From 833ef67312b011663758eb46a3b0b19bef5b87b9 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 7 Mar 2018 15:30:29 +0100
Subject: [PATCH 0001/2793] nixos/i18n: add option for extra locale settings

---
 nixos/modules/config/i18n.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 46b22fc1285..105cec86022 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -34,6 +34,17 @@ with lib;
         '';
       };
 
+      extraLocaleSettings = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = { LC_MESSAGES = "en_US.UTF-8"; LC_TIME = "de_DE.UTF-8"; };
+        description = ''
+          A set of additional system-wide locale settings other than
+          <literal>LANG</literal> which can be configured with
+          <option>i18n.defaultLocale</option>.
+        '';
+      };
+
       supportedLocales = mkOption {
         type = types.listOf types.str;
         default = ["all"];
@@ -129,7 +140,7 @@ with lib;
     environment.sessionVariables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
-      };
+      } // config.i18n.extraLocaleSettings;
 
     systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) {
       LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
@@ -141,6 +152,7 @@ with lib;
         source = pkgs.writeText "locale.conf"
           ''
             LANG=${config.i18n.defaultLocale}
+            ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)}
           '';
       };
 

From 5ff872aa24983cf3e1cf28bb990042846c1a97ee Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 23 Feb 2018 13:12:53 +0000
Subject: [PATCH 0002/2793] substituteStream(): print warning if nothing done

---
 pkgs/stdenv/generic/setup.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 26d28609d87..9b3ca3bf11e 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -642,7 +642,8 @@ fi
 
 substituteStream() {
     local var=$1
-    shift
+    local description=$2
+    shift 2
 
     while (( "$#" )); do
         case "$1" in
@@ -650,6 +651,14 @@ substituteStream() {
                 pattern="$2"
                 replacement="$3"
                 shift 3
+                local savedvar
+                savedvar="${!var}"
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
+                if [ "$pattern" != "$replacement" ]; then
+                    if [ "${!var}" == "$savedvar" ]; then
+                        echo "substituteStream(): WARNING: pattern '$pattern' doesn't match anything in $description" >&2
+                    fi
+                fi
                 ;;
 
             --subst-var)
@@ -662,11 +671,13 @@ substituteStream() {
                 fi
                 pattern="@$varName@"
                 replacement="${!varName}"
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
                 ;;
 
             --subst-var-by)
                 pattern="@$2@"
                 replacement="$3"
+                eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
                 shift 3
                 ;;
 
@@ -675,8 +686,6 @@ substituteStream() {
                 return 1
                 ;;
         esac
-
-        eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
     done
 
     printf "%s" "${!var}"
@@ -704,7 +713,7 @@ substitute() {
     consumeEntire content < "$input"
 
     if [ -e "$output" ]; then chmod +w "$output"; fi
-    substituteStream content "$@" > "$output"
+    substituteStream content "file '$input'" "$@" > "$output"
 }
 
 substituteInPlace() {
@@ -726,7 +735,7 @@ substituteAllStream() {
     local -a args=()
     _allFlags
 
-    substituteStream "$1" "${args[@]}"
+    substituteStream "$1" "$2" "${args[@]}"
 }
 
 # Substitute all environment variables that start with a lowercase character and
@@ -1137,7 +1146,7 @@ fixupPhase() {
         for hook in $setupHooks; do
             local content
             consumeEntire content < "$hook"
-            substituteAllStream content >> "${!outputDev}/nix-support/setup-hook"
+            substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"
             unset -v content
         done
         unset -v hook

From 8887e1f697d9e13ad277ca7d7054bc42c2459548 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 25 Jul 2018 17:36:41 +0100
Subject: [PATCH 0003/2793] weechat: seperate weechat-unwrapped from wrapper

If I have a patch I want to apply to weechat, I can't do that with
overrideAttrs like I can with almost every other package, because that
only applies to the wrapper derivation. For other wrapped packages, one
can usually call the wrapper with any version of the derivation, but the
weechat derivation didn't expose a wrapper creation function.

Taking inspiration from other packages, particularly Firefox, I
extracted the wrapper into its own function, made the default weechat
derivation use that, and added weechat-unwrapped.

Now I can add my custom patch like this:

    (wrapWeechat
      (weechat-unwrapped.overrideAttrs (oldAttrs: {
        patches = [
          (fetchpatch {
            url = "https://github.com/weechat/weechat/commit/55767f5f116db3cb56cf85f52aa80feff45b6abf.patch?full_index=1";
            sha256 = "1pkcdsby57diqds1y5hhl0fr4i8j0zax32jb0gqd36siki3lza3d";
          })
        ];
      }))
      { configure =
        { availablePlugins, ... }:
        {
          plugins = with availablePlugins; [
            (python.withPackages (packages: with packages; [ potr websocket_client ]))
          ];
        };
      })

There is a small backward incompatibility here: previously, it was
possible to get an unwrapped weechat like this:

    weechat.override { configure = null; }

This didn't seem too important to keep around since it was also possible
to get an unwrapped weechat in a much more obvious way:

    weechat.unwrapped

I could probably make it so that the first way still worked, if that
behavior turns out to really have been important.
---
 .../networking/irc/weechat/default.nix        | 54 +-----------------
 .../networking/irc/weechat/wrapper.nix        | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +-
 3 files changed, 65 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/weechat/wrapper.nix

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 16162435e09..82f9e28a13c 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -2,7 +2,6 @@
 , ncurses, openssl, aspell, gnutls
 , zlib, curl, pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
-, writeScriptBin # for withPlugins
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
@@ -10,9 +9,7 @@
 , pythonSupport ? true, pythonPackages
 , rubySupport ? true, ruby
 , tclSupport ? true, tcl
-, extraBuildInputs ? []
-, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
-, runCommand }:
+, extraBuildInputs ? [] }:
 
 let
   inherit (pythonPackages) python;
@@ -26,7 +23,7 @@ let
   ];
   enabledPlugins = builtins.filter (p: p.enabled) plugins;
 
-  weechat =
+  in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
       version = "2.1";
@@ -81,49 +78,4 @@ let
         maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
         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") // {
-            extraEnv = ''
-              export PATH="${perlInterpreter}/bin:$PATH"
-            '';
-          };
-          tcl = simplePlugin "tcl";
-          ruby = simplePlugin "ruby";
-          guile = simplePlugin "guile";
-          lua = simplePlugin "lua";
-        };
-      };
-
-    inherit (config) plugins;
-
-    pluginsDir = runCommand "weechat-plugins" {} ''
-      mkdir -p $out/plugins
-      for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
-        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;
-  }
+    }
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
new file mode 100644
index 00000000000..5c557a8fd24
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -0,0 +1,57 @@
+{ pythonPackages, perl, runCommand, lib, writeScriptBin, stdenv
+}:
+
+weechat:
+
+let
+  wrapper = {
+    configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
+  }:
+
+  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") // {
+            extraEnv = ''
+              export PATH="${perlInterpreter}/bin:$PATH"
+            '';
+          };
+          tcl = simplePlugin "tcl";
+          ruby = simplePlugin "ruby";
+          guile = simplePlugin "guile";
+          lua = simplePlugin "lua";
+        };
+    };
+
+    inherit (config) plugins;
+
+    pluginsDir = runCommand "weechat-plugins" {} ''
+      mkdir -p $out/plugins
+      for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
+        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;
+  };
+
+in lib.makeOverridable wrapper
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b22f261ab1..5b95467da98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18895,12 +18895,16 @@ with pkgs;
 
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
 
-  weechat = callPackage ../applications/networking/irc/weechat {
+  wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
+
+  weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
     inherit (darwin) libresolv;
     guile = guile_2_0;
   };
 
+  weechat = wrapWeechat weechat-unwrapped { };
+
   weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge {
     inherit (luaPackages) cjson;
   };

From fb3ed07a2b0120432bf16646469b8aab5a6eec9a 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 18:13:31 +0200
Subject: [PATCH 0004/2793] binutils: fix #44936 the huge size regression

206 -> 32 MiB, i.e. not like the previous 26, but much better now.
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 3205366f80e..d433ee4e7a4 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
 
   configureFlags = [
-    "--enable-targets=all" "--enable-64-bit-bfd"
+    "--enable-64-bit-bfd"
     "--disable-install-libbfd"
     "--disable-shared" "--enable-static"
     "--with-system-zlib"

From beb063a1031c08df77996d97e4f6f9a2da1d911a 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 22:30:41 +0200
Subject: [PATCH 0005/2793] binutils: use shared libs

---
 .../tools/misc/binutils/default.nix           | 35 +++++++++++++------
 pkgs/stdenv/linux/default.nix                 |  4 ++-
 pkgs/stdenv/linux/make-bootstrap-tools.nix    |  1 +
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index d433ee4e7a4..5e271db8bd1 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, buildPackages
+{ stdenv, lib, buildPackages
 , fetchurl, zlib, autoreconfHook264
+# Enabling all targets increases output size to a multiple.
+, withAllTargets ? false, libbfd, libopcodes
+, enableShared ? true
 , noSysDirs, gold ? true, bison ? null
 }:
 
 let
+  reuseLibs = enableShared && withAllTargets;
+
   # Remove gold-symbol-visibility patch when updating, the proper fix
   # is now upstream.
   # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
   version = "2.30";
   basename = "binutils-${version}";
-  inherit (stdenv.lib) optionals optionalString;
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
-  targetPrefix = optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-";
+  targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+                  "${stdenv.targetPlatform.config}-";
 in
 
 stdenv.mkDerivation rec {
@@ -64,14 +69,14 @@ stdenv.mkDerivation rec {
     # be satisfied on aarch64 platform. Add backported fix from bugzilla.
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
     ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
-  ] ++ stdenv.lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
+  ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
 
   outputs = [ "out" "info" "man" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     bison
-  ] ++ stdenv.lib.optionals stdenv.targetPlatform.isiOS [
+  ] ++ lib.optionals stdenv.targetPlatform.isiOS [
     autoreconfHook264
   ];
   buildInputs = [ zlib ];
@@ -100,12 +105,14 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
 
-  configureFlags = [
+  configureFlags =
+    (if enableShared then [ "--enable-shared" "--disable-static" ]
+                     else [ "--disable-shared" "--enable-static" ])
+  ++ lib.optional withAllTargets "--enable-targets=all"
+  ++ [
     "--enable-64-bit-bfd"
-    "--disable-install-libbfd"
-    "--disable-shared" "--enable-static"
     "--with-system-zlib"
 
     "--enable-deterministic-archives"
@@ -116,10 +123,16 @@ stdenv.mkDerivation rec {
     # RUNPATH instead of RPATH on binaries.  This is important because
     # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
     "--enable-new-dtags"
-  ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
+  ] ++ lib.optionals gold [ "--enable-gold" "--enable-plugins" ];
 
   doCheck = false; # fails
 
+  postFixup = lib.optionalString reuseLibs ''
+    rm "$out"/lib/lib{bfd,opcodes}-${version}.so
+    ln -s '${lib.getLib libbfd}/lib/libbfd-${version}.so' "$out/lib/"
+    ln -s '${lib.getLib libopcodes}/lib/libopcodes-${version}.so' "$out/lib/"
+  '';
+
   # else fails with "./sanity.sh: line 36: $out/bin/size: not found"
   doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform && stdenv.hostPlatform == stdenv.targetPlatform;
 
@@ -129,7 +142,7 @@ stdenv.mkDerivation rec {
     inherit targetPrefix version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for manipulating binaries (linker, assembler, etc.)";
     longDescription = ''
       The GNU Binutils are a collection of binary tools.  The main
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index de58178a34b..0745d9653a3 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -189,7 +189,9 @@ in
 
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
-      binutils = super.binutils_nogold;
+      binutils-unwrapped = super.binutils-unwrapped.override {
+        gold = false;
+      };
       inherit (prevStage)
         ccWrapperStdenv
         gcc-unwrapped coreutils gnugrep;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4fc9999b538..dd23304cb45 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -150,6 +150,7 @@ in with pkgs; rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils.bintools.out}/bin/$i $out/bin
         done
+        cp '${lib.getLib binutils.bintools}'/lib/* "$out/lib/"
 
         chmod -R u+w $out
 

From 363f78fb4c3e7dc777d4870ea5ce343c9fc4ba40 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Fri, 7 Sep 2018 22:17:06 +1200
Subject: [PATCH 0006/2793] gobject-introspection: Fix macos shared lib paths

Uses patch Nirbheek Chauhan's patch from this issue upstream issue:
https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222

Fixes #40599
---
 .../absolute_shlib_path.patch                 |  4 +--
 .../gobject-introspection/default.nix         |  1 +
 .../macos-shared-library.patch                | 36 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/gobject-introspection/macos-shared-library.patch

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 6a112aedcc0..96e7b553e60 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -87,8 +87,8 @@
 +                    m = pattern.search(line)
                  if m:
                      del patterns[library]
--                    shlibs.append(m.group(1))
-+                    shlibs.append(os.path.join(options.fallback_libpath, m.group(1)))
+-                    shlibs.append(_sanitize_install_name(m.group(1)))
++                    shlibs.append(os.path.join(options.fallback_libpath, _sanitize_install_name(m.group(1))))
                      break
  
          if len(patterns) > 0:
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5ab5005bad..7d64f6a0205 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   patches = [
+    ./macos-shared-library.patch
     (substituteAll {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
diff --git a/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
new file mode 100644
index 00000000000..9a1d41cf1e3
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
@@ -0,0 +1,36 @@
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index c93d20c..4d4915d 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -43,6 +43,22 @@ def _resolve_libtool(options, binary, libraries):
+ 
+     return shlibs
+ 
++def _sanitize_install_name(install_name):
++    '''
++    On macOS, the dylib can be built with install_name as @rpath/libfoo.so
++    instead of the absolute path to the library, so handle that. The name
++    can also be @loader_path or @executable_path.
++    '''
++    if not install_name.startswith('@'):
++        return install_name
++    if install_name.startswith('@rpath/'):
++        return install_name[7:]
++    if install_name.startswith('@loader_path/'):
++        return install_name[13:]
++    if install_name.startswith('@executable_path/'):
++        return install_name[17:]
++    raise RuntimeError('Unknown install_name {!r}'.format(install_name))
++
+ 
+ # Assume ldd output is something vaguely like
+ #
+@@ -121,7 +137,7 @@ def _resolve_non_libtool(options, binary, libraries):
+                 m = pattern.search(line)
+                 if m:
+                     del patterns[library]
+-                    shlibs.append(m.group(1))
++                    shlibs.append(_sanitize_install_name(m.group(1)))
+                     break
+ 
+         if len(patterns) > 0:

From bc2905b02032ce66f012482b638edc2e1cea5e55 Mon Sep 17 00:00:00 2001
From: Lana Black <lanablack@amok.cc>
Date: Mon, 24 Sep 2018 20:40:45 +0000
Subject: [PATCH 0007/2793] libbladeRF: 1.9.0 -> 2.0.2

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

diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 04bd3f3d71e..ac8de886fad 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -2,14 +2,14 @@
 , libusb1, udev }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.0";
+  version = "2.0.2";
   name = "libbladeRF-${version}";
 
   src = fetchFromGitHub {
     owner = "Nuand";
     repo = "bladeRF";
     rev = "libbladeRF_v${version}";
-    sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa";
+    sha256 = "18qwljjdnf4lds04kc1zvslr5hh9cjnnjkcy07lbkrq7pj0pfnc6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 8596dc9125974ef729127cf491201cd6d8b8d75f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 14:42:50 +0000
Subject: [PATCH 0008/2793] fetchgit: use buildPackages's git

---
 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 88fe95c4196..de7105405ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -171,7 +171,7 @@ with pkgs;
   fetchfossil = callPackage ../build-support/fetchfossil { };
 
   fetchgit = callPackage ../build-support/fetchgit {
-    git = gitMinimal;
+    git = buildPackages.gitMinimal;
   };
 
   fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { };

From a5a5d5c45d41be63f13a461135cffc82562642ba Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 22 Aug 2018 00:27:31 +0900
Subject: [PATCH 0009/2793] zathura: wrap binary in the wrapper

---
 pkgs/applications/misc/zathura/core/default.nix | 9 ++-------
 pkgs/applications/misc/zathura/wrapper.nix      | 6 ++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 56701cffb8c..3a5618b4c93 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
 , appstream-glib, desktop-file-utils, python3
 , gtk, girara, gettext, libxml2
-, file, sqlite, glib, texlive, libintl, libseccomp
+, sqlite, glib, texlive, libintl, libseccomp
 , gtk-mac-integration, synctexSupport ? true
 }:
 
@@ -24,16 +24,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    file gtk girara libintl libseccomp
+    gtk girara libintl libseccomp
     sqlite glib
   ] ++ optional synctexSupport texlive.bin.core
     ++ optional stdenv.isDarwin [ gtk-mac-integration ];
 
-  postInstall = ''
-    wrapProgram "$out/bin/zathura" \
-      --prefix PATH ":" "${makeBinPath [ file ]}"
-  '';
-
   meta = {
     homepage = https://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 64f617782f2..dfae9fa1c3a 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -1,4 +1,4 @@
-{ symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }:
+{ symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }:
 
 let
   pluginsPath = lib.makeSearchPath "lib/zathura" plugins;
@@ -11,7 +11,9 @@ in symlinkJoin {
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath}
+    wrapProgram $out/bin/zathura \
+      --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
+      --add-flags --plugins-dir=${pluginsPath}
   '';
 
   meta = with lib; {

From 7bf3f0911fc29e0e85b47e0960a569dc75a0f562 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sun, 12 Aug 2018 02:04:06 +0900
Subject: [PATCH 0010/2793] zathura: keep wrapper's WM_CLASS consistent with
 wrapped binary

---
 pkgs/applications/misc/zathura/core/default.nix | 2 ++
 pkgs/applications/misc/zathura/wrapper.nix      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 3a5618b4c93..4cf05a21636 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn";
   };
 
+  outputs = [ "bin" "man" "dev" "out" ];
+
   nativeBuildInputs = [
     meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
     gettext makeWrapper libxml2
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index dfae9fa1c3a..b81d12947e4 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -6,12 +6,12 @@ let
 in symlinkJoin {
   name = "zathura-with-plugins-${zathura_core.version}";
 
-  paths = [ zathura_core ];
+  paths = with zathura_core; [ man dev out ];
 
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    wrapProgram $out/bin/zathura \
+    makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
       --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
       --add-flags --plugins-dir=${pluginsPath}
   '';

From 92e1cf23e6bdc5b8884a297fab3e99771d27c528 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 10:06:35 -0700
Subject: [PATCH 0011/2793] rdkafka: 0.11.5 -> 0.11.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/rdkafka/versions
---
 pkgs/development/libraries/rdkafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 11ae3a52adc..61c52de80b7 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rdkafka-${version}";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
     rev = "v${version}";
-    sha256 = "1b0zp7k0775g5pzvkmpmsha63wx8wcwcas6w6wb09y0gymxz0xss";
+    sha256 = "17fah3x71ipnzvlj0yg8hfmqkk91s942z34p681r4k8giv7avm30";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6d4b02df3f8cbc51b35b31208c4127b45d60f431 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Mon, 29 Oct 2018 12:26:18 +0100
Subject: [PATCH 0012/2793] nixos/containers: don't create veths if not
 configured

Previously, setting "privateNetwork = true" without specifying host and
local addresses would create unconfigured interfaces: ve-$INSTANCE on the host
and eth0 inside the container.

These changes is rebased part of the original PR #3021.
---
 nixos/modules/virtualisation/containers.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 8fe59badd33..50ee89168ee 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -36,7 +36,7 @@ let
         #! ${pkgs.runtimeShell} -e
 
         # Initialise the container side of the veth pair.
-        if [ "$PRIVATE_NETWORK" = 1 ]; then
+        if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
 
           ip link set host0 name eth0
           ip link set dev eth0 up
@@ -85,6 +85,10 @@ let
       cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
 
       if [ "$PRIVATE_NETWORK" = 1 ]; then
+        extraFlags+=" --private-network"
+      fi
+
+      if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
         extraFlags+=" --network-veth"
         if [ -n "$HOST_BRIDGE" ]; then
           extraFlags+=" --network-bridge=$HOST_BRIDGE"
@@ -153,7 +157,7 @@ let
       # Clean up existing machined registration and interfaces.
       machinectl terminate "$INSTANCE" 2> /dev/null || true
 
-      if [ "$PRIVATE_NETWORK" = 1 ]; then
+      if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
         ip link del dev "ve-$INSTANCE" 2> /dev/null || true
         ip link del dev "vb-$INSTANCE" 2> /dev/null || true
       fi
@@ -200,7 +204,7 @@ let
           '';
     in
       ''
-        if [ "$PRIVATE_NETWORK" = 1 ]; then
+        if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
           if [ -z "$HOST_BRIDGE" ]; then
             ifaceHost=ve-$INSTANCE
             ip link set dev $ifaceHost up
@@ -349,7 +353,7 @@ let
         List of forwarded ports from host to container. Each forwarded port
         is specified by protocol, hostPort and containerPort. By default,
         protocol is tcp and hostPort and containerPort are assumed to be
-        the same if containerPort is not explicitly given. 
+        the same if containerPort is not explicitly given.
       '';
     };
 
@@ -694,7 +698,7 @@ in
     # container so that container@.target can get the container
     # configuration.
     environment.etc =
-      let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); 
+      let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
       in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
       { text =
           ''

From d65b39a8052e60f6ad3e70472f7a64d8e2c8c613 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 30 Oct 2018 17:29:37 +0100
Subject: [PATCH 0013/2793] kernel: enable MLX5_CORE_EN when possible

Hydra's builders from Packet.net use this option a lot, causing
lots of slow deploys.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 27a615d7bb9..20a2fc2c8e6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -638,6 +638,7 @@ let
       MEGARAID_NEWGEN       = yes;
 
       MLX4_EN_VXLAN = whenOlder "4.8" yes;
+      MLX5_CORE_EN       = option yes;
 
       MODVERSIONS        = whenOlder "4.9" yes;
       MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension

From 7e470fdac75e0670871135f37c47b8527fd934a5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 18:39:48 -0500
Subject: [PATCH 0014/2793] gn: 20180830 -> 20181031

---
 pkgs/development/tools/build-managers/gn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index a273afd7158..d5559768d6f 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -2,8 +2,8 @@
 , git, ninja, python }:
 
 let
-  rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
-  sha256 = "1a5s6i07s8l4f1bakh3fyaym00xz7zgd49sp6awm10xb7yjh95ba";
+  rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a";
+  sha256 = "1ny23sprl7ygb2lpdnqxv60m8kaf4h2dmpqjp61l5vc2s7f32g97";
 
   shortRev = builtins.substring 0 7 rev;
   lastCommitPosition = writeText "last_commit_position.h" ''
@@ -18,7 +18,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gn-${version}";
-  version = "20180830";
+  version = "20181031";
 
   src = fetchgit {
     url = "https://gn.googlesource.com/gn";

From bde99096a80e74692795fa2782619c46a476839e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 31 Oct 2018 15:17:24 -0500
Subject: [PATCH 0015/2793] Revert "Revert "patch-shebangs: respect cross
 compilation""

This reverts commit 9c4b11e9a060de2175aef4d36881f97812ab17fe.
---
 .../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 d26bf735d30..441f230869b 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 "$f: 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 eb7c50a993833ecdb94cc3affb55ac4c560edf50 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 31 Oct 2018 15:34:45 -0500
Subject: [PATCH 0016/2793] patch-shebangs: use --build for auto patch shebangs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In strictDeps=false, autoPatchshebangs should use
--build (corresponding to PATH) to lookup commands. This restores the
previous behavior of patchshebangs so that we don’t break stuff that
isn’t careful in the buildInputs vs. nativeBuildInputs distinction.
Unfortunately this won’t work under cross compilation.
---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 +++-
 pkgs/stdenv/generic/setup.sh                     | 8 --------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 441f230869b..b35c3c87625 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -102,10 +102,12 @@ patchShebangs() {
 patchShebangsAuto () {
     if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
 
+        if [ -z "${strictDeps-}"]; then
+            patchShebangs --build "$prefix"
         # 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
+        elif [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
             patchShebangs --build "$prefix"
         else
             patchShebangs --host "$prefix"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8af369b1d17..81c1725f1d1 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -257,17 +257,9 @@ 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"
-
-    # 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

From 2f2e635dd5431859a01bbbcae0493be90041d495 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 31 Oct 2018 15:35:34 -0500
Subject: [PATCH 0017/2793] darwin/stdenv: bash is a build input

patch shebangs needs to be in build inputs for it to get into
HOST_PATH.
---
 pkgs/stdenv/darwin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5fb410b64eb..d9b3c7dd29f 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -278,8 +278,8 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = [ pkgs.darwin.CF ];
+    extraNativeBuildInputs = with pkgs; [ xz ];
+    extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
     libcxx = pkgs.libcxx;
 
     extraPreHook = ''
@@ -335,8 +335,8 @@ in rec {
     };
   in with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = [ pkgs.darwin.CF ];
+    extraNativeBuildInputs = with pkgs; [ xz ];
+    extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
     libcxx = pkgs.libcxx;
 
     extraPreHook = ''

From 320c9c10de8489604c459127079f59a3ef4d8475 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 6 Jun 2018 22:04:35 +0200
Subject: [PATCH 0018/2793] make-derivation: use pname-version as default name
 if both are present

---
 lib/strings.nix                         | 20 ++++++++++++++++++++
 pkgs/stdenv/generic/make-derivation.nix | 15 +++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 4d7fa1e774d..48420a36781 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -236,6 +236,26 @@ rec {
     in lenContent >= lenSuffix &&
        substring (lenContent - lenSuffix) lenContent content == suffix;
 
+  /* Determine whether a string contains the given infix
+
+    Type: hasInfix :: string -> string -> bool
+
+    Example:
+      hasInfix "bc" "abcd"
+      => true
+      hasInfix "ab" "abcd"
+      => true
+      hasInfix "cd" "abcd"
+      => true
+      hasInfix "foo" "abcd"
+      => false
+  */
+  hasInfix = infix: content:
+    let
+      drop = x: substring 1 (stringLength x) x;
+    in hasPrefix infix content
+      || content != "" && hasInfix infix (drop content);
+
   /* Convert a string to a list of characters (i.e. singleton strings).
      This allows you to, e.g., map a function over each character.  However,
      note that this will likely be horribly inefficient; Nix is not a
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 08a914787c3..5b1fd4b8d15 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -65,6 +65,8 @@ rec {
     , pos ? # position used in error messages and for meta.position
         (if attrs.meta.description or null != null
           then builtins.unsafeGetAttrPos "description" attrs.meta
+          else if attrs.version or null != null
+          then builtins.unsafeGetAttrPos "version" attrs
           else builtins.unsafeGetAttrPos "name" attrs)
     , separateDebugInfo ? false
     , outputs ? [ "out" ]
@@ -79,6 +81,15 @@ rec {
     , ... } @ attrs:
 
     let
+      # Check that the name is consistent with pname and version:
+      selfConsistent = (with attrs; attrs ? "name" ->
+        (lib.assertMsg (attrs ? "version" -> lib.strings.hasInfix version name)
+          "version ${version} does not appear in name ${name}" &&
+        lib.assertMsg (attrs ? "pname" -> lib.strings.hasInfix pname name)
+          "pname ${pname} does not appear in name ${name}"));
+
+      computedName = if name != "" then name else "${attrs.pname}-${attrs.version}";
+
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
       # no package has `doCheck = true`.
       doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
@@ -175,7 +186,7 @@ rec {
         // {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
-          name = assert validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); name + lib.optionalString
+          name = assert selfConsistent && validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
             # Fixed-output derivations like source tarballs shouldn't get a host
             # suffix. But we have some weird ones with run-time deps that are
             # just used for their side-affects. Those might as well since the
@@ -287,7 +298,7 @@ rec {
       meta = {
           # `name` above includes cross-compilation cruft (and is under assert),
           # lets have a clean always accessible version here.
-          inherit name;
+          name = computedName;
 
           # If the packager hasn't specified `outputsToInstall`, choose a default,
           # which is the name of `p.bin or p.out or p`;

From b0e9fc131ca777b24b97e21154ff66bb4f312eb6 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:32:52 +0100
Subject: [PATCH 0019/2793] treewide: Fix packages using name where they should
 use pname

---
 pkgs/applications/altcoins/mist.nix                         | 4 ++--
 pkgs/applications/audio/cadence/default.nix                 | 2 +-
 pkgs/applications/graphics/vimiv/default.nix                | 2 +-
 pkgs/applications/misc/omegat.nix                           | 2 +-
 pkgs/applications/networking/browsers/brave/default.nix     | 2 +-
 pkgs/development/compilers/graalvm/default.nix              | 2 +-
 pkgs/development/libraries/elf-header/default.nix           | 2 +-
 pkgs/development/libraries/igraph/default.nix               | 4 ++--
 pkgs/development/libraries/libsignal-protocol-c/default.nix | 2 +-
 pkgs/development/libraries/libxl/default.nix                | 4 ++--
 pkgs/development/libraries/yojimbo/default.nix              | 2 +-
 pkgs/development/python-modules/pyinputevent/default.nix    | 2 +-
 pkgs/development/python-modules/pymaging/default.nix        | 2 +-
 pkgs/development/python-modules/pymaging_png/default.nix    | 2 +-
 pkgs/development/python-modules/rbtools/default.nix         | 2 +-
 pkgs/development/python-modules/repocheck/default.nix       | 2 +-
 pkgs/development/python-modules/snappergui/default.nix      | 2 +-
 pkgs/development/python-modules/svg2tikz/default.nix        | 2 +-
 pkgs/development/python-modules/urwidtrees/default.nix      | 2 +-
 pkgs/development/ruby-modules/gem-config/default.nix        | 2 +-
 pkgs/development/tools/icr/default.nix                      | 2 +-
 pkgs/development/tools/kubectx/default.nix                  | 4 ++--
 pkgs/development/tools/pyre/default.nix                     | 2 +-
 pkgs/development/tools/scry/default.nix                     | 2 +-
 pkgs/servers/web-apps/fileshelter/default.nix               | 2 +-
 pkgs/tools/misc/hid-listen/default.nix                      | 2 +-
 pkgs/tools/networking/quickserve/default.nix                | 2 +-
 27 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index 194c004f9c7..2990b44c7f4 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -2,7 +2,7 @@
 
 let
   version = "0.11.1";
-  name = "mist";
+  pname = "mist";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
@@ -26,7 +26,7 @@ let
   };
 
   mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
-    inherit name version meta;
+    inherit pname version meta;
 
     src = {
       i686-linux = fetchurl {
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 87dbb310995..cc4f5cae2de 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -10,7 +10,7 @@
 
  stdenv.mkDerivation rec {
   version = "0.9.0";
-  name = "cadence";
+  pname = "cadence";
 
   src = fetchurl {
     url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 538931c1040..e790ef49acb 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -6,7 +6,7 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  name = "vimiv";
+  pname = "vimiv";
   version = "0.7.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index e6a6be88b6c..660b5db6105 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.1.5.2";
-  name = "omegat";
+  pname = "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;
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index d097e0b448c..379180357a2 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -69,7 +69,7 @@ let rpath = lib.makeLibraryPath [
 
 
 in stdenv.mkDerivation rec {
-    name = "brave";
+    pname = "brave";
     version = "0.25.2";
 
     src = fetchurl {
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index a35143b4349..513f082dcf5 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -65,7 +65,7 @@ in rec {
 
   mx = stdenv.mkDerivation rec {
     version = "5.192.0";
-    name = "mx";
+    pname = "mx";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "mx";
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index ab8c217dce4..47b39eeb7e9 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenvNoCC.mkDerivation {
-  name = "elf-header";
+  pname = "elf-header";
   inherit (libc) version;
 
   src = null;
diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 4ac3ebc0988..aab64b941ca 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -3,12 +3,12 @@
   flex, yacc, zlib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "igraph";
+  pname = "igraph";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "igraph";
-    repo = name;
+    repo = pname;
     rev = version;
     sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8";
   };
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix
index 379361a7031..f3549d52f69 100644
--- a/pkgs/development/libraries/libsignal-protocol-c/default.nix
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libsignal-protocol-c";
+  pname = "libsignal-protocol-c";
   version = "2.3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 035bfa8d6dc..471789d3e0f 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxl";
+  pname = "libxl";
   version = "3.8.1";
 
   src = fetchurl {
-    url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz";
+    url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
     sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
   };
 
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
index 9a3416a368b..9bd20ee2607 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
 
 stdenv.mkDerivation rec {
-  name = "yojimbo";
+  pname = "yojimbo";
   version = "1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix
index 4709cf0d116..6eeeeb20c00 100644
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "pyinputevent";
+  pname = "pyinputevent";
   version = "2016-10-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix
index 34620c55c80..234aee8436d 100644
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "pymaging";
+  pname = "pymaging";
   version = "unstable-2016-11-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix
index 6756f9deee3..fb92739776d 100644
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "pymaging-png";
+  pname = "pymaging-png";
   version = "unstable-2016-11-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index 127188ac3fb..3be8bb99bbe 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "rbtools";
+  pname = "rbtools";
   version = "0.7.2";
   disabled = isPy3k;
 
diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix
index 17dea17105e..88437ae9032 100644
--- a/pkgs/development/python-modules/repocheck/default.nix
+++ b/pkgs/development/python-modules/repocheck/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "repocheck";
+  pname = "repocheck";
   version = "2015-08-05";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix
index 43e942a9588..db1a75ab7f2 100644
--- a/pkgs/development/python-modules/snappergui/default.nix
+++ b/pkgs/development/python-modules/snappergui/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "Snapper-GUI";
+  pname = "Snapper-GUI";
   version = "0.1";
 
   src = fetchgit {
diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index c3308bf229c..36f6dc06850 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -6,7 +6,7 @@
 }:
 
 buildPythonPackage {
-  name = "svg2tikz";
+  pname = "svg2tikz";
   version = "1.0.0";
   disabled = ! isPy27;
 
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index ac9cf73cab1..da5501f50ba 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -5,7 +5,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "urwidtrees";
+  pname = "urwidtrees";
   version  = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index b5aa0933c2e..52f176fae94 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -29,7 +29,7 @@ let
   v8 = v8_3_16_14;
 
   rainbow_rake = buildRubyGem {
-    name = "rake";
+    pname = "rake";
     gemName = "rake";
     source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
     type = "gem";
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index 3c6eb6a98b0..8fb79a9eabe 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -2,7 +2,7 @@
 , openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "icr";
+  pname = "icr";
   version = "0.5.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 959bb869868..e70cf409197 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -3,12 +3,12 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "kubectx";
+  pname = "kubectx";
   version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "ahmetb";
-    repo = "${name}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg";
   };
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 382e733cb98..02772f9f791 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -82,7 +82,7 @@ let
   };
 };
 typeshed = stdenv.mkDerivation {
-  name = "typeshed";
+  pname = "typeshed";
   version = pyre-version;
   src = fetchFromGitHub {
     owner = "python";
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
index ab810a2ae9f..03e7c64f549 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, crystal, shards, which }:
 
 stdenv.mkDerivation rec {
-  name = "scry";
+  pname = "scry";
   # 0.7.1 doesn't work with crystal > 0.25
   version = "0.7.1.20180919";
 
diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix
index d0be4f575dd..01fb8c62482 100644
--- a/pkgs/servers/web-apps/fileshelter/default.nix
+++ b/pkgs/servers/web-apps/fileshelter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt3, libconfig, pkgconfig } :
 
 stdenv.mkDerivation rec {
-  name = "fileshelter";
+  pname = "fileshelter";
   version = "3.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix
index 0ebad4f7117..6bbe4888d1b 100644
--- a/pkgs/tools/misc/hid-listen/default.nix
+++ b/pkgs/tools/misc/hid-listen/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip }:
 stdenv.mkDerivation rec {
-  name = "hid-listen";
+  pname = "hid-listen";
   version = "1.01";
 
   src = fetchzip {
diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix
index 06e5918dccd..7269eb7b80a 100644
--- a/pkgs/tools/networking/quickserve/default.nix
+++ b/pkgs/tools/networking/quickserve/default.nix
@@ -12,7 +12,7 @@ let
   };
   wrappedPython = python3.withPackages (_: [ threaded_servers ]);
 in stdenv.mkDerivation {
-  name = "quickserve";
+  pname = "quickserve";
   version = "2018";
 
   unpackPhase = ":";

From 9ec40cc3bfd5915f1625ca741fb3fd2be7ea30c1 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:35:13 +0100
Subject: [PATCH 0020/2793] treewide: Fix overrides having wrong versions

---
 pkgs/applications/misc/k2pdfopt/default.nix    |  1 +
 .../science/misc/sasview/xhtml2pdf.nix         |  1 +
 .../virtualization/docker/default.nix          |  9 ++++++---
 pkgs/misc/emulators/retroarch/cores.nix        | 18 +++++++++---------
 pkgs/tools/virtualization/awsebcli/default.nix |  1 +
 pkgs/top-level/all-packages.nix                |  1 +
 pkgs/top-level/python-packages.nix             |  1 +
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index ad2381394f4..0e84283a9ef 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
   let
     mupdf_modded = mupdf.overrideAttrs (attrs: {
       name = "mupdf-1.10a";
+      version = "1.10a";
       src = fetchurl {
         url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
         sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
index 0b3d438843d..8eff2057928 100644
--- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
+++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
@@ -3,6 +3,7 @@
 let
   #xhtml2pdf specifically requires version "1.0b10" of html5lib
   html5 = html5lib.overrideAttrs( oldAttrs: rec{
+    name = "${oldAttrs.pname}-${version}";
     version = "1.0b10";
     src = oldAttrs.src.override {
       inherit version;
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e83a1af4466..e9bfbffe41e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -16,7 +16,8 @@ rec {
     } :
   let
     docker-runc = runc.overrideAttrs (oldAttrs: rec {
-      name = "docker-runc";
+      name = "docker-runc-${version}";
+      inherit version;
       src = fetchFromGitHub {
         owner = "docker";
         repo = "runc";
@@ -28,7 +29,8 @@ rec {
     });
 
     docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
-      name = "docker-containerd";
+      name = "docker-containerd-${version}";
+      inherit version;
       src = fetchFromGitHub {
         owner = "docker";
         repo = "containerd";
@@ -42,7 +44,8 @@ rec {
     });
 
     docker-tini = tini.overrideAttrs  (oldAttrs: rec {
-      name = "docker-init";
+      name = "docker-init-${version}";
+      inherit version;
       src = fetchFromGitHub {
         owner = "krallin";
         repo = "tini";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 2eef6009ac2..7a0a48db118 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -67,7 +67,7 @@ in with stdenv.lib.licenses;
     buildPhase = "make";
   };
 
-  beetle-pce-fast = (mkLibRetroCore rec {
+  beetle-pce-fast = let der = (mkLibRetroCore rec {
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
@@ -76,12 +76,12 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's PC Engine core to libretro";
     license = gpl2;
-  }).override {
+  }); in der.override {
     buildPhase = "make";
-    name = "beetle-pce-fast";
+    name = "beetle-pce-fast-${der.version}";
   };
 
-  beetle-psx = (mkLibRetroCore rec {
+  beetle-psx = let der = (mkLibRetroCore rec {
     core = "mednafen-psx";
     src = fetchRetro {
       repo = "beetle-psx-libretro";
@@ -90,12 +90,12 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
     license = gpl2;
-  }).override {
+  }); in der.override {
     buildPhase = "make";
-    name = "beetle-psx";
+    name = "beetle-psx-${der.version}";
   };
 
-  beetle-saturn = (mkLibRetroCore rec {
+  beetle-saturn = let der = (mkLibRetroCore rec {
     core = "mednafen-saturn";
     src = fetchRetro {
       repo = "beetle-saturn-libretro";
@@ -104,9 +104,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's Saturn core to libretro";
     license = gpl2;
-  }).override {
+  }); in der.override {
     buildPhase = "make";
-    name = "beetle-saturn";
+    name = "beetle-saturn-${der.version}";
     meta.platforms = [ "x86_64-linux" ];
   };
 
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index b1693bd262f..fabdd535774 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -20,6 +20,7 @@ let
       });
 
       pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec {
+        name = "${oldAttrs.pname}-${version}";
         version = "0.5.5";
         src = oldAttrs.src.override {
           inherit version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a2fbd1b2fc..f0e44d05849 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10553,6 +10553,7 @@ with pkgs;
   in
     (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: {
       name = "libgap-${oldAttrs.pname}-${version}";
+      inherit version;
       src = fetchurl {
         url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
         sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 233ffaa2f42..1b363736694 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3727,6 +3727,7 @@ in {
 
   sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
     name = "sphinx-1.2.3";
+    version = "1.2.3";
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
       sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";

From f54f5fdaaa29594d163b3193bb00a9a84846ab4b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:50:34 +0100
Subject: [PATCH 0021/2793] treewide: various version number fixes

---
 pkgs/development/python-modules/qutip/default.nix           | 4 ++--
 pkgs/development/python-modules/waitress-django/default.nix | 1 -
 pkgs/tools/system/lshw/default.nix                          | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 4a8460ddfdb..13c24312ed0 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -11,11 +11,11 @@
 }:
 
 buildPythonPackage rec {
-  name = "qutip";
+  pname = "qutip";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "https://qutip.googlecode.com/files/QuTiP-2.2.0.tar.gz";
+    url = "https://qutip.googlecode.com/files/QuTiP-${version}.tar.gz";
     sha256 = "a26a639d74b2754b3a1e329d91300e587e8c399d8a81d8f18a4a74c6d6f02ba3";
   };
 
diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix
index 421995e3792..c230cd9cfa6 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "waitress-django";
   version = "0.0.0";
-  name = pname;
 
   src = ./.;
   pythonPath = [ django_1_8 waitress ];
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index d57b6518975..5711dff5783 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -6,10 +6,10 @@ let numVersion = "02.18"; # :(
 in
 stdenv.mkDerivation rec {
   name = "lshw-${numVersion}b";
-  version = "B.${numVersion}";
+  version = "${numVersion}";
 
   src = fetchurl {
-    url = "https://ezix.org/software/files/lshw-${version}.tar.gz";
+    url = "https://ezix.org/software/files/lshw-B.${version}.tar.gz";
     sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
   };
 

From 0e381e084e1b2f6c6ca9e5d75620a7049ef4947f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:44:40 +0100
Subject: [PATCH 0022/2793] arm-trusted-firmware: correctly handle version
 overrides

---
 pkgs/misc/arm-trusted-firmware/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 868d60d6d32..6bfaa2a2f27 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -6,11 +6,12 @@ let
             , platform
             , extraMakeFlags ? []
             , extraMeta ? {}
+            , version ? "1.5"
             , ... } @ args:
            stdenv.mkDerivation (rec {
 
     name = "arm-trusted-firmware-${platform}-${version}";
-    version = "1.5";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "ARM-software";

From 914392c646c57c4d24baaa3f40ffefe1aaf52445 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:43:47 +0100
Subject: [PATCH 0023/2793] modem-manager: don't define inconsistent pname

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

diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 6ca8c892562..15ec2ef41cd 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "modem-manager-${version}";
-  pname = "ModemManager";
   version = "1.7.990";
 
+  package = "ModemManager";
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
     sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
   };
 

From 1c69e58e61a221aa3f11197f15b3f2cdf5dd08d5 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:38:42 +0100
Subject: [PATCH 0024/2793] treewide: use unstable-date instead of hash as
 version

---
 pkgs/applications/networking/flent/http-getter.nix      | 4 ++--
 pkgs/applications/office/bookworm/default.nix           | 4 +---
 pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 ++--
 pkgs/development/libraries/gsignond/default.nix         | 5 ++---
 pkgs/development/libraries/libsignon-glib/default.nix   | 6 ++----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
index 20557c18c52..63c18d6e092 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -2,8 +2,8 @@
 , curl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "http-getter";
-  version = "20180606";
+  pname = "http-getter";
+  version = "unstable-2018-06-06";
 
   src = fetchFromGitHub {
     owner = "tohojo";
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index bc2f260c703..433281da87b 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -3,9 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bookworm";
-  version = "4f7b118281667d22f1b3205edf0b775341fa49cb";
-
-  name = "${pname}-2018-10-21";
+  version = "unstable-2018-10-21";
 
   src = fetchFromGitHub {
     owner = "babluboy";
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
index 991e9717b80..fbd2950b6d5 100644
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix
@@ -1,9 +1,9 @@
 {stdenv, writeText, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-    name = "hex-registry";
+    pname = "hex-registry";
     rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1";
-    version = "20180712.${rev}";
+    version = "unstable-2018-07-12";
 
     src = fetchFromGitHub {
         inherit rev;
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
index 11dcc2a2ee9..af7aa2b1207 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -6,16 +6,15 @@
 let
 unwrapped = stdenv.mkDerivation rec {
   pname = "gsignond";
-  version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
+  version = "unstable-2018-10-04";
 
-  name = "${pname}-2018-10-04";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchFromGitLab {
     owner = "accounts-sso";
     repo = pname;
-    rev = version;
+    rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
     sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
   };
 
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index 2c0ef60bc63..db2b468bb3a 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsignon-glib";
-  version = "3639a2e90447e4640a03a44972560afe8f61aa48";
-
-  name = "${pname}-2018-10-24";
+  version = "unstable-2018-10-24";
 
   outputs = [ "out" "dev" "devdoc" "py" ];
 
   src = fetchgit {
     url = "https://gitlab.com/accounts-sso/${pname}";
-    rev = version;
+    rev = "3639a2e90447e4640a03a44972560afe8f61aa48";
     fetchSubmodules = true;
     sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
   };

From a3042c92e61e249691779d3e43a31f766ef1cc7b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:37:04 +0100
Subject: [PATCH 0025/2793] salut-a-toi: don't define name and pname as
 incompatible things

---
 .../networking/instant-messengers/salut-a-toi/default.nix    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 987a7aa1be0..13c7281aea7 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -9,12 +9,11 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "salut-a-toi-${version}";
+    pname = "salut-a-toi";
     version = "0.6.1";
-    pname = "sat-${version}";
 
     src = fetchurl {
-      url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
+      url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2";
       sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
     };
 

From 0d7c99481ba46573e83074b7abf0a58a6b58dbaf Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:41:09 +0100
Subject: [PATCH 0026/2793] fetchegg: add version to derivation

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

diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix
index 746af9e2737..d4d33a5593c 100644
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@@ -8,7 +8,7 @@ if md5 != "" then
   throw "fetchegg does not support md5 anymore, please use sha256"
 else
 stdenvNoCC.mkDerivation {
-  name = "chicken-${name}-export";
+  name = "chicken-${name}-export-${version}";
   builder = ./builder.sh;
   nativeBuildInputs = [ chicken ];
 

From 2449bd25950cd552bb96a007bba58f22448f7949 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:46:58 +0100
Subject: [PATCH 0027/2793] hex: correct version handling

---
 pkgs/development/beam-modules/hex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index d0af0b59c9f..7e91153bed5 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -7,13 +7,13 @@ let
   };
 
   pkg = self: stdenv.mkDerivation rec {
-    name = "hex";
-    version = "v0.17.1";
+    pname = "hex";
+    version = "0.17.1";
 
     src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
-        rev = "${version}";
+        rev = "v${version}";
         sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
     };
 

From e2ea0573fc8df1797993efeefcb051d4ff5965e1 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:48:53 +0100
Subject: [PATCH 0028/2793] enhanced-ctorrent: follow versioning guidelines

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

diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix
index 2cfde73a01a..bb3ab98d1a4 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  version = "dnh3.3.2";
-  name = "enhanced-ctorrent";
+  version = "3.3.2";
+  pname = "enhanced-ctorrent-dhn";
 
   src = fetchurl {
     url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz";

From 2224d42e024630647f612a145fbae1fdd66f1f5e Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:49:17 +0100
Subject: [PATCH 0029/2793] metaphone: don't use capital for pname

---
 pkgs/development/python-modules/metaphone/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix
index b72789369f2..c2f5201538f 100644
--- a/pkgs/development/python-modules/metaphone/default.nix
+++ b/pkgs/development/python-modules/metaphone/default.nix
@@ -1,9 +1,8 @@
 { stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
 
 buildPythonPackage rec {
-  pname = "Metaphone";
+  pname = "metaphone";
   version = "0.6";
-  name  = "metaphone-${version}";
 
   src = fetchPypi {
     inherit pname version;

From d2e6608aa520b17a45a39cdfbefd0240bd56b332 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:49:33 +0100
Subject: [PATCH 0030/2793] sphinx: don't use capital for pname

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index e4e9bfaba1c..59fd7465be3 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -25,7 +25,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "Sphinx";
+  pname = "sphinx";
   version = "1.7.9";
   src = fetchPypi {
     inherit pname version;

From 1e99582eaff5605947b8e9cdef7d440df8cf7ba3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:26:05 +0100
Subject: [PATCH 0031/2793] treewide: for substituteAll: s/version/version_/

This is because it gets passed to mkDerivation through some route, this ensures
that doesn't mess with anything
---
 pkgs/development/python-modules/py3exiv2/default.nix | 2 +-
 pkgs/development/python-modules/py3exiv2/setup.patch | 6 +++---
 pkgs/misc/drivers/hplip/3.16.11.nix                  | 2 +-
 pkgs/misc/drivers/hplip/default.nix                  | 2 +-
 pkgs/misc/drivers/hplip/hplip.state                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index 4c6ca0bad33..647fbdd872c 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./setup.patch;
-      version = "3${stdenv.lib.versions.minor python.version}";
+      version_ = "3${stdenv.lib.versions.minor python.version}";
     })
   ];
 
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index 8b0619c5bc5..784533105d6 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -3,9 +3,9 @@
 @@ -39,7 +39,7 @@
                  if '3' in l[2:]:
                      return l.replace('libboost', 'boost')
- 
+
 -libboost = get_libboost_name()
-+libboost = 'boost_python@version@'
- 
++libboost = 'boost_python@version_@'
+
  setup(
      name='py3exiv2',
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 8982834d9a9..0c6ff464a62 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -23,7 +23,7 @@ let
   };
 
   hplipState = substituteAll {
-    inherit version;
+    version_ = version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index f03d75dfa02..e2c34473e54 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -25,7 +25,7 @@ let
   };
 
   hplipState = substituteAll {
-    inherit version;
+    version_ = version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state
index 9d19a93f364..3c7c2eb2df7 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/pkgs/misc/drivers/hplip/hplip.state
@@ -1,4 +1,4 @@
 [plugin]
 installed=1
 eula=1
-version=@version@
+version=@version_@

From cef08f162e7dfd82858721c0d9579c36a1dee453 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 5 Nov 2018 19:05:09 +0100
Subject: [PATCH 0032/2793] remmina: use pname instead of name

Co-Authored-By: Synthetica9 <git@hilhorst.be>
---
 pkgs/applications/networking/remote/remmina/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index dc17ccc4a37..af2eece37df 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "remmina-${version}";
+  pname = "remmina";
   version = "1.2.32";
 
   src = fetchFromGitLab {

From c63d3530ef68c0b757f1c79af73d02516ba6b0d2 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 17:38:20 +0100
Subject: [PATCH 0033/2793] vcv-rack, opkowa: pname-version fixes

---
 pkgs/applications/audio/vcv-rack/default.nix | 5 +++--
 pkgs/misc/drivers/epkowa/default.nix         | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 74e041868db..27533084804 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -3,8 +3,9 @@
 , libzip, rtaudio, rtmidi, speex }:
 
 let
-  glfw-git = glfw.overrideAttrs (oldAttrs: {
-    name = "glfw-git-20180529";
+  glfw-git = glfw.overrideAttrs (oldAttrs: rec {
+    name = "glfw-git-${version}";
+    version = "unstable-2018-05-29";
     src = fetchFromGitHub {
       owner = "glfw";
       repo = "glfw";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 3359f9e94ac..643977d829d 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -26,7 +26,7 @@ in
 
 let plugins = {
   x770 =   stdenv.mkDerivation rec {
-    name = "iscan-gt-x770-bundle";
+    pname = "iscan-gt-x770-bundle";
     version = "1.0.1";
     pluginVersion = "2.1.2-1";
 
@@ -58,7 +58,7 @@ let plugins = {
     meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; };
     };
   f720 = stdenv.mkDerivation rec {
-    name = "iscan-gt-f720-bundle";
+    pname = "iscan-gt-f720-bundle";
     version = "1.0.1";
     pluginVersion = "0.1.1-2";
 

From 43192446d928f69e89fe5cb95ef7b2b060ba5e01 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 5 Nov 2018 00:35:53 +0100
Subject: [PATCH 0034/2793] oneko: switch around version and vname

Co-Authored-By: Synthetica9 <git@hilhorst.be>
---
 pkgs/applications/misc/oneko/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index e1cc70e4277..76df2a264e2 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.sakura.5";
-  vname = "1.2.5";
-  name = "oneko-${vname}";
+  version_name = "1.2.sakura.5";
+  version = "1.2.5";
+  name = "oneko-${version}";
   src = fetchurl {
-    url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
+    url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
   };
   buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];

From b6f86df64a7ff03a98538863542fc14cae3e0be9 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 6 Nov 2018 00:27:41 +0100
Subject: [PATCH 0035/2793] bookworm: fix rev

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

diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index 433281da87b..b767f7d3b1d 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babluboy";
     repo = pname;
-    rev = version;
+    rev = "4f7b118281667d22f1b3205edf0b775341fa49cb";
     sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
   };
 

From ace631b616feed0bad3f3a14b87abe581ef74597 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 6 Nov 2018 15:59:38 +0100
Subject: [PATCH 0036/2793] gnupg22: 2.2.10 -> 2.2.11

See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.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 06a06f5721c..08dc6888980 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.10";
+  version = "2.2.11";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "05f9804g72pffdxgvxjmjzkfcpjg1x221g9rwcr8fi51hrxd77br";
+    sha256 = "1ncwqjhcxh46fgkp84g2lhf91amcha7abk6wdm1kagzm7q93wv29";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f485b2e71f73d91895306b9e5ca6aa5e44735e0a Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Tue, 6 Nov 2018 22:43:28 -0800
Subject: [PATCH 0037/2793] ncurses: upgrade from 6.1 -> 6.1-20181027

This includes fixes for CVE-2018-10754.

While we're changing things, also set the `--with-manpage-format=normal`
configure flag, which prevents the `configure` script from looking in
/usr to determine whether to compress manpages. This was already the
format on NixOS (where these directories don't exist), but making this
explicit makes the build more reproducible on other distros.
---
 pkgs/development/libraries/ncurses/default.nix  | 14 ++++++++------
 pkgs/development/libraries/ncurses/st-0.7.patch | 13 -------------
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/ncurses/st-0.7.patch

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6293efcca8b..77de18de2b0 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -12,17 +12,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "6.1";
+  version = "6.1-20181027";
   name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
 
   src = fetchurl {
-    url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
-    sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
+    urls = [
+      "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
+      "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
+    ];
+    sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902";
   };
 
-  # The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future.
-  # It is necessary for the 6.1 version of ncurses.
-  patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch;
+  patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
 
   outputs = [ "out" "dev" "man" ];
   setOutputFlags = false; # some aren't supported
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
     "--without-debug"
     "--enable-pc-files"
     "--enable-symlinks"
+    "--with-manpage-format=normal"
   ] ++ lib.optional unicode "--enable-widec"
     ++ lib.optional (!withCxx) "--without-cxx"
     ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
diff --git a/pkgs/development/libraries/ncurses/st-0.7.patch b/pkgs/development/libraries/ncurses/st-0.7.patch
deleted file mode 100644
index 956f9b68d68..00000000000
--- a/pkgs/development/libraries/ncurses/st-0.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/misc/terminfo.src b/misc/terminfo.src
-index 84f4810..ac300a7 100644
---- a/misc/terminfo.src
-+++ b/misc/terminfo.src
-@@ -6260,7 +6260,7 @@ st-0.7|simpleterm 0.7,
- 	     %=%t3%e%p1%d%;m,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- 	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
--	Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
-+	Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
- 	kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
- 	kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
- 	kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,

From d32f51c618471104e3363a2e99c12334d8ed6691 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 18:35:16 +0000
Subject: [PATCH 0038/2793] cc-wrapper, bintools-wrapper: simply symlink man
 and info outputs

With the previous commit `propagateDoc` is now always given the correct value
(i.e. it is never set to `true` when there are no `man` and `info` outputs).
Hence, we can simply symlink the original outputs to the wrapper outputs.

Pros:

- simpler, less indirection compared to `propagated-user-env-packages`,
- uses less inodes (1 symlink, which nix then simply automatically resolves
  and removes, vs. two directories and a file),
- makes direct references like "export MANPATH=${stdenv.cc.man}/share/man"
  simply work.

Cons:

- I'm not aware of any.

This and the previous commit together almost completely revert commits
fde7296a4749efadbeb8b608b7b4cc01c3a6e6d7,
fa412972091538376d1d4ffd446803b5d9385cbb, and
c981787db951afb11c1328461df82d4277ebec07.
---
 pkgs/build-support/bintools-wrapper/default.nix | 5 ++---
 pkgs/build-support/cc-wrapper/default.nix       | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index f9ca245beea..813ef620e3e 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -268,9 +268,8 @@ stdenv.mkDerivation {
       ## Man page and info support
       ##
 
-      mkdir -p $man/nix-support $info/nix-support
-      echo ${bintools.man or ""} >> $man/nix-support/propagated-user-env-packages
-      echo ${bintools.info or ""} >> $info/nix-support/propagated-user-env-packages
+      ln -s ${bintools.man} $man
+      ln -s ${bintools.info} $info
     ''
 
     + ''
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e59758371a3..4a8c95175be 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -263,9 +263,8 @@ stdenv.mkDerivation {
       ## Man page and info support
       ##
 
-      mkdir -p $man/nix-support $info/nix-support
-      printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
-      printWords ${cc.info or ""}  > $info/nix-support/propagated-user-env-packages
+      ln -s ${cc.man} $man
+      ln -s ${cc.info} $info
     ''
 
     + ''

From 3137c609a486f00a101b54123894c413b7b28090 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Tue, 6 Nov 2018 23:14:20 -0800
Subject: [PATCH 0039/2793] libtiff: 4.0.9 -> 2018-11-04

This includes a bunch of security fixes (#49786), and mimics what Debian
has done in moving to a git snapshot instead of a released version +
backported security patches.
---
 .../development/libraries/libtiff/default.nix | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index bf0393fd89a..4176bb9555f 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,36 +1,38 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv
+, fetchFromGitLab
+
+, pkgconfig
+, autogen
+, autoconf
+, automake
+, libtool
+
+, zlib
+, libjpeg
+, xz
+}:
 
-let
-  version = "4.0.9";
-in
 stdenv.mkDerivation rec {
-  name = "libtiff-${version}";
+  version = "2018-11-04";
+  name = "libtiff-unstable-${version}";
 
-  src = fetchurl {
-    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
-    sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
+  src = fetchFromGitLab {
+    owner = "libtiff";
+    repo = "libtiff";
+    rev = "779e54ca32b09155c10d398227a70038de399d7d";
+    sha256 = "029fmn0rdmb5gxhg83ff9j2zx3qk6wsiaiv554jq26pdc23achsp";
   };
 
-  prePatch = let
-      debian = fetchurl {
-        # When the URL disappears, it typically means that Debian has new patches
-        # (probably security) and updating to new tarball will apply them as well.
-        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
-        sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
-      };
-    in ''
-      tar xf ${debian}
-      patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
-    '';
-
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autogen autoconf automake libtool ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
   enableParallelBuilding = true;
 
+  preConfigure = "./autogen.sh";
+
   doCheck = true; # not cross;
 
   meta = with stdenv.lib; {

From 4b0d441cc4db398222efc17973386ea0fe897a41 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 30 Oct 2018 14:56:23 +0100
Subject: [PATCH 0040/2793] rustc: build with system llvm and jemalloc

Just like fedora does: https://src.fedoraproject.org/rpms/rust/blob/master/f/rust.spec

Also some cleanup of tests which were removed but no longer exist.
---
 pkgs/development/compilers/rust/default.nix |  2 +-
 pkgs/development/compilers/rust/rustc.nix   | 54 +++++++++------------
 pkgs/top-level/all-packages.nix             |  1 +
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a925127596d..9e697155f96 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -29,7 +29,7 @@ in rec {
       ./patches/disable-test-inherit-env.patch
     ];
 
-    forceBundledLLVM = true;
+    withBundledLLVM = false;
 
     configureFlags = [ "--release-channel=stable" ];
 
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index decf14a3294..48710753d80 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,9 +1,9 @@
-{ stdenv, targetPackages
+{ stdenv, targetPackages, removeReferencesTo
 , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
 , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
 , which, libffi, gdb
 , version
-, forceBundledLLVM ? false
+, withBundledLLVM ? false
 , src
 , configureFlags ? []
 , patches
@@ -40,7 +40,10 @@ stdenv.mkDerivation {
   # See https://github.com/NixOS/nixpkgs/pull/34227
   stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
 
-  NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+  NIX_LDFLAGS =
+       # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
+       optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
+    ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
 
   # Enable nightly features in stable compiles (used for
   # bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
@@ -54,13 +57,12 @@ stdenv.mkDerivation {
   # We need rust to build rust. If we don't provide it, configure will try to download it.
   # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
   configureFlags = configureFlags
-                ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
-                ++ [ "--enable-vendor" ]
-                # ++ [ "--jemalloc-root=${jemalloc}/lib"
-                ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
-                ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
-                ++ optional (targets != []) "--target=${target}"
-                ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
+                ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
+                     "--enable-vendor"
+                     "--jemalloc-root=${jemalloc}/lib"
+                     "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
+                ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
+                ++ optional (targets != []) "--target=${target}";
 
   # The bootstrap.py will generated a Makefile that then executes the build.
   # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
@@ -79,29 +81,13 @@ stdenv.mkDerivation {
   postPatch = ''
     patchShebangs src/etc
 
-    # Fix dynamic linking against llvm
-    #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
+    ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
+    rm -rf src/jemalloc
 
     # Fix the configure script to not require curl as we won't use it
     sed -i configure \
       -e '/probe_need CFG_CURL curl/d'
 
-    # Fix the use of jemalloc prefixes which our jemalloc doesn't have
-    # TODO: reenable if we can figure out how to get our jemalloc to work
-    #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
-    #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
-
-    # Disable fragile tests.
-    rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
-    rm -vr src/test/run-make-fulldeps/issue-26092 || true
-
-    # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
-    rm -vr src/test/ui/run-pass/issue-36023.rs || true
-
-    # Disable test getting stuck on hydra - possible fix:
-    # https://reviews.llvm.org/rL281650
-    rm -vr src/test/ui/run-pass/issue-36474.rs || true
-
     # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
     sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
 
@@ -137,14 +123,14 @@ stdenv.mkDerivation {
   # ps is needed for one of the test cases
   nativeBuildInputs =
     [ file python2 ps rustPlatform.rust.rustc git cmake
-      which libffi
+      which libffi removeReferencesTo
     ]
     # Only needed for the debuginfo tests
     ++ optional (!stdenv.isDarwin) gdb;
 
-  buildInputs = [ ncurses ] ++ targetToolchains
+  buildInputs = targetToolchains
     ++ optional stdenv.isDarwin Security
-    ++ optional (!forceBundledLLVM) llvmShared;
+    ++ optional (!withBundledLLVM) llvmShared;
 
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
@@ -165,6 +151,12 @@ stdenv.mkDerivation {
 
   inherit doCheck;
 
+  # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
+  # and thus a transitive dependency on ncurses
+  postInstall = ''
+    find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
+  '';
+
   configurePlatforms = [];
 
   # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e44d05849..827e8718f0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7324,6 +7324,7 @@ with pkgs;
   # For beta and nightly releases use the nixpkgs-mozilla overlay
   rust = callPackage ../development/compilers/rust ({
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+    llvm = llvm_7;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });

From 973eca740bec22df9760f9db9e1e66f3e5f6c164 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 8 Nov 2018 12:58:56 +0100
Subject: [PATCH 0041/2793] rustc: fix build with unbundled jemalloc and llvm
 on darwin

jemalloc with stripped prefix would cause segfaults in free:
https://github.com/NixOS/nixpkgs/pull/49557#issuecomment-436734677

Thanks to @danieldk for darwin testing/debugging.
---
 pkgs/development/compilers/rust/rustc.nix     |  5 ++++-
 .../development/libraries/jemalloc/common.nix | 19 ++++++++++++-------
 .../libraries/jemalloc/default.nix            |  2 --
 .../libraries/jemalloc/jemalloc450.nix        |  4 +---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 48710753d80..3ec08a82d01 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -20,6 +20,8 @@ let
 
   llvmShared = llvm.override { enableSharedLibraries = true; };
 
+  prefixedJemalloc = jemalloc.override { stripPrefix = false; };
+
   target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
 in
 
@@ -43,6 +45,7 @@ stdenv.mkDerivation {
   NIX_LDFLAGS =
        # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
        optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
+    ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
     ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
 
   # Enable nightly features in stable compiles (used for
@@ -59,7 +62,7 @@ stdenv.mkDerivation {
   configureFlags = configureFlags
                 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
                      "--enable-vendor"
-                     "--jemalloc-root=${jemalloc}/lib"
+                     "--jemalloc-root=${prefixedJemalloc}/lib"
                      "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
                 ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
                 ++ optional (targets != []) "--target=${target}";
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index 593f4411f19..5ac1067d92f 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,6 +1,13 @@
-{ stdenv, fetchurl, version, sha256, ... }@args:
+{ version, sha256 }:
+{ stdenv, fetchurl,
+# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
+# then stops downstream builds (mariadb in particular) from detecting it. This
+# option should remove the prefix and give us a working jemalloc.
+# Causes segfaults with some software (ex. rustc), but defaults to true for backward
+# compatibility. Ignored on non OSX.
+stripPrefix ? true }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "jemalloc-${version}";
   inherit version;
 
@@ -9,10 +16,8 @@ stdenv.mkDerivation (rec {
     inherit sha256;
   };
 
-  # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
-  # then stops downstream builds (mariadb in particular) from detecting it. This
-  # option should remove the prefix and give us a working jemalloc.
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
+  # see the comment on stripPrefix
+  configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix=";
   doCheck = true;
 
   enableParallelBuilding = true;
@@ -28,4 +33,4 @@ stdenv.mkDerivation (rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
-} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))
+}
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 8cb7c1f9673..7ea7bccd6b8 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
 import ./common.nix {
-  inherit stdenv fetchurl;
   version = "5.1.0";
   sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
 }
diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix
index 00b38a85553..d328ab8016a 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl }:
 import ./common.nix {
-  inherit stdenv fetchurl;
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-}
+} 

From 0266996a8db7cc41c7951fda993fe8eb7c386695 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Thu, 8 Nov 2018 17:53:29 +0100
Subject: [PATCH 0042/2793] agda: use writeShellScriptbin instead of
 writeScriptBin

This adds the shell shebang to the wrapper script. Without this,
emacs and in particular agda2-mode (but probably other applications as
well) return a format error when trying to execute agda.
---
 pkgs/build-support/agda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 8a871cfeb51..356fd058cac 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -3,7 +3,7 @@
 # Contact: stdenv.lib.maintainers.fuuzetsu
 
 { stdenv, Agda, glibcLocales
-, writeScriptBin
+, writeShellScriptBin
 , extension ? (self: super: {})
 }:
 
@@ -77,7 +77,7 @@ let
         buildInputs = let
           # Makes a wrapper available to the user. Very useful in
           # nix-shell where all dependencies are -i'd.
-          agdaWrapper = writeScriptBin "agda" ''
+          agdaWrapper = writeShellScriptBin "agda" ''
             ${self.agdaWithArgs} "$@"
           '';
         in [agdaWrapper] ++ self.buildDepends;

From d836c6ad5727872d20b53b4519398a7690a02512 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 21:02:31 -0700
Subject: [PATCH 0043/2793] libopus: 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/libopus/versions
---
 pkgs/development/libraries/libopus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 135f1caf97e..30fa7d749a1 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -2,14 +2,14 @@
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
-  version = "1.2.1";
+  version = "1.3";
 in
 stdenv.mkDerivation rec {
   name = "libopus-${version}";
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
-    sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg";
+    sha256 = "0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag";
   };
 
   outputs = [ "out" "dev" ];

From 5d37d633880a167b5deb0efc10161b0e45af1a15 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:26:17 +0100
Subject: [PATCH 0044/2793] postgresql_9_3: 9.3.24 -> 9.3.25

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index f8bf08b55b7..518b0c2fbba 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -100,9 +100,9 @@ let
 in {
 
   postgresql_9_3 = common {
-    version = "9.3.24";
+    version = "9.3.25";
     psqlSchema = "9.3";
-    sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542";
+    sha256 = "1nxn0hjrg4y5v5n2jgzrbicgv4504r2yfjyk6g6rq0sx8603x5g4";
   };
 
   postgresql_9_4 = common {

From 882c3b529c3c1253617e533a2dbec721276afc94 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:27:21 +0100
Subject: [PATCH 0045/2793] postgresql_9_4: 9.4.19 -> 9.4.20

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 518b0c2fbba..a1c7beae8b5 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -106,9 +106,9 @@ in {
   };
 
   postgresql_9_4 = common {
-    version = "9.4.19";
+    version = "9.4.20";
     psqlSchema = "9.4";
-    sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3";
+    sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf";
   };
 
   postgresql_9_5 = common {

From f703ea62a0ab7a9dd568a632dff90e1094556065 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:27:55 +0100
Subject: [PATCH 0046/2793] postgresql_9_5: 9.5.14 -> 9.5.15

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a1c7beae8b5..4e1dc6cd59d 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -112,9 +112,9 @@ in {
   };
 
   postgresql_9_5 = common {
-    version = "9.5.14";
+    version = "9.5.15";
     psqlSchema = "9.5";
-    sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y";
+    sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
   };
 
   postgresql_9_6 = common {

From 1670fd115d958b59fc2f8dfa369583d4b6b65a70 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:30:06 +0100
Subject: [PATCH 0047/2793] postgresql_9_6: 9.6.10 -> 9.6.11

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 4e1dc6cd59d..1fe5ac81999 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -118,9 +118,9 @@ in {
   };
 
   postgresql_9_6 = common {
-    version = "9.6.10";
+    version = "9.6.11";
     psqlSchema = "9.6";
-    sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6";
+    sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
   };
 
   postgresql_10 = common {

From 575151eb08eb92e6382892466823417958651951 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:30:43 +0100
Subject: [PATCH 0048/2793] postgresql_10: 10.5 -> 10.6

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 1fe5ac81999..7f9ccff10e2 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -124,9 +124,9 @@ in {
   };
 
   postgresql_10 = common {
-    version = "10.5";
+    version = "10.6";
     psqlSchema = "10.0";
-    sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
+    sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
   };
 
   postgresql_11 = common {

From 3cbc20e8c408328afa1ff05a46679a2abbe417e3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Nov 2018 15:31:13 +0100
Subject: [PATCH 0049/2793] postgresql_11: 11.0 -> 11.1

See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7f9ccff10e2..ee302b48ee4 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -130,9 +130,9 @@ in {
   };
 
   postgresql_11 = common {
-    version = "11.0";
+    version = "11.1";
     psqlSchema = "11.0";
-    sha256 = "0szk9ssfych1wlpyqxz3z6dllg1l6m5labpii8c2r463s01vm6xz";
+    sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
   };
 
 }

From a4f94bda1af05ab7b959841e5d11857aac3d7187 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sat, 3 Nov 2018 10:37:07 +0100
Subject: [PATCH 0050/2793] pythonPackages.prettytable: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 2ab92217144..d5a917e03ce 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "599bc5b4b9602e28294cf795733c889c26dd934aa7e0ee9cff9b905d4fbad188";
+    sha256 = "1ndckiniasacfqcdafzs04plskrcigk7vxprr2y34jmpkpf60m1d";
   };
 
   buildInputs = [ glibcLocales ];

From 31e7c15a708e9c009a19f6a802a9b7b3375dfb16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 05:22:37 -0800
Subject: [PATCH 0051/2793] nasm: 2.13.03 -> 2.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/nasm/versions
---
 pkgs/development/compilers/nasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index b95f6e5ee95..271d26eda1c 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nasm-${version}";
-  version = "2.13.03";
+  version = "2.14";
 
   src = fetchurl {
     url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
-    sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
+    sha256 = "0i678zbm1ljn5jwia7gj1n503izwvzlh55xzm4i0qgfmr8kzsg6l";
   };
 
   nativeBuildInputs = [ perl ];

From 934e4894019904d7f65bb510aba06eeffa913854 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Nov 2018 09:54:28 +0000
Subject: [PATCH 0052/2793] rust: 1.30.0 -> 1.30.1

---
 pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++--------
 pkgs/development/compilers/rust/default.nix   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index e738dd7acae..4f16912a86b 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.29.2";
+  version = "1.30.0";
 
-  # fetch hashes by running `print-hashes.sh 1.29.2`
+  # fetch hashes by running `print-hashes.sh 1.30.0`
   hashes = {
-    i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
-    x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
-    armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
-    aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
-    i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
-    x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
+    i686-unknown-linux-gnu = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21";
+    x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f";
+    armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd";
+    aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e";
+    i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230";
+    x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a925127596d..24f51025fb9 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -7,11 +7,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.30.0";
+  version = "1.30.1";
   cargoVersion = "1.30.0";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
+    sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
   };
 in rec {
   rustc = callPackage ./rustc.nix {

From 1699401625819acd2864374b9e2a7c55d25947be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 09:46:07 -0800
Subject: [PATCH 0053/2793] libuv: 1.23.1 -> 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/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 68c35c49ef3..4fed33a4d35 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.1";
+  version = "1.23.2";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
+    sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7";
   };
 
   patches = [

From a94dfe9204534f13b293fbad8fb1b7b7208ab98f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 12:38:24 -0800
Subject: [PATCH 0054/2793] libmicrohttpd: 0.9.59 -> 0.9.60

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 041e0d98d65..4462fca7b64 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmicrohttpd-${version}";
-  version = "0.9.59";
+  version = "0.9.60";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v";
+    sha256 = "0wf457bqbdvx53clk4dg2620p83vk4757l7lrpvmxrd9jlzms3nd";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];

From a7e2c580bf00f8b19a7f11d85c7f06f9fec132c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 12:49:26 -0800
Subject: [PATCH 0055/2793] libevdev: 1.5.9 -> 1.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/libevdev/versions
---
 pkgs/development/libraries/libevdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 2ef1d3965ce..7998655e46b 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.5.9";
+  name = "libevdev-1.6.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1";
+    sha256 = "057qdrwbhql2lvr4kxljk3yqjsmh65hyrfbr2b681nc7b635q07m";
   };
 
   buildInputs = [ python ];

From 3a6a4c8dab00d7006166247ce54e39ad8a017c44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 13:56:32 -0800
Subject: [PATCH 0056/2793] kexectools: 2.0.17 -> 2.0.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/kexec-tools/versions
---
 pkgs/os-specific/linux/kexectools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 069bd17c483..591243b1ca4 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.17";
+  version = "2.0.18";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "1ac20jws8iys9w6dpn4q3hihyx73zkabdwv3gcb779cxfrmq2k2h";
+    sha256 = "0f5jnb0470nmxyl1cz2687hqjr8cwqniqc1ycq9bazlp85rz087h";
   };
 
   hardeningDisable = [ "format" "pic" "relro" ];

From ea6d48d4be923c0daf68e414b7173aafd57ac8d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 16:32:58 -0800
Subject: [PATCH 0057/2793] help2man: 1.47.7 -> 1.47.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/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 311b206fa91..b473aec859e 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.7";
+  name = "help2man-1.47.8";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "03gckfr2980qn319c02vflq7d75vq2qdkxrw80kb9g84xn48wnsq";
+    sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj";
   };
 
   nativeBuildInputs = [ gettext LocaleGettext ];

From cc1bcd73dfd92c0aab64871445419279c34ebdef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 19:41:12 -0800
Subject: [PATCH 0058/2793] gnu-efi: 3.0.8 -> 3.0.9 (#50097)

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

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 1f8a518d69e..036863c9c0b 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnu-efi-${version}";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
-    sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n";
+    sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
   };
 
   buildInputs = [ pciutils ];

From e6985dba46544dc15e6c997f13cbf31f5be9b905 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 21:03:30 -0800
Subject: [PATCH 0059/2793] gdbm: 1.18 -> 1.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/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 8d88dc04924..ca4c0bc744b 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.18";
-  # FIXME: remove on update to > 1.18
+  name = "gdbm-1.18.1";
+  # FIXME: remove on update to > 1.18.1
   NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
+    sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
   };
 
   doCheck = true; # not cross;

From 058e787beaac05b8b4e1a7883ea9bbafb0953797 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Nov 2018 22:02:16 -0800
Subject: [PATCH 0060/2793] fluidsynth: 1.1.11 -> 2.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/fluidsynth/versions
---
 pkgs/applications/audio/fluidsynth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index b3b838c5d47..33ac7218778 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
-  version = "1.1.11";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "FluidSynth";
     repo = "fluidsynth";
     rev = "v${version}";
-    sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
+    sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];

From 904ae0b116b40dbb248ca0a62e5cd0e56c0d29d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 10 Nov 2018 03:18:29 -0800
Subject: [PATCH 0061/2793] dnsmasq: 2.79 -> 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/dnsmasq/versions
---
 pkgs/tools/networking/dnsmasq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 9adb95d1d3f..315e12cc155 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -12,11 +12,11 @@ let
   ]);
 in
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.79";
+  name = "dnsmasq-2.80";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq";
+    sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd";
   };
 
   preBuild = ''

From acf75db44c6ff017528cc6ba7997145c07ea4fd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 10 Nov 2018 06:37:11 -0800
Subject: [PATCH 0062/2793] ethtool: 4.18 -> 4.19 (#50117)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ethtool/versions
---
 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 105733e0033..5bca02037c7 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.18";
+  version = "4.19";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "0461nwqp1z9a89nmxf7kq0r4jfl9c7fg55c71lfmc5y0siaqb54h";
+    sha256 = "1j6hyr809af2m3gqm11hdfwks5kljqy1ikspq3d9rhj29qv6r2mi";
   };
 
   meta = with stdenv.lib; {

From 8e24ea925b30dff43ca8350f447630fbd9163c95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 10 Nov 2018 08:43:41 -0800
Subject: [PATCH 0063/2793] apacheHttpd: 2.4.35 -> 2.4.37

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 b4b4cf49592..bf82e916590 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.35";
+  version = "2.4.37";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6";
+    sha256 = "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l";
   };
 
   # FIXME: -dev depends on -doc

From 734bd4ca5421093773f61ea8f9f4972a973b64bf Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 10 Nov 2018 15:46:04 +0100
Subject: [PATCH 0064/2793] go_1_11: 1.11 -> 1.11.2f

fixes #50180
---
 pkgs/development/compilers/go/1.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index f58e0801030..cab739b9028 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -22,13 +22,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.11";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q";
+    sha256 = "0pk7pxfm3ij2ksdrg49jz501fr1d103zr4mjjwv821if9g279jc9";
   };
 
   GOCACHE = "off";

From 728d2a2ac707d064b1eca8c393746c4ea3e272c2 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 9 Nov 2018 17:09:56 -0500
Subject: [PATCH 0065/2793] vscode-extensions.ms-vscode.cpptools: 0.19.0 ->
 0.20.1

---
 pkgs/misc/vscode-extensions/cpptools/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 539d03d66fe..06f86582d53 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -34,8 +34,9 @@ let
     name = "cpptools-language-component-binaries";
 
     src = fetchzip {
-      url = "https://download.visualstudio.microsoft.com/download/pr/e8bc2ccc-bb10-4d40-8e29-edcd78986e9a/2e86fa29aefdbde2ea2cd1a6fceadeaa/bin_linux.zip";
-      sha256 = "1hvrbp3c4733aryslgyh3l5azmqkw398j2wbgr3w788fphg4v6cc";
+      # Follow https://go.microsoft.com/fwlink/?linkid=2037608
+      url = "https://download.visualstudio.microsoft.com/download/pr/97ed3eeb-b31e-421c-92dc-4f3a98af301e/069a1e6ab1b4b017853a7e9e08067744/bin_linux.zip";
+      sha256 = "19flm4vcrg89x0b20bd0g45apabzfqgvcpjddnmyk312jc242gmb";
     };
 
     patchPhase = ''
@@ -67,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.19.0";
-    sha256 = "1x97mz859bzr4gxy6cnqgd8qmvnrjn9zdxh457slsxsk4wqcfmgj";
+    version = "0.20.1";
+    sha256 = "1gmnkrn26n57vx2nm5hhalkkl2irak38m2lklgja0bi10jb6y08l";
   };
 
   buildInputs = [

From a3488fb9acf9d9648db3eca4dbf5cf63354fd78b Mon Sep 17 00:00:00 2001
From: Michael Eden <themichaeleden@gmail.com>
Date: Sun, 11 Nov 2018 10:32:09 -0500
Subject: [PATCH 0066/2793] fix FHSUserEnv blacklists

---
 pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
index 7e49e9e78d7..0e9e36bc301 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", NULL};
+const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", "lib", "lib64", "lib32", "sbin", NULL};
 
 void bind_mount(const gchar *source, const gchar *target) {
   fail_if(g_mkdir(target, 0755));

From 9531a32b6074fe25728b7466831e9007870ac1eb Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Sun, 11 Nov 2018 09:55:55 -0800
Subject: [PATCH 0067/2793] make-wrapper should use runtimeShell, not bash, for
 cross-compilation

---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +-
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 5d5ddcaa8d7..bc12be0fa36 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -40,7 +40,7 @@ makeWrapper() {
 
     mkdir -p "$(dirname "$wrapper")"
 
-    echo "#! $SHELL -e" > "$wrapper"
+    echo "#! @shell@ -e" > "$wrapper"
 
     params=("$@")
     for ((n = 2; n < ${#params[*]}; n += 1)); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfddbd965d1..1491d62c5a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -356,7 +356,7 @@ with pkgs;
       inherit contents compressor prepend;
     };
 
-  makeWrapper = makeSetupHook { deps = [ dieHook ]; }
+  makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; }
                               ../build-support/setup-hooks/make-wrapper.sh;
 
   makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }:

From 08d98b2e3814e5c6b4832f335897d482db6d361d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 13 Nov 2018 01:13:00 +0000
Subject: [PATCH 0068/2793] linux: enable CGROUP_HUGETLB, CGROUP_PERF,
 CGROUP_RDMA (#50225)

These options were added in:

NAMESPACES 2.6.25
CGROUP_DEVICE 2.6.26
CGROUP_HUGETLB 3.6
CGROUP_PERF 2.6.39
CGROUP_RDMA 4.11
---
 pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 27a615d7bb9..b94e34c8f6c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -370,9 +370,12 @@ let
     };
 
     container = {
-      NAMESPACES     = option yes; #  Required by 'unshare' used by 'nixos-install'
+      NAMESPACES     = yes; #  Required by 'unshare' used by 'nixos-install'
       RT_GROUP_SCHED = no;
-      CGROUP_DEVICE  = option yes;
+      CGROUP_DEVICE  = yes;
+      CGROUP_HUGETLB = yes;
+      CGROUP_PERF    = yes;
+      CGROUP_RDMA    = whenAtLeast "4.11" yes;
 
       MEMCG                    = yes;
       MEMCG_SWAP               = yes;

From 76c956be5cecfc73423d767d9243d159d7b83508 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 10 Nov 2018 13:49:36 -0600
Subject: [PATCH 0069/2793] treewide: disable pie in more places
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some packages don’t work correctly with pie. Here I disable it for:

- busybox
- linux kernel
- kexectools

I also get rid of the Musl conditional for disabling pie in GCC and
Binutils. Some day we might want to enable PIE without Musl and it
will be useful to have the *just* work with our compiler and linkers.
---
 pkgs/development/compilers/gcc/4.8/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix      | 2 +-
 pkgs/development/compilers/gcc/5/default.nix        | 2 +-
 pkgs/development/compilers/gcc/6/default.nix        | 2 +-
 pkgs/development/compilers/gcc/7/default.nix        | 2 +-
 pkgs/development/compilers/gcc/8/default.nix        | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 2 +-
 pkgs/development/tools/misc/binutils/default.nix    | 2 +-
 pkgs/os-specific/linux/busybox/default.nix          | 3 ++-
 pkgs/os-specific/linux/kernel/manual-config.nix     | 2 +-
 pkgs/os-specific/linux/kexectools/default.nix       | 2 +-
 11 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index bcb724fd58c..a7a8011b2e6 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   outputs = [ "out" "lib" "man" "info" ];
   setOutputFlags = false;
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 13ff4165a41..a3ba03f517a 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -185,7 +185,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   outputs = if langJava || langGo then ["out" "man" "info"]
     else [ "out" "lib" "man" "info" ];
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index a30cd6bbda9..95e3d7b8492 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -178,7 +178,7 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 372a7065f2d..ff48e485a9a 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -178,7 +178,7 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 094c26cbf69..9235908f14c 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 1335666c54c..363694dcf4e 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index c18189cd949..586fb2b44e1 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "pie" ];
 
   postPatch =
     if targetPlatform != hostPlatform || stdenv.cc.libc != null then
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 54f9b5e4031..2d2884eda3e 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
     then "-Wno-string-plus-int -Wno-deprecated-declarations"
     else "-static-libgcc";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" "pie" ];
 
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
   configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 71ad6203e32..5f4efe943ca 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
     sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p";
   };
 
-  hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
+  hardeningDisable = [ "format" "pie" ]
+    ++ lib.optionals enableStatic [ "fortify" ];
 
   patches = [
     ./busybox-in-store.patch
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 1d280647c5a..0ce6ed769a3 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -269,7 +269,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
       ++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ]
       ;
 
-  hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
+  hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
 
   # Absolute paths for compilers avoid any PATH-clobbering issues.
   makeFlags = commonMakeFlags ++ [
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 069bd17c483..b78286a902b 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ac20jws8iys9w6dpn4q3hihyx73zkabdwv3gcb779cxfrmq2k2h";
   };
 
-  hardeningDisable = [ "format" "pic" "relro" ];
+  hardeningDisable = [ "format" "pic" "relro" "pie" ];
 
   configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ];
   nativeBuildInputs = [ buildPackages.stdenv.cc ];

From 340dd80175ed4d29b9d30bec17daf5a5cd8c59e5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Sep 2018 19:28:49 +0200
Subject: [PATCH 0070/2793] =?UTF-8?q?meson:=200.46.1=20=E2=86=92=200.48.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meson/allow-dirs-outside-of-prefix.patch  |  4 ++--
 .../tools/build-managers/meson/default.nix    |  7 ++++--
 .../build-managers/meson/fix-rpath.patch      | 24 +++++++++++++++++--
 .../meson/gir-fallback-path.patch             | 17 +++++++------
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
index bef89c881b5..382c2f0c05b 100644
--- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -1,6 +1,6 @@
 --- a/mesonbuild/coredata.py
 +++ b/mesonbuild/coredata.py
-@@ -282,18 +282,13 @@
+@@ -298,18 +298,13 @@
          '''
          if option.endswith('dir') and os.path.isabs(value) and \
             option not in builtin_dir_noprefix_options:
@@ -22,4 +22,4 @@
 +                value = value[skip:]
          return value
  
-     def init_builtins(self, options):
+     def init_builtins(self):
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 0ba44b1b17a..13f61fb1617 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,12 +1,12 @@
 { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.46.1";
+  version = "0.48.2";
   pname = "meson";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
+    sha256 = "1shfbr0mf8gmwpw5ivrmwp8282qw9mfhxmccd7fsgidp4x3nslby";
   };
 
   postFixup = ''
@@ -16,6 +16,9 @@ python3Packages.buildPythonApplication rec {
       mv ".$i-wrapped" "$i"
     done
     popd
+
+    # Do not propagate Python
+    rm $out/nix-support/propagated-build-inputs
   '';
 
   patches = [
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
index e52428a7db2..30ecb30ee93 100644
--- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch
+++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
@@ -1,6 +1,15 @@
 --- a/mesonbuild/compilers/compilers.py
 +++ b/mesonbuild/compilers/compilers.py
-@@ -846,8 +848,10 @@
+@@ -1112,6 +1112,8 @@
+         for p in rpath_paths:
+             if p == from_dir:
+                 relative = '' # relpath errors out in this case
++            elif os.path.isabs(p):
++                relative = p # These can be outside of build dir.
+             else:
+                 relative = os.path.relpath(os.path.join(build_dir, p), os.path.join(build_dir, from_dir))
+             rel_rpaths.append(relative)
+@@ -1121,8 +1123,10 @@
              if paths != '':
                  paths += ':'
              paths += build_rpath
@@ -15,7 +24,7 @@
              else:
 --- a/mesonbuild/scripts/depfixer.py
 +++ b/mesonbuild/scripts/depfixer.py
-@@ -300,6 +300,14 @@
+@@ -303,6 +303,14 @@
              return
          self.bf.seek(rp_off)
          old_rpath = self.read_str()
@@ -30,3 +39,14 @@
          if len(old_rpath) < len(new_rpath):
              sys.exit("New rpath must not be longer than the old one.")
          # The linker does read-only string deduplication. If there is a
+@@ -316,6 +324,10 @@
+         if not new_rpath:
+             self.remove_rpath_entry(entrynum)
+         else:
++            # clean old rpath to avoid stale references
++            # (see https://github.com/NixOS/nixpkgs/pull/46020)
++            self.bf.seek(rp_off)
++            self.bf.write(b'\0'*len(old_rpath))
+             self.bf.seek(rp_off)
+             self.bf.write(new_rpath)
+             self.bf.write(b'\0')
diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
index d8d14f188a2..b7667ed493f 100644
--- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
+++ b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
@@ -1,13 +1,16 @@
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -427,6 +427,10 @@
-         scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all',
-                          '--output', '@OUTPUT@']
+@@ -780,6 +780,13 @@
+         scan_command += self._scan_langs(state, [lc[0] for lc in langs_compilers])
+         scan_command += list(external_ldflags)
  
-+        fallback_libpath = girtarget.get_custom_install_dir()[0]
++        if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1:
++            raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets])))
++
++        fallback_libpath = girtargets[0].get_custom_install_dir()[0]
 +        if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/":
 +            scan_command += ['--fallback-library-path=' + fallback_libpath]
 +
-         header = kwargs.pop('header', None)
-         if header:
-             if not isinstance(header, str):
+         scan_target = self._make_gir_target(state, girfile, scan_command, depends, kwargs)
+ 
+         typelib_output = '%s-%s.typelib' % (ns, nsversion)

From 8a923c9e5085caf40da811701c0d6b80ac0093d9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 20:11:20 +0200
Subject: [PATCH 0071/2793] glib-networking: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/development/libraries/glib-networking/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 4ac6e87b9dd..87d26b10027 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
+{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
 , gsettings-desktop-schemas }:
 
 let
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
     patchShebangs meson_post_install.py
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext
+    python3 # install_script
+  ];
   propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
 
   doCheck = false; # tests need to access the certificates (among other things)

From 08db7cf19ba65db4124d704a5f837732b1da5e98 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:00:08 +0200
Subject: [PATCH 0072/2793] gnome3.gnome-settings-daemon: add python3 for
 install script

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

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 ce025899c80..25758ddea8d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
 , libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
 , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
-, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }:
+, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
 
 stdenv.mkDerivation rec {
   name = "gnome-settings-daemon-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # fatal error: gio/gunixfdlist.h: No such file or directory
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
 
   buildInputs = with gnome3; [
     ibus gtk glib gsettings-desktop-schemas networkmanager

From 5c5736e6e249ea95faa2eb3e4703d1c32ca6b192 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:06:08 +0200
Subject: [PATCH 0073/2793] gnome3.gnome-bluetooth: add python3 for install
 script

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 946e7adff79..2db256c323f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
 , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }:
 
 let
   pname = "gnome-bluetooth";
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection
-    gtk-doc docbook_xsl docbook_xml_dtd_43
+    gtk-doc docbook_xsl docbook_xml_dtd_43 python3
   ];
   buildInputs = [
     glib gtk3 udev libnotify libcanberra-gtk3

From 63ab92cff837d6df045c30a4a5a67b66f2960a6e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:06:42 +0200
Subject: [PATCH 0074/2793] gnome3.gnome-session: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 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 57bcd826038..973613b3319 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
-, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412
+, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext makeWrapper
-    xmlto libxslt docbook_xsl docbook_xml_dtd_412
+    xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3
     dbus # for DTD
   ];
 

From 68606d51d30c2878a4b07a85787f92f2d46acd2e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:43:55 +0200
Subject: [PATCH 0075/2793] gst_all_1.gst-plugins-base: add python3 for install
 script

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

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index a5f8e340642..0e3ff52c4d5 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, meson, ninja, gettext, gobjectIntrospection
-, python, gstreamer, orc, pango, libtheora
+, python3, gstreamer, orc, pango, libtheora
 , libintl, libopus
 , enableX11 ? stdenv.isLinux, libXv
 , enableWayland ? stdenv.isLinux, wayland
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ]
+  nativeBuildInputs = [ pkgconfig python3 gettext gobjectIntrospection ]
 
   # Broken meson with Darwin. Should hopefully be fixed soon. Tracking
   # in https://bugzilla.gnome.org/show_bug.cgi?id=781148.

From 0217c2980d9eb5859fa6098f06ed5faa1e1d755c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:09:17 +0200
Subject: [PATCH 0076/2793] gst_all_1.gst-plugins-bad: add python3 for install
 script

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

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 3f030b7469e..cbe880acc78 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja, gettext
-, pkgconfig, python, gst-plugins-base, orc
+, pkgconfig, python3, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
 , faad2, libass, libkate, libmms, librdf, ladspaH
 , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig python gettext ];
+  nativeBuildInputs = [ meson ninja pkgconfig python3 gettext ];
 
   buildInputs = [
     gst-plugins-base orc

From a5af84ef2c584e3c86b36a6044c172c6ce46191d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:58:48 +0200
Subject: [PATCH 0077/2793] libinput: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/development/libraries/libinput/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 87c6bb03d4b..8297d7c4dda 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -29,13 +29,10 @@ stdenv.mkDerivation rec {
     (mkFlag documentationSupport "documentation")
     (mkFlag eventGUISupport "debug-gui")
     (mkFlag testsSupport "tests")
+    "--libexecdir=${placeholder "bin"}/libexec"
   ];
 
-  preConfigure = ''
-    mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
-  '';
-
-  nativeBuildInputs = [ pkgconfig meson ninja ]
+  nativeBuildInputs = [ pkgconfig meson ninja python3Packages.python ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];
 

From 927a82d60f876d34efc179d049a8c2a44b6c0c5d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Sep 2018 05:58:22 +0200
Subject: [PATCH 0078/2793] libratbag: fix meson/python compatibility

---
 pkgs/os-specific/linux/libratbag/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 271dc156695..c614b39255d 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -12,15 +12,14 @@ stdenv.mkDerivation rec {
     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 ];
+  buildInputs = [
+    glib systemd udev libevdev
+    (python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
+  ];
 
   mesonFlags = [
     "-Dsystemd-unit-dir=./lib/systemd/system/"

From 40f8dceff5a320bb565ccecb2915de7411d3ac2d Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:41:39 +0300
Subject: [PATCH 0079/2793] SDL2: enable parallel building

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 07a63a366f1..e009204133e 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -60,9 +60,7 @@ stdenv.mkDerivation rec {
       cf-private
     ];
 
-  # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
-  #   pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   configureFlags = [
     "--disable-oss"

From 3d4f4149b5b0588eacfdf90ac4f4979be55f0d01 Mon Sep 17 00:00:00 2001
From: hyphon81 <zero812n@gmail.com>
Date: Sun, 11 Nov 2018 13:09:19 +0900
Subject: [PATCH 0080/2793] pythonPackages.gym: init at 0.9.6

Fix the description and add the comment
---
 .../python-modules/gym/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/gym/default.nix

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
new file mode 100644
index 00000000000..c8ad9107004
--- /dev/null
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage, fetchPypi
+, numpy, requests, six, pyglet, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "gym";
+  version = "0.9.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0llbhn3zdlsz2crd5grd1yygg8zp2shsclc24iqix5gw5f65clx5";
+  };
+
+  propagatedBuildInputs = [
+    numpy requests six pyglet scipy
+  ];
+
+  # The test needs MuJoCo that is not free library.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents.";
+    homepage = https://gym.openai.com/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ hyphon81 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d065d48f2b..393a6d12030 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2448,6 +2448,8 @@ in {
 
   gspread = callPackage ../development/python-modules/gspread { };
 
+  gym = callPackage ../development/python-modules/gym { };
+
   gyp = callPackage ../development/python-modules/gyp { };
 
   guessit = callPackage ../development/python-modules/guessit { };

From 25fafd2eb5599c6d61357964f9802c260c81556a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Nov 2018 19:32:54 +0100
Subject: [PATCH 0081/2793] Revert "darwin/stdenv: bash is a build input"

Completely breaks darwin. Every package in the stdenv that has shebangs
in the output will end up with references to bootstrap-tools.

This reverts commit 2f2e635dd5431859a01bbbcae0493be90041d495.
---
 pkgs/stdenv/darwin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d9b3c7dd29f..5fb410b64eb 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -278,8 +278,8 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraNativeBuildInputs = with pkgs; [ xz ];
-    extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
     libcxx = pkgs.libcxx;
 
     extraPreHook = ''
@@ -335,8 +335,8 @@ in rec {
     };
   in with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraNativeBuildInputs = with pkgs; [ xz ];
-    extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = [ pkgs.darwin.CF ];
     libcxx = pkgs.libcxx;
 
     extraPreHook = ''

From c9223a17bc86fda888b36b7fde9ebc5bed3f0463 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Nov 2018 19:41:50 +0100
Subject: [PATCH 0082/2793] Revert "patch-shebangs: use --build for auto patch
 shebangs"

Completely breaks darwin. Every package in the stdenv that has shebangs
in the output will end up with references to bootstrap-tools.

This reverts commit eb7c50a993833ecdb94cc3affb55ac4c560edf50.
---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 +---
 pkgs/stdenv/generic/setup.sh                     | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index b35c3c87625..441f230869b 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -102,12 +102,10 @@ patchShebangs() {
 patchShebangsAuto () {
     if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
 
-        if [ -z "${strictDeps-}"]; then
-            patchShebangs --build "$prefix"
         # 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).
-        elif [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
+        if [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
             patchShebangs --build "$prefix"
         else
             patchShebangs --host "$prefix"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 336e229c6a3..be96d018612 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -257,9 +257,17 @@ 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"
+
+    # 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

From bdec3ed049477a0c2b0b615d0a6c5e5b79ea74cb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Nov 2018 19:42:04 +0100
Subject: [PATCH 0083/2793] Revert "Revert "Revert "patch-shebangs: respect
 cross compilation"""

Completely breaks darwin. Every package in the stdenv that has shebangs
in the output will end up with references to bootstrap-tools.

This reverts commit bde99096a80e74692795fa2782619c46a476839e.
---
 .../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 441f230869b..d26bf735d30 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 e5deb04fedcc6dd775d10613ed56efb3aecd8949 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 14 Nov 2018 23:43:05 +0100
Subject: [PATCH 0084/2793] libpng: 1.6.34 -> 1.6.35

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0e5a4a866e8..9c1ed80e51e 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,20 +3,20 @@
 assert zlib != null;
 
 let
-  patchVersion = "1.6.34";
+  patchVersion = "1.6.35";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
+    sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
 in stdenv.mkDerivation rec {
   name = "libpng" + whenPatched "-apng" + "-${version}";
-  version = "1.6.34";
+  version = "1.6.35";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
-    sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
+    sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
   };
   postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
 

From 376f4b9f0570d5609da6d5cc9a1e80de24a895a1 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 15 Nov 2018 00:18:26 +0100
Subject: [PATCH 0085/2793] nss: 3.39 -> 3.40

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 8a3de28b784..e559b9a076a 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -8,11 +8,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.39";
+  version = "3.40";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
-    sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_40_RTM/src/${name}.tar.gz";
+    sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
   };
 
   buildInputs = [ perl zlib sqlite ]

From 002c411f45a9bcea367cd664be231ac75793a83e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Oct 2018 16:30:33 -0500
Subject: [PATCH 0086/2793] libva: 2.1.0 -> 2.3.0

See notes for this and previous release:

* https://github.com/intel/libva/releases/tag/2.3.0
* https://github.com/intel/libva/releases/tag/2.2.0
---
 pkgs/development/libraries/libva/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 0ba49da06cf..435b7e3c915 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${lib.optionalString minimal "minimal-"}${version}";
-  version = "2.1.0";
+  version = "2.3.0";
 
   # update libva-utils and vaapiIntel as well
   src = fetchFromGitHub {
     owner  = "01org";
     repo   = "libva";
     rev    = version;
-    sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w";
+    sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z";
   };
 
   outputs = [ "dev" "out" ];

From 8b2c757823ad4a866a833c53074002adb79e2730 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Oct 2018 16:33:10 -0500
Subject: [PATCH 0087/2793] libva-utils: bump hash to match new version
 (inherit's from libva)

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

diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 6868e5c8cfa..a31968a5373 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "01org";
     repo   = "libva-utils";
     rev    = version;
-    sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2";
+    sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From ae2f9509bd63a86471b311828443e2232d33de57 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Oct 2018 16:39:36 -0500
Subject: [PATCH 0088/2793] vaapiIntel: bump to 2.2.0, don't force using
 matching version w/libva

If there was a 2.3.0 we would use that, but there isn't and only
version requirement mentioned is libva >= 1.1.0 .

(they also test against libva git in the travis.yml, FWIW)

https://github.com/intel/intel-vaapi-driver/releases/tag/2.2.0
---
 pkgs/development/libraries/vaapi-intel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index ba763e33490..70ee61aecd3 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "intel-vaapi-driver-${version}";
-  inherit (libva) version;
+  version = "2.2.0"; # generally try to match libva version, but not required
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "intel-vaapi-driver";
     rev    = version;
-    sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";
+    sha256 = "1z8iqnswias2gph61yzyal53456y71ff98f21cs17hw4qjfkwa6k";
   };
 
   patchPhase = ''

From bd54a288b325509ac642d143ca30a8657fc1a968 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Oct 2018 16:51:12 -0500
Subject: [PATCH 0089/2793] intel-gpu-tools: add 'peg' dep for overlay

---
 pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index a1b358807c4..a8f358ab55b 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, utilmacros, gnome2, openssl }:
+, procps, utilmacros, gnome2, openssl, peg }:
 
 stdenv.mkDerivation rec {
   name = "intel-gpu-tools-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig utilmacros ];
   buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
     libXext libXv libXrandr glib bison libunwind python3 procps
-    gnome2.gtkdoc openssl ];
+    gnome2.gtkdoc openssl peg ];
 
   preConfigure = ''
     ./autogen.sh

From 12bd5dc7460d8b1eb680c57223371ed7182f8138 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Nov 2018 00:24:22 -0500
Subject: [PATCH 0090/2793] libinput: 1.12.2 -> 1.23.3

https://lists.freedesktop.org/archives/wayland-devel/2018-November/039620.html
---
 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 87c6bb03d4b..b5b0c98427f 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.2";
+  version = "1.12.3";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb";
+    sha256 = "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 95fa7b6370fa5297c4f439a1cbdc8bae35862e12 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Thu, 1 Nov 2018 12:45:04 +0100
Subject: [PATCH 0091/2793] libarchive: 3.3.2 -> 3.3.3

Update includes patches for sec issues:
- CVE-2017-14166
- CVE-2017-14501
- CVE-2017-14502
- Upstream includes patch for libressl version check

fixes #49583
---
 .../libraries/libarchive/CVE-2017-14166.patch | 36 -------------------
 .../libraries/libarchive/CVE-2017-14502.patch | 28 ---------------
 .../libraries/libarchive/default.nix          | 15 ++------
 3 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14166.patch
 delete mode 100644 pkgs/development/libraries/libarchive/CVE-2017-14502.patch

diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
deleted file mode 100644
index b729ae41e0a..00000000000
--- a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@bec.de>
-Date: Tue, 5 Sep 2017 18:12:19 +0200
-Subject: [PATCH] Do something sensible for empty strings to make fuzzers
- happy.
-
----
- libarchive/archive_read_support_format_xar.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
-index 7a22beb9d..93eeacc5e 100644
---- a/libarchive/archive_read_support_format_xar.c
-+++ b/libarchive/archive_read_support_format_xar.c
-@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
- 	uint64_t l;
- 	int digit;
- 
-+	if (char_cnt == 0)
-+		return (0);
-+
- 	l = 0;
- 	digit = *p - '0';
- 	while (digit >= 0 && digit < 10  && char_cnt-- > 0) {
-@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
- {
- 	int64_t l;
- 	int digit;
--        
-+
-+	if (char_cnt == 0)
-+		return (0);
-+
- 	l = 0;
- 	while (char_cnt-- > 0) {
- 		if (*p >= '0' && *p <= '7')
diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
deleted file mode 100644
index dad8a93a8a8..00000000000
--- a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@bec.de>
-Date: Sat, 9 Sep 2017 17:47:32 +0200
-Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
- archives.
-
-Reported-By: OSS-Fuzz issue 573
----
- libarchive/archive_read_support_format_rar.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
-index cbb14c32d..751de6979 100644
---- a/libarchive/archive_read_support_format_rar.c
-+++ b/libarchive/archive_read_support_format_rar.c
-@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
-         return (ARCHIVE_FATAL);
-       }
-       filename[filename_size++] = '\0';
--      filename[filename_size++] = '\0';
-+      /*
-+       * Do not increment filename_size here as the computations below
-+       * add the space for the terminating NUL explicitly.
-+       */
-+      filename[filename_size] = '\0';
- 
-       /* Decoded unicode form is UTF-16BE, so we have to update a string
-        * conversion object for it. */
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 7625abf38fb..029be971ac1 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,24 +10,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
+    sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
   };
 
-  patches = [
-    ./CVE-2017-14166.patch
-    ./CVE-2017-14502.patch
-
-    # LibreSSL patch; this is from upstream, and can be removed when the next release is made.
-    (fetchpatch {
-      url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
-      sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
-    })
-  ];
-
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 8684ef15a12146dee4a1409bbfa364a8cb6c897e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 15 Nov 2018 08:04:24 -0800
Subject: [PATCH 0092/2793] hdf5: 1.10.3 -> 1.10.4 (#50100)

* hdf5: 1.10.3 -> 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/hdf5-threadsafe/versions

* hdf5: update meta.license

HDF5 is licensed under a BSD 3-clause variant
---
 pkgs/tools/misc/hdf5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index e481a31e926..3d50b068cc4 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -16,11 +16,11 @@ assert !cpp || mpi == null;
 let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
-  version = "1.10.3";
+  version = "1.10.4";
   name = "hdf5-${version}";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
-    sha256 = "1a85v6812afi6k3gmfdcj80f6ys9kc80v7ysz39pz9948z7dqp66";
+    sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj";
  };
 
   passthru = {
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
     '';
-    license = stdenv.lib.licenses.free; # BSD-like
+    license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
     homepage = https://www.hdfgroup.org/HDF5/;
     platforms = stdenv.lib.platforms.unix;
     broken = (gfortran != null) && stdenv.isDarwin;

From b76d11e1a5ce6f15bf62961462cc237470d82d4d Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 15 Nov 2018 14:02:32 -0600
Subject: [PATCH 0093/2793] bison: 3.1 -> 3.2.1 (#49454)

3.2: http://lists.gnu.org/archive/html/info-gnu/2018-10/msg00008.html
3.2.1: http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00005.html
---
 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 d75a7e0ee3d..bae134ea3a5 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.1";
+  name = "bison-3.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.gz";
-    sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7";
+    sha256 = "1pgcvwzzlckb83sdcljz75hg71zwbc2a4pl5ycwxsxw05423gwq1";
   };
 
   patches = []; # remove on another rebuild

From 064f35fad39575254a393ce5272ab131bd3e4374 Mon Sep 17 00:00:00 2001
From: Christian S <ch.schmidbauer+git@gmail.com>
Date: Wed, 31 Oct 2018 19:00:25 +0100
Subject: [PATCH 0094/2793] x265: 2.7 -> 2.9

Encoder enhancements, AVX-512 support, ...

x265: fix linking issue on aarch64
---
 pkgs/development/libraries/x265/default.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index d11a93254bf..4212687a02a 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, yasm
+{ stdenv, fetchurl, fetchpatch, cmake, yasm
 , debugSupport ? false # Run-time sanity checks (debugging)
 , highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
 , werrorSupport ? false # Warnings as errors
@@ -16,19 +16,28 @@ in
 
 stdenv.mkDerivation rec {
   name = "x265-${version}";
-  version = "2.7";
+  version = "2.9";
 
   src = fetchurl {
     urls = [
-      "http://get.videolan.org/x265/x265_${version}.tar.gz"
-      "https://github.com/videolan/x265/archive/${version}.tar.gz"
+      "https://get.videolan.org/x265/x265_${version}.tar.gz"
+      "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
     ];
-    sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym";
+    sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb";
   };
 
   enableParallelBuilding = true;
 
-  patchPhase = ''
+  patches = [
+    # Fix issue #442 (linking issue on non-x86 platforms)
+    # Applies on v2.9 only, this should be removed at next update
+    (fetchpatch {
+      url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw";
+      sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928";
+    })
+  ];
+
+  postPatch = ''
     sed -i 's/unknown/${version}/g' source/cmake/version.cmake
   '';
 

From d690ccee63c1b67f0624709af5fbf77e70d4be76 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 6 Nov 2018 16:37:01 -0600
Subject: [PATCH 0095/2793] utillinux: 2.32.1 -> 2.33

https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33-ReleaseNotes
---
 pkgs/os-specific/linux/util-linux/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 55758190efd..72693696494 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,15 +4,15 @@
 let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
-  majorVersion = "2.32";
-  patchVersion = "1";
+  majorVersion = "2.33";
+  patchVersion = "";
 
 in stdenv.mkDerivation rec {
   name = "util-linux-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6";
+    sha256 = "12k54fj1wz1193kq619vplvzj7gf8yn42sfj0kmfxgrm7kbvjqgj";
   };
 
   patches = [

From 471f1be7188154633d290b474fd52905fd21e48c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 16 Nov 2018 07:31:05 +0000
Subject: [PATCH 0096/2793] gdb: 8.1.1 -> 8.2 (#50444)

---
 .../tools/misc/gdb/debug-info-from-env.patch  | 88 +++----------------
 pkgs/development/tools/misc/gdb/default.nix   | 19 ++--
 2 files changed, 24 insertions(+), 83 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
index ad6dca6749e..a7eda2c7e17 100644
--- a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
+++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
@@ -1,81 +1,13 @@
-Look up .build-id files relative to the directories in the
-colon-separated environment variable NIX_DEBUG_INFO_DIRS, in addition
-to the existing debug-file-directory setting.
+Initialize debug-file-directory from NIX_DEBUG_INFO_DIRS, a colon-separated list
+of directories with separate debugging information files.
 
-diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/build-id.c gdb-8.0/gdb/build-id.c
---- gdb-8.0-orig/gdb/build-id.c	2017-06-04 17:51:26.000000000 +0200
-+++ gdb-8.0/gdb/build-id.c	2017-07-28 13:18:10.797375927 +0200
-@@ -67,8 +67,8 @@
+--- a/gdb/main.c
++++ b/gdb/main.c
+@@ -551,3 +551,6 @@ captured_main_1 (struct captured_main_args *context)
  
- /* See build-id.h.  */
- 
--gdb_bfd_ref_ptr
--build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
-+static gdb_bfd_ref_ptr
-+build_id_to_debug_bfd_in (const char *directories, size_t build_id_len, const bfd_byte *build_id)
- {
-   char *link, *debugdir;
-   VEC (char_ptr) *debugdir_vec;
-@@ -78,7 +78,7 @@
-   int alloc_len;
- 
-   /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
--  alloc_len = (strlen (debug_file_directory)
-+  alloc_len = (strlen (directories)
- 	       + (sizeof "/.build-id/" - 1) + 1
- 	       + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
-   link = (char *) alloca (alloc_len);
-@@ -86,7 +86,7 @@
-   /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
-      cause "/.build-id/..." lookups.  */
- 
--  debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
-+  debugdir_vec = dirnames_to_char_ptr_vec (directories);
-   back_to = make_cleanup_free_char_ptr_vec (debugdir_vec);
- 
-   for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
-@@ -137,6 +137,30 @@
-   return abfd;
- }
- 
-+gdb_bfd_ref_ptr
-+build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
-+{
-+  gdb_bfd_ref_ptr abfd = build_id_to_debug_bfd_in(debug_file_directory, build_id_len, build_id);
+-  debug_file_directory = relocate_gdb_directory (DEBUGDIR,
++  debug_file_directory = getenv("NIX_DEBUG_INFO_DIRS");
 +
-+  if (abfd != NULL)
-+    return abfd;
-+
-+  static int init = 0;
-+  static char *env_var;
-+  if (!init)
-+    {
-+      env_var = getenv("NIX_DEBUG_INFO_DIRS");
-+      init = 1;
-+    }
-+
-+  if (env_var)
-+    {
-+      abfd = build_id_to_debug_bfd_in(env_var, build_id_len, build_id);
-+    }
-+
-+  return abfd;
-+}
-+
- /* See build-id.h.  */
- 
- char *
-diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/symfile.c gdb-8.0/gdb/symfile.c
---- gdb-8.0-orig/gdb/symfile.c	2017-06-04 17:51:27.000000000 +0200
-+++ gdb-8.0/gdb/symfile.c	2017-07-28 12:54:05.401586174 +0200
-@@ -1415,8 +1415,8 @@
- 			   struct cmd_list_element *c, const char *value)
- {
-   fprintf_filtered (file,
--		    _("The directory where separate debug "
--		      "symbols are searched for is \"%s\".\n"),
-+		    _("The directories where separate debug "
-+		      "symbols are searched for are \"%s\".\n"),
- 		    value);
- }
- 
++  if (debug_file_directory == NULL)
++    debug_file_directory = relocate_gdb_directory (DEBUGDIR,
+ 						 DEBUGDIR_RELOCATABLE);
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index a60a77bed30..103f1131148 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 
 # Build time
-, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs
+, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs
 
 # Run time
 , ncurses, readline, gmp, mpfr, expat, zlib, dejagnu
@@ -13,7 +13,7 @@
 
 let
   basename = "gdb-${version}";
-  version = "8.1.1";
+  version = "8.2";
 in
 
 assert pythonSupport -> python != null;
@@ -26,11 +26,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p";
+    sha256 = "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963";
   };
 
-  patches = [ ./debug-info-from-env.patch ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch;
+  patches = [
+    ./debug-info-from-env.patch
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ./darwin-target-match.patch
+    (fetchpatch {
+      name = "gdb-aarch64-linux-tdep.patch";
+      url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=0c0a40e0abb9f1a584330a1911ad06b3686e5361";
+      excludes = [ "gdb/ChangeLog" ];
+      sha256 = "16zjw99npyapj68sw52xzmbw671ajm9xv7g5jxfmp94if5y91mnj";
+    })
+  ];
 
   nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
 

From d53c0a71ab877bc72ed5aa403b15c8fbb3450a34 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 16 Nov 2018 09:21:06 +0100
Subject: [PATCH 0097/2793] pythonPackages.cython: don't test codestyle
 (#50432)

This requires pycodestyle when using python3 and adding it leads to test
failures for some reason. Maybe some patching we do. There is no reason to
test codestyle for a distro, so just disable it.
---
 pkgs/development/python-modules/Cython/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index d4191731973..7f252fb58cb 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -45,6 +45,7 @@ in buildPythonPackage rec {
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP"
     ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \
+      --no-code-style \
       ${stdenv.lib.optionalString (builtins.length excludedTests != 0)
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';

From 0c7b1576dd83865b171693e5b09e1585405c405f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 13:54:40 -0500
Subject: [PATCH 0098/2793] sqlite: 3.24.0 -> 3.25.0

https://sqlite.org/releaselog/3_25_0.html
---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 pkgs/development/libraries/sqlite/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 5b68b4901f9..106cade7aa8 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.24.0";
+  version = "3.25.0";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj";
+    sha256 = "020dyfd948l4zdw2izirjaw90pq4668ihms0c9kqj5rmzhk88n81";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 92574091558..2033d560a67 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.24.0";
+  version = "3.25.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr";
+    sha256 = "0wbz638p1q8fxr2rdhi5dy9wvffh8x1zwh2lx0zdj8zaq7gr66ny";
   };
 
   outputs = [ "bin" "dev" "out" ];

From daf738f55db1ccd368d26be4e8d5015797c49aa0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 09:46:07 -0500
Subject: [PATCH 0099/2793] sqlite: 3.25.0 -> 3.25.1

---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 pkgs/development/libraries/sqlite/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 106cade7aa8..db7bb6d9f96 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.25.0";
+  version = "3.25.1";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "020dyfd948l4zdw2izirjaw90pq4668ihms0c9kqj5rmzhk88n81";
+    sha256 = "1bkz5n8zshh51brcxvyfysdy6mmx6zy4xhhdnwvsavnynk042bz6";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 2033d560a67..560825646e8 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.25.0";
+  version = "3.25.1";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "0wbz638p1q8fxr2rdhi5dy9wvffh8x1zwh2lx0zdj8zaq7gr66ny";
+    sha256 = "1lbgxhrdjjy2gcwrzj0inq4p117g1l117mmgm0y0g4zhhyyldvcn";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 2e2740165a56497654dfb6a2845efb4fe1e9cb74 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 26 Sep 2018 10:28:05 -0500
Subject: [PATCH 0100/2793] sqlite: 3.25.1 -> 3.25.2

---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 pkgs/development/libraries/sqlite/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index db7bb6d9f96..4f8203523c4 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.25.1";
+  version = "3.25.2";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "1bkz5n8zshh51brcxvyfysdy6mmx6zy4xhhdnwvsavnynk042bz6";
+    sha256 = "0n7lzp671x1xz6fx138xa1jhi4vfwib3awaxac5skw6fv9q61940";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 560825646e8..74d8310777d 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.25.1";
+  version = "3.25.2";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "1lbgxhrdjjy2gcwrzj0inq4p117g1l117mmgm0y0g4zhhyyldvcn";
+    sha256 = "109i1sfryghrdaynkqq9s9aq4347vy653bwkqwx4slix8a2196ns";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 6f0c65ee3f72cc4f1c3195610fc285a2ed441c0b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Nov 2018 22:41:29 -0600
Subject: [PATCH 0101/2793] sqlite: 3.25.2 -> 3.25.3

https://sqlite.org/releaselog/3_25_3.html
---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 pkgs/development/libraries/sqlite/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 4f8203523c4..f3d69f09444 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.25.2";
+  version = "3.25.3";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "0n7lzp671x1xz6fx138xa1jhi4vfwib3awaxac5skw6fv9q61940";
+    sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 74d8310777d..c98164ae63b 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.25.2";
+  version = "3.25.3";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "109i1sfryghrdaynkqq9s9aq4347vy653bwkqwx4slix8a2196ns";
+    sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0";
   };
 
   outputs = [ "bin" "dev" "out" ];

From b8229dd2dc9db325c31010112dabf06564c5eff4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Nov 2018 23:19:19 -0600
Subject: [PATCH 0102/2793] pythonPackages.sqlalchemy: 1.2.12 -> 1.2.13

---
 .../python-modules/sqlalchemy/default.nix       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index e1c576f9427..c0cca3562f7 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchPypi
+, fetchpatch
 , buildPythonPackage
 , pytest
 , mock
@@ -9,13 +10,23 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c5951d9ef1d5404ed04bae5a16b60a0779087378928f997a294d1229c6ca4d3e";
+    sha256 = "84412de3794acee05630e7788f25e80e81f78eb4837e7b71d0499129f660486a";
   };
 
+  patches = [
+    # fix for failing doc tests
+    # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
+    (fetchpatch {
+      name = "doc-test-fixes.patch";
+      url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
+      sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
+    })
+  ];
+
   checkInputs = [
     pytest
     mock
@@ -32,4 +43,4 @@ buildPythonPackage rec {
     description = "A Python SQL toolkit and Object Relational Mapper";
     license = licenses.mit;
   };
-}
\ No newline at end of file
+}

From c8115bd75f0ca83a85b7e0f6862282d9e61ec4ad Mon Sep 17 00:00:00 2001
From: Ashijit Pramanik <ashijit007@gmail.com>
Date: Fri, 16 Nov 2018 14:44:41 +0530
Subject: [PATCH 0103/2793] smlnj: 110.79 -> 110.84 and smlnj-bootstrap: 110.80
 -> 110.84

---
 .../development/compilers/smlnj/bootstrap.nix |  6 +--
 pkgs/development/compilers/smlnj/default.nix  | 46 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index fad5c7d73fe..2fe1f1f3f5a 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "smlnj-bootstrap-${version}";
 
-  version = "110.80";
+  version = "110.84";
 
   src = fetchurl {
     url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg";
-    sha256 = "1709xpgmxa6v73h77y7vn9wf5vlfdk75p61w28nzgfdsdc8f8l65";
+    sha256 = "17fpnlxcfwx2ysg6y9c5wwx6s3jca981nb0pawfcg6xg9wcapyfz";
   };
 
   buildInputs = [ cpio rsync makeWrapper ];
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     platforms   = stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.jwiegley ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 9b4816bb282..a14d48c10b9 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,31 +1,31 @@
 { stdenv, fetchurl, darwin }:
 let
-  version = "110.79";
+  version = "110.84";
   baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
 
   sources = map fetchurl [
-    { url = "${baseurl}/config.tgz";              sha256 = "1siahy5sxz20bdy88s7zjj6gn55np1h54dalmg0nwzqq1rc048xb"; }
-    { url = "${baseurl}/cm.tgz";                  sha256 = "174g71hvk1wfdmrg1mbx3p5j04ywnbbjapnnr9sgjd99pqqqsmdz"; }
-    { url = "${baseurl}/compiler.tgz";            sha256 = "001wi97ghj3mym4bk73gzzzrh7584hd79jn08cnq1wssdcfpn4mw"; }
-    { url = "${baseurl}/runtime.tgz";             sha256 = "0lavdzg25nbdzdyyf6wm304k0gsbb5bng2nlcx8gcfl743vl13r0"; }
-    { url = "${baseurl}/system.tgz";              sha256 = "00j34m5n8m30p51kajd0sxamy7gpwxaxrlgw5agxh0wi83vqfaki"; }
-    { url = "${baseurl}/MLRISC.tgz";              sha256 = "19q3gp7yfby4n8z6jn9m9q8g0a9kvb13arj8f2j0x9jnh3y2is78"; }
-    { url = "${baseurl}/smlnj-lib.tgz";           sha256 = "0frkc23zh9h1c2lvkidh92lsp56liyb3hyv17503nchmkxrlsi09"; }
-    { url = "${baseurl}/old-basis.tgz";           sha256 = "1ka7w4nvkmaf86dkdzgbwiw8kay6gxhcyx4q17m33wdzsjbq56lh"; }
-    { url = "${baseurl}/ckit.tgz";                sha256 = "1z8xf5pqwayqd8j6xhfhqs4axkb4dx7vdqi2a7gq3zbx2fd3s7pw"; }
-    { url = "${baseurl}/nlffi.tgz";               sha256 = "1544m7ildyd0d60wfy2hl700jnslpxqb7brgh8p0bmkvhhvvc96v"; }
-    { url = "${baseurl}/cml.tgz";                 sha256 = "11blq65zlsbh6iwq502jww1z4iyk9pf2iv3d437cgnpb3sn9mx72"; }
-    { url = "${baseurl}/eXene.tgz";               sha256 = "14yl8a5xwms1m9bvfwfiz6rhg49225l52lqqq9sbxbf57615n9yg"; }
-    { url = "${baseurl}/ml-lpt.tgz";              sha256 = "118s7v2f73ym91ymvnmswjxm2pw5n4q1d4hvbs1cmm43dv28pw7m"; }
-    { url = "${baseurl}/ml-lex.tgz";              sha256 = "0lf5ir12v8j6n11mblrl00jgm583ak077vgbabc1dfmz47rd566b"; }
-    { url = "${baseurl}/ml-yacc.tgz";             sha256 = "0dmifbbq1wxkxf479jv61nsy79sr78ad9fq6561rvgi4h12lzh7k"; }
-    { url = "${baseurl}/ml-burg.tgz";             sha256 = "1b5z18azik1kpaafi1vjgaf181yv32h88zm3z5fqxs96pwb86h1d"; }
-    { url = "${baseurl}/pgraph.tgz";              sha256 = "15g06hl7zn98qas3b6r6lrl75g9d1galqxdyai7d5z9q5lq71j2v"; }
-    { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0jwilcv2ycfpcy3cgs8ndaj16yqm8m2q63sipcigfycacpyqfsiw"; }
-    { url = "${baseurl}/heap2asm.tgz";            sha256 = "0wylsw1dkls9l86j226ilfb50mfk4h4zz4r9zdj104a1mqvvbgfk"; }
-    { url = "${baseurl}/smlnj-c.tgz";             sha256 = "1xr89r1nhzg53hk0v0fk1livphwpgmzh1dgjqxl4w8dx9qhk9yf0"; }
-    { url = "${baseurl}/doc.tgz";                 sha256 = "1fz4l3019n1rkrww98w59cdhlrz9jg635hmdq59xryc0j78y4ga1"; }
-    { url = "${baseurl}/boot.x86-unix.tgz";       sha256 = "0nka4dhklhilrsw4byr5vixiap28zp67ai0vjkwhqh03amkcr8zq"; }
+    { url = "${baseurl}/config.tgz";              sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; }
+    { url = "${baseurl}/cm.tgz";                  sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; }
+    { url = "${baseurl}/compiler.tgz";            sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; }
+    { url = "${baseurl}/runtime.tgz";             sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; }
+    { url = "${baseurl}/system.tgz";              sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; }
+    { url = "${baseurl}/MLRISC.tgz";              sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; }
+    { url = "${baseurl}/smlnj-lib.tgz";           sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; }
+    { url = "${baseurl}/old-basis.tgz";           sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; }
+    { url = "${baseurl}/ckit.tgz";                sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; }
+    { url = "${baseurl}/nlffi.tgz";               sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; }
+    { url = "${baseurl}/cml.tgz";                 sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; }
+    { url = "${baseurl}/eXene.tgz";               sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; }
+    { url = "${baseurl}/ml-lpt.tgz";              sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; }
+    { url = "${baseurl}/ml-lex.tgz";              sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; }
+    { url = "${baseurl}/ml-yacc.tgz";             sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; }
+    { url = "${baseurl}/ml-burg.tgz";             sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; }
+    { url = "${baseurl}/pgraph.tgz";              sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; }
+    { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; }
+    { url = "${baseurl}/heap2asm.tgz";            sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; }
+    { url = "${baseurl}/smlnj-c.tgz";             sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; }
+    { url = "${baseurl}/doc.tgz";                 sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; }
+    { url = "${baseurl}/boot.x86-unix.tgz";       sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; }
   ];
 in stdenv.mkDerivation {
   name = "smlnj-${version}";

From 273aa1ff815dcdf4a40d2ce38eff9ecf27e89bf2 Mon Sep 17 00:00:00 2001
From: Ashijit Pramanik <ashijit007@gmail.com>
Date: Fri, 16 Nov 2018 16:17:35 +0530
Subject: [PATCH 0104/2793] smlnj: 110.84 includes a new implementation of
 Abstract Syntax Description Library (ASDL). Adding it as a required source.

---
 pkgs/development/compilers/smlnj/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index a14d48c10b9..a2a03328b6d 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -26,6 +26,7 @@ let
     { url = "${baseurl}/smlnj-c.tgz";             sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; }
     { url = "${baseurl}/doc.tgz";                 sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; }
     { url = "${baseurl}/boot.x86-unix.tgz";       sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; }
+    { url = "${baseurl}/asdl.tgz";                sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; }
   ];
 in stdenv.mkDerivation {
   name = "smlnj-${version}";

From 1488f51f4b3a6fbf59429fd8bdbb69831aaccf12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 11 Nov 2018 20:01:54 -0200
Subject: [PATCH 0105/2793] libjpeg-turbo: 1.5.3 -> 2.0.1

---
 .../libraries/libjpeg-turbo/default.nix       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 84c6c96ea5d..826fd81a38a 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl, nasm
-}:
+{ stdenv, fetchurl, cmake, nasm }:
 
 stdenv.mkDerivation rec {
   name = "libjpeg-turbo-${version}";
-  version = "1.5.3";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
-    sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j";
-  }; # github releases still need autotools, surprisingly
+    sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
+  };
 
   patches =
     stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
@@ -16,12 +15,21 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ nasm ];
+  nativeBuildInputs = [ cmake nasm ];
 
-  enableParallelBuilding = true;
+  preConfigure = ''
+    cmakeFlagsArray+=(
+      "-DCMAKE_INSTALL_BINDIR=$bin/bin"
+      "-DWITH_JPEG8=1"
+      "-DWITH_JPEG9=1"
+    )
+  '';
 
   doCheck = true; # not cross;
   checkTarget = "test";
+  preCheck = ''
+    export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://libjpeg-turbo.virtualgl.org/;

From f1de24feb89d6516c35b7c34c0fb7dc57e8d865d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= <pe@pijul.org>
Date: Fri, 16 Nov 2018 12:12:59 +0000
Subject: [PATCH 0106/2793] Rust build-support: fixing a compilation error in
 some crates (such as proc-macro2)

---
 .../rust/build-rust-crate/configure-crate.nix             | 2 ++
 .../build-support/rust/build-rust-crate/install-crate.nix | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 37fef2abd77..ff04ba6a817 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -71,6 +71,8 @@ in ''
   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}
+  export NUM_JOBS=1
+  export RUSTC="rustc"
   if [[ -n "${versionPre}" ]]; then
     export CARGO_PKG_VERSION_PRE="${versionPre}"
   fi
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
index c41df34ca39..3b0282621ea 100644
--- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -20,9 +20,11 @@ crateName: metadata:
     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 # */
+  if [[ -d target/bin ]]; then
+    if [[ "$(ls -A target/bin)" ]]; then
+      mkdir -p $out/bin
+      cp -P target/bin/* $out/bin # */
+    fi
   fi
   runHook postInstall
 ''

From aceb11047ab77d6645a1ae641af1204c5f1e39ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Nov 2018 08:36:42 -0600
Subject: [PATCH 0107/2793] retdec: bump yaramod dep to fix 2/bison 3.2+

---
 .../tools/analysis/retdec/default.nix         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index 428ca259f49..3e64e91d130 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , fetchzip
 , lib
 , callPackage
@@ -70,8 +71,8 @@ let
   yaramod = fetchFromGitHub {
     owner = "avast-tl";
     repo = "yaramod";
-    rev = "v2.1.2";
-    sha256 = "1rpyqzkrqvk721hf75wb7aasw5mzp9wz4j89p0x1l9p5x1b3maz3";
+    rev = "v2.2.2";
+    sha256 = "0cq9h4h686q9ybamisbl797g6xjy211s3cq83nixkwkigmz48ccp";
   };
   jsoncpp = fetchFromGitHub {
     owner = "open-source-parsers";
@@ -181,6 +182,20 @@ in stdenv.mkDerivation rec {
     (yaramod // { dep_name = "yaramod"; })
   ];
 
+  # Use newer yaramod to fix w/bison 3.2+
+  patches = [
+    # 2.1.2 -> 2.2.1
+    (fetchpatch {
+      url = https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch;
+      sha256 = "0hdq634f72fihdy10nx2ajbps561w03dfdsy5r35afv9fapla6mv";
+    })
+    # 2.2.1 -> 2.2.2
+    (fetchpatch {
+      url = https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch;
+      sha256 = "0a8mwmwb39pr5ag3q11nv81ncdk51shndqrkm92shqrmdq14va52";
+    })
+  ];
+
   postPatch = (lib.concatMapStrings patchDep external_deps) + ''
     # install retdec-support
     echo "Checking version of retdec-support"

From 6b490ee2964662d69f0d38e71f0dc3565ad49515 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 15 Nov 2018 12:53:41 -0600
Subject: [PATCH 0108/2793] mesa: 18.2.4 -> 18.2.5

https://www.mesa3d.org/relnotes/18.2.5.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 91813b4180e..9490e553721 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.4";
+  version = "18.2.5";
   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 = "0knbr6nl7qk5bijz6p7yqr8fc806gvmz9p6jlnvdaxkqnpmil7b2";
+    sha256 = "0wrbdk988mh42bbpicf5knx5pdqs3xp05s71alqkbr9j523k4b5i";
   };
 
   prePatch = "patchShebangs .";

From 551aecfa833d00bb061ff8bf64e7906b93813aa6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 16 Nov 2018 22:35:56 +0100
Subject: [PATCH 0109/2793] tmpdir audit: only fail with files referenced below
 (#35068)

On Linux the `$TMPDIR` is `/build`. The TMPDIR audit looks for `$TMPDIR`
in the build output, which will then fail with packages like
/buildkite-agent.

This fixes the heuristic to look for `$TMPDIR/` instead.
---
 pkgs/build-support/setup-hooks/audit-tmpdir.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index 0f515842ebc..43ea0d6caec 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -13,23 +13,23 @@ auditTmpdir() {
     local dir="$1"
     [ -e "$dir" ] || return 0
 
-    header "checking for references to $TMPDIR in $dir..."
+    header "checking for references to $TMPDIR/ in $dir..."
 
     local i
     while IFS= read -r -d $'\0' i; do
         if [[ "$i" =~ .build-id ]]; then continue; fi
 
         if isELF "$i"; then
-            if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then
-                echo "RPATH of binary $i contains a forbidden reference to $TMPDIR"
+            if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then
+                echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
                 exit 1
             fi
         fi
 
         if  isScript "$i"; then
             if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
-                if grep -q -F "$TMPDIR" "$i"; then
-                    echo "wrapper script $i contains a forbidden reference to $TMPDIR"
+                if grep -q -F "$TMPDIR/" "$i"; then
+                    echo "wrapper script $i contains a forbidden reference to $TMPDIR/"
                     exit 1
                 fi
             fi

From 0a085d508ac054e45dfe0a7f24d55b29ca9d4ae9 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 16 Nov 2018 16:54:46 -0600
Subject: [PATCH 0110/2793] sudo: 1.8.25p1 -> 1.8.26 (#50422)

https://www.sudo.ws/stable.html#1.8.26
---
 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 975e533d477..56848af71f6 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.25p1";
+  name = "sudo-1.8.26";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx";
+    sha256 = "1qpyyfga8rs02p3186sns8qvh2bzwa48ka845nrcqh83dyd23nj0";
   };
 
   prePatch = ''

From b07330de548c8c5ce53d63ba5eca8441dc040ad5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 17 Nov 2018 23:32:21 -0800
Subject: [PATCH 0111/2793] vim: 8.1.0490 -> 8.1.0535

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 6d92c047157..09361d7f4e7 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.0490";
+  version = "8.1.0535";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r";
+    sha256 = "0kgh213ca2qfrwdqfimrnhlxidjbrg26icxw00rivjiv1blii7ck";
   };
 
   enableParallelBuilding = true;

From c79d621a111b6ff528d95beaad09118ab2948e94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 01:52:55 -0800
Subject: [PATCH 0112/2793] remmina: 1.2.32 -> 1.2.32.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/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 dc17ccc4a37..57787a83f72 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "remmina-${version}";
-  version = "1.2.32";
+  version = "1.2.32.1";
 
   src = fetchFromGitLab {
     owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
+    sha256 = "1b77gs68j5j4nlv69vl81d0kp2623ysvshq7495y6hq5wgi5l3gc";
   };
 
   nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];

From 60ba7d233e49e8b9b3ecde68b6b0f25f1bbe92de Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:24 +0000
Subject: [PATCH 0113/2793] pythonPackages.requests: disable multiple outputs

The `dev` output is empty anyway.

The problem is that it interacts badly with other parts of python and
stdenv infrastructure. In particular, before this patch it installs
code into `out` output (with only generated `nix-support` in `dev`),
but `makePythonPath` then uses `propagatedBuildInputs` to generate
`PYTHONPATH` while stdenv selects `dev` outputs for
`propagatedBuiltInputs`. This results in `makePythonPath` linking to
the empty `dev` output in `PYTHONPATH`.

This reverts a piece of commit 28299f669adc41e5278372cad952fb1e1165b44b.
---
 pkgs/development/python-modules/requests/default.nix | 2 --
 pkgs/development/tools/glslviewer/default.nix        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 99d4b56b2b1..9894c4319c5 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
     sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
   };
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [ pytest ];
   propagatedBuildInputs = [ urllib3 idna chardet certifi ];
   # sadly, tests require networking
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index fbae0a76f25..e8315e7b60c 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     libXi libX11
   ] ++ (with python2Packages; [ python setuptools wrapPython ])
     ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
-  pythonPath = with python2Packages; [ requests.dev ];
+  pythonPath = with python2Packages; [ requests ];
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
   preConfigure = ''

From 607c6e78e76614cba04c589221f226e28696d277 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:26 +0000
Subject: [PATCH 0114/2793] kodiPlugins.simpleplugin: init at 2.3.2

---
 pkgs/applications/video/kodi/plugins.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index f2ceacdd799..a0c7c9d017a 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -251,6 +251,25 @@ let self = rec {
 
   };
 
+  simpleplugin = mkKodiPlugin rec {
+    plugin = "simpleplugin";
+    namespace = "script.module.simpleplugin";
+    version = "2.3.2";
+
+    src = fetchFromGitHub {
+      owner = "romanvm";
+      repo = namespace;
+      rev = "v.${version}";
+      sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
+    };
+
+    meta = {
+      homepage = src.meta.homepage;
+      description = "Simpleplugin API";
+      license = licenses.gpl3;
+    };
+  };
+
   svtplay = mkKodiPlugin rec {
 
     plugin = "svtplay";

From e2203319030f2c6e219412fd94044feed3429b8c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:28 +0000
Subject: [PATCH 0115/2793] kodiPlugins.yatp: init at 3.3.2

---
 pkgs/applications/video/kodi/plugins.nix      | 30 ++++++++++++++++++-
 .../video/kodi/yatp/dont-monkey.patch         | 29 ++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/video/kodi/yatp/dont-monkey.patch

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index a0c7c9d017a..91183aca2c4 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,6 +1,7 @@
 { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
 , cmake, kodiPlain, libcec_platform, tinyxml
-, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
+, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
+, python2Packages }:
 
 with stdenv.lib;
 
@@ -462,4 +463,31 @@ let self = rec {
     };
   };
 
+  yatp = python2Packages.toPythonModule (mkKodiPlugin rec {
+    plugin = "yatp";
+    namespace = "plugin.video.yatp";
+    version = "3.3.2";
+
+    src = fetchFromGitHub {
+      owner = "romanvm";
+      repo = "kodi.yatp";
+      rev = "v.${version}";
+      sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
+    };
+
+    patches = [ ./yatp/dont-monkey.patch ];
+
+    propagatedBuildInputs = [
+      simpleplugin
+      python2Packages.requests
+      python2Packages.libtorrentRasterbar
+    ];
+
+    meta = {
+      homepage = src.meta.homepage;
+      description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
+      license = licenses.gpl3;
+    };
+  });
+
 }; in self
diff --git a/pkgs/applications/video/kodi/yatp/dont-monkey.patch b/pkgs/applications/video/kodi/yatp/dont-monkey.patch
new file mode 100644
index 00000000000..62d5d0c0d4c
--- /dev/null
+++ b/pkgs/applications/video/kodi/yatp/dont-monkey.patch
@@ -0,0 +1,29 @@
+diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
+index 1adcbb5..488b72c 100644
+--- a/plugin.video.yatp/server.py
++++ b/plugin.video.yatp/server.py
+@@ -20,24 +20,8 @@ addon = Addon()
+ _ = addon.initialize_gettext()
+ addon.log_notice('Starting Torrent Server...')
+ 
+-# A monkey-patch to set the necessary librorrent version
+-librorrent_addon = Addon('script.module.libtorrent')
+-orig_custom_version = librorrent_addon.get_setting('custom_version', False)
+-orig_set_version = librorrent_addon.get_setting('set_version', False)
+-librorrent_addon.set_setting('custom_version', 'true')
+-if addon.libtorrent_version == '1.0.9':
+-    librorrent_addon.set_setting('set_version', '4')
+-elif addon.libtorrent_version == '1.1.0':
+-    librorrent_addon.set_setting('set_version', '5')
+-elif addon.libtorrent_version == '1.1.1':
+-    librorrent_addon.set_setting('set_version', '6')
+-else:
+-    librorrent_addon.set_setting('set_version', '0')
+-
+ from libs.server import wsgi_app
+ 
+-librorrent_addon.set_setting('custom_version', orig_custom_version)
+-librorrent_addon.set_setting('set_version', orig_set_version)
+ # ======
+ 
+ if addon.enable_limits:

From f78835e791c8143aeec1a41207345455275ead5a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 22:03:11 +0000
Subject: [PATCH 0116/2793] kodiPlugins.exodus: remove

No loner exists, I couldn't find an official replacement repo, should be
removed according to
https://github.com/NixOS/nixpkgs/pull/46196#discussion_r215762595
---
 pkgs/applications/video/kodi/plugins.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 91183aca2c4..196852933a9 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -181,26 +181,6 @@ let self = rec {
     // (mkController "ps")
     // (mkController "snes");
 
-  exodus = mkKodiPlugin rec {
-
-    plugin = "exodus";
-    namespace = "plugin.video.exodus";
-    version = "3.1.13";
-
-    src = fetchurl {
-      url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
-      sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
-    };
-
-    buildInputs = [ unzip ];
-
-    meta = {
-      description = "A streaming plugin for Kodi";
-      platforms = platforms.all;
-      maintainers = with maintainers; [ edwtjo ];
-    };
-  };
-
   hyper-launcher = let
     pname = "hyper-launcher";
     version = "1.5.2";

From a27e3b2acb6ec2c0c48ac049cdab49596a29e07c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 16:35:21 -0800
Subject: [PATCH 0117/2793] pipenv: 2018.10.13 -> 2018.11.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/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 7d4a58d0e39..46b77a2b998 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.10.13";
+    version = "2018.11.14";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7";
+      sha256 = "1ni2cjgm04dwi8a0376nzwwy3gklqk9d0hkl8d9j760lvqshsxjz";
     };
 
     LC_ALL = "en_US.UTF-8";

From e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 18:32:32 -0600
Subject: [PATCH 0118/2793] libgcrypt: pass --with-libgpg-error-prefix

Avoids having to put the gpg-error-config binary directly in PATH.

/cc @shlevy
---
 pkgs/development/libraries/libgcrypt/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 6912817419f..173dc1f722b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -27,12 +27,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin gettext
     ++ stdenv.lib.optional enableCapabilities libcap;
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    # This is intentional: gpg-error-config is a shell script that will work during the build
-    mkdir -p "$NIX_BUILD_TOP"/bin
-    ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
-    export PATH="$NIX_BUILD_TOP/bin:$PATH"
-  '';
+  configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config

From dfa36eda92000085e066883bb9b7f060a2915863 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@users.noreply.github.com>
Date: Sun, 18 Nov 2018 20:04:21 -0500
Subject: [PATCH 0119/2793] 50629.cross compile libksba (#50649)

* Fix cross-compilation of libksba.

This explicitly points libksba configure script at the correct prefix for libgpgerror with dev tools.

It also provides a build-system compiler so that the asn1-gentables.c build helper can be compiled and run
on the build system.
---
 pkgs/development/libraries/libksba/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 0611e0e57e7..d48d89235d8 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, libgpgerror }:
+{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
 
 stdenv.mkDerivation rec {
   name = "libksba-1.3.5";
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext ];
   propagatedBuildInputs = [ libgpgerror ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
 
   postInstall = ''
     mkdir -p $dev/bin

From 2f629c1a47e795ec3a41a865ee65433b309e49a2 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Mon, 19 Nov 2018 12:03:32 +1100
Subject: [PATCH 0120/2793] python-mnist: init at 0.6

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

diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix
new file mode 100644
index 00000000000..67cb4eae251
--- /dev/null
+++ b/pkgs/development/python-modules/python-mnist/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "python-mnist";
+  version = "0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5d59a44335eccb4b310efb2ebb76f44e8588a1732cfb4923f4a502b61d8b653a";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sorki/python-mnist;
+    description = "Simple MNIST data parser written in Python";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cmcdragonkai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5a0d57a2d5..387faecb168 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -617,6 +617,8 @@ in {
 
   python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
 
+  python-mnist = callPackage ../development/python-modules/python-mnist { };
+
   python-igraph = callPackage ../development/python-modules/python-igraph {
     pkgconfig = pkgs.pkgconfig;
     igraph = pkgs.igraph;

From 69d1151bfabc005febf6f5f6a628072602a17f06 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 16 Nov 2018 16:22:11 -0600
Subject: [PATCH 0121/2793] ninja: make setup-hook.sh closer to setup.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Things changed in the Ninja setup-hook:
- Respect installFlags
- Automatically add checkPhase (can be disabled with dontUseNinjaCheck
  in the same way as dontUseNinjaBuild and dontUseNinjaInstall). Tests
  are only run when "ninja test" exists.
- Error in build phase when build.ninja is missing. We don’t have a
  way to fall back to other build methods, so it’s best to be very
  clear when we aren’t able to build with ninja
- Set -l flag to 1 when enableParallelBuilding is disabled
---
 .../tools/build-managers/ninja/setup-hook.sh  | 78 +++++++++++++------
 1 file changed, 56 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index d9ad7460931..61670ec9ebb 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -1,27 +1,23 @@
 ninjaBuildPhase() {
     runHook preBuild
 
-    if [[ -z "$ninjaFlags" && ! ( -e build.ninja ) ]]; then
-        echo "no build.ninja, doing nothing"
-    else
-        local buildCores=1
+    local buildCores=1
 
-        # Parallel building is enabled by default.
-        if [ "${enableParallelBuilding-1}" ]; then
-            buildCores="$NIX_BUILD_CORES"
-        fi
-
-        # shellcheck disable=SC2086
-        local flagsArray=( \
-            -j"$buildCores" -l"$NIX_BUILD_CORES" \
-            $ninjaFlags "${ninjaFlagsArray[@]}" \
-            $buildFlags "${buildFlagsArray[@]}")
-
-        echoCmd 'build flags' "${flagsArray[@]}"
-        ninja "${flagsArray[@]}"
-        unset flagsArray
+    # Parallel building is enabled by default.
+    if [ "${enableParallelBuilding-1}" ]; then
+        buildCores="$NIX_BUILD_CORES"
     fi
 
+    local flagsArray=(
+        -j$buildCores -l$buildCores
+        $ninjaFlags "${ninjaFlagsArray[@]}"
+        $buildFlags "${buildFlagsArray[@]}"
+    )
+
+    echoCmd 'build flags' "${flagsArray[@]}"
+    ninja "${flagsArray[@]}"
+    unset flagsArray
+
     runHook postBuild
 }
 
@@ -32,11 +28,12 @@ fi
 ninjaInstallPhase() {
     runHook preInstall
 
-    installTargets="${installTargets:-install}"
-
     # shellcheck disable=SC2086
-    local flagsArray=( $installTargets \
-        $ninjaFlags "${ninjaFlagsArray[@]}")
+    local flagsArray=(
+        $ninjaFlags "${ninjaFlagsArray[@]}"
+        $installFlags "${installFlagsArray[@]}"
+        ${installTargets:-install}
+    )
 
     echoCmd 'install flags' "${flagsArray[@]}"
     ninja "${flagsArray[@]}"
@@ -48,3 +45,40 @@ ninjaInstallPhase() {
 if [ -z "$dontUseNinjaInstall" -a -z "$installPhase" ]; then
     installPhase=ninjaInstallPhase
 fi
+
+ninjaCheckPhase() {
+    runHook preCheck
+
+    if [ -z "${checkTarget:-}" ]; then
+        if ninja -n test >/dev/null 2>&1; then
+            checkTarget=test
+        fi
+    fi
+
+    if [ -z "${checkTarget:-}" ]; then
+        echo "no check/test target in ${makefile:-Makefile}, doing nothing"
+    else
+        local buildCores=1
+
+        if [ "${enableParallelChecking-1}" ]; then
+            buildCores="$NIX_BUILD_CORES"
+        fi
+
+        local flagsArray=(
+            -j$buildCores -l$buildCores
+            $ninjaFlags "${ninjaFlagsArray[@]}"
+            $checkFlags "${checkFlagsArray[@]}"
+            $checkTarget
+        )
+
+        echoCmd 'check flags' "${flagsArray[@]}"
+        ninja "${flagsArray[@]}"
+        unset flagsArray
+    fi
+
+    runHook postCheck
+}
+
+if [ -z "$dontUseNinjaCheck" -a -z "$checkPhase" ]; then
+    checkPhase=ninjaCheckPhase
+fi

From 955fd85829ec9006ee5102dc66fea62f31ddbb28 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 16 Nov 2018 16:28:12 -0600
Subject: [PATCH 0122/2793] treewide: remove "ninja test" checkPhase

This is now handled in the ninja setup hook.

(cherry picked from commit f5e099754fffc3d2b68c8ba6fc8025f3c921fddc)
---
 pkgs/applications/audio/cozy-audiobooks/default.nix  | 4 ----
 pkgs/development/python-modules/pythonix/default.nix | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
index f0a7280b038..1b996f9f0c5 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -66,10 +66,6 @@ python3Packages.buildPythonApplication rec {
     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
   '';
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index fd8012a24d3..f7cecae8497 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -18,10 +18,6 @@ buildPythonPackage rec {
 
   buildInputs = [ nix boost ];
 
-  checkPhase = ''
-    ninja test
-  '';
-
   meta = with stdenv.lib; {
     description = ''
        Eval nix code from python.

From 9433a3882b8c3f9ab1503292335b73a4356bf750 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Nov 2018 19:08:47 -0600
Subject: [PATCH 0123/2793] ninja: fix mistake in setup-hook

---
 pkgs/development/tools/build-managers/ninja/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index 61670ec9ebb..7754819fd9a 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -56,7 +56,7 @@ ninjaCheckPhase() {
     fi
 
     if [ -z "${checkTarget:-}" ]; then
-        echo "no check/test target in ${makefile:-Makefile}, doing nothing"
+        echo "no test target found in ninja, doing nothing"
     else
         local buildCores=1
 

From f6f7283e692111603b15bae48026432469b85085 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 13:42:05 -0600
Subject: [PATCH 0124/2793] meson: remove check phase

This is now handled in ninja.
---
 .../tools/build-managers/meson/setup-hook.sh         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index b98225c1305..06375c1528e 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -39,15 +39,3 @@ if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then
     setOutputFlags=
     configurePhase=mesonConfigurePhase
 fi
-
-mesonCheckPhase() {
-    runHook preCheck
-
-    meson test --print-errorlogs
-
-    runHook postCheck
-}
-
-if [ -z "$dontUseMesonCheck" -a -z "$checkPhase" ]; then
-    checkPhase=mesonCheckPhase
-fi

From 2c47a4229f3b3c22b4d7d337694dcf2067b41594 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 14:33:09 -0600
Subject: [PATCH 0125/2793] treewide: remove ctest usages

These are already in the generated makefiles!
---
 pkgs/applications/audio/radiotray-ng/default.nix             | 1 -
 .../networking/instant-messengers/utox/default.nix           | 5 -----
 pkgs/applications/science/biology/EZminc/default.nix         | 2 --
 pkgs/applications/science/biology/N3/default.nix             | 3 ---
 pkgs/applications/science/biology/ants/default.nix           | 2 --
 pkgs/applications/science/biology/inormalize/default.nix     | 2 --
 pkgs/applications/science/biology/minc-tools/default.nix     | 2 --
 pkgs/desktops/gnome-3/apps/evolution/default.nix             | 2 --
 pkgs/development/libraries/arguments/default.nix             | 1 -
 pkgs/development/libraries/cmark/default.nix                 | 4 ++--
 pkgs/development/libraries/libcouchbase/default.nix          | 1 -
 pkgs/development/libraries/libtoxcore/default.nix            | 1 -
 pkgs/development/libraries/pagmo2/default.nix                | 4 ----
 pkgs/development/libraries/science/biology/EBTKS/default.nix | 2 --
 pkgs/development/libraries/science/biology/bicpl/default.nix | 1 -
 .../libraries/science/biology/elastix/default.nix            | 2 --
 .../libraries/science/biology/nifticlib/default.nix          | 1 -
 .../development/libraries/science/math/liblapack/default.nix | 4 ----
 pkgs/development/libraries/simpleitk/default.nix             | 2 --
 19 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 6f7ce9048c4..900c2bf7a41 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   checkInputs = [ gtest ];
-  checkPhase = "ctest";
   # doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
   doCheck = false; # fails to pick up supplied gtest, tries to download it instead
 
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 531ca5cbadc..3c5e65ffe77 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -32,11 +32,6 @@ stdenv.mkDerivation rec {
 
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
   checkInputs = [ check ];
-  checkPhase = ''
-    runHook preCheck
-    ctest -VV
-    runHook postCheck
-  '';
 
   meta = with stdenv.lib; {
     description = "Lightweight Tox client";
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix
index 20d88eb3aaf..dbcfead6b1e 100644
--- a/pkgs/applications/science/biology/EZminc/default.nix
+++ b/pkgs/applications/science/biology/EZminc/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec { pname = "EZminc";
                  "-DEZMINC_BUILD_MRFSEG=TRUE"
                  "-DEZMINC_BUILD_DD=TRUE" ];
 
-  checkPhase = "ctest --output-on-failure ../tests/";  # but ctest doesn't find the tests ...
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix
index c14846beec2..3502ac3e51b 100644
--- a/pkgs/applications/science/biology/N3/default.nix
+++ b/pkgs/applications/science/biology/N3/default.nix
@@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
 
-  checkPhase = "ctest --output-on-failure";
-  # don't run the tests as they fail at least due to missing program wrappers in this phase ...
-
   postFixup = ''
     for p in $out/bin/*; do
       wrapProgram $p --prefix PERL5LIB : $PERL5LIB
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index 0b8ddd0d4fb..f54bd9af028 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  checkPhase = "ctest";
-
   postInstall = ''
     for file in $out/bin/*; do
       wrapProgram $file --set ANTSPATH "$out/bin"
diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix
index f17143ad06b..7ba054a592e 100644
--- a/pkgs/applications/science/biology/inormalize/default.nix
+++ b/pkgs/applications/science/biology/inormalize/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
 
-  checkPhase = "ctest --output-on-failure";  # but no tests
-
   postFixup = ''
     for p in $out/bin/*; do
       wrapProgram $p --prefix PERL5LIB : $PERL5LIB
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 8e1f74686d1..c680eda95d2 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
 
-  checkPhase = "ctest --output-on-failure";  # still some weird test failures though
-
   postFixup = ''
     for prog in minccomplete minchistory mincpik; do
       wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 8fb8c230784..89a16b02893 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -38,8 +38,6 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkPhase = "ctest";
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "evolution";
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix
index 60fafd60ad0..ebef604e1be 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/pkgs/development/libraries/arguments/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
 
   #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ];
 
-  checkPhase = "ctest --output-on-failure";
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index fce02dac950..1cf963c8946 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   doCheck = !stdenv.isDarwin;
-  checkPhase = ''
+  preCheck = ''
     export LD_LIBRARY_PATH=$(readlink -f ./src)
-    CTEST_OUTPUT_ON_FAILURE=1 make test
+    export CTEST_OUTPUT_ON_FAILURE=1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 516702e2afe..2db78f82292 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ libevent openssl ];
 
   doCheck = !stdenv.isDarwin;
-  checkPhase = "ctest";
 
   meta = with stdenv.lib; {
     description = "C client library for Couchbase";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 4a8dfc40d4a..026674e44fc 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -31,7 +31,6 @@ let
 
     doCheck = false; # hangs, tries to access the net?
     checkInputs = [ check ];
-    checkPhase = "ctest";
 
     meta = with stdenv.lib; {
       description = "P2P FOSS instant messaging application aimed to replace Skype";
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 367cef46dc4..c680efa95f8 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -31,10 +31,6 @@ stdenv.mkDerivation rec {
                  "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
                  "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
 
-  checkPhase = ''
-    ctest
-  '';
-
   # All but one test pass skip for now (tests also take about 30 min to compile)
   doCheck = false;
 
diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix
index 67f868a91a7..f4353f51d66 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
 
-  checkPhase = "ctest --output-on-failure";  # but cmake doesn't run the tests ...
-
   meta = with stdenv.lib; {
     homepage = "https://github.com/BIC-MNI/${pname}";
     description = "Library for working with MINC files";
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix
index d00a74f61e2..f763e8a4fcc 100644
--- a/pkgs/development/libraries/science/biology/bicpl/default.nix
+++ b/pkgs/development/libraries/science/biology/bicpl/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ];
 
-  checkPhase = "ctest --output-on-failure";
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 7b9e6b24d41..5f4cbbaa567 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python ];
   buildInputs = [ itk ];
 
-  checkPhase = "ctest";
-
   meta = with stdenv.lib; {
     homepage = http://elastix.isi.uu.nl/;
     description = "Image registration toolkit based on ITK";
diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix
index 19e5644b993..51eed36312d 100644
--- a/pkgs/development/libraries/science/biology/nifticlib/default.nix
+++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib ];
 
-  checkPhase = "ctest";
   doCheck = false; # fails 7 out of 293 tests
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index e6af2251b1f..561be858023 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
 
   doCheck = ! shared;
 
-  checkPhase = "
-    ctest
-  ";
-
   enableParallelBuilding = true;
 
   passthru = {
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index c807325b155..1c17124a2bb 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];
 
-  checkPhase = "ctest";
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 4ebab3de1e54a2e5fe4b4075f86e486c95a5cdf4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 18:07:56 -0600
Subject: [PATCH 0126/2793] ninja: use -t query to find test target

---
 pkgs/development/tools/build-managers/ninja/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index 7754819fd9a..a593bb790bf 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -50,7 +50,7 @@ ninjaCheckPhase() {
     runHook preCheck
 
     if [ -z "${checkTarget:-}" ]; then
-        if ninja -n test >/dev/null 2>&1; then
+        if ninja -t query test >/dev/null 2>&1; then
             checkTarget=test
         fi
     fi

From a16c04c9d3669c2f5baab8ac28f7e06bf8a7759e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 19:03:03 -0600
Subject: [PATCH 0127/2793] =?UTF-8?q?ninja:=20don=E2=80=99t=20use=20build/?=
 =?UTF-8?q?install/check=20flags=20in=20setup-hook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These don’t have much use in ninja, so easiest to leave them out.
---
 pkgs/development/tools/build-managers/ninja/setup-hook.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index a593bb790bf..58347868682 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -11,7 +11,6 @@ ninjaBuildPhase() {
     local flagsArray=(
         -j$buildCores -l$buildCores
         $ninjaFlags "${ninjaFlagsArray[@]}"
-        $buildFlags "${buildFlagsArray[@]}"
     )
 
     echoCmd 'build flags' "${flagsArray[@]}"
@@ -31,7 +30,6 @@ ninjaInstallPhase() {
     # shellcheck disable=SC2086
     local flagsArray=(
         $ninjaFlags "${ninjaFlagsArray[@]}"
-        $installFlags "${installFlagsArray[@]}"
         ${installTargets:-install}
     )
 
@@ -67,7 +65,6 @@ ninjaCheckPhase() {
         local flagsArray=(
             -j$buildCores -l$buildCores
             $ninjaFlags "${ninjaFlagsArray[@]}"
-            $checkFlags "${checkFlagsArray[@]}"
             $checkTarget
         )
 

From b75d5adb330bf013fdbc9ff2514fad49a6ca3dc1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Nov 2018 19:29:51 -0600
Subject: [PATCH 0128/2793] ninja: restore old -l flag value

This can be set unconditionally to $NIX_BUILD_CORES according to
@orivej.
---
 pkgs/development/tools/build-managers/ninja/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index 58347868682..3e87814ba86 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -9,7 +9,7 @@ ninjaBuildPhase() {
     fi
 
     local flagsArray=(
-        -j$buildCores -l$buildCores
+        -j$buildCores -l$NIX_BUILD_CORES
         $ninjaFlags "${ninjaFlagsArray[@]}"
     )
 
@@ -63,7 +63,7 @@ ninjaCheckPhase() {
         fi
 
         local flagsArray=(
-            -j$buildCores -l$buildCores
+            -j$buildCores -l$NIX_BUILD_CORES
             $ninjaFlags "${ninjaFlagsArray[@]}"
             $checkTarget
         )

From 81ccf54c18a0ade9c3f13ff526a64e90179c1a71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 18:25:35 -0800
Subject: [PATCH 0129/2793] pcre2: 10.31 -> 10.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/pcre2/versions
---
 pkgs/development/libraries/pcre2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index bbc4dfae86c..89649f0bf30 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pcre2-${version}";
-  version = "10.31";
+  version = "10.32";
   src = fetchurl {
     url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
-    sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0";
+    sha256 = "0bkwp2czcckvvbdls7b331cad11rxsm020aqhrbz84z8bp68k7pj";
   };
 
   configureFlags = [

From aa706dc2c85a49ae84df6b1e78f5280f03e0b8ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 20:02:29 -0800
Subject: [PATCH 0130/2793] opencascade: 0.17.2 -> 0.18.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/opencascade-oce/versions
---
 pkgs/development/libraries/opencascade/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 4a12217443c..05d78488957 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -2,10 +2,10 @@
 ftgl, freetype}:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-oce-0.17.2";
+  name = "opencascade-oce-0.18.3";
   src = fetchurl {
-    url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
-    sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
+    url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
+    sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
   };
 
   buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];

From 24af67b42be7916ed4e38e1021a8b9c653492c1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 21:01:34 -0800
Subject: [PATCH 0131/2793] ocamlPackages.visitors: 20171124 -> 20180513

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-visitors/versions
---
 pkgs/development/ocaml-modules/visitors/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix
index 506721f7bf5..25a83fa7912 100644
--- a/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/pkgs/development/ocaml-modules/visitors/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, cppo, ppx_tools, ppx_deriving, result }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-visitors-20171124";
+  name = "ocaml${ocaml.version}-visitors-20180513";
 
   src = fetchurl {
-    url = http://gallium.inria.fr/~fpottier/visitors/visitors-20171124.tar.gz;
-    sha256 = "04047k2v0pgwcdkgw7jk4955pgil0nj2ji0zfhmlqrdbinyfqzac";
+    url = http://gallium.inria.fr/~fpottier/visitors/visitors-20180513.tar.gz;
+    sha256 = "12j8n9fkl43sd0j78x2zqix8m1vinswl2jgwndd62vmx98f5rl1v";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cppo ];

From bd54510d163231cf6b52c5206ab7125f1b3cef27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 21:17:09 -0800
Subject: [PATCH 0132/2793] ocamlPackages.opam-file-format: 2.0.0-rc2 -> 2.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/ocaml4.06.1-opam-file-format/versions
---
 pkgs/development/ocaml-modules/opam-file-format/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
index 1dec7e36e1c..f61a690da19 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc2";
+  version = "2.0.0";
   name = "ocaml${ocaml.version}-opam-file-format-${version}";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "opam-file-format";
     rev = "${version}";
-    sha256 = "05g0pikmifmfkwyws5x82fglgsz3d317yfn6nrz7zmpn22cirvir";
+    sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv";
   };
 
   buildInputs = [ ocaml findlib ];

From 9c8335444051de35a2ea661df9532685a6fb722f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 22:49:15 -0800
Subject: [PATCH 0133/2793] nasm: 2.13.03 -> 2.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/nasm/versions
---
 pkgs/development/compilers/nasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index b95f6e5ee95..271d26eda1c 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nasm-${version}";
-  version = "2.13.03";
+  version = "2.14";
 
   src = fetchurl {
     url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
-    sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
+    sha256 = "0i678zbm1ljn5jwia7gj1n503izwvzlh55xzm4i0qgfmr8kzsg6l";
   };
 
   nativeBuildInputs = [ perl ];

From c64467de653590e05aea1db3b6ea8f1d933667e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 23:32:14 -0800
Subject: [PATCH 0134/2793] ocamlPackages.csv: 2.1 -> 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/ocaml4.06.1-csv/versions
---
 pkgs/development/ocaml-modules/csv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index e10b21286dd..bfddc8d1c66 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   pname = "csv";
-	version = "2.1";
+	version = "2.2";
 
 	src = fetchurl {
 		url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
-		sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg";
+		sha256 = "1llwjdi14vvfy4966crapibq0djii71x47b0yxhjcl5jw4xnsaha";
 	};
 
 	meta = {

From 80a8ef49493e4d46f2997ce0c10c1faf9d83369f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 02:04:01 -0800
Subject: [PATCH 0135/2793] libnftnl: 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/libnftnl/versions
---
 pkgs/development/libraries/libnftnl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 0d4d6504142..ff729f586f4 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
+  version = "1.1.2";
   name = "libnftnl-${version}";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx";
+    sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 095c00b5586bfe1bf9213bd2d25992e3e3bc7b55 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 18 Nov 2018 12:09:57 +0000
Subject: [PATCH 0136/2793] eigen: replace with eigen3_3: 3.2.10 -> 3.3.5

---
 pkgs/development/libraries/eigen/3.3.nix     | 29 --------------------
 pkgs/development/libraries/eigen/default.nix | 16 +++++------
 pkgs/top-level/all-packages.nix              | 14 ++--------
 3 files changed, 10 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/libraries/eigen/3.3.nix

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
deleted file mode 100644
index c48f8e4c973..00000000000
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, fetchpatch, cmake}:
-
-let
-  version = "3.3.5";
-in
-stdenv.mkDerivation {
-  name = "eigen-${version}";
-
-  src = fetchurl {
-    url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
-    name = "eigen-${version}.tar.gz";
-    sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
-  };
-
-  patches = [
-    ./include-dir.patch
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with stdenv.lib; {
-    description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
-    license = licenses.lgpl3Plus;
-    homepage = http://eigen.tuxfamily.org ;
-    platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
-    inherit version;
-  };
-}
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index c120132dcb8..c48f8e4c973 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, fetchpatch, cmake}:
 
 let
-  version = "3.2.10";
+  version = "3.3.5";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,17 +9,15 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
+    sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
   };
 
+  patches = [
+    ./include-dir.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
-  doCheck = false; # a couple of tests fail with "Child aborted"
-
-  postInstall = ''
-    sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
-  '';
-
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2320e358805..0a9db55f2a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1676,9 +1676,7 @@ with pkgs;
 
   apparix = callPackage ../tools/misc/apparix { };
 
-  appleseed = callPackage ../tools/graphics/appleseed {
-    eigen = eigen3_3;
-  };
+  appleseed = callPackage ../tools/graphics/appleseed { };
 
   arping = callPackage ../tools/networking/arping { };
 
@@ -3213,9 +3211,7 @@ with pkgs;
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
-  halide = callPackage ../development/compilers/halide {
-    eigen = eigen3_3;
-  };
+  halide = callPackage ../development/compilers/halide { };
 
   hardinfo = callPackage ../tools/system/hardinfo { };
 
@@ -9471,7 +9467,6 @@ with pkgs;
   editline = callPackage ../development/libraries/editline { };
 
   eigen = callPackage ../development/libraries/eigen {};
-  eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {};
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
 
@@ -10702,9 +10697,7 @@ with pkgs;
 
   libf2c = callPackage ../development/libraries/libf2c {};
 
-  libfive = callPackage ../development/libraries/libfive {
-    eigen = eigen3_3;
-  };
+  libfive = callPackage ../development/libraries/libfive { };
 
   libfixposix = callPackage ../development/libraries/libfixposix {};
 
@@ -21677,7 +21670,6 @@ with pkgs;
   };
 
   caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
-    eigen = eigen3_3;
     inherit (python3Packages) python future six numpy pydot;
     protobuf = protobuf3_1;
     python-protobuf = python3Packages.protobuf.override { inherit protobuf; };

From 4b3b9087318e60be2a30af7fa87e86b64f9edc23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 03:03:34 -0800
Subject: [PATCH 0137/2793] libmicrohttpd: 0.9.59 -> 0.9.60

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 041e0d98d65..4462fca7b64 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmicrohttpd-${version}";
-  version = "0.9.59";
+  version = "0.9.60";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v";
+    sha256 = "0wf457bqbdvx53clk4dg2620p83vk4757l7lrpvmxrd9jlzms3nd";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];

From 7a48c7ccf8209bf16ab3516e6e7ffb0c415305ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 19 Nov 2018 12:11:06 +0100
Subject: [PATCH 0138/2793] meson: remove obsolete and blocking patch

meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
---
 pkgs/development/tools/build-managers/meson/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 118a7681c3a..13f61fb1617 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages, fetchpatch }:
+{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.48.2";
@@ -44,12 +44,6 @@ python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
-
-    # Support Python 3.7. This is part of 0.47 and 0.48.1.
-    (fetchpatch {
-      url = https://github.com/mesonbuild/meson/commit/a87496addd9160300837aa50193f4798c6f1d251.patch;
-      sha256 = "1jfn9dgib5bc8frcd65cxn3fzhp19bpbjadxjkqzbjk1v4hdbl88";
-    })
   ];
 
   setupHook = ./setup-hook.sh;

From 8cd3a08c672661ea6e89387efc55aa4937efb372 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 04:14:55 -0800
Subject: [PATCH 0139/2793] imlib2: 1.5.0 -> 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/imlib2/versions
---
 pkgs/development/libraries/imlib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 18b42ea4b4f..2576580908a 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "imlib2-1.5.0";
+  name = "imlib2-1.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
-    sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m";
+    sha256 = "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps";
   };
 
   buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]

From 6aebaa04276668c1c2126b8e4491f23293a64624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 19 Nov 2018 14:09:33 +0100
Subject: [PATCH 0140/2793] nlopt: move version into the derivation itself

---
 pkgs/development/libraries/nlopt/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 48b7acf2896..bbbc818db63 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,13 +1,8 @@
 { fetchurl, stdenv, octave ? null, cmake }:
 
-let
-
-  version = "2.5.0";
-
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "nlopt-${version}";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";

From d9a02b82d9af2972fabc4f6ae2d90c1f3dcc6110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 19 Nov 2018 14:09:41 +0100
Subject: [PATCH 0141/2793] slic3r-prusa3d: fix sha256 for version 1.41.1

The release tag was updated a few days after the initial release.
---
 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 cc9133257a0..445d996f605 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy";
+    sha256 = "0crjrll8cjpkllval6abrqzvzp8g3rnb4vmwi5vivw0jvdv3w5y7";
     rev = "version_${version}";
   };
 

From 59ba6a3e2b2b4bfc77e60f6cdd1c49b8eef7a745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 19 Nov 2018 14:09:52 +0100
Subject: [PATCH 0142/2793] slic3r-prusa3d: patch lib name for newer nlopt
 versions

The upgrade to version 2.5.0 of nlopt broke building of slic3r-prusa3d
because the C++ version of the nlopt lib is now integrated into
`libnlopt`.
---
 pkgs/applications/misc/slic3r/prusa3d.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 445d996f605..2f5486a0f4b 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
+{ stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
   boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
   glew, eigen, curl, gtest, nlopt, pcre, xorg }:
 let
@@ -98,6 +98,10 @@ stdenv.mkDerivation rec {
     # 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
+  '' + lib.optionalString (lib.versionOlder "2.5" nlopt.version) ''
+    # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
+    # now seems to be integrated into the main lib.
+    sed -i 's|nlopt_cxx|nlopt|g' xs/src/libnest2d/cmake_modules/FindNLopt.cmake
   '';
 
   postInstall = ''

From 9c258ce2d3a9aed6fe732ad369d0a4fb2ea83ca8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 05:31:59 -0800
Subject: [PATCH 0143/2793] keyutils: 1.5.10 -> 1.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/keyutils/versions
---
 pkgs/os-specific/linux/keyutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 6932afdf478..5e04dc51f3f 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keyutils-${version}";
-  version = "1.5.10";
+  version = "1.6";
 
   src = fetchurl {
     url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
-    sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i";
+    sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 82e2e90764efa529753c4359ef8124af746ae5db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 06:17:37 -0800
Subject: [PATCH 0144/2793] help2man: 1.47.7 -> 1.47.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/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 1b90cfb1d01..44ec787a1a5 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.7";
+  name = "help2man-1.47.8";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "03gckfr2980qn319c02vflq7d75vq2qdkxrw80kb9g84xn48wnsq";
+    sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj";
   };
 
   nativeBuildInputs = [ gettext LocaleGettext ];

From 44d91411538887471a3b01ce81c5175e9567268d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 07:02:38 -0800
Subject: [PATCH 0145/2793] hunspell: 1.6.2 -> 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/hunspell/versions
---
 pkgs/development/libraries/hunspell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 62c3d79cf9a..3728c05e516 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.7.0";
   name = "hunspell-${version}";
 
   src = fetchurl {
     url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
-    sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w";
+    sha256 = "12mwwqz6qkx7q1lg9vpjiiwh4fk4c8xs6g6g0xa2ia0hp5pbh9xv";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];

From 024ee18ff62c5f48c1106b0a7300e821029d4563 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 09:45:10 -0800
Subject: [PATCH 0146/2793] file: 5.34 -> 5.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/file/versions
---
 pkgs/tools/misc/file/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 1e8c902a050..b6ca95bc567 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "file-${version}";
-  version = "5.34";
+  version = "5.35";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "02mj4g34l13facacsc0ff8rchbh93ccqw7hns45yqgx8pzdm0npi";
+    sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h";
   };
 
   nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;

From 285eb9a8949a63446fd8bdffbe30a8468ed897c7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 19 Nov 2018 16:16:16 -0600
Subject: [PATCH 0147/2793] cmake: set CTEST_OUTPUT_ON_FAILURE globally

We should always use this.
---
 pkgs/applications/office/kmymoney/default.nix                | 2 +-
 pkgs/development/libraries/cmark/default.nix                 | 1 -
 .../development/libraries/science/math/scalapack/default.nix | 5 +----
 pkgs/development/tools/build-managers/cmake/setup-hook.sh    | 2 ++
 pkgs/development/tools/build-managers/ninja/setup-hook.sh    | 3 ---
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 7899bf607e5..7061a632394 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   installCheckPhase = let
     pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
   in lib.optionalString doInstallCheck ''
-    QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \
+    QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} \
       ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \
       ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
   '';
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 1cf963c8946..a7b604bc0d2 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isDarwin;
   preCheck = ''
     export LD_LIBRARY_PATH=$(readlink -f ./src)
-    export CTEST_OUTPUT_ON_FAILURE=1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 3961374a9b1..ba02b16383f 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       )
   '';
 
-  checkPhase = ''
+  preCheck = ''
     # make sure the test starts even if we have less than 4 cores
     export OMPI_MCA_rmaps_base_oversubscribe=1
 
@@ -35,9 +35,6 @@ stdenv.mkDerivation rec {
     export OMP_NUM_THREADS=1
 
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
-    export CTEST_OUTPUT_ON_FAILURE=1
-
-    make test
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index d37e25943b5..42b4999cfba 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -15,6 +15,8 @@ fixCmakeFiles() {
 cmakeConfigurePhase() {
     runHook preConfigure
 
+    export CTEST_OUTPUT_ON_FAILURE=1
+
     if [ -z "$dontFixCmake" ]; then
         fixCmakeFiles .
     fi
diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
index 3e87814ba86..e3c67bd139d 100644
--- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -15,7 +15,6 @@ ninjaBuildPhase() {
 
     echoCmd 'build flags' "${flagsArray[@]}"
     ninja "${flagsArray[@]}"
-    unset flagsArray
 
     runHook postBuild
 }
@@ -35,7 +34,6 @@ ninjaInstallPhase() {
 
     echoCmd 'install flags' "${flagsArray[@]}"
     ninja "${flagsArray[@]}"
-    unset flagsArray
 
     runHook postInstall
 }
@@ -70,7 +68,6 @@ ninjaCheckPhase() {
 
         echoCmd 'check flags' "${flagsArray[@]}"
         ninja "${flagsArray[@]}"
-        unset flagsArray
     fi
 
     runHook postCheck

From 5beb37d258dfb3258c50c54ca4a18d39790c8784 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 14:21:00 -0800
Subject: [PATCH 0148/2793] elfutils: 0.174 -> 0.175

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

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 6bd624a2878..477a5aa415d 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.174";
+  version = "0.175";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "12nhr8zrw4sjzrvpf38vl55bq5nm05qkd7nq76as443f0xq7xwnd";
+    sha256 = "0nx6nzbk0rw3pxbzxsfvrjjh37hibzd2gjz5bb8wccpf85ar5vzp";
   };
 
   patches = [ ./debug-info-from-env.patch ];

From 70e2b0bef065b1b9e68f8a86f8fc619ed3c6613e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 19 Nov 2018 18:14:44 -0600
Subject: [PATCH 0149/2793] cmake: also set CTEST_PARALLEL_LEVEL

---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 42b4999cfba..f095103ee04 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -16,6 +16,9 @@ cmakeConfigurePhase() {
     runHook preConfigure
 
     export CTEST_OUTPUT_ON_FAILURE=1
+    if [ -n "${enableParallelChecking-1}" ]; then
+        export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES
+    fi
 
     if [ -z "$dontFixCmake" ]; then
         fixCmakeFiles .

From 3ffda36356dd7b0fd41fb796b9a65f05f9f3a7a1 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Tue, 20 Nov 2018 01:15:13 +0100
Subject: [PATCH 0150/2793] wireguard: don't modprobe if boot.isContainer is
 set

---
 nixos/modules/services/networking/wireguard.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 564632a85ae..41aff1480a0 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -202,7 +202,7 @@ let
         };
 
         script = ''
-          modprobe wireguard
+          ${optionalString (!config.boot.isContainer) "modprobe wireguard"}
 
           ${values.preSetup}
 

From 1b32158eab4e5bafd4d492e7209a18210b6d5eb8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Nov 2018 18:44:38 -0800
Subject: [PATCH 0151/2793] apacheHttpd: 2.4.35 -> 2.4.37

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 b4b4cf49592..bf82e916590 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.35";
+  version = "2.4.37";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6";
+    sha256 = "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l";
   };
 
   # FIXME: -dev depends on -doc

From f96349c45658174d33836ea6c2b5528473977284 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 20 Jan 2018 03:58:35 -0500
Subject: [PATCH 0152/2793] pypy: Change libPrefix from pypy5.10 to pypy2.7

To avoid conflicting with pypy3, as per
https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../development/interpreters/python/pypy/2.7/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index d95707ecb22..3e2aa9d8d83 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -10,19 +10,16 @@
 assert zlibSupport -> zlib != null;
 
 let
-  majorVersion = "6.0";
-  minorVersion = "0";
-  minorVersionSuffix = "";
+  version = "6.0.0";
   pythonVersion = "2.7";
-  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
-  libPrefix = "pypy${majorVersion}";
+  libPrefix = "pypy${pythonVersion}";
   sitePackages = "site-packages";
 
   pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
 
 in stdenv.mkDerivation rec {
   name = "pypy-${version}";
-  inherit majorVersion version pythonVersion;
+  inherit version pythonVersion;
 
   src = fetchurl {
     url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";

From 91333c1740f45fe55ae248dddc9c86f057f02310 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 20 Jan 2018 04:00:41 -0500
Subject: [PATCH 0153/2793] pypy: Remove redundant --withmod-* flags

--allworkingmodules is already the default.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/interpreters/python/pypy/2.7/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 3e2aa9d8d83..854467e65a8 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -66,12 +66,7 @@ in stdenv.mkDerivation rec {
     ${pythonForPypy.interpreter} rpython/bin/rpython \
       --make-jobs="$NIX_BUILD_CORES" \
       -Ojit \
-      --batch pypy/goal/targetpypystandalone.py \
-      --withmod-_minimal_curses \
-      --withmod-unicodedata \
-      --withmod-thread \
-      --withmod-bz2 \
-      --withmod-_multiprocessing
+      --batch pypy/goal/targetpypystandalone.py
   '';
 
   setupHook = python-setup-hook sitePackages;

From 8b80dec522bd5e0e628e8ac018ed7b58f397a57f Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 20 Jan 2018 04:01:25 -0500
Subject: [PATCH 0154/2793] pypy: Reenable tests fixed upstream

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/interpreters/python/pypy/2.7/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 854467e65a8..d8fb633958e 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -79,9 +79,7 @@ in stdenv.mkDerivation rec {
     # disable shutils because it assumes gid 0 exists
     # disable socket because it has two actual network tests that fail
     # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
-    # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure
-    # disable test_zipfile64 because it causes ENOSPACE
-    ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python
+    ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python
   '';
 
   installPhase = ''

From 6d80927a43baee1b006fd54944084001dc04b5a5 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 20 Jan 2018 04:06:08 -0500
Subject: [PATCH 0155/2793] pypy: Set isPy2, isPy27

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/interpreters/python/pypy/2.7/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index d8fb633958e..6f7fa962296 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -116,6 +116,8 @@ in stdenv.mkDerivation rec {
     inherit zlibSupport libPrefix sitePackages;
     executable = "pypy";
     isPypy = true;
+    isPy2 = true;
+    isPy27 = true;
     buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
     interpreter = "${self}/bin/${executable}";
     withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};

From bf44d81df9ad72bc7d3ea37f2c7aa571eb0a8914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 20 Nov 2018 11:18:56 +0100
Subject: [PATCH 0156/2793] androidndk: 17c -> 18b

---
 pkgs/development/mobile/androidenv/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 9058da1c50a..282924047aa 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -306,7 +306,21 @@ rec {
       x86_64-linux = "12cacc70c3fd2f40574015631c00f41fb8a39048";
     };
   };
-  androidndk = androidndk_17c;
+
+  androidndk_18b = pkgs.callPackage ./androidndk.nix {
+    inherit (buildPackages)
+      unzip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses5 lib python3 libcxx
+      coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+    version = "18b";
+    sha1s = {
+      x86_64-darwin = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
+      x86_64-linux = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
+    };
+  };
+  androidndk = androidndk_18b;
 
   androidndk_r8e = import ./androidndk_r8e.nix {
     inherit (buildPackages)

From 4ef6ce5953ed07d048ee8ac89adcb8da905b363c Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Fri, 17 Aug 2018 12:11:40 -0400
Subject: [PATCH 0157/2793] aravis: init at 0.5.13

---
 pkgs/development/libraries/aravis/default.nix | 89 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/development/libraries/aravis/default.nix

diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
new file mode 100644
index 00000000000..dc98de1c2cb
--- /dev/null
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
+, audit, glib, libusb, libxml2
+, wrapGAppsHook
+, gstreamer ? null
+, gst-plugins-base ? null
+, gst-plugins-good ? null
+, gst-plugins-bad ? null
+, libnotify ? null
+, gnome3 ? null
+, enableUsb ? true
+, enablePacketSocket ? true
+, enableViewer ? true
+, enableGstPlugin ? true
+, enableCppTest ? false
+, enableFastHeartbeat ? false
+, enableAsan ? false
+}:
+
+let
+  gstreamerAtLeastVersion1 =
+    stdenv.lib.all
+      (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
+      [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+in
+  assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+  assert enableViewer -> enableGstPlugin;
+  assert enableViewer -> libnotify != null;
+  assert enableViewer -> gnome3 != null;
+  assert enableViewer -> gstreamerAtLeastVersion1;
+
+  stdenv.mkDerivation rec {
+
+    pname = "aravis";
+    version = "0.5.13";
+    name = "${pname}-${version}";
+
+    src = fetchFromGitHub {
+      owner = "AravisProject";
+      repo = "aravis";
+      rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48";
+      sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy";
+    };
+
+    outputs = [ "bin" "dev" "out" "lib" ];
+
+    nativeBuildInputs = [
+      autoreconfHook
+      pkgconfig
+      intltool
+      gtk-doc
+    ] ++ stdenv.lib.optional enableViewer wrapGAppsHook;
+
+    buildInputs =
+      [ glib libxml2 ]
+      ++ stdenv.lib.optional enableUsb libusb
+      ++ stdenv.lib.optional enablePacketSocket audit
+      ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
+      ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ];
+
+    preAutoreconf = ''./autogen.sh'';
+
+    configureFlags =
+      stdenv.lib.optional enableUsb "--enable-usb"
+        ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket"
+        ++ stdenv.lib.optional enableViewer "--enable-viewer"
+        ++ stdenv.lib.optional enableGstPlugin
+        (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin")
+        ++ stdenv.lib.optional enableCppTest "--enable-cpp-test"
+        ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
+        ++ stdenv.lib.optional enableAsan "--enable-asan";
+
+    postPatch = ''
+        ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
+      '';
+
+    doCheck = true;
+
+    meta = {
+      description = "Library for video acquisition using GenICam cameras";
+      longDescription = ''
+        Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
+      '';
+      homepage = https://aravisproject.github.io/docs/aravis-0.5;
+      license = stdenv.lib.licenses.lgpl2;
+      maintainers = [];
+      platforms = stdenv.lib.platforms.unix;
+    };
+  }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b4730f3518..70d9c2cff17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9136,6 +9136,10 @@ with pkgs;
     #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
+  aravis = callPackage ../development/libraries/aravis {
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
+  };
+
   arb = callPackage ../development/libraries/arb {};
   arb-git = callPackage ../development/libraries/arb/git.nix {};
 

From ae29a9e688845f276c60aa48e3d8426a2b9b2d6d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 20 Nov 2018 15:56:23 +0000
Subject: [PATCH 0158/2793] openssl: 1.0.2p -> 1.0.2q

CVE-2018-0734: https://www.openssl.org/news/vulnerabilities.html#2018-0734
CVE-2018-5407: https://www.openssl.org/news/vulnerabilities.html#2018-5407

No patches can any longer be shared between 1.0.2 and 1.1, so reorganize
patches into subdirectories (and remove an unused one).
---
 .../openssl/1.0.2/nix-ssl-cert-file.patch     | 16 +++++++++++++++
 .../use-etc-ssl-certs-darwin.patch            |  0
 .../{ => 1.0.2}/use-etc-ssl-certs.patch       |  0
 .../libraries/openssl/darwin-arch.patch       | 12 -----------
 .../development/libraries/openssl/default.nix | 20 ++++++++++---------
 5 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
 rename pkgs/development/libraries/openssl/{ => 1.0.2}/use-etc-ssl-certs-darwin.patch (100%)
 rename pkgs/development/libraries/openssl/{ => 1.0.2}/use-etc-ssl-certs.patch (100%)
 delete mode 100644 pkgs/development/libraries/openssl/darwin-arch.patch

diff --git a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
new file mode 100644
index 00000000000..5765409fdd5
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
@@ -0,0 +1,16 @@
+diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
+index e6d0e6e1a6..b89456fd87 100644
+--- a/crypto/x509/by_file.c
++++ b/crypto/x509/by_file.c
+@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
+     switch (cmd) {
+     case X509_L_FILE_LOAD:
+         if (argl == X509_FILETYPE_DEFAULT) {
+-            file = ossl_safe_getenv(X509_get_default_cert_file_env());
++            file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
++
++            if (!file)
++                file = ossl_safe_getenv(X509_get_default_cert_file_env());
+ 
+             if (file)
+                 ok = (X509_load_cert_crl_file(ctx, file,
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch
rename to pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
similarity index 100%
rename from pkgs/development/libraries/openssl/use-etc-ssl-certs.patch
rename to pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch
deleted file mode 100644
index 63db3efc084..00000000000
--- a/pkgs/development/libraries/openssl/darwin-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1c-orig/Configure openssl-1.0.1c/Configure
---- openssl-1.0.1c-orig/Configure	2012-03-14 23:20:40.000000000 +0100
-+++ openssl-1.0.1c/Configure	2012-12-18 17:29:30.268090633 +0100
-@@ -579,7 +579,7 @@
- "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- # iPhoneOS/iOS
- "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2ad4b8d904b..3e643807f1c 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -15,13 +15,7 @@ let
       inherit sha256;
     };
 
-    patches =
-      (args.patches or [])
-      ++ [ ./nix-ssl-cert-file.patch ]
-      ++ optional (versionOlder version "1.1.0")
-          (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
-      ++ optional (versionOlder version "1.0.2" && stdenv.hostPlatform.isDarwin)
-           ./darwin-arch.patch;
+    inherit patches;
 
     postPatch = ''
       patchShebangs Configure
@@ -125,13 +119,21 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2p";
-    sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
+    version = "1.0.2q";
+    sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p";
+    patches = [
+      ./1.0.2/nix-ssl-cert-file.patch
+
+      (if stdenv.hostPlatform.isDarwin
+       then ./1.0.2/use-etc-ssl-certs-darwin.patch
+       else ./1.0.2/use-etc-ssl-certs.patch)
+    ];
   };
 
   openssl_1_1 = common {
     version = "1.1.1";
     sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
+    patches = [ ./nix-ssl-cert-file.patch ];
   };
 
 }

From d012516c44dc6937e0b3eab5c3b6c5af6222da86 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 20 Nov 2018 15:56:49 +0000
Subject: [PATCH 0159/2793] openssl_1_1: 1.1.1 -> 1.1.1a

CVE-2018-0734: https://www.openssl.org/news/vulnerabilities.html#2018-0734
CVE-2018-0735: https://www.openssl.org/news/vulnerabilities.html#2018-0735
---
 .../libraries/openssl/1.1/nix-ssl-cert-file.patch | 15 +++++++++++++++
 pkgs/development/libraries/openssl/default.nix    |  6 +++---
 .../libraries/openssl/nix-ssl-cert-file.patch     | 14 --------------
 3 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
 delete mode 100644 pkgs/development/libraries/openssl/nix-ssl-cert-file.patch

diff --git a/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
new file mode 100644
index 00000000000..9e871cfb1d3
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
@@ -0,0 +1,15 @@
+diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
+index 244512c935..f0b70d7ea1 100644
+--- a/crypto/x509/by_file.c
++++ b/crypto/x509/by_file.c
+@@ -46,7 +46,9 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
+     switch (cmd) {
+     case X509_L_FILE_LOAD:
+         if (argl == X509_FILETYPE_DEFAULT) {
+-            file = ossl_safe_getenv(X509_get_default_cert_file_env());
++            file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
++            if (!file)
++                file = ossl_safe_getenv(X509_get_default_cert_file_env());
+             if (file)
+                 ok = (X509_load_cert_crl_file(ctx, file,
+                                               X509_FILETYPE_PEM) != 0);
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 3e643807f1c..8efcbd58dd1 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -131,9 +131,9 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1";
-    sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
-    patches = [ ./nix-ssl-cert-file.patch ];
+    version = "1.1.1a";
+    sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
+    patches = [ ./1.1/nix-ssl-cert-file.patch ];
   };
 
 }
diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
deleted file mode 100644
index 893fb3eb664..00000000000
--- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
---- openssl-1.0.2j-orig/crypto/x509/by_file.c	2016-09-26 11:49:07.000000000 +0200
-+++ openssl-1.0.2j/crypto/x509/by_file.c	2016-10-13 16:54:31.400288302 +0200
-@@ -97,7 +97,9 @@
-     switch (cmd) {
-     case X509_L_FILE_LOAD:
-         if (argl == X509_FILETYPE_DEFAULT) {
--            file = getenv(X509_get_default_cert_file_env());
-+            file = getenv("NIX_SSL_CERT_FILE");
-+            if (!file)
-+                file = getenv(X509_get_default_cert_file_env());
-             if (file)
-                 ok = (X509_load_cert_crl_file(ctx, file,
-                                               X509_FILETYPE_PEM) != 0);

From aa8ff56401728ac23c074b2b027e2f44a1111d51 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 12 Nov 2018 18:12:13 -0500
Subject: [PATCH 0160/2793] python3Packages.async_generator: fix build on
 python3.5

---
 pkgs/development/python-modules/async_generator/default.nix | 5 ++++-
 pkgs/development/python-modules/pytest-asyncio/default.nix  | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix
index 6bf77ecd75e..b8ec2f54476 100644
--- a/pkgs/development/python-modules/async_generator/default.nix
+++ b/pkgs/development/python-modules/async_generator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, pytest-asyncio }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "async_generator";
@@ -17,6 +17,9 @@ buildPythonPackage rec {
     pytest -W error -ra -v --pyargs async_generator
   '';
 
+  # disable tests on python3.5 to avoid circular dependency with pytest-asyncio
+  doCheck = !isPy35;
+
   meta = with lib; {
     description = "Async generators and context managers for Python 3.5+";
     homepage = https://github.com/python-trio/async_generator;
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 6b4ce6f6123..24602c52260 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
 buildPythonPackage rec {
   pname = "pytest-asyncio";
   version = "0.9.0";
@@ -10,7 +10,8 @@ buildPythonPackage rec {
     sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf";
   };
 
-  buildInputs = [ pytest ];
+  buildInputs = [ pytest ]
+    ++ stdenv.lib.optionals isPy35 [ async_generator ];
 
   # No tests in archive
   doCheck = false;

From ae93ed0f0d4e7be0a286d1fca86446318c0c6ffb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 6 Nov 2018 13:04:42 +0100
Subject: [PATCH 0161/2793] nixos/slurm: set slurmd KillMode to process

The default of systemd is to kill the
the whole cgroup of a service. For slurmd
this means that all running jobs get killed
as well whenever the configuration is updated (and activated).

To avoid this behaviour we set "KillMode=process"
to kill only slurmd on reload. This is how
slurm configures the systemd service.

See:
https://bugs.schedmd.com/show_bug.cgi?id=2095#c24
https://github.com/SchedMD/slurm/commit/508f866ea10e4c359d62d443279198082d587107
---
 nixos/modules/services/computing/slurm/slurm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index cd481212db2..cd1b6264fa9 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -303,6 +303,7 @@ in
 
       serviceConfig = {
         Type = "forking";
+        KillMode = "process";
         ExecStart = "${wrappedSlurm}/bin/slurmd";
         PIDFile = "/run/slurmd.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

From f7b05cafff6e7cb64ecb2d4d01f876a263b9c1f3 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 18 Jun 2018 09:31:15 -0400
Subject: [PATCH 0162/2793] vscode-extensions.WakaTime.vscode-wakatime: init at
 1.2.3

---
 pkgs/misc/vscode-extensions/default.nix       |  2 ++
 pkgs/misc/vscode-extensions/vscode-utils.nix  | 12 ++++----
 .../vscode-extensions/wakatime/default.nix    | 30 +++++++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/misc/vscode-extensions/wakatime/default.nix

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index dd1bb0ad124..59938b76fe0 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -26,4 +26,6 @@ rec {
   ms-vscode.cpptools = callPackage ./cpptools {};
 
   ms-python.python = callPackage ./python {};
+
+  WakaTime.vscode-wakatime = callPackage ./wakatime {};
 }
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index d7ec669204c..82d39dbfec6 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -65,10 +65,10 @@ let
     "sha256"
   ];
 
-  mktplcExtRefToExtDrv = ext: 
-    buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { 
-      mktplcRef = ext; 
-    }); 
+  mktplcExtRefToExtDrv = ext:
+    buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // {
+      mktplcRef = ext;
+    });
 
   extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
   extensionsFromVscodeMarketplace = mktplcExtRefList:
@@ -77,7 +77,7 @@ let
 in
 
 {
-  inherit fetchVsixFromVscodeMarketplace buildVscodeExtension 
+  inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
           buildVscodeMarketplaceExtension extensionFromVscodeMarketplace
           extensionsFromVscodeMarketplace;
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
new file mode 100644
index 00000000000..fe7943dbefb
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, wakatime, vscode-utils }:
+
+let
+  inherit (vscode-utils) buildVscodeMarketplaceExtension;
+in
+  buildVscodeMarketplaceExtension {
+    mktplcRef = {
+      name = "vscode-wakatime";
+      publisher = "WakaTime";
+      version = "1.2.3";
+      sha256 = "1n7bxkwgpip11k6d7zc3ifp9zb6p7f27f4x4g584wisrnfnqj1bp";
+    };
+
+    postPatch = ''
+      mkdir -p out/wakatime-master
+
+      cp -rt out/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
+    '';
+
+    meta = with stdenv.lib; {
+      description = ''
+        Visual Studio Code plugin for automatic time tracking and metrics generated
+        from your programming activity
+      '';
+      license = licenses.bsd3;
+      maintainers = with maintainers; [
+        eadwu
+      ];
+    };
+  }

From b13af1e87b26a3ee7d81c4b237710a93e1f243e8 Mon Sep 17 00:00:00 2001
From: eburimu <eburimu@users.noreply.github.com>
Date: Tue, 20 Nov 2018 21:41:16 -0600
Subject: [PATCH 0163/2793] cyrus-sasl: 2.1.26 -> 2.1.27 w/ cross-compiling
 support

Fixes #50539
---
 .../cyrus-sasl-ac-try-run-fix.patch           | 12 +++++++++
 .../libraries/cyrus-sasl/default.nix          | 25 +++++++------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch

diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
new file mode 100644
index 00000000000..8662e812e99
--- /dev/null
+++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
@@ -0,0 +1,12 @@
+--- a/m4/sasl2.m4	2018-11-18 22:33:29.902625600 +0300
++++ b/m4/sasl2.m4	2018-11-18 22:33:59.828746176 +0300
+@@ -339,7 +339,8 @@
+ ],	
+ 	[ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+ 	AC_MSG_RESULT(yes) ],
+-	AC_MSG_RESULT(no))
++	AC_MSG_RESULT(no),
++    AC_MSG_RESULT(no))
+   LIBS="$cmu_save_LIBS"
+ 
+ else
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index cec7e1a2d51..4344923f694 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,32 +1,29 @@
-{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext,
-  pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }:
+{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
+, pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false
+, buildPackages }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
-  version = "2.1.26";
+  version = "2.1.27";
 
   src = fetchurl {
     url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
-    sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
+    sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames ];
   buildInputs =
     [ openssl db gettext kerberos ]
     ++ lib.optional enableLdap openldap
-    ++ lib.optional stdenv.isFreeBSD autoreconfHook
-    ++ lib.optional stdenv.isLinux pam
-    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isLinux pam;
 
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
-    (fetchpatch {
-      name = "CVE-2013-4122.patch";
-      url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
-      sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
-    })
+    ./cyrus-sasl-ac-try-run-fix.patch
   ] ++ lib.optional stdenv.isFreeBSD (
       fetchurl {
         url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
@@ -42,10 +39,6 @@ stdenv.mkDerivation rec {
     "--enable-shared"
   ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
 
-  # Avoid triggering regenerating using broken autoconf/libtool bits.
-  # (many distributions carry patches to remove/replace, but this works for now)
-  dontUpdateAutotoolsGnuConfigScripts = if stdenv.hostPlatform.isMusl then true else null;
-
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 
   postInstall = ''

From 4d8664e593d54b4ee2722ef6c8286bac8b60418f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 20 Nov 2018 21:29:45 -0600
Subject: [PATCH 0164/2793] libtirpc: fix cross compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

KRB5_CONFIG needs to be aviailable to get the right one when cross
compiling. These things should just use pkgconfig, but it’s fairly
easy to hack around this. krb5-config will not be on path because we
don’t know ahead of time what architecture it will be for.
---
 pkgs/development/libraries/ti-rpc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index c139b5be102..d67d7618574 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
                 '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__'
   '';
 
+  KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config";
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libkrb5 ];
 

From 4d10fb36d466c6c4620429d409a1e65629648395 Mon Sep 17 00:00:00 2001
From: eburimu <eburimu@users.noreply.github.com>
Date: Tue, 20 Nov 2018 21:25:28 -0600
Subject: [PATCH 0165/2793] nspr: fix cross compilation

Fixes #50656
---
 pkgs/development/libraries/nspr/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index cdbd57d785f..56804d54667 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
-, CoreServices ? null }:
+, CoreServices ? null
+, buildPackages }:
 
 let version = "4.20"; in
 
@@ -21,6 +22,8 @@ stdenv.mkDerivation {
     substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
   '';
 
+  HOST_CC = "cc";
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   configureFlags = [
     "--enable-optimize"
     "--disable-debug"

From 36e2e9dd3383c42c60f20e026a51d127d7e299dc Mon Sep 17 00:00:00 2001
From: eburimu <eburimu@users.noreply.github.com>
Date: Tue, 20 Nov 2018 21:19:48 -0600
Subject: [PATCH 0166/2793] fontconfig: use native xsltproc in case of cross
 compilation

Fixes #50801
---
 pkgs/development/libraries/fontconfig/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 1a028526726..f730e3e3408 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
   propagatedBuildInputs = [ freetype ];
-  nativeBuildInputs = [ pkgconfig gperf ];
+  nativeBuildInputs = [ pkgconfig gperf libxslt ];
   buildInputs = [ expat ];
 
   configureFlags = [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     cd "$out/etc/fonts"
-    "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \
+    xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \
       --stringparam fontconfigConfigVersion "${configVersion}" \
       --path $out/share/xml/fontconfig \
       ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
@@ -77,4 +77,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.vcunat ];
   };
 }
-

From 0470591687161a447ca6969954251d9b4c4dddcd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 12:50:54 +0100
Subject: [PATCH 0167/2793] python.pkgs.metaphone: fix pname

This is a proper fix for 2224d42e024630647f612a145fbae1fdd66f1f5e.
The pname is used by fetchPypi, so you can't just modify it
and expect fetching to still work.
---
 pkgs/development/python-modules/metaphone/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix
index c2f5201538f..e167ee494a8 100644
--- a/pkgs/development/python-modules/metaphone/default.nix
+++ b/pkgs/development/python-modules/metaphone/default.nix
@@ -5,7 +5,8 @@ buildPythonPackage rec {
   version = "0.6";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "Metaphone";
+    inherit version;
     sha256 = "09ysaczwh2rlsqq9j5fz7m4pq2fs0axp5vvivrpfrdvclvffl2xd";
   };
 

From 9dd56a9b1e9231ac3289ede63e252407671fb87c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 12:52:17 +0100
Subject: [PATCH 0168/2793] python.pkgs.sphinx: fix pname

This is a proper fix for d2e6608aa520b17a45a39cdfbefd0240bd56b332
The pname is used by fetchPypi, so you can't just modify it
and expect fetching to still work.
---
 pkgs/development/python-modules/sphinx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 59fd7465be3..831c527af0e 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
   pname = "sphinx";
   version = "1.7.9";
   src = fetchPypi {
-    inherit pname version;
+    pname = "Sphinx";
+    inherit version;
     sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4";
   };
   LC_ALL = "en_US.UTF-8";

From 16267b4389c75cba9f0f10664043bd6d47013827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 21 Nov 2018 16:28:15 +0100
Subject: [PATCH 0169/2793] enchant: 1.6.0 -> 1.6.1

hunspell-1.7.0 broke enchant-1.6, upgrading to the latest 1.6 release fixes the
problem.
---
 pkgs/development/libraries/enchant/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index a9446306d33..dc0967ef61e 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
   pname = "enchant";
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
-    sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
+    url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
+    sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Generic spell checking library";
-    homepage = http://www.abisource.com/enchant;
+    homepage = https://abiword.github.io/enchant;
     platforms = platforms.unix;
     license = licenses.lgpl21;
   };

From 9564927888dc683360a045640c3e38b85a7fa76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 19 Nov 2018 17:11:05 +0000
Subject: [PATCH 0170/2793] buildGoPackage: remove build-time dependency on
 parallel (and perl)

xargs is as good as parallel for our job

fixes #50752
---
 pkgs/development/go-modules/generic/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 0e092473bd5..deebba5cfec 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync
+{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
 , removeReferencesTo, fetchFromGitHub }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
@@ -78,7 +78,7 @@ go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   inherit name;
-  nativeBuildInputs = [ removeReferencesTo go parallel ]
+  nativeBuildInputs = [ removeReferencesTo go ]
     ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
   buildInputs = [ go ] ++ buildInputs;
 
@@ -162,11 +162,11 @@ go.stdenv.mkDerivation (
     else
       touch $TMPDIR/buildFlagsArray
     fi
-    export -f buildGoDir # parallel needs to see the function
+    export -f buildGoDir # xargs needs to see the function
     if [ -z "$enableParallelBuilding" ]; then
         export NIX_BUILD_CORES=1
     fi
-    getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
+    getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
 
     runHook postBuild
   '';
@@ -175,7 +175,7 @@ go.stdenv.mkDerivation (
   checkPhase = args.checkPhase or ''
     runHook preCheck
 
-    getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test
+    getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
 
     runHook postCheck
   '';

From 8bbf525fd383e77ea5ce63d663055a146aba4a42 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 9 Oct 2018 14:14:56 -0500
Subject: [PATCH 0171/2793] libx11: 1.6.6 -> 1.6.7

https://lists.x.org/archives/xorg-announce/2018-October/002921.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 b53a5a23533..ccf0dfe9034 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation {
-    name = "libX11-1.6.6";
+    name = "libX11-1.6.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2;
-      sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5";
+      url = mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2;
+      sha256 = "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 1775d697d81..30b553b93db 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -60,7 +60,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2

From 003a96c04c0ff4a5c2e2e3edbb1d87ce8d2d7908 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Nov 2018 11:06:24 -0600
Subject: [PATCH 0172/2793] git: 2.19.1 -> 2.19.2

https://github.com/git/git/blob/master/Documentation/RelNotes/2.19.2.txt
---
 .../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 b946d0b7daa..88704ef281e 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.1";
+  version = "2.19.2";
   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 = "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l";
+    sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From db900da8d898668c75f732eae160d1142d800ed0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 21 Nov 2018 13:15:35 -0500
Subject: [PATCH 0173/2793] pythonPackages.docutils: fix python3 build on
 darwin

---
 pkgs/development/python-modules/docutils/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index c31cfceebba..c2aced4e45e 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -14,17 +14,15 @@ buildPythonPackage rec {
     sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
   };
 
-  checkPhase = if isPy3k then ''
-    ${python.interpreter} test3/alltests.py
-  '' else ''
-    ${python.interpreter} test/alltests.py
+  checkPhase = ''
+    LANG="en_US.UTF-8" ${python.interpreter} ${if isPy3k then "test3/alltests.py" else "test/alltests.py"}
   '';
 
   # Create symlinks lacking a ".py" suffix, many programs depend on these names
   postFixup = ''
-    (cd $out/bin && for f in *.py; do
-      ln -s $f $(echo $f | sed -e 's/\.py$//')
-    done)
+    for f in $out/bin/*.py; do
+      ln -s $(basename $f) $out/bin/$(basename $f .py)
+    done
   '';
 
   meta = {

From 1d3a243a2536ed5ad1d6e385ad4be6d1eeeedfd9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 22 Nov 2018 10:32:53 +0800
Subject: [PATCH 0174/2793] freerdp: 2.0.0-rc3 -> 2.0.0-rc4

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

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index f80d47d36f1..6512792dd2b 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   name = "freerdp-${version}";
-  version = "2.0.0-rc3";
+  version = "2.0.0-rc4";
 
   src = fetchFromGitHub {
     owner  = "FreeRDP";
     repo   = "FreeRDP";
     rev    = version;
-    sha256 = "0lpn6klwfnw69imgiibn3mff7lzli2idphgvw5lnradbfw4pr9qc";
+    sha256 = "0546i0m2d4nz5jh84ngwzpcm3c43fp987jk6cynqspsmvapab6da";
   };
 
   # outputs = [ "bin" "out" "dev" ];

From 60c6dc3f5e829f74da99ed3166401001ec5d5a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 Nov 2018 09:36:06 +0000
Subject: [PATCH 0175/2793] go_1_11: remove unused postConfigure

Since it was overriding configurePhase postConfigure has not be used in a while.
---
 pkgs/development/compilers/go/1.11.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 91afc89ae14..795a029a170 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -5,11 +5,6 @@ let
 
   inherit (stdenv.lib) optionals optionalString;
 
-  clangHack = writeScriptBin "clang" ''
-    #!${stdenv.shell}
-    exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
-  '';
-
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
     cp -rf ${go_bootstrap}/* $out/
@@ -164,10 +159,6 @@ stdenv.mkDerivation rec {
     ulimit -a
   '';
 
-  postConfigure = optionalString stdenv.isDarwin ''
-    export PATH=${clangHack}/bin:$PATH
-  '';
-
   installPhase = ''
     cp -r . $GOROOT
     ( cd $GOROOT/src && ./all.bash )

From 416d8928b26707b16ba85faefaf7a5d7ba667d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 Nov 2018 09:37:20 +0000
Subject: [PATCH 0176/2793] go_1_11: split into install/check phase

For cross compilation we want to skip installCheckPhase.
---
 pkgs/development/compilers/go/1.11.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 795a029a170..9676b92e8c3 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -160,8 +160,17 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
     cp -r . $GOROOT
-    ( cd $GOROOT/src && ./all.bash )
+    ( cd $GOROOT/src && ./make.bash )
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preCheck
+    ( cd $GOROOT/src && ./run.bash --no-rebuild)
+    runHook postCheck
   '';
 
   preFixup = ''

From 90720d0139feaf7421344073430d2a6f5ecbb231 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Thu, 22 Nov 2018 03:59:41 +0100
Subject: [PATCH 0177/2793] curl: cherry-pick upstream patch for ipv6 url
 parsing

Upstream bug: curl/curl#3218.

This causes nixos/tests/ipv6.nix to fix since the last staging merge.
---
 pkgs/tools/networking/curl/default.nix        |  5 ++
 .../curl/fix-ipv6-url-parsing.patch           | 54 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/fix-ipv6-url-parsing.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index dac92f98223..42ea641afb6 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
     sha256 = "084niy7cin13ba65p8x38w2xcyc54n3fgzbin40fa2shfr0ca0kq";
   };
 
+  patches = [
+    # Cherry picked fix for https://github.com/curl/curl/issues/3218
+    ./fix-ipv6-url-parsing.patch
+  ];
+
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
   separateDebugInfo = stdenv.isLinux;
 
diff --git a/pkgs/tools/networking/curl/fix-ipv6-url-parsing.patch b/pkgs/tools/networking/curl/fix-ipv6-url-parsing.patch
new file mode 100644
index 00000000000..8a74b27ce7f
--- /dev/null
+++ b/pkgs/tools/networking/curl/fix-ipv6-url-parsing.patch
@@ -0,0 +1,54 @@
+From b28094833a971870fd8c07960b3b12bf6fbbaad3 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Fri, 2 Nov 2018 15:11:16 +0100
+Subject: [PATCH] URL: fix IPv6 numeral address parser
+
+Regression from 46e164069d1a52. Extended test 1560 to verify.
+
+Reported-by: tpaukrt on github
+Fixes #3218
+Closes #3219
+---
+ lib/urlapi.c            | 8 ++++++--
+ tests/libtest/lib1560.c | 9 +++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/lib/urlapi.c b/lib/urlapi.c
+index c53e523434..18a6076fff 100644
+--- a/lib/urlapi.c
++++ b/lib/urlapi.c
+@@ -499,8 +499,12 @@ static CURLUcode parse_port(struct Curl_URL *u, char *hostname)
+      (']' == endbracket)) {
+     /* this is a RFC2732-style specified IP-address */
+     portptr = &hostname[len];
+-    if (*portptr != ':')
+-      return CURLUE_MALFORMED_INPUT;
++    if(*portptr) {
++      if(*portptr != ':')
++        return CURLUE_MALFORMED_INPUT;
++    }
++    else
++      portptr = NULL;
+   }
+   else
+     portptr = strchr(hostname, ':');
+diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
+index e0faa12b29..57469a9063 100644
+--- a/tests/libtest/lib1560.c
++++ b/tests/libtest/lib1560.c
+@@ -128,6 +128,15 @@ struct querycase {
+ };
+ 
+ static struct testcase get_parts_list[] ={
++  {"http://[fd00:a41::50]:8080",
++   "http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
++   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
++  {"http://[fd00:a41::50]/",
++   "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",
++   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
++  {"http://[fd00:a41::50]",
++   "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",
++   CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+   {"https://[::1%252]:1234",
+    "https | [11] | [12] | [13] | [::1%252] | 1234 | / | [16] | [17]",
+    CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},

From 25af5188454a7ce35e11366f8102b0698f72ebea Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 6 Nov 2018 23:48:01 +0100
Subject: [PATCH 0178/2793] nixos/slurm: add extraConfigPaths options

---
 nixos/modules/services/computing/slurm/slurm.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index cd1b6264fa9..d1a1383e45b 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -46,7 +46,7 @@ let
   # in the same directory as slurm.conf
   etcSlurm = pkgs.symlinkJoin {
     name = "etc-slurm";
-    paths = [ configFile cgroupConfig plugStackConfig ];
+    paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
   };
 
 in
@@ -239,6 +239,17 @@ in
         '';
       };
 
+      extraConfigPaths = mkOption {
+        type = with types; listOf path;
+        default = [];
+        description = ''
+          Slurm expects config files for plugins in the same path
+          as <literal>slurm.conf</literal>. Add extra nix store
+          paths that should be merged into same directory as
+          <literal>slurm.conf</literal>.
+        '';
+      };
+
 
     };
 

From 0e8332ca2bfe5503cec403ac759c180f1d3d0ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?=
 <pierre-etienne.meunier@inria.fr>
Date: Thu, 22 Nov 2018 11:40:03 +0000
Subject: [PATCH 0179/2793] Fixing "include"

---
 pkgs/build-support/rust/build-rust-crate/helpers.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix
index e04324684e5..8a0a62434ec 100644
--- a/pkgs/build-support/rust/build-rust-crate/helpers.nix
+++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix
@@ -2,6 +2,7 @@
 {
   kernel = stdenv.hostPlatform.parsed.kernel.name;
   abi = stdenv.hostPlatform.parsed.abi.name;
+  cpu = stdenv.hostPlatform.parsed.cpu.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:
@@ -11,10 +12,12 @@
        features
    ) [] (builtins.attrNames feat);
   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
+     lib.lists.any (f:
+       let p = toString (src + ("/" + f));
+           suff = lib.strings.removePrefix p path;
+       in
+       suff == "" || (lib.strings.hasPrefix "/" suff)
+     ) includedFiles
   ) src;
   exclude = excludedFiles: src: builtins.filterSource (path: type:
     lib.lists.all (f:

From 0ed4fc606ae0ee92113fe72f17cf3ee5381bd8f8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 22 Nov 2018 13:21:37 +0100
Subject: [PATCH 0180/2793] nixos/slurm: add recommended mysql settings

---
 nixos/tests/slurm.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 7f9c266cbff..30e408c7db1 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -63,6 +63,12 @@ in {
             ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
             name = "slurm";
           }];
+          extraOptions = ''
+            # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration
+            innodb_buffer_pool_size=1024M
+            innodb_log_file_size=64M
+            innodb_lock_wait_timeout=900
+          '';
         };
       };
 

From 4cb63dc74ce546373b484d297b2ef0f5b1343972 Mon Sep 17 00:00:00 2001
From: Craig Younkins <cyounkins@gmail.com>
Date: Fri, 23 Nov 2018 02:09:49 +0000
Subject: [PATCH 0181/2793] perlPackages.MailSender: init at 0.903

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 012531799c3..c951822f8f4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9156,6 +9156,19 @@ let
     };
   };
 
+  MailSender = buildPerlPackage rec {
+    name = "Mail-Sender-0.903";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz";
+      sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf";
+    };
+    meta = {
+      homepage = https://github.com/Perl-Email-Project/Mail-Sender;
+      description = "(DEPRECATED) module for sending mails with attachments through an SMTP server";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MailSendmail = buildPerlPackage rec {
     name = "Mail-Sendmail-0.80";
     src = fetchurl {

From c116de941106a0f546b3a1659033e4044f40a2d2 Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Thu, 22 Nov 2018 19:57:01 -0800
Subject: [PATCH 0182/2793] Use runtimeShell for dhcpcd

---
 pkgs/tools/networking/dhcpcd/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index fa025a2ec89..b9aa7156e86 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
+{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:
 
 stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
     runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
   ];
 
+  prePatch = ''
+    substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
+  '';
+
   preConfigure = "patchShebangs ./configure";
 
   configureFlags = [

From e8bce19aeaecbae12da05049944fc4776035c15b Mon Sep 17 00:00:00 2001
From: Daniel Goertzen <daniel.goertzen@gmail.com>
Date: Thu, 22 Nov 2018 14:18:53 -0600
Subject: [PATCH 0183/2793] openssl: fix cross compile (perl)

Fixes issue #50921. Build result was depending on build perl instead of
host perl which broke cross compilation.
---
 pkgs/development/libraries/openssl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 8efcbd58dd1..3ec8e3ab229 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -87,6 +87,7 @@ let
     '' +
     ''
       mkdir -p $bin
+      substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
       mv $out/bin $bin/
 
       mkdir $dev

From dd69374a63a9ea57b1fbe1d464bb3757e00bc139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 23 Nov 2018 15:47:06 +0100
Subject: [PATCH 0184/2793] libjpeg-turbo: don't change ABI, don't add *.a

(refers to the parent commit)
---
 pkgs/development/libraries/libjpeg-turbo/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 826fd81a38a..4e654168d4b 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cmakeFlagsArray+=(
       "-DCMAKE_INSTALL_BINDIR=$bin/bin"
-      "-DWITH_JPEG8=1"
-      "-DWITH_JPEG9=1"
+      "-DENABLE_STATIC=0"
     )
   '';
 

From d4f2925a1c5a29ab85edf643b549917565fe0ce4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 22 Nov 2018 16:47:09 -0600
Subject: [PATCH 0185/2793] pixman: 0.34.0 -> 0.36.0

---
 pkgs/development/libraries/pixman/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index af4e12a014b..58dc6707c18 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -2,23 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "pixman-${version}";
-  version = "0.34.0";
+  version = "0.36.0";
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/${name}.tar.bz2";
-    sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
+    sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px";
   };
 
-  patches = stdenv.lib.optionals stdenv.cc.isClang [
-    (fetchpatch {
-      name = "builtin-shuffle.patch";
-      url = https://patchwork.freedesktop.org/patch/177506/raw;
-      sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr";
-    })
-  ];
-
-  nativeBuildInputs = [ pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ libpng ];
 

From 84634a3b91d7518fbf329e7ac7e95e784c27ebf7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 22 Nov 2018 16:49:13 -0600
Subject: [PATCH 0186/2793] bison: 3.2.1 -> 3.2.2

---
 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 bae134ea3a5..2aca4af1dea 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.2.1";
+  name = "bison-3.2.2";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.gz";
-    sha256 = "1pgcvwzzlckb83sdcljz75hg71zwbc2a4pl5ycwxsxw05423gwq1";
+    sha256 = "0v3q6ym34krb4iskg0pspvpm35wmp3gx9njb9c35cv0w0h0j5z9z";
   };
 
   patches = []; # remove on another rebuild

From e90f44f94bc4456c6464c80df46b73737036d648 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 23 Nov 2018 18:21:03 -0600
Subject: [PATCH 0187/2793] pixman: remove unused args

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

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 58dc6707c18..61af6e7fdab 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
   name = "pixman-${version}";

From 28cdb6e841b9098517c2a7957454437387ca887d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 13:12:25 -0500
Subject: [PATCH 0188/2793] pyjwt: fix tests to work with pytest >= 3.9.0

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

diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index f7d3e32f992..94a1a4e6b0e 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -15,6 +15,13 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestrunner pytestcov pytest ];
 
+  # pytest 3.9.0 changed behavior of deprecated_call, see release notes
+  postPatch = ''
+    for x in tests/test_api_*py; do
+      substituteInPlace "$x" --replace AssertionError pytest.fail.Exception
+    done
+  '';
+
   meta = with lib; {
     description = "JSON Web Token implementation in Python";
     homepage = https://github.com/jpadilla/pyjwt;

From 79b94624686bdf43a0518d6be7d5ad0e0274c0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 Nov 2018 09:39:20 +0000
Subject: [PATCH 0189/2793] go_1_11: fix cross compilation

---
 pkgs/development/compilers/go/1.11.nix        | 120 ++++++++++++------
 .../go-modules/generic/default.nix            |  19 ++-
 pkgs/top-level/all-packages.nix               |   6 +-
 3 files changed, 100 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index b1a26b2218d..2f078abdb9a 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+, buildPackages, targetPackages }:
 
 let
 
@@ -7,12 +8,22 @@ let
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
-    cp -rf ${go_bootstrap}/* $out/
+    cp -rf ${buildPackages.go_bootstrap}/* $out/
     chmod -R u+w $out
     find $out -name "*.c" -delete
     cp -rf $out/bin/* $out/share/go/bin/
   '';
 
+  goarch = platform: {
+    "i686" = "386";
+    "x86_64" = "amd64";
+    "aarch64" = "arm64";
+    "arm" = "arm";
+    "armv5tel" = "arm";
+    "armv6l" = "arm";
+    "armv7l" = "arm";
+  }.${platform.parsed.cpu.name} or (throw "Unsupported system");
+
 in
 
 stdenv.mkDerivation rec {
@@ -26,13 +37,13 @@ stdenv.mkDerivation rec {
     sha256 = "0pk7pxfm3ij2ksdrg49jz501fr1d103zr4mjjwv821if9g279jc9";
   };
 
-  GOCACHE = "off";
-
   # perl is used for testing go vet
   nativeBuildInputs = [ perl which pkgconfig patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+
+
   propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
 
   hardeningDisable = [ "all" ];
@@ -126,62 +137,93 @@ stdenv.mkDerivation rec {
     substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
   '';
 
-  GOOS = stdenv.hostPlatform.parsed.kernel.name;
-  GOARCH = {
-    "i686" = "386";
-    "x86_64" = "amd64";
-    "aarch64" = "arm64";
-    "arm" = "arm";
-    "armv5tel" = "arm";
-    "armv6l" = "arm";
-    "armv7l" = "arm";
-  }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported system");
+  GOOS = stdenv.targetPlatform.parsed.kernel.name;
+  GOARCH = goarch stdenv.targetPlatform;
+  # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
+  # Go will nevertheless build a for host system that we will copy over in
+  # the install phase.
+  GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
+  GOHOSTARCH = goarch stdenv.buildPlatform;
+
+  # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
+  # to be different from CC/CXX
+  CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+      "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
+    else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+      "${stdenv.cc.targetPrefix}cc"
+    else
+      null;
+  CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+      "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
+    else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+      "${stdenv.cc.targetPrefix}c++"
+    else
+      null;
+
   GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.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";
   # Hopefully avoids test timeouts on Hydra
   GO_TEST_TIMEOUT_SCALE = 3;
 
-  # The go build actually checks for CC=*/clang and does something different, so we don't
-  # just want the generic `cc` here.
-  CC = if stdenv.isDarwin then "clang" else "cc";
+  # Indicate that we are running on build infrastructure
+  # Some tests assume things like home directories and users exists
+  GO_BUILDER_NAME = "nix";
 
-  configurePhase = ''
-    # Indicate that we are running on build infrastructure
-    # Some tests assume things like home directories and users exists
-    export GO_BUILDER_NAME=nix
+  GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
 
-    mkdir -p $out/share/go/bin
-    export GOROOT=$out/share/go
-    export GOBIN=$GOROOT/bin
-    export PATH=$GOBIN:$PATH
+  postConfigure = ''
+    export GOCACHE=$TMPDIR/go-cache
+    # this is compiled into the binary
+    export GOROOT_FINAL=$out/share/go
+
+    export PATH=$(pwd)/bin:$PATH
+
+    # Independent from host/target, CC should produce code for the building system.
+    export CC=${buildPackages.stdenv.cc}/bin/cc
     ulimit -a
   '';
 
-  installPhase = ''
-    runHook preInstall
-    cp -r . $GOROOT
-    ( cd $GOROOT/src && ./make.bash )
-    runHook postInstall
+  postBuild = ''
+    (cd src && ./make.bash)
   '';
 
-  doInstallCheck = true;
-  installCheckPhase = ''
+  doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
+
+  checkPhase = ''
     runHook preCheck
-    ( cd $GOROOT/src && ./run.bash --no-rebuild)
+    (cd src && ./run.bash --no-rebuild)
     runHook postCheck
   '';
 
-  preFixup = ''
-    rm -r $out/share/go/pkg/bootstrap
-    rm -r $out/share/go/pkg/obj
-    ln -s $out/share/go/bin $out/bin
+  preInstall = ''
+    # Contains the wrong perl shebang when cross compiling,
+    # since it is not used for anything we can deleted as well.
+    rm src/regexp/syntax/make_perl_groups.pl
+  '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
+    mv bin/*_*/* bin
+    rmdir bin/*_*
+    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+      rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
+    ''}
+  '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
+    rm -rf bin/*_*
+    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+      rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
+    ''}
+  '' else "");
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $GOROOT_FINAL
+    cp -a bin pkg src lib misc api doc $GOROOT_FINAL
+    ln -s $GOROOT_FINAL/bin $out/bin
+    runHook postInstall
   '';
 
   setupHook = ./setup-hook.sh;
 
-  disallowedReferences = [ go_bootstrap ];
+  disallowedReferences = [ goBootstrap ];
 
   meta = with stdenv.lib; {
     branch = "1.11";
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index deebba5cfec..6af5f72f2b7 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,5 +1,5 @@
 { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
-, removeReferencesTo, fetchFromGitHub }:
+, removeReferencesTo, fetchFromGitHub, stdenv }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 , shellHook ? ""
@@ -80,7 +80,9 @@ go.stdenv.mkDerivation (
   inherit name;
   nativeBuildInputs = [ removeReferencesTo go ]
     ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
-  buildInputs = [ go ] ++ buildInputs;
+  buildInputs = buildInputs;
+
+  inherit (go) GOOS GOARCH;
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure
@@ -167,7 +169,18 @@ go.stdenv.mkDerivation (
         export NIX_BUILD_CORES=1
     fi
     getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
-
+  '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    # normalize cross-compiled builds w.r.t. native builds
+    (
+      dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
+      if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
+        mv $dir/* $dir/..
+      fi
+      if [[ -d $dir ]]; then
+        rmdir $dir
+      fi
+    )
+  '' + ''
     runHook postBuild
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9bd6b1f5ba..78478a889bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13024,13 +13024,13 @@ with pkgs;
   ### DEVELOPMENT / GO MODULES
 
   buildGo19Package = callPackage ../development/go-modules/generic {
-    go = go_1_9;
+    go = buildPackages.go_1_9;
   };
   buildGo110Package = callPackage ../development/go-modules/generic {
-    go = go_1_10;
+    go = buildPackages.go_1_10;
   };
   buildGo111Package = callPackage ../development/go-modules/generic {
-    go = go_1_11;
+    go = buildPackages.go_1_11;
   };
 
   buildGoPackage = buildGo111Package;

From 3681fa5456f7c259c3fb458807a6138195116015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Nov 2018 21:25:05 +0000
Subject: [PATCH 0190/2793] direnv: make cross-compile on windows

---
 pkgs/development/libraries/kerberos/krb5.nix | 2 +-
 pkgs/tools/misc/coreutils/default.nix        | 2 +-
 pkgs/tools/misc/direnv/default.nix           | 9 +++++----
 pkgs/tools/networking/openssh/default.nix    | 2 +-
 pkgs/tools/text/gawk/default.nix             | 2 +-
 pkgs/top-level/perl-packages.nix             | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index afb928aff6e..165f9139ff1 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     description = "MIT Kerberos 5";
     homepage = http://web.mit.edu/kerberos/;
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
     maintainers = with maintainers; [ wkennington ];
   };
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index de97e94ae42..c465907fde8 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
 
     maintainers = [ maintainers.eelco ];
   };
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e096024e537..089ed6ce516 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, bash}:
+{ stdenv, fetchFromGitHub, buildGoPackage, bash, fetchpatch }:
 
 buildGoPackage rec {
   name = "direnv-${version}";
@@ -16,9 +16,10 @@ buildGoPackage rec {
     cd $NIX_BUILD_TOP/go/src/$goPackagePath
   '';
 
-  buildPhase = ''
-    make BASH_PATH=${bash}/bin/bash
-  '';
+  # we have no bash at the moment for windows
+  makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
+    "BASH_PATH=${bash}/bin/bash"
+  ];
 
   installPhase = ''
     mkdir -p $out
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 7aeae3ca9d1..7b3c0089466 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.openssh.com/;
     description = "An implementation of the SSH protocol";
     license = stdenv.lib.licenses.bsd2;
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
     maintainers = with maintainers; [ eelco aneeshusa ];
   };
 }
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 15d54f4a2a4..33ce5a0fdb8 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
 
     maintainers = [ ];
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 012531799c3..569494d39b6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8934,7 +8934,7 @@ let
     meta = with stdenv.lib; {
       description = "The World-Wide Web library for Perl";
       license = with licenses; [ artistic1 gpl1Plus ];
-      platforms = platforms.unix;
+      platforms = platforms.unix ++ platforms.windows;
     };
     buildInputs = [ TestFatal TestNeeds TestRequiresInternet ];
   };

From 48518b481d6f3f8ae0114d00a54fd086575c3984 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Sat, 24 Nov 2018 12:29:47 +0100
Subject: [PATCH 0191/2793] erlangR21: 21.1.2 -> 21.1.3

---
 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 1ca652eed66..965845c5a33 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "21.1.2";
-  sha256 = "0kn6ghr151b1qmbazc1c8k1r0wpsrqh9l3wrhfyxix3ld5yc3a5c";
+  version = "21.1.3";
+  sha256 = "0374qpafrpnfspsvjaa3sgs0h8ryi3ah8fvmr7dm7zsmgb4ihdsg";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From d4b9752212f77b122b9166dc52faad5de2fc1409 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 24 Nov 2018 15:23:18 -0800
Subject: [PATCH 0192/2793] tesseract_4: 4.00.00alpha-git-20170410 -> 4.0.0

The 4.0.0 stable release is out.

Changelog: https://github.com/tesseract-ocr/tesseract/wiki/4.0x-Changelog
---
 pkgs/applications/graphics/tesseract/4.x.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix
index 156c911b9b8..2ebca09b831 100644
--- a/pkgs/applications/graphics/tesseract/4.x.nix
+++ b/pkgs/applications/graphics/tesseract/4.x.nix
@@ -7,20 +7,20 @@
 
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
-  version = "4.00.00alpha-git-20170410";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    rev = "36a995bdc92eb2dd8bc5a63205708944a3f990a1";
-    sha256 = "0xz3krvap8sdm27v1dyb34lcdmx11wzvxyszpppfsfmjgkvg19bq";
+    rev = version;
+    sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8";
   };
 
   tessdata = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tessdata";
-    rev = "8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40";
-    sha256 = "0idwkv4qsmmqhrxcgyhy32yldl3vk054m7dkv4fjswfnalgsx794";
+    rev = version;
+    sha256 = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];

From f789d73eb1d41409418c18fbdcc719a16d22577b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 24 Nov 2018 21:04:13 -0500
Subject: [PATCH 0193/2793] sunxi-tools: 20171130 -> 20181113

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

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 0bddd0d3e17..b3026cdf84d 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
 
 stdenv.mkDerivation {
-  name = "sunxi-tools-20171130";
+  name = "sunxi-tools-20181113";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "5c1971040c6c44caefb98e371bfca9e18d511da9";
-    sha256 = "0qzm515i3dfn82a6sf7372080zb02d365z52bh0b1q711r4dvjgp";
+    rev = "6d598a0ed714201380e78130213500be6512942b";
+    sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   installTargets = [ "install-tools" "install-misc" ];
 
   meta = with stdenv.lib; {
-    description = "Tools for Allwinner A10 devices";
+    description = "Tools for Allwinner SoC devices";
     homepage = http://linux-sunxi.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;

From 24c3b7cc4eae423e16b26935688fd733a6fe33e9 Mon Sep 17 00:00:00 2001
From: plchldr <plchldr@oddco.de>
Date: Sun, 25 Nov 2018 09:30:03 +0100
Subject: [PATCH 0194/2793] add myself to maintainers

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 87c144f0d42..f93aca68aaa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3404,6 +3404,11 @@
     github = "pkmx";
     name = "Chih-Mao Chen";
   };
+  plchldr = {
+    email = "mail@oddco.de";
+    github = "plchldr";
+    name = "Jonas Beyer";
+  };
   plcplc = {
     email = "plcplc@gmail.com";
     github = "plcplc";

From 0972bde7d22f10838485682cfc00ad4ef95e8d09 Mon Sep 17 00:00:00 2001
From: plchldr <plchldr@oddco.de>
Date: Sun, 25 Nov 2018 09:49:01 +0100
Subject: [PATCH 0195/2793] rtl8821a: init at 5.1.5

---
 pkgs/os-specific/linux/rtl8821au/default.nix | 40 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/rtl8821au/default.nix

diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix
new file mode 100644
index 00000000000..9cb28d5dc8d
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8821au/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, kernel, bc }:
+
+stdenv.mkDerivation rec {
+  name = "rtl8821au-${kernel.version}-${version}";
+  version = "5.1.5";
+
+  src = fetchFromGitHub {
+    owner = "zebulon2";
+    repo = "rtl8812au";
+    rev = "61d0cd95afc01eae64da0c446515803910de1a00";
+    sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw";
+  };
+
+  nativeBuildInputs = [ bc ];
+  buildInputs = kernel.moduleBuildDependencies;
+
+  hardeningDisable = [ "pic" "format" ];
+
+  NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
+
+  prePatch = ''
+    substituteInPlace ./Makefile \
+      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
+      --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
+      --replace /sbin/depmod \# \
+      --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware";
+    homepage = https://github.com/zebulon2/rtl8812au;
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ plchldr ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3773df2c94f..4b1bc4254fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14481,6 +14481,8 @@ with pkgs;
 
     rtl8814au = callPackage ../os-specific/linux/rtl8814au { };
 
+    rtl8821au = callPackage ../os-specific/linux/rtl8821au { };
+
     rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
 
     openafs = callPackage ../servers/openafs/1.6/module.nix { };

From 8d4fbc55d839374090fbf45250d40e18e12b4e48 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 25 Nov 2018 15:20:24 +0100
Subject: [PATCH 0196/2793] Write cargo config to temporary file instead of
 source dir.

... as this fails if the source dir contains a "config" directory.
---
 pkgs/build-support/rust/fetchcargo.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 9e77f8817b2..c231799552f 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -38,18 +38,19 @@ stdenv.mkDerivation {
     fi
 
     export CARGO_HOME=$(mktemp -d cargo-home.XXX)
+    CARGO_CONFIG=$(mktemp cargo-config.XXXX)
 
     ${cargoUpdateHook}
 
     mkdir -p $out
-    cargo vendor $out | cargo-vendor-normalise > config
+    cargo vendor $out | cargo-vendor-normalise > $CARGO_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;
+    if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
+      install -Dt $out/.cargo $CARGO_CONFIG;
     fi;
   '';
 

From b34b39cab4861125cfe4b719a1e6d8e8b472c25e Mon Sep 17 00:00:00 2001
From: fishyfriend <fishyfriend@users.noreply.github.com>
Date: Sun, 25 Nov 2018 02:17:25 -0500
Subject: [PATCH 0197/2793] nixos/urxvtd: remove socket activation

This fixes #23193. urxvtd is not presently compatible with socket activation.
---
 nixos/modules/services/x11/urxvtd.nix | 30 +++++++++------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index f2ce089ce19..5531d7f153c 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -18,27 +18,17 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.user = {
-      sockets.urxvtd = {
-        description = "socket for urxvtd, the urxvt terminal daemon";
-        wantedBy = [ "graphical-session.target" ];
-        partOf = [ "graphical-session.target" ];
-        socketConfig = {
-          ListenStream = "%t/urxvtd-socket";
-        };
+    systemd.user.services.urxvtd = {
+      description = "urxvt terminal daemon";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      path = [ pkgs.xsel ];
+      serviceConfig = {
+        ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o";
+        Environment = "RXVT_SOCKET=%t/urxvtd-socket";
+        Restart = "on-failure";
+        RestartSec = "5s";
       };
-
-      services.urxvtd = {
-        description = "urxvt terminal daemon";
-        path = [ pkgs.xsel ];
-        serviceConfig = {
-          ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o";
-          Environment = "RXVT_SOCKET=%t/urxvtd-socket";
-          Restart = "on-failure";
-          RestartSec = "5s";
-        };
-      };
-
     };
 
     environment.systemPackages = [ pkgs.rxvt_unicode-with-plugins ];

From c6913213ebe7f584e7398e0f245905e00a1c1e41 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 25 Nov 2018 21:26:25 +0100
Subject: [PATCH 0198/2793] nextcloud-client: switch to libsecret and use it by
 default

This change makes it easier for users to setup the nextcloud client with
GNOME keyring support as discussed in the IRC[1][2].

Additionaly we now use `libsecret` instead of `libgnome-keyring` which
integrates better in a GNOME setup (libgnome-keyring defaults to the
Gnome2 library)[3].

[1] https://logs.nix.samueldr.com/nixos/2018-11-24#1745871;
[2] https://logs.nix.samueldr.com/nixos/2018-11-24#1746033;
[3] #38266
---
 .../networking/nextcloud-client/default.nix        |  9 ++++++---
 .../networking/nextcloud-client/wrapper.nix        | 14 --------------
 pkgs/top-level/all-packages.nix                    |  6 +-----
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/networking/nextcloud-client/wrapper.nix

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 3d54ff3a7c3..ca1accf2f91 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
-, inotify-tools, makeWrapper, libgnome-keyring, openssl_1_1, pcre, qtwebengine
+, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
 
   buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
 
@@ -32,7 +32,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
-      $out/share/applications/nextcloud.desktop
+    $out/share/applications/nextcloud.desktop
+
+    wrapProgram "$out/bin/nextcloud" \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/nextcloud-client/wrapper.nix b/pkgs/applications/networking/nextcloud-client/wrapper.nix
deleted file mode 100644
index 292cbaa1c40..00000000000
--- a/pkgs/applications/networking/nextcloud-client/wrapper.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, nextcloud-client, makeWrapper, symlinkJoin, withGnomeKeyring ? false, libgnome-keyring }:
-
-if (!withGnomeKeyring) then nextcloud-client else symlinkJoin {
-  name = "${nextcloud-client.name}-with-gnome-keyring";
-  paths = [ nextcloud-client ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  postBuild = ''
-    wrapProgram "$out/bin/nextcloud" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgnome-keyring ]}
-  '';
-
-  inherit (nextcloud-client) meta;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76f9067f787..e956ca6ef3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4388,11 +4388,7 @@ with pkgs;
 
   nextcloud = callPackage ../servers/nextcloud { };
 
-  nextcloud-client-unwrapped = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
-
-  nextcloud-client = callPackage ../applications/networking/nextcloud-client/wrapper.nix {
-    nextcloud-client = nextcloud-client-unwrapped;
-  };
+  nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
 
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
 

From 991d4bf68c7242dfb94f6d276c23749afc8c956d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 22 Nov 2018 21:29:14 +0100
Subject: [PATCH 0199/2793] mutt/neomutt: work around S/MIME issues with
 `application/pgp-encrypted`

The original issue can be reproduced when sending with an unpatched
`mutt` or `neomutt` an email with an attachement which as han `.asc`
extension. This will be interpreted as `application/pgp-encrypted` which
experiences special logic, in the end the attachement will contain
"Version: 1"[1][2][3]

Right now, there are the following issues in the {,neo}mutt packages:

* `mutt.override { smimeSupport = true }` fails to build since the
  Debian patch results in a 404. Debian moved their packages to
  `salsa.debian.org`.

  However we can't use a versioned URL for this as Debian only tracks
  the Mutt versions that are available in their releases. The patch
  doesn't touch Mutt's core and is therefore simple to rebase, so
  sticking to the 1.10.2 patch for now should be sufficient.

* The original issue was never fixed in NeoMutt, currently we use the
  S/MIME database from `pkgs.mime-types` which contains the issue with
  `application/pgp-encrypted` as well.

  After some discussion[4] it seems to be the best decision to use the
  `mailcap` database distributed by Fedora[5] which fixes the issue
  rather than `mime-types` v9 from 2012.

[1] https://bugs.archlinux.org/task/43319
[2] https://bugs.gentoo.org/534658
[3] https://github.com/neomutt/neomutt/blob/neomutt-20180716/sendlib.c#L490-L496
[4] https://github.com/NixOS/nixpkgs/pull/50927#issuecomment-441383260
[5] https://pagure.io/mailcap
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 .../networking/mailreaders/neomutt/default.nix            | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index f2c097a4375..cb0b8c8f5b7 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = optional smimeSupport (fetchpatch {
-    url    = "https://sources.debian.net/src/mutt/1.7.2-1/debian/patches/misc/smime.rc.patch";
-    sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
+    sha256 = "1rl27qqwl4nw321ll5jcvfmkmz4fkvcsh5vihjcrhzzyf6vz8wmj";
   });
 
   buildInputs =
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f082c241a64..a8c322b42b8 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
 , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
-, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
+, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap
+}:
 
 let
   muttWrapper = writeScript "mutt" ''
@@ -28,7 +29,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     cyrus_sasl gss gpgme kerberos libidn ncurses
     notmuch openssl perl lmdb
-    mime-types
+    mailcap
   ];
 
   nativeBuildInputs = [
@@ -47,10 +48,11 @@ in stdenv.mkDerivation rec {
         --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
     done
 
+
     # allow neomutt to map attachments to their proper mime.types if specified wrongly
     # and use a far more comprehensive list than the one shipped with neomutt
     substituteInPlace sendlib.c \
-      --replace /etc/mime.types ${mime-types}/etc/mime.types
+      --replace /etc/mime.types ${mailcap}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
     # that has tests (20180223) as well as 20180716 so we disable them for now.

From 7b63cdcc077b3c86faa7245daae9398075ae3d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Nov 2018 07:22:50 +0000
Subject: [PATCH 0200/2793] go_1_11: remove build artifacts

---
 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 2f078abdb9a..5d4a8e84265 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -197,6 +197,7 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
+    rm -r pkg/{bootstrap,obj}
     # Contains the wrong perl shebang when cross compiling,
     # since it is not used for anything we can deleted as well.
     rm src/regexp/syntax/make_perl_groups.pl

From b200613f4e33cc92f28dfc18cd63d791a200acd7 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <dawehner@googlemail.com>
Date: Sun, 25 Nov 2018 21:34:16 +0000
Subject: [PATCH 0201/2793] tychus: init at version 0.6.3

---
 pkgs/development/tools/tychus/default.nix | 28 +++++++++++++++++++++
 pkgs/development/tools/tychus/deps.nix    | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/tools/tychus/default.nix
 create mode 100644 pkgs/development/tools/tychus/deps.nix

diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix
new file mode 100644
index 00000000000..775e26eb6a8
--- /dev/null
+++ b/pkgs/development/tools/tychus/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
+
+buildGoPackage rec {
+  name = "tychus-${version}";
+  version = "0.6.3";
+
+  goPackagePath = "github.com/devlocker/tychus";
+  goDeps = ./deps.nix;
+  subPackages = [];
+
+  src = fetchFromGitHub {
+    owner = "devlocker";
+    repo = "tychus";
+    rev = "v${version}";
+    sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw";
+  };
+
+  buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
+
+  buildFlags = "--tags release";
+
+  meta = {
+    description = "Command line utility to live-reload your application.";
+    homepage = https://github.com/devlocker/tychus;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/tychus/deps.nix b/pkgs/development/tools/tychus/deps.nix
new file mode 100644
index 00000000000..194aa96ae3c
--- /dev/null
+++ b/pkgs/development/tools/tychus/deps.nix
@@ -0,0 +1,30 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "f91529fc609202eededff4de2dc0ba2f662240a3";
+      sha256 = "10c3d5dp98rys134dnsl19ldj8bca183z91lj8rkbsy78qzrr9af";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
+      sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76f9067f787..a3b17612a3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9009,6 +9009,10 @@ with pkgs;
 
   tweak = callPackage ../applications/editors/tweak { };
 
+  tychus = callPackage ../development/tools/tychus {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+  };
+
   uhd = callPackage ../development/tools/misc/uhd { };
 
   uisp = callPackage ../development/tools/misc/uisp { };

From 3d67b52a9db004a453d5539db1062251abbe7d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Nov 2018 16:13:19 +0100
Subject: [PATCH 0202/2793] postfix: 3.3.1 -> 3.3.2

---
 pkgs/servers/mail/postfix/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 796d5696ebf..e2a78477bb6 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
-, coreutils, findutils, gnugrep, gawk, icu, pcre
+, coreutils, findutils, gnugrep, gawk, icu, pcre, m4
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
 , withMySQL ? false, mysql
@@ -25,14 +25,14 @@ in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "0fvymsklp32njsv0ngc1f45j01kcy61r5in99g5palibwkd19xal";
+    sha256 = "0nxkszdgs6fs86j6w1lf3vhxvjh1hw2jmrii5icqx9a9xqgg74rw";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper m4 ];
   buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
                 ++ lib.optional withPgSQL postgresql
                 ++ lib.optional withMySQL mysql.connector-c

From cc21100623f71dea4bca73169ed59ded37bd6da2 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 26 Nov 2018 11:21:55 -0500
Subject: [PATCH 0203/2793] nixos/sway-beta: pass arguments from wrapper to
 sway

---
 nixos/modules/programs/sway-beta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
index e651ea4cca3..8447f94ca25 100644
--- a/nixos/modules/programs/sway-beta.nix
+++ b/nixos/modules/programs/sway-beta.nix
@@ -8,7 +8,7 @@ let
 
   swayWrapped = pkgs.writeShellScriptBin "sway" ''
     ${cfg.extraSessionCommands}
-    exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway
+    exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway "$@"
   '';
   swayJoined = pkgs.symlinkJoin {
     name = "sway-joined";

From 931b7b47a279b7e566ef487ee1bc1a8002bd1212 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 26 Nov 2018 19:36:02 +0100
Subject: [PATCH 0204/2793] nixos tests doc: minor fixes

This fixes some quirks I introduced in previous commits.

1. No need for an extra newline when printing the output of shell commands.
2. 'or die' is what's already used in the NixOS test sources, while
   'die unless' has no occurrences.
---
 .../manual/development/running-nixos-tests-interactively.xml    | 2 +-
 nixos/doc/manual/development/writing-nixos-tests.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index b25d3dcb911..c15ad448317 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -19,7 +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
+&gt; print($machine->succeed("pwd")) # 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.
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 983f8f9cbe3..4a2615c9407 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");
-die unless $machine->succeed("uname") =~ /Linux/;
+$machine->succeed("uname") =~ /Linux/ or die;
 </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 e7fd32d2f1de4d8ead3faf3ddb28566169bea1b5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 26 Nov 2018 10:26:07 +0100
Subject: [PATCH 0205/2793] appimage-run: fix missing libatk-bridge-2.0.so.0

Fix `error while loading shared libraries: libatk-bridge-2.0.so.0`
when trying to run Beaker Browser >= 0.8.0
---
 pkgs/tools/package-management/appimage-run/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index e744b897f46..af42b579a42 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -66,6 +66,7 @@ buildFHSUserEnv {
     dbus-glib
     libav
     atk
+    at-spi2-atk
     libudev0-shim
     networkmanager098
 

From 021b6e86faef9ab8876eff0a2c20df1c55b1f494 Mon Sep 17 00:00:00 2001
From: Luz <luz666@daum.net>
Date: Mon, 26 Nov 2018 22:33:39 +0100
Subject: [PATCH 0206/2793] librepcb: 20181031 -> 0.1.0

---
 pkgs/applications/science/electronics/librepcb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index c0831847b72..bc6e5e33ea2 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "librepcb-${version}";
-  version = "20181031";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "LibrePCB";
     repo = "LibrePCB";
     fetchSubmodules = true;
-    rev = "3cf8dba9fa88e5b392d639c9fdbcf3a44664170a";
-    sha256 = "0kr4mii5w3kj3kqvhgq7zjxjrq44scx8ky0x77gyqmwvwfwk7nmx";
+    rev = "d7458d3b3e126499902e1a66a0ef889f516a7c97";
+    sha256 = "19wh0398fzzpd65nh4mmc4jllkrgcrwxvxdby0gb5wh1sqyaqac4";
   };
 
   enableParallelBuilding = true;

From c64a9718ce82c2579c1f707748e066bb9596d50b Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 26 Nov 2018 22:22:09 +0100
Subject: [PATCH 0207/2793] nixos/containers: simplify env var definition

Also clear up the misleading comment: This env var isn't
root-specific, it's needed for all users.
---
 nixos/modules/virtualisation/container-config.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 561db7cabcf..78c59d98a5e 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -22,12 +22,8 @@ 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
-    '';
-
-
+    # Use the host's nix-daemon.
+    environment.variables.NIX_REMOTE = "daemon";
 
   };
 

From 6db866cbd2e90525163074788dabbb3d7374e0ba Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Nov 2018 17:51:18 -0500
Subject: [PATCH 0208/2793] Revert "zfs cannot be distributed. Disabling it in
 the isos."

ZFS's popularity is growing, and not including it by default is a
bit frustrating. On top of that, the base iso includes ZFS
_anyway_ due to other packages depending upon it.

I think we're in the clear to do this on the basis that Oracle
probably doesn't care, it is probably fine (the SFLC agrees) and
we're a small fish. If a copyright holder asks us to, we can
definitely revert it again.

This reverts commit 33d07c7ea9f0d05d47dd4b41ded3b261380acfac.
---
 nixos/modules/profiles/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 7e14b0e2114..2a2fe119d30 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -49,7 +49,7 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
 
   # Configure host id for ZFS to work
   networking.hostId = lib.mkDefault "8425e349";

From ea1017304574303fdbed49c6907c5c5f04b2c6dc Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Tue, 27 Nov 2018 00:39:20 +0000
Subject: [PATCH 0209/2793] php: align Darwin and Linux versions again

Instead of pinning Darwin to older versions, add small patches to
configure.in (7.1) / configure.ac (7.2) to fix the build of the intl
extension on recent PHP versions on Darwin.

fix-paths-php7.patch also required changes -- since we now run autoconf
at build time (through ./buildconf), it needs to patch the input .m4
files instead of ./configure directly.
---
 pkgs/development/interpreters/php/default.nix | 51 ++++++---------
 .../interpreters/php/fix-paths-php7.patch     | 33 +++++-----
 .../php/php71-darwin-isfinite.patch           | 60 ++++++++++++++++++
 .../php/php72-darwin-isfinite.patch           | 62 +++++++++++++++++++
 4 files changed, 159 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/php71-darwin-isfinite.patch
 create mode 100644 pkgs/development/interpreters/php/php72-darwin-isfinite.patch

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f9938de6f59..cae10e6d2d2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,5 +1,5 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, flex, bison
+{ lib, stdenv, fetchurl, flex, bison, autoconf
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
@@ -12,6 +12,7 @@ let
   generic =
   { version
   , sha256
+  , extraPatches ? []
   , imapSupport ? config.php.imap or (!stdenv.isDarwin)
   , ldapSupport ? config.php.ldap or true
   , mhashSupport ? config.php.mhash or true
@@ -65,7 +66,7 @@ let
 
       enableParallelBuilding = true;
 
-      nativeBuildInputs = [ pkgconfig ];
+      nativeBuildInputs = [ pkgconfig autoconf ];
       buildInputs = [ flex bison pcre ]
         ++ optional stdenv.isLinux systemd
         ++ optionals imapSupport [ uwimap openssl pam ]
@@ -182,6 +183,8 @@ let
 
         configureFlags+=(--with-config-file-path=$out/etc \
           --includedir=$dev/include)
+
+        ./buildconf --force
       '';
 
       postInstall = ''
@@ -210,7 +213,7 @@ let
         outputsToInstall = [ "out" "dev" ];
       };
 
-      patches = [ ./fix-paths-php7.patch ];
+      patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
 
       postPatch = optional stdenv.isDarwin ''
         substituteInPlace configure --replace "-lstdc++" "-lc++"
@@ -223,35 +226,19 @@ let
     };
 
 in {
-  # 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.1.23, 7.2.9, 7.2.10, 7.2.11.
+  php71 = generic {
+    version = "7.1.23";
+    sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
 
-  php71 = generic (
-    if stdenv.isDarwin then
-      {
-        version = "7.1.20";
-        sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
-      }
-    else
-      {
-        version = "7.1.23";
-        sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
-      }
-  );
+    # https://bugs.php.net/bug.php?id=76826
+    extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
+  };
 
-  php72 = generic (
-    if stdenv.isDarwin then
-      {
-        version = "7.2.8";
-        sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
-      }
-    else
-      {
-        version = "7.2.11";
-        sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
-      }
-  );
+  php72 = generic {
+    version = "7.2.11";
+    sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
+
+    # https://bugs.php.net/bug.php?id=76826
+    extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
+  };
 }
diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch
index 2b9e4ad0ebb..908f06ec49a 100644
--- a/pkgs/development/interpreters/php/fix-paths-php7.patch
+++ b/pkgs/development/interpreters/php/fix-paths-php7.patch
@@ -1,16 +1,8 @@
---- php-7.0.0beta1/configure	    2015-07-10 12:11:41.810045613 +0000
-+++ php-7.0.0beta1-new/configure	2015-07-17 16:10:21.775528267 +0000
-@@ -6172,7 +6172,7 @@
-     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
-   fi
- 
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -37303,9 +37303,7 @@
- 
+diff -ru a/ext/gettext/config.m4 b/ext/gettext/config.m4
+--- a/ext/gettext/config.m4	2018-11-07 15:35:26.000000000 +0000
++++ b/ext/gettext/config.m4	2018-11-27 00:33:07.000000000 +0000
+@@ -6,9 +6,7 @@
+ [  --with-gettext[=DIR]      Include GNU gettext support])
  
  if test "$PHP_GETTEXT" != "no"; then
 -  for i in $PHP_GETTEXT /usr/local /usr; do
@@ -19,5 +11,16 @@
 +  GETTEXT_DIR=$PHP_GETTEXT
  
    if test -z "$GETTEXT_DIR"; then
-     as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5
-
+     AC_MSG_ERROR(Cannot locate header file libintl.h)
+diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+--- a/sapi/apache2handler/config.m4	2018-11-07 15:35:23.000000000 +0000
++++ b/sapi/apache2handler/config.m4	2018-11-27 00:32:28.000000000 +0000
+@@ -66,7 +66,7 @@
+     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
+   fi
+ 
+-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
++  APXS_LIBEXECDIR="$prefix/modules"
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
new file mode 100644
index 00000000000..ebfcd94f8d4
--- /dev/null
+++ b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
@@ -0,0 +1,60 @@
+diff -ru a/Zend/configure.in b/Zend/configure.in
+--- a/Zend/configure.in	2018-11-07 15:35:26.000000000 +0000
++++ b/Zend/configure.in	2018-11-27 00:28:48.000000000 +0000
+@@ -70,7 +70,7 @@
+ #endif
+ 
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -79,7 +79,7 @@
+ #endif
+ #endif
+ 
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -90,7 +90,7 @@
+ #define zend_isinf(a) 0
+ #endif
+ 
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff -ru a/configure.in b/configure.in
+--- a/configure.in	2018-11-07 15:35:26.000000000 +0000
++++ b/configure.in	2018-11-27 00:28:48.000000000 +0000
+@@ -75,7 +75,7 @@
+ #endif
+ 
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -84,7 +84,7 @@
+ #endif
+ #endif
+ 
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -95,7 +95,7 @@
+ #define zend_isinf(a) 0
+ #endif
+ 
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
diff --git a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch b/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
new file mode 100644
index 00000000000..ea2e3e28f2c
--- /dev/null
+++ b/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
@@ -0,0 +1,62 @@
+diff --git a/Zend/configure.ac b/Zend/configure.ac
+index b95c1360b8..fe16c86007 100644
+--- a/Zend/configure.ac
++++ b/Zend/configure.ac
+@@ -60,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #include <math.h>
+ 
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -69,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #endif
+ #endif
+ 
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -80,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #define zend_isinf(a) 0
+ #endif
+ 
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff --git a/configure.ac b/configure.ac
+index d3f3cacd07..ddbf712ba2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,7 +68,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #include <math.h>
+ 
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -77,7 +77,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #endif
+ #endif
+ 
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -88,7 +88,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #define zend_isinf(a) 0
+ #endif
+ 
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)

From 8221da343ef344b7bc858136ae99398fca5ae498 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Tue, 27 Nov 2018 02:01:24 +0100
Subject: [PATCH 0210/2793] php71: 7.1.23 -> 7.1.24

---
 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 cae10e6d2d2..b6b27bd43ea 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -227,8 +227,8 @@ let
 
 in {
   php71 = generic {
-    version = "7.1.23";
-    sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
+    version = "7.1.24";
+    sha256 = "02qy76krbdhlbkzs9k1sa5mgmj0qnbb8gcf1j3q0cq3z7kkj9pk6";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;

From ec3d829257d33d4ea7057481ae987bfcd15cddf6 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Tue, 27 Nov 2018 02:01:47 +0100
Subject: [PATCH 0211/2793] php72: 7.2.11 -> 7.2.12

---
 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 b6b27bd43ea..03a235ae384 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -235,8 +235,8 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.11";
-    sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
+    version = "7.2.12";
+    sha256 = "1dpnbsv4bdlc5v40ddddi971f456jp1qrn89w5di1dj70g1c895p";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;

From edd52b4fa5d520477d42aa4358f05953165070c4 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 26 Nov 2018 18:40:08 +0100
Subject: [PATCH 0212/2793] kube-prompt: 1.0.4 -> 1.0.5

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/kube-prompt/default.nix | 4 ++--
 pkgs/development/tools/kube-prompt/deps.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
index 2ea69a0c56b..60f53c74bb2 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kube-prompt-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/c-bata/kube-prompt";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "c-bata";
     repo = "kube-prompt";
-    sha256 = "09c2kjsk8cl7qgxbr1s7qd9br5shf7gccxvbf7nyi6wjiass9yg5";
+    sha256 = "1c1y0n1yxcaxvhlsj7b0wvhi934b5g0s1mi46hh5amb9j3dhgq1c";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix
index 393b69a2a33..e2391789a41 100644
--- a/pkgs/development/tools/kube-prompt/deps.nix
+++ b/pkgs/development/tools/kube-prompt/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/c-bata/go-prompt";
-      rev =  "c52492ff1b386e5c0ba5271b5eaad165fab09eca";
-      sha256 = "14k8anchf0rcpxfbb2acrajdqrfspscbkn47m4py1zh5rkk6b9p9";
+      rev =  "09daf6ae57865e436aab9ede6b66b490036e87de";
+      sha256 = "1s58y0i67x2yvi3iisdhj2qqrbl4kz0viy06caip8ykhxpvvkq30";
     };
   }
   {

From a067e883b1603baf6298060e54ca4c7112755e96 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 27 Nov 2018 12:37:14 +0100
Subject: [PATCH 0213/2793] valgrind: Apply upstream patch for Makefile race in
 coregrind

---
 .../valgrind/coregrind-makefile-race.patch    | 41 +++++++++++++++++++
 .../tools/analysis/valgrind/default.nix       |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch

diff --git a/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch b/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch
new file mode 100644
index 00000000000..cd09f0edff3
--- /dev/null
+++ b/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch
@@ -0,0 +1,41 @@
+From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001
+From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
+Date: Sun, 28 Oct 2018 18:35:11 +0100
+Subject: [PATCH 1/1] Fix dependencies between libcoregrind*.a and
+ *m_main.o/*m_libcsetjmp.o
+
+The primary and secondary coregrind libraries must be updated
+when m_main.c or m_libcsetjmp.c are changed.
+
+A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a,
+and so tools were not relinked when m_main.c or m_libcsetjmp.c were
+changed.
+---
+ coregrind/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
+index 914a270..8de1996 100644
+--- a/coregrind/Makefile.am
++++ b/coregrind/Makefile.am
+@@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \
+ endif
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \
+     $(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS)
++libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \
++    libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+ 
+ if VGCONF_HAVE_PLATFORM_SEC
+ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \
+@@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \
+ endif
+ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \
+     $(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS)
++libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \
++    libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
+ endif
+ 
+ #----------------------------------------------------------------------------
+-- 
+2.9.3
+
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index a371bc2e002..df99ecb13bb 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03";
   };
 
+  patches = [ ./coregrind-makefile-race.patch ];
+
   outputs = [ "out" "dev" "man" "doc" ];
 
   hardeningDisable = [ "stackprotector" ];

From 82f7281a8f0cd6c0dbf7cda95c5ce5fc4ad9637c Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Tue, 27 Nov 2018 22:27:15 +1030
Subject: [PATCH 0214/2793] jetbrains-editors: 2018.2 -> 2018.3

---
 .../editors/jetbrains/default.nix             | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 50922982e0c..3d905a83c8e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.2.4"; /* updated by script */
+    version = "2018.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 = "0aan23ggs314bvpsldsv9m4pdmnlgdcjac9x6hv1j145a1pp439i"; /* updated by script */
+      sha256 = "0hd44flxqnnxg390mkf4ppjs2nxv0nwdc7a2i65f69bp5h61x783"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand Release";
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.2.6"; /* updated by script */
+    version = "2018.3"; /* 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 = "02hpbyivji9vnik7p04zrja1rhhl49r0365g0i6sa1rrwd1fhvwf"; /* updated by script */
+      sha256 = "01ccz5ksbv8xh8mnk3zxqpia8zgayy8bcgmbwqibrykz47y6r7yy"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA Release";
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.2.6"; /* updated by script */
+    version = "2018.3"; /* 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 = "0x0ylcbj8spvzmwxrw3p4c64ad27iz58lwj4yb8a6vwh6p22gflk"; /* updated by script */
+      sha256 = "16z0pqmxjn5dl42rbz7mx8gi13xs3220pzkdsdkh1k1ny9caqzvj"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA Release";
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.2.5"; /* updated by script */
+    version = "2018.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 = "0zfnhrkv4y90a3myq13406vzivg234l69x0c5d7vyv6ys7dmq5fm"; /* updated by script */
+      sha256 = "0kgrh3w4lpk7qkp5gss24in1nqahdfllvf97qz6r77zn9n5k1wq7"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm Release";
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.2.5"; /* updated by script */
+    version = "2018.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 = "0yfq25kmzzd15x83zdbrq9j62c32maklzhsk1rzymabyb56blh5c"; /* updated by script */
+      sha256 = "0q4scwnqy0h725g9z5hd145c3n10iaj04z790s4lixg1c63h3y8q"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm Release";
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.2.4"; /* updated by script */
+    version = "2018.2.5"; /* 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 = "0dk3ch749ai5kyg9q8819ckrqw2jk4f656iqrkkpab9fjqfjylka"; /* updated by script */
+      sha256 = "0b01fnifk5iawyf2zi7r5ffz8dxlh18g2ilrkc5746vmnsp0jxq4"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine 2018.2";
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.2.6"; /* updated by script */
+    version = "2018.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 = "1snx59b6d0szd1a07agpqxlprhy2mc9jvbnxcck5hfwxl3ic7x5g"; /* updated by script */
+      sha256 = "0msvgdjbdipc4g8j705d1jya2mjmx4wwhb23nch3znh7grryr75s"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm Release";

From 97c8ede6cb02853ca300c12e869f1c3205da33c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Nov 2018 09:30:43 -0600
Subject: [PATCH 0215/2793] gist: 4.6.2 -> 5.0.0, simplify

* default wrapper works fine now AFAICT
* Not sure that 'dontStrip' does anything here
  (regardless doesn't seem to be useful any longer)
---
 pkgs/tools/text/gist/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index f5dcbb9191c..7091031d28f 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -1,21 +1,11 @@
-{ buildRubyGem, lib, ruby, makeWrapper }:
+{ buildRubyGem, lib, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "gist";
-  version = "4.6.2";
-  source.sha256 = "0zrw84k2982aiansmv2aj3101d3giwa58221n6aisvg5jq5kmiib";
-
-  buildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    # Fix the default ruby wrapper
-    makeWrapper $out/${ruby.gemPath}/bin/gist $out/bin/gist \
-      --set GEM_PATH $out/${ruby.gemPath}:${ruby}/${ruby.gemPath}
-  '';
-
-  dontStrip = true;
+  version = "5.0.0";
+  source.sha256 = "1i0a73mzcjv4mj5vjqwkrx815ydsppx3v812lxxd9mk2s7cj1vyd";
 
   meta = with lib; {
     description = "Upload code to https://gist.github.com (or github enterprise)";

From 9d25cac0049909a32ed1a09b1ffeae2975db071c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 26 Nov 2018 00:37:36 -0600
Subject: [PATCH 0216/2793] radare2: 3.0.1 -> 3.1.0

---
 .../tools/analysis/radare2/default.nix         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 0381dc85895..88d68e2fd19 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "19915";
-    gittap = "3.0.1";
-    gittip = "addb7f21e73073600fd6205e385fa096084701f5";
-    rev = "3.0.1";
-    version = "3.0.1";
-    sha256 = "0da4ns11valy305074cri3in5zcafjw3vxc53b4yg37114ly433h";
-    cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
-    cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
+    version_commit = "20222";
+    gittap = "3.1.0";
+    gittip = "c033496ebc7034e52a84be9cdb2d2dfad6a4cfac";
+    rev = "3.1.0";
+    version = "3.1.0";
+    sha256 = "0ggqda8433n7p4yivn7l0807i5wwf0vww2p8v90ri66nasbzvl16";
+    cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
+    cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "19720";
+    version_commit = "20222";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From d0ed3e507972ad3aed20f20043da20090c60950f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 23 Nov 2018 19:47:34 -0600
Subject: [PATCH 0217/2793] nghttp2: 1.34.0 -> 1.35.0

https://nghttp2.org/blog/2018/11/23/nghttp2-v1-35-0/
---
 .../development/libraries/nghttp2/default.nix |  6 +-
 .../nghttp2/fix-stream-operator.patch         | 63 -------------------
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/libraries/nghttp2/fix-stream-operator.patch

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d4c859db289..39fdb6d4eb2 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -18,15 +18,13 @@ let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.34.0";
+  version = "1.35.0";
 
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "1l5rir8d73x97p3p1x4l8cawjc9m2adnippnb27fmrbcd3rfaxbl";
+    sha256 = "0nfdagjb0apgvms28kr9m8k93di5fv6ww9i1jwpd83y0p4vf5zvh";
   };
 
-  patches = [ ./fix-stream-operator.patch /* can't fetchpatch during bootstrap */ ];
-
   outputs = [ "bin" "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/nghttp2/fix-stream-operator.patch b/pkgs/development/libraries/nghttp2/fix-stream-operator.patch
deleted file mode 100644
index 7d8acde8ebc..00000000000
--- a/pkgs/development/libraries/nghttp2/fix-stream-operator.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 153531d4d0ebe00ac95047dbf1fec1d9d694f29f Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Sun, 7 Oct 2018 22:19:00 +0900
-Subject: [PATCH] nghttpx: Use the same type as standard stream operator<<
-
----
- src/shrpx_log.cc |  4 ++--
- src/shrpx_log.h  | 20 ++++++++++++++------
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/src/shrpx_log.cc b/src/shrpx_log.cc
-index 8459d15e3..6966cf945 100644
---- a/src/shrpx_log.cc
-+++ b/src/shrpx_log.cc
-@@ -228,7 +228,7 @@ Log &Log::operator<<(const ImmutableString &s) {
-   return *this;
- }
- 
--Log &Log::operator<<(int64_t n) {
-+Log &Log::operator<<(long long n) {
-   if (n >= 0) {
-     return *this << static_cast<uint64_t>(n);
-   }
-@@ -262,7 +262,7 @@ Log &Log::operator<<(int64_t n) {
-   return *this;
- }
- 
--Log &Log::operator<<(uint64_t n) {
-+Log &Log::operator<<(unsigned long long n) {
-   if (flags_ & fmt_hex) {
-     write_hex(n);
-     return *this;
-diff --git a/src/shrpx_log.h b/src/shrpx_log.h
-index 1130b8da8..17b90536e 100644
---- a/src/shrpx_log.h
-+++ b/src/shrpx_log.h
-@@ -100,12 +100,20 @@ class Log {
-   Log &operator<<(const char *s);
-   Log &operator<<(const StringRef &s);
-   Log &operator<<(const ImmutableString &s);
--  Log &operator<<(int16_t n) { return *this << static_cast<int64_t>(n); }
--  Log &operator<<(int32_t n) { return *this << static_cast<int64_t>(n); }
--  Log &operator<<(int64_t n);
--  Log &operator<<(uint16_t n) { return *this << static_cast<uint64_t>(n); }
--  Log &operator<<(uint32_t n) { return *this << static_cast<uint64_t>(n); }
--  Log &operator<<(uint64_t n);
-+  Log &operator<<(short n) { return *this << static_cast<long long>(n); }
-+  Log &operator<<(int n) { return *this << static_cast<long long>(n); }
-+  Log &operator<<(long n) { return *this << static_cast<long long>(n); }
-+  Log &operator<<(long long n);
-+  Log &operator<<(unsigned short n) {
-+    return *this << static_cast<unsigned long long>(n);
-+  }
-+  Log &operator<<(unsigned int n) {
-+    return *this << static_cast<unsigned long long>(n);
-+  }
-+  Log &operator<<(unsigned long n) {
-+    return *this << static_cast<unsigned long long>(n);
-+  }
-+  Log &operator<<(unsigned long long n);
-   Log &operator<<(float n) { return *this << static_cast<double>(n); }
-   Log &operator<<(double n);
-   Log &operator<<(long double n);

From 468d1595f820e572f6ae0d70d09c936f4eb47a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 27 Nov 2018 17:04:40 +0100
Subject: [PATCH 0218/2793] mkpasswd: fix cross compilation

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

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index b8da305c36d..3d30fef02e2 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = whois.src;
 
-  buildInputs = [ perl ];
+  nativeBuildInputs = [ perl ];
 
   preConfigure = whois.preConfigure;
   buildPhase = "make mkpasswd";

From 3083fa2aa10908c522e4f1dbdea126dc600ebc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?=
 <pierre-etienne.meunier@inria.fr>
Date: Tue, 27 Nov 2018 16:08:11 +0000
Subject: [PATCH 0219/2793] Carnix 0.9.2

---
 pkgs/build-support/rust/carnix.nix    |  27 +-
 pkgs/build-support/rust/crates-io.nix | 632 ++++++++++++--------------
 2 files changed, 283 insertions(+), 376 deletions(-)

diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 7a0d92f81b4..dd44fed623e 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -1,4 +1,4 @@
-# Generated by carnix 0.8.11: carnix generate-nix
+# Generated by carnix 0.9.1: carnix generate-nix
 { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
 with buildRustCrateHelpers;
 let inherit (lib.lists) fold;
@@ -6,7 +6,7 @@ let inherit (lib.lists) fold;
 in
 let crates = cratesIO; in
 rec {
-  carnix = crates.crates.carnix."0.8.11" deps;
+  carnix = crates.crates.carnix."0.9.2" deps;
   __all = [ (carnix {}) ];
   deps.aho_corasick."0.6.8" = {
     memchr = "2.1.0";
@@ -42,7 +42,7 @@ rec {
     arrayvec = "0.4.7";
     constant_time_eq = "0.1.3";
   };
-  deps.carnix."0.8.11" = {
+  deps.carnix."0.9.2" = {
     clap = "2.32.0";
     dirs = "1.0.4";
     env_logger = "0.5.13";
@@ -51,7 +51,6 @@ rec {
     log = "0.4.5";
     nom = "3.2.1";
     regex = "1.0.5";
-    rusqlite = "0.14.0";
     serde = "1.0.80";
     serde_derive = "1.0.80";
     serde_json = "1.0.32";
@@ -112,16 +111,9 @@ rec {
     version_check = "0.1.5";
   };
   deps.libc."0.2.43" = {};
-  deps.libsqlite3_sys."0.9.3" = {
-    pkg_config = "0.3.14";
-  };
-  deps.linked_hash_map."0.4.2" = {};
   deps.log."0.4.5" = {
     cfg_if = "0.1.6";
   };
-  deps.lru_cache."0.1.1" = {
-    linked_hash_map = "0.4.2";
-  };
   deps.memchr."1.0.2" = {
     libc = "0.2.43";
   };
@@ -134,7 +126,6 @@ rec {
   deps.nom."3.2.1" = {
     memchr = "1.0.2";
   };
-  deps.pkg_config."0.3.14" = {};
   deps.proc_macro2."0.4.20" = {
     unicode_xid = "0.1.0";
   };
@@ -170,12 +161,6 @@ rec {
   deps.remove_dir_all."0.5.1" = {
     winapi = "0.3.6";
   };
-  deps.rusqlite."0.14.0" = {
-    bitflags = "1.0.4";
-    libsqlite3_sys = "0.9.3";
-    lru_cache = "0.1.1";
-    time = "0.1.40";
-  };
   deps.rustc_demangle."0.1.9" = {};
   deps.ryu."0.2.6" = {};
   deps.scoped_threadpool."0.1.9" = {};
@@ -220,11 +205,6 @@ rec {
   deps.thread_local."0.3.6" = {
     lazy_static = "1.1.0";
   };
-  deps.time."0.1.40" = {
-    libc = "0.2.43";
-    redox_syscall = "0.1.40";
-    winapi = "0.3.6";
-  };
   deps.toml."0.4.8" = {
     serde = "1.0.80";
   };
@@ -232,7 +212,6 @@ rec {
   deps.unicode_width."0.1.5" = {};
   deps.unicode_xid."0.1.0" = {};
   deps.utf8_ranges."1.0.1" = {};
-  deps.vcpkg."0.2.6" = {};
   deps.vec_map."0.8.1" = {};
   deps.version_check."0.1.5" = {};
   deps.winapi."0.3.6" = {
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
index 9d9cafe4cbf..b03f52d3509 100644
--- a/pkgs/build-support/rust/crates-io.nix
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -5,6 +5,8 @@ let inherit (lib.lists) fold;
 in
 rec {
 
+# aho-corasick-0.6.8
+
   crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
     crateName = "aho-corasick";
     version = "0.6.8";
@@ -25,6 +27,9 @@ rec {
   ];
 
 
+# end
+# ansi_term-0.11.0
+
   crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate {
     crateName = "ansi_term";
     version = "0.11.0";
@@ -47,6 +52,9 @@ rec {
   ];
 
 
+# end
+# argon2rs-0.2.5
+
   crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate {
     crateName = "argon2rs";
     version = "0.2.5";
@@ -61,11 +69,11 @@ rec {
   features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec {
     argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true);
     blake2_rfc = fold recursiveUpdate {} [
-      { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
-      { "0.2.18".simd_asm =
-        (f.blake2_rfc."0.2.18".simd_asm or false) ||
+      { "${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" =
+        (f.blake2_rfc."${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" or false) ||
         (argon2rs."0.2.5"."simd" or false) ||
         (f."argon2rs"."0.2.5"."simd" or false); }
+      { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
     ];
     scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true;
   }) [
@@ -74,6 +82,9 @@ rec {
   ];
 
 
+# end
+# arrayvec-0.4.7
+
   crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate {
     crateName = "arrayvec";
     version = "0.4.7";
@@ -102,6 +113,9 @@ rec {
   ];
 
 
+# end
+# atty-0.2.11
+
   crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate {
     crateName = "atty";
     version = "0.2.11";
@@ -136,6 +150,9 @@ rec {
   ];
 
 
+# end
+# backtrace-0.3.9
+
   crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate {
     crateName = "backtrace";
     version = "0.3.9";
@@ -147,13 +164,13 @@ rec {
     ])
       ++ (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 [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else [])
+      ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.9".backtrace_sys}" deps) ] else [])) else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
       (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps)
     ]) else [])
       ++ (if kernel == "windows" then mapFeatures features ([
     ]
-      ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []);
+      ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.9".winapi}" deps) ] else [])) else []);
     features = mkFeatures (features."backtrace"."0.3.9" or {});
   };
   features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec {
@@ -241,6 +258,9 @@ rec {
   ];
 
 
+# end
+# backtrace-sys-0.1.24
+
   crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate {
     crateName = "backtrace-sys";
     version = "0.1.24";
@@ -265,6 +285,9 @@ rec {
   ];
 
 
+# end
+# bitflags-1.0.4
+
   crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "1.0.4";
@@ -277,6 +300,9 @@ rec {
   }) [];
 
 
+# end
+# blake2-rfc-0.2.18
+
   crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate {
     crateName = "blake2-rfc";
     version = "0.2.18";
@@ -312,65 +338,68 @@ rec {
   ];
 
 
-  crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate {
+# end
+# carnix-0.9.2
+
+  crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate {
     crateName = "carnix";
-    version = "0.8.11";
+    version = "0.9.2";
     authors = [ "pe@pijul.org <pe@pijul.org>" ];
-    sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch";
+    sha256 = "1r668rjqcwsxjpz2hrr7j3k099c1xsb8vfq1w7y1ps9hap9af42z";
     crateBin =
       [{  name = "cargo-generate-nixfile";  path = "src/cargo-generate-nixfile.rs"; }] ++
       [{  name = "carnix";  path = "src/main.rs"; }];
     dependencies = mapFeatures features ([
-      (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps)
-      (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps)
-      (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps)
-      (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps)
-      (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps)
-      (crates."log"."${deps."carnix"."0.8.11"."log"}" deps)
-      (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps)
-      (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps)
-      (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps)
-      (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps)
-      (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps)
-      (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps)
-      (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps)
-      (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps)
+      (crates."clap"."${deps."carnix"."0.9.2"."clap"}" deps)
+      (crates."dirs"."${deps."carnix"."0.9.2"."dirs"}" deps)
+      (crates."env_logger"."${deps."carnix"."0.9.2"."env_logger"}" deps)
+      (crates."error_chain"."${deps."carnix"."0.9.2"."error_chain"}" deps)
+      (crates."itertools"."${deps."carnix"."0.9.2"."itertools"}" deps)
+      (crates."log"."${deps."carnix"."0.9.2"."log"}" deps)
+      (crates."nom"."${deps."carnix"."0.9.2"."nom"}" deps)
+      (crates."regex"."${deps."carnix"."0.9.2"."regex"}" deps)
+      (crates."serde"."${deps."carnix"."0.9.2"."serde"}" deps)
+      (crates."serde_derive"."${deps."carnix"."0.9.2"."serde_derive"}" deps)
+      (crates."serde_json"."${deps."carnix"."0.9.2"."serde_json"}" deps)
+      (crates."tempdir"."${deps."carnix"."0.9.2"."tempdir"}" deps)
+      (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps)
     ]);
   };
-  features_.carnix."0.8.11" = deps: f: updateFeatures f (rec {
-    carnix."0.8.11".default = (f.carnix."0.8.11".default or true);
-    clap."${deps.carnix."0.8.11".clap}".default = true;
-    dirs."${deps.carnix."0.8.11".dirs}".default = true;
-    env_logger."${deps.carnix."0.8.11".env_logger}".default = true;
-    error_chain."${deps.carnix."0.8.11".error_chain}".default = true;
-    itertools."${deps.carnix."0.8.11".itertools}".default = true;
-    log."${deps.carnix."0.8.11".log}".default = true;
-    nom."${deps.carnix."0.8.11".nom}".default = true;
-    regex."${deps.carnix."0.8.11".regex}".default = true;
-    rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true;
-    serde."${deps.carnix."0.8.11".serde}".default = true;
-    serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true;
-    serde_json."${deps.carnix."0.8.11".serde_json}".default = true;
-    tempdir."${deps.carnix."0.8.11".tempdir}".default = true;
-    toml."${deps.carnix."0.8.11".toml}".default = true;
+  features_.carnix."0.9.2" = deps: f: updateFeatures f (rec {
+    carnix."0.9.2".default = (f.carnix."0.9.2".default or true);
+    clap."${deps.carnix."0.9.2".clap}".default = true;
+    dirs."${deps.carnix."0.9.2".dirs}".default = true;
+    env_logger."${deps.carnix."0.9.2".env_logger}".default = true;
+    error_chain."${deps.carnix."0.9.2".error_chain}".default = true;
+    itertools."${deps.carnix."0.9.2".itertools}".default = true;
+    log."${deps.carnix."0.9.2".log}".default = true;
+    nom."${deps.carnix."0.9.2".nom}".default = true;
+    regex."${deps.carnix."0.9.2".regex}".default = true;
+    serde."${deps.carnix."0.9.2".serde}".default = true;
+    serde_derive."${deps.carnix."0.9.2".serde_derive}".default = true;
+    serde_json."${deps.carnix."0.9.2".serde_json}".default = true;
+    tempdir."${deps.carnix."0.9.2".tempdir}".default = true;
+    toml."${deps.carnix."0.9.2".toml}".default = true;
   }) [
-    (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps)
-    (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps)
-    (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps)
-    (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps)
-    (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps)
-    (features_.log."${deps."carnix"."0.8.11"."log"}" deps)
-    (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps)
-    (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps)
-    (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps)
-    (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps)
-    (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps)
-    (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps)
-    (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps)
-    (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps)
+    (features_.clap."${deps."carnix"."0.9.2"."clap"}" deps)
+    (features_.dirs."${deps."carnix"."0.9.2"."dirs"}" deps)
+    (features_.env_logger."${deps."carnix"."0.9.2"."env_logger"}" deps)
+    (features_.error_chain."${deps."carnix"."0.9.2"."error_chain"}" deps)
+    (features_.itertools."${deps."carnix"."0.9.2"."itertools"}" deps)
+    (features_.log."${deps."carnix"."0.9.2"."log"}" deps)
+    (features_.nom."${deps."carnix"."0.9.2"."nom"}" deps)
+    (features_.regex."${deps."carnix"."0.9.2"."regex"}" deps)
+    (features_.serde."${deps."carnix"."0.9.2"."serde"}" deps)
+    (features_.serde_derive."${deps."carnix"."0.9.2"."serde_derive"}" deps)
+    (features_.serde_json."${deps."carnix"."0.9.2"."serde_json"}" deps)
+    (features_.tempdir."${deps."carnix"."0.9.2"."tempdir"}" deps)
+    (features_.toml."${deps."carnix"."0.9.2"."toml"}" deps)
   ];
 
 
+# end
+# cc-1.0.25
+
   crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
     crateName = "cc";
     version = "1.0.25";
@@ -391,6 +420,9 @@ rec {
   }) [];
 
 
+# end
+# cfg-if-0.1.6
+
   crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
     crateName = "cfg-if";
     version = "0.1.6";
@@ -402,6 +434,9 @@ rec {
   }) [];
 
 
+# end
+# clap-2.32.0
+
   crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate {
     crateName = "clap";
     version = "2.32.0";
@@ -412,12 +447,12 @@ rec {
       (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps)
       (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps)
     ]
-      ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else [])
-      ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else [])
-      ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else []))
+      ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."${deps."clap"."2.32.0".atty}" deps) ] else [])
+      ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."${deps."clap"."2.32.0".strsim}" deps) ] else [])
+      ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."${deps."clap"."2.32.0".vec_map}" deps) ] else []))
       ++ (if !(kernel == "windows") then mapFeatures features ([
     ]
-      ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []);
+      ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.32.0".ansi_term}" deps) ] else [])) else []);
     features = mkFeatures (features."clap"."2.32.0" or {});
   };
   features_.clap."2.32.0" = deps: f: updateFeatures f (rec {
@@ -469,11 +504,11 @@ rec {
     ];
     strsim."${deps.clap."2.32.0".strsim}".default = true;
     textwrap = fold recursiveUpdate {} [
-      { "${deps.clap."2.32.0".textwrap}".default = true; }
-      { "0.10.0".term_size =
-        (f.textwrap."0.10.0".term_size or false) ||
+      { "${deps.clap."2.32.0".textwrap}"."term_size" =
+        (f.textwrap."${deps.clap."2.32.0".textwrap}"."term_size" or false) ||
         (clap."2.32.0"."wrap_help" or false) ||
         (f."clap"."2.32.0"."wrap_help" or false); }
+      { "${deps.clap."2.32.0".textwrap}".default = true; }
     ];
     unicode_width."${deps.clap."2.32.0".unicode_width}".default = true;
     vec_map."${deps.clap."2.32.0".vec_map}".default = true;
@@ -488,6 +523,9 @@ rec {
   ];
 
 
+# end
+# constant_time_eq-0.1.3
+
   crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate {
     crateName = "constant_time_eq";
     version = "0.1.3";
@@ -499,6 +537,9 @@ rec {
   }) [];
 
 
+# end
+# dirs-1.0.4
+
   crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate {
     crateName = "dirs";
     version = "1.0.4";
@@ -533,6 +574,9 @@ rec {
   ];
 
 
+# end
+# either-1.5.0
+
   crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate {
     crateName = "either";
     version = "1.5.0";
@@ -553,6 +597,9 @@ rec {
   }) [];
 
 
+# end
+# env_logger-0.5.13
+
   crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate {
     crateName = "env_logger";
     version = "0.5.13";
@@ -564,7 +611,7 @@ rec {
       (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps)
       (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps)
     ]
-      ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else []));
+      ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."${deps."env_logger"."0.5.13".regex}" deps) ] else []));
     features = mkFeatures (features."env_logger"."0.5.13" or {});
   };
   features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec {
@@ -592,6 +639,9 @@ rec {
   ];
 
 
+# end
+# error-chain-0.12.0
+
   crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate {
     crateName = "error-chain";
     version = "0.12.0";
@@ -599,7 +649,7 @@ rec {
     sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []));
+      ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."${deps."error_chain"."0.12.0".backtrace}" deps) ] else []));
     features = mkFeatures (features."error_chain"."0.12.0" or {});
   };
   features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec {
@@ -620,6 +670,9 @@ rec {
   ];
 
 
+# end
+# failure-0.1.3
+
   crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate {
     crateName = "failure";
     version = "0.1.3";
@@ -627,8 +680,8 @@ rec {
     sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])
-      ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else []));
+      ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.3".backtrace}" deps) ] else [])
+      ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.3".failure_derive}" deps) ] else []));
     features = mkFeatures (features."failure"."0.1.3" or {});
   };
   features_.failure."0.1.3" = deps: f: updateFeatures f (rec {
@@ -659,6 +712,9 @@ rec {
   ];
 
 
+# end
+# failure_derive-0.1.3
+
   crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate {
     crateName = "failure_derive";
     version = "0.1.3";
@@ -688,6 +744,9 @@ rec {
   ];
 
 
+# end
+# fuchsia-zircon-0.3.3
+
   crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon";
     version = "0.3.3";
@@ -708,6 +767,9 @@ rec {
   ];
 
 
+# end
+# fuchsia-zircon-sys-0.3.3
+
   crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon-sys";
     version = "0.3.3";
@@ -719,6 +781,9 @@ rec {
   }) [];
 
 
+# end
+# humantime-1.1.1
+
   crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate {
     crateName = "humantime";
     version = "1.1.1";
@@ -737,6 +802,9 @@ rec {
   ];
 
 
+# end
+# itertools-0.7.8
+
   crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate {
     crateName = "itertools";
     version = "0.7.8";
@@ -761,6 +829,9 @@ rec {
   ];
 
 
+# end
+# itoa-0.4.3
+
   crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate {
     crateName = "itoa";
     version = "0.4.3";
@@ -779,6 +850,9 @@ rec {
   }) [];
 
 
+# end
+# lazy_static-1.1.0
+
   crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate {
     crateName = "lazy_static";
     version = "1.1.0";
@@ -811,6 +885,9 @@ rec {
   ];
 
 
+# end
+# libc-0.2.43
+
   crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate {
     crateName = "libc";
     version = "0.2.43";
@@ -829,105 +906,8 @@ rec {
   }) [];
 
 
-  crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate {
-    crateName = "libsqlite3-sys";
-    version = "0.9.3";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021";
-    build = "build.rs";
-    dependencies = (if abi == "msvc" then mapFeatures features ([
-]) else []);
-
-    buildDependencies = mapFeatures features ([
-    ]
-      ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else []));
-    features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {});
-  };
-  features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec {
-    libsqlite3_sys = fold recursiveUpdate {} [
-      { "0.9.3".bindgen =
-        (f.libsqlite3_sys."0.9.3".bindgen or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); }
-      { "0.9.3".cc =
-        (f.libsqlite3_sys."0.9.3".cc or false) ||
-        (f.libsqlite3_sys."0.9.3".bundled or false) ||
-        (libsqlite3_sys."0.9.3"."bundled" or false); }
-      { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); }
-      { "0.9.3".min_sqlite_version_3_6_8 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (f.libsqlite3_sys."0.9.3".default or false) ||
-        (libsqlite3_sys."0.9.3"."default" or false); }
-      { "0.9.3".pkg-config =
-        (f.libsqlite3_sys."0.9.3".pkg-config or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
-      { "0.9.3".vcpkg =
-        (f.libsqlite3_sys."0.9.3".vcpkg or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
-    ];
-    pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true;
-  }) [
-    (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps)
-  ];
-
-
-  crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate {
-    crateName = "linked-hash-map";
-    version = "0.4.2";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
-    sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."linked_hash_map"."0.4.2" or {});
-  };
-  features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec {
-    linked_hash_map = fold recursiveUpdate {} [
-      { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); }
-      { "0.4.2".heapsize =
-        (f.linked_hash_map."0.4.2".heapsize or false) ||
-        (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
-        (linked_hash_map."0.4.2"."heapsize_impl" or false); }
-      { "0.4.2".serde =
-        (f.linked_hash_map."0.4.2".serde or false) ||
-        (f.linked_hash_map."0.4.2".serde_impl or false) ||
-        (linked_hash_map."0.4.2"."serde_impl" or false); }
-      { "0.4.2".serde_test =
-        (f.linked_hash_map."0.4.2".serde_test or false) ||
-        (f.linked_hash_map."0.4.2".serde_impl or false) ||
-        (linked_hash_map."0.4.2"."serde_impl" or false); }
-    ];
-  }) [];
-
+# end
+# log-0.4.5
 
   crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate {
     crateName = "log";
@@ -947,35 +927,8 @@ rec {
   ];
 
 
-  crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate {
-    crateName = "lru-cache";
-    version = "0.1.1";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ];
-    sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
-    dependencies = mapFeatures features ([
-      (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
-    ]);
-    features = mkFeatures (features."lru_cache"."0.1.1" or {});
-  };
-  features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec {
-    linked_hash_map = fold recursiveUpdate {} [
-      { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; }
-      { "0.4.2".heapsize_impl =
-        (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
-        (lru_cache."0.1.1"."heapsize_impl" or false) ||
-        (f."lru_cache"."0.1.1"."heapsize_impl" or false); }
-    ];
-    lru_cache = fold recursiveUpdate {} [
-      { "0.1.1".default = (f.lru_cache."0.1.1".default or true); }
-      { "0.1.1".heapsize =
-        (f.lru_cache."0.1.1".heapsize or false) ||
-        (f.lru_cache."0.1.1".heapsize_impl or false) ||
-        (lru_cache."0.1.1"."heapsize_impl" or false); }
-    ];
-  }) [
-    (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
-  ];
-
+# end
+# memchr-1.0.2
 
   crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate {
     crateName = "memchr";
@@ -984,16 +937,16 @@ rec {
     sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+      ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."${deps."memchr"."1.0.2".libc}" deps) ] else []));
     features = mkFeatures (features."memchr"."1.0.2" or {});
   };
   features_.memchr."1.0.2" = deps: f: updateFeatures f (rec {
     libc = fold recursiveUpdate {} [
-      { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
-      { "0.2.43".use_std =
-        (f.libc."0.2.43".use_std or false) ||
+      { "${deps.memchr."1.0.2".libc}"."use_std" =
+        (f.libc."${deps.memchr."1.0.2".libc}"."use_std" or false) ||
         (memchr."1.0.2"."use_std" or false) ||
         (f."memchr"."1.0.2"."use_std" or false); }
+      { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
     ];
     memchr = fold recursiveUpdate {} [
       { "1.0.2".default = (f.memchr."1.0.2".default or true); }
@@ -1013,6 +966,9 @@ rec {
   ];
 
 
+# end
+# memchr-2.1.0
+
   crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate {
     crateName = "memchr";
     version = "2.1.0";
@@ -1021,7 +977,7 @@ rec {
     dependencies = mapFeatures features ([
       (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps)
     ]
-      ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+      ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."${deps."memchr"."2.1.0".libc}" deps) ] else []));
 
     buildDependencies = mapFeatures features ([
       (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps)
@@ -1031,11 +987,11 @@ rec {
   features_.memchr."2.1.0" = deps: f: updateFeatures f (rec {
     cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true;
     libc = fold recursiveUpdate {} [
-      { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
-      { "0.2.43".use_std =
-        (f.libc."0.2.43".use_std or false) ||
+      { "${deps.memchr."2.1.0".libc}"."use_std" =
+        (f.libc."${deps.memchr."2.1.0".libc}"."use_std" or false) ||
         (memchr."2.1.0"."use_std" or false) ||
         (f."memchr"."2.1.0"."use_std" or false); }
+      { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
     ];
     memchr = fold recursiveUpdate {} [
       { "2.1.0".default = (f.memchr."2.1.0".default or true); }
@@ -1058,6 +1014,9 @@ rec {
   ];
 
 
+# end
+# nodrop-0.1.12
+
   crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate {
     crateName = "nodrop";
     version = "0.1.12";
@@ -1082,6 +1041,9 @@ rec {
   }) [];
 
 
+# end
+# nom-3.2.1
+
   crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate {
     crateName = "nom";
     version = "3.2.1";
@@ -1094,11 +1056,11 @@ rec {
   };
   features_.nom."3.2.1" = deps: f: updateFeatures f (rec {
     memchr = fold recursiveUpdate {} [
-      { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
-      { "1.0.2".use_std =
-        (f.memchr."1.0.2".use_std or false) ||
+      { "${deps.nom."3.2.1".memchr}"."use_std" =
+        (f.memchr."${deps.nom."3.2.1".memchr}"."use_std" or false) ||
         (nom."3.2.1"."std" or false) ||
         (f."nom"."3.2.1"."std" or false); }
+      { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
     ];
     nom = fold recursiveUpdate {} [
       { "3.2.1".compiler_error =
@@ -1132,16 +1094,8 @@ rec {
   ];
 
 
-  crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.14";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
-  };
-  features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
-    pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
-  }) [];
-
+# end
+# proc-macro2-0.4.20
 
   crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate {
     crateName = "proc-macro2";
@@ -1170,6 +1124,9 @@ rec {
   ];
 
 
+# end
+# quick-error-1.2.2
+
   crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate {
     crateName = "quick-error";
     version = "1.2.2";
@@ -1181,6 +1138,9 @@ rec {
   }) [];
 
 
+# end
+# quote-0.6.8
+
   crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate {
     crateName = "quote";
     version = "0.6.8";
@@ -1193,11 +1153,11 @@ rec {
   };
   features_.quote."0.6.8" = deps: f: updateFeatures f (rec {
     proc_macro2 = fold recursiveUpdate {} [
-      { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
-      { "0.4.20".proc-macro =
-        (f.proc_macro2."0.4.20".proc-macro or false) ||
+      { "${deps.quote."0.6.8".proc_macro2}"."proc-macro" =
+        (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}"."proc-macro" or false) ||
         (quote."0.6.8"."proc-macro" or false) ||
         (f."quote"."0.6.8"."proc-macro" or false); }
+      { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
     ];
     quote = fold recursiveUpdate {} [
       { "0.6.8".default = (f.quote."0.6.8".default or true); }
@@ -1211,6 +1171,9 @@ rec {
   ];
 
 
+# end
+# rand-0.4.3
+
   crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
     crateName = "rand";
     version = "0.4.3";
@@ -1221,7 +1184,7 @@ rec {
     ]) else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
     ]
-      ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else [])
+      ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."${deps."rand"."0.4.3".libc}" deps) ] else [])) else [])
       ++ (if kernel == "windows" then mapFeatures features ([
       (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
     ]) else []);
@@ -1259,6 +1222,9 @@ rec {
   ];
 
 
+# end
+# redox_syscall-0.1.40
+
   crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate {
     crateName = "redox_syscall";
     version = "0.1.40";
@@ -1271,6 +1237,9 @@ rec {
   }) [];
 
 
+# end
+# redox_termios-0.1.1
+
   crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate {
     crateName = "redox_termios";
     version = "0.1.1";
@@ -1289,6 +1258,9 @@ rec {
   ];
 
 
+# end
+# redox_users-0.2.0
+
   crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate {
     crateName = "redox_users";
     version = "0.2.0";
@@ -1315,6 +1287,9 @@ rec {
   ];
 
 
+# end
+# regex-1.0.5
+
   crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate {
     crateName = "regex";
     version = "1.0.5";
@@ -1355,6 +1330,9 @@ rec {
   ];
 
 
+# end
+# regex-syntax-0.6.2
+
   crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate {
     crateName = "regex-syntax";
     version = "0.6.2";
@@ -1372,6 +1350,9 @@ rec {
   ];
 
 
+# end
+# remove_dir_all-0.5.1
+
   crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate {
     crateName = "remove_dir_all";
     version = "0.5.1";
@@ -1396,90 +1377,8 @@ rec {
   ];
 
 
-  crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate {
-    crateName = "rusqlite";
-    version = "0.14.0";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
-      (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
-      (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
-      (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps)
-    ]);
-    features = mkFeatures (features."rusqlite"."0.14.0" or {});
-  };
-  features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true;
-    libsqlite3_sys = fold recursiveUpdate {} [
-      { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; }
-      { "0.9.3".buildtime_bindgen =
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (rusqlite."0.14.0"."buildtime_bindgen" or false) ||
-        (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); }
-      { "0.9.3".bundled =
-        (f.libsqlite3_sys."0.9.3".bundled or false) ||
-        (rusqlite."0.14.0"."bundled" or false) ||
-        (f."rusqlite"."0.14.0"."bundled" or false); }
-      { "0.9.3".min_sqlite_version_3_6_11 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (rusqlite."0.14.0"."backup" or false) ||
-        (f."rusqlite"."0.14.0"."backup" or false); }
-      { "0.9.3".min_sqlite_version_3_6_23 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (rusqlite."0.14.0"."trace" or false) ||
-        (f."rusqlite"."0.14.0"."trace" or false); }
-      { "0.9.3".min_sqlite_version_3_7_3 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (rusqlite."0.14.0"."functions" or false) ||
-        (f."rusqlite"."0.14.0"."functions" or false); }
-      { "0.9.3".min_sqlite_version_3_7_4 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (rusqlite."0.14.0"."blob" or false) ||
-        (f."rusqlite"."0.14.0"."blob" or false); }
-      { "0.9.3".min_sqlite_version_3_7_7 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (rusqlite."0.14.0"."vtab" or false) ||
-        (f."rusqlite"."0.14.0"."vtab" or false); }
-      { "0.9.3".sqlcipher =
-        (f.libsqlite3_sys."0.9.3".sqlcipher or false) ||
-        (rusqlite."0.14.0"."sqlcipher" or false) ||
-        (f."rusqlite"."0.14.0"."sqlcipher" or false); }
-      { "0.9.3".unlock_notify =
-        (f.libsqlite3_sys."0.9.3".unlock_notify or false) ||
-        (rusqlite."0.14.0"."unlock_notify" or false) ||
-        (f."rusqlite"."0.14.0"."unlock_notify" or false); }
-    ];
-    lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true;
-    rusqlite = fold recursiveUpdate {} [
-      { "0.14.0".bundled =
-        (f.rusqlite."0.14.0".bundled or false) ||
-        (f.rusqlite."0.14.0".array or false) ||
-        (rusqlite."0.14.0"."array" or false); }
-      { "0.14.0".csv =
-        (f.rusqlite."0.14.0".csv or false) ||
-        (f.rusqlite."0.14.0".csvtab or false) ||
-        (rusqlite."0.14.0"."csvtab" or false); }
-      { "0.14.0".default = (f.rusqlite."0.14.0".default or true); }
-      { "0.14.0".lazy_static =
-        (f.rusqlite."0.14.0".lazy_static or false) ||
-        (f.rusqlite."0.14.0".vtab or false) ||
-        (rusqlite."0.14.0"."vtab" or false); }
-      { "0.14.0".vtab =
-        (f.rusqlite."0.14.0".vtab or false) ||
-        (f.rusqlite."0.14.0".array or false) ||
-        (rusqlite."0.14.0"."array" or false) ||
-        (f.rusqlite."0.14.0".csvtab or false) ||
-        (rusqlite."0.14.0"."csvtab" or false); }
-    ];
-    time."${deps.rusqlite."0.14.0".time}".default = true;
-  }) [
-    (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
-    (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
-    (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
-    (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps)
-  ];
-
+# end
+# rustc-demangle-0.1.9
 
   crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate {
     crateName = "rustc-demangle";
@@ -1492,6 +1391,9 @@ rec {
   }) [];
 
 
+# end
+# ryu-0.2.6
+
   crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate {
     crateName = "ryu";
     version = "0.2.6";
@@ -1507,6 +1409,9 @@ rec {
   }) [];
 
 
+# end
+# scoped_threadpool-0.1.9
+
   crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate {
     crateName = "scoped_threadpool";
     version = "0.1.9";
@@ -1519,6 +1424,9 @@ rec {
   }) [];
 
 
+# end
+# serde-1.0.80
+
   crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate {
     crateName = "serde";
     version = "1.0.80";
@@ -1548,6 +1456,9 @@ rec {
   }) [];
 
 
+# end
+# serde_derive-1.0.80
+
   crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate {
     crateName = "serde_derive";
     version = "1.0.80";
@@ -1576,6 +1487,9 @@ rec {
   ];
 
 
+# end
+# serde_json-1.0.32
+
   crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate {
     crateName = "serde_json";
     version = "1.0.32";
@@ -1606,6 +1520,9 @@ rec {
   ];
 
 
+# end
+# strsim-0.7.0
+
   crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate {
     crateName = "strsim";
     version = "0.7.0";
@@ -1617,6 +1534,9 @@ rec {
   }) [];
 
 
+# end
+# syn-0.15.13
+
   crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate {
     crateName = "syn";
     version = "0.15.13";
@@ -1626,23 +1546,23 @@ rec {
       (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps)
       (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps)
     ]
-      ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else []));
+      ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."${deps."syn"."0.15.13".quote}" deps) ] else []));
     features = mkFeatures (features."syn"."0.15.13" or {});
   };
   features_.syn."0.15.13" = deps: f: updateFeatures f (rec {
     proc_macro2 = fold recursiveUpdate {} [
-      { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
-      { "0.4.20".proc-macro =
-        (f.proc_macro2."0.4.20".proc-macro or false) ||
+      { "${deps.syn."0.15.13".proc_macro2}"."proc-macro" =
+        (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}"."proc-macro" or false) ||
         (syn."0.15.13"."proc-macro" or false) ||
         (f."syn"."0.15.13"."proc-macro" or false); }
+      { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
     ];
     quote = fold recursiveUpdate {} [
-      { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
-      { "0.6.8".proc-macro =
-        (f.quote."0.6.8".proc-macro or false) ||
+      { "${deps.syn."0.15.13".quote}"."proc-macro" =
+        (f.quote."${deps.syn."0.15.13".quote}"."proc-macro" or false) ||
         (syn."0.15.13"."proc-macro" or false) ||
         (f."syn"."0.15.13"."proc-macro" or false); }
+      { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
     ];
     syn = fold recursiveUpdate {} [
       { "0.15.13".clone-impls =
@@ -1679,6 +1599,9 @@ rec {
   ];
 
 
+# end
+# synstructure-0.10.0
+
   crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate {
     crateName = "synstructure";
     version = "0.10.0";
@@ -1710,6 +1633,9 @@ rec {
   ];
 
 
+# end
+# tempdir-0.3.7
+
   crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate {
     crateName = "tempdir";
     version = "0.3.7";
@@ -1730,6 +1656,9 @@ rec {
   ];
 
 
+# end
+# termcolor-1.0.4
+
   crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate {
     crateName = "termcolor";
     version = "1.0.4";
@@ -1747,6 +1676,9 @@ rec {
   ];
 
 
+# end
+# termion-1.5.1
+
   crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate {
     crateName = "termion";
     version = "1.5.1";
@@ -1772,6 +1704,9 @@ rec {
   ];
 
 
+# end
+# textwrap-0.10.0
+
   crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate {
     crateName = "textwrap";
     version = "0.10.0";
@@ -1789,6 +1724,9 @@ rec {
   ];
 
 
+# end
+# thread_local-0.3.6
+
   crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate {
     crateName = "thread_local";
     version = "0.3.6";
@@ -1806,41 +1744,8 @@ rec {
   ];
 
 
-  crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate {
-    crateName = "time";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."time"."0.1.40"."libc"}" deps)
-    ])
-      ++ (if kernel == "redox" then mapFeatures features ([
-      (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps)
-    ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps)
-    ]) else []);
-  };
-  features_.time."0.1.40" = deps: f: updateFeatures f (rec {
-    libc."${deps.time."0.1.40".libc}".default = true;
-    redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true;
-    time."0.1.40".default = (f.time."0.1.40".default or true);
-    winapi = fold recursiveUpdate {} [
-      { "${deps.time."0.1.40".winapi}"."minwinbase" = true; }
-      { "${deps.time."0.1.40".winapi}"."minwindef" = true; }
-      { "${deps.time."0.1.40".winapi}"."ntdef" = true; }
-      { "${deps.time."0.1.40".winapi}"."profileapi" = true; }
-      { "${deps.time."0.1.40".winapi}"."std" = true; }
-      { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; }
-      { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; }
-      { "${deps.time."0.1.40".winapi}".default = true; }
-    ];
-  }) [
-    (features_.libc."${deps."time"."0.1.40"."libc"}" deps)
-    (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps)
-    (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps)
-  ];
-
+# end
+# toml-0.4.8
 
   crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate {
     crateName = "toml";
@@ -1859,6 +1764,9 @@ rec {
   ];
 
 
+# end
+# ucd-util-0.1.1
+
   crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate {
     crateName = "ucd-util";
     version = "0.1.1";
@@ -1870,6 +1778,9 @@ rec {
   }) [];
 
 
+# end
+# unicode-width-0.1.5
+
   crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
     crateName = "unicode-width";
     version = "0.1.5";
@@ -1882,6 +1793,9 @@ rec {
   }) [];
 
 
+# end
+# unicode-xid-0.1.0
+
   crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate {
     crateName = "unicode-xid";
     version = "0.1.0";
@@ -1894,6 +1808,9 @@ rec {
   }) [];
 
 
+# end
+# utf8-ranges-1.0.1
+
   crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate {
     crateName = "utf8-ranges";
     version = "1.0.1";
@@ -1905,16 +1822,8 @@ rec {
   }) [];
 
 
-  crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate {
-    crateName = "vcpkg";
-    version = "0.2.6";
-    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
-    sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
-  };
-  features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
-    vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
-  }) [];
-
+# end
+# vec_map-0.8.1
 
   crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate {
     crateName = "vec_map";
@@ -1936,6 +1845,9 @@ rec {
   }) [];
 
 
+# end
+# version_check-0.1.5
+
   crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate {
     crateName = "version_check";
     version = "0.1.5";
@@ -1947,6 +1859,9 @@ rec {
   }) [];
 
 
+# end
+# winapi-0.3.6
+
   crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
     crateName = "winapi";
     version = "0.3.6";
@@ -1971,6 +1886,9 @@ rec {
   ];
 
 
+# end
+# winapi-i686-pc-windows-gnu-0.4.0
+
   crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-i686-pc-windows-gnu";
     version = "0.4.0";
@@ -1983,6 +1901,9 @@ rec {
   }) [];
 
 
+# end
+# winapi-util-0.1.1
+
   crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate {
     crateName = "winapi-util";
     version = "0.1.1";
@@ -2011,6 +1932,9 @@ rec {
   ];
 
 
+# end
+# winapi-x86_64-pc-windows-gnu-0.4.0
+
   crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-x86_64-pc-windows-gnu";
     version = "0.4.0";
@@ -2023,6 +1947,9 @@ rec {
   }) [];
 
 
+# end
+# wincolor-1.0.1
+
   crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate {
     crateName = "wincolor";
     version = "1.0.1";
@@ -2047,4 +1974,5 @@ rec {
   ];
 
 
+# end
 }

From 94c342348bd54646644250cfa3a03641e718757e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 27 Nov 2018 14:16:27 -0200
Subject: [PATCH 0220/2793] vivaldi: 2.1.1337.47-1 -> 2.1.1337.51-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 33172b9af70..89dd6775719 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 = "2.1.1337.47-1";
+  version = "2.1.1337.51-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "0i4dd5fgipplfq9jylm23jc9vn0qzf03ph1v85qh252hw5fgnyj2";
+    sha256 = "08x6abyz65vx4ycj8ys8sib9z1adb8ybmnrqjck69b30kbz78rj2";
   };
 
   unpackPhase = ''

From 6cb1bdb67f1a1b1c720c4e76b2eff107c6c0fdb3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Nov 2018 11:39:13 -0600
Subject: [PATCH 0221/2793] libical: disable parallel check, fix

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

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 718233b0ffa..93586341dc4 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
   # Using install check so we do not have to manually set
   # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
   doInstallCheck = true;
+  enableParallelChecking = false;
   installCheckPhase = ''
     runHook preInstallCheck
 

From 08699733bbf38cb2ab587688db727e0fd8b83cce Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Fri, 2 Nov 2018 16:05:54 +0800
Subject: [PATCH 0222/2793] pulumi: init at 0.16.2

---
 pkgs/tools/admin/pulumi/default.nix | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/admin/pulumi/default.nix

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
new file mode 100644
index 00000000000..b24b88fa96a
--- /dev/null
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+let
+
+  version = "0.16.2";
+
+  # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
+  pulumiArchPackage = {
+    "x86_64-linux" = {
+      url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
+      sha256 = "16qgy2pj3xkf1adi3882fpsl99jwsm19111fi5vzh1xqf39sg549";
+    };
+    "x86_64-darwin" = {
+      url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
+      sha256 = "18ck9khspa0x798bdlwk8dzylbsq7s35xmla8yasd9qqlab1yy1a";
+    };
+  };
+
+in stdenv.mkDerivation rec {
+  inherit version;
+  name = "pulumi-${version}";
+
+  src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system};
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp * $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://pulumi.io/;
+    description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
+    license = with licenses; [ asl20 ];
+    platforms = builtins.attrNames pulumiArchPackage;
+    maintainers = with maintainers; [
+      peterromfeldhk
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20dbd2552dc..d3785640178 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4663,6 +4663,8 @@ with pkgs;
       };
   };
 
+  pulumi-bin = callPackage ../tools/admin/pulumi { };
+
   p0f = callPackage ../tools/security/p0f { };
 
   pngout = callPackage ../tools/graphics/pngout { };

From 2d5908f89bab59c2c4f88fbfc900dfff9baa55f0 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 27 Nov 2018 17:49:22 +0100
Subject: [PATCH 0223/2793] kustomize: 1.0.9 -> 1.0.10

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/kustomize/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 15ae07962c5..38b495d89a6 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -3,9 +3,9 @@
 
 buildGoPackage rec {
   name = "kustomize-${version}";
-  version = "1.0.9";
-  # rev is the 1.0.8 commit, mainly for kustomize version command output
-  rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d";
+  version = "1.0.10";
+  # rev is the 1.0.10 commit, mainly for kustomize version command output
+  rev = "383b3e798b7042f8b7431f93e440fb85631890a3";
 
   goPackagePath = "sigs.k8s.io/kustomize";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
   '';
 
   src = fetchFromGitHub {
-    sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f";
+    sha256 = "1z78d5j2w78x4ks4v745050g2ffmirj03v7129dib2lfhfjra8aj";
     rev = "v${version}";
     repo = "kustomize";
     owner = "kubernetes-sigs";

From b3de1c5f21d9a2b1e27a849cec457b50bb8ca7b3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 1 Nov 2018 11:43:53 -0500
Subject: [PATCH 0224/2793] gmime: 3.2.1 -> 3.2.2

It says fixed vala packaging but commits don't seem to do that?
---
 pkgs/development/libraries/gmime/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 63d00f1dd1a..9d36c192df7 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.1";
+  version = "3.2.2";
   name = "gmime-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
-    sha256 = "0q65nalxzpyjg37gdlpj9v6028wp0qx47z96q0ff6znw217nzzjn";
+    sha256 = "02bjv8nh50182g23figi67c5rhmdyd5wyida0rmkyyrjrpzi8c31";
   };
 
   outputs = [ "out" "dev" ];

From ce4e3a3d4646cfb2bd01800254d1417578613289 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Nov 2018 11:31:02 -0600
Subject: [PATCH 0225/2793] gmime3: 3.2.2 -> 3.2.3

https://github.com/jstedfast/gmime/blob/3.2.3/NEWS
---
 pkgs/development/libraries/gmime/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 9d36c192df7..443200c17b1 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.2";
+  version = "3.2.3";
   name = "gmime-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
-    sha256 = "02bjv8nh50182g23figi67c5rhmdyd5wyida0rmkyyrjrpzi8c31";
+    sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
   };
 
   outputs = [ "out" "dev" ];

From 3ee42320fed0b46b99ffa64cd3c4accb6c85fde4 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 27 Nov 2018 18:23:09 +0100
Subject: [PATCH 0226/2793] avldrums.lv2: 0.3.0 -> 0.3.1

---
 pkgs/applications/audio/avldrums-lv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index 40fb0c6d9e1..75b6d8e2758 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "avldrums.lv2";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "x42";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w51gdshq2i5bix2x5l3g3gnycy84nlzf5sj0jkrw0zrnbk6ghwg";
+    sha256 = "0yhq3n5bahhqpj40mvlkxcjsdsw63jsbz20pl77bx2qj30w25i2j";
     fetchSubmodules = true;
   };
 

From de634ae9025fabf8f34e113e6d3133bde3ba7e36 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 27 Nov 2018 18:30:04 +0100
Subject: [PATCH 0227/2793] dragonfly-reverb: 0.9.4 -> 1.0.0

---
 pkgs/applications/audio/dragonfly-reverb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index fbe987e09cb..1710931aa22 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelwillis";
     repo = "dragonfly-reverb";
-    rev = "0.9.4";
-    sha256 = "0lc45jybjwg4wrcz4s9lvzpvqawgj825rkqhz2xxvalfbvjazi53";
+    rev = "1.0.0";
+    sha256 = "05m4hd8lg0a7iiia6cbiw5qmc4p8vbkxp2qh7ywaabawiwa9r24x";
     fetchSubmodules = true;
   };
 

From 16f5462d84008a5c20939754798823e5eae85101 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Nov 2018 19:38:59 +0100
Subject: [PATCH 0228/2793] androidStudioPackages.{dev,canary}: 3.4.0.3 ->
 3.4.0.4

---
 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 00444e1c2c7..671f469e2b2 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "12gzwnlvc1w5lywpdckdgwxy2yrhf0m0fvaljdsis2arw0x9qdh2";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.3"; # "Android Studio 3.4 Canary 4"
-    build = "183.5129585";
-    sha256Hash = "10y09sy0h4yp39dwpp8x7kjvw8r7hvk0qllbbaqj76j33xa85793";
+    version = "3.4.0.4"; # "Android Studio 3.4 Canary 5"
+    build = "183.5141831";
+    sha256Hash = "0xfk5vyjk3pdb44jp43vb5394486z2qgzrdhjzbf1ncbhvaf0aji";
   };
 in rec {
   # Old alias

From 1296566746b40e1a1ae6c41f5e49f10d18072439 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Nov 2018 19:38:59 +0100
Subject: [PATCH 0229/2793] androidStudioPackages.beta: 3.3.0.16 -> 3.3.0.17

---
 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 671f469e2b2..b849f1fa62d 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
   };
   betaVersion = {
-    version = "3.3.0.16"; # "Android Studio 3.3 Beta 4"
-    build = "182.5114240";
-    sha256Hash = "12gzwnlvc1w5lywpdckdgwxy2yrhf0m0fvaljdsis2arw0x9qdh2";
+    version = "3.3.0.17"; # "Android Studio 3.3 RC 1"
+    build = "182.5138683";
+    sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
   };
   latestVersion = { # canary & dev
     version = "3.4.0.4"; # "Android Studio 3.4 Canary 5"

From b3fb2d5c1c871a3c154037e14fa0815d1d0891ba Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Nov 2018 20:03:36 +0100
Subject: [PATCH 0230/2793] signal-desktop: 1.18.0 -> 1.18.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 d9b86b31bf2..2f7f3c5836a 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.18.0";
+  version = "1.18.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0l5q55k5dp7hbvw3dnjsz39blbsahx6nh9ln4c69752zg473yv4v";
+    sha256 = "1gak6nhv5gk37iv1bfmjx6wf0p1vcln5y29i6fkzmvcrp3j2cmfh";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From d04fedd71500703e86486f31e4a1b1289fb7c081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 27 Nov 2018 19:16:21 +0000
Subject: [PATCH 0231/2793] postgresql: Enable systemd integration for 9.6+

This allows, finally, proper detection when postgresql is ready to
accept connections. Until now, it was possible that services depending
on postgresql would fail in a race condition trying to connect
to postgresql.
---
 nixos/modules/services/databases/postgresql.nix | 3 +++
 pkgs/servers/sql/postgresql/default.nix         | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f592be0e768..aeab445a998 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -238,6 +238,9 @@ in
             User = "postgres";
             Group = "postgres";
             PermissionsStartOnly = true;
+            Type = if lib.versionAtLeast cfg.package.version "9.6"
+                   then "notify"
+                   else "simple";
 
             # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index dce158ebed9..c91a9bb8b9a 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -1,10 +1,11 @@
-{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata }:
+{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd }:
 
 let
 
   common = { version, sha256, psqlSchema }:
    let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
     name = "postgresql-${version}";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
@@ -15,7 +16,7 @@ let
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
-      [ zlib readline openssl libxml2 makeWrapper ]
+      [ zlib readline openssl libxml2 makeWrapper systemd ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
     enableParallelBuilding = true;
@@ -33,6 +34,7 @@ let
       "--sysconfdir=/etc"
       "--libdir=$(lib)/lib"
       "--with-system-tzdata=${tzdata}/share/zoneinfo"
+      (lib.optionalString (atLeast "9.6" && !stdenv.isDarwin) "--with-systemd")
       (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
     ];
 

From f31ea5a2d58c2487b4927bd2e59ae3269ae24368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 27 Nov 2018 19:38:54 +0000
Subject: [PATCH 0232/2793] postgresql: conditionalize systemd (on darwin)

---
 pkgs/servers/sql/postgresql/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c91a9bb8b9a..16eeac03811 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -16,7 +16,8 @@ let
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
-      [ zlib readline openssl libxml2 makeWrapper systemd ]
+      [ zlib readline openssl libxml2 makeWrapper ]
+      ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
     enableParallelBuilding = true;

From af31c4ef4c9b374ef7538179601c0b827e9a6efc Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 27 Nov 2018 20:44:18 +0100
Subject: [PATCH 0233/2793] renoise: needs only mpg123 library

Moved in postFixup because fixup phase shrinks RPATH
---
 pkgs/applications/audio/renoise/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index c3474b60348..081c4ab41ac 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib,
-  mpg123, makeWrapper, releasePath ? null }:
+{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib
+, mpg123, releasePath ? null }:
 
 with stdenv.lib;
 
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
         releasePath
     else throw "Platform is not supported by Renoise";
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
+  buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
 
   installPhase = ''
     cp -r Resources $out
@@ -56,9 +55,13 @@ stdenv.mkDerivation rec {
 
     mkdir $out/bin
     ln -s $out/renoise $out/bin/renoise
+  '';
 
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
-    wrapProgram "$out/renoise" --prefix LD_LIBRARY_PATH : "${mpg123}/lib"
+  postFixup = ''
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath ${mpg123}/lib:$out/lib \
+      $out/renoise
   '';
 
   meta = {

From 14342e8c6d7f1ac2d8792c8cc5bae6b2d1c227d0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Nov 2018 13:43:47 -0600
Subject: [PATCH 0234/2793] pdns-recursor: 4.1.7 -> 4.1.8 (security)

https://docs.powerdns.com/recursor/changelog/4.1.html#change-4.1.8
---
 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 1f8429a60d1..e4a4bcf5760 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.7";
+  version = "4.1.8";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "0syvxlfxy3h2x1kvqkj7qqk8k85y42qjq30pcqqmy69v3pymq14s";
+    sha256 = "1xg5swappik8v5mjyl7magw7picf5cqp6rbhckd6ijssz16qzy38";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f5b030002b637b7af705351d866cf2da55df41f8 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 26 Nov 2018 20:04:11 +0100
Subject: [PATCH 0235/2793] mopidy-iris: 3.31.1 -> 3.31.2

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

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 847e67ebd8e..c3f45caf531 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.31.1";
+  version = "3.31.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1djxkgjvfzijvlq3gill1p20l0q64dbv9wd55whbir1l7y8wdga5";
+    sha256 = "0639ib5nicrabckjd17wdmhl8n3822gc2p1bn0xv8mq70paspar6";
   };
 
   propagatedBuildInputs = [
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
     pylast
     spotipy
     raven
-    tornado
+    tornado_4
   ]);
 
   postPatch = "sed -i /tornado/d setup.py";

From c41c195dc52a88810f6520d7ed3dc699a9f4b0b1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 27 Nov 2018 20:13:23 +0000
Subject: [PATCH 0236/2793] postgresql: disable parallel building on Darwin

There have been multiple reports of this failing.

Fixes https://github.com/NixOS/nixpkgs/issues/51093.
---
 pkgs/servers/sql/postgresql/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 16eeac03811..480b5327028 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -20,7 +20,7 @@ let
       ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
-    enableParallelBuilding = true;
+    enableParallelBuilding = !stdenv.isDarwin;
 
     makeFlags = [ "world" ];
 

From 63c7ed978828b9561bcc22185d32f4d67c57c117 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 27 Nov 2018 20:21:25 +0000
Subject: [PATCH 0237/2793] hyperrogue: 10.4j -> 10.5a

---
 pkgs/games/hyperrogue/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 7f7ec00bdd6..99870ca52de 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -3,19 +3,21 @@
 
 stdenv.mkDerivation rec {
   name = "hyperrogue-${version}";
-  version = "10.4j";
+  version = "10.5a";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     rev = "v${version}";
-    sha256 = "0p0aplfr5hs5dmkgbd4rhvrdk33gss1wdb7knd2vf27n4c2avjcl";
+    sha256 = "1s5jm5qrbw60s8q73fzjk9g2fmapd0i7zmrna2dqx55i1gg9d597";
   };
 
   CPPFLAGS = "-I${SDL.dev}/include/SDL";
 
   buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.roguetemple.com/z/hyper/;
     description = "A roguelike game set in hyperbolic geometry";

From 5a1eb1819b21d876d79cac5f205520e04f982de1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 27 Nov 2018 15:57:10 -0500
Subject: [PATCH 0238/2793] spdlog: 0.14.0 -> 0.17.0 & 1.1.0 -> 1.2.1

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

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index a96cd455f55..198c61d37b5 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -15,7 +15,7 @@ let
 
       nativeBuildInputs = [ cmake ];
 
-      # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
+      cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ];
 
       outputs = [ "out" "doc" ];
 
@@ -35,12 +35,12 @@ let
 in
 {
   spdlog_1 = generic {
-    version = "1.1.0";
-    sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f";
+    version = "1.2.1";
+    sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n";
   };
 
   spdlog_0 = generic {
-    version = "0.14.0";
-    sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
+    version = "0.17.0";
+    sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9";
   };
 }

From 064bd03b8c2faa534f3979051f5ecb267af9bc72 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Nov 2018 22:14:41 +0100
Subject: [PATCH 0239/2793] doc: tweak the coding conventions (#51113)

Encouraging to put container elements on their own lines to minimize
diffs, merge conflicts and making re-ordering easier.

Nix doesn't suffer the restrictions of other languages where commas are
used to separate list items.
---
 doc/coding-conventions.xml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 2d2018c72d2..a8a4557b461 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -56,25 +56,30 @@ foo { arg = ...; }
      or list elements should be aligned:
 <programlisting>
 # A long list.
-list =
-  [ elem1
-    elem2
-    elem3
-  ];
+list = [
+  elem1
+  elem2
+  elem3
+];
 
 # A long attribute set.
-attrs =
-  { attr1 = short_expr;
-    attr2 =
-      if true then big_expr else big_expr;
-  };
-
-# Alternatively:
 attrs = {
   attr1 = short_expr;
   attr2 =
     if true then big_expr else big_expr;
 };
+
+# Combined
+listOfAttrs = [
+  {
+    attr1 = 3;
+    attr2 = "fff";
+  }
+  {
+    attr1 = 5;
+    attr2 = "ggg";
+  }
+];
 </programlisting>
     </para>
    </listitem>

From 784230c0fc959fc87fa7d26b5ce8d85999e69951 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Nov 2018 16:17:07 -0500
Subject: [PATCH 0240/2793] linux: 4.4.164 -> 4.4.165

---
 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 b0733857c80..01bcc6f2525 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.164";
+  version = "4.4.165";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "041w65dxsdcdpf7isis2r4xabfm9pbhfgxxx7n9d1nv7grss3d4v";
+    sha256 = "19zmigb1avq63n0cbvsqaw9ygddwx13mrvl80p92abw7ns26b2va";
   };
 } // (args.argsOverride or {}))

From 3739bf46d54419e87fd3a413093bf997823c6841 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Nov 2018 16:17:31 -0500
Subject: [PATCH 0241/2793] linux: 4.9.140 -> 4.9.141

---
 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 35fd90b6160..2fc57a104ea 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.140";
+  version = "4.9.141";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hzrha3rh90jwxjmrh4npd0q56pf512nmb8i2p484k9cikssx27q";
+    sha256 = "09mc5sxzzxmks20vslimaaaw0aamjcc3lvpyjydmr78s25q5zfsp";
   };
 } // (args.argsOverride or {}))

From 23ef67470136839682322d33d94988fb25c13613 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Nov 2018 16:17:42 -0500
Subject: [PATCH 0242/2793] linux: 4.14.83 -> 4.14.84

---
 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 69ce2fe71c6..6254ed7fac0 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.83";
+  version = "4.14.84";
 
   # 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 = "081zxc7ikcn1hy22pw5af0dql9pq24h2anfgnykc83jfjbg2h5vh";
+    sha256 = "0653fg6p0wg81i4mj8n4lghn8h8jx3pkbyp6sm22p2b1rwpgj893";
   };
 } // (args.argsOverride or {}))

From ef3f3067a1770e859bd02581170359fd35c7ef2a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Nov 2018 16:18:20 -0500
Subject: [PATCH 0243/2793] linux: 4.19.4 -> 4.19.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 13e4a56f471..54b03fc88be 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.4";
+  version = "4.19.5";
 
   # 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 = "1aj7zwrjwrjb3m3nfccykmcvhrrjsk1zchc5g4f63xd1pc35d3x3";
+    sha256 = "0xggarlff54l9zxm5qr14nzd514xxg8i1akyxzlb0znfkk19x0wc";
   };
 } // (args.argsOverride or {}))

From 1936aa5d571467710af5226987e2e3b901afcb54 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Tue, 27 Nov 2018 18:55:44 +1030
Subject: [PATCH 0244/2793] scss_lint: init at 0.57.1

---
 pkgs/development/tools/scss-lint/Gemfile      |  2 +
 pkgs/development/tools/scss-lint/Gemfile.lock | 25 ++++++++
 pkgs/development/tools/scss-lint/default.nix  | 15 +++++
 pkgs/development/tools/scss-lint/gemset.nix   | 62 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 106 insertions(+)
 create mode 100644 pkgs/development/tools/scss-lint/Gemfile
 create mode 100644 pkgs/development/tools/scss-lint/Gemfile.lock
 create mode 100644 pkgs/development/tools/scss-lint/default.nix
 create mode 100644 pkgs/development/tools/scss-lint/gemset.nix

diff --git a/pkgs/development/tools/scss-lint/Gemfile b/pkgs/development/tools/scss-lint/Gemfile
new file mode 100644
index 00000000000..05eac2332f5
--- /dev/null
+++ b/pkgs/development/tools/scss-lint/Gemfile
@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "scss_lint"
diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock
new file mode 100644
index 00000000000..546dfabe4d7
--- /dev/null
+++ b/pkgs/development/tools/scss-lint/Gemfile.lock
@@ -0,0 +1,25 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.9.25)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.7.2)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    scss_lint (0.57.1)
+      rake (>= 0.9, < 13)
+      sass (~> 3.5, >= 3.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  scss_lint
+
+BUNDLED WITH
+   1.16.3
diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/development/tools/scss-lint/default.nix
new file mode 100644
index 00000000000..d1d0dbababa
--- /dev/null
+++ b/pkgs/development/tools/scss-lint/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp }:
+
+bundlerApp {
+  pname = "scss_lint";
+  gemdir = ./.;
+  exes = [ "scss-lint" ];
+
+  meta = with lib; {
+    description = "A tool to help keep your SCSS files clean and readable";
+    homepage    = https://github.com/brigade/scss-lint;
+    license     = licenses.mit;
+    maintainers = [ maintainers.lovek323 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/pkgs/development/tools/scss-lint/gemset.nix
new file mode 100644
index 00000000000..46747f04939
--- /dev/null
+++ b/pkgs/development/tools/scss-lint/gemset.nix
@@ -0,0 +1,62 @@
+{
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+      type = "gem";
+    };
+    version = "1.9.25";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
+      type = "gem";
+    };
+    version = "12.3.1";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  sass = {
+    dependencies = ["sass-listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1phs6hnd8b95m7n5wbh5bsclmwaajd1sqlgw9fmj72bfqldbmcqa";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  scss_lint = {
+    dependencies = ["rake" "sass"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dv4ff1lqbgqdx99nwg059c983dhw67kvvjd21f6vf62cjx09lpn";
+      type = "gem";
+    };
+    version = "0.57.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 702cc2a354a..9a20cbdc805 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8919,6 +8919,8 @@ with pkgs;
 
   sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { };
 
+  scss-lint = callPackage ../development/tools/scss-lint { };
+
   shallot = callPackage ../tools/misc/shallot { };
 
   shards = callPackage ../development/tools/build-managers/shards { };

From dcae76862b003220e8a3d62779cf7392ddb898aa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 27 Nov 2018 19:57:56 +0000
Subject: [PATCH 0245/2793] nginxMainline: 1.15.6 -> 1.15.7

---
 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 93dfbbad2b4..8f33fa8d33b 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.6";
-  sha256 = "1ikchbnq1dv8wjnsf6jj24xkb36vcgigyps71my8r01m41ycdn53";
+  version = "1.15.7";
+  sha256 = "14yz5cag9jdi088kdyammpi0ixrzi91bc0nwdldj42hfdhpyl8lg";
 })

From dc1a0df1bb69e49aa3cd0d728a83825836b0b485 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Nov 2018 16:37:19 -0500
Subject: [PATCH 0246/2793] gradle: Add 5.0

---
 .../tools/build-managers/gradle/default.nix            | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index a369df68f05..afe93ddf383 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,6 +52,16 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
+    name = "gradle-5.0";
+    nativeVersion = "0.14";
+
+    src = fetchurl {
+      url = "http://services.gradle.org/distributions/${name}-bin.zip";
+      sha256 = "19krxq9pid9dg6bhdbhhg7ykm5kcx7lv7cr58rj67g0h6jgsqmv1";
+    };
+  };
+
+  gradle_4_10 = gradleGen rec {
     name = "gradle-4.10.2";
     nativeVersion = "0.14";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3c4bfaf23e..8bd97f72f70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8568,6 +8568,7 @@ with pkgs;
   gradle_2_14 = self.gradleGen.gradle_2_14;
   gradle_2_5 = self.gradleGen.gradle_2_5;
   gradle_3_5 = self.gradleGen.gradle_3_5;
+  gradle_4_10 = self.gradleGen.gradle_4_10;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.

From 798a2a6c97ff2251dd2796e8fd1b248d704296ba Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Nov 2018 23:36:30 +0100
Subject: [PATCH 0247/2793] bundix: 2.3.1 -> 2.4.0 (#51146)

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

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 4ac62da7f4a..d0782513c75 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -6,13 +6,13 @@ buildRubyGem rec {
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "manveru";
     repo = "bundix";
     rev = version;
-    sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v";
+    sha256 = "1lq8nday6031mj7ivnk2wd47v2smz6frnb8xh2yhyhpld045v1rz";
   };
 
   buildInputs = [ ruby bundler ];

From 12d4cc12ac4f53f38db19a4e8e78ebc7ba2ee042 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 27 Nov 2018 15:10:25 -0500
Subject: [PATCH 0248/2793] pythonPackages.sure: 1.2.24 -> 1.4.11

Fix broken python package `sure`
---
 pkgs/development/python-modules/sure/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 31ec9c12b00..b4c5fdf4022 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -1,31 +1,28 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, nose
+, rednose
 , six
 , mock
-, pkgs
 , isPyPy
 }:
 
 buildPythonPackage rec {
   pname = "sure";
-  version = "1.2.24";
+  version = "1.4.11";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w";
+    sha256 = "3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa";
   };
 
-  LC_ALL="en_US.UTF-8";
-
-  buildInputs = [ nose pkgs.glibcLocales ];
+  buildInputs = [ rednose ];
   propagatedBuildInputs = [ six mock ];
 
   meta = with stdenv.lib; {
     description = "Utility belt for automated testing";
-    homepage = https://falcao.it/sure/;
+    homepage = https://sure.readthedocs.io/en/latest/;
     license = licenses.gpl3Plus;
   };
 

From 0e3c1e7801e8db0ac0887206bab9d6d717ef0eb9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:19:26 -0500
Subject: [PATCH 0249/2793] pythonPackages.astunparse: 1.5.0 -> 1.6.1

---
 .../python-modules/astunparse/default.nix     | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index 4c46f93b547..703a6e68167 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, fetchPypi, buildPythonPackage, six }:
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, six
+, wheel
+ }:
 
 buildPythonPackage rec {
   pname = "astunparse";
-  version =  "1.5.0";
+  version =  "1.6.1";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kc9lm2jvfcip3z8snj04dar5a9jh857a704m6lvcv4xclm3rpsm";
+    sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca";
   };
-  propagatedBuildInputs = [ six ];
-  doCheck = false; # no tests
+
+  propagatedBuildInputs = [ six wheel ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "This is a factored out version of unparse found in the Python source distribution";
+    homepage = https://github.com/simonpercivall/astunparse;
     license = licenses.bsd3;
     maintainers = with maintainers; [ jyp ];
   };

From ac3b358a8ccb42bc116dd08366aa5ab3f252c42b Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Tue, 27 Nov 2018 02:11:03 -0800
Subject: [PATCH 0250/2793] libtiff: 2018-11-04 -> 4.0.10

---
 .../development/libraries/libtiff/default.nix | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 4176bb9555f..55c747540f7 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,11 +1,7 @@
 { stdenv
-, fetchFromGitLab
+, fetchurl
 
 , pkgconfig
-, autogen
-, autoconf
-, automake
-, libtool
 
 , zlib
 , libjpeg
@@ -13,26 +9,22 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2018-11-04";
-  name = "libtiff-unstable-${version}";
+  version = "4.0.10";
+  name = "libtiff-${version}";
 
-  src = fetchFromGitLab {
-    owner = "libtiff";
-    repo = "libtiff";
-    rev = "779e54ca32b09155c10d398227a70038de399d7d";
-    sha256 = "029fmn0rdmb5gxhg83ff9j2zx3qk6wsiaiv554jq26pdc23achsp";
+  src = fetchurl {
+    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
+    sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig autogen autoconf automake libtool ];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
   enableParallelBuilding = true;
 
-  preConfigure = "./autogen.sh";
-
   doCheck = true; # not cross;
 
   meta = with stdenv.lib; {

From ab8bd6e34edeb7c0d85b545b1c59355568faa38f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:20:05 -0500
Subject: [PATCH 0251/2793] pythonPackages.nbval: init at 0.9.1

---
 .../python-modules/nbval/default.nix          | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/nbval/default.nix

diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
new file mode 100644
index 00000000000..c9ab72894ef
--- /dev/null
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, coverage
+, ipykernel
+, jupyter_client
+, nbformat
+, pytest
+, six
+, glibcLocales
+, matplotlib
+, sympy
+, pytestcov
+}:
+
+buildPythonPackage rec {
+  pname = "nbval";
+  version = "0.9.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3f18b87af4e94ccd073263dd58cd3eebabe9f5e4d6ab535b39d3af64811c7eda";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  buildInputs = [ glibcLocales ];
+  checkInputs = [ matplotlib sympy pytestcov ];
+  propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ];
+
+  checkPhase = ''
+    pytest tests --current-env --ignore tests/test_timeouts.py
+  '';
+
+  meta = with lib; {
+    description = "A py.test plugin to validate Jupyter notebooks";
+    homepage = https://github.com/computationalmodelling/nbval;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2626721b8e..eb0334d8b8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -434,6 +434,8 @@ in {
 
   mwoauth = callPackage ../development/python-modules/mwoauth { };
 
+  nbval = callPackage ../development/python-modules/nbval { };
+
   nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
 
   neuron = pkgs.neuron.override {

From b5d58552c07e4b6cf7e682d258498a0b632bd8c9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:20:41 -0500
Subject: [PATCH 0252/2793] pythonPackages.multiset: init at 2.1.1

---
 .../python-modules/multiset/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/multiset/default.nix

diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix
new file mode 100644
index 00000000000..5cc159dc205
--- /dev/null
+++ b/pkgs/development/python-modules/multiset/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytestrunner
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "multiset";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7";
+  };
+
+  buildInputs = [ setuptools_scm pytestrunner ];
+  checkInputs = [ pytest ];
+
+  meta = with lib; {
+    description = "An implementation of a multiset";
+    homepage = https://github.com/wheerd/multiset;
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb0334d8b8f..bb273cbdb4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -430,6 +430,8 @@ in {
     mpi = pkgs.openmpi;
   };
 
+  multiset = callPackage ../development/python-modules/multiset { };
+
   mwclient = callPackage ../development/python-modules/mwclient { };
 
   mwoauth = callPackage ../development/python-modules/mwoauth { };

From fe5a7e5ed6f94283f591a73ceaf3716c462516e9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:21:05 -0500
Subject: [PATCH 0253/2793] pythonPackages.matchpy: init at 0.4.6

---
 .../python-modules/matchpy/default.nix        | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/matchpy/default.nix

diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
new file mode 100644
index 00000000000..92549096758
--- /dev/null
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hopcroftkarp
+, multiset
+, pytest
+, pytestrunner
+, hypothesis
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+  pname = "matchpy";
+  version = "0.4.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "eefa1e50a10e1255db61bc2522a6768ad0701f8854859f293ebaa442286faadd";
+  };
+
+  buildInputs = [ setuptools_scm pytestrunner ];
+  checkInputs = [ pytest hypothesis ];
+  propagatedBuildInputs = [ hopcroftkarp multiset ];
+
+  meta = with lib; {
+    description = "A library for pattern matching on symbolic expressions";
+    homepage = https://github.com/HPAC/matchpy;
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb273cbdb4f..1299631cab3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -422,6 +422,8 @@ in {
 
   markerlib = callPackage ../development/python-modules/markerlib { };
 
+  matchpy = callPackage ../development/python-modules/matchpy { };
+
   monty = callPackage ../development/python-modules/monty { };
 
   mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;

From e097b5e82b6597139c267b81c814a59a3aca849f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 27 Nov 2018 11:52:21 -0500
Subject: [PATCH 0254/2793] pythonPackages.matchpy: init at 0.4.6

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

diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
index 92549096758..dcac40b873c 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -7,11 +7,13 @@
 , pytestrunner
 , hypothesis
 , setuptools_scm
+, isPy27
 }:
 
 buildPythonPackage rec {
   pname = "matchpy";
   version = "0.4.6";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

From a6dc1123e0a6492f67d7cfb4e4ff14abd25125cc Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:21:28 -0500
Subject: [PATCH 0255/2793] pythonPackages.hopcroftkarp: init at 1.2.4

---
 .../python-modules/hopcroftkarp/default.nix   | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/hopcroftkarp/default.nix

diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix
new file mode 100644
index 00000000000..4acf05b4142
--- /dev/null
+++ b/pkgs/development/python-modules/hopcroftkarp/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "hopcroftkarp";
+  version = "1.2.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cc6fc7ad348bbe5c9451f8116845c46ae26290c92b2dd14690aae2d55ba5e3a6";
+  };
+
+  # tests fail due to bad package name
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Implementation of HopcroftKarp's algorithm";
+    homepage = https://github.com/sofiat-olaosebikan/hopcroftkarp;
+    license = licenses.gpl1;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1299631cab3..cd752b05ec0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -398,6 +398,8 @@ in {
     inherit python;
   });
 
+  hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };
+
   httpsig = callPackage ../development/python-modules/httpsig { };
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };

From 8b6b45c7424bd9c9c3ff416054fc78774ab1fd5b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 26 Nov 2018 15:21:50 -0500
Subject: [PATCH 0256/2793] pythonPackages.uarray: init at 0.4

---
 .../python-modules/uarray/default.nix         | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/uarray/default.nix

diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
new file mode 100644
index 00000000000..fad2dee2d16
--- /dev/null
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, matchpy
+, numpy
+, astunparse
+, typing-extensions
+, black
+, pytest
+, pytestcov
+, numba
+, nbval
+, python
+, isPy37
+}:
+
+buildPythonPackage rec {
+  pname = "uarray";
+  version = "0.4";
+  format = "flit";
+  # will have support soon see
+  # https://github.com/Quansight-Labs/uarray/pull/64
+  disabled = isPy37;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4ec88f477d803a914d58fdf83aeedfb1986305355775cf55525348c62cce9aa4";
+  };
+
+  checkInputs = [ pytest nbval pytestcov numba ];
+  propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ];
+
+  checkPhase = ''
+    ${python.interpreter} extract_readme_tests.py
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Universal array library";
+    homepage = https://github.com/Quansight-Labs/uarray;
+    license = licenses.bsd0;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd752b05ec0..5a39faaae80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3961,6 +3961,8 @@ in {
 
   ua-parser = callPackage ../development/python-modules/ua-parser { };
 
+  uarray = callPackage ../development/python-modules/uarray { };
+
   ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };
 
   umemcache = callPackage ../development/python-modules/umemcache {};

From 1fc0eee80c93fcff789e2cc398c1031bf07b3fc2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 27 Nov 2018 21:11:06 -0500
Subject: [PATCH 0257/2793] gitAndTools.git-reparent: init at 2017-09-03

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-reparent/default.nix    | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-reparent/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 c99ae18ff52..21cdd87ddcf 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -94,6 +94,8 @@ let
 
   git-remote-hg = callPackage ./git-remote-hg { };
 
+  git-reparent = callPackage ./git-reparent { };
+
   git-secret = callPackage ./git-secret { };
 
   git-secrets = callPackage ./git-secrets { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
new file mode 100644
index 00000000000..f2f700b8510
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, makeWrapper, git, gnused }:
+
+stdenv.mkDerivation rec {
+  name = "git-reparent-${version}";
+  version = "2017-09-03";
+
+  src = fetchFromGitHub {
+    owner  = "MarkLodato";
+    repo   = "git-reparent";
+    rev    = "a99554a32524a86421659d0f61af2a6c784b7715";
+    sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -m755 -Dt $out/bin git-reparent
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/git-reparent --prefix PATH : "${stdenv.lib.makeBinPath [ git gnused ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Git command to recommit HEAD with a new set of parents";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
+}

From a034d90e3b2e6e500015ca15b6a5f53137b6aefd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Nov 2018 21:58:56 -0600
Subject: [PATCH 0258/2793] z3: 4.8.1 -> 4.8.3

https://github.com/Z3Prover/z3/releases/tag/z3-4.8.3
---
 pkgs/applications/science/logic/z3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 29fc94a71da..28a7e783ff3 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.8.1";
+  version = "4.8.3";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
     rev    = name;
-    sha256 = "1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f";
+    sha256 = "0p5gdmhd32x6zwmx7j5cgwh4jyfxa9yapym95nlmyfaqzak92qar";
   };
 
   buildInputs = [ python fixDarwinDylibNames ];

From 243417fa44136184b273932de5d3a45d16c7016e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 28 Nov 2018 01:11:28 -0500
Subject: [PATCH 0259/2793] gitAndTools.git-reparent: correct version

---
 .../version-management/git-and-tools/git-reparent/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index f2f700b8510..03435ec834a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "git-reparent-${version}";
-  version = "2017-09-03";
+  version = "unstable-2017-09-03";
 
   src = fetchFromGitHub {
     owner  = "MarkLodato";

From 6c0601713730cc8e732e0c2410b6af2652ae6902 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 28 Nov 2018 09:54:31 +0100
Subject: [PATCH 0260/2793] jackett: 0.10.446 -> 0.10.471

---
 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 9f297873dd0..b3328538496 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.446";
+  version = "0.10.471";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1vmgywklax5br3pynjp5b74l2mkmhk3njiccjrl0l7j8ikyar1fw";
+    sha256 = "0la05akvpvfg9jdgfd39wnc87zi7axzx7499w9m3py7qqqyvgyin";
   };
 
   buildInputs = [ makeWrapper ];

From 3c9d05389c736cebebec65b3874d6cd96daad59f Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Wed, 28 Nov 2018 13:01:38 +0300
Subject: [PATCH 0261/2793] swig: fix cross compilation

---
 pkgs/development/tools/misc/swig/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 077d037aa97..7e527bebba1 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool bison ];
+  nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ];
   buildInputs = [ pcre ];
 
   configureFlags = [ "--without-tcl" ];

From dacbd5a61a9f4ec778dad67bc9538095599f589d Mon Sep 17 00:00:00 2001
From: Brandon Black <freedom@reardencode.com>
Date: Wed, 28 Nov 2018 02:15:25 -0800
Subject: [PATCH 0262/2793] nixos/ntp: use upstream default restrictions to
 avoid DDoS (#50762)

Fixes #50732
---
 nixos/doc/manual/release-notes/rl-1903.xml | 10 ++++++
 nixos/modules/services/networking/ntpd.nix | 38 ++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 49f475913d8..cedd5fc21c6 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -111,6 +111,16 @@
       without Syncthing resetting the permission on every start.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <literal>ntp</literal> module now has sane default restrictions.
+      If you're relying on the previous defaults, which permitted all queries
+      and commands from all firewall-permitted sources, you can set
+      <varname>services.ntp.restrictDefault</varname> and
+      <varname>services.ntp.restrictSource</varname> to
+      <literal>[]</literal>.
+    </para>
+   </listitem>
    <listitem>
     <para>
      Package <varname>rabbitmq_server</varname> is renamed to
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 32174100b0f..588d1c6edb0 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -15,6 +15,10 @@ let
   configFile = pkgs.writeText "ntp.conf" ''
     driftfile ${stateDir}/ntp.drift
 
+    restrict default ${toString cfg.restrictDefault}
+    restrict -6 default ${toString cfg.restrictDefault}
+    restrict source ${toString cfg.restrictSource}
+
     restrict 127.0.0.1
     restrict -6 ::1
 
@@ -36,11 +40,40 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          Whether to synchronise your machine's time using the NTP
-          protocol.
+          Whether to synchronise your machine's time using ntpd, as a peer in
+          the NTP network.
+          </para>
+          <para>
+          Disables <literal>systemd.timesyncd</literal> if enabled.
         '';
       };
 
+      restrictDefault = mkOption {
+        type = types.listOf types.str;
+        description = ''
+          The restriction flags to be set by default.
+          </para>
+          <para>
+          The default flags prevent external hosts from using ntpd as a DDoS
+          reflector, setting system time, and querying OS/ntpd version. As
+          recommended in section 6.5.1.1.3, answer "No" of
+          http://support.ntp.org/bin/view/Support/AccessRestrictions
+        '';
+        default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ];
+      };
+
+      restrictSource = mkOption {
+        type = types.listOf types.str;
+        description = ''
+          The restriction flags to be set on source.
+          </para>
+          <para>
+          The default flags allow peers to be added by ntpd from configured
+          pool(s), but not by other means.
+        '';
+        default = [ "limited" "kod" "nomodify" "notrap" "noquery" ];
+      };
+
       servers = mkOption {
         default = config.networking.timeServers;
         description = ''
@@ -51,6 +84,7 @@ in
       extraFlags = mkOption {
         type = types.listOf types.str;
         description = "Extra flags passed to the ntpd command.";
+        example = literalExample ''[ "--interface=eth0" ]'';
         default = [];
       };
 

From be6b461bb9e07df8d93a3cc6432b74550acf12c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Nov 2018 10:25:08 +0000
Subject: [PATCH 0263/2793] swig: document why pcre.dev is in nativeBuildInputs

---
 pkgs/development/tools/misc/swig/3.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 7e527bebba1..9dc2b535c09 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }:
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
   };
 
+  # for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config
   nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ];
+  disallowedReferences = [ buildPackages.pcre.dev ];
+
   buildInputs = [ pcre ];
 
   configureFlags = [ "--without-tcl" ];

From 39a4d1f3a993ecfdedaf2aa506c32c170c08985a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Nov 2018 18:03:51 +0100
Subject: [PATCH 0264/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-3-g5ba7f08 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e8d9049755bee3e2b1f28fd933d321b80bc887d8.
---
 .../haskell-modules/hackage-packages.nix      | 299 ++++++++++++++----
 1 file changed, 234 insertions(+), 65 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6c30537c2ca..a864c27cbda 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -27187,8 +27187,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "6.1.4";
-       sha256 = "07cvdynr2x228i2l3kjyz1p5vx5f8jzpi5q7g253b9590gn6z19d";
+       version = "6.1.5";
+       sha256 = "0p78yxdnfzz6jw7az6xfh6sjcnf9d8sl512cmhdcws78p7f2rhlx";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27204,8 +27204,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "6.1.4";
-       sha256 = "1h9z3sqmyc4fx2ci10qvqz8fjgyskpfdmv88xlfaj5dvr7gscmnr";
+       version = "6.1.5";
+       sha256 = "1ikd0sn3z901hyad55ngzs99b0v9bs5vkry5965w22smljdg3rqh";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27216,21 +27216,21 @@ self: {
   "antiope-core" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, base, bytestring
      , exceptions, generic-lens, http-client, http-types, lens
-     , monad-logger, mtl, resourcet, transformers, unliftio-core
+     , monad-logger, mtl, resourcet, text, transformers, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "6.1.4";
-       sha256 = "0d0bm4pncdgi3s6kqa5idy6dkzrblllvkbyr71adb6waqn4k3pn3";
+       version = "6.1.5";
+       sha256 = "06c8wd4gjlrz1sdk7qpd1l8n29a3jkipy749j3414x7b5fqxbzi7";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring exceptions generic-lens
-         http-client http-types lens monad-logger mtl resourcet transformers
-         unliftio-core
+         http-client http-types lens monad-logger mtl resourcet text
+         transformers unliftio-core
        ];
        testHaskellDepends = [
          amazonka amazonka-core base bytestring exceptions generic-lens
-         http-client http-types lens monad-logger mtl resourcet transformers
-         unliftio-core
+         http-client http-types lens monad-logger mtl resourcet text
+         transformers unliftio-core
        ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27243,8 +27243,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "6.1.4";
-       sha256 = "1h3x6l7rnbxxxarmmk8brapa93yqgkqn1wi465c80f8cqrmqggfw";
+       version = "6.1.5";
+       sha256 = "181ygxvf29acianvnryv1kbn5g69axkagqa54429ja8jfxiblrqq";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -27264,8 +27264,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "6.1.4";
-       sha256 = "12bjy67cmqnazl6j6x3yvksinvr3fhf5j84vsblnq3ph0d5xzxk6";
+       version = "6.1.5";
+       sha256 = "09ysy9r38d216vzq0nm1zfl4fqz8mrqa39c2ivy7pqm4xldsqary";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
          base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27289,8 +27289,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "6.1.4";
-       sha256 = "1nyzc6ii9iwcglbh520gbzfrpgqn08lnmwmz3376dqh1jr7klyp4";
+       version = "6.1.5";
+       sha256 = "0b2mildkgd271c8hwg6b3jf8xgli5bmd4dx9c0ac8ihyn28xr0m8";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 antiope-core attoparsec base
          bytestring conduit conduit-extra exceptions generic-lens http-types
@@ -27312,8 +27312,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "6.1.4";
-       sha256 = "12wsmxn8bbliwxqcyfaczdi8kmgyxcj3jp1shh6pf433d6r1rvsn";
+       version = "6.1.5";
+       sha256 = "07kg0b0iyik0axnycph3irp73cv614qcny3z3rib1rpvbknz9iwh";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base generic-lens lens
          text unliftio-core
@@ -27333,8 +27333,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "6.1.4";
-       sha256 = "1fq682w9pn1nvhr1zv4if7ak2lx3psmv2algm3k3k0pal2j1flh1";
+       version = "6.1.5";
+       sha256 = "097vxkz54k4ijqqzb8lijr90hvnyyhqm7sqn5qxam3wy355w3z5c";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
          antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27389,6 +27389,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "antlr-haskell" = callPackage
+    ({ mkDerivation, base, call-stack, containers, deepseq, hashable
+     , haskell-src-meta, HUnit, mtl, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, th-lift, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "antlr-haskell";
+       version = "0.1.0.0";
+       sha256 = "057mr0vw299hjjxlcpmwpbpwn6snzdvr73gmwxhh1gqgbh9g4bx4";
+       libraryHaskellDepends = [
+         base containers deepseq hashable haskell-src-meta mtl
+         template-haskell text th-lift transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base call-stack containers deepseq hashable haskell-src-meta HUnit
+         mtl QuickCheck template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text th-lift transformers
+         unordered-containers
+       ];
+       description = "A Haskell implementation of the ANTLR top-down parser generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "antlrc" = callPackage
     ({ mkDerivation, antlr3c, base, bytestring, c2hs, enumerator
      , haskell98, regex-posix
@@ -32652,6 +32676,7 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babl" = callPackage
@@ -34492,6 +34517,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencoding" = callPackage
@@ -39462,7 +39488,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_41_4" = callPackage
+  "brick_0_41_5" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39470,8 +39496,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.41.4";
-       sha256 = "1mmdzirpqfwg03dng09i91nkzvv7765flj7xaw79grwwx6xchpnq";
+       version = "0.41.5";
+       sha256 = "0r7r44h81jpv2h9wqwkh9i5hmdkr296cvmvyha6qr89298npz1cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39913,6 +39939,8 @@ self: {
        pname = "bson";
        version = "0.3.2.6";
        sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
+       revision = "1";
+       editedCabalFile = "0d9s7v330fckrxzdgmbdj7bapb1pgla8yf0mq5zhw27shxy5m3dx";
        libraryHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          text time
@@ -42819,6 +42847,41 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "cachix-api_0_1_0_3" = 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.3";
+       sha256 = "00j5m3pqnlwwvbj4669lpng6awsn5xzz67c6qq5dmc5q7ii2vzdf";
+       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 base ];
+       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
@@ -46441,6 +46504,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "church-list" = callPackage
@@ -49023,6 +49087,7 @@ self: {
        ];
        description = "Syslog implementation on top of 'co-log-core'";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coalpit" = callPackage
@@ -50387,8 +50452,8 @@ self: {
        pname = "compact";
        version = "0.1.0.1";
        sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf";
-       revision = "1";
-       editedCabalFile = "0bdp226gx3gr1hg68xydxhkfr0h469ay60h0s1ywar19y3m8dn1p";
+       revision = "2";
+       editedCabalFile = "1sy8szbmbhn13s54bq04ni234kk05najm3xm0sh6r9qnvg7pcjd7";
        libraryHaskellDepends = [ base binary bytestring ghc-compact ];
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
@@ -50973,12 +51038,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_2_0_2_0" = callPackage
+  "composition-prelude_2_0_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "2.0.2.0";
-       sha256 = "1p1g451rgx5wlfvmvplyp772ai6jy8nbylrly8bx11x053rirygk";
+       version = "2.0.2.1";
+       sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -54734,6 +54799,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {python34 = null;};
 
   "cql" = callPackage
@@ -62713,12 +62779,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_19_0" = callPackage
+  "dhall_1_19_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
      , cborg, containers, contravariant, criterion, cryptonite, deepseq
-     , Diff, directory, doctest, exceptions, filepath, haskeline
-     , http-client, http-client-tls, lens-family-core, megaparsec
-     , memory, mockery, mtl, optparse-applicative, parsers
+     , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline
+     , http-client, http-client-tls, http-types, lens-family-core
+     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
      , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
      , quickcheck-instances, repline, scientific, serialise, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, text
@@ -62726,15 +62792,15 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.19.0";
-       sha256 = "1sz24w3vl0jffdv392kxdp01z823cbssk8w687v7gg27sdliq4gz";
+       version = "1.19.1";
+       sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring case-insensitive cborg containers
-         contravariant cryptonite Diff directory exceptions filepath
-         haskeline http-client http-client-tls lens-family-core megaparsec
-         memory mtl optparse-applicative parsers prettyprinter
+         contravariant cryptonite Diff directory dotgen exceptions filepath
+         haskeline http-client http-client-tls http-types lens-family-core
+         megaparsec memory mtl optparse-applicative parsers prettyprinter
          prettyprinter-ansi-terminal repline scientific serialise
          template-haskell text transformers unordered-containers uri-encode
          vector
@@ -66532,6 +66598,7 @@ self: {
        ];
        description = "Low-level bindings to the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docusign-client" = callPackage
@@ -66550,6 +66617,7 @@ self: {
        ];
        description = "Client bindings for the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docusign-example" = callPackage
@@ -66568,6 +66636,7 @@ self: {
        ];
        description = "DocuSign examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docvim" = callPackage
@@ -69302,6 +69371,7 @@ self: {
        ];
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egyptian-fractions" = callPackage
@@ -73629,20 +73699,20 @@ self: {
 
   "expiring-containers" = callPackage
     ({ mkDerivation, base, containers, hashable, int-multimap
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, time
-     , timestamp, unordered-containers
+     , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck, time, timestamp, unordered-containers
      }:
      mkDerivation {
        pname = "expiring-containers";
-       version = "0.2.2";
-       sha256 = "0w4ix9m575c6vnq5hcc5bdw8k083lg73kwfa8zbk9xvpi0nsczll";
+       version = "0.2.2.1";
+       sha256 = "0zicnfwamm6yx91pb92qjzv0n25cwdz4krymnvpn5vyhh96k3kwh";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
        ];
        testHaskellDepends = [
-         base containers hashable int-multimap quickcheck-instances tasty
-         tasty-hunit tasty-quickcheck time timestamp unordered-containers
+         int-multimap QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck timestamp
        ];
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
@@ -74033,6 +74103,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -78078,6 +78149,7 @@ self: {
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fltkhs-hello-world" = callPackage
@@ -78681,8 +78753,8 @@ self: {
      }:
      mkDerivation {
        pname = "follow-file";
-       version = "0.0.2";
-       sha256 = "0661fp7gf5gyb4w06qm7lfaclzp0zk96gkhcx3pallckfr3214hk";
+       version = "0.0.3";
+       sha256 = "0nxvw17ndjrg34mc2a0bcyprcng52f6mn3l7mhx2fc11njdf2b93";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78691,9 +78763,10 @@ self: {
        ];
        executableHaskellDepends = [
          attoparsec attoparsec-path base bytestring conduit
-         conduit-combinators directory hinotify path text
+         conduit-combinators directory exceptions hinotify monad-control mtl
+         path text unix utf8-string
        ];
-       description = "Be notified when a file gets appended, solely with what was added";
+       description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81355,6 +81428,7 @@ self: {
        ];
        description = "Utility functions for using funflow with nix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funion" = callPackage
@@ -82704,6 +82778,7 @@ self: {
        testHaskellDepends = [ base generic-data tasty tasty-hunit ];
        description = "Surgery for generic data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -82785,6 +82860,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "generic-lens_1_1_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
+     , inspection-testing, lens, profunctors, QuickCheck, tagged
+     }:
+     mkDerivation {
+       pname = "generic-lens";
+       version = "1.1.0.0";
+       sha256 = "1frng5vgk4pkaw8wqqj6ch9p5fk88rbw1mmxzs0cp13wpxnr9wpc";
+       libraryHaskellDepends = [ base profunctors tagged ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing lens profunctors
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq lens QuickCheck
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-lens-labels" = callPackage
     ({ mkDerivation, base, generic-lens }:
      mkDerivation {
@@ -83604,6 +83699,7 @@ self: {
        ];
        description = "Standard spec's for optics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -88413,6 +88509,7 @@ self: {
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-game" = callPackage
@@ -92781,6 +92878,7 @@ self: {
        ];
        description = "scrapes google scholar, provides RSS feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random" = callPackage
@@ -100106,6 +100204,7 @@ self: {
        ];
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-daemon" = callPackage
@@ -100139,6 +100238,7 @@ self: {
        ];
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-debug" = callPackage
@@ -101865,6 +101965,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Variant and EADT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskyapi" = callPackage
@@ -110827,8 +110928,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.5.0";
-       sha256 = "0nqvcs9ch2knlllb0r0j0aqwab7h3yxh5iay377gyq8xc0m4l8w6";
+       version = "0.5.1";
+       sha256 = "0rgdk1jiczl4rwa66irbfcif4rvkrcyzk29lmpwr2kkqjz0zi7kk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122104,15 +122205,16 @@ self: {
      }) {};
 
   "impl" = callPackage
-    ({ mkDerivation, base, named, template-haskell }:
+    ({ mkDerivation, base, containers, named, template-haskell }:
      mkDerivation {
        pname = "impl";
-       version = "0.1.0.0";
-       sha256 = "00l50mrl7g3jzixlj3z2kar61vzb152lnn485b7zdsz4vgqxs1sx";
-       libraryHaskellDepends = [ base named template-haskell ];
+       version = "0.2.0.0";
+       sha256 = "00fyb41abz9k52ninlavnldm2vz20wbhdrdq5r2s7ir1karv551g";
+       libraryHaskellDepends = [ base containers named template-haskell ];
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "implicit" = callPackage
@@ -126163,6 +126265,7 @@ self: {
        doHaddock = false;
        description = "Generate flamegraphs from Jaeger .json dumps.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jail" = callPackage
@@ -131136,6 +131239,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacat" = callPackage
@@ -147372,8 +147476,8 @@ self: {
     ({ mkDerivation, base, monad-control, mtl, transformers-base }:
      mkDerivation {
        pname = "monadoid";
-       version = "0.0.2";
-       sha256 = "0xy89vhndmsrg0cz93ril79zrffb6fnj75vd3ivfrnsn0kxykhi6";
+       version = "0.0.3";
+       sha256 = "073ma6429m92z1pdglxvb02d6f17wdnh90mnscrjwdvzb406w0cy";
        libraryHaskellDepends = [
          base monad-control mtl transformers-base
        ];
@@ -149506,6 +149610,7 @@ self: {
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec" = callPackage
@@ -151373,6 +151478,7 @@ self: {
        ];
        description = "Simple interface to rendering with NanoVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nanq" = callPackage
@@ -156018,6 +156124,7 @@ self: {
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oauthenticated" = callPackage
@@ -157253,6 +157360,7 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opench-meteo" = callPackage
@@ -159366,8 +159474,8 @@ self: {
      }:
      mkDerivation {
        pname = "pairing";
-       version = "0.1.0";
-       sha256 = "0gdq9qfa874h8h8jkr5zqi90k3jzfnw9r9ydnx3pxn3j1d9si27v";
+       version = "0.1.1";
+       sha256 = "15230s384z6hg29fc9l06qsk0657c1z00x0pijgxr9w8lbis56qg";
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude QuickCheck random
          wl-pprint-text
@@ -159491,12 +159599,16 @@ self: {
          base bytestring containers criterion mtl text time weigh
        ];
        doCheck = false;
+       postInstall = ''
+         mkdir -p $out/share
+         mv $data/*/*/man $out/share/
+       '';
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_4" = callPackage
+  "pandoc_2_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -159512,8 +159624,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.4";
-       sha256 = "1kf1v7zfifh5i1hw5bwdbd78ncp946kx1s501c077vwzdzvcz2ck";
+       version = "2.5";
+       sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -159539,7 +159651,10 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring containers criterion mtl text time weigh
        ];
-       doCheck = false;
+       postInstall = ''
+         mkdir -p $out/share
+         mv $data/*/*/man $out/share/
+       '';
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159580,7 +159695,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_15" = callPackage
+  "pandoc-citeproc_0_15_0_1" = 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
@@ -159589,8 +159704,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.15";
-       sha256 = "0pj2q15q8vak70cdrfxk53nzlsv6zi5pi67nlrkn5kks3srvw2r7";
+       version = "0.15.0.1";
+       sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -164874,6 +164989,7 @@ self: {
        ];
        description = "A library for writing forwards-declared build systems in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piet" = callPackage
@@ -167373,6 +167489,7 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {poker-eval = null;};
 
   "pokitdok" = callPackage
@@ -184892,6 +185009,29 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_9_4_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, template-haskell, text, time, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.9.4.2";
+       sha256 = "08glsr8mwxkz3hw68d6j7v285nay2a6xkyqpyc1b6wc9iw2g82r7";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers old-time template-haskell
+         text time vector
+       ];
+       testHaskellDepends = [
+         array base cereal containers lens lens-action QuickCheck
+         quickcheck-instances tasty tasty-quickcheck template-haskell time
+         vector
+       ];
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safecopy-migrate" = callPackage
     ({ mkDerivation, base, base-prelude, cereal, containers, extra
      , haskell-src-meta, microlens, safecopy, template-haskell
@@ -189404,6 +189544,7 @@ self: {
        ];
        description = "Servant Stream support for conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-csharp" = callPackage
@@ -190006,6 +190147,7 @@ self: {
        ];
        description = "Servant Stream support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-match" = callPackage
@@ -190127,6 +190269,7 @@ self: {
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-named" = callPackage
@@ -190236,6 +190379,7 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -192296,6 +192440,7 @@ self: {
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-persist" = callPackage
@@ -205170,6 +205315,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supplemented" = callPackage
@@ -210787,6 +210933,7 @@ self: {
        libraryHaskellDepends = [ base text text-builder ];
        description = "Text styling for ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-binary" = callPackage
@@ -226685,6 +226832,7 @@ self: {
        ];
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-secure-cookies" = callPackage
@@ -231128,6 +231276,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno_0_3_5" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, deepseq
+     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
+     , weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.3.5";
+       sha256 = "0352xn6jlcbh1z4qlz679kybcvwz756xz21fzhv36vklzxclvgxn";
+       libraryHaskellDepends = [
+         array base bytestring deepseq hspec mtl mutable-containers vector
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
+       ];
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {

From c340ab0f96f0f5fcaf046336589792343b4367b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Nov 2018 20:16:01 +0100
Subject: [PATCH 0265/2793] haskell-fgl: update ghc-8.6.x build to latest
 version

---
 .../configuration-ghc-8.6.x.nix               |  5 +-
 .../patches/fgl-monad-fail.patch              | 61 -------------------
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete 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 79cd85a7a9d..9209144c780 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,7 @@ self: super: {
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;
+  fgl = self.fgl_5_7_0_1;
   free = self.free_5_1;
   haddock-library = dontCheck super.haddock-library_1_7_0;
   HaTeX = doJailbreak super.HaTeX;
@@ -81,10 +82,6 @@ self: super: {
   # https://github.com/tibbe/unordered-containers/issues/214
   unordered-containers = dontCheck super.unordered-containers;
 
-  # https://github.com/haskell/fgl/issues/79
-  # https://github.com/haskell/fgl/issues/81
-  fgl = appendPatch (overrideCabal super.fgl (drv: { editedCabalFile = null; })) ./patches/fgl-monad-fail.patch;
-
   # Test suite does not compile.
   cereal = dontCheck super.cereal;
   data-clist = doJailbreak super.data-clist;  # won't cope with QuickCheck 2.12.x
diff --git a/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
deleted file mode 100644
index d0df9b774e4..00000000000
--- a/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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 95615ad662b726938518b351f4ec25848a8d0a28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Nov 2018 20:17:21 +0100
Subject: [PATCH 0266/2793] haskell-pandoc: update ghc-8.6.x build to latest
 version

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 +---
 1 file changed, 1 insertion(+), 3 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 9209144c780..5f069e24729 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -68,6 +68,7 @@ self: super: {
   JuicyPixels = self.JuicyPixels_3_3_2;
   lens = self.lens_4_17;
   megaparsec = dontCheck (doJailbreak super.megaparsec);
+  pandoc = self.pandoc_2_5;
   patience = markBrokenVersion "0.1.1" super.patience;
   polyparse = self.polyparse_1_12_1;
   primitive = self.primitive_0_6_4_0;
@@ -96,9 +97,6 @@ self: super: {
   # https://github.com/jgm/skylighting/issues/55
   skylighting-core = dontCheck super.skylighting-core;
 
-  # https://github.com/jgm/pandoc/issues/4974
-  pandoc = doJailbreak super.pandoc_2_4;
-
   # Break out of "yaml >=0.10.4.0 && <0.11".
   stack = doJailbreak super.stack;
 

From 790e31279d2d5a629824aeb23bf30e18b97b307c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Nov 2018 20:42:33 +0100
Subject: [PATCH 0267/2793] haskell-pandoc-citeproc: update ghc-8.6.x build to
 latest version

---
 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 5f069e24729..fe9425ef3f8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -69,6 +69,8 @@ self: super: {
   lens = self.lens_4_17;
   megaparsec = dontCheck (doJailbreak super.megaparsec);
   pandoc = self.pandoc_2_5;
+  pandoc-citeproc = self.pandoc-citeproc_0_15;
+  pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
   patience = markBrokenVersion "0.1.1" super.patience;
   polyparse = self.polyparse_1_12_1;
   primitive = self.primitive_0_6_4_0;

From b38bfe18c72d7f7ff54729b5537e04b04c1ce00b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Nov 2018 12:11:49 +0100
Subject: [PATCH 0268/2793] pandoc: adapt postInstall hook to
 embedded-data-files build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 447dda793f4..ba0b20bf8d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4680,6 +4680,10 @@ with pkgs;
   pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
     configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
     buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
+    postInstall = ''
+      mkdir -p $out/share/man/man1
+      cp man/pandoc.1 $out/share/man/man1/
+    '';
   });
 
   pamtester = callPackage ../tools/security/pamtester { };

From 8ef639a5678a651fc4cdb61e51fa19ba034da5fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Nov 2018 20:42:59 +0100
Subject: [PATCH 0269/2793] haskell-brick: update ghc-8.6.x build to latest
 version

---
 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 fe9425ef3f8..d61915c5abd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_41_4;
+  brick = self.brick_0_41_5;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From f2c07cd63ee4d40f5abb75c8336a1b9687a11222 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Wed, 28 Nov 2018 03:21:37 -0800
Subject: [PATCH 0270/2793] xcpretty: init at 0.3.0 (#48494)

---
 .../ruby-modules/bundler-app/default.nix      |  1 +
 pkgs/development/tools/xcpretty/Gemfile       |  2 ++
 pkgs/development/tools/xcpretty/Gemfile.lock  | 15 +++++++++++
 pkgs/development/tools/xcpretty/default.nix   | 27 +++++++++++++++++++
 pkgs/development/tools/xcpretty/gemset.nix    | 19 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/tools/xcpretty/Gemfile
 create mode 100644 pkgs/development/tools/xcpretty/Gemfile.lock
 create mode 100644 pkgs/development/tools/xcpretty/default.nix
 create mode 100644 pkgs/development/tools/xcpretty/gemset.nix

diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 60e3a38517c..d0ad56538b9 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -29,6 +29,7 @@
 , buildInputs ? []
 , postBuild ? ""
 , gemConfig ? null
+, passthru ? {}
 }@args:
 
 let
diff --git a/pkgs/development/tools/xcpretty/Gemfile b/pkgs/development/tools/xcpretty/Gemfile
new file mode 100644
index 00000000000..0b37143fe0e
--- /dev/null
+++ b/pkgs/development/tools/xcpretty/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'xcpretty'
diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock
new file mode 100644
index 00000000000..6f1ba7545a8
--- /dev/null
+++ b/pkgs/development/tools/xcpretty/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rouge (2.0.7)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  xcpretty
+
+BUNDLED WITH
+   1.16.4
diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/development/tools/xcpretty/default.nix
new file mode 100644
index 00000000000..99af752086f
--- /dev/null
+++ b/pkgs/development/tools/xcpretty/default.nix
@@ -0,0 +1,27 @@
+{ lib, bundlerApp, bundler, bundix }:
+
+bundlerApp {
+  pname = "xcpretty";
+  gemdir = ./.;
+
+  exes = [ "xcpretty" ];
+
+  passthru = {
+    updateScript = ''
+      set -e
+      echo
+      cd ${toString ./.}
+      ${bundler}/bin/bundle lock --update
+      ${bundix}/bin/bundix
+    '';
+  };
+
+  meta = with lib; {
+    description     = "Flexible and fast xcodebuild formatter";
+    homepage        = https://github.com/supermarin/xcpretty;
+    license         = licenses.mit;
+    maintainers     = with maintainers; [
+      nicknovitski
+    ];
+  };
+}
diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/development/tools/xcpretty/gemset.nix
new file mode 100644
index 00000000000..30c68a93c13
--- /dev/null
+++ b/pkgs/development/tools/xcpretty/gemset.nix
@@ -0,0 +1,19 @@
+{
+  rouge = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+  xcpretty = {
+    dependencies = ["rouge"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba0b20bf8d3..4a793e5d314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9077,6 +9077,8 @@ with pkgs;
     deps = [ xcbuild ];
   } ../development/tools/xcbuild/setup-hook.sh  ;
 
+  xcpretty = callPackage ../development/tools/xcpretty { };
+
   xmlindent = callPackage ../development/web/xmlindent {};
 
   xpwn = callPackage ../development/mobile/xpwn {};

From 24865963f0e7886e1a42d8aa112306d7cc6cfbd8 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein@google.com>
Date: Wed, 28 Nov 2018 11:39:51 +0000
Subject: [PATCH 0271/2793] modularity: Document the ability to use non-files
 in imports (#50503)

* modularity: Document the ability to use non-files in imports
* Update nixos/doc/manual/configuration/modularity.xml

Co-Authored-By: Baughn <svein@google.com>
---
 nixos/doc/manual/configuration/modularity.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 298ffd661f6..cda36eba25c 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -127,4 +127,23 @@ nix-repl> map (x: x.hostName) config.<xref linkend="opt-services.httpd.virtualHo
 [ "example.org" "example.gov" ]
 </screen>
  </para>
+
+ <para>
+   While abstracting your configuration, you may find it useful to generate
+   modules using code, instead of writing files. The example
+   below would have the same effect as importing a file which sets those
+   options.
+   <screen>
+     { config, pkgs, ... }:
+
+     let netConfig = { hostName }: {
+       networking.hostName = hostName;
+       networking.useDHCP = false;
+    };
+
+    in
+
+    { imports = [ (netConfig "nixos.localdomain") ]; }
+  </screen>
+</para>
 </section>

From 0b7522d0f66cfc11a54b79d48435abcc8a4f7db5 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 27 Nov 2018 14:40:02 -0500
Subject: [PATCH 0272/2793] pythonPackages.perf: init at 1.5.1

---
 .../python-modules/perf/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/perf/default.nix

diff --git a/pkgs/development/python-modules/perf/default.nix b/pkgs/development/python-modules/perf/default.nix
new file mode 100644
index 00000000000..558886ce622
--- /dev/null
+++ b/pkgs/development/python-modules/perf/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, statistics
+, pythonOlder
+, nose
+, psutil
+, contextlib2
+, mock
+, unittest2
+, isPy27
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "perf";
+  version = "1.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5aae76e58bd3edd0c50adcc7c16926ebb9ed8c0e5058b435a30d58c6bb0394a8";
+  };
+
+  checkInputs = [ nose psutil ] ++
+    lib.optionals isPy27 [ contextlib2 mock unittest2 ];
+  propagatedBuildInputs = [ six ] ++
+    lib.optionals (pythonOlder "3.4") [ statistics ];
+
+  # tests not included in pypi repository
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} -m nose
+  '';
+
+  meta = with lib; {
+    description = "Python module to generate and modify perf";
+    homepage = https://github.com/vstinner/perf;
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a39faaae80..a60ef2eab90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -488,6 +488,8 @@ in {
 
   pdfx = callPackage ../development/python-modules/pdfx { };
 
+  perf = callPackage ../development/python-modules/perf { };
+
   phonopy = callPackage ../development/python-modules/phonopy { };
 
   pims = callPackage ../development/python-modules/pims { };

From 0549e307a52a8d3f17a0e2e821501a6f4e92f80f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 27 Nov 2018 15:08:07 -0500
Subject: [PATCH 0273/2793] pythonPackages.pytest-mypy: init at 0.3.2

---
 .../python-modules/pytest-mypy/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-mypy/default.nix

diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix
new file mode 100644
index 00000000000..09d79b33791
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, mypy
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-mypy";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "acc653210e7d8d5c72845a5248f00fd33f4f3379ca13fe56cfc7b749b5655c3e";
+  };
+
+  propagatedBuildInputs = [ pytest mypy ];
+
+  meta = with lib; {
+    description = "Mypy static type checker plugin for Pytest";
+    homepage = https://github.com/dbader/pytest-mypy;
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a60ef2eab90..deebe8dd92a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -623,6 +623,8 @@ in {
 
   pytesseract = callPackage ../development/python-modules/pytesseract { };
 
+  pytest-mypy = callPackage ../development/python-modules/pytest-mypy { };
+
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
   python-binance = callPackage ../development/python-modules/python-binance { };

From 602efddc24de418c96f03e3d5af4f39a1845da3a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 4 Nov 2018 22:17:29 +0100
Subject: [PATCH 0274/2793] xorg.libX11: fix cross

---
 pkgs/servers/x11/xorg/overrides.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8f4c251335a..94e19d92117 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,5 +1,5 @@
 { abiCompat ? null,
-  stdenv, makeWrapper, lib, fetchurl, fetchpatch,
+  stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages,
 
   automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
   python, freetype, tradcpp, fontconfig,
@@ -98,6 +98,7 @@ self: super:
     outputs = [ "out" "dev" "man" ];
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
     preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
     '';

From 6bda83a64dfe6a1728c23724752c94b96de5a3e0 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 27 Nov 2018 13:58:49 +0000
Subject: [PATCH 0275/2793] doc: document upgrading Ruby packages

As requested[1] by @Ekleog.

[1]: https://github.com/NixOS/nixpkgs/pull/51040#issuecomment-441642763
---
 doc/languages-frameworks/ruby.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index c52a72a3df4..df4e5acb22c 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -50,6 +50,17 @@ bundlerEnv rec {
   future updates can be run easily.
  </para>
 
+ <para>
+  Updating Ruby packages can then be done like this:
+ </para>
+
+<screen>
+<![CDATA[$ cd pkgs/servers/monitoring/sensu
+$ nix-shell -p bundler --run 'bundle lock --update'
+$ nix-shell -p bundix --run 'bundix'
+]]>
+</screen>
+
  <para>
   For tools written in Ruby - i.e. where the desire is to install a package and
   then execute e.g. <command>rake</command> at the command line, there is an

From 2d0fad757ab26d943c1f0f4edf078c6cd8670861 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 4 Nov 2018 22:16:49 +0100
Subject: [PATCH 0276/2793] xorg: generate python into nativeBuildInputs

---
 pkgs/servers/x11/xorg/default.nix             | 10 ++++----
 .../x11/xorg/generate-expr-from-tarballs.pl   | 24 +++++++++++++++++--
 pkgs/servers/x11/xorg/overrides.nix           |  7 +-----
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ccf0dfe9034..1f953e89ec8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1248,7 +1248,7 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
-  libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation {
+  libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation {
     name = "libxcb-1.13.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1256,8 +1256,8 @@ lib.makeScope newScope (self: with self; {
       sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
+    nativeBuildInputs = [ pkgconfig python ];
+    buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
@@ -1594,8 +1594,8 @@ lib.makeScope newScope (self: with self; {
       sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
     };
     hardeningDisable = [ "bindnow" "relro" ];
-    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ python ];
+    nativeBuildInputs = [ pkgconfig python ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 701a8984ada..aba45a21534 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -23,6 +23,7 @@ my %pkgURLs;
 my %pkgHashes;
 my %pkgNames;
 my %pkgRequires;
+my %pkgNativeRequires;
 
 my %pcMap;
 
@@ -106,6 +107,7 @@ while (<>) {
     my $provides = `find $pkgDir -name "*.pc.in"`;
     my @provides2 = split '\n', $provides;
     my @requires = ();
+    my @nativeRequires = ();
 
     foreach my $pcFile (@provides2) {
         my $pc = $pcFile;
@@ -163,7 +165,7 @@ while (<>) {
     }
 
     if ($file =~ /AM_PATH_PYTHON/) {
-        push @requires, "python";
+        push @nativeRequires, "python";
     }
 
     if ($file =~ /AC_PATH_PROG\(FCCACHE/) {
@@ -230,7 +232,9 @@ while (<>) {
     push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/;
 
     print "REQUIRES $pkg => @requires\n";
+    print "NATIVE_REQUIRES $pkg => @nativeRequires\n";
     $pkgRequires{$pkg} = \@requires;
+    $pkgNativeRequires{$pkg} = \@nativeRequires;
 
     print "done\n";
 }
@@ -255,6 +259,20 @@ EOF
 foreach my $pkg (sort (keys %pkgURLs)) {
     print "$pkg\n";
 
+    my %nativeRequires = ();
+    my @nativeBuildInputs;
+    foreach my $req (sort @{$pkgNativeRequires{$pkg}}) {
+        if (defined $pcMap{$req}) {
+            # Some packages have .pc that depends on itself.
+            next if $pcMap{$req} eq $pkg;
+            if (!defined $nativeRequires{$pcMap{$req}}) {
+                push @nativeBuildInputs, $pcMap{$req};
+                $nativeRequires{$pcMap{$req}} = 1;
+            }
+        } else {
+            print "  NOT FOUND: $req\n";
+        }
+    }
     my %requires = ();
     my @buildInputs;
     foreach my $req (sort @{$pkgRequires{$pkg}}) {
@@ -270,9 +288,11 @@ foreach my $pkg (sort (keys %pkgURLs)) {
         }
     }
 
+    my $nativeBuildInputsStr = join "", map { $_ . " " } @nativeBuildInputs;
     my $buildInputsStr = join "", map { $_ . " " } @buildInputs;
 
     my @arguments = @buildInputs;
+    push @arguments, @nativeBuildInputs;
     unshift @arguments, "stdenv", "pkgconfig", "fetchurl";
     my $argumentsStr = join ", ", @arguments;
 
@@ -290,7 +310,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
       sha256 = "$pkgHashes{$pkg}";
     };
     hardeningDisable = [ "bindnow" "relro" ];
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr];
     buildInputs = [ $buildInputsStr];$extraAttrsStr
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 94e19d92117..46dcdcd9225 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -2,7 +2,7 @@
   stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages,
 
   automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
-  python, freetype, tradcpp, fontconfig,
+  freetype, tradcpp, fontconfig,
   libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
   mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
   mcpp, epoxy, openssl, pkgconfig, llvm_6,
@@ -85,15 +85,10 @@ self: super:
   });
 
   libxcb = super.libxcb.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
     configureFlags = [ "--enable-xkb" "--enable-xinput" ];
     outputs = [ "out" "dev" "man" "doc" ];
   });
 
-  xcbproto = super.xcbproto.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
-  });
-
   libX11 = super.libX11.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "man" ];
     configureFlags = attrs.configureFlags or []
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7104b05f26e..31e65c19001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13941,7 +13941,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
     inherit (darwin.apple_sdk.libs) Xplugin;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
-    python = python2; # Incompatible with Python 3x
     udev = if stdenv.isLinux then udev else null;
     libdrm = if stdenv.isLinux then libdrm else null;
     abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`

From a5a239ca2d2229e10d35ce2c2c9c31aba7510c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 28 Nov 2018 13:06:23 +0100
Subject: [PATCH 0277/2793] efivar: fix cross compilation

---
 pkgs/tools/system/efivar/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 8f1367d3fdc..4072b8834ca 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, popt }:
+{ stdenv, buildPackages, fetchFromGitHub, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ popt ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   makeFlags = [
     "prefix=$(out)"

From 3ba355b0ba5feb07badc33466e3884febc7b7c44 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 27 Nov 2018 23:36:51 -0500
Subject: [PATCH 0278/2793] sqlcheck: init at 1.2

---
 .../tools/database/sqlcheck/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/database/sqlcheck/default.nix

diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix
new file mode 100644
index 00000000000..867aa0b98ec
--- /dev/null
+++ b/pkgs/development/tools/database/sqlcheck/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "sqlcheck-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "jarulraj";
+    repo = "sqlcheck";
+    rev = "v${version}";
+    sha256 = "0v8idyhwhbphxzmh03lih3wd9gdq317zn7wsf01infih7b6l0k69";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Automatically identify anti-patterns in SQL queries";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a793e5d314..ec95be1979d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8977,6 +8977,8 @@ with pkgs;
 
   spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; };
 
+  sqlcheck = callPackage ../development/tools/database/sqlcheck { };
+
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
   sqlite-web = callPackage ../development/tools/database/sqlite-web { };

From 6bc8b5bbd91edec0d1eada27aec96690cab47cab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Nov 2018 17:23:18 +0100
Subject: [PATCH 0279/2793] python-bugzilla: update from version 1.1.0 to 2.2.0

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

diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix
index b57fdd5625b..2e79db8d71a 100644
--- a/pkgs/development/python-modules/bugzilla/default.nix
+++ b/pkgs/development/python-modules/bugzilla/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "bugzilla";
-  version = "1.1.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;

From ab6e5f0fe50589c3adc9374c2cd54da1cb98e680 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Nov 2018 12:31:31 +0100
Subject: [PATCH 0280/2793] LTS Haskell 12.20

---
 .../configuration-hackage2nix.yaml            | 74 ++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca0ea5a1514..82ecd05b266 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.19
+  # LTS Haskell 12.20
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -56,7 +56,7 @@ default-package-overrides:
   - ad ==4.3.5
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
-  - aern2-mp ==0.1.2.0
+  - aern2-mp ==0.1.3.1
   - aern2-real ==0.1.1.0
   - aeson ==1.3.1.1
   - aeson-attoparsec ==0.0.0
@@ -419,7 +419,7 @@ default-package-overrides:
   - colour ==2.3.4
   - combinatorial ==0.1.0.1
   - comfort-graph ==0.0.3.1
-  - commutative ==0.0.1.4
+  - commutative ==0.0.2
   - comonad ==5.0.4
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
@@ -435,7 +435,7 @@ default-package-overrides:
   - concise ==0.1.0.1
   - concurrency ==1.6.1.0
   - concurrent-extra ==0.7.0.12
-  - concurrent-output ==1.10.7
+  - concurrent-output ==1.10.9
   - concurrent-split ==0.0.1.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
@@ -476,6 +476,7 @@ default-package-overrides:
   - cpuinfo ==0.1.0.1
   - cql ==4.0.1
   - cql-io ==1.0.1.1
+  - crackNum ==2.3
   - credential-store ==0.1.2
   - criterion ==1.4.1.0
   - criterion-measurement ==0.1.1.0
@@ -486,7 +487,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.14
+  - crypto-enigma ==0.0.3.1
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -554,7 +555,7 @@ default-package-overrides:
   - data-textual ==0.3.0.2
   - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
-  - DAV ==1.3.2
+  - DAV ==1.3.3
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
   - dbus ==1.0.1
@@ -576,7 +577,7 @@ default-package-overrides:
   - dhall ==1.15.1
   - dhall-bash ==1.0.15
   - dhall-json ==1.2.3
-  - dhall-text ==1.0.13
+  - dhall-text ==1.0.14
   - di ==1.0.1
   - diagrams ==1.4
   - diagrams-builder ==0.8.0.3
@@ -650,7 +651,7 @@ default-package-overrides:
   - either ==5.0.1
   - either-unwrap ==1.1
   - ekg ==0.4.0.15
-  - ekg-core ==0.1.1.4
+  - ekg-core ==0.1.1.6
   - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.4.0
   - ekg-wai ==0.1.0.3
@@ -722,7 +723,7 @@ default-package-overrides:
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
   - fgl ==5.6.0.0
-  - filecache ==0.4.0
+  - filecache ==0.4.1
   - file-embed ==0.0.10.1
   - file-embed-lzma ==0
   - filelock ==0.1.1.2
@@ -747,6 +748,7 @@ default-package-overrides:
   - flat-mcmc ==1.5.0
   - flay ==0.4
   - flexible-defaults ==0.0.2
+  - FloatingHex ==0.4
   - floatshow ==0.2.4
   - flow ==1.0.17
   - fmlist ==0.9.2
@@ -878,7 +880,7 @@ default-package-overrides:
   - graph-wrapper ==0.2.5.1
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
-  - greskell ==0.2.1.1
+  - greskell ==0.2.2.0
   - greskell-core ==0.1.2.4
   - greskell-websocket ==0.1.1.2
   - groom ==0.1.2.1
@@ -926,7 +928,7 @@ default-package-overrides:
   - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.3
   - haskell-src-exts-simple ==1.20.0.0
-  - haskell-src-exts-util ==0.2.3
+  - haskell-src-exts-util ==0.2.4
   - haskell-src-meta ==0.8.0.3
   - haskell-tools-ast ==1.1.0.2
   - haskell-tools-backend-ghc ==1.1.0.2
@@ -958,7 +960,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.6.1
   - hedgehog-corpus ==0.1.0
-  - hedis ==0.10.4
+  - hedis ==0.10.8
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.2
@@ -968,6 +970,7 @@ default-package-overrides:
   - hexpat ==0.20.13
   - hexstring ==0.11.1
   - hfsevents ==0.1.6
+  - hgmp ==0.1.1
   - hidapi ==0.1.5
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
@@ -1002,7 +1005,8 @@ default-package-overrides:
   - HPDF ==1.4.10
   - hpqtypes ==1.5.3.0
   - hprotoc ==2.4.11
-  - hquantlib ==0.0.4.0
+  - hquantlib ==0.0.5.0
+  - hquantlib-time ==0.0.4.1
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
   - hruby ==0.3.6
@@ -1012,8 +1016,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.6
   - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
@@ -1048,7 +1052,7 @@ default-package-overrides:
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8.1
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.3
+  - hsyslog-udp ==0.2.4
   - htaglib ==1.2.0
   - HTF ==0.13.2.5
   - html ==1.0.1.2
@@ -1060,7 +1064,7 @@ default-package-overrides:
   - HTTP ==4000.3.12
   - http2 ==1.6.4
   - http-api-data ==0.3.8.1
-  - http-client ==0.5.13.1
+  - http-client ==0.5.14
   - http-client-openssl ==0.2.2.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
@@ -1079,7 +1083,7 @@ default-package-overrides:
   - hvect ==0.4.0.0
   - hvega ==0.1.0.3
   - hw-balancedparens ==0.2.0.2
-  - hw-bits ==0.7.0.3
+  - hw-bits ==0.7.0.4
   - hw-conduit ==0.2.0.5
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
@@ -1093,7 +1097,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.19
+  - hw-prim ==0.6.2.20
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1132,7 +1136,7 @@ default-package-overrides:
   - indents ==0.5.0.0
   - indexed-list-literals ==0.2.1.2
   - inflections ==0.4.0.3
-  - influxdb ==1.6.0.9
+  - influxdb ==1.6.1
   - ini ==0.3.6
   - inline-c ==0.6.1.0
   - inline-java ==0.8.4
@@ -1188,7 +1192,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-feed ==1.0.4
+  - json-feed ==1.0.5
   - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.5
   - json-rpc-server ==0.2.6.0
@@ -1215,7 +1219,7 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.6
+  - lackey ==1.0.7
   - LambdaHack ==0.8.3.0
   - lame ==0.1.1
   - language-c ==0.8.2
@@ -1288,6 +1292,7 @@ default-package-overrides:
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
   - log-postgres ==0.7.0.2
+  - long-double ==0.1
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
@@ -1311,7 +1316,7 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.2.3.0
+  - massiv ==0.2.4.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1423,7 +1428,7 @@ default-package-overrides:
   - mwc-probability ==2.0.4
   - mwc-probability-transition ==0.4
   - mwc-random ==0.13.6.0
-  - mysql ==0.1.5
+  - mysql ==0.1.6
   - mysql-haskell ==0.8.3.0
   - mysql-haskell-nem ==0.1.0.0
   - mysql-haskell-openssl ==0.8.3.0
@@ -1577,9 +1582,9 @@ default-package-overrides:
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
-  - picosat ==0.1.4
+  - picosat ==0.1.5
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.10
+  - pinboard ==0.9.12.11
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
@@ -1613,11 +1618,11 @@ default-package-overrides:
   - polyparse ==1.12
   - pooled-io ==0.0.2.2
   - portable-lines ==0.1
-  - postgresql-binary ==0.12.1.1
+  - postgresql-binary ==0.12.1.2
   - postgresql-libpq ==0.9.4.2
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.4.0
-  - postgresql-simple-migration ==0.1.12.0
+  - postgresql-simple-migration ==0.1.13.0
   - postgresql-simple-queue ==1.0.1
   - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
@@ -1678,7 +1683,7 @@ default-package-overrides:
   - pure-zlib ==0.6.4
   - pushbullet-types ==0.4.1.0
   - qm-interpolated-string ==0.3.0.0
-  - qnap-decrypt ==0.3.2
+  - qnap-decrypt ==0.3.3
   - QuasiText ==0.1.2.6
   - quickbench ==1.0
   - QuickCheck ==2.11.3
@@ -1706,7 +1711,7 @@ default-package-overrides:
   - rank2classes ==1.1.0.1
   - Rasterific ==0.7.4
   - rasterific-svg ==0.3.3.2
-  - ratel ==1.0.6
+  - ratel ==1.0.7
   - ratel-wai ==1.0.4
   - ratio-int ==0.1.2
   - rattletrap ==4.1.2
@@ -1771,7 +1776,9 @@ default-package-overrides:
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
+  - rosezipper ==0.2
   - rot13 ==0.2.0.1
+  - rounded ==0.1.0.1
   - RSA ==2.3.0
   - rss-conduit ==0.4.2.2
   - runmemo ==1.0.0.1
@@ -1794,6 +1801,7 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.3.17
+  - sbv ==7.12
   - SCalendar ==1.1.0
   - scalendar ==1.2.0
   - scalpel ==0.5.1
@@ -1867,7 +1875,7 @@ default-package-overrides:
   - sexp-grammar ==2.0.1
   - SHA ==1.6.4.4
   - shake-language-c ==0.12.0
-  - shakespeare ==2.0.19
+  - shakespeare ==2.0.20
   - shell-conduit ==4.7.0
   - shell-escape ==0.2.0
   - shelltestrunner ==1.9
@@ -2147,8 +2155,8 @@ default-package-overrides:
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
-  - tz ==0.1.3.1
-  - tzdata ==0.1.20180501.0
+  - tz ==0.1.3.2
+  - tzdata ==0.1.20181026.0
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
   - unbound-generics ==0.3.4
@@ -2347,7 +2355,7 @@ default-package-overrides:
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.5
   - yesod-auth-fb ==1.9.1
-  - yesod-auth-hashdb ==1.7
+  - yesod-auth-hashdb ==1.7.1
   - yesod-bin ==1.6.0.3
   - yesod-core ==1.6.8.1
   - yesod-csp ==0.2.4.0

From 82c7dea54a114a20b4401df42a6e1a1e1f3f34b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Nov 2018 12:32:32 +0100
Subject: [PATCH 0281/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-3-g5ba7f08 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0782f90b261f662d9a056dbbf3bb98e2a05518da.
---
 .../haskell-modules/hackage-packages.nix      | 731 ++----------------
 1 file changed, 65 insertions(+), 666 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a864c27cbda..c6e9204372b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3492,35 +3492,6 @@ self: {
      }) {};
 
   "DAV" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , data-default, exceptions, haskeline, http-client, http-client-tls
-     , http-types, lens, mtl, network, network-uri, optparse-applicative
-     , transformers, transformers-base, transformers-compat, utf8-string
-     , xml-conduit, xml-hamlet
-     }:
-     mkDerivation {
-       pname = "DAV";
-       version = "1.3.2";
-       sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         http-client http-client-tls http-types lens mtl transformers
-         transformers-base transformers-compat utf8-string xml-conduit
-         xml-hamlet
-       ];
-       executableHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         haskeline http-client http-client-tls http-types lens mtl network
-         network-uri optparse-applicative transformers transformers-base
-         transformers-compat utf8-string xml-conduit xml-hamlet
-       ];
-       description = "RFC 4918 WebDAV support";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "DAV_1_3_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , data-default, exceptions, haskeline, http-client, http-client-tls
      , http-types, lens, mtl, network, network-uri, optparse-applicative
@@ -3547,7 +3518,6 @@ self: {
        ];
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DBFunctor" = callPackage
@@ -19080,8 +19050,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
-       version = "2.8.1.0";
-       sha256 = "0953ql8gblkbjqc652bd96nrn1m5i00j2p82h4q6l92j4h8dimpv";
+       version = "2.8.2.0";
+       sha256 = "1yi1mynxdy05hmq5hzqr9vyjgbr2k0dqjpma0mlk2vqli3nhvw5m";
        description = "A binding to Windows Win32 API";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
@@ -21625,26 +21595,6 @@ self: {
      }) {};
 
   "aern2-mp" = callPackage
-    ({ mkDerivation, base, convertible, hmpfr, hspec, integer-gmp
-     , integer-logarithms, lens, mixed-types-num, QuickCheck, regex-tdfa
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "aern2-mp";
-       version = "0.1.2.0";
-       sha256 = "131wymnajhji593zydnyddyc6cwg0y3nqgvibq8l9h23v4m67rlx";
-       revision = "1";
-       editedCabalFile = "09b92kf60m4v0xn2nm9h8wkg8wr7dc1na5c9mg2lk3kplf60sfvk";
-       libraryHaskellDepends = [
-         base convertible hmpfr hspec integer-gmp integer-logarithms lens
-         mixed-types-num QuickCheck regex-tdfa template-haskell
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "Multi-precision floats via MPFR";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aern2-mp_0_1_3_1" = callPackage
     ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
      , mixed-types-num, QuickCheck, regex-tdfa, rounded
      , template-haskell
@@ -21660,7 +21610,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aern2-real" = callPackage
@@ -31695,27 +31644,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "avro_0_4_0_0" = 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
+  "avro_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , 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.4.0.0";
-       sha256 = "1cly3x4lmibcjm5sz68s2fncakpx2cfvyimv4ck1mm5v94yfp8pi";
+       version = "0.4.1.0";
+       sha256 = "0dndnk8wk1ir59m19qsb3jrza8xy2w3w3fqv52hyqz1w5ca906n6";
        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
+         aeson array base base16-bytestring bifunctors 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
+         aeson array base base16-bytestring bifunctors 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;
@@ -50336,24 +50287,6 @@ self: {
      }) {};
 
   "commutative" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-instances, random
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "commutative";
-       version = "0.0.1.4";
-       sha256 = "1ky9axa5vs12w4m8wzlnw1cf3m9ndq239534rxfknm3k5h0ldrqd";
-       libraryHaskellDepends = [ base random semigroups ];
-       testHaskellDepends = [
-         base QuickCheck quickcheck-instances random semigroups tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       description = "Commutative binary operations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "commutative_0_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, random
      , semigroups, tasty, tasty-hunit, tasty-quickcheck, vector
      }:
@@ -51607,22 +51540,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.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;
-     }) {};
-
-  "concurrent-output_1_10_9" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -51636,7 +51553,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -55882,14 +55798,19 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
+    ({ mkDerivation, ansi-terminal, base, containers, HUnit, mtl
+     , optparse-applicative, QuickCheck, split, text
      }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.0.2.14";
-       sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       version = "0.0.3.1";
+       sha256 = "0iadzyp44ylzwq65jqvln1cmlnsvpwvy0cvpn8xfdqd1x0qil8i2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers mtl split text ];
+       executableHaskellDepends = [
+         ansi-terminal base containers mtl optparse-applicative split text
+       ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
@@ -62974,21 +62895,6 @@ self: {
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-applicative, text }:
-     mkDerivation {
-       pname = "dhall-text";
-       version = "1.0.13";
-       sha256 = "09bwhc2wrwliwrvd565wr0rgdxmi0g4i9691b8nb32nybb20l1ah";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base dhall optparse-applicative text
-       ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_14" = callPackage
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
@@ -63001,7 +62907,6 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -66601,19 +66506,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "docusign-base-minimal" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, http-media
+     , lens, servant, servant-client, text
+     }:
+     mkDerivation {
+       pname = "docusign-base-minimal";
+       version = "0.0.1";
+       sha256 = "0ifzfjganr9yznm4gxkk204g3ld1mrz4v9yp47w9wh5gmzzarxv5";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default http-media lens servant
+         servant-client text
+       ];
+       description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "docusign-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , data-default, docusign-base, exceptions, http-client
+     , data-default, docusign-base-minimal, exceptions, http-client
      , http-client-tls, http-types, servant-client, text, uuid
      }:
      mkDerivation {
        pname = "docusign-client";
-       version = "0.0.1";
-       sha256 = "1vyb7n08vqjmc18adbs6ck01q5440a0r99ahb566v427mr9hcydg";
+       version = "0.0.2";
+       sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx";
        libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring data-default docusign-base
-         exceptions http-client http-client-tls http-types servant-client
-         text uuid
+         aeson base base64-bytestring bytestring data-default
+         docusign-base-minimal exceptions http-client http-client-tls
+         http-types servant-client text uuid
        ];
        description = "Client bindings for the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
@@ -69602,24 +69523,6 @@ self: {
      }) {};
 
   "ekg-core" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-core";
-       version = "0.1.1.4";
-       sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
-       revision = "3";
-       editedCabalFile = "1s3545x9w01rrwzchb4f91ck0n6dc7gf0zwkryqx1b2c95ni5qa8";
-       libraryHaskellDepends = [
-         base containers ghc-prim text unordered-containers
-       ];
-       benchmarkHaskellDepends = [ base ];
-       description = "Tracking of system metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-core_0_1_1_6" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, text
      , unordered-containers
      }:
@@ -69633,7 +69536,6 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -76350,25 +76252,6 @@ self: {
      }) {};
 
   "filecache" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
-     }:
-     mkDerivation {
-       pname = "filecache";
-       version = "0.4.0";
-       sha256 = "0x2ffqx6wfv6n3k3396463f771zs9ps1rcw8ga3qw4vm5sv8s26d";
-       libraryHaskellDepends = [
-         base containers directory exceptions filepath fsnotify mtl stm
-         strict-base-types time
-       ];
-       testHaskellDepends = [
-         base containers directory filepath hspec stm temporary
-       ];
-       description = "A cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "filecache_0_4_1" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
      }:
@@ -76385,7 +76268,6 @@ self: {
        ];
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filediff" = callPackage
@@ -81714,14 +81596,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fuzzyset_0_1_0_7" = callPackage
+  "fuzzyset_0_1_0_8" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
      , ieee754, lens, text, text-metrics, unordered-containers, vector
      }:
      mkDerivation {
        pname = "fuzzyset";
-       version = "0.1.0.7";
-       sha256 = "1smkvbz22dfx1d99dcb0p1j4bnkw1jd553ca6zkqhk0yqvhm2w4q";
+       version = "0.1.0.8";
+       sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv";
        libraryHaskellDepends = [
          base base-unicode-symbols data-default lens text text-metrics
          unordered-containers vector
@@ -92244,27 +92126,6 @@ self: {
      }) {};
 
   "greskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
-     , greskell-core, hint, hspec, semigroups, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "greskell";
-       version = "0.2.1.1";
-       sha256 = "0nplscs0gv9isb1z2i8qh50yssvd7kkd669j53491hjw53rwy1cs";
-       libraryHaskellDepends = [
-         aeson base greskell-core semigroups text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring doctest doctest-discover greskell-core hint
-         hspec text unordered-containers
-       ];
-       description = "Haskell binding for Gremlin graph query language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "greskell_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
      , exceptions, greskell-core, hint, hspec, semigroups, text
      , transformers, unordered-containers, vector
@@ -92283,7 +92144,6 @@ self: {
        ];
        description = "Haskell binding for Gremlin graph query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greskell-core" = callPackage
@@ -99949,22 +99809,6 @@ self: {
      }) {};
 
   "haskell-src-exts-util" = callPackage
-    ({ mkDerivation, base, containers, data-default, haskell-src-exts
-     , semigroups, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts-util";
-       version = "0.2.3";
-       sha256 = "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8";
-       libraryHaskellDepends = [
-         base containers data-default haskell-src-exts semigroups
-         transformers uniplate
-       ];
-       description = "Helper functions for working with haskell-src-exts trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts-util_0_2_4" = callPackage
     ({ mkDerivation, base, containers, data-default, haskell-src-exts
      , semigroups, transformers, uniplate
      }:
@@ -99978,7 +99822,6 @@ self: {
        ];
        description = "Helper functions for working with haskell-src-exts trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -104287,31 +104130,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.4";
-       sha256 = "1xsa6wgakmjhwz9s9fybbwsx6gxy6630bqyrai0sb4vmd9lnbxfx";
-       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_8" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, stm, test-framework, test-framework-hunit
@@ -104333,7 +104151,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
@@ -111584,38 +111401,6 @@ self: {
      }) {};
 
   "hquantlib" = callPackage
-    ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl
-     , hmatrix-special, HUnit, mersenne-random-pure64, parallel
-     , QuickCheck, random, statistics, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "hquantlib";
-       version = "0.0.4.0";
-       sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp";
-       revision = "2";
-       editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers hmatrix hmatrix-gsl hmatrix-special
-         mersenne-random-pure64 parallel random statistics time vector
-         vector-algorithms
-       ];
-       executableHaskellDepends = [
-         base containers mersenne-random-pure64 parallel time
-       ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
-       license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hquantlib_0_0_5_0" = callPackage
     ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl
      , hmatrix-special, hquantlib-time, HUnit, mersenne-random-pure64
      , parallel, QuickCheck, random, statistics, test-framework
@@ -116195,22 +115980,6 @@ self: {
      }) {};
 
   "hsyslog-udp" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "hsyslog-udp";
-       version = "0.2.3";
-       sha256 = "1gmnyiqd7abh7b4vk9y24s9r0jgfvqd8jqpz9f1p97yidzic8gzh";
-       libraryHaskellDepends = [
-         base bytestring hsyslog network text time unix
-       ];
-       testHaskellDepends = [ base hspec time ];
-       description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsyslog-udp_0_2_4" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
      }:
@@ -116224,7 +115993,6 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -116921,33 +116689,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, deepseq, directory
-     , exceptions, filepath, ghc-prim, hspec, http-types, memory
-     , mime-types, monad-control, network, network-uri, random, stm
-     , streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.13.1";
-       sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive containers
-         cookie deepseq exceptions filepath ghc-prim http-types memory
-         mime-types network network-uri random stm streaming-commons text
-         time transformers
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive containers
-         deepseq directory hspec http-types monad-control network
-         network-uri streaming-commons text time transformers zlib
-       ];
-       doCheck = false;
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_14" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -116972,7 +116713,6 @@ self: {
        doCheck = false;
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -118697,25 +118437,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
-     , hw-prim, hw-string-parse, QuickCheck, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.7.0.3";
-       sha256 = "1z6h8ljws92jdchzbkv7siig859b21ck04xnp2fka2j8p97d437w";
-       libraryHaskellDepends = [
-         base bytestring hw-int hw-prim hw-string-parse safe vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hw-prim QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
-       description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-bits_0_7_0_4" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
      , safe, vector
@@ -118734,7 +118455,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hw-prim vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-conduit" = callPackage
@@ -118796,8 +118516,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-dsv";
-       version = "0.3.1";
-       sha256 = "1fdc0hrcv1ypnkbfjazw0x4yzlsnrbfzddk0xvsqadhd3rl62slk";
+       version = "0.3.2";
+       sha256 = "14xkyvqggax9vx46kvsg3w0h7pnsfsbwbd5jbr95p5nw8yrsa8pg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119237,8 +118957,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.19";
-       sha256 = "06d124i6y1kai14yfpwbys3fvpqxf7wrvyhhlihqdvpqfksll1dv";
+       version = "0.6.2.20";
+       sha256 = "05azmns8nvdpfhd0fi71slsgn8irghyx25rynipc44ff407c1maa";
        libraryHaskellDepends = [
          base bytestring mmap semigroups transformers vector
        ];
@@ -123002,30 +122722,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.9";
-       sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_6_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, lens, network, optional-args, QuickCheck, scientific
@@ -123047,7 +122743,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
@@ -127599,25 +127294,6 @@ self: {
      }) {};
 
   "json-feed" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, hspec
-     , mime-types, network-uri, tagsoup, text, time
-     }:
-     mkDerivation {
-       pname = "json-feed";
-       version = "1.0.4";
-       sha256 = "07xj9h2zdiyvrib93d99xi179nbzir96yylwkxajpfckfgyi4xmp";
-       libraryHaskellDepends = [
-         aeson base bytestring mime-types network-uri tagsoup text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath hspec mime-types network-uri tagsoup
-         text time
-       ];
-       description = "JSON Feed";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "json-feed_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, hspec
      , mime-types, network-uri, tagsoup, text, time
      }:
@@ -127634,7 +127310,6 @@ self: {
        ];
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-fu" = callPackage
@@ -130741,18 +130416,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "1.0.6";
-       sha256 = "1z8ipsf78l57jbkcyhjfwbgvj5gmna46x1jvcrin01rpg8xy97q4";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_7" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -130762,7 +130425,6 @@ self: {
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lacroix" = callPackage
@@ -141910,27 +141572,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, data-default-class
-     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
-     , vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.2.3.0";
-       sha256 = "1wrfzlika7w82nxmmj192cbrhm769yhmichk1lpylldzvv9j0wl5";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq ghc-prim primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base bytestring data-default deepseq hspec QuickCheck
-         safe-exceptions vector
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_2_4_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, data-default-class
      , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
      , vector
@@ -141949,7 +141590,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -150726,21 +150366,6 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
-     }:
-     mkDerivation {
-       pname = "mysql";
-       version = "0.1.5";
-       sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring containers ];
-       librarySystemDepends = [ mysql ];
-       testHaskellDepends = [ base bytestring hspec ];
-       description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mysql;};
-
-  "mysql_0_1_6" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
      }:
      mkDerivation {
@@ -150753,7 +150378,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -164885,19 +164509,6 @@ self: {
      }) {};
 
   "picosat" = callPackage
-    ({ mkDerivation, base, containers, random, rdtsc, transformers }:
-     mkDerivation {
-       pname = "picosat";
-       version = "0.1.4";
-       sha256 = "0fch3s2q5g5sif6xqd69v0kbf41061vdviifr6l9aym70jp9yvas";
-       libraryHaskellDepends = [ base containers transformers ];
-       testHaskellDepends = [ base containers random rdtsc transformers ];
-       description = "Bindings to the PicoSAT solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "picosat_0_1_5" = callPackage
     ({ mkDerivation, base, containers, random, rdtsc, transformers }:
      mkDerivation {
        pname = "picosat";
@@ -165045,8 +164656,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.12.10";
-       sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds";
+       version = "0.9.12.11";
+       sha256 = "12vj9lg7l2nb92j9mydsa8hcy0ql71qnphfhgdm30xrsps79vwd0";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random
@@ -168508,35 +168119,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, bytestring-strict-builder, containers, conversion
-     , conversion-bytestring, conversion-text, criterion, json-ast
-     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
-     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.12.1.1";
-       sha256 = "181npyfnz9xbmwjfzcrmbwlzw2xchy2fsibiw6d3c01y45xv607v";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring
-         bytestring-strict-builder containers loch-th network-ip
-         placeholders scientific text time transformers unordered-containers
-         uuid vector
-       ];
-       testHaskellDepends = [
-         aeson conversion conversion-bytestring conversion-text json-ast
-         loch-th network-ip placeholders postgresql-libpq QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ criterion rerebase ];
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_12_1_2" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, bytestring-strict-builder, containers, conversion
      , conversion-bytestring, conversion-text, criterion, json-ast
@@ -168563,7 +168145,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-common" = callPackage
@@ -168855,29 +168436,6 @@ self: {
      }) {};
 
   "postgresql-simple-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-migration";
-       version = "0.1.12.0";
-       sha256 = "18sx8ila7w7k4ym4rs36dc48v0cdl3b4il5jfqyfcx34n3mb5y4q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
-       ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple text time
-       ];
-       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple-migration_0_1_13_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
@@ -168898,7 +168456,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -174254,37 +173811,6 @@ self: {
      }) {};
 
   "qnap-decrypt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit
-     , conduit-extra, crypto-api, directory, filepath, hspec, HUnit
-     , optparse-applicative, streaming-commons, tagged, temporary
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "qnap-decrypt";
-       version = "0.3.2";
-       sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary bytestring cipher-aes128 conduit conduit-extra
-         crypto-api directory streaming-commons tagged utf8-string
-       ];
-       executableHaskellDepends = [
-         base binary bytestring cipher-aes128 conduit conduit-extra
-         crypto-api directory filepath optparse-applicative
-         streaming-commons tagged utf8-string
-       ];
-       testHaskellDepends = [
-         base binary bytestring cipher-aes128 conduit conduit-extra
-         crypto-api directory filepath hspec HUnit streaming-commons tagged
-         temporary utf8-string
-       ];
-       description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "qnap-decrypt_0_3_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit
      , conduit-extra, crypto-api, directory, filepath, hspec, HUnit
      , optparse-applicative, streaming-commons, tagged, temporary
@@ -174313,7 +173839,6 @@ self: {
        ];
        description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qq-literals" = callPackage
@@ -176941,27 +176466,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "1.0.6";
-       sha256 = "0bqgkijadr3zhmnq787k6bkqg96di3fbrb3ywlypns624mhwcw37";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers filepath hspec
-         http-client http-client-tls http-types text uuid
-       ];
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -176980,7 +176484,6 @@ self: {
        ];
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
@@ -192505,31 +192008,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.19";
-       sha256 = "0h1nmdpizw4bvpkxlnrwq02r3wnk01z4jqid12hp30bi577yqd5l";
-       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_20" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -192551,7 +192029,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 ];
      }) {};
 
@@ -198729,8 +198206,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.3";
-       sha256 = "0rwspgmy4s33viijxb4rqck7qdwrxn15k54cbccijncqjpc15azj";
+       version = "0.0.3.1";
+       sha256 = "1rhmj14z9ypv9z5pg6494kbp4mr5906cpjgsrn1cc5rkgj1xlv59";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -198740,7 +198217,7 @@ self: {
          unordered-containers urlpath uuid wai wai-middleware-content-type
          wai-transformers websockets websockets-simple wuss
        ];
-       description = "Unified streaming dependency management for web apps";
+       description = "Unified streaming data-dependency framework for web apps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -219247,33 +218724,6 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, thyme, time, timezone-olson, timezone-series
-     , tzdata, vector
-     }:
-     mkDerivation {
-       pname = "tz";
-       version = "0.1.3.1";
-       sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default deepseq
-         template-haskell time tzdata vector
-       ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th time tzdata
-       ];
-       benchmarkHaskellDepends = [
-         base criterion lens thyme time timezone-olson timezone-series
-       ];
-       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-       description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tz_0_1_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -219298,33 +218748,9 @@ self: {
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = 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";
-       revision = "1";
-       editedCabalFile = "19iqfzmh8xvd3cqlr1lp673232gk59z335xqbv18d4yy5qxc2fj0";
-       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_20181026_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -219343,7 +218769,6 @@ self: {
        ];
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -223927,8 +223352,8 @@ self: {
        pname = "vector-fftw";
        version = "0.1.3.8";
        sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
-       revision = "1";
-       editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f";
+       revision = "2";
+       editedCabalFile = "16qbqswgrx48lc4h5fa8ccyxv448scad9f2p9qvgzsn66lmm7iqc";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
        description = "A binding to the fftw library for one-dimensional vectors";
@@ -234410,31 +233835,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.7";
-       sha256 = "072g8c2phhgphj0469qg9chbninxwjkigy2pzhfl51zbm50skfb5";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent text yesod-auth yesod-core
-         yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_7_1" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
@@ -234457,7 +233857,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage

From 5987c5c694f3910e308beda967192cccf9a63610 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack.kelly@data61.csiro.au>
Date: Wed, 28 Nov 2018 12:33:57 +1100
Subject: [PATCH 0282/2793] postgresql: Remove static libs using host platform
 extension

---
 pkgs/servers/sql/postgresql/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index ee302b48ee4..ff365beb301 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -67,7 +67,8 @@ let
           # Remove static libraries in case dynamic are available.
           for i in $out/lib/*.a; do
             name="$(basename "$i")"
-            if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then
+            ext="${stdenv.hostPlatform.extensions.sharedLibrary}"
+            if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
               rm "$i"
             fi
           done

From b5120953c6f27e5bab6a4a02744c0bae47f80a3c Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 1 Oct 2018 17:12:56 +0200
Subject: [PATCH 0283/2793] nixos/roundcube: add roundcube module and default
 configuration

---
 nixos/modules/services/mail/roundcube.nix | 89 +++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 nixos/modules/services/mail/roundcube.nix

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
new file mode 100644
index 00000000000..fc655add00e
--- /dev/null
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -0,0 +1,89 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.roundcube;
+in
+{
+  options.services.roundcube = {
+    enable = mkEnableOption "Roundcube";
+
+    listenAddress = mkOption {
+      type = types.str;
+      default = 127.0.0.1;
+      description = "Listening address";
+    };
+
+    listenPort = mkOption {
+      type = types.int;
+      default = 80;
+      description = "Listening port";
+    };
+    
+    subDomain = mkOption {
+      type = types.str;
+      example = "webmail";
+      description = "Sub-domain to use which is the name of the nginx vhost";
+    };
+    
+    extraConfig = mkOption {
+      type = types.str;
+      default = ''
+        <?php
+
+        $config = array();
+        $config['db_dsnw'] = 'pgsql://roundcube:pass@localhost/roundcubemail';
+        $config['db_prefix'] = 'rc';
+        $config['default_host'] = 'tls://%h';
+        $config['smtp_server'] = 'tls://%h';
+        $config['smtp_user'] = '%u';
+        $config['smtp_pass'] = '%p';
+
+        $config['max_message_size'] = '25M';
+      '';
+      description = "Configuration for roundcube webmail instance";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc."roundcube/config.inc.php".text = cfg.extraConfig;
+
+    services.nginx.virtualHosts = {
+      "${cfg.subDomain}" = {
+        listen = [ { addr = cfg.listenAddress; port = cfg.listenPort; } ];
+        locations."/" = {
+          root = pkgs.roundcube;
+          index = "index.php";
+          extraConfig = ''
+            location ~* \.php$ {
+              fastcgi_split_path_info ^(.+\.php)(/.+)$;
+              fastcgi_pass unix:/run/phpfpm/roundcube;
+              include ${pkgs.nginx}/conf/fastcgi_params;
+              include ${pkgs.nginx}/conf/fastcgi.conf;
+            }
+          '';
+        };
+      };
+    };
+
+    services.phpfpm.poolConfigs.${cfg.subDomain} = ''
+      listen = /run/phpfpm/roundcube
+      listen.owner = nginx
+      listen.group = nginx
+      listen.mode = 0660
+      user = nginx
+      pm = dynamic
+      pm.max_children = 75
+      pm.start_servers = 2
+      pm.min_spare_servers = 1
+      pm.max_spare_servers = 20
+      pm.max_requests = 500
+      php_admin_value[error_log] = 'stderr'
+      php_admin_flag[log_errors] = on
+      php_admin_value[post_max_size] = 25M
+      php_admin_value[upload_max_filesize] = 25M
+      catch_workers_output = yes
+   '';
+  };
+}

From 195fa0dafc1b50c576bd85893a8c70fb7a66b280 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Tue, 2 Oct 2018 11:05:20 +0200
Subject: [PATCH 0284/2793] nixos/roundcube: add to module-list

---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 15fa7b1ac36..75e8446523f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -332,6 +332,7 @@
   ./services/mail/rspamd.nix
   ./services/mail/rss2email.nix
   ./services/mail/rmilter.nix
+  ./services/mail/roundcube.nix
   ./services/mail/nullmailer.nix
   ./services/misc/airsonic.nix
   ./services/misc/apache-kafka.nix

From 2f8073bd92a8289d52c19e574ea3db96911d9e82 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Wed, 3 Oct 2018 11:22:50 +0200
Subject: [PATCH 0285/2793] roundcube: IPv6 by default

---
 nixos/modules/services/mail/roundcube.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index fc655add00e..4639af33b63 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -11,8 +11,8 @@ in
 
     listenAddress = mkOption {
       type = types.str;
-      default = 127.0.0.1;
-      description = "Listening address";
+      default = "[::]";
+      description = "Listening address. IPv6 addresses must be enclosed in square brackets";
     };
 
     listenPort = mkOption {

From 9ace7f640996bb3e95f8233a74ef980af3a35559 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 11 Oct 2018 10:09:29 +0200
Subject: [PATCH 0286/2793] roundcube: clean-up and add test

---
 nixos/modules/services/mail/roundcube.nix | 143 +++++++++++++++-------
 nixos/tests/roundcube.nix                 |  28 +++++
 2 files changed, 128 insertions(+), 43 deletions(-)
 create mode 100644 nixos/tests/roundcube.nix

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 4639af33b63..b4ab429b520 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -9,65 +9,98 @@ in
   options.services.roundcube = {
     enable = mkEnableOption "Roundcube";
 
-    listenAddress = mkOption {
-      type = types.str;
-      default = "[::]";
-      description = "Listening address. IPv6 addresses must be enclosed in square brackets";
+    nginx.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to enable nginx virtual host management.
+        Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.&lt;name&gt;</literal>.
+        See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
+      '';
     };
 
-    listenPort = mkOption {
-      type = types.int;
-      default = 80;
-      description = "Listening port";
-    };
-    
-    subDomain = mkOption {
+    hostName = mkOption {
       type = types.str;
       example = "webmail";
-      description = "Sub-domain to use which is the name of the nginx vhost";
+      description = "Host name to use which for the nginx vhost";
     };
-    
-    extraConfig = mkOption {
-      type = types.str;
-      default = ''
-        <?php
 
-        $config = array();
-        $config['db_dsnw'] = 'pgsql://roundcube:pass@localhost/roundcubemail';
-        $config['db_prefix'] = 'rc';
-        $config['default_host'] = 'tls://%h';
-        $config['smtp_server'] = 'tls://%h';
-        $config['smtp_user'] = '%u';
-        $config['smtp_pass'] = '%p';
+    database = {
+      username = mkOption {
+        type = types.str;
+        default = "roundcube";
+        description = "Username for the postgresql connection";
+      };
+      host = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "Host of the postgresql server";
+      };
+      password = mkOption {
+        type = types.str;
+        description = "Password for the postgresql connection";
+      };
+      dbname = mkOption {
+        type = types.str;
+        default = "roundcube";
+        description = "Name of the postgresql database";
+      };
+    };
 
-        $config['max_message_size'] = '25M';
+    plugins = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        List of roundcube plugins to enable.
       '';
-      description = "Configuration for roundcube webmail instance";
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = "Extra configuration for roundcube webmail instance";
     };
   };
 
   config = mkIf cfg.enable {
-    environment.etc."roundcube/config.inc.php".text = cfg.extraConfig;
+    environment.etc."roundcube/config.inc.php".text = ''
+      <?php
 
-    services.nginx.virtualHosts = {
-      "${cfg.subDomain}" = {
-        listen = [ { addr = cfg.listenAddress; port = cfg.listenPort; } ];
-        locations."/" = {
-          root = pkgs.roundcube;
-          index = "index.php";
-          extraConfig = ''
-            location ~* \.php$ {
-              fastcgi_split_path_info ^(.+\.php)(/.+)$;
-              fastcgi_pass unix:/run/phpfpm/roundcube;
-              include ${pkgs.nginx}/conf/fastcgi_params;
-              include ${pkgs.nginx}/conf/fastcgi.conf;
-            }
-          '';
+      $config = array();
+      $config['db_dsnw'] = 'pgsql://${cfg.database.username}:${cfg.database.password}@${cfg.database.host}/${cfg.database.dbname}';
+      $config['log_driver'] = 'syslog';
+      $config['max_message_size'] = '25M';
+      $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}];
+      ${cfg.extraConfig}
+    '';
+
+    services.nginx = mkIf cfg.nginx.enable {
+      enable = true;
+      virtualHosts = {
+        ${cfg.hostName} = {
+          forceSSL = mkDefault true;
+          enableACME = mkDefault true;
+          locations."/" = {
+            root = pkgs.roundcube;
+            index = "index.php";
+            extraConfig = ''
+              location ~* \.php$ {
+                fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                fastcgi_pass unix:/run/phpfpm/roundcube;
+                include ${pkgs.nginx}/conf/fastcgi_params;
+                include ${pkgs.nginx}/conf/fastcgi.conf;
+              }
+            '';
+          };
         };
       };
     };
 
-    services.phpfpm.poolConfigs.${cfg.subDomain} = ''
+    services.postgresql = mkIf (cfg.database.host == "localhost") {
+      enable = true;
+    };
+
+    services.phpfpm.poolConfigs.${cfg.hostName} = ''
       listen = /run/phpfpm/roundcube
       listen.owner = nginx
       listen.group = nginx
@@ -84,6 +117,30 @@ in
       php_admin_value[post_max_size] = 25M
       php_admin_value[upload_max_filesize] = 25M
       catch_workers_output = yes
-   '';
+    '';
+    systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
+
+    systemd.services.roundcube-setup = let
+      pgSuperUser = config.services.postgresql.superUser;
+    in {
+      requires = [ "postgresql.service" ];
+      after = [ "postgresql.service" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ config.services.postgresql.package ];
+      script = ''
+        mkdir -p /var/lib/roundcube
+        if [ ! -f /var/lib/roundcube/db-created ]; then
+          if [ "${cfg.database.host}" = "localhost" ]; then
+            ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
+            ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
+          fi
+          PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
+            -f ${pkgs.roundcube}/SQL/postgres.initial.sql \
+            -h ${cfg.database.host} ${cfg.database.dbname}
+          touch /var/lib/roundcube/db-created
+        fi
+      '';
+      serviceConfig.Type = "oneshot";
+    };
   };
 }
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
new file mode 100644
index 00000000000..faa5f3fa0df
--- /dev/null
+++ b/nixos/tests/roundcube.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "roundcube";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ globin ];
+  };
+
+  nodes = {
+    roundcube = { config, pkgs, ... }: {
+      services.roundcube = {
+        enable = true;
+        hostName = "roundcube";
+        nginx.enable = true;
+        database.password = "notproduction";
+      };
+      services.nginx.virtualHosts.roundcube = {
+        forceSSL = false;
+        enableACME = false;
+      };
+    };
+  };
+
+  testScript = ''
+    $roundcube->start;
+    $roundcube->waitForUnit("postgresql.service");
+    $roundcube->waitForUnit("phpfpm-roundcube.service");
+    $roundcube->succeed("curl -sSfL http://roundcube/");
+  '';
+})

From 1262a5ca975b26fe113b5a03cddbc184cc7a4f58 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 28 Nov 2018 17:33:26 +0100
Subject: [PATCH 0287/2793] roundcube: apply code review suggestions

---
 nixos/modules/services/mail/roundcube.nix | 29 ++++++++++++++---------
 nixos/tests/all-tests.nix                 |  1 +
 nixos/tests/roundcube.nix                 |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index b4ab429b520..6d81c7374f4 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -7,13 +7,13 @@ let
 in
 {
   options.services.roundcube = {
-    enable = mkEnableOption "Roundcube";
-
-    nginx.enable = mkOption {
+    enable = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = ''
-        Whether to enable nginx virtual host management.
+        Whether to enable roundcube.
+
+        Also enables nginx virtual host management.
         Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.&lt;name&gt;</literal>.
         See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
       '';
@@ -21,8 +21,8 @@ in
 
     hostName = mkOption {
       type = types.str;
-      example = "webmail";
-      description = "Host name to use which for the nginx vhost";
+      example = "webmail.example.com";
+      description = "Hostname to use for the nginx vhost";
     };
 
     database = {
@@ -34,7 +34,12 @@ in
       host = mkOption {
         type = types.str;
         default = "localhost";
-        description = "Host of the postgresql server";
+        description = ''
+          Host of the postgresql server. If this is not set to
+          <literal>localhost</literal>, you have to create the
+          postgresql user and database yourself, with appropriate
+          permissions.
+        '';
       };
       password = mkOption {
         type = types.str;
@@ -51,7 +56,7 @@ in
       type = types.listOf types.str;
       default = [];
       description = ''
-        List of roundcube plugins to enable.
+        List of roundcube plugins to enable. Currently, only those directly shipped with Roundcube are supported.
       '';
     };
 
@@ -74,7 +79,7 @@ in
       ${cfg.extraConfig}
     '';
 
-    services.nginx = mkIf cfg.nginx.enable {
+    services.nginx = {
       enable = true;
       virtualHosts = {
         ${cfg.hostName} = {
@@ -100,7 +105,7 @@ in
       enable = true;
     };
 
-    services.phpfpm.poolConfigs.${cfg.hostName} = ''
+    services.phpfpm.poolConfigs.roundcube = ''
       listen = /run/phpfpm/roundcube
       listen.owner = nginx
       listen.group = nginx
@@ -139,6 +144,8 @@ in
             -h ${cfg.database.host} ${cfg.database.dbname}
           touch /var/lib/roundcube/db-created
         fi
+
+        ${pkgs.php}/bin/php ${pkgs.roundcube}/bin/update.sh
       '';
       serviceConfig.Type = "oneshot";
     };
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7bf261b58d6..feffdb97c18 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -178,6 +178,7 @@ in
   rabbitmq = handleTest ./rabbitmq.nix {};
   radicale = handleTest ./radicale.nix {};
   redmine = handleTest ./redmine.nix {};
+  roundcube = handleTest ./roundcube.nix {};
   rspamd = handleTest ./rspamd.nix {};
   rss2email = handleTest ./rss2email.nix {};
   rsyslogd = handleTest ./rsyslogd.nix {};
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index faa5f3fa0df..178134fd9b3 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -9,7 +9,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.roundcube = {
         enable = true;
         hostName = "roundcube";
-        nginx.enable = true;
         database.password = "notproduction";
       };
       services.nginx.virtualHosts.roundcube = {
@@ -23,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     $roundcube->start;
     $roundcube->waitForUnit("postgresql.service");
     $roundcube->waitForUnit("phpfpm-roundcube.service");
+    $roundcube->waitForUnit("nginx.service");
     $roundcube->succeed("curl -sSfL http://roundcube/");
   '';
 })

From 13e45aeed302363be9eed17c75db80fcc3e0100e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:26:21 -0600
Subject: [PATCH 0288/2793] make-derivation: remove selfConsistent check

version is set in lots of places but might not need to be in a name.

Alternative to #50364.
---
 pkgs/stdenv/generic/make-derivation.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 57e757080a2..b4e39162951 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -81,13 +81,6 @@ rec {
     , ... } @ attrs:
 
     let
-      # Check that the name is consistent with pname and version:
-      selfConsistent = (with attrs; attrs ? "name" ->
-        (lib.assertMsg (attrs ? "version" -> lib.strings.hasInfix version name)
-          "version ${version} does not appear in name ${name}" &&
-        lib.assertMsg (attrs ? "pname" -> lib.strings.hasInfix pname name)
-          "pname ${pname} does not appear in name ${name}"));
-
       computedName = if name != "" then name else "${attrs.pname}-${attrs.version}";
 
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
@@ -188,7 +181,7 @@ rec {
         // {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
-          name = assert selfConsistent && validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
+          name = assert validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
             # Fixed-output derivations like source tarballs shouldn't get a host
             # suffix. But we have some weird ones with run-time deps that are
             # just used for their side-affects. Those might as well since the

From d64f28815486924a6fc3b1d9a46e6925b5d3c2ba Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:29:00 -0600
Subject: [PATCH 0289/2793] =?UTF-8?q?make-derivation:=20don=E2=80=99t=20as?=
 =?UTF-8?q?sert=20on=20separateDebugInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When separateDebugInfo = true & !stdenv.hostPlatform.isLinux, we
always gave an error. There is no reason to do this. Instead, just
don’t add separate debug info when we aren’t on Linux.
---
 pkgs/stdenv/generic/make-derivation.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index b4e39162951..2debf063c7e 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -88,7 +88,8 @@ rec {
       doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
       doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform;
 
-      outputs' = outputs ++ lib.optional separateDebugInfo "debug";
+      separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux;
+      outputs' = outputs ++ lib.optional separateDebugInfo' "debug";
 
       fixedOutputDrv = attrs ? outputHash;
       noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated
@@ -123,7 +124,7 @@ rec {
         [
           (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)
           (map (drv: drv.nativeDrv or drv) nativeBuildInputs
-             ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
+             ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
              ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
           (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)
         ]
@@ -181,7 +182,7 @@ rec {
         // {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
-          name = assert validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
+          name = assert validity.handled; computedName + lib.optionalString
             # Fixed-output derivations like source tarballs shouldn't get a host
             # suffix. But we have some weird ones with run-time deps that are
             # just used for their side-affects. Those might as well since the

From a9b7fa7634f509aa8332069867c220fe7546474b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:30:24 -0600
Subject: [PATCH 0290/2793] Revert "treewide: for substituteAll:
 s/version/version_/"

This reverts commit 1e99582eaff5605947b8e9cdef7d440df8cf7ba3.
---
 pkgs/development/python-modules/py3exiv2/default.nix | 2 +-
 pkgs/development/python-modules/py3exiv2/setup.patch | 6 +++---
 pkgs/misc/drivers/hplip/3.16.11.nix                  | 2 +-
 pkgs/misc/drivers/hplip/default.nix                  | 2 +-
 pkgs/misc/drivers/hplip/hplip.state                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index 647fbdd872c..4c6ca0bad33 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./setup.patch;
-      version_ = "3${stdenv.lib.versions.minor python.version}";
+      version = "3${stdenv.lib.versions.minor python.version}";
     })
   ];
 
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index 784533105d6..8b0619c5bc5 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -3,9 +3,9 @@
 @@ -39,7 +39,7 @@
                  if '3' in l[2:]:
                      return l.replace('libboost', 'boost')
-
+ 
 -libboost = get_libboost_name()
-+libboost = 'boost_python@version_@'
-
++libboost = 'boost_python@version@'
+ 
  setup(
      name='py3exiv2',
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 0c6ff464a62..8982834d9a9 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -23,7 +23,7 @@ let
   };
 
   hplipState = substituteAll {
-    version_ = version;
+    inherit version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index e2c34473e54..f03d75dfa02 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -25,7 +25,7 @@ let
   };
 
   hplipState = substituteAll {
-    version_ = version;
+    inherit version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state
index 3c7c2eb2df7..9d19a93f364 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/pkgs/misc/drivers/hplip/hplip.state
@@ -1,4 +1,4 @@
 [plugin]
 installed=1
 eula=1
-version=@version_@
+version=@version@

From a56fe056ece1d7c0b384a08467408ded507573c7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:44:10 -0600
Subject: [PATCH 0291/2793] =?UTF-8?q?make-derivation:=20don=E2=80=99t=20ad?=
 =?UTF-8?q?d=20host=20suffix=20if=20there=20is=20no=20c=20compiler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some trivial builders use the name attr to choose the exec name
produced. For example nixos-install,

  nixos-install = makeProg {
    name = "nixos-install";
    src = ./nixos-install.sh;
    nix = config.nix.package.out;
    path = makeBinPath [ nixos-enter ];
  };

When cross compiling, this puts the prog in,

  /bin/nixos-install-powerpc64le-unknown-linux-gnu
---
 pkgs/stdenv/generic/make-derivation.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 2debf063c7e..aa1dcfe977d 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -96,7 +96,7 @@ rec {
                                       ++ depsHostHost ++ depsHostHostPropagated
                                       ++ buildInputs ++ propagatedBuildInputs
                                       ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
-      runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
+      dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || stdenv.cc == null;
       supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
       defaultHardeningFlags = if stdenv.targetPlatform.isMusl
                               then supportedHardeningFlags
@@ -187,7 +187,7 @@ rec {
             # suffix. But we have some weird ones with run-time deps that are
             # just used for their side-affects. Those might as well since the
             # hash can't be the same. See #32986.
-            (stdenv.hostPlatform != stdenv.buildPlatform && runtimeSensativeIfFixedOutput)
+            (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
             ("-" + stdenv.hostPlatform.config);
 
           builder = attrs.realBuilder or stdenv.shell;

From b72a68cea4316fbd276af5b587c95cea7f2c05b8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 27 Nov 2018 18:31:18 +0100
Subject: [PATCH 0292/2793] x42-plugins: 20180812 -> 20181103

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

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 7c57b884c8e..e6041dc9b1c 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20180812";
+  version = "20181103";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "0gzwzxpa2k2w9c6j3pspwi9slfyd57wb192d6yqcg92pfmnxy9dz";
+    sha256 = "085d6qjj7nl22f0xamqdrnfxwi8zrfwgkwm1svm73bjkdv270438";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
       homepage = https://github.com/x42/x42-plugins;
       maintainers = with maintainers; [ magnetophon ];
       license = licenses.gpl2;
-      platforms = platforms.linux;
+      platforms = [ "i686-linux" "x86_64-linux" ];
     };
 }

From 44f2569e50c60e6e0a0db600897e3c523708b1bd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Nov 2018 20:50:18 +0100
Subject: [PATCH 0293/2793] eclipse-plugin-spotbugs: 3.1.8 -> 3.1.9

---
 pkgs/applications/editors/eclipse/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index cbc30588434..9595bfe4d8b 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -555,12 +555,12 @@ rec {
 
   spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.8";
+    version = "3.1.9";
 
     src = fetchzip {
       stripRoot = false;
       url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
-      sha256 = "0086shivxx745f69226f59xcv7l9xliwyr9kxm6zyn753c888js3";
+      sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz";
     };
 
     meta = with stdenv.lib; {

From 9ba423b09a24e5f9b63b65ede99a4d79c16cc920 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 27 Nov 2018 20:20:53 -0800
Subject: [PATCH 0294/2793] aminal: init at 0.7.4

---
 pkgs/applications/misc/aminal/default.nix | 75 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/applications/misc/aminal/default.nix

diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
new file mode 100644
index 00000000000..ebf78be7a08
--- /dev/null
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -0,0 +1,75 @@
+{ buildGoPackage
+, Carbon
+, Cocoa
+, Kernel
+, cf-private
+, fetchFromGitHub
+, lib
+, mesa_glu
+, stdenv
+, xorg
+}:
+
+buildGoPackage rec {
+  name = "aminal-${version}";
+  version = "0.7.4";
+
+  goPackagePath = "github.com/liamg/aminal";
+
+  buildInputs =
+    lib.optionals stdenv.isLinux [
+      mesa_glu
+      xorg.libX11
+      xorg.libXcursor
+      xorg.libXi
+      xorg.libXinerama
+      xorg.libXrandr
+      xorg.libXxf86vm
+    ] ++ lib.optionals stdenv.isDarwin [
+      Carbon
+      Cocoa
+      Kernel
+      cf-private  /* Needed for NSDefaultRunLoopMode */
+    ];
+
+  src = fetchFromGitHub {
+    owner = "liamg";
+    repo = "aminal";
+    rev = "v${version}";
+    sha256 = "0wnzxjlv98pi3gy4hp3d19pwpa4kf1h5rqy03s9bcqdbpb1v1b7v";
+  };
+
+  preBuild = ''
+    buildFlagsArray=("-ldflags=-X ${goPackagePath}/version.Version=${version}")
+  '';
+
+  meta = with lib; {
+    description = "Golang terminal emulator from scratch";
+    longDescription = ''
+      Aminal is a modern terminal emulator for Mac/Linux implemented in Golang
+      and utilising OpenGL.
+
+      The project is experimental at the moment, so you probably won't want to
+      rely on Aminal as your main terminal for a while.
+
+      Features:
+      - Unicode support
+      - OpenGL rendering
+      - Customisation options
+      - True colour support
+      - Support for common ANSI escape sequences a la xterm
+      - Scrollback buffer
+      - Clipboard access
+      - Clickable URLs
+      - Multi platform support (Windows coming soon...)
+      - Sixel support
+      - Hints/overlays
+      - Built-in patched fonts for powerline
+      - Retina display support
+    '';
+    homepage = https://github.com/liamg/aminal;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 447dda793f4..2fd8431be48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19319,6 +19319,11 @@ with pkgs;
     vte = gnome3.vte;
   };
 
+  aminal = callPackage ../applications/misc/aminal {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
+    inherit (darwin) cf-private;
+  };
+
   termite-unwrapped = callPackage ../applications/misc/termite {
     vte = gnome3.vte-ng;
   };

From 8b472e3739dbcb2fa832f936a665280996c6879d Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Thu, 29 Nov 2018 01:32:40 +0530
Subject: [PATCH 0295/2793] marp: 0.0.13 -> 0.0.14

* marp: 0.0.13 -> 0.0.14 (#50757)

I think 0.0.13 never worked. The 0.0.14 download is weird.

https://github.com/yhatt/marp/issues/258
---
 pkgs/applications/office/marp/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 6ff0cf1dfd0..cdda46d4837 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, atomEnv, libXScrnSaver }:
+{ stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "marp-${version}";
-  version = "0.0.13";
+  version = "0.0.14";
 
   src = fetchurl {
     url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
-    sha256 = "1120mbw4mf7v4qfmss3121gkgp5pn31alk9cssxbrmdcsdkaq5ld";
+    sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4";
   };
-  sourceRoot = ".";
+
+  unpackPhase = ''
+    mkdir {locales,resources}
+    tar --delay-directory-restore -xf $src
+    chmod u+x {locales,resources}
+  '';
 
   installPhase = ''
-      mkdir -p $out/lib/marp $out/bin
-      cp -r ./* $out/lib/marp
-      ln -s $out/lib/marp/Marp $out/bin
+    mkdir -p $out/lib/marp $out/bin
+    cp -r ./* $out/lib/marp
+    ln -s $out/lib/marp/Marp $out/bin
   '';
 
   postFixup = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \
+      --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \
       $out/bin/Marp
   '';
 

From bfc680311afa04389b29fbbcc80c5b3f6a71e759 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Wed, 28 Nov 2018 15:17:25 -0500
Subject: [PATCH 0296/2793] rclone: 1.44 -> 1.45

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 34712a522fe..af01b89dc76 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,15 +2,16 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.44";
+  version = "1.45";
 
   goPackagePath = "github.com/ncw/rclone";
+  subPackages = [ "." ];
 
   src = fetchFromGitHub {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "0kpx9r4kksscsvia7r79z9h8ghph25ay9dgpqrnp599fq1bqky61";
+    sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26";
   };
 
   outputs = [ "bin" "out" "man" ];

From ca9c757684f4511e44de8b81f020fa9134d46f84 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Wed, 28 Nov 2018 23:50:36 +0300
Subject: [PATCH 0297/2793] boohu: 0.10 -> 0.11

---
 pkgs/games/boohu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 92eccd67a1f..ccfdf8d905c 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
 
   name = "boohu-${version}";
-  version = "0.10.0";
+  version = "0.11.0";
 
   goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
-    sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6";
+    sha256 = "1qc3mz1mj6byyslmx1afprg1l7x8rcy7i004sy32g590jaahwqdr";
   };
 
   buildFlags = "--tags ansi";

From 60856aa9ea1dee98721c6ed81aa1735a8e098481 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Nov 2018 15:07:23 -0600
Subject: [PATCH 0298/2793] mesa: 18.2.5 -> 18.2.6

https://www.mesa3d.org/relnotes/18.2.6.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 a6b935fb826..faf1261da4a 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.5";
+  version = "18.2.6";
   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 = "0wrbdk988mh42bbpicf5knx5pdqs3xp05s71alqkbr9j523k4b5i";
+    sha256 = "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly";
   };
 
   prePatch = "patchShebangs .";

From 359bf7f1e31ff5615974266e55993aff0a52ddf0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 28 Nov 2018 22:37:24 +0100
Subject: [PATCH 0299/2793] sage: disable test timeout

Hydra build failed due to timeout:
https://hydra.nixos.org/build/84870983
---
 pkgs/applications/science/math/sage/sage-tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index feccf75a7ac..1f400db18fc 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     mkdir -p "$HOME"
 
     # "--long" tests are in the order of 1h, without "--long" its 1/2h
-    "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${patienceSpecifier} ${testArgs}
+    "sage" -t --timeout=0 --nthreads "$NIX_BUILD_CORES" --optional=sage ${patienceSpecifier} ${testArgs}
   '';
 }

From d6376bca6de2014705492ed70c93054b74540523 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 28 Nov 2018 22:52:15 +0100
Subject: [PATCH 0300/2793] sage: don't test the downgraded R

Fails transiently. See https://github.com/NixOS/nixpkgs/pull/49249. The
failures look harmless and are fixed with R 3.5 which will be used in
sage 8.5.
---
 pkgs/applications/science/math/sage/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 832b2f11056..46e60a2b81e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -129,6 +129,7 @@ let
     # https://trac.sagemath.org/ticket/25674
     R = pkgs.R.overrideAttrs (attrs: rec {
       name = "R-3.4.4";
+      doCheck = false;
       src = fetchurl {
         url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
         sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";

From 54737e329b08cee72dbbedf81431eb425f0ee04f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 16:00:43 -0600
Subject: [PATCH 0301/2793] doc: fix incorrect example

For whatever reason, nix-build ... --argstr a.b "c" doesn't work. It fails quitely so it's best to use an example here that works.
---
 doc/cross-compilation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index a41240570c6..40cf11304ea 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -385,7 +385,7 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).system
     Eventually we would like to make these platform examples an unnecessary
     convenience so that
 <programlisting>
-nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
+nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
     works in the vast majority of cases. The problem today is dependencies on
     other sorts of configuration which aren't given proper defaults. We rely on
     the examples to crudely to set those configuration parameters in some

From 6a0f0cce63b65e41ab679cc66a20f9acfc0d61c3 Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Mon, 26 Nov 2018 15:15:39 -0600
Subject: [PATCH 0302/2793] kubetail: install completions

---
 pkgs/applications/networking/cluster/kubetail/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 38892cdf039..b2cf486b612 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    install -Dm755 kubetail $out/bin/kubetail
+    install -Dm755 kubetail                 "$out/bin/kubetail"
+    install -Dm755 completion/kubetail.bash "$out/share/bash-completion/completions/kubetail"
+    install -Dm755 completion/kubetail.fish "$out/share/fish/vendor_completions.d/kubetail.fish"
+    install -Dm755 completion/kubetail.zsh  "$out/share/zsh/site-functions/_kubetail"
   '';
 
   meta = with lib; {

From a3ec5dce2bcc7b346acd7a507821dc2bc105fbac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Thu, 8 Nov 2018 13:11:19 +0100
Subject: [PATCH 0303/2793] gitlab-shell: don't hardcode gitlab-shell paths in
 authorized_keys

---
 .../gitlab-shell/remove-hardcoded-locations.patch   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 6d29f5f9e6c..3d381404c63 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -43,3 +43,16 @@ index 57c70f5..700569b 100644
    end
  
    def api
+diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
+index 0600a18..6814f0a 100644
+--- a/lib/gitlab_keys.rb
++++ b/lib/gitlab_keys.rb
+@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
+   attr_accessor :auth_file, :key
+
+   def self.command(whatever)
+-    "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
++    "/run/current-system/sw/bin/gitlab-shell #{whatever}"
+   end
+
+   def self.command_key(key_id)

From 3caeeabb1484358b5d6d63f346767dc1764c424a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Nov 2018 19:16:33 +0100
Subject: [PATCH 0304/2793] gitlab: stop regenerating the authorized_keys file

---
 nixos/doc/manual/release-notes/rl-1903.xml | 18 ++++++++++++++++--
 nixos/modules/services/misc/gitlab.nix     |  4 ----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index cedd5fc21c6..376a5355f7c 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -241,8 +241,22 @@
      (<literal>networking.firewall.interfaces.default.*</literal>), and assigning
      to this pseudo device will override the (<literal>networking.firewall.allow*</literal>)
      options.
-    </para>
-   </listitem>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+     GitLab Shell previously used the nix store paths for the
+     <literal>gitlab-shell</literal> command in its
+     <literal>authorized_keys</literal> file, which might stop working after
+     garbage collection. To circumvent that, we regenerated that file on each
+     startup.  As <literal>gitlab-shell</literal> has now been changed to use
+     <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is
+     not necessary anymore, but there might be leftover lines with a nix store
+     path. Regenerate the <literal>authorized_keys</literal> file via
+     <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that
+     case.
+   </para>
+  </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 07adf58c9b2..769a9526cf6 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -609,10 +609,6 @@ 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} -H force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup
-
         # 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 ff74da41fd4c6cb5ebb7f127e16912c76a74684e Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 24 Nov 2018 16:44:20 +0100
Subject: [PATCH 0305/2793] winePackages.wine: add SDL support

---
 pkgs/misc/emulators/wine/base.nix    | 1 +
 pkgs/misc/emulators/wine/default.nix | 3 ++-
 pkgs/top-level/wine-packages.nix     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index f87f8eab984..94cf4a77456 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
   ++ lib.optional udevSupport            pkgs.udev
   ++ lib.optional vulkanSupport          pkgs.vulkan-loader
+  ++ lib.optional sdlSupport             pkgs.SDL2
   ++ lib.optionals gstreamerSupport      (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ])
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.glib ]
   ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 91323ab6de7..6ecca6c2503 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -42,6 +42,7 @@
   xineramaSupport ? false,
   xmlSupport ? false,
   vulkanSupport ? false,
+  sdlSupport ? false,
 }:
 
 let wine-build = build: release:
@@ -53,7 +54,7 @@ let wine-build = build: release:
                   netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
                   gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
                   pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
-                  openglSupport gstreamerSupport udevSupport vulkanSupport;
+                  openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport;
         };
       });
 
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
index 8ff2d46c24e..3a81a3d99bc 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -25,6 +25,7 @@ rec {
     udevSupport = true;
     xineramaSupport = true;
     xmlSupport = true;
+    sdlSupport = true;
   };
 
   full = base.override {

From ce5de69e17da8bf0376e58feea48d5089b33b4fa Mon Sep 17 00:00:00 2001
From: rht <rhtbot@protonmail.com>
Date: Wed, 28 Nov 2018 23:39:56 +0000
Subject: [PATCH 0306/2793] brave: 0.56.12 -> 0.56.15 (70.0.3538.77 ->
 70.0.3538.110)

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 725adda56e7..8d436e77180 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -74,11 +74,11 @@ let rpath = lib.makeLibraryPath [
 
 in stdenv.mkDerivation rec {
     name = "brave-${version}";
-    version = "0.56.12";
+    version = "0.56.15";
 
     src = fetchurl {
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        sha256 = "1pvablwchpsm1fdhfp9kr2912yv4812r8prv5fn799qpflzxvyai";
+        sha256 = "1d18fgnxcgl95bhkgfqjyv4p81q6fciqibd3ss4vwh1ljjy1fv76";
     };
 
     dontConfigure = true;

From 2e5eb135aac300032edd82e4b7a49a17dc80ba4d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 27 Nov 2018 21:51:41 -0500
Subject: [PATCH 0307/2793] sd-image: Verifies the FAT partition before copying
 it.

This is to ensure `mtools`-based operations don't wreck the FS.
---
 nixos/modules/installer/cd-dvd/sd-image.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index b6e1d11c2b5..e3b1ce3b7c4 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -135,6 +135,8 @@ in
 
         # Copy the populated /boot into the SD image
         (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
+        # Verify the FAT partition before copying it.
+        fsck.vfat -vn bootpart.img
         dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS
       '';
     }) {};

From 1b6a4d3979f13f990617d32ee9ec99b1f02673ec Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 27 Nov 2018 21:52:10 -0500
Subject: [PATCH 0308/2793] sd-image: Do not use batch operation for `mcopy`.

```
       b      Batch mode. Optimized for huge recursive copies, but less secure if a crash happens during the copy.
```

It seems the "less secure if a crash happens" does not need a crash to
happen.

With batch mode:

```
/[...]/.
  Start (0) does not point to parent (___)
```

For pretty much everything copied in.

Without batch mode, everything passes `fsck`.

See #51150
---
 nixos/modules/installer/cd-dvd/sd-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index e3b1ce3b7c4..69746a8e979 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -134,7 +134,7 @@ in
         ${config.sdImage.populateBootCommands}
 
         # Copy the populated /boot into the SD image
-        (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
+        (cd boot; mcopy -psvm -i ../bootpart.img ./* ::)
         # Verify the FAT partition before copying it.
         fsck.vfat -vn bootpart.img
         dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS

From 0a367c41ea2b956b7952e1e81da6d51e95a310cd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 28 Nov 2018 19:09:02 -0500
Subject: [PATCH 0309/2793] iso-image: Verifies the FAT partition at build.

This is done to ensure `mtools`-based operations leave a clean FS.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 96fdb997b2c..dbf7643c336 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -340,6 +340,8 @@ let
       truncate --size=$image_size "$out"
       ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
       mcopy -bpsvm -i "$out" ./* ::
+      # Verify the FAT partition.
+      ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
     ''; # */
 
   targetArch = if pkgs.stdenv.isi686 then

From 38644380493cb87c209115c54dc908a89f43e91b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 28 Nov 2018 19:14:54 -0500
Subject: [PATCH 0310/2793] iso-image: Do not use batch operations for `mcopy`.

```
       b      Batch mode. Optimized for huge recursive copies, but less secure if a crash happens during the copy.
```

It seems the "less secure if a crash happens" does not need a crash to
happen.

With batch mode:

```
/[...]/.
  Start (0) does not point to parent (___)
```

For pretty much everything copied in.

Without batch mode, everything passes `fsck`.

See #51150
---
 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 dbf7643c336..aa8003fef2c 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -339,7 +339,7 @@ let
       echo "Image size: $image_size"
       truncate --size=$image_size "$out"
       ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
-      mcopy -bpsvm -i "$out" ./* ::
+      mcopy -psvm -i "$out" ./* ::
       # Verify the FAT partition.
       ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
     ''; # */

From 67a4067a443db2ca8256e26e5e0dcbf4c1c3f12a Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 13 Nov 2018 09:15:51 -0500
Subject: [PATCH 0311/2793] autospotting: init at unstable-2018-11-17

---
 .../misc/autospotting/default.nix             | 30 ++++++++
 pkgs/applications/misc/autospotting/deps.nix  | 75 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 107 insertions(+)
 create mode 100644 pkgs/applications/misc/autospotting/default.nix
 create mode 100644 pkgs/applications/misc/autospotting/deps.nix

diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
new file mode 100644
index 00000000000..2f38307ca1e
--- /dev/null
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "autospotting-${version}";
+  version = "unstable-2018-11-17";
+  goPackagePath = "github.com/AutoSpotting/AutoSpotting";
+
+  src = fetchFromGitHub {
+    owner = "AutoSpotting";
+    repo = "AutoSpotting";
+    rev = "122ab8f292a2f718dd85e79ec22acd455122907e";
+    sha256 = "0p48lgig9kblxvgq1kggczkn4qdbx6ciq9c8x0179i80vl4jf7v6";
+  };
+
+  goDeps = ./deps.nix;
+
+  # patching path where repository used to exist
+  postPatch = ''
+    sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/AutoSpotting/AutoSpotting;
+    description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes";
+    license = licenses.free;
+    maintainers = [ maintainers.costrouc ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/applications/misc/autospotting/deps.nix b/pkgs/applications/misc/autospotting/deps.nix
new file mode 100644
index 00000000000..ea744ed6648
--- /dev/null
+++ b/pkgs/applications/misc/autospotting/deps.nix
@@ -0,0 +1,75 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/aws/aws-lambda-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-lambda-go";
+      rev =  "2d482ef09017ae953b1e8d5a6ddac5b696663a3c";
+      sha256 = "06v2yfvn4sn116lds0526a8mfrsng4vafrdjf1dhpalqarrbdvmz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "9333060a8d957db41bff1c80603a802aa674fad8";
+      sha256 = "0fnypw6zm6k70fzhm5a8g69ag64rxbrrpdk7l3rkfqd99slyg5kz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cristim/ec2-instances-info";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cristim/ec2-instances-info";
+      rev =  "73c042a5558cd6d8b61fb82502d6f7aec334e9ed";
+      sha256 = "1xajrkxqqz5wlbi9w2wdhnk115rbmqxyga29f8v9psq8hzwgi0rg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "d8f796af33cc11cb798c1aaeb27a4ebc5099927d";
+      sha256 = "19z27f306fpsrjdvkzd61w1bdazcdbczjyjck177g33iklinhpvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "5cf292cae48347c2490ac1a58fe36735fb78df7e";
+      sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "0b12d6b5";
+      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/namsral/flag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/namsral/flag";
+      rev =  "67f268f20922975c067ed799e4be6bacf152208c";
+      sha256 = "1lmxq3z276zrsggpfq9b7yklzzxdyib49zr8sznb1lcqlvxqsr47";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 118e5f57794..b188f985e46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -595,6 +595,8 @@ with pkgs;
 
   autoflake = callPackage ../development/tools/analysis/autoflake { };
 
+  autospotting = callPackage ../applications/misc/autospotting { };
+
   avfs = callPackage ../tools/filesystems/avfs { };
 
   avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { };

From fd08b98da90fe1ff064f37f4a54284031a2b7469 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 16 Nov 2018 21:25:30 +0100
Subject: [PATCH 0312/2793] pythonPackages.fs-s3fs: init at 1.0.0

`fs` is a python-based file system abstraction layer. The new package
`fs-s3fs` is an implementation of it which stores files inside an S3
bucket.
---
 .../python-modules/fs-s3fs/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/fs-s3fs/default.nix

diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix
new file mode 100644
index 00000000000..156b0fdd76e
--- /dev/null
+++ b/pkgs/development/python-modules/fs-s3fs/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage, fetchPypi, lib, fs, six, boto3 }:
+
+buildPythonPackage rec {
+  pname = "fs-s3fs";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak";
+  };
+
+  propagatedBuildInputs = [ fs six boto3 ];
+
+  # tests try to integrate an s3 bucket which can't be tested properly in an isolated environment.
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://pypi.org/project/fs-s3fs/;
+    license = licenses.mit;
+    description = "Amazon S3 filesystem for PyFilesystem2";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c413ae1b47e..e494765a9c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2658,6 +2658,8 @@ in {
 
   fs = callPackage ../development/python-modules/fs { };
 
+  fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
+
   libcloud = callPackage ../development/python-modules/libcloud { };
 
   libgpuarray = callPackage ../development/python-modules/libgpuarray {

From 9d2160e73bcd96a12235e0d06731964032f136d4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 26 Nov 2018 02:25:26 +0100
Subject: [PATCH 0313/2793] pythonPackages.pyftpdlib: skip tests

Although the tests are passing locally, it seems as the excessive
filesystem usage causes several build failures and timeouts in the Hydra
and OfBorg infrastructure:

* https://hydra.nixos.org/build/84374861 (python3 on linux.x86_64)
* https://hydra.nixos.org/build/84368459 (python2 on linux.x86_64)

Some of these tests are failing after several seconds though, but I
couldn't identify a pattern and I'm not overly surprised that a FTP
library has impure tests. However the API seems to be usable in a Python
{2,3} environment, so it should be safe to use even with disabled tests.
---
 pkgs/development/python-modules/pyftpdlib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index b8f483d3a1d..254edfb8693 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
   checkInputs = [ mock psutil ];
   propagatedBuildInputs = [ pyopenssl pysendfile ];
 
-  checkPhase = ''
-    ${python.interpreter} pyftpdlib/test/runner.py
-  '';
+  # impure filesystem-related tests cause timeouts
+  # on Hydra: https://hydra.nixos.org/build/84374861
+  doCheck = false;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/giampaolo/pyftpdlib/;

From d8e73253a44f3057d74cedf4d542fcc324dbd500 Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Thu, 29 Nov 2018 05:11:57 +0300
Subject: [PATCH 0314/2793] f2fs-tools: fix cross compilation

---
 pkgs/tools/filesystems/f2fs-tools/default.nix |  2 ++
 .../f2fs-tools/f2fs-tools-cross-fix.patch     | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index a1428a25774..90bb443dfdd 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libselinux libuuid ];
 
+  patches = [ ./f2fs-tools-cross-fix.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/;
     description = "Userland tools for the f2fs filesystem";
diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
new file mode 100644
index 00000000000..1503732240c
--- /dev/null
+++ b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
@@ -0,0 +1,27 @@
+--- f2fs-tools/configure.ac.orig	2018-11-29 05:05:57.154988687 +0300
++++ f2fs-tools/configure.ac	2018-11-29 05:06:12.667316101 +0300
+@@ -20,14 +20,16 @@
+ 				[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
+ 				[Minor version for f2fs-tools])
+ 
+-AC_CHECK_FILE(.git,
+-	AC_DEFINE([F2FS_TOOLS_DATE],
+-		"m4_bpatsubst(f2fs_tools_gitdate,
+-		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
+-		[f2fs-tools date based on Git commits]),
+-	AC_DEFINE([F2FS_TOOLS_DATE],
+-		"f2fs_tools_date",
+-		[f2fs-tools date based on Source releases]))
++dnl AC_CHECK_FILE(.git,
++dnl 	AC_DEFINE([F2FS_TOOLS_DATE],
++dnl 		"m4_bpatsubst(f2fs_tools_gitdate,
++dnl 		[\([0-9-]*\)\(\w\|\W\)*], [\1])",
++dnl 		[f2fs-tools date based on Git commits]),
++dnl 	AC_DEFINE([F2FS_TOOLS_DATE],
++dnl 		"f2fs_tools_date",
++dnl 		[f2fs-tools date based on Source releases]))
++
++AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases])
+ 
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADER([config.h])

From fd78464de91d5d64dda217397586996e0b7ff37f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Nov 2018 18:00:08 -0600
Subject: [PATCH 0315/2793] premake: add setup-hook

Adds a configure phase for packages using premake.
premakeConfigurePhase runs the correct premake version for the premake
you are using (see premake_cmd).
---
 pkgs/development/tools/misc/premake/3.nix     |  3 +++
 pkgs/development/tools/misc/premake/5.nix     |  3 +++
 .../tools/misc/premake/default.nix            |  7 +++++--
 .../tools/misc/premake/setup-hook.sh          | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/misc/premake/setup-hook.sh

diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 77f61386874..8b02bf96fd5 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation {
     install -Dm755 bin/premake $out/bin/premake
   '';
 
+  premake_cmd = "premake3";
+  setupHook = ./setup-hook.sh;
+
   meta = {
     homepage = http://industriousone.com/premake;
     description = "A simple build configuration and project generation tool using lua";
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 93220a02e2d..8ceb3d4a436 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
     install -Dm755 bin/release/premake5 $out/bin/premake5
   '';
 
+  premake_cmd = "premake5";
+  setupHook = ./setup-hook.sh;
+
   meta = {
     homepage = https://premake.github.io;
     description = "A simple build configuration and project generation tool using lua";
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
index 770c8071095..99bf8cac81f 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
 
   buildPhase = ''
     make -C build/gmake.unix/
@@ -22,11 +22,14 @@ stdenv.mkDerivation {
     install -Dm755 bin/release/premake4 $out/bin/premake4
   '';
 
+  premake_cmd = "premake4";
+  setupHook = ./setup-hook.sh;
+
   meta = with stdenv.lib; {
     homepage = http://industriousone.com/premake;
     description = "A simple build configuration and project generation tool using lua";
     license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh
new file mode 100644
index 00000000000..ba06ea2c761
--- /dev/null
+++ b/pkgs/development/tools/misc/premake/setup-hook.sh
@@ -0,0 +1,19 @@
+premakeConfigurePhase() {
+    runHook preConfigure
+
+    local flagsArray=(
+        ${premakefile:+--file=$premakefile}
+        $premakeFlags ${premakeFlagsArray[@]}
+        ${premakeBackend:-gmake}
+    )
+
+    echoCmd 'configure flags' "${flagsArray[@]}"
+
+    @premake_cmd@ "${flagsArray[@]}"
+
+    runHook postConfigure
+}
+
+if [ -z "$configurePhase" ]; then
+    configurePhase=premakeConfigurePhase
+fi

From a06eb847058584480487e840a1c9b78cb7828e84 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Nov 2018 18:02:16 -0600
Subject: [PATCH 0316/2793] bootil: cleanup installation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A few changes needed here:

- We don’t want to guess what our platform is. We can patch location
  and targetdir to not put things in an unpredictable directory.
- Make premake4 a native build input.
- Set the premakefile variable.
---
 pkgs/development/libraries/bootil/default.nix | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index b64cdd5245f..0ed223832b6 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -23,21 +23,21 @@ stdenv.mkDerivation rec {
     url = https://github.com/garrynewman/bootil/pull/22.patch;
     name = "github-pull-request-22.patch";
     sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
-  })];
+  }) ];
 
-  platform =
-    if stdenv.isLinux then "linux"
-    else if stdenv.isDarwin then "macosx"
-    else throw "unrecognized system ${stdenv.hostPlatform.system}";
+  # Avoid guessing where files end up. Just use current directory.
+  postPatch = ''
+    substituteInPlace projects/premake4.lua \
+      --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )'
+    substituteInPlace projects/bootil.lua \
+      --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )'
+  '';
 
-  buildInputs = [ premake4 ];
-
-  configurePhase = "premake4 --file=projects/premake4.lua gmake";
-  makeFlags = "-C projects/${platform}/gmake";
+  nativeBuildInputs = [ premake4 ];
+  premakefile = "projects/premake4.lua";
 
   installPhase = ''
-    mkdir -p $out/lib
-    cp lib/${platform}/gmake/libbootil_static.a $out/lib/
-    cp -r include $out/
+    install -D libbootil_static.a $out/lib/libbootil_static.a
+    cp -r include $out
   '';
 }

From e0471b6c45345f66b633d15f191680408c110ce3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Nov 2018 20:13:40 -0600
Subject: [PATCH 0317/2793] yojimbo: use premake build hook

---
 pkgs/development/libraries/yojimbo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
index 9a3416a368b..557c46470a8 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ premake5 doxygen ];
   propagatedBuildInputs = [ libsodium mbedtls ];
 
-  buildPhase = ''
-    premake5 gmake
-    make all
+  postBuild = ''
     premake5 docs
   '';
 
@@ -28,6 +26,8 @@ stdenv.mkDerivation rec {
     cp -r docs/html $out/share/doc/yojimbo
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A network library for client/server games with dedicated servers";
     longDescription = ''

From 932c1ff4c89d8464208879abb33f3682386c8bcf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 01:32:11 -0600
Subject: [PATCH 0318/2793] distrho: cleanup premake usage

---
 pkgs/applications/audio/distrho/default.nix | 37 ++++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index bf79b68bc7d..1c41451b08f 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,7 +1,13 @@
 { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
-, pkgconfig, premake3, xorg, ladspa-sdk }:
+, pkgconfig, ladspa-sdk, premake3
+, libX11, libXcomposite, libXcursor, libXext, libXinerama, libXrender
+}:
 
-stdenv.mkDerivation rec {
+let
+  premakeos = if stdenv.hostPlatform.isDarwin then "osx"
+              else if stdenv.hostPlatform.isWindows then "mingw"
+              else "linux";
+in stdenv.mkDerivation rec {
   name = "distrho-ports-${version}";
   version = "2018-04-16";
 
@@ -12,27 +18,26 @@ stdenv.mkDerivation rec {
     sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v";
   };
 
+  configurePhase = ''
+    runHook preConfigure
+
+    sh ./scripts/premake-update.sh ${premakeos}
+
+    runHook postConfigure
+  '';
+
   patchPhase = ''
     sed -e "s#@./scripts#sh scripts#" -i Makefile
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig premake3 ];
   buildInputs = [
-    alsaLib fftwSinglePrec freetype libjack2 premake3
-    xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
-    xorg.libXinerama xorg.libXrender ladspa-sdk
+    alsaLib fftwSinglePrec freetype libjack2
+    libX11 libXcomposite libXcursor libXext
+    libXinerama libXrender ladspa-sdk
   ];
 
-  buildPhase = ''
-    sh ./scripts/premake-update.sh linux
-    make lv2
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/lib/lv2
-    cp -a bin/lv2/* $out/lib/lv2/
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     homepage = http://distrho.sourceforge.net;

From 0984032d6ae2d87b8a032a75f783942da2279235 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 01:35:32 -0600
Subject: [PATCH 0319/2793] gmad: use premake setup hook

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

diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix
index a15914877cc..78936ec1949 100644
--- a/pkgs/games/gmad/default.nix
+++ b/pkgs/games/gmad/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     else if stdenv.isDarwin then "gmad_osx"
     else "gmad";
 
-  configurePhase = "premake4 --bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include gmake";
+  premakeFlags = "--bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include";
 
   installPhase = ''
     mkdir -p $out/bin

From 9d2c6ea47a146cb6e10c4d4ec08179cf18dc26fe Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 01:42:54 -0600
Subject: [PATCH 0320/2793] otfcc: use premake setup hook

---
 pkgs/tools/misc/otfcc/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
index acf46a58a6b..96e5e6a1d94 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, premake5, ninja }:
+{ stdenv, fetchFromGitHub, premake5 }:
 
 stdenv.mkDerivation rec {
   name = "otfcc-${version}";
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1rnjfqqyc6d9nhlh8if9k37wk94mcwz4wf3k239v6idg48nrk10b";
   };
 
-  nativeBuildInputs = [ premake5 ninja ];
+  nativeBuildInputs = [ premake5 ];
 
-  configurePhase = ''
-    premake5 ninja
+  # Don’t guess where our makefiles will end up. Just use current
+  # directory.
+  patchPhase = ''
+    substituteInPlace premake5.lua \
+      --replace 'location "build/gmake"' 'location "."'
   '';
 
-  ninjaFlags = let x = if stdenv.hostPlatform.isi686 then "x86" else "x64"; in
-    [ "-C" "build/ninja" "otfccdump_release_${x}" "otfccbuild_release_${x}" ];
-
   installPhase = ''
     mkdir -p $out/bin
     cp bin/release-x*/otfcc* $out/bin/

From 801b375925fb212eec52f74574ad4d19f74301ef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 16:43:32 -0600
Subject: [PATCH 0321/2793] tome4: use premake hook

---
 pkgs/games/tome4/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index 3f6726a17f1..ec529676463 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -25,9 +25,10 @@ in stdenv.mkDerivation rec {
     sha256 = "0mc5dgh2x9nbili7gy6srjhb23ckalf08wqq2amyjr5rq392jvd7";
   };
 
-  nativeBuildInputs = [ premake4 makeWrapper unzip ];
+  nativeBuildInputs = [ makeWrapper unzip premake4 ];
 
-  # tome4 vendors quite a few libraries so someone might want to look into avoiding that...
+  # tome4 vendors quite a few libraries so someone might want to look
+  # into avoiding that...
   buildInputs = [
     libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image
   ];
@@ -36,20 +37,11 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = [
+    "-I${SDL2.dev}/include/SDL2"
     "-I${SDL2_image}/include/SDL2"
     "-I${SDL2_ttf}/include/SDL2"
   ];
 
-  postPatch = ''
-    substituteInPlace premake4.lua \
-      --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \
-      --replace "/usr/include/GL" "/run/opengl-driver/include"
-  '';
-
-  preConfigure = ''
-    premake4 gmake
-  '';
-
   makeFlags = [ "config=release" ];
 
   # The wrapper needs to cd into the correct directory as tome4's detection of

From 613e262fc2f84d068da40ee6c45f0915c00e2193 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 19:48:07 -0600
Subject: [PATCH 0322/2793] imake: add setup hook

---
 .../x11/xorg/darwin-imake-setup-hook.sh       |  1 -
 pkgs/servers/x11/xorg/imake-setup-hook.sh     | 19 +++++++++++++++++++
 pkgs/servers/x11/xorg/overrides.nix           |  8 ++++----
 3 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh
 create mode 100644 pkgs/servers/x11/xorg/imake-setup-hook.sh

diff --git a/pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh b/pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh
deleted file mode 100644
index 6dbaf724092..00000000000
--- a/pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-export IMAKECPP="@tradcpp@/bin/tradcpp"
diff --git a/pkgs/servers/x11/xorg/imake-setup-hook.sh b/pkgs/servers/x11/xorg/imake-setup-hook.sh
new file mode 100644
index 00000000000..10f54198f7f
--- /dev/null
+++ b/pkgs/servers/x11/xorg/imake-setup-hook.sh
@@ -0,0 +1,19 @@
+export IMAKECPP="@tradcpp@/bin/tradcpp"
+
+imakeConfigurePhase() {
+    runHook preConfigure
+
+    echoCmd 'configuring with imake'
+
+    if [ -z "${imakefile:-}" -a ! -e Imakefile ]; then
+        echo "no Imakefile, doing nothing"
+    else
+        xmkmf -a
+    fi
+
+    runHook postConfigure
+}
+
+if [ -z "$dontUseImakeConfigure" -a -z "$configurePhase" ]; then
+    configurePhase=imakeConfigurePhase
+fi
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8f4c251335a..48e67ac74a8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -63,12 +63,12 @@ self: super:
     inherit (self) xorgcffiles;
     x11BuildHook = ./imake.sh;
     patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
-    setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
-    CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
+    setupHook = ./imake-setup-hook.sh;
+    CFLAGS = [ ''-DIMAKE_COMPILETIME_CPP='"${if stdenv.isDarwin
       then "${tradcpp}/bin/cpp"
-      else "gcc"}\\\""
+      else "gcc"}"' ''
     ];
-    tradcpp = if stdenv.isDarwin then tradcpp else null;
+    inherit tradcpp;
   });
 
   mkfontdir = super.mkfontdir.overrideAttrs (attrs: {

From a858113076b9012664237eb619b9289936b187a9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 19:54:15 -0600
Subject: [PATCH 0323/2793] oneko: use imake setup hook

Simplifies some things here.
---
 pkgs/applications/misc/oneko/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index e1cc70e4277..311f093ba6d 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, xlibsWrapper }:
+{ stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   version = "1.2.sakura.5";
@@ -8,14 +8,11 @@ stdenv.mkDerivation rec {
     url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
   };
-  buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ xlibsWrapper ];
 
-  configurePhase = "xmkmf";
-
-  installPhase = ''
-    make install BINDIR=$out/bin
-    make install.man MANPATH=$out/share/man
-  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
+  installTargets = "install install.man";
 
   meta = with stdenv.lib; {
     description = "Creates a cute cat chasing around your mouse cursor";

From 3d3f87365c160f27bd6d1455ef1bd3fc4cebe915 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 19:55:08 -0600
Subject: [PATCH 0324/2793] xcruiser: add setup hook

Cleans things up a bit here.
---
 pkgs/applications/misc/xcruiser/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix
index 3a25147971a..945072ce026 100644
--- a/pkgs/applications/misc/xcruiser/default.nix
+++ b/pkgs/applications/misc/xcruiser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gccmakedep, xorg }:
+{ stdenv, fetchurl, gccmakedep, xorg, imake, libXt, libXaw, libXpm, libXext }:
 
 stdenv.mkDerivation {
   name = "xcruiser-0.30";
@@ -8,13 +8,13 @@ stdenv.mkDerivation {
       sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
     };
 
-  buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];
+  nativeBuildInputs = [ gccmakedep imake ];
+  buildInputs = [ libXt libXaw libXpm libXext ];
 
-  configurePhase = "xmkmf -a";
-
-  preBuild = ''
-    makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults)
-  '';
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "XAPPLOADDIR=$(out)/etc/X11/app-defaults"
+  ];
 
   meta = with stdenv.lib; {
     description = "Filesystem visualization utility";

From f5be016c23dd4abb5b5478007484ca7341f84e1e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:06:26 -0600
Subject: [PATCH 0325/2793] xmove: remove

This package is unmaintained.

https://packages.qa.debian.org/x/xmove/news/20090130T204752Z.html
---
 pkgs/applications/misc/xmove/default.nix | 19 -------------------
 pkgs/top-level/all-packages.nix          |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/applications/misc/xmove/default.nix

diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix
deleted file mode 100644
index e461a2c8816..00000000000
--- a/pkgs/applications/misc/xmove/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, libX11, libXi, imake, xauth, libXau}:
-stdenv.mkDerivation {
-  name = "xmove-2.0b2";
-
-  src = fetchurl {
-    url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz;
-    sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf";
-  };
-
-  buildPhase = "cd xmove; sed -e 's/.*No address for our host.*/{hp = gethostbyname(\"localhost\");};/' -i main.c; cp ../man/man1/xmove.1 xmove.man ; xmkmf; make; cd .. ; cd xmovectrl ; cp ../man/man1/xmovectrl.1 xmovectrl.man; xmkmf; make ; cd ..";
-  installPhase = "cd xmove; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd .. ; cd xmovectrl ; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd ..";
-
-  buildInputs = [libX11 libXi imake xauth libXau];
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ce1afbb415..ff7b4f9951d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20051,8 +20051,6 @@ with pkgs;
 
   xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { };
 
-  xmove = callPackage ../applications/misc/xmove { };
-
   xmp = callPackage ../applications/audio/xmp { };
 
   xnee = callPackage ../tools/X11/xnee { };

From cf3940ef9582d097cd7fd7c92dc80d4a86f928e6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:11:15 -0600
Subject: [PATCH 0326/2793] xxkb: use imake setup hook

---
 pkgs/applications/misc/xxkb/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
index 90e2723a906..56638d126c1 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake
-, svgSupport ? true, librsvg, glib, gdk_pixbuf, pkgconfig
+{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
+, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig
 }:
 
 assert svgSupport ->
@@ -13,20 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
   };
 
+  nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [
-    imake
     libX11 libXt libXext libXpm
   ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
 
   outputs = [ "out" "man" ];
 
-  configurePhase = ''
-    xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"}
-  '';
+  imakeFlags = stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT";
 
-  preBuild = ''
-    makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$man/share/man )
-  '';
+  makeFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "PIXMAPDIR=${placeholder "out"}/share/xxkb"
+    "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
+    "MANDIR=${placeholder "man"}/share/man"
+  ];
 
   installTargets = "install install.man";
 

From 8a4da418491fab6185ce3c7cf88f38cc1c2ba2e6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:12:33 -0600
Subject: [PATCH 0327/2793] xearth: use imake setup hook

---
 .../science/astronomy/xearth/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index 5f276a1b3c7..fef4ca1907f 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, xorg }:
+{ stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
+
 stdenv.mkDerivation rec {
   name = "xearth-${version}";
   version = "1.1";
-  
+
   src = fetchurl {
     url = "http://xearth.org/${name}.tar.gz";
     sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
   };
 
-  buildInputs = with xorg; [  imake libXt libXext ];
-
-  dontAddPrefix = true;
-  configureScript="xmkmf";
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libXt libXext ];
 
   installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
   installTargets="install install.man";
-  
+
   meta = with stdenv.lib; {
     description = "sets the X root window to an image of the Earth";
     homepage = "http://xplanet.org";

From cbf9b5610b83d86d7f831b3440dc9195b2e54766 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:14:03 -0600
Subject: [PATCH 0328/2793] larswm: use imake setup hook

---
 pkgs/applications/window-managers/larswm/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix
index 21ea00d110e..4ec1a4bcd05 100644
--- a/pkgs/applications/window-managers/larswm/default.nix
+++ b/pkgs/applications/window-managers/larswm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, imake, libX11, libXext, libXmu}:
+{ stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }:
 
 stdenv.mkDerivation {
   name = "larswm-7.5.3";
@@ -8,13 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v";
   };
 
-  buildInputs = [ imake libX11 libXext libXmu ];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libX11 libXext libXmu ];
 
-  configurePhase = ''
-    xmkmf
-    makeFlags="BINDIR=$out/bin MANPATH=$out/share/man"
-    installTargets="install install.man"
-  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
+  installTargets = "install install.man";
 
   meta = {
     homepage = http://www.fnurt.net/larswm;

From 1eab4151d411ad62aa303ddda221a8fcf9747be8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:15:45 -0600
Subject: [PATCH 0329/2793] xsnow: use imake setup hook

---
 pkgs/games/xsnow/default.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 47a321c99b4..07ed50d4e7b 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXt, libXpm, libXext, imake }:
+{ stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }:
 
 stdenv.mkDerivation rec {
 
@@ -10,25 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
   };
 
+  nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [
-    libXt libXpm libXext imake
+    libXt libXpm libXext
   ];
 
-  buildPhase = ''
-    xmkmf
-    make
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1
-    cp xsnow $out/bin/
-    cp xsnow.1 $out/share/man/man1/
-  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
 
   meta = {
     description = "An X-windows application that will let it snow on the root, in between and on windows";
     homepage = http://janswaal.home.xs4all.nl/Xsnow/;
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.robberer ];
-  }; 
+  };
 }

From 92c119fb31c5d30e43bf35272396ad4559dc548d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 20:17:05 -0600
Subject: [PATCH 0330/2793] xautolock: use imake setup hook

---
 pkgs/misc/screensavers/xautolock/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index 0c1446f0672..cce4b351c57 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto }:
+{ stdenv, fetchurl, xlibsWrapper
+, imake, gccmakedep, libXScrnSaver, scrnsaverproto }:
 
 stdenv.mkDerivation rec {
   name = "xautolock-2.2";
@@ -14,10 +15,13 @@ stdenv.mkDerivation rec {
     })
   ];
   NIX_CFLAGS_COMPILE = "-DSYSV";
-  makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man";
-  preBuild = "xmkmf";
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "MANPATH=$(out)/share/man"
+  ];
   installTargets = "install install.man";
-  buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ];
   meta = with stdenv.lib; {
     description = "A program that launches a given program when your X session has been idle for a given time.";
     homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;

From be10bee0e48c4f3f365b947ee539d607d7b30dc7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:29:40 -0600
Subject: [PATCH 0331/2793] x2x: use imake setup hook

---
 pkgs/tools/X11/x2x/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index 24cf4f6b2e1..0c3538a0db9 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, imake, libX11, libXtst, libXext}:
+{ stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
 
 stdenv.mkDerivation {
   name = "x2x-1.27";
@@ -8,20 +8,16 @@ stdenv.mkDerivation {
     sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
   };
 
-  buildInputs = [ imake libX11 libXtst libXext ];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libX11 libXtst libXext ];
 
   hardeningDisable = [ "format" ];
 
-  configurePhase = ''
-    xmkmf
-    makeFlags="BINDIR=$out/bin x2x"
-  '';
+  buildFlags = [ "x2x" ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man/man1
-    cp x2x $out/bin/
-    cp x2x.1 $out/man/man1/
+    install -D x2x $out/bin/x2x
+    install -D x2x.1 $out/man/man1/x2x.1
   '';
 
   meta = with stdenv.lib; {

From 39122285ba4441be27fc7b0bbbbbf647189df557 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:32:14 -0600
Subject: [PATCH 0332/2793] xbrightness: use imake setup hook

---
 pkgs/tools/X11/xbrightness/default.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index f4112765e67..2857ea6c7be 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, xorg }:
+{ stdenv, fetchurl, imake, gccmakedep
+, libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm  }:
 
 stdenv.mkDerivation {
 
@@ -8,22 +9,11 @@ stdenv.mkDerivation {
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
   };
 
-  buildInputs = [
-    xorg.imake
-    xorg.libX11
-    xorg.libXaw
-    xorg.libXext
-    xorg.libXmu
-    xorg.libXpm
-    xorg.libXxf86vm
-  ];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ];
 
-  configurePhase = "xmkmf";
-
-  installPhase = ''
-    make install BINDIR=$out/bin
-    make install.man MANPATH=$out/share/man
-  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
+  installTargets = "install install.man";
 
   meta = {
     description = "X11 brigthness and gamma software control";

From fd1a5aecabe55f141eadd4ee5b5d8bfd3196f538 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:37:05 -0600
Subject: [PATCH 0333/2793] xvkbd: use imake setup hook

---
 pkgs/tools/X11/xvkbd/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 06824f882a4..6ccc8a24cae 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, imake, libXt, libXaw, libXtst, libXi, libXpm, xextproto, gccmakedep, Xaw3d }:
+{ stdenv, fetchurl, imake, libXt, libXaw, libXtst
+, libXi, libXpm, xextproto, gccmakedep, Xaw3d }:
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
@@ -8,12 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
   };
 
-  buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libXt libXaw libXtst xextproto libXi Xaw3d libXpm ];
   installTargets = [ "install" "install.man" ];
-  preBuild = ''
-    makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults MANPATH=$out/man )
-  '';
-  configurePhase = '' xmkmf -a '';
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "XAPPLOADDIR=$(out)/etc/X11/app-defaults"
+    "MANPATH=$(out)/man"
+  ];
 
   meta = with stdenv.lib; {
     description = "Virtual keyboard for X window system";

From c90dba094d84e5a1fa613682ef5bc2fc13ae0de7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:38:50 -0600
Subject: [PATCH 0334/2793] xzoom: use imake setup hook

---
 pkgs/tools/X11/xzoom/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix
index 05154e28263..d1867e3b077 100644
--- a/pkgs/tools/X11/xzoom/default.nix
+++ b/pkgs/tools/X11/xzoom/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, libX11, imake, libXext, libXt}:
+{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}.${patchlevel}";
   pname = "xzoom";
@@ -16,12 +17,16 @@ stdenv.mkDerivation rec {
        sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh";
     })
   ];
-  buildInputs = [libX11 imake libXext libXt];
 
-  configurePhase = ''
-    xmkmf
-    makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANPATH=$out/share/man"
-  '';
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ libX11 libXext libXt ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "BINDIR=$(out)/bin"
+    "MANPATH=$(out)/share/man"
+  ];
+  installTargets = "install install.man";
 
   meta = {
     inherit version;

From f0077dc7dad7bec5f2823834a6337cb5db1a2299 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:40:57 -0600
Subject: [PATCH 0335/2793] transfig: use imake setup hook

---
 pkgs/tools/graphics/transfig/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix
index cb3f0edff0f..ceee3b7674d 100644
--- a/pkgs/tools/graphics/transfig/default.nix
+++ b/pkgs/tools/graphics/transfig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, libjpeg, libpng, imake}:
+{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
 
 stdenv.mkDerivation rec {
   name = "transfig-3.2.4";
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4";
   };
 
-  buildInputs = [zlib libjpeg libpng imake];
+  nativeBuildInputs = [ imake gccmakedep ];
+  buildInputs = [ zlib libjpeg libpng ];
 
   patches = [
     ./patch-fig2dev-dev-Imakefile
@@ -45,12 +46,7 @@ stdenv.mkDerivation rec {
     runHook postPatch
   '';
 
-  preBuild = ''
-    xmkmf
-    make Makefiles
-  '';
-
-  makeFlags = [ "CC=cc" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   preInstall = ''
     mkdir -p $out

From 3f00c67ef9ec34637b007832bf0ec9d0e44a3602 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:44:21 -0600
Subject: [PATCH 0336/2793] x11-ssh-askpass: cleanup

---
 pkgs/tools/networking/x11-ssh-askpass/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 896a2ff4daa..1b9d5534903 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, imake }:
+{ stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }:
 
 stdenv.mkDerivation {
   name = "x11-ssh-askpass-1.2.4.1";
@@ -10,16 +10,16 @@ stdenv.mkDerivation {
     sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88";
   };
 
-  nativeBuildInputs = [ imake ];
+  nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [ xlibsWrapper ];
 
   configureFlags = [
     "--with-app-defaults-dir=$out/etc/X11/app-defaults"
   ];
 
-  preBuild = ''
-    xmkmf
-    make includes
+  dontUseImakeConfigure = true;
+  postConfigure = ''
+    xmkmf -a
   '';
 
   installTargets = [ "install" "install.man" ];

From 8e4b0ceeb2be26690a934bfd08a90a75d9181f40 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Nov 2018 21:47:45 -0600
Subject: [PATCH 0337/2793] vncrec: use imake setup hook

---
 pkgs/tools/video/vncrec/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 7efcf6cbf83..49a2c4d4acb 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -12,16 +12,17 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [
-    libX11 xproto imake gccmakedep libXt libXmu libXaw
+    libX11 xproto libXt libXmu libXaw
     libXext xextproto libSM libICE libXpm libXp
   ];
 
-  buildPhase = ''xmkmf && make World'';
-
-  installPhase = ''
-    make DESTDIR=$out BINDIR=/bin MANDIR=/share/man/man1 install install.man
-  '';
+  makeFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "MANDIR=${placeholder "out"}/share/man"
+  ];
+  installTargets = "install install.man";
 
   meta = {
     description = "VNC recorder";

From 5d9b3a8e8b43b8a769ea1e0f9f4b5541ed4b6108 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:05:08 -0600
Subject: [PATCH 0338/2793] nas: use imake setup hook

---
 pkgs/servers/nas/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix
index 9b8402ec0e0..86f75a21359 100644
--- a/pkgs/servers/nas/default.nix
+++ b/pkgs/servers/nas/default.nix
@@ -16,12 +16,9 @@ in stdenv.mkDerivation {
 
   buildInputs = [ xproto libXau libXt libXext libXaw libXpm ];
 
-  buildPhase = ''
-    xmkmf
-    make WORLDOPTS="" World
-  '';
+  buildFlags = [ "WORLDOPTS=" "World" ];
 
-  installFlags = "LDLIBS=-lfl DESTDIR=\${out}";
+  installFlags = [ "LDLIBS=-lfl" "DESTDIR=${placeholder "out"}" ];
 
   postInstall = ''
     mv $out/${xorgcffiles}/* $out

From 38f1b48232347d1a6e21a2c603c516b9a7128502 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:11:41 -0600
Subject: [PATCH 0339/2793] tightvnc: use imake setup hook

---
 pkgs/tools/admin/tightvnc/default.nix | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index 4027b3d531c..5a76b500d14 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -10,15 +10,14 @@ stdenv.mkDerivation {
   };
 
   # for the builder script
-  inherit xauth fontDirectories perl;
-  gcc = stdenv.cc.cc;
+  inherit fontDirectories;
 
   hardeningDisable = [ "format" ];
 
   buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw
                   libXpm libXp xauth openssh ];
 
-  patchPhase = ''
+  postPatch = ''
     fontPath=
     for i in $fontDirectories; do
       for j in $(find $i -name fonts.dir); do
@@ -27,37 +26,38 @@ stdenv.mkDerivation {
     done
 
     sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h
-  '';
 
-  buildPhase = ''
-    xmkmf
-    make World
     sed -e 's@/usr/bin/perl@${perl}/bin/perl@' \
         -e 's@unix/:7100@'$fontPath'@' \
         -i vncserver
 
-    cd Xvnc
-    sed -e 's@.* CppCmd .*@#define CppCmd		'$gcc'/bin/cpp@' -i config/cf/linux.cf
-    sed -e 's@.* CppCmd .*@#define CppCmd		'$gcc'/bin/cpp@' -i config/cf/Imake.tmpl
+    sed -e 's@.* CppCmd .*@#define CppCmd		cpp@' -i Xvnc/config/cf/linux.cf
+    sed -e 's@.* CppCmd .*@#define CppCmd		cpp@' -i Xvnc/config/cf/Imake.tmpl
     sed -i \
         -e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \
         -e "s@\<xauth\>@${xauth}/bin/xauth@g" \
-        ../vncserver
-    ./configure
-    make
-    cd ..
+        vncserver
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
+    runHook preInstall
+
     ./vncinstall $out/bin $out/share/man
 
+    runHook postInstall
+  '';
+
+  postInstall = ''
     # fix HTTP client:
-    t=$out/share/tightvnc
-    mkdir -p $t
-    sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver
-    cp -r classes $t
+    mkdir -p $out/share/tightvnc
+    cp -r classes $out/share/tightvnc
+    substituteInPlace $out/bin/vncserver \
+      --replace /usr/local/vnc/classes $out/share/tightvnc/classes
   '';
 
   meta = {

From c0a804c747c6909c036da76472393b2fbd6413b9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 14:22:10 -0600
Subject: [PATCH 0340/2793] treewide: add dontUseImakeConfigure where needed

We need to set dontUseImakeConfigure in a few places to prevent imake
from overriding the default configure phase. This packages all have a
configure script that needs to get run:

- Xaw3d
- R
- tkgate
- ssvnc
---
 pkgs/applications/networking/remote/ssvnc/default.nix | 4 +++-
 pkgs/applications/science/electronics/tkgate/1.x.nix  | 4 +++-
 pkgs/applications/science/math/R/default.nix          | 2 ++
 pkgs/development/libraries/Xaw3d/default.nix          | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index f20bb740615..99835627f87 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
 
-  configurePhase = "makeFlags=PREFIX=$out";
+  dontUseImakeConfigure = true;
+
+  makeFlags = "PREFIX=$(out)";
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index aca1f9a3589..ab2b75917b9 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
   };
 
-  buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ];
+  nativeBuildInputs = [ which yacc flex imake gccmakedep ];
+  buildInputs = [ tcl tk libX11 xproto ];
+  dontUseImakeConfigure = true;
 
   patchPhase = ''
     sed -i config.h \
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 2fa8f3e5d7b..5cd6bbf4bdd 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
   };
 
+  dontUseImakeConfigure = true;
+
   buildInputs = [
     bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
     pango pcre perl readline texLive xz zlib less texinfo graphviz icu
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 0a7f02f17e5..3e496b7e981 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
     sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
   };
+  dontUseImakeConfigure = true;
   nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
   buildInputs = [ libXpm libXp ];
   propagatedBuildInputs = [ xlibsWrapper libXmu ];

From b7893a700daf186492a8ba0b3ee77856ae9fcbea Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 03:37:26 +0100
Subject: [PATCH 0341/2793] xorg.libXv: fix cross

---
 pkgs/servers/x11/xorg/overrides.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 46dcdcd9225..afcf2708ac0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -245,6 +245,8 @@ self: super:
 
   libXv = super.libXv.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "devdoc" ];
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
   });
 
   libXvMC = super.libXvMC.overrideAttrs (attrs: {

From 9111012f7f543bbe5ba06e92105da9c85d086fc4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 03:46:20 +0100
Subject: [PATCH 0342/2793] luaPackages.luasocket: fix cross

---
 pkgs/top-level/lua-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 8d141d7e7c6..8a93f5dff5b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -596,7 +596,7 @@ let
     };
 
     patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace src/makefile --replace gcc cc \
+      substituteInPlace src/makefile \
         --replace 10.3 10.5
     '';
 
@@ -604,6 +604,8 @@ let
       makeFlagsArray=(
         LUAV=${lua.luaversion}
         PLAT=${platformString}
+        CC=''${CC}
+        LD=''${CC}
         prefix=$out
       );
     '';

From adaffa3c0107f38753a32e31985ea7be04c5b8b7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 04:58:17 +0100
Subject: [PATCH 0343/2793] cups: fix cross

---
 pkgs/misc/cups/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 38ad73d0160..227886e126f 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -60,7 +60,9 @@ stdenv.mkDerivation rec {
     ++ optional (libpaper != null) "--enable-libpaper"
     ++ optional stdenv.isDarwin "--disable-launchd";
 
+  # AR has to be an absolute path
   preConfigure = ''
+    export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
     configureFlagsArray+=(
       # Put just lib/* and locale into $lib; this didn't work directly.
       # lib/cups is moved back to $out in postInstall.

From 36efeac21a63d82da055378c49adb8e01b4efe65 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 29 Nov 2018 03:51:06 +0100
Subject: [PATCH 0344/2793] beets: Add patch to fix Python 3.7 compatibility

Since 0f38d9669ffd74991b65a9c40cdbcf2a98438d1f, the default Python
version for Python 3 is now Python 3.7.

It has been a while since beets had a new release, but the fix for
Python 3.7 is already in master (and it's also rather small), so I
decided to cherry-pick the commit as a patch.

I've built the package along with its tests and they failed at first,
but the errors were unrelated. So I disabled the tests for pylint, as
they're failing right now.

In addition I also needed to temporarily revert
0d2f06ae3a1f8347dc09cd0dfe6d12b757368e4d, which supposedly should fix
issues with Python 2 but aparently breaks Python 3 support and during
the beets tests we get a ModuleNotFoundError for the "_gi_gst" module.

However I didn't further investigate why this happens, as I'm time
constrained right now. But after disabling the pylint tests and the
revert of the mentioned gst-python commit, the beets tests succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jtojnar, @lopsided98 (for introducing the gst-python change)
Cc: @domenkozar, @pjones (other beets maintainers)
---
 pkgs/tools/audio/beets/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 8f0cc6c4f5c..1cba381a57b 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins
 , pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
+, fetchpatch
 
 # Attributes needed for tests of the external plugins
 , callPackage, beets
@@ -155,6 +156,14 @@ in pythonPackages.buildPythonApplication rec {
   patches = [
     ./replaygain-default-bs1770gain.patch
     ./keyfinder-default-bin.patch
+
+    # Fix Python 3.7 compatibility
+    (fetchpatch {
+      url = "https://github.com/beetbox/beets/commit/"
+          + "15d44f02a391764da1ce1f239caef819f08beed8.patch";
+      sha256 = "12rjb4959nvnrm3fvvki7chxjkipa0cy8i0yi132xrcn8141dnpm";
+      excludes = [ "docs/changelog.rst" ];
+    })
   ];
 
   postPatch = ''

From 887ae75eb22e1929f406adf5bdba5e8d25453755 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 29 Nov 2018 04:53:39 +0100
Subject: [PATCH 0345/2793] beets-alternatives: 0.8.2 -> 0.9.0

This introduces the following upstream changes:

  * The package is now on PyPI
  * Require at least beets v1.4.7
  * Update album art in alternatives when it changes
  * Python 3 support (Python 2.7 continues to be supported)
  * Support the format aliases defined by the convert plugin ('wma' and
    'vorbis' with current beets)
  * Bugfix: Explicitly write tags after encoding instead of relying on
            the encoder to do so
  * Bugfix: If the formats config option is modified, don't move files
            if the extension would change, but re-encode

I updated this because I was pinged by @wisp3rwind about moving back to
@geigerzaehler's repository at [1].

This is what @wisp3rwind wrote in the comment[2] (which was originally
directed to @Profpatsch):

  (I hope you're the one to bug, or at least can ping someone else), I
  just noticed that you switched the NixOS package to my repository.
  Would you please switch it back to this repo soon-ish? The code here
  is better tested, and [3] is handled less elegantly on my fork since
  it requires changes to the configuration. The latter are undocumented,
  but whoever has bothered to take a look at the code might end up with
  (harmless) unused config entries.

So in essence we're now back to the original upstream repository again,
which I changed to @wisp3rwind's fork in 29e89248bfe74ca8d9d539c7ae441f
because it fixed issues with Python 3.

Stripping the long_description from setup.py also doesn't seem to be
required anymore, but I didn't investigate why (might be because either
our Python tooling now sets a default language or the README simply no
longer has non-ASCII characters).

[1]: https://github.com/geigerzaehler/beets-alternatives
[2]: https://github.com/geigerzaehler/beets-alternatives/issues/23
[3]: https://github.com/geigerzaehler/beets-alternatives/pull/27

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/audio/beets/alternatives-plugin.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index a3e7f9a63d6..04b6a7678e5 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -2,20 +2,16 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "beets-alternatives-${version}";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     repo = "beets-alternatives";
-    owner = "wisp3rwind";
+    owner = "geigerzaehler";
     # This is 0.8.2 with fixes against Beets 1.4.6 and Python 3 compatibility.
-    rev = "331eb406786a2d4dc3dd721a534225b087474b1e";
-    sha256 = "1avds2x5sp72c89l1j52pszprm85g9sm750jh1dhnyvgcbk91cb5";
+    rev = "v${version}";
+    sha256 = "19160gwg5j6asy8mc21g2kf87mx4zs9x2gbk8q4r6330z4kpl5pm";
   };
 
-  postPatch = ''
-    sed -i -e '/long_description/d' setup.py
-  '';
-
   nativeBuildInputs = [ beets pythonPackages.nose ];
 
   checkPhase = "nosetests";

From bef2a439576b38e69aed756fe8e43bd4f7869723 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 29 Nov 2018 05:04:41 +0100
Subject: [PATCH 0346/2793] beets-alternatives: Add myself as maintainer

I've introduced the plugin and have been maintaining it ever since, so
it's time to make myself the official maintainer in order to avoid
confusion about who to address when issues about the alternatives plugin
arise.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @wisp3rwind
---
 pkgs/tools/audio/beets/alternatives-plugin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 04b6a7678e5..38902f234a2 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -19,6 +19,7 @@ pythonPackages.buildPythonApplication rec {
   meta = {
     description = "Beets plugin to manage external files";
     homepage = https://github.com/geigerzaehler/beets-alternatives;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
     license = stdenv.lib.licenses.mit;
   };
 }

From bd676cf69777e706a804535d27e9940e99d5596f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Thu, 29 Nov 2018 05:14:32 +0100
Subject: [PATCH 0347/2793] slic3r-prusa3d: 1.41.1 -> 1.41.2

---
 pkgs/applications/misc/slic3r/prusa3d.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 2f5486a0f4b..251ee4d918b 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -33,7 +33,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.41.1";
+  version = "1.41.2";
 
   enableParallelBuilding = true;
 
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0crjrll8cjpkllval6abrqzvzp8g3rnb4vmwi5vivw0jvdv3w5y7";
+    sha256 = "046ircwc0wr586v7106ys557ypslmyq9p4qgi34ads1d6bgxhlyy";
     rev = "version_${version}";
   };
 

From b014cdd2928c37ad68149428a7d5b87962ea1c22 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 05:50:02 +0100
Subject: [PATCH 0348/2793] ssmtp: fix cross

---
 pkgs/tools/networking/ssmtp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index 24e96491f9d..4c906812f64 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation {
       sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
           -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
           -i Makefile
+      substituteInPlace Makefile \
+        --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
     '';
 
   installFlags = "etcdir=$(out)/etc";

From 34faed5bb06ee21c3c632299a9336d54ee7cb52a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 09:49:08 +0100
Subject: [PATCH 0349/2793] set-source-date-epoch-to-latest: fix warning

If there was no older file than $NIX_BUILD_TOP this would result in a
warning, e.g. with nix-info.

```
/nix/store/15kgcm8hnd99p7plqzx7p4lcr2jni4df-set-source-date-epoch-to-latest.sh: line 13: [: : integer expression expected
```
---
 .../setup-hooks/set-source-date-epoch-to-latest.sh              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index 84e40cd0514..ae34ffec485 100644
--- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -10,7 +10,7 @@ updateSourceDateEpoch() {
     local newestFile="${res[1]}"
 
     # Update $SOURCE_DATE_EPOCH if the most recent file we found is newer.
-    if [ "$time" -gt "$SOURCE_DATE_EPOCH" ]; then
+    if [ "${time:-0}" -gt "$SOURCE_DATE_EPOCH" ]; then
         echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile"
         export SOURCE_DATE_EPOCH="$time"
 

From 59c4f4883f4719f4f81597dc9a61f4c9bfbaea7f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 29 Nov 2018 09:23:13 +0000
Subject: [PATCH 0350/2793] tixati: 2.57 -> 2.58

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

diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 9f47f8464a1..13d44655df8 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tixati-${version}";
-  version = "2.57";
+  version = "2.58";
 
   src = fetchurl {
     url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
-    sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7";
+    sha256 = "077z5i0grkxkgw2npylv4r897434k2pr03brqx5hjpjw3797r141";
   };
 
   installPhase = ''

From 98a2a5b5370c1e2092d09cb38b9dcff6d98a109f Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Wed, 28 Nov 2018 00:16:59 +0300
Subject: [PATCH 0351/2793] fix jfsutils cross compilation

---
 pkgs/tools/filesystems/jfsutils/ar-fix.patch | 10 ++++++++++
 pkgs/tools/filesystems/jfsutils/default.nix  | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/filesystems/jfsutils/ar-fix.patch

diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/pkgs/tools/filesystems/jfsutils/ar-fix.patch
new file mode 100644
index 00000000000..697029cd5a8
--- /dev/null
+++ b/pkgs/tools/filesystems/jfsutils/ar-fix.patch
@@ -0,0 +1,10 @@
+--- jfsutils-1.1.15/configure.in.orig	2018-11-27 20:46:55.830242385 +0300
++++ jfsutils-1.1.15/configure.in	2018-11-27 20:47:00.596307630 +0300
+@@ -15,6 +15,7 @@
+ AC_PATH_PROG(LN, ln, ln)
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix
index acc7a91d93f..92dfe00c951 100644
--- a/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/pkgs/tools/filesystems/jfsutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libuuid }:
+{ stdenv, fetchurl, libuuid, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "jfsutils-1.1.15";
@@ -8,8 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4";
   };
 
-  patches = [ ./types.patch ./hardening-format.patch ];
+  patches = [
+    ./types.patch
+    ./hardening-format.patch
+    # required for cross-compilation
+    ./ar-fix.patch
+  ];
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libuuid ];
 
   meta = with stdenv.lib; {

From 216a95454042ed8bbd87207d59f101215dd15e73 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 26 Nov 2018 00:43:45 +0100
Subject: [PATCH 0352/2793] nixos/nextcloud: add basic module documentation and
 warn about current upgrading issues

Part of #49783. NextCloud tracks in its `config.php` the application's
state which makes it hard for the module to modify configurations during
upgrades.

It will take time until the issue is properly fixed, therefore we
decided to warn about this in the manual.

This PR addresses two things:

* Adding a basic example for nextcloud. I figured it to be helpful to
  add some basic usage instructions when adding a new manual entry.
  Advanced documentation may follow later.

  For now this document actively links to the service options, so users
  are guided to the remaining options that can be helpful in certain
  cases.

* Add a warning about upgrades and manual changes in
  `/var/lib/nextcloud`. This will be fixed in the future, but it's
  definetely helpful to document the current issues in the manual (as
  proposed in https://github.com/NixOS/nixpkgs/issues/49783#issuecomment-439691127).
---
 nixos/modules/services/web-apps/nextcloud.nix |  2 +
 nixos/modules/services/web-apps/nextcloud.xml | 99 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/nextcloud.xml

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d0efdf88d73..ecb1c5615d5 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -484,4 +484,6 @@ in {
       };
     })
   ]);
+
+  meta.doc = ./nextcloud.xml;
 }
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
new file mode 100644
index 00000000000..9600d1be7c8
--- /dev/null
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -0,0 +1,99 @@
+<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-nextcloud">
+ <title>Nextcloud</title>
+
+ <para>
+  <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source, self-hostable cloud
+  platform. The server setup can be automated using
+  <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A desktop client is packaged
+  at <literal>pkgs.nextcloud-client</literal>.
+ </para>
+
+ <section xml:id="module-services-nextcloud-basic-usage">
+  <title>Basic usage</title>
+  <para>
+   Nextcloud is a PHP-based application which requires an HTTP server
+   (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal> optionally supports
+   <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>) and a database
+   (it's recommended to use <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
+  </para>
+  <para>
+    A very basic configuration may look like this:
+<programlisting>{ pkgs, ... }:
+{
+  services.nextcloud = {
+    <link linkend="opt-services.nextcloud.enable">enable</link> = true;
+    <link linkend="opt-services.nextcloud.hostName">hostName</link> = "nextcloud.tld";
+    <link linkend="opt-services.nextcloud.nginx.enable">nginx.enable</link> = true;
+    config = {
+      <link linkend="opt-services.nextcloud.config.dbtype">dbtype</link> = "pgsql";
+      <link linkend="opt-services.nextcloud.config.dbuser">dbuser</link> = "nextcloud";
+      <link linkend="opt-services.nextcloud.config.dbhost">dbhost</link> = "/tmp"; # nextcloud will add /.s.PGSQL.5432 by itself
+      <link linkend="opt-services.nextcloud.config.dbname">dbname</link> = "nextcloud";
+      <link linkend="opt-services.nextcloud.config.adminpassFile">adminpassFile</link> = "/path/to/admin-pass-file";
+      <link linkend="opt-services.nextcloud.config.adminuser">adminuser</link> = "root";
+    };
+  };
+
+  services.postgresql = {
+    <link linkend="opt-services.postgresql.enable">enable</link> = true;
+    <link linkend="opt-services.postgresql.initialScript">initialScript</link> = pkgs.writeText "psql-init" ''
+      CREATE ROLE nextcloud WITH LOGIN;
+      CREATE DATABASE nextcloud WITH OWNER nextcloud;
+    '';
+  };
+
+  # ensure that postgres is running *before* running the setup
+  systemd.services."nextcloud-setup" = {
+    requires = ["postgresql.service"];
+    after = ["postgresql.service"];
+  };
+
+  <link linkend="opt-networking.firewall.allowedTCPPorts">networking.firewall.allowedTCPPorts</link> = [ 80 443 ];
+}</programlisting>
+  </para>
+  <para>
+   The options <literal>hostName</literal> and <literal>nginx.enable</literal> are used internally to configure an
+   HTTP server using <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal> and <literal>nginx</literal>.
+   The <literal>config</literal> attribute set is used for the <literal>config.php</literal> which is used
+   for the application's configuration.
+   <emphasis>Beware: this isn't entirely pure since the config is modified by the application's runtime!</emphasis>
+  </para>
+  <para>
+    In case the application serves multiple hosts (those are checked with
+    <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>)
+    those can be added using
+    <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
+  </para>
+ </section>
+
+ <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
+  <title>Pitfalls</title>
+  <para>
+   Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The
+   config file lives in the home directory of the <literal>nextcloud</literal> user (by default
+   <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to track several
+   states of the application (e.g. whether installed or not).
+  </para>
+  <para>
+   Right now changes to the <literal>services.nextcloud.config</literal> attribute set won't take effect
+   after the first install
+   (except <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>) since the actual configuration
+   file is generated by the NextCloud installer which also sets up critical parts such as the database
+   structure.
+  </para>
+  <para>
+   <emphasis>Warning: don't delete <literal>config.php</literal>! This file tracks the application's state and a deletion can cause unwanted side-effects!</emphasis>
+  </para>
+  <para>
+   <emphasis>Warning: don't rerun <literal>nextcloud-occ maintenance:install</literal>! This command tries to install the application and can cause unwanted side-effects!</emphasis>
+  </para>
+  <para>
+    The issues are known and reported in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/49783">#49783</link>, for now it's unfortunately necessary to manually work around these issues.
+  </para>
+ </section>
+
+</chapter>

From fc14aebab844277c4dee41a549431cac959cd1ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Nov 2018 03:12:41 -0800
Subject: [PATCH 0353/2793] libngspice: 28 -> 29

* libngspice: 28 -> 29 (#50685)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libngspice/versions

* libngspice: refresh meta.license

See:
https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
---
 pkgs/development/libraries/libngspice/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index 5a34910924c..87382bd1ae2 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-28";
+  name = "libngspice-29";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-28.tar.gz";
-    sha256 = "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l";
+    url = "mirror://sourceforge/ngspice/ngspice-29.tar.gz";
+    sha256 = "0jjwz73naq7l9yhwdqbpnrfckywp2ffkppivxjv8w92zq7xhyvcd";
   };
 
   nativeBuildInputs = [ flex bison ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = http://ngspice.sourceforge.net;
-    license = with licenses; [ "BSD" gpl2 ];
+    license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
     maintainers = with maintainers; [ bgamari ];
     platforms = platforms.linux;
   };

From 2fe089c870125f7d05342a560b0db159218191f8 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 14:52:21 +0300
Subject: [PATCH 0354/2793] pythonPackages.should-dsl: init at 2.1.2

---
 .../python-modules/should-dsl/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/should-dsl/default.nix

diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix
new file mode 100644
index 00000000000..987d7e60cea
--- /dev/null
+++ b/pkgs/development/python-modules/should-dsl/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "should-dsl";
+  version = "2.1.2";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "should_dsl";
+    sha256 = "0ai30dxgygwzaj9sgdzyfr9p5b7gwc9piq59nzr4xy5x1zcm7xrn";
+  };
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Should assertions in Python as clear and readable as possible";
+    homepage = http://www.should-dsl.info/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6cdde6f87e5..b8e7abc8f6a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3843,6 +3843,8 @@ in {
 
   simplegeneric = callPackage ../development/python-modules/simplegeneric { };
 
+  should-dsl = callPackage ../development/python-modules/should-dsl { };
+
   simplejson = callPackage ../development/python-modules/simplejson { };
 
   simplekml = callPackage ../development/python-modules/simplekml { };

From d91e61865b9279008878fff5b29e416fe3aa9f91 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 14:53:41 +0300
Subject: [PATCH 0355/2793] pythonPackages.nose-pattern-exclude: init at 0.1.3

---
 .../nose-pattern-exclude/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/nose-pattern-exclude/default.nix

diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix
new file mode 100644
index 00000000000..24d74b938af
--- /dev/null
+++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "nose-pattern-exclude";
+  version = "0.1.3";
+
+  propagatedBuildInputs = [ nose ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0apzxx8lavsdlxlpaxqw1snx5p7q8v5dfbip6v32f9pj2vyain1i";
+  };
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Exclude specific files and directories from nosetests runs";
+    homepage = https://github.com/jakubroztocil/nose-pattern-exclude;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8e7abc8f6a..15fe1f64ff6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3076,6 +3076,8 @@ in {
 
   nose-cprof = callPackage ../development/python-modules/nose-cprof { };
 
+  nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };
+
   nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };
 
   notebook = callPackage ../development/python-modules/notebook { };

From f5f7f1510dc1df14dc58d95fe77735e2fb9c6bb1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 14:54:12 +0300
Subject: [PATCH 0356/2793] pythonPackages.nose-of-yeti: init at 1.8

---
 .../python-modules/nose-of-yeti/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/nose-of-yeti/default.nix

diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix
new file mode 100644
index 00000000000..7a783da3117
--- /dev/null
+++ b/pkgs/development/python-modules/nose-of-yeti/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
+
+buildPythonPackage rec {
+  pname = "nose-of-yeti";
+  version = "1.8";
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ nose fudge should-dsl ];
+
+  # PyPI doesn't contain tests so let's use GitHub.
+  src = fetchFromGitHub {
+    owner = "delfick";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1pq9bf47k0csv41vdh2g6n336p3pd11q91hj5ypk0ls3nj756gbx";
+  };
+
+  checkPhase = ''
+    patchShebangs test.sh
+    ./test.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nose plugin providing BDD dsl for python";
+    homepage = https://github.com/delfick/nose-of-yeti;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15fe1f64ff6..699864f0f48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3076,6 +3076,8 @@ in {
 
   nose-cprof = callPackage ../development/python-modules/nose-cprof { };
 
+  nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };
+
   nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };
 
   nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };

From 0f81ac7737ba0de7a65fb3578942534544cab2c1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 14:55:19 +0300
Subject: [PATCH 0357/2793] pythonPackages.nose-focus: init at 0.1.3

---
 .../python-modules/nose-focus/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/nose-focus/default.nix

diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix
new file mode 100644
index 00000000000..ef86a35b304
--- /dev/null
+++ b/pkgs/development/python-modules/nose-focus/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
+, nose-pattern-exclude, which }:
+
+buildPythonPackage rec {
+  pname = "nose-focus";
+  version = "0.1.3";
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ nose nose-of-yeti nose-pattern-exclude which ];
+
+  # PyPI doesn't contain tests so let's use GitHub. See:
+  # https://github.com/delfick/nose-focus/issues/4
+  #
+  # However, the versions aren't tagged on GitHub so need to use a manually
+  # checked revision. See: https://github.com/delfick/nose-focus/issues/5
+  src = fetchFromGitHub {
+    owner = "delfick";
+    repo = pname;
+    rev = "4dac785ba07ed6e1df61b0fe2854685eef3bd115";
+    sha256 = "0gpd4j4433dc5ifh31w08c3bx862md0qm1ix6aam1rz4ayxpq51f";
+  };
+
+  checkPhase = ''
+    patchShebangs test.sh
+    ./test.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Decorator and plugin to make nose focus on specific tests";
+    homepage = https://nose-focus.readthedocs.io/en/latest/;
+    license = licenses.wtfpl;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 699864f0f48..771fd095a5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3066,6 +3066,8 @@ in {
 
   nose-exclude = callPackage ../development/python-modules/nose-exclude { };
 
+  nose-focus = callPackage ../development/python-modules/nose-focus { };
+
   nose2 = callPackage ../development/python-modules/nose2 { };
 
   nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };

From 5d2ac2cd0674987e416202464076d5af3af30418 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 15:00:51 +0300
Subject: [PATCH 0358/2793] pythonPackages.yanc: init at 0.3.3

---
 .../python-modules/yanc/default.nix           | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/yanc/default.nix

diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix
new file mode 100644
index 00000000000..690b110fc93
--- /dev/null
+++ b/pkgs/development/python-modules/yanc/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "yanc";
+  version = "0.3.3";
+
+  # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10
+  disabled = !(pythonOlder "3.5");
+
+  checkInputs = [ nose ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w";
+  };
+
+  checkPhase = ''
+    nosetests .
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Yet another nose colorer";
+    homepage = https://github.com/0compute/yanc;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 771fd095a5b..e3c8ddcab17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4849,6 +4849,8 @@ in {
 
   yamllint = callPackage ../development/python-modules/yamllint { };
 
+  yanc = callPackage ../development/python-modules/yanc { };
+
   yarl = callPackage ../development/python-modules/yarl { };
 
   suseapi = callPackage ../development/python-modules/suseapi { };

From 735abd8c4c054c98c90a634c2bc22f2734a4be2f Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 16:17:30 +0300
Subject: [PATCH 0359/2793] pythonPackages.pyres: init at 1.5

---
 .../python-modules/pyres/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyres/default.nix

diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix
new file mode 100644
index 00000000000..111e05066d6
--- /dev/null
+++ b/pkgs/development/python-modules/pyres/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+
+buildPythonPackage rec {
+  pname = "pyres";
+  version = "1.5";
+
+  # ps is used in Worker.worker_pids method
+  propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ];
+  checkInputs = [ nose pkgs.redis ];
+
+  # PyPI tarball doesn't contain tests so let's use GitHub
+  src = fetchFromGitHub {
+    owner = "binarydud";
+    repo = pname;
+    rev = version;
+    sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y";
+  };
+
+  checkPhase = ''
+    redis-server &
+    nosetests .
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python resque clone";
+    homepage = https://github.com/binarydud/pyres;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3c8ddcab17..3a270d971d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -585,6 +585,8 @@ in {
 
   pyparser = callPackage ../development/python-modules/pyparser { };
 
+  pyres = callPackage ../development/python-modules/pyres { };
+
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
     pythonPackages = self;
   };

From 866be59b208ea213b52b64773934cfbd0bb83460 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 16:36:18 +0300
Subject: [PATCH 0360/2793] pythonPackages.pyssim: init at 0.4

---
 .../python-modules/pyssim/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyssim/default.nix

diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
new file mode 100644
index 00000000000..38dddda9b2e
--- /dev/null
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }:
+
+buildPythonPackage rec {
+  pname = "pyssim";
+  version = "0.4";
+
+  propagatedBuildInputs = [ numpy scipy pillow ];
+
+  # PyPI tarball doesn't contain test images so let's use GitHub
+  src = fetchFromGitHub {
+    owner = "jterrace";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0rnj3xdhma1fc0fg0jjsdy74ar0hgr3w8kygbnijqjdms7m3asqm";
+  };
+
+  # Tests are copied from .travis.yml
+  checkPhase = ''
+    $out/bin/pyssim test-images/test1-1.png test-images/test1-1.png | grep 1
+    $out/bin/pyssim test-images/test1-1.png test-images/test1-2.png | grep 0.998
+    $out/bin/pyssim test-images/test1-1.png "test-images/*" | grep -E " 1| 0.998| 0.672| 0.648" | wc -l | grep 4
+    $out/bin/pyssim --cw --width 128 --height 128 test-images/test1-1.png test-images/test1-1.png | grep 1
+    $out/bin/pyssim --cw --width 128 --height 128 test-images/test3-orig.jpg test-images/test3-rot.jpg | grep 0.938
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Module for computing Structured Similarity Image Metric (SSIM) in Python";
+    homepage = https://github.com/jterrace/pyssim;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a270d971d3..4a2d2c4c429 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -611,6 +611,8 @@ in {
     slurm = pkgs.slurm;
   };
 
+  pyssim = callPackage ../development/python-modules/pyssim { };
+
   pystache = callPackage ../development/python-modules/pystache { };
 
   pytesseract = callPackage ../development/python-modules/pytesseract { };

From c6bd5294aa8d72a0cb76a414283e741150a169a3 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 19:04:03 +0300
Subject: [PATCH 0361/2793] pythonPackages.preggy: init at 1.4.2

---
 .../python-modules/preggy/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/preggy/default.nix

diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix
new file mode 100644
index 00000000000..b88366de88f
--- /dev/null
+++ b/pkgs/development/python-modules/preggy/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }:
+
+buildPythonPackage rec {
+  pname = "preggy";
+  version = "1.4.2";
+
+  propagatedBuildInputs = [ six unidecode ];
+  checkInputs = [ nose yanc ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g4ifjh01dkmdzs4621ahk8hpkngid1xxhl51jvzy4h4li4590hw";
+  };
+
+  checkPhase = ''
+    nosetests .
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Assertion library for Python";
+    homepage = http://heynemann.github.io/preggy/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a2d2c4c429..7def4851e7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4847,6 +4847,8 @@ in {
 
   packaging = callPackage ../development/python-modules/packaging { };
 
+  preggy = callPackage ../development/python-modules/preggy { };
+
   pytoml = callPackage ../development/python-modules/pytoml { };
 
   pypandoc = callPackage ../development/python-modules/pypandoc { };

From fd6e6dcfa1ede2a79559e309b4d01581a31fe691 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 16:17:05 +0300
Subject: [PATCH 0362/2793] pythonPackages.remotecv: init at 2.2.2

---
 .../python-modules/remotecv/default.nix       | 38 +++++++++++++++++++
 .../remotecv/install_requires.patch           | 16 ++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/remotecv/default.nix
 create mode 100644 pkgs/development/python-modules/remotecv/install_requires.patch

diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix
new file mode 100644
index 00000000000..2102cf06425
--- /dev/null
+++ b/pkgs/development/python-modules/remotecv/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, argparse, pyres, nose
+, preggy, numpy, yanc, nose-focus, mock, opencv }:
+
+buildPythonPackage rec {
+  pname = "remotecv";
+  version = "2.2.2";
+
+  propagatedBuildInputs = [ pillow argparse pyres ];
+
+  checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ];
+
+  # PyPI tarball doesn't contain tests so let's use GitHub
+  src = fetchFromGitHub {
+    owner = "thumbor";
+    repo = pname;
+    rev = version;
+    sha256 = "0slalp1x626ajy2cbdfifhxf0ffzckqdz6siqsqr6s03hrl877hy";
+  };
+
+  # Remove unnecessary argparse dependency and some seemingly unnecessary
+  # version upper bounds because nixpkgs contains (or could contain) newer
+  # versions.
+  # See: https://github.com/thumbor/remotecv/issues/15
+  patches = [
+    ./install_requires.patch
+  ];
+
+  checkPhase = ''
+    nosetests --with-yanc -s tests/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenCV worker for facial and feature recognition";
+    homepage = https://github.com/thumbor/remotecv/wiki;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/development/python-modules/remotecv/install_requires.patch b/pkgs/development/python-modules/remotecv/install_requires.patch
new file mode 100644
index 00000000000..37203128486
--- /dev/null
+++ b/pkgs/development/python-modules/remotecv/install_requires.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index 70f765c..8003cda 100644
+--- a/setup.py
++++ b/setup.py
+@@ -53,9 +53,8 @@ remotecv is an OpenCV worker for facial and feature recognition
+     },
+ 
+     install_requires=[
+-        "argparse>=1.2.1,<1.3.0",
+-        "pyres>=1.5,<1.6",
+-        "Pillow>=4.3.0,<5.2.0",
++        "pyres>=1.5",
++        "Pillow>=4.3.0",
+     ],
+ 
+     entry_points={
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7def4851e7a..b55c18734b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -658,6 +658,8 @@ in {
 
   relatorio = callPackage ../development/python-modules/relatorio { };
 
+  remotecv = callPackage ../development/python-modules/remotecv { };
+
   pyzufall = callPackage ../development/python-modules/pyzufall { };
 
   rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});

From cfaf696a7b5679c67682d8b8eddf73fd848e7187 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 28 Oct 2018 09:42:15 +0200
Subject: [PATCH 0363/2793] pythonPackages.cairosvg1: init at 1.0.22

---
 .../python-modules/cairosvg/1_x.nix           | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/cairosvg/1_x.nix

diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix
new file mode 100644
index 00000000000..b6d40a5fdb7
--- /dev/null
+++ b/pkgs/development/python-modules/cairosvg/1_x.nix
@@ -0,0 +1,37 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
+, cssselect2, defusedxml, pillow, tinycss2 }:
+
+# CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an
+# alternative
+buildPythonPackage rec {
+  pname = "CairoSVG";
+  version = "1.0.22";
+
+  # PyPI doesn't include tests so use GitHub
+  src = fetchFromGitHub {
+    owner = "Kozea";
+    repo = pname;
+    rev = version;
+    sha256 = "15z0cag5s79ghhrlgs5xc9ayvzzdr3v8151vf6k819f1drsfjfxl";
+  };
+
+  propagatedBuildInputs = [ cairocffi ];
+
+  checkInputs = [ nose fontconfig cssselect2 defusedxml pillow tinycss2 ];
+
+  # Almost all tests just fail. Not sure how to fix them.
+  doCheck = false;
+
+  # checkInputs = [ nose fontconfig cssselect2 defusedxml pillow tinycss2 ];
+
+  # checkPhase = ''
+  #   FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf nosetests .
+  # '';
+
+  meta = with stdenv.lib; {
+    homepage = https://cairosvg.org;
+    license = licenses.lgpl3;
+    description = "SVG converter based on Cairo";
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b55c18734b0..d1153e449b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1140,6 +1140,8 @@ in {
 
   cairocffi = callPackage ../development/python-modules/cairocffi {};
 
+  cairosvg1 = callPackage ../development/python-modules/cairosvg/1_x.nix {};
+
   cairosvg = callPackage ../development/python-modules/cairosvg {};
 
   carrot = callPackage ../development/python-modules/carrot {};

From 336f11c3b16a037aedd8b7201b794d7edc18a3ab Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 27 Oct 2018 16:17:52 +0300
Subject: [PATCH 0364/2793] pythonPackages.thumbor: run tests

---
 .../python-modules/thumbor/default.nix        | 56 +++++++++++++++----
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index ec33a5020d4..4ab443afbff 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,6 +1,8 @@
-{ buildPythonPackage, tornado, pycrypto, pycurl, pytz
-, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
-, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
+{ buildPythonPackage, python, tornado, pycrypto, pycurl, pytz
+, pillow, derpconf, python_magic, libthumbor, webcolors
+, piexif, futures, statsd, thumborPexif, fetchFromGitHub, isPy3k, lib
+, mock, raven, nose, yanc, remotecv, pyssim, cairosvg1, preggy, opencv3
+, pkgs, coreutils
 }:
 
 buildPythonPackage rec {
@@ -9,16 +11,38 @@ buildPythonPackage rec {
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1icfnzwzi5lvnh576n7v3r819jaw15ph9ja2w3fwg5z9qs40xvl8";
+  # Tests aren't included in PyPI tarball so use GitHub instead
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "1ys5ymwbvgh2ir85g9nyrzzf8vgi16j6pzzi53b0rgjx0kwlmnxg";
   };
 
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
+    substituteInPlace "tests/test_utils.py" \
+      --replace "/bin/ls" "${coreutils}/bin/ls"
+    substituteInPlace "tests/detectors/test_face_detector.py" \
+      --replace "./thumbor" "$out/lib/${python.libPrefix}/site-packages/thumbor"
+    substituteInPlace "tests/detectors/test_glasses_detector.py" \
+      --replace "./thumbor" "$out/lib/${python.libPrefix}/site-packages/thumbor"
   '';
 
+  checkInputs = [
+    nose
+    pyssim
+    preggy
+    mock
+    yanc
+    remotecv
+    cairosvg1
+    raven
+    pkgs.redis
+    pkgs.glibcLocales
+  ];
+
   propagatedBuildInputs = [
     tornado
     pycrypto
@@ -27,18 +51,26 @@ buildPythonPackage rec {
     pillow
     derpconf
     python_magic
-    pexif
     libthumbor
-    opencv
+    opencv3
     webcolors
     piexif
     statsd
+    pkgs.exiftool
+    pkgs.libjpeg
+    pkgs.ffmpeg
+    pkgs.gifsicle
   ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
 
-  # disabled due to too many impure tests and issues with native modules in
-  # the pure testing environment. See https://github.com/NixOS/nixpkgs/pull/37147
-  # for further reference.
-  doCheck = false;
+  # Remove the source tree before running nosetests because otherwise nosetests
+  # uses that instead of the installed package. Is there some other way to
+  # achieve this?
+  checkPhase = ''
+    redis-server --port 6668 --requirepass hey_you &
+    rm -r thumbor
+    export LC_ALL="en_US.UTF-8"
+    nosetests -v --with-yanc -s tests/
+  '';
 
   meta = with lib; {
     description = "A smart imaging service";

From 51f6d7f24465e7d894b349cb2b9c9139cfb6dd55 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 29 Oct 2018 10:41:53 +0200
Subject: [PATCH 0365/2793] pythonPackages.piexif: 1.0.13 -> 1.1.2

---
 .../development/python-modules/piexif/default.nix | 15 ++++-----------
 .../python-modules/thumbor/default.nix            |  2 ++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index b5460e8b608..0de96a3f585 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -2,22 +2,15 @@
 
 buildPythonPackage rec {
   pname = "piexif";
-  version = "1.0.13";
+  version = "1.1.2";
 
-  # pillow needed for unit tests
-  buildInputs = [ pillow ];
-
-  postPatch = ''
-    # incompatibility with pillow => 4.2.0
-    # has been resolved in https://github.com/hMatoba/Piexif/commit/c3a8272f5e6418f223b25f6486d8ddda201bbdf1
-    # remove this in the next version
-    sed -i -e 's/RGBA/RGB/' tests/s_test.py
-  '';
+  # Pillow needed for unit tests
+  checkInputs = [ pillow ];
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1d3dde03bd6298393645bc11d585b67a6ea98fd7e9e1aded6d5d6ec3e4cfbdda";
+    sha256 = "0dj6wiw4mk65zn7p0qpghra39mf88m3ph2xn7ff9jvasgczrgkb0";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 4ab443afbff..27e90514b72 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
+    substituteInPlace "setup.py" \
+      --replace "piexif>=1.0.13,<1.1.0" "piexif>=1.0.13"
     substituteInPlace "tests/test_utils.py" \
       --replace "/bin/ls" "${coreutils}/bin/ls"
     substituteInPlace "tests/detectors/test_face_detector.py" \

From e2a6e8b8ffe78d908a65c15a559f9d172b891c80 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 28 Nov 2018 16:25:56 +0100
Subject: [PATCH 0366/2793] pythonPackages.pyres: ensure that redis 2.10.6 is
 used

Upstream's requirements.txt wrongly suggests that redis==3.x is support
(missing upper-bound constraint), but the tests break due to API
incompatibilities.
---
 .../python-modules/pyres/default.nix          | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix
index 111e05066d6..2ea6043c427 100644
--- a/pkgs/development/python-modules/pyres/default.nix
+++ b/pkgs/development/python-modules/pyres/default.nix
@@ -1,11 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+
+let
+
+  # the requirements of `pyres` support Redis 3.x (due to a missing upper-bound),
+  # but it doesn't support Redis 3.x.
+  redis' = redis.overridePythonAttrs (old: rec {
+    pname = "redis";
+    version = "2.10.6";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
+    };
+  });
+
+in
 
 buildPythonPackage rec {
   pname = "pyres";
   version = "1.5";
 
   # ps is used in Worker.worker_pids method
-  propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ];
+  propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ];
   checkInputs = [ nose pkgs.redis ];
 
   # PyPI tarball doesn't contain tests so let's use GitHub

From 06f9b4769b3ee74cd74e915a457b9ce690e019d6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 12:51:31 +0100
Subject: [PATCH 0367/2793] fribidi: fix cross

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

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 08b0a87e3e2..b60f4be245e 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 
 , meson
 , ninja
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
     sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/fribidi/fribidi/pull/88.patch";
+      sha256 = "1n4l6333vhbxfckwg101flmvq6bbygg66fjp69ddcjqaqb6gh9k9";
+    })
+  ];
+
   postPatch = ''
     patchShebangs test
   '';

From 694b4d29e1d0e4c86d497da437a3eed90910a7db Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Nov 2018 13:06:12 +0100
Subject: [PATCH 0368/2793] ilmbase: fix cross

---
 .../development/libraries/ilmbase/cross.patch | 35 +++++++++++++++++++
 .../development/libraries/ilmbase/default.nix |  7 ++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/ilmbase/cross.patch

diff --git a/pkgs/development/libraries/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch
new file mode 100644
index 00000000000..207a440a0d8
--- /dev/null
+++ b/pkgs/development/libraries/ilmbase/cross.patch
@@ -0,0 +1,35 @@
+From: Helmut Grohne <>
+Subject: compile build tools with the build architecture compiler
+
+Patch-Source: https://github.com/openexr/openexr/issues/221
+
+Index: ilmbase-2.2.0/configure.ac
+===================================================================
+--- ilmbase-2.2.0.orig/configure.ac
++++ ilmbase-2.2.0/configure.ac
+@@ -28,6 +28,7 @@
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
++AX_PROG_CXX_FOR_BUILD
+ 
+ dnl
+ dnl PKGCONFIG preparations
+Index: ilmbase-2.2.0/Half/Makefile.am
+===================================================================
+--- ilmbase-2.2.0.orig/Half/Makefile.am
++++ ilmbase-2.2.0/Half/Makefile.am
+@@ -17,9 +17,11 @@
+ 
+ CLEANFILES = eLut eLut.h toFloat toFloat.h
+ 
+-eLut_SOURCES = eLut.cpp
++eLut$(EXEEXT): eLut.cpp
++	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@
+ 
+-toFloat_SOURCES = toFloat.cpp
++toFloat$(EXEEXT): toFloat.cpp
++	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@
+ 
+ eLut.h:	eLut
+ 	./eLut > eLut.h
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 3989e941b6b..98370f52e18 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
 
 stdenv.mkDerivation rec {
   name = "ilmbase-${version}";
@@ -16,11 +16,12 @@ stdenv.mkDerivation rec {
     ./bootstrap
   '';
 
-  buildInputs = [ automake autoconf libtool which ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ automake autoconf libtool which ];
 
   NIX_CFLAGS_LINK = [ "-pthread" ];
 
-  patches = [ ./bootstrap.patch ];
+  patches = [ ./bootstrap.patch ./cross.patch ];
 
   # fails 1 out of 1 tests with
   # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"

From f222ebdd605256cc4ec76542dd4fe40b6f72df03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 29 Nov 2018 11:13:13 +0000
Subject: [PATCH 0369/2793] fusionio-vsl: remove

Broken on all kernel version.
No update in nixpkgs since 2015
---
 pkgs/os-specific/linux/fusionio/srcs.nix      | 22 ---------
 pkgs/os-specific/linux/fusionio/util.nix      | 45 -------------------
 .../linux/fusionio/vsl-fix-file-inode.patch   | 13 ------
 pkgs/os-specific/linux/fusionio/vsl.nix       | 39 ----------------
 pkgs/top-level/all-packages.nix               |  4 --
 5 files changed, 123 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/fusionio/srcs.nix
 delete mode 100644 pkgs/os-specific/linux/fusionio/util.nix
 delete mode 100644 pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
 delete mode 100644 pkgs/os-specific/linux/fusionio/vsl.nix

diff --git a/pkgs/os-specific/linux/fusionio/srcs.nix b/pkgs/os-specific/linux/fusionio/srcs.nix
deleted file mode 100644
index fb632a6e9fb..00000000000
--- a/pkgs/os-specific/linux/fusionio/srcs.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchurl }:
-rec {
-  version = "3.2.10";
-
-  libvsl = fetchurl {
-    name = "fusionio-libvsl-${version}.deb";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk";
-    sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk";
-  };
-
-  util = fetchurl {
-    name = "fusionio-util-${version}.deb";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs";
-    sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq";
-  };
-
-  vsl = fetchurl {
-    name = "fusionio-iomemory-vsl-${version}.tar.gz";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM";
-    sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc";
-  };
-}
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
deleted file mode 100644
index 6327a95f39d..00000000000
--- a/pkgs/os-specific/linux/fusionio/util.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }:
-
-let
-  srcs = import ./srcs.nix { inherit fetchurl; };
-in
-stdenv.mkDerivation {
-  name = "fusionio-util-${srcs.version}";
-
-  nativeBuildInputs = [ dpkg ];
-
-  buildCommand = ''
-    dpkg-deb -R ${srcs.libvsl} $TMPDIR
-    dpkg-deb -R ${srcs.util} $TMPDIR
-
-    rm $TMPDIR/usr/bin/fio-{bugreport,sanitize}
-
-    mkdir -p $out
-    cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
-    for BIN in $(find $out/bin -type f); do
-      echo Patching $BIN
-      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${stdenv.lib.makeLibraryPath [ glibc gcc.cc libuuid ] }:$out/lib" $BIN
-
-      # Test our binary to see if it was correctly patched
-      set +e
-      $BIN --help >/dev/null 2>&1
-      ST="$?"
-      set -e
-      if [ "$ST" -ge "10" ]; then
-        echo "Failed testing $BIN"
-        exit 1;
-      fi
-    done
-  '';
-
-  dontStrip = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://fusionio.com;
-    description = "Fusionio command line utilities";
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    broken = stdenv.hostPlatform.system != "x86_64-linux";
-    maintainers = with maintainers; [ wkennington ];
-  };
-}
diff --git a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
deleted file mode 100644
index 25887ceee0f..00000000000
--- a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kfile.c b/kfile.c
-index 5014e77..a65d921 100644
---- a/kfile.c
-+++ b/kfile.c
-@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp)
- #if KFIOC_STRUCT_FILE_HAS_PATH
-     return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode;
- #else
--    return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode;
-+    return (fusion_inode *) file_inode((struct file *)fp);
- #endif
- }
- 
diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix
deleted file mode 100644
index 6ebe2e0cdaf..00000000000
--- a/pkgs/os-specific/linux/fusionio/vsl.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, kernel }:
-
-let
-  srcs = import ./srcs.nix { inherit fetchurl; };
-in
-stdenv.mkDerivation rec {
-  name = "fusionio-iomemory-vsl-${srcs.version}";
-
-  src = srcs.vsl;
-
-  hardeningDisable = [ "pic" ];
-
-  prePatch = ''
-    cd root/usr/src/iomemory-vsl-*
-  '';
-
-  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch;
-
-  preBuild = ''
-    sed -i Makefile kfio_config.sh \
-      -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g"
-    export DKMS_KERNEL_VERSION=${kernel.modDirVersion}
-    export TARGET="x86_64_cc48"
-  '';
-
-  installPhase = ''
-    export INSTALL_ROOT=$out
-    make modules_install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://fusionio.com;
-    description = "Kernel driver for accessing fusion-io cards";
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    broken = stdenv.hostPlatform.system != "x86_64-linux";
-    maintainers = with maintainers; [ wkennington ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b188f985e46..d31d2b6125c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14201,8 +14201,6 @@ with pkgs;
   fuse3 = fusePackages.fuse_3;
   fuse-common = hiPrio fusePackages.fuse_3.common;
 
-  fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { };
-
   fxload = callPackage ../os-specific/linux/fxload { };
 
   gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
@@ -14485,8 +14483,6 @@ with pkgs;
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
 
-    fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { };
-
     lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { };

From e82d79b6794790e925407c658c947ba1eafb828b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Nov 2018 00:52:18 -0600
Subject: [PATCH 0370/2793] libapparmor: drop conflicting patch, fix build
 w/musl

---
 pkgs/os-specific/linux/apparmor/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index e632be905fd..851520a93be 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -37,11 +37,6 @@ let
   '';
 
   patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-    (fetchpatch {
-      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
-      name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
-      sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac";
-    })
     (fetchpatch {
       url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
       name = "0003-Added-missing-typedef-definitions-on-parser.patch";

From 432a2e0354475ee43b77cb3669b1e45a657ba015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 29 Nov 2018 14:53:25 +0000
Subject: [PATCH 0371/2793] inferno: remove

Also there have been updates, this package was not updated since 2015 in the repository
I therefore conclude that nobody actually uses this.
Official webpage was also not updated since then.
---
 pkgs/applications/inferno/default.nix | 58 ---------------------------
 pkgs/applications/inferno/inferno     | 31 --------------
 pkgs/top-level/all-packages.nix       |  2 -
 3 files changed, 91 deletions(-)
 delete mode 100644 pkgs/applications/inferno/default.nix
 delete mode 100755 pkgs/applications/inferno/inferno

diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
deleted file mode 100644
index de9be76b6e4..00000000000
--- a/pkgs/applications/inferno/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ fetchhg, stdenv, xorg, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  # Inferno is a rolling release from a mercurial repository. For the verison number
-  # of the package I'm using the mercurial commit number.
-  rev = "785";
-  name = "inferno-${rev}";
-  host = "Linux";
-  objtype = "386";
-
-  src = fetchhg {
-    url    = "https://bitbucket.org/inferno-os/inferno-os";
-    sha256 = "1b428ma9fi5skvfrxp91dr43a62kax89wmx7950ahc1cxyx90k7x";
-  };
-
-  buildInputs = [ makeWrapper ] ++ (with xorg; [ libX11 libXpm libXext xextproto ]);
-
-  infernoWrapper = ./inferno;
-
-  configurePhase = ''
-    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' \
-        -e 's@^OBJTYPE=.*$@OBJTYPE=${objtype}@g' \
-        -e 's@^SYSHOST=.*$@SYSHOST=${host}@g' \
-        -i mkconfig
-    # Get rid of an annoying warning
-    sed -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' \
-        -i ${host}/${objtype}/include/lib9.h
-  '';
-
-  buildPhase = ''
-    mkdir -p $out/share/inferno
-    cp -r . $out/share/inferno
-    ./makemk.sh
-    export PATH=$PATH:$out/share/inferno/Linux/386/bin
-    mk nuke
-    mk
-  '';
-
-  installPhase = ''
-    # Installs executables in $out/share/inferno/${host}/${objtype}/bin
-    mk install
-    mkdir -p $out/bin
-    # Install start-up script
-    makeWrapper $infernoWrapper $out/bin/inferno \
-      --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
-      --set INFERNO_ROOT "$out/share/inferno"
-  '';
-
-  hardeningDisable = [ "fortify" ];
-
-  meta = {
-    description = "A compact distributed operating system for building cross-platform distributed systems";
-    homepage = http://inferno-os.org/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/inferno/inferno b/pkgs/applications/inferno/inferno
deleted file mode 100755
index 6eb6da8861a..00000000000
--- a/pkgs/applications/inferno/inferno
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env bash
-
-
-export INFERNO_HOME="$HOME/.local/share/inferno"
-if [ -n "$XDG_DATA_HOME" ]
-  then export INFERNO_HOME="$XDG_DATA_HOME/inferno"
-fi
-
-if [ ! -d $INFERNO_HOME ]; then
-  mkdir -p $INFERNO_HOME
-fi
-
-if [ ! -d $INFERNO_HOME/tmp ]; then
-  mkdir -p $INFERNO_HOME/tmp
-fi
-
-for d in $INFERNO_HOME/{acme,appl,dis,lib,man,module,usr/inferno}; do
-  if [ ! -d $d ]; then
-    mkdir -p $d
-    cp --no-preserve=all -r $INFERNO_ROOT/${d#$INFERNO_HOME/}/* $d/
-    chmod -R +w $d
-  fi
-done
-
-if [ ! -d $INFERNO_HOME/usr/$USER ]; then
-  mkdir -p $INFERNO_HOME/usr/$USER
-  cp -r $INFERNO_ROOT/usr/inferno/* $INFERNO_HOME/usr/$USER/
-  chmod -R +w $INFERNO_HOME/usr/$USER
-fi
-
-exec emu "$@" /dis/sh.dis -c "bind -b -c '#U*$INFERNO_HOME/' /; /dis/sh.dis"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d31d2b6125c..6e290571fc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17503,8 +17503,6 @@ with pkgs;
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 
-  inferno = pkgsi686Linux.callPackage ../applications/inferno { };
-
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
     poppler = poppler_0_61;

From 6854b50c06709042b5e4eab1e3552e83e5ced301 Mon Sep 17 00:00:00 2001
From: Stig <stig@stig.io>
Date: Thu, 29 Nov 2018 16:10:37 +0100
Subject: [PATCH 0372/2793] perlPackages.Imager: init at 1.006

* perlPackages.Imager: init at 1.006 (#50620)
---
 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 e8c407d23fa..4bcc7f4d32c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7462,6 +7462,21 @@ let
     };
   };
 
+  Imager = buildPerlPackage rec {
+    name = "Imager-1.006";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz";
+      sha256 = "c1e434a4de6250e3b229aa74aa653e56c38f981864f71a975366c50559c9d52b";
+    };
+    buildInputs = [ ExtUtilsPkgConfig pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
+    makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";
+    meta = {
+      homepage = http://imager.perl.org/;
+      description = "Perl extension for Generating 24 bit Images";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ImageInfo = buildPerlPackage rec {
     name = "Image-Info-1.41";
     src = fetchurl {

From 7c6189d5494b406f2af05e75a5e2a6bb6d7dae96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 29 Nov 2018 16:16:47 +0000
Subject: [PATCH 0373/2793] libosip_3: remove

Old package from 2015, that has no users in nixpkgs
---
 pkgs/development/libraries/osip/3.nix | 17 -----------------
 pkgs/top-level/all-packages.nix       |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/osip/3.nix

diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix
deleted file mode 100644
index b485fa3e947..00000000000
--- a/pkgs/development/libraries/osip/3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
-  version = "3.6.0";
-  src = fetchurl {
-    url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
-  };
-  name = "libosip2-${version}";
-
-  meta = {
-    license = stdenv.lib.licenses.lgpl21Plus;
-    homepage = http://www.gnu.org/software/osip/;
-    description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d31d2b6125c..9b4ff0242da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11097,8 +11097,6 @@ with pkgs;
 
   libosip = callPackage ../development/libraries/osip {};
 
-  libosip_3 = callPackage ../development/libraries/osip/3.nix {};
-
   libosmium = callPackage ../development/libraries/libosmium { };
 
   libosmocore = callPackage ../applications/misc/libosmocore { };

From 7e8cc555282885d3bfb561b3f8809819a15d0a03 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 27 Nov 2018 21:19:49 +0200
Subject: [PATCH 0374/2793] rustup: 1.13.0 -> 1.15.0

---
 pkgs/development/tools/rust/rustup/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index fd6dbc7aeaa..7647478b7f4 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "1.13.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
-    owner = "rust-lang-nursery";
+    owner = "rust-lang";
     repo = "rustup.rs";
     rev = version;
-    sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
+    sha256 = "12d8z53vixrrbhvadw8fgifik0xi3hyfj1s75my8lcqwmij91gkn";
   };
 
-  cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
+  cargoSha256 = "0syp53s285ixshp6yswly0mwkcl0y2ddj5hc110irqsrvwgss32r";
 
   nativeBuildInputs = [ pkgconfig ];
 

From ce3de16e8d575223acd48296fa33ec105df1aae9 Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Thu, 29 Nov 2018 19:57:36 +0300
Subject: [PATCH 0375/2793] fix perl DBI package, missing \t in Makefile

---
 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 569494d39b6..4895873ecec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4109,7 +4109,7 @@ let
       \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi
 
       \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h
-        \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi
+      ''\t\$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi
 
       # ---
       ';

From ca11db894f2a8c91a950d9ec326c3977770b766c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 14:12:02 +0200
Subject: [PATCH 0376/2793] python2.pkgs.gst-python: fix build

---
 .../development/python-modules/gst-python/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 8cbc08dbbfd..96da9bcf4f6 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -28,6 +28,17 @@ in buildPythonPackage rec {
       url = https://bugzilla.gnome.org/attachment.cgi?id=371989;
       sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08";
     })
+    # Fixes `from gi.repository import Gst` when gst-python's site-package is in
+    # PYTHONPATH
+    (fetchurl {
+      url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff;
+      sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r";
+    })
+    # Fixes python2 build from the above changes
+    (fetchurl {
+      url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff;
+      sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1";
+    })
   ];
 
   # TODO: First python_dep in meson.build needs to be removed

From 8f90b3324019890974fdb4d205bc1f6e73bf2a5f Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Thu, 29 Nov 2018 17:18:23 +0000
Subject: [PATCH 0377/2793] buildMaven: Support metadata-only dependencies

The circumstances which can make this necessary are discussed in NixOS/mvn2nix-maven-plugin#17
---
 pkgs/build-support/build-maven.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index b9da06c43c8..f47e3ebc61c 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -15,16 +15,15 @@ infoFile: let
 
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let
-      inherit (dep)
-        url sha1 groupId artifactId
-        version metadata repository-id;
+      inherit (dep) sha1 groupId artifactId version metadata repository-id;
 
       versionDir = dep.unresolved-version or version;
       authenticated = dep.authenticated or false;
+      url = dep.url or "";
 
-      fetch = (if authenticated then requireFile else fetchurl) {
+      fetch = if (url != "") then ((if authenticated then requireFile else fetchurl) {
         inherit url sha1;
-      };
+      }) else "";
 
       fetchMetadata = (if authenticated then requireFile else fetchurl) {
         inherit (metadata) url sha1;
@@ -32,10 +31,15 @@ infoFile: let
     in ''
       dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir}
       mkdir -p $dir
-      ln -sv ${fetch} $dir/${fetch.name}
+
+      ${lib.optionalString (fetch != "") ''
+        ln -sv ${fetch} $dir/${fetch.name}
+      ''}
       ${lib.optionalString (dep ? metadata) ''
         ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml
-        ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|')
+        ${lib.optionalString (fetch != "") ''
+          ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|')
+        ''}
       ''}
     '') info.dependencies)}
   '';

From cfb184f2cb81e32639564597a0bf820a6595900e Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Wed, 28 Nov 2018 00:13:19 +0300
Subject: [PATCH 0378/2793] fix reiserfsprogs cross compilation

---
 pkgs/tools/filesystems/reiserfsprogs/default.nix       |  4 +++-
 .../reiserfsprogs/reiserfsprogs-ar-fix.patch           | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch

diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index e23dd5f0bd1..345974bed58 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libuuid }:
+{ stdenv, fetchurl, libuuid, autoreconfHook }:
 
 let version = "3.6.24"; in
 stdenv.mkDerivation rec {
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
   };
 
+  patches = [ ./reiserfsprogs-ar-fix.patch ];
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libuuid ];
 
   NIX_CFLAGS_COMPILE = "-std=gnu90";
diff --git a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
new file mode 100644
index 00000000000..356782a3d98
--- /dev/null
+++ b/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
@@ -0,0 +1,10 @@
+--- reiserfsprogs-3.6.24/configure.ac.orig	2018-11-29 17:16:52.313624894 +0300
++++ reiserfsprogs-3.6.24/configure.ac	2018-11-29 17:16:54.480669132 +0300
+@@ -21,6 +21,7 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for libraries.
+ 

From 5ce63222433aa922a4d96921dd6f6c7f169b11ff Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 29 Nov 2018 20:30:38 +0200
Subject: [PATCH 0379/2793] qbittorrent: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 673ece2cb72..532efa68f9a 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1hpcn1x4z3vdjscw035d18vqhfs7c6yv002akgmbgdf9jl3vfrsl";
+    sha256 = "1hclyahgzj775h1fnv2rck9cw3r2yp2r6p1q263mj890n32gf3hp";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported

From 79e15430b0a64c23d6a6247df974256d04de60c5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Nov 2018 20:36:44 +0100
Subject: [PATCH 0380/2793] androidStudioPackages.{dev,canary}: 3.4.0.4 ->
 3.4.0.5

---
 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 b849f1fa62d..de7e3977ad8 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.4"; # "Android Studio 3.4 Canary 5"
-    build = "183.5141831";
-    sha256Hash = "0xfk5vyjk3pdb44jp43vb5394486z2qgzrdhjzbf1ncbhvaf0aji";
+    version = "3.4.0.5"; # "Android Studio 3.4 Canary 6"
+    build = "183.5146016";
+    sha256Hash = "1z2asimpsw15iild7c4aqicph6v327qx3ffjgvl2n8vr5rspsns1";
   };
 in rec {
   # Old alias

From c90a45a3832ac4ea7f265016710f19522df1b109 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 29 Nov 2018 12:49:40 -0600
Subject: [PATCH 0381/2793] cockroachdb: 2.0.0 -> 2.1.1, aarch64 support

This also splits the .bin output to have a separate .man attribute:
previously it contained both.

This also adds provisional support for aarch64-linux, which seems to
build easily. (Full testing will ideally come via NixOS tests later)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/cockroachdb/default.nix | 44 +++++++++++++++++-------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index aba997d75f1..6f4b10759e3 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6, libedit }:
+{ stdenv, buildGoPackage, fetchurl
+, cmake, xz, which, autoconf
+, ncurses6, libedit, libunwind
+}:
 
+let
+  darwinDeps = [ libunwind libedit ];
+  linuxDeps  = [ ncurses6 ];
+
+  buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps;
+  nativeBuildInputs = [ cmake xz which autoconf ];
+
+in
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "2.0.0";
+  version = "2.1.1";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy";
+    sha256 = "1z34zlwznh4lgbc1ryn577w7mmycyjbmz28k1hhhb6ricmk1x847";
   };
 
-  buildInputs = [ (if stdenv.isDarwin then libedit else ncurses6) ];
-  nativeBuildInputs = [ cmake xz which autoconf ];
+  inherit nativeBuildInputs buildInputs;
 
   buildPhase = ''
     runHook preBuild
@@ -21,24 +31,34 @@ buildGoPackage rec {
     make buildoss
     cd src/${goPackagePath}
     for asset in man autocomplete; do
-      ./cockroach gen $asset
+      ./cockroachoss gen $asset
     done
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-    install -D cockroach $bin/bin/cockroach
+
+    install -D cockroachoss $bin/bin/cockroach
     install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash
-    cp -r man $bin/share/man
+
+    mkdir -p $man/share/man
+    cp -r man $man/share/man
+
     runHook postInstall
   '';
 
+  # Unfortunately we have to keep an empty reference to $out, because it seems
+  # buildGoPackages only nukes references to the go compiler under $bin, effectively
+  # making all binary output under $bin mandatory. Ideally, we would just use
+  # $out and $man and remove $bin since there's no point in an empty path. :(
+  outputs = [ "bin" "man" "out" ];
+
   meta = with stdenv.lib; {
-    homepage = https://www.cockroachlabs.com;
+    homepage    = https://www.cockroachlabs.com;
     description = "A scalable, survivable, strongly-consistent SQL database";
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
-    maintainers = [ maintainers.rushmorem ];
+    license     = licenses.asl20;
+    platforms   = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ rushmorem thoughtpolice ];
   };
 }

From f190b5f2264fd7d340039dceb51ee2f95748a491 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:44:29 +0100
Subject: [PATCH 0382/2793] iptables: 1.6.2 -> 1.8.2

+ enabled BPF compiler by default since it is the future

Changelog 1.8.0:
https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.0.txt

Changelog 1.8.1:
https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.1.txt

Changelog 1.8.2:
https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.2.txt
---
 pkgs/os-specific/linux/iptables/default.nix   | 35 +++++++++++++++----
 .../iptables/netinet-headers-collision.patch  | 11 ++++++
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/iptables/netinet-headers-collision.patch

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 84493421481..8f98391021f 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,18 +1,38 @@
-{ stdenv, fetchurl, bison, flex, pkgconfig
-, libnetfilter_conntrack, libnftnl, libmnl }:
+{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig
+, libnetfilter_conntrack, libnftnl, libmnl, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.6.2";
+  version = "1.8.2";
 
   src = fetchurl {
     url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m";
+    sha256 = "1bqj9hf3szy9r0w14iy23w00ir8448nfhpcprbwmcchsxm88nxx3";
   };
 
+  patches = [
+    # Adds missing bits to extensions' libipt_icmp.c and libip6t_icmp6.c that were causing build to fail
+    (fetchpatch {
+      url = "https://git.netfilter.org/iptables/patch/?id=907e429d7548157016cd51aba4adc5d0c7d9f816";
+      sha256 = "0vc7ljcglz5152lc3jx4p44vjfi6ipvxdrgkdb5dmkhlb5v93i2h";
+    })
+    # Build with musl libc fails because of conflicting struct ethhdr definitions
+    (fetchpatch {
+      url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f";
+      sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266";
+    })
+    # extensions: libip6t_mh: fix bogus translation error
+    (fetchpatch {
+      url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3";
+      sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf";
+    })
+    # Prevent headers collisions between linux and netfilter (in.h and in6.h)
+    (./netinet-headers-collision.patch)
+  ];
+
   nativeBuildInputs = [ bison flex pkgconfig ];
 
-  buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];
+  buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ];
 
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
@@ -21,17 +41,18 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-devel"
     "--enable-shared"
+    "--enable-bpf-compiler"
   ];
 
   outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
     description = "A program to configure the Linux IP packet filtering ruleset";
-    homepage = http://www.netfilter.org/projects/iptables/index.html;
+    homepage = https://www.netfilter.org/projects/iptables/index.html;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];
     license = licenses.gpl2;
-    downloadPage = "http://www.netfilter.org/projects/iptables/files/";
+    downloadPage = "https://www.netfilter.org/projects/iptables/files/";
     updateWalker = true;
     inherit version;
   };
diff --git a/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch b/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch
new file mode 100644
index 00000000000..940ffa0c29c
--- /dev/null
+++ b/pkgs/os-specific/linux/iptables/netinet-headers-collision.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,9 @@
+ 
+ #include <linux/types.h>
+ 
++#ifndef _NETINET_IN_H
+ #include <linux/in.h>
+ #include <linux/in6.h>
++#endif
+ #include <limits.h>

From db2cebbe7724e0c2eee91b6e03e06a2b5809e709 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 17:22:02 -0500
Subject: [PATCH 0383/2793] pythonPackages.pywbem: 0.10.0 -> 0.12.6

---
 .../python-modules/pywbem/default.nix         |  77 +--
 .../make_cimdatetime_timezone_aware.patch     | 491 ------------------
 pkgs/top-level/python-packages.nix            |   3 +-
 3 files changed, 43 insertions(+), 528 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch

diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index 159e0ce15fb..90a415060eb 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,50 +1,57 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
-, m2crypto, ply, pyyaml, six
-, httpretty, lxml, mock, pytest, requests
+{ lib, buildPythonPackage, fetchPypi, libxml2
+, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37, python
+, httpretty, lxml, mock, pytest, requests, decorator, unittest2
 }:
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "0.10.0";
+  version = "0.12.6";
 
-  src = fetchFromGitHub {
-    owner  = "pywbem";
-    repo   = "pywbem";
-    rev    = "v${version}";
-    sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
+  # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
+  disabled = isPy37;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dc6b745rrys600n05apdf6lb2vv5arlcwv7aiz9whgkbcd9qhki";
   };
 
-  patches = [
-    # fix timezone handling so the tests pass again. Can go when 0.10.1 is released
-    # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681
-    ./make_cimdatetime_timezone_aware.patch
+  propagatedBuildInputs = [
+    mock
+    pbr
+    ply
+    pyyaml
+    six
+  ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ];
+
+  checkInputs = [
+    decorator
+    httpretty
+    libxml2
+    lxml
+    pytest
+    requests
+    unittest2
   ];
 
-  propagatedBuildInputs = [ m2crypto ply pyyaml six ];
+  postPatch = ''
+    # Uses deprecated library yamlordereddictloader
+    rm testsuite/test_client.py
 
-  checkInputs = [ httpretty lxml mock pytest requests ];
-
-  # 1 test fails because it doesn't like running in our sandbox. Deleting the
-  # whole file is admittedly a little heavy-handed but at least the vast
-  # majority of tests are run.
-  checkPhase = ''
-    rm testsuite/testclient/networkerror.yaml
-
-    substituteInPlace makefile \
-      --replace "PYTHONPATH=." "" \
-      --replace '--cov $(package_name) --cov-config coveragerc' ""
-
-    for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
-      substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
-    done
-
-    make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
+    # Wants `wbemcli` in PATH
+    rm testsuite/test_wbemcli.py
+    
+    # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
+    rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
   '';
 
-  meta = with stdenv.lib; {
-    description = "Support for the WBEM standard for systems management.";
-    homepage = http://pywbem.github.io/pywbem/;
-    license = licenses.gpl2;
+  checkPhase = ''
+    pytest testsuite/
+  '';
+
+  meta = with lib; {
+    description = "Support for the WBEM standard for systems management";
+    homepage = https://pywbem.github.io;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
deleted file mode 100644
index 55fb9bbb12d..00000000000
--- a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
+++ /dev/null
@@ -1,491 +0,0 @@
-From bb7fa19d636d999bf844d80939e155b8f212ef3e Mon Sep 17 00:00:00 2001
-From: Andreas Maier <maiera@de.ibm.com>
-Date: Fri, 23 Jun 2017 19:13:51 +0200
-Subject: [PATCH] Made CIMDateTime always timezone-aware, re-enabled
- test_cim_types.py
-
-Details:
-- Ensured that 'CIMDateTime' objects for point in time values are
-  timezone-aware when supplied with a timezone-naive 'datetime'
-  object. This does not change the behavior, but increases code
-  clarity.
-- Clarified that in the documentation of 'CIMDateTime'.
-- Added testcases for CIMDateTime.
-- Re-enabled the testing of test_cim_types.py. Since its change
-  to using pytest it was not run because the test methods were
-  all static methods which apparently does not work. Not sure
-  this ever worked.
-
-Signed-off-by: Andreas Maier <maiera@de.ibm.com>
----
- docs/changes.rst            |   5 +
- pywbem/cim_types.py         |  22 +--
- testsuite/test_cim_types.py | 369 +++++++++++++++++++++++---------------------
- 3 files changed, 207 insertions(+), 189 deletions(-)
-
-diff --git a/docs/changes.rst b/docs/changes.rst
-index 272ed30d..6fdfbcf4 100644
---- a/docs/changes.rst
-+++ b/docs/changes.rst
-@@ -72,6 +72,11 @@ Enhancements
-
- * Added unit test for recorder. See issue #676
-
-+* Ensured that `CIMDateTime` objects for point in time values are
-+  timezone-aware when supplied with a timezone-naive `datetime` object.
-+  This does not change the behavior, but increases code clarity.
-+  Clarified that in the documentation of  `CIMDateTime`. See issue #698.
-+
- Bug fixes
- ^^^^^^^^^
-
-diff --git a/pywbem/cim_types.py b/pywbem/cim_types.py
-index 6d1f140c..5ecc7707 100644
---- a/pywbem/cim_types.py
-+++ b/pywbem/cim_types.py
-@@ -74,6 +74,7 @@
- import re
- import warnings
- import six
-+import copy
-
- from . import config
-
-@@ -294,9 +295,11 @@ def __init__(self, dtarg):
-             * A :term:`string` object will be
-               interpreted as CIM datetime format (see :term:`DSP0004`) and
-               will result in a point in time or a time interval.
--            * A :class:`py:datetime.datetime` object must be timezone-aware
--              (see :class:`~pywbem.MinutesFromUTC`) and will result in a point
--              in time.
-+            * A :class:`py:datetime.datetime` object will result in a point
-+              in time. If the :class:`py:datetime.datetime` object is
-+              timezone-aware (see :class:`~pywbem.MinutesFromUTC`), the
-+              specified timezone will be used. Otherwise, a default timezone
-+              of UTC will be assumed.
-             * A :class:`py:datetime.timedelta` object will result in a time
-               interval.
-             * Another :class:`~pywbem.CIMDateTime` object will be copied.
-@@ -342,14 +345,15 @@ def __init__(self, dtarg):
-                     raise ValueError('dtarg argument "%s" has an invalid CIM '
-                                      'datetime format' % dtarg)
-         elif isinstance(dtarg, datetime):
--            self.__datetime = dtarg
-+            if dtarg.tzinfo is None:
-+                self.__datetime = dtarg.replace(tzinfo=MinutesFromUTC(0))
-+            else:
-+                self.__datetime = copy.copy(dtarg)
-         elif isinstance(dtarg, timedelta):
--            self.__timedelta = dtarg
-+            self.__timedelta = copy.copy(dtarg)
-         elif isinstance(dtarg, CIMDateTime):
--            # pylint: disable=protected-access
--            self.__datetime = dtarg.__datetime
--            # pylint: disable=protected-access
--            self.__timedelta = dtarg.__timedelta
-+            self.__datetime = copy.copy(dtarg.datetime)
-+            self.__timedelta = copy.copy(dtarg.timedelta)
-         else:
-             raise TypeError('dtarg argument "%s" has an invalid type: %s '
-                             '(expected datetime, timedelta, string, or '
-diff --git a/testsuite/test_cim_types.py b/testsuite/test_cim_types.py
-index 4ae354d3..b1f54d06 100755
---- a/testsuite/test_cim_types.py
-+++ b/testsuite/test_cim_types.py
-@@ -43,105 +43,99 @@ def integer_tuple(request):
-     return request.param
-
-
--class TestIntegers:
--    """
--    Test CIM integer data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class(integer_tuple):
--        """Test class attrs via class level"""
--        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
--        assert obj_type.cimtype == exp_cimtype
--        assert obj_type.minvalue == exp_minvalue
--        assert obj_type.maxvalue == exp_maxvalue
--
--    @staticmethod
--    def test_class_attrs_inst(integer_tuple):
--        """Test class attrs via instance level"""
--        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
--        obj = obj_type(42)
--        assert obj.cimtype == exp_cimtype
--        assert obj.minvalue == exp_minvalue
--        assert obj.maxvalue == exp_maxvalue
--
--    @staticmethod
--    def test_inheritance(integer_tuple):
--        """Test inheritance"""
--        obj_type = integer_tuple[0]
--        obj = obj_type(42)
--        assert isinstance(obj, obj_type)
--        assert isinstance(obj, CIMType)
--        assert isinstance(obj, CIMInt)
--        assert not isinstance(obj, CIMFloat)
--
--    @staticmethod
--    def test_init_int(integer_tuple):
--        """Test initialization from integer value"""
--        obj_type = integer_tuple[0]
--        obj = obj_type(42)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str(integer_tuple):
--        """Test initialization from string value"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('42')
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str_base10(integer_tuple):
--        """Test initialization from string value with base 10"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('42', 10)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str_base16(integer_tuple):
--        """Test initialization from string value with base 16"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('2A', 16)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_minimum(integer_tuple):
--        """Test initialization from integer value at minimum"""
--        obj_type = integer_tuple[0]
--        exp_minvalue = integer_tuple[2]
--        obj = obj_type(exp_minvalue)
--        assert obj == exp_minvalue
--
--    @staticmethod
--    def test_init_maximum(integer_tuple):
--        """Test initialization from integer value at maximum"""
--        obj_type = integer_tuple[0]
--        exp_maxvalue = integer_tuple[3]
--        obj = obj_type(exp_maxvalue)
--        assert obj == exp_maxvalue
--
--    @staticmethod
--    def test_init_too_low(integer_tuple):
--        """Test initialization from integer value below minimum"""
--        obj_type = integer_tuple[0]
--        exp_minvalue = integer_tuple[2]
--        try:
--            obj_type(exp_minvalue - 1)
--        except ValueError:
--            pass
--        else:
--            raise AssertionError("ValueError was not raised.")
--
--    @staticmethod
--    def test_init_too_high(integer_tuple):
--        """Test initialization from integer value above maximum"""
--        obj_type = integer_tuple[0]
--        exp_maxvalue = integer_tuple[3]
--        try:
--            obj_type(exp_maxvalue + 1)
--        except ValueError:
--            pass
--        else:
--            raise AssertionError("ValueError was not raised.")
-+def test_integer_class_attrs_class(integer_tuple):
-+    """Test class attrs via class level"""
-+    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
-+    assert obj_type.cimtype == exp_cimtype
-+    assert obj_type.minvalue == exp_minvalue
-+    assert obj_type.maxvalue == exp_maxvalue
-+
-+
-+def test_integer_class_attrs_inst(integer_tuple):
-+    """Test class attrs via instance level"""
-+    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
-+    obj = obj_type(42)
-+    assert obj.cimtype == exp_cimtype
-+    assert obj.minvalue == exp_minvalue
-+    assert obj.maxvalue == exp_maxvalue
-+
-+
-+def test_integer_inheritance(integer_tuple):
-+    """Test inheritance"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type(42)
-+    assert isinstance(obj, obj_type)
-+    assert isinstance(obj, CIMType)
-+    assert isinstance(obj, CIMInt)
-+    assert not isinstance(obj, CIMFloat)
-+
-+
-+def test_integer_init_int(integer_tuple):
-+    """Test initialization from integer value"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type(42)
-+    assert obj == 42
-+
-+
-+def test_integer_init_str(integer_tuple):
-+    """Test initialization from string value"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('42')
-+    assert obj == 42
-+
-+
-+def test_integer_init_str_base10(integer_tuple):
-+    """Test initialization from string value with base 10"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('42', 10)
-+    assert obj == 42
-+
-+
-+def test_integer_init_str_base16(integer_tuple):
-+    """Test initialization from string value with base 16"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('2A', 16)
-+    assert obj == 42
-+
-+
-+def test_integer_init_minimum(integer_tuple):
-+    """Test initialization from integer value at minimum"""
-+    obj_type = integer_tuple[0]
-+    exp_minvalue = integer_tuple[2]
-+    obj = obj_type(exp_minvalue)
-+    assert obj == exp_minvalue
-+
-+
-+def test_integer_init_maximum(integer_tuple):
-+    """Test initialization from integer value at maximum"""
-+    obj_type = integer_tuple[0]
-+    exp_maxvalue = integer_tuple[3]
-+    obj = obj_type(exp_maxvalue)
-+    assert obj == exp_maxvalue
-+
-+
-+def test_integer_init_too_low(integer_tuple):
-+    """Test initialization from integer value below minimum"""
-+    obj_type = integer_tuple[0]
-+    exp_minvalue = integer_tuple[2]
-+    try:
-+        obj_type(exp_minvalue - 1)
-+    except ValueError:
-+        pass
-+    else:
-+        raise AssertionError("ValueError was not raised.")
-+
-+
-+def test_integer_init_too_high(integer_tuple):
-+    """Test initialization from integer value above maximum"""
-+    obj_type = integer_tuple[0]
-+    exp_maxvalue = integer_tuple[3]
-+    try:
-+        obj_type(exp_maxvalue + 1)
-+    except ValueError:
-+        pass
-+    else:
-+        raise AssertionError("ValueError was not raised.")
-
-
- #
-@@ -164,47 +158,41 @@ def real_tuple(request):
-     return request.param
-
-
--class TestReals:
--    """
--    Test CIM real data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class(real_tuple):
--        """Test class attrs via class level"""
--        obj_type, exp_cimtype = real_tuple
--        assert obj_type.cimtype == exp_cimtype
--
--    @staticmethod
--    def test_class_attrs_inst(real_tuple):
--        """Test class attrs via instance level"""
--        obj_type, exp_cimtype = real_tuple
--        obj = obj_type(42)
--        assert obj.cimtype == exp_cimtype
--
--    @staticmethod
--    def test_inheritance(real_tuple):
--        """Test inheritance"""
--        obj_type = real_tuple[0]
--        obj = obj_type(42)
--        assert isinstance(obj, obj_type)
--        assert isinstance(obj, CIMType)
--        assert isinstance(obj, CIMFloat)
--        assert not isinstance(obj, CIMInt)
--
--    @staticmethod
--    def test_init_float(real_tuple):
--        """Test initialization from floating point value"""
--        obj_type = real_tuple[0]
--        obj = obj_type(42.0)
--        assert obj == 42.0
--
--    @staticmethod
--    def test_init_str(real_tuple):
--        """Test initialization from string value"""
--        obj_type = real_tuple[0]
--        obj = obj_type('42.0')
--        assert obj == 42.0
-+def test_real_class_attrs_class(real_tuple):
-+    """Test class attrs via class level"""
-+    obj_type, exp_cimtype = real_tuple
-+    assert obj_type.cimtype == exp_cimtype
-+
-+
-+def test_real_class_attrs_inst(real_tuple):
-+    """Test class attrs via instance level"""
-+    obj_type, exp_cimtype = real_tuple
-+    obj = obj_type(42)
-+    assert obj.cimtype == exp_cimtype
-+
-+
-+def test_real_inheritance(real_tuple):
-+    """Test inheritance"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type(42)
-+    assert isinstance(obj, obj_type)
-+    assert isinstance(obj, CIMType)
-+    assert isinstance(obj, CIMFloat)
-+    assert not isinstance(obj, CIMInt)
-+
-+
-+def test_real_init_float(real_tuple):
-+    """Test initialization from floating point value"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type(42.0)
-+    assert obj == 42.0
-+
-+
-+def test_real_init_str(real_tuple):
-+    """Test initialization from string value"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type('42.0')
-+    assert obj == 42.0
-
-
- #
-@@ -271,6 +259,26 @@ def test_init_str(real_tuple):
-         '20140924193040.654321+120'
-     ),
-     (
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        'timestamp',
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        None,
-+        0,
-+        '20140924193040.654321+000'
-+    ),
-+    (
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321),
-+        'timestamp',
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        None,
-+        0,
-+        '20140924193040.654321+000'
-+    ),
-+    (
-         '20140924193040.654321+120',
-         'timestamp',
-         datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-@@ -325,46 +333,47 @@ def datetime_init_tuple(request):
-     return request.param
-
-
--class TestDatetime:
--    """
--    Test CIM real data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class():
--        """Test class attrs via class level"""
--        assert CIMDateTime.cimtype == 'datetime'
--
--    @staticmethod
--    def test_class_attrs_inst():
--        """Test class attrs via instance level"""
--        obj = CIMDateTime('00000000000000.000000:000')
--        assert obj.cimtype == 'datetime'
--
--    @staticmethod
--    def test_inheritance():
--        """Test inheritance"""
--        obj = CIMDateTime('00000000000000.000000:000')
--        assert isinstance(obj, CIMDateTime)
--        assert isinstance(obj, CIMType)
--        assert not isinstance(obj, CIMFloat)
--        assert not isinstance(obj, CIMInt)
--
--    @staticmethod
--    def test_init(datetime_init_tuple):
--        """Test initialization from all input types"""
--        (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
--         exp_str) = datetime_init_tuple
--        try:
--            obj = CIMDateTime(dtarg)
--        except Exception as exc:
--            assert isinstance(exc, exp_kind)
--        else:
--            assert obj.is_interval == (exp_kind == 'interval')
--            assert obj.datetime == exp_datetime
--            assert obj.timedelta == exp_timedelta
--            assert obj.minutes_from_utc == exp_minutesfromutc
--            assert str(obj) == exp_str
-+def test_datetime_class_attrs_class():
-+    """Test class attrs via class level"""
-+    assert CIMDateTime.cimtype == 'datetime'
-+
-+
-+def test_datetime_class_attrs_inst():
-+    """Test class attrs via instance level"""
-+    obj = CIMDateTime('00000000000000.000000:000')
-+    assert obj.cimtype == 'datetime'
-+
-+
-+def test_datetime_inheritance():
-+    """Test inheritance"""
-+    obj = CIMDateTime('00000000000000.000000:000')
-+    assert isinstance(obj, CIMDateTime)
-+    assert isinstance(obj, CIMType)
-+    assert not isinstance(obj, CIMFloat)
-+    assert not isinstance(obj, CIMInt)
-+
-+
-+def test_datetime_init(datetime_init_tuple):
-+    """Test initialization from all input types"""
-+    (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
-+     exp_str) = datetime_init_tuple
-+    try:
-+        obj = CIMDateTime(dtarg)
-+    except Exception as exc:
-+        assert isinstance(exc, exp_kind)
-+    else:
-+        assert obj.is_interval == (exp_kind == 'interval')
-+        assert obj.datetime == exp_datetime
-+        if obj.datetime is not None:
-+            assert isinstance(obj.datetime, datetime)
-+            # We ensure that the datetime is always timezone-aware:
-+            assert obj.datetime.tzinfo is not None
-+        assert obj.timedelta == exp_timedelta
-+        if obj.timedelta is not None:
-+            assert isinstance(obj.timedelta, timedelta)
-+        assert obj.minutes_from_utc == exp_minutesfromutc
-+        assert str(obj) == exp_str
-+
-
- # TODO: Add testcases for get_local_utcoffset()
- # TODO: Add testcases for now()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f17e501e9de..1812dcad769 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4842,8 +4842,7 @@ in {
   ROPGadget = callPackage ../development/python-modules/ROPGadget { };
 
   # We need "normal" libxml2 and not the python package by the same name.
-  pywbem = disabledIf isPy36
-    (callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; });
+  pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
 
   unicorn = callPackage ../development/python-modules/unicorn { };
 

From 99512af9f5337e09f1bd9d88bc7ffe16c6affc00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 27 Nov 2018 15:25:01 +0100
Subject: [PATCH 0384/2793] balsa: use gtkspell3 instead of enchant

The build fails with enchant-1.6.1 and enchant2. use gtkspell instead.
---
 pkgs/applications/networking/mailreaders/balsa/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 571a4895147..8d9a685b444 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
-  webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
+  webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
   libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
   hicolor-icon-theme, wrapGAppsHook
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     webkitgtk
     openssl
     libnotify
-    enchant
+    gtkspell3
     gpgme
     libcanberra-gtk3
     gtksourceview
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     "--with-ssl"
     "--with-unique"
     "--without-gnome"
+    "--with-spell-checker=gtkspell"
   ];
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

From fe6a9a37b99a89288db055ddda1916ec83ec0d31 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 29 Nov 2018 23:47:26 +0100
Subject: [PATCH 0385/2793] brave: version is just 0.56.15

---
 pkgs/applications/networking/browsers/brave/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ed524b331dd..f167980f0bf 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -74,7 +74,6 @@ let rpath = lib.makeLibraryPath [
 
 in stdenv.mkDerivation rec {
     pname = "brave";
-    version = "0.56.12";
     version = "0.56.15";
 
     src = fetchurl {

From 70f5d64cb359a8e4351a32f24d68b8a8e0227b76 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 29 Nov 2018 23:48:08 +0100
Subject: [PATCH 0386/2793] brave: version is just 0.56.15

---
 pkgs/applications/networking/browsers/brave/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ed524b331dd..f167980f0bf 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -74,7 +74,6 @@ let rpath = lib.makeLibraryPath [
 
 in stdenv.mkDerivation rec {
     pname = "brave";
-    version = "0.56.12";
     version = "0.56.15";
 
     src = fetchurl {

From b5504e26b0558382115e4b241cdcad3349ae22b0 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Thu, 29 Nov 2018 16:45:57 -0500
Subject: [PATCH 0387/2793] pkgs/stdenv/generic/make-derivation.nix:
 s/targetPlatform/hostPlatform/

---
 pkgs/stdenv/generic/make-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 6c0c94487de..67c7c5eae53 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -93,7 +93,7 @@ rec {
                                       ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
       runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
       supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
-      defaultHardeningFlags = if stdenv.targetPlatform.isMusl
+      defaultHardeningFlags = if stdenv.hostPlatform.isMusl
                               then supportedHardeningFlags
                               else lib.remove "pie" supportedHardeningFlags;
       enabledHardeningOptions =

From 3f90f52b07518f1b068a254424aae479df63eae5 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Fri, 30 Nov 2018 02:01:05 +0300
Subject: [PATCH 0388/2793] boohu: 0.11 -> 0.11.1 (#51248)

---
 pkgs/games/boohu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index ccfdf8d905c..2504e6935ab 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
 
   name = "boohu-${version}";
-  version = "0.11.0";
+  version = "0.11.1";
 
   goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
-    sha256 = "1qc3mz1mj6byyslmx1afprg1l7x8rcy7i004sy32g590jaahwqdr";
+    sha256 = "0m0ajxiyx8qwxj2zq33s5qpjr65cr33f7dpirg6b4w4y9gyhhv1g";
   };
 
   buildFlags = "--tags ansi";

From d37976c508a52567dc0392eb563cfd9c372f44d7 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Nov 2018 09:12:45 +0900
Subject: [PATCH 0389/2793] thunderbird-bin: 60.3.0 -> 60.3.2

---
 .../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 2c6c74974cf..7cd3ad47c00 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.3.1";
+  version = "60.3.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ar/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ar/thunderbird-60.3.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "57b092a02666d2ca2d2b13b04bc00114b7e14b8b23b82f0af53f0d53485a8db117eea3408affcebff6431133bf337f07ecc111cdd8c5f50b4a93594ad07c0a29";
+      sha512 = "c051155472deab805e0e689d45ab82a952aecd19f91b2373cdfab3925a6b9fdebcd9a147c06e6ff491e1d1374cb03e2091220187801ab7f07f9d787c4fc4c269";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ast/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ast/thunderbird-60.3.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a0635e9006beec03cc5a6fb298cfc1f4bfce342bb537f1834d02f452e82285ac5853ea520c1275140ea812c742fcf19d5f6e662b7eba58bcf7e80d796236ca39";
+      sha512 = "099d5a43e4e037f33f9ae4f89c1958d9e7016cc5f5673eed74d3c37bde6590fc2e47bb832784561bcf9c4ed53decbde51372a83019e3c72bf09745b95aeaf74a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/be/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/be/thunderbird-60.3.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f2860e9508278895198d87b54ac2984d961221fa0bac20dba505d01d762ea7041127323c67cd2288d2372f37d82e0870c6a832ff4113fe914927a377e22ced99";
+      sha512 = "7e55877c3f75d9907e5cca8f7f423edc79d1bb072f96acf227fffe37375528dd5c40bf8b3d39151ac79ff510ad3e50f1940ea4df32a6cbb32a0afb085640aaba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/bg/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/bg/thunderbird-60.3.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1d0070daf743b1c9e2b0a3471ff4f8bfd992279a422bb58daf6b7f96a6238adf654bfdf74d8414e758af2f033703a73cb0e1f71c0c72e0b7e61e62b6180ea185";
+      sha512 = "6230c26a960e962db8a0c4f8302df3ae471aa6b663bd7819da1b3ccd1b2f6db1fa207936502f7b8cf2eb47032efca7e6d0e1275223007758588df290ba9a9ac8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/br/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/br/thunderbird-60.3.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f2bb792417855409c993a2d2e9ae627b800ef3dfc7a78fd82f3af400c2c4c964757662659a32b039e20e0330b7f16b502d011a104798c2dcc47235a8c561b9a3";
+      sha512 = "8005b6b605d8a863a4b2b312a0126ffcd09a25072d11731eaab9f096f5e0b22e4fc8142d86d39505c48b6f73f96cf2d6ac4c2158d148338cbfa8c587b238063a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ca/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ca/thunderbird-60.3.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e5ae4dbe02b38042ed64f399ea531203fd04d6358b70ddb2c67d29ccea45019a4226ea1719692ea48120c30af240d4d5470e4f64f09239dbfff2607569ad9bb7";
+      sha512 = "98be5d8e71110d4de311e15c448b71cceec37fce5b50b689ecdad0322c093a7e7d96caab9919a83b48af784bf4da7269274125cd5d351870dcb775c0453237ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/cs/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cs/thunderbird-60.3.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b0f1440db8a329103f873a57988bc6fa66e36336752b7c215a952079f77182d91c6fdacc7815f74c18a4fe7c8a648e7aaf58cbb2fdabfda5b76daac81a602559";
+      sha512 = "35863fc6513dec41b256150a7a9c3bb9e45cc72ae869da422b8550986148c8de0de14d985a5bba50af030263c0480a709d2a9755aac73b7e60e40939db7f9f31";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/cy/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cy/thunderbird-60.3.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "191f2113ffce94d1ebff5619aa84caea262f424217bf17882189f40f772704aa07ce4ac232292742493d1b1be564558907a418c0104be656ec1441bcaee7ebe0";
+      sha512 = "3e3813449095eea1c7715d98d9198c63001b46b1aae463c6cfa1622b3808659d8a71d3cbac4264fa0fdb6264c1de738a2c79503b0629e062e949616ba0208f7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/da/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/da/thunderbird-60.3.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "54611a769b3f06860a3d61519b992dc5e4605b13d8d7069031155a23b590230c003dde720dbaf161f6dee87d96df057f01d55e195ec34bb4fb55f1423b166ee2";
+      sha512 = "dc51279ead50553ef8e8345635925b45dd8be63fdd99e3aa1499d2cc2996d084931c00b7b942935d00914c78f56b8bef13a7545d6bbf47a51a16ab26a30132cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/de/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/de/thunderbird-60.3.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d1ea83e5402e68a93800491e091daf7bd9951be2de8e3c4e786061c57fe850cdd12bba4a35a24e4df44432a2124dc3b8c5732271a9a1c71f7fe2deebbfe94d88";
+      sha512 = "117a1c2a930c8c5a3c5a96dd6e28e7e167fb6cbe06f607211aeb1af427b47bc3b75d0431ea38ddf3812f5899d690f9c7a6dc8341c124249836bd0ab0da3147c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/dsb/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/dsb/thunderbird-60.3.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "5f1d459902e2ed9eb6cfa10a0ea05068bda0eb3146e5bb9b20ca2c93d85521ff465d596e9348421dda839ebd0e55c480e277ae66ba10236533f9aba7c3c317cb";
+      sha512 = "a717e0d4e57b354c4eb331f01de97267d0616fdf9a47dc8e51acadc4966ee21323a97c59b902e2b315079174acfb896c658cb07ee62f6f04959116961837d92f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/el/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/el/thunderbird-60.3.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5f1702a2b78373f0cb408363621bbfaa377f1ca38eb17bc6dfbac582115a795c2d22220725378f67b49f8f7554a37a5af5f0a18f7584e54c7f62128fba3dec33";
+      sha512 = "4e4d0df91c563cf21c83617529751cfe26ddd6d0c3952fffd5ef03d40d622da9dc84e1dc861239cbfb345d87a99e2fbe0afe4fd7975bb589201bef8d70da092e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/en-GB/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-GB/thunderbird-60.3.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "754d330a04178aa68c15c6212a04dcd5547af820f82b55d7d36910b5c85fc3d28310fe24864dcf7e4ab21838589350a752dc220c9409307ea6059d3e9adc02f3";
+      sha512 = "6a7c42efe472950daa603462de76b57bfcf97810e4c4a2fa38f07aeff8a6729939ddd35b7348deab357c723c6a20b71d25da3e2fa05502ebac1d74fb9c6498c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/en-US/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-US/thunderbird-60.3.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3f8dd135299243996182ab9b8f38e5f7d6d486468b1afbeb52d481d8ad943cb9fec899cd56002ecb5f55f7b22e3184c4a5d114f55734b8e39debbe4ac4060b68";
+      sha512 = "6c549e9cb1a4de1f73b26332c933cb96da841f75afc54511e3d6ed459b3f1439e7febe72337e8b24d825a8fa82b1b1520248c8551bfd8446812abedd3df516b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/es-AR/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-AR/thunderbird-60.3.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "cbe6bbd993f84e583b3d399ac45626384969d6823ef21da84034f3bb3b26b1f86e4ba65a1bee73438ca75d8aeb9f61a75f1b8747b23f1ed5059796d7ec14adac";
+      sha512 = "4465e400726d550d06fd36e8baf3c96445123f2b8c78c1d5c701d9175038878d52e304adb1cd5a6fee3be274605448916a8512b9fbda452852aaf63c8aeca242";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/es-ES/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-ES/thunderbird-60.3.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "3c7c4b4cd9cfc2d867ed895adbcef4e1af487b5fe6bad6c5931ce055f2fa656de9b51d1008cfa9a342f7b8360ee6d39529d4e81dc773721157bd42841cde2d95";
+      sha512 = "4629ac510525f6af9f287bad685f696f130607eaab020bfec8bb46c2b816b7b8a3df1d0cf45e98446e13b8d219add30b751935ba5d08d5fd426da9346f9292de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/et/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/et/thunderbird-60.3.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ba2b2a7970a87d41c85aa5fea1cebed55755356fed7a82a08b0945e6311b410df25511e4886e6c066f43b31774fbd35fc65c10b155bab2aac5eb1918cdec8e3c";
+      sha512 = "fbb8b9e90ab0e3160e8b48ad788ec31ebc2c82b2839f64deb2d28c2377debb666bd94a7b081748f11d9eaa10af026693a25d9ac121754d8e2c333330984f97cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/eu/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/eu/thunderbird-60.3.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "3398a2c1a2fed97b8e17822d7b6048af686b67f91d2b096f1e0d58dc5d29c2eac60aed39b62b80788634c3996adb0bcb93cb07e5bfe7eb2d2a88e58e1cdfe8fb";
+      sha512 = "8c2e3da06c2ce5768e23d2a0e29e186d31be925c9fd2e7479978ee8a190113d753c80ca059126b1d28bc828f732c517ba6f28647402be5284948fbe7939ea98a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fi/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fi/thunderbird-60.3.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e7be730f994829e55a51754b569b8148cfc871fbf6dc28962f3d23400ed68105d813ead1612974f5f27148a57bfe099e4fd63ed4111eb877485314111fc046ea";
+      sha512 = "05c7516c48e1574055ef56575e7c7f0315bf307dddee786758b5c49fc8acb41462fad1064fb1255d4b8c2f714da7ebd6070d4d5248c6078bfc587457b51b0f2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fr/thunderbird-60.3.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "710a1da3b50dd50d01f29685c6bbb6a39849a5d0daf1c98c2722c5f823b501b9679f53ed72a0335143582e10d01605d57e474936278063254f01f41cc211d92d";
+      sha512 = "5a11368521eeff68cacf8ed353b12d9d17f134871739e0c1d25a6103e4c8b917b19179978940075905e5dbac51cc13ff8bdae6185222ceb6eaa5fdd3dfab16ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/fy-NL/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fy-NL/thunderbird-60.3.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "dd08b6a9e99b2f639139bd8b2f83406229dc8470a66381bd625a15f17093f7996777d35c05bf8cfae930c1379e547236197f73620750a99c27cc2adf0b7688c4";
+      sha512 = "003561a27b2ff7b484fe0ddf37fc539055ca8e302f0daea64c1932c0a9e2fb3a66809cef707ec3feb2dfbea5e57cb1d8aa957d4584a33f0465d252398dcad512";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ga-IE/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ga-IE/thunderbird-60.3.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ef38f8713a7e792d7ccc62e360954c29675ce208e51c06dc3679869487059e5d768f803e751fd008c369a2e438f5c54d95f4b48d042deeb88b0c6e7c84bab213";
+      sha512 = "17db64205a0d56a90c61ab63326986054a3b162bacc01a5ae5cbfc5c6015b47a64886663418b10f1da779556b5730411bae6515e903af96c1d2f0bc51399067d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/gd/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gd/thunderbird-60.3.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "9ea6406dbdca47e031af25139707707b9bc56957180ac73682b55c324980c6df0dc8b0ec4618cb175dfd489d7941f8f61f71551c9d221383698eaa6b300826e0";
+      sha512 = "9c09193e9a24b7a34a5e247cb9bac9b1913a4bd7549a396a4c723c83de716b3e7d055588c926d6bb08e7b6a223515764b8ba51f6d013229f40da848a401f3b01";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/gl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gl/thunderbird-60.3.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6ed22b1fe889a1b8109c180c90e35acabe3ce904a0d57824fdfc83f703814635123aa2fcc2f8a6edf50a33111698537ee284911a7eb3ce7f1dc8ec77819ee61f";
+      sha512 = "a303ff6bd6fe3659ef2d09aa58cd911b7b8148ea5c925b82ca7a68f3b16534e13149e03f6fb15c5f93242d6e61d4e1448a1ff27b146de9adf586f01d8d32dfbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/he/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/he/thunderbird-60.3.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "08c9923c10248b3b6e0c33b75dde8de66377404c979924c29ce602798ddec564fdb3e978a1345d9f2f734768301a262f8ce309bf002f7c7cf9434087e2439266";
+      sha512 = "ea72e43f7b1de708de898dd8351cf4837f97c1a28a71648cbfb76986bb2a87cdb747437e8b9358577685c38c9f5ec80e9982442521065a8c0e412e19cfdccdb9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hr/thunderbird-60.3.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "95cb5f4d35174dffbf341d2d8986ae0b5248ca7e447aebb13d27915ac7968dc1454ee8fdad201b0de7fa6b9af0cd632c951a2aa9d43fc5f6aa6f7f205ec42cb4";
+      sha512 = "a48ac47c5c04fcdc532e983559fbd2967539250d242f84f2599883c068c67e9c72d73b6355f7f6756d80ed9a54bff5a36929928398acd080e04675b552bcffec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hsb/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hsb/thunderbird-60.3.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "903be2c67851f112092a09110b7abde2d05d1964e8c573962709b902a5335be3eda0f2c687e6cad67d42339e58559d633768d5b203ad482c1de6f31ba3b13a94";
+      sha512 = "cef96f079261d53092d2fb7e8f93f72caebb3aaff910264188e8b3532de1ec4fa0f43ed45a60f80bc9ba5eac69cd17f2a415b70700d7bfd6ed8c873f2fadfdd8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hu/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hu/thunderbird-60.3.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "83a65776921962cc84f6c932e471d8a1532aeaae6edf95a9d8f68e301ad4383d0cfdb35469a51393c45628e89142c63af3886d1bfb31cb37eef188a07f96f352";
+      sha512 = "45245ae609216cb307e07b33ebc531c900e51634a6eba57bffcdbb4e0d72dd7466e399d0f5fff42a06973c3f2fde61d5e59a608985a513786819dde443cd2e3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/hy-AM/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hy-AM/thunderbird-60.3.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "42469e3b613321906f2573706a523af032e93abea2e579b1e768d75898a504c4ab5280d7f9ec1a2e25257ca4fd877d53092fd85813d59c6dc4e5eca058aad6b4";
+      sha512 = "d9b56f551997ba6d2413ce6847ab6af4bcf9d633bef2fea7a0fa8e8bf37fd87ce497134a7f58c31d647f781d07977be58449485c13212eff2996e3ebd34a3be7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/id/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/id/thunderbird-60.3.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "008e9b2949f55a400209440e6eefc6144b71f76589ce18c022e2fdfb203d75f97a93ec3f06a9810a72e0b5b0566d2403b16baee25a46dbaf77eaf36a1ad0bbf2";
+      sha512 = "8d09a5e23191f454b628c3bbd1b95045b201dce34ce5ee78e35d4e03ab3e2f686a1be2683332d1fde5bccbffec1e878c851bbebe019b8e62634f64eae344e2df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/is/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/is/thunderbird-60.3.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "130432feebe93be2c2d87febbf3a45be16c118a980d3fbb20a8d0fa42ea1898e70f60d758ce407df461ef6984a2e55d67594e50edcc4b9445468bb1ef5421889";
+      sha512 = "bd38c11eeecc90df111917e8d6d4c68882c24b40b1c7171f366c795dcaf4709fcd47aa1d81d76c7db549b054b3705330ce389bd8445dd48350c8cd3a22bdd9e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/it/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/it/thunderbird-60.3.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "1887f49727e3116bfecba4b084fe550b1b9b82f90b620ada9baa81825ab200489dbedab2f465cb52a0e22eb130069bc639eb54ab48b6e708c264bbc5bc076fbb";
+      sha512 = "ad3fef3fc1414a98e7c24abd31b0fa0796e326c141ec5896b29feac7c3955c807ebdf01e7d099f37b31e32f3267cf8052ee8d4f324ef974ccbce38f13ae432d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ja/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ja/thunderbird-60.3.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "c60a6e44368387f424c9881702dcb4f3dcfe439bcef92a5e6791c7619f3fb71a36a83e6ec2142cfa556e36b0582070f1aee9973261afc1fdae55a6d5f5b808d9";
+      sha512 = "880df6180766953da20c8917da020750431b5463879aa1803a6a4b9437a650f918a69e75804c267c1cfcc959a18edae1936f5059fa165cb9a5721937b3aa68af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/kab/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kab/thunderbird-60.3.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "1db688c67904b1f930133c5e711390d2fa1498e48db450f3ca41e6b039fd7cce4b68298ecfe5a47c20eda9ae0464ab9fe8d0907b28a59bb3fd95a7d895c02665";
+      sha512 = "285a5054b19e155905f0a29478b4cbb3694499d798ec009dcf4c3cf5d44510c5468d6119fcfd5d2e4ca4e4d1abd83ddc1d9fbdfc68499534e42040e2b8a27463";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/kk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kk/thunderbird-60.3.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "e24f8f451e39bf945e51dc9afc4f40f3e5239616cb838e977ab74151f64dc07c246dcded50976a721261a01d9de0d55b802077de18f7682bbd892c2282f7969d";
+      sha512 = "fe77320d7228c623bab6eed15466bb31b64955dd885728728000e03ebd368c666b825bfce8a5ae9b9f17e74a519d74ae26c636e8451fa3df91a7b5b5e2ff3d05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ko/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ko/thunderbird-60.3.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "52296e8ba959fd82b29b8cd7eb57812955d2078fc7b8aeccab80b8a4d917a6459072a2a317feee41bf649c1806797767a85fcf81af656eb51dee70352b57ec17";
+      sha512 = "f3cbb3fe94d44f4c4334041ff53983829c783ba1cb23bdf73d07a35f3b59dbff8c4a584f159441b142e1ceae3e768e4b20316a870033603db8987bf4f1b04d53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/lt/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/lt/thunderbird-60.3.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b5a1a8ce67d441e0d919e808a9f7b0e9dedbcdd7af105a372f071430ad1426847087b53ab2b7bb455d161216287e2c0a7e2639d80a0161f7a92a8e87337deb8d";
+      sha512 = "977aeda9dfaa83b1abf844d40199382f5ab8be2466064b4258fe46b6821b333db027c2f45355c6655a7173ca369e5329b269bb456ab964ec38e3e5a878cb8054";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ms/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ms/thunderbird-60.3.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8ebbee14a1c2b540baac19f6b154e74e3c39a3178b1ea32b55f35edaf2cf41f4e6096be3075b54c37f8b01e7e424dbc2f9d6b3fd04afd366ed854684e276f302";
+      sha512 = "f5e4ec77934a66ee22d8d8bc2d0c238d020a0843da562ac6ad344818ab0ed32497ca00eaf96c252392d3923151ecbe9f7a0c90d3dee7e558bbe75da278547549";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nb-NO/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nb-NO/thunderbird-60.3.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "8e9ae2aa4572e247ecf9d1715d0733bdf7123dc1fab7804a2dfb4f27aac589aecfa86824597e1efa218dfec4807730a697e36a813008b0b208c9181ae20592dc";
+      sha512 = "4d3723af7503ef508ea269f44185eefb33894a989461a22a742cfd369d0a2d93d6c3bce61711ce2a5de868b3d7f7c612a8a596718609068950b32d1bca7f1c55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nl/thunderbird-60.3.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a910555ed33fe721de624b591fa0a4aa769e8c8e3d78253eca907e0ad2f4ebe541e2b72ca3434d79aee9a59dde219c5b24d5b406f0dbafa0b1a8f080cd3f6e9d";
+      sha512 = "0a95e88ecaa1b3af514bdfcaab648f3cba9b280e5eb4c9efb371309cdaf0dd1215cd74d2d3af203e0547c1bab4b2480c4a3e9f81e2d1c301322497aa990af281";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/nn-NO/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nn-NO/thunderbird-60.3.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "9fb084d5ddaf22cd282b3ba001b39d926ef49a03c9ceb5624cf11bc637af5dbe3ad90d0282f6b90f794010f69104e5bb126ff5c8aafd7cbed82cae0834563e20";
+      sha512 = "d4c112319b8df0e377cdca82b33f55b0e949d3b2f2cdc3bfc5b5eb0c0a0e98470452b231e8c82f2cf303f1e75b512c5097f5988bf10efc57cb2362f7711dfae2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pl/thunderbird-60.3.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "c5c4590b177775b559acd89d3aa2c4555fa4c8c564ed426cad567b68e2508560d6a8bf55c9b3665819be3ce9b42ef94b795082f18e27559d6f1087a51c26bd5d";
+      sha512 = "94829eaf23916a0ff5273b38594a9a10ba9b178c0103deffcef0eb2015e4a2c51dba341644252b86430f18f4a2e526307f45ae5515f6d47832b74438dc798ea9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pt-BR/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-BR/thunderbird-60.3.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "4d66d1774fea6fcf2c81bebb5035b4544ae6795077c8d12cfddd05257149a56ae91b280a28488483ddaa444533b253297f7e6d9c2314111db8013e0f8f0c234a";
+      sha512 = "55148505771d65796766e6ce0b46ae9787dffda5a3176f249092f9f446fa5cb9d7dffbca0774865bfe000e79cb8b9e7704e4f095117172b3a2b8fc661b4e21d7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/pt-PT/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-PT/thunderbird-60.3.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "1e24124c69e5c8b0293ea79c499329b0075fa795d87e8ebc78f322859bfb6e76f977daaaf1cb187bcff5239767fd55dd5e53884a785cc60bbf4c1180543c8c5b";
+      sha512 = "9d7c6f004afec887f06e7b08c344727dd8310390511f454e18a93ef618830bb68df5ef60129659a31c33ef6b57d3c0e7693ccb5d4c9452eed1ef1404c6f83956";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/rm/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/rm/thunderbird-60.3.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "f2f6174e337010075ab78b88f9de1fb10d213fe1329ac185a64bde7c2efd9f5ad6a0151a42e0745694bb1f426246fba34cea5627316e17fa41bdc292ad692fc1";
+      sha512 = "f7dc1d5981d98f38c13c840e71b542dd3aad096d8dea8add79ebf756129a0a83316eb42b9018d47ab694c190384658cfb243dc96d4522a84a7f35ce82e79fa00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ro/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ro/thunderbird-60.3.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "25daf13a075591ef46295b44c0977c8e159612862953e7c22a053a3958b765b8a5693e8aef691590031285605101024142a42922faafdf9c0c998554e154dd74";
+      sha512 = "97f7f674e4a858ee9c03bf1661071c6d0990b5018de9f69ac46a98c82db53c67d2589d91ec9db2c1f6361a700d47779f6f4015214d8010da490fd69fbe065764";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/ru/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ru/thunderbird-60.3.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "a187abec0708338f7a0f593a2054fc20f4f018d1e2ceead6778c616450a2cb3fd2f959f4c7e6018ecefd07a984828efa2da3f91b34104dd62fbf5a5a97310082";
+      sha512 = "de481909f670659bbb3c227aa97780ceb54683b5ce47135e480fb95f89663b2fd9ce176d7507913f31417f66fbe8d4f8af08481bbfbac6468f7ebdc5b0bdcfa8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/si/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/si/thunderbird-60.3.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "076c69137e6d4067f553efde45d1676b386277c904f452ee1880a52ead9cc40a1bceab33a895886c32a203dc8aa6d2735b5f81b21b969ccccfd2d5e75a2db289";
+      sha512 = "07ebf67fa8673dc7bfcf5563591e4ef5c4736e3844b31a4e6662098d15dc05a437e3d5eab544cd09c010628a20f15ead8185e149560e0526dc1379f0a9202f56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sk/thunderbird-60.3.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "669bf299926fb9f4b0201c9fbbb593eebe127ff64d9c3cd12f79aa56b2e9d8a9b68c34e8ee42b9cc1287972c1a3d28c080945c1f17f4fbf672bc90c1f86425e1";
+      sha512 = "deb6291ba941743956603f6a91c0a19a2c56960bc91869ca7201f7a3eccfc630300987ce5b7bba51856bc16cbad2e34cd7ee645a22d692c12e8b4f66553c6a1a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sl/thunderbird-60.3.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "0d22ef11e347caa3e03b4a83c19dc1a230be3ed2e561ce84284b752abc7d64720e2d68d2fbdec19da73cdc13c5e90983179197e512f7db4f52c341539b8c1329";
+      sha512 = "b07617d113b7c3ac75cd4b3f8fbd098bbbf5cc2b8f06317da410ce534a93013671519c9e0698809add4c14fe131b6273dafdbdb8a8ed56922a68978cd20a094f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sq/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sq/thunderbird-60.3.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ac5e98dc1660efc255bc07a545e47f2141a8468e8bb911ad1b42143e5e048a82d5771f32718983ab80695b357b3b2d08897cf98f791f466edfa57d75579920c0";
+      sha512 = "b22bdf2bf3b8cb3c1a5e63360652ac34bcc63499a02a8a5af7e2c6987b310d5d4a18495b17c2f7ce9f509be08b8b5ea1beefc241958d75c4c6be26bc5a02532d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sr/thunderbird-60.3.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "2215af6e62448949dbb89cc66a52c9f83eabf1074ad8cff437953123d53ad403537b5655509bcdbbdf239da32e5b9d689b02cd625e225ce74a0c22f07318ba1f";
+      sha512 = "5d5139a8f9405b4ced928bb9241c0a4b3502421c8329b2da4d582022c2f57b7c599b48428ceb6601799448ad40d52270429891b7a637f9a913b47ef15a3d296c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/sv-SE/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sv-SE/thunderbird-60.3.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c72db6a8ed31e7348df9a0fc3931c5b1520f7bc03ea47e92eab343acd58c3fb4574beb91fc932733bc52e670451a04a88262e6e29ad7c0dacbcb37da522537b6";
+      sha512 = "2b8d2962846a7a0ef0c8f77cfb51e26da417de7a808bccc97ae3087dde1f4f0d38f770a3e14c26f5081af6c57dbd175ef81ff82992430bcc5fdfba2c2948c9ba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/tr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/tr/thunderbird-60.3.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "249d2320607100ec397556619872b701dea16142ee3ca0599fd17d66e5581d4753326a0aa9e2fff4b38c9a91ab8e923abeb0115cd8ad9e82cc871116d670cd4e";
+      sha512 = "e37b98fca81ceb022d95e6b23260a22ae0dde8f48753c6dcab96a3aadc8a68c852c2c6e105ee7da8733402561435357b0d70524aac419604a13964894a88671c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/uk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/uk/thunderbird-60.3.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "439d7018c6a6cb3544ec26fdf6bb93d6be2a7a4a6a19d6d5de40e7bcaf0281e42af6fbad23d4640959fae84ea4bf487c19fe07bb50334cd593a20c7c5db999e9";
+      sha512 = "9d1f38ed783b36f4312ce701dc8da3bf9facbff9874b08bf5730995a2fec3a060cd55aa395919b03ae12fd9f941e5f2fd329e5d836e1f722bfea97387e07be92";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/vi/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/vi/thunderbird-60.3.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0f7e6cc139cba5223fb75b0fff6b60e26d2783e6a78f22f3d8d1ec518f950856ecdef9b2aa31346aadbadcc08ee9b9a251e2fbdc5bc9655395fa2015530de050";
+      sha512 = "e70d087dcdfc0e5f6791b1c5e1483ffe6891b64792823b400d79fd9ed8bba10e5c21cb14a11cc2e020d8c91ef5f82455793595dc7143956d0d1a99f673125253";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/zh-CN/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-CN/thunderbird-60.3.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3280a8085855b25b88e485581d3f275873c4c01f1ea9608d98b01553a0dacfa7226d405d055028b2a45daf6316004b12ccd8637deeffb30724540df1ee480773";
+      sha512 = "28c4d992ce79d3f62984a1a0c009a742709c4d5dc1be3e9e05da6b4e232e269b04f548b67b1e0af85c51f7f4470cb3bb9a79d5bb2ab5c55f27806bbd27f5611d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-x86_64/zh-TW/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-TW/thunderbird-60.3.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "194cd71fd722d2f8f47ada2fcb02c018cace495d6d72c7eacfff38c6e5f30b7749dad41f2e28af8e935703c4033fcd5f7264ff828240008bb17a86e6894fedd8";
+      sha512 = "444524e9be27bc5a37d06cf7f9496d75ae524a27c97577066cf6bfcb2923369cf11a949d8712433345f04fd2ed7423c45497a51a50c058b7910216d9f0986350";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ar/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ar/thunderbird-60.3.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "56a8a07096fb29db87dc2633aff725612ff8255991674c590dfff51970778bb6b118a2f025097bb139086cfb949d0f53b1a6b1e9670c4b3cb0fc9ecfe35f6065";
+      sha512 = "5e147d4087d5b3f92f3f62e4f889bf1a38851f038ecaf9957bdc9ba8a7c52905ef74788a6879285836bf780177ea785b0ff65074eead4a1ba2442ad2466ef82b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ast/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ast/thunderbird-60.3.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "9475397f31e227e6a83b9572b82d7067fc633fde9a271fa68be5922f860346abb2bc879b14f489b54c3e518cd2d917b5e5ea2a03da3ab554607356cb7236f4b9";
+      sha512 = "29066ad291416e4cb1e778effb807b3427d74285ca5edc4ae84c27e39e4b033eaa665ca22ebd603b7d1f7347e6d21874c1be6b00df56e6a4c93aa60fdf613b07";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/be/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/be/thunderbird-60.3.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "488cf4396202882d4499b0bf6a3c5fe636fd162c767c5344ccb033ad57c90f544fb1e4daf348f08863c990eed0a07bb543c8b9f648786535a3db2887e77a6823";
+      sha512 = "535a84a7943a1da9117829e9cc9aa0f1fef1e3eda0ee61d356a4f2e10dbf2a61da899fef2d0b858674a4e54f574bb0aa5db628b5dab52fccf2a0eca06b9695cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/bg/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/bg/thunderbird-60.3.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "62bd4387ede66078250b1a462ddd487c97addd044b8c04858de922b60b88823880869f7eee0cf618b51ef1de956007d4fc9a6ce05ffae209284104cec4557bb1";
+      sha512 = "83c925fc5164146c24447835229cd1abe4d9eb89adababa68057d90906ee6b1fa51549311dfae934eb1faf36f5d10118a1d4cb7338019dd41a6d563fcfafafa7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/br/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/br/thunderbird-60.3.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "39fd9e5b42000c9b1e37f7a0bdf03681a3372166cf90750495f7e2a0e10f45465b3eb7d68454022634ffa8dd7a280d0ba98fee9367fa6058223fb87c06349e75";
+      sha512 = "b9c0e4cd14a3c745f506c303e2cad6357890f7b9dda91de43d4bddf5bf45c0247120f6c824189721512536e3cfed4b3a1d32a1767b2cac64f20349f158c10acc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ca/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ca/thunderbird-60.3.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "9cde54a64916448a776de3c197851576c5d9e395bc90da1f18abc0f5f1bb27d267bfcda33cde51fb06c80277caf35a7b9f1fad6853f8d053d95abb8ed2e95f5f";
+      sha512 = "5d45160609b49ef060d7d6a92c5ca24b4dd6f02397103cd66a76796ac72c2ce8f9be6445b09489d8aa96ef0156ec31a734e7091d0134176593a488905370d81a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/cs/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cs/thunderbird-60.3.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "1b5b8633a6502e731e9d187b0c3977db8338c3aac9d4b07c12468b143a11488c5c4b46b898f3ced8637b16abeacde0c0482b74d0c67c04bb4e1e40bce66d8151";
+      sha512 = "659431aa61b6221543bb7e59b7b5361ac2011ffad65ece1046df3869b54c1cd39fda0998108f9c72f1dc4f5151496962b73e31ba1d3a2bf9bd6bd3186f7ed0a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/cy/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cy/thunderbird-60.3.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a4636852813f271fe7ded7665d386d34120f664e5e2c18bd923efb4f3ff4cc273fa6ce952b243a2e25840f96baa4ac28979201d6f9a99ce8ce2bd18be41f1f82";
+      sha512 = "4a488557f0f64d4d4a4aa33ab385754f89bd1d1f2d7d39b64e75ef8a6a2d2f55bacfe9fcdad7901e44f9f2c69acb76d595ae379dbd3dee07bdf299a4dfa08a3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/da/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/da/thunderbird-60.3.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "fb4b302ac628b6b84ee8c537ec533200421c0fa4ce5af2efbc92e1f62e23761f5a64e11ed004ebbada8c0f31a4576d8a006571470896470547622aefb27af4dd";
+      sha512 = "39b46247bc1f83c1f2d3470421411cc931beef1087089110aaffa4b604c102048771069c833db85a3c3b070b9586e45a6eeeaeb5b3fe9ee1e77daf5e6e7aaf0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/de/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/de/thunderbird-60.3.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "76a213f0ee3fc1611d88d82639bdd3a90fb0cae0ef9c938087da3cc14c2802c6ab2bb5c73eb27e370fa45dcf25c075c27c86fc1b8f38b32aeaf76b796269293e";
+      sha512 = "fd29518af52080217b38733f5babac66e7dfb17742b67be2ad962c541ac31e27bb162303474acb3c320a4a33c1e589c4f826b66b16df2296647e499051b540d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/dsb/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/dsb/thunderbird-60.3.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "34e0fdc2179d4edd61044eb43f9fb4653e3a34e424ca68e549f430dd2398c6e8890b1ab5dc1aa08a1f93ce5e73774eb465e75ac13c6ec56ffe25de5e41b308bd";
+      sha512 = "4f0c47c2757a5ef641f1618a7276a9a171cd681c517db130886a1569c7e00542be05fab2062fce21b5c3f8df60e3c521b25292f7bfe1c437b7c1a779c9165510";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/el/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/el/thunderbird-60.3.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "c09cb6653d9bace2767c25fd7a2d8a0100c36a5f029e2950872a13cd2f2cdc56f4e4c5a53af36d1667cd23a0ed405e529d470b0405a0f615c4a1e78e08cc6c90";
+      sha512 = "fb6f80d1a7a8e465fc49e38d986bdcbfd962b3c99c45629ac188e58ff3cc63cc97da4529fb67566705ed3c4e682598e0089e826d015b0dddcf60d359faece400";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/en-GB/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-GB/thunderbird-60.3.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "df3b0c6e90fb683d7b67db078c4052be3066072032a99e9b1ec2bd1bc9f5f7a95952788c754efbfce9c5ca89a43d6b59953a3c5283eaef134457b79f7fa0c538";
+      sha512 = "7e2301e76e4be208256bcec9237c39b30cf49075c46d27a243005c39289e1ae26a1ee41a294c8d5389279b21749fda4f490c2fd1b3ee4b8bd9f1170f2efffcec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/en-US/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-US/thunderbird-60.3.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "18794d71c1d904caa1959feeaeceee38c86bca0faa84438ac1e1355879ae832fd509d2124a6d9ecbac7242eef334793357caed871713a139511ae77107168933";
+      sha512 = "0132ce8050a45246919e5fe538b84eb158cbf40401d487ffb7bf72d04a2bc3371d7606523dc6776dc3b6dd4c1930d56f6b47197385cf580d7b51c926c69eae99";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/es-AR/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-AR/thunderbird-60.3.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "69825a80a98ecaed860c5f31c63928f215736fd9eefeadd7be1d88659c17afa58d7975f0ceec26040a21ca048da7b06154a44798069092c0a4e2e6816e847aba";
+      sha512 = "bccb7704f8bd0f09054e48c54bd4ebeb4718667aaf46c55a7cca3e351181e09760fdcbca4e1e1948746b74f2c7ae46cf0d565f4a9c00430225e6f2c2849ea459";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/es-ES/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-ES/thunderbird-60.3.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "673b4d55bf3691cf972a1f1369486cd205d7c6e8bc91cd826050fa28dd6c313f872aca399191305320289962f93495ea6316ae2f2b29313d8b61c175ae0640cb";
+      sha512 = "81359edf957802660c0f92f8894a9087acb2ee6b08906de1fbf4be2145911c30b6de27b11b66ee8b7ad8cafeb09e00f336649537829f82cb7f204c834b1e585f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/et/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/et/thunderbird-60.3.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "1dd9ac5e292fdec230189de90fe5ca923351b98a95d72d302bbc2c838e48cda46bc2e8e4ac2f08d2356b7a596dc2210fb9f24c15319fbb519b29dab78e29f2c1";
+      sha512 = "4039a1680551f03a17225cb8b2cb9e0fbf554ce3956e89700655cf010483c61e7b29070aba4a0fb7395b93838f9fab6542fb006b9c14f0a013b6eb587329d7c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/eu/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/eu/thunderbird-60.3.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "acfa8190d55223752cd3c65fa87bff86b7f1f38d86365bba23190c4f16519feb8acc37e1a47497e69279a312e57d39a5830ba8d9c4391a1503024f125ab72b18";
+      sha512 = "d7a5c40069541615ff8479a8eb48d5a199d9bf9f834661af833b65d68fce93d8b433fd45e0175bf29c8322a402136f8b4b174b7c85329659bfaaaa3430bab574";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fi/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fi/thunderbird-60.3.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "8a95970bd4fb56ff80324a743f02e9dfa21df698f761096ee5d425663e87590ca8d38ab62ccc97298f4d935f4713ded1e0acf01afbcea1d378ed2c065cee637d";
+      sha512 = "10c1d2e0a3d3d0dd2bc6166e4dd3ffc273f97e7b7a03d5148a8475411357eba8733ef33380cb79d813b65fe128e2bc07ac2eef30139e3d6c69af77003cee8950";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fr/thunderbird-60.3.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "51111b8da2823523bdce77d9807535e09b54f1ca7e1621f3447c9e4bf44522a176263a843875a3f55602b7b53d60ae00fd5a59f22fb3119a792064ebb9ace209";
+      sha512 = "31b8463352704d1ac6640a07bd0131f683f4baa2faed799f91de956a083f184539186f0a1bd061c0e1793cc97f22a32b275c5e60994cce93f441181f2120ceaf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/fy-NL/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fy-NL/thunderbird-60.3.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "144cf86e32fdad0f4eed95b461de9dc0713c3bc70ccd77c1db94ea53762bffe7a5254f3f898228347e7b1d26df0055dc04b0192d3b1a3653a8109ff8f4f712c1";
+      sha512 = "80831dcef438c2737d38df2822223632030d62efd84361925f06caa7a108cc966848184403d8422a8a1c43fd1df52a77dc4b561dd2733de73d2c8aa0e0d5978e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ga-IE/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ga-IE/thunderbird-60.3.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7f411ee0f9b518dcf122eff2eb0b70fc1c7a71d2ccddb73482a17c9508f084ff0df6aa6d9a1555c576b0fbd32c9d65e106b8f98c7d603907c7a7189de034bbca";
+      sha512 = "7ceb9363d331fe9a0c3ed4b052cce765e2ef735b8a869ba3a08e83ed5195d073c1f4d9ca4578140b195cf25e3ae8771da8e061efb3e14bf5e9d875362babb713";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/gd/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gd/thunderbird-60.3.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "116e72b7f9759576077d3d11b9913b78dc6356e98995f0ee1ce152d04da9d0d5db6d32218a8e3a9403ee64405c95413fda8f86c6fef85336f799324179896fb2";
+      sha512 = "292a67e214ab6392e7c6eb80a576fa130b9c22620c8c2ae5ae5eecddecb823526f39a0f16d7df3c4cb80b35325b907708083fd45efb845d40ab89bc3cf5d0374";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/gl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gl/thunderbird-60.3.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "1d06ad862128b2ecb38b885c868c153b78a2246cdc635a066634f8b1a9e08fcff83d30806f9906b8f2a5a929e702be51ebec7fec54f7b80d4544f20cd2ab84b6";
+      sha512 = "df9f2a24a70facdaaa8c1b3831994fa2f5f14df92cc85dfdafa4fd4a28e7f331ae220ae08a4938755738f01e5f6fa1bbd62a558780a5444afe07e201d6c34f5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/he/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/he/thunderbird-60.3.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "6858b78aa38171194ee1821f7266924301859921591d84ab057a52ffaced7665adaaeb1ba536f9f0a7b8cd79ccc253631ff1a3d205c43c2c08d161e520ce7a60";
+      sha512 = "f1f527e5ec325fe9df177b172061dbfd205c307ea275f732b31ab460801dc49a18cd41625caca0c118f62d2642e4494e961b85b3058e2909445203d7b69ce6c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hr/thunderbird-60.3.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "eb3f16f0000ea85e420c8bc60abe7b509ba0d125b8f95fdfc67d4c0fcf87b6c0db86a0297e8ee2e7fcb419951fcb0ba42a7e59005742145ae6067be5e85f6e93";
+      sha512 = "dd5b62e71c708db2dfbaa59bf860b4dcff951607277605193ff084943f4ba7be9f458310a2a3c047d4e29b7ba432bfce1ee2dcb5217c460d90816b17c2232824";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hsb/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hsb/thunderbird-60.3.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "55ee75a0158ef072c1698cefa5b6725da36e9286c6da004ceb58f2aec109609f7ca9937d8825b92ae2731ef156e562249093fd551064388bc73905fc9ad2545f";
+      sha512 = "30374f1750facbd5d96e9b38aa2f237a7424e278df6e8ceaa622d119866b10859b594622438c8299d92bdb6baee2ddd7e45498e6fbdb13a0b0d8bf2304454501";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hu/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hu/thunderbird-60.3.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "6b9fee4d7747af8b6d39654fcbd0c14e7762a1ab4fb7e7e133598fded0295020b39009e028ffb3d8db502811bd5ca9889abf5004cb01ff995bf9c13b871e11bc";
+      sha512 = "7a1a955704d4fe5220f039a6fca68f87995f654a59f51df832970607809db76f1cf480df90893ffa88fe87c5cabfa0733ff307393e22c78318c379db963cb26e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/hy-AM/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hy-AM/thunderbird-60.3.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "e0aa3adb175fd1562e6292526f6512d5f6a9e6584d521aae3c97cc0143946a49e41e1914e9ba6d87f29409ab8b17f84cac9bd4a815e29f7c9ece1729d302881c";
+      sha512 = "8393a86a9217a4c387cc92b4c61ea552c7115549dba0ee02afac065757fcae4f79b67ef8fdd1559b942f674f6804bba7804d54696ffa71338de42bca7f12cf83";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/id/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/id/thunderbird-60.3.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "7839db4bb937e699688d1e2fd387cbfb25a0402529b183f09897535341324f4d92e774c3bf517ba3a51c86f74854508b5bd6a5560bc153bf3720ea8191c119ca";
+      sha512 = "fafd7a26288b951d179657f99c72581e4bb5299e8db775b7a086f3481f700dde031137e2cc7370e308c943a0a874c5985c6b9e36c7af1b60c4553779a4653d85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/is/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/is/thunderbird-60.3.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "29b069bcad1cc668f65a3749a1d87b6582ad32400905bf446f8ccb86cf42100d7034bdb4c0d22a66b8f5ccf95659a5ee4c058f7c5a5ee2222dd0a93cd6236a9d";
+      sha512 = "3aa276ee0ee8f2613ec7ef1543ba5938658fdd5c1ea24b42d39c5fff4f016325daaa701f89c65a32f04c85fd066f3bef75dd0d5d28ffdeb29618fc16435f046d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/it/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/it/thunderbird-60.3.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "fdc47d3462cc3db49a8208423c19b0d74b65eeefaad2eca873eb194cc8c9691adfba7e87bbbc7c4a472423eff91ff8e21d78fafef18a4e841e922c72eb53d78b";
+      sha512 = "696b5bd5c93fa5a174b04f2501e46c6334cbbdba43073015962e7ae17cbf577f0e64d016b7f892513a3a07b6867e8419cb16fc82b915d09695d5a84f3d904bad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ja/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ja/thunderbird-60.3.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "068a15c6913a556c1c9d0deeb96c75087f68e62c0dd2eef3445c4460e08c314d457f799e82f96dfe00fabf9ce4cf7a7c379d08e7a7ebb2969c39ae87082bdef4";
+      sha512 = "588e5c6dfbb40cf355d62f000b5561c6a2a4e0b5c43c7dd2136fab11ee4763cd9cbea89e958f3959aae0570c694aa067d77ed7cca818147cf51a28efb304ab72";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/kab/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kab/thunderbird-60.3.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d11ef24a47ff39eab178ad448ea2d1457978b31dbe5ab0da2b87011d351d92ba54245891a1c6be3ed7424ea9f5743093e1cd6eeaadfe016405ad53252b7d5590";
+      sha512 = "aa58f8a4309ca122d8517042c9a8c8a92b90087001ae4552de6b660bae082565ae1d80aacd3e506f8582a145132a482fb8c22eab033d7afd4a3959653d00f1d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/kk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kk/thunderbird-60.3.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e4bb916f3e04136b470d46b04d7d2ba4c3d9d703dc8fda44e7611ec51af06af4bf73ab30f4d4b578560a27a34adb6950534d0554573a21210bf825f2aec4ea73";
+      sha512 = "6081c78fe6febdc6c1c0ef2d102755760c9b137d117c0ad5b8adbf1a50769c3198a703abbb5a826ddd723cb128d535d2f075359e7300d763d8e0a769e3bd5897";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ko/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ko/thunderbird-60.3.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "9453426d6bb088af4bc4e0e2eea7dd163d434fbb7a29993b82faea9e79a11aca95214aefbac6278a44b90356eaca050ba081dccbb0e57bf5eadfddb992251ee4";
+      sha512 = "980b2fe49c2f705296ff9036e6714f2039a81ca8c591dd8a0567ba2171196f188be647a3aab1bab25fd48c7f3a02b75307f0a35edb36c534785d51c207fd7203";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/lt/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/lt/thunderbird-60.3.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "a0a3580444318c1bae14d8123cb215c37c32ef4e7f0db87e118054c34d7c3fb9b4d3659241379a23360680ddef6bbaec9fd3a514790efd6cd5f43d58de2fab30";
+      sha512 = "e3b37725dcc8f97f36c7e57450b911ba4547b2f34720f27cd89b7f2be92bcc0ee20f1e3426e623a53125013b447ea90df138da53c68de535620f548c955915f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ms/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ms/thunderbird-60.3.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "8295bef9738e4808fe0e72fdc27f772f493ef8ec0ba1ee66923a51e45088152bf61ef0dc1539af7de6e6c637dae1b9ea70ea89912e621a27083550f7abb47c70";
+      sha512 = "a27ab9c7c524f7dbeb6dde32f36c4cd0f3fe20026e90793bf6fb6396f9a7816aee99c48574224c72be8aba5922dd3d7a21b6c05cbbf8caf1e7b956af50018f2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nb-NO/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nb-NO/thunderbird-60.3.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "3311340af28fe81452c27c704420a9e30ca9c1ff1dc3b7ce2a49210e83149c0fdea1014f546109704f14cd467963624f8634568df7764085a88e078a58cf8af4";
+      sha512 = "45135f0d62b03919b754b2b95329dd4a60ad7a2ad1ed4fdff5f174df5d1391111c9f3acd1a0b4ee71b340327b06180619fe84740b43fa8d6fa5d70ea6bcba0da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nl/thunderbird-60.3.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "7b6ebfa8c12da1e73769f74ea15fbd339e0886783bf4a51fb1c612d7d7372cddd0abdfe654760880c4bdbee6930349b6290c3d52d886915445110449cdef8d6f";
+      sha512 = "be4fd59d184fd161aa2afa1d2a13a11e54adad4329991b588d373a206b5f2e41bd03d51c1270d6bfc6c84a83c520cd3859eea8f5dbe71b0d2fbfe4bdac2a862e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/nn-NO/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nn-NO/thunderbird-60.3.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "d89fabc6c2bf7b64eeca36b4b0b20e64e8e317764c24c9b4cf9430c54635e81ddf66879a3bd1748c295d3b52c523b63d4871823d98e86e1be68c953e0639fe6e";
+      sha512 = "896c6bfef19af9dc5cf48829869d47a7fcc2daeb9ce2f0a86a959fd6d656b6d721b024830f03230b9bf35a300b21dcb603d5e7aacb36666c33ff80bf5babf1a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pl/thunderbird-60.3.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "5ee0bf77ccbf7f57fd4b4c7cc71befa785590d68c67141e135ef5f399e73a7e3cf2b5256f9420963c63b27a680168308772b313fea8a29c6aa322b8eaa46f059";
+      sha512 = "fb5f412f4bee2af9fed61f310306b883e78b4d64934643cfa0418b69a54e29f746b427e97f58aa94031bf1428d959e3c7e7605dc98c3658163f34217e87ed051";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pt-BR/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-BR/thunderbird-60.3.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "2243bfd560aff648ffe73cc9e7c6218bf6a1dc81e9970a097742a37aef6becdb93e5226d7340d7b69ee7a7a74785f7c06d93d0da726869ad339a715c265dbd5e";
+      sha512 = "d1cfa631a3491f1015b8182ef5beb8046cebb0d2a0f541a31dfaac88b2f54586c8a6ad15a23ad17aac0c1ff9ec3b5a214002f0aa46dea37698093ca9f71ad288";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/pt-PT/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-PT/thunderbird-60.3.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "06a4caf81f561fd943050bfbb36b2f9190790f407aaecd8f20a3dcaca82bd037edd70622ace1dcf41fa4be1109ad9e80fd40332e45034895dc3fec148fd334aa";
+      sha512 = "5d63808463b829f6bffea85d0c07119ba8d33f09f39fd7494f84d12dcf205286df6e87ff1dbbeac8a6961403060f0f23b148c2ebe0329e47ec8dbab3b94267c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/rm/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/rm/thunderbird-60.3.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4664931159370d114a50f075d7fd0cec7fa0bb3e91b96d7778b206ed5e748bbe71a9f30ec1a3a7a41849b524b409e024346c5c5344d18b5eb94aa939b86f59e2";
+      sha512 = "b8c0b360b47ab9d43fa2ec3fa0fde1cacc8cc7d2f47e43eda2b4f973991d2df247520d0a10972777ce78d87887e0ace82844aec5955d122cef3119328367c862";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ro/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ro/thunderbird-60.3.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f0b19356c5917e16edeb8f120b0765f948010198a1bb8fa45e4bf7965553677f01920cf34b816d0dc3ba9190a11b6fb72ee33f0239e2e5974c60bd2929924a7b";
+      sha512 = "3a696c7bcf2ee63ca797579d5a196659cc00ebba9ccbd7f41450aa5f8352260cd7cece56b43722ff09dafeafa2e11e76bd51f6863a7badd15f550ef1e38c6ce5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/ru/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ru/thunderbird-60.3.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b79517c780485098ae0aa91d275e8f314b8914a1a84400646963e0a23bd9179fe9dd3b63b80e45cc102296364bed639ab45841932d0bf93142e38850764125e7";
+      sha512 = "897df974fdda8f9c68091a15ddaaf36261b4d68183c3f09442fff486c2a86249e24744187cf85cfcd3217f54340a7c51f14ecc618373101ecd264ae767a387e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/si/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/si/thunderbird-60.3.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d7a4a804c0122a902d513e6bbde37fb75b35a6a49300992aa81f6590becff6315d757c095f35505dce48b1e4d6b4963f7484f636c0d87d5ecf0cdfc1b9f44464";
+      sha512 = "35b16423c41886f28a9aab9e9b5ebcc811ac03424a89b9e6f7ca494f8cc43a1c51668854d9c479fde8f977306290cf0b5bd2eb4c0c60fc98fc6522333624890e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sk/thunderbird-60.3.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f50653801aff3f8596cfcdaf53755b5557e69aa237a76bd5598bc349839616a18b2a7703ce79094b6719d7e544f66a114b5d61ac9ef65f20c4f10a2e7b2cbe45";
+      sha512 = "5e4855121d4d36dc639a85986d5ccef62c7eff28008d7d2c5150becd75ebe6f95a5ae54a280e35e50c5f2cbc27665a709e1fdc55860d17b893b2fc2e48d0e56b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sl/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sl/thunderbird-60.3.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "d98731420605736ec5ba1df75a38b8a44ebe2a29c307fb7e63f51db0b2f8d2fab0bde2c8e4d9778bba82545f04f42a80bff1659cf49f3a1db5ad5418cfe9c34f";
+      sha512 = "93ca3fb5eec8edeb050d8c293446f44c975f5b206de5ceac7cf9a7feb3699c90c1e85848fb22108ec757960d6a686d68ffba61644b20d1e0c8ffd0a126dadd17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sq/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sq/thunderbird-60.3.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "8973e874151efb48343dec2c192e98015740d160dff902d1c07f6f1a5e770344ed07260bb4986892615f31b5c06f56a59406def6d7af20cab04edcba2e5b6003";
+      sha512 = "891a6a103eb05b84af59c76cee7742d5ad04aa51beb955a7023852879e2853b5ac2b79af2dd45f87cefbcd176ab7d6bda9773f9af8e624435ac228d0c04ce298";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sr/thunderbird-60.3.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "354706cac183b91067d55d49b16f525aef6c5abbedb729d321e615d8e29c05976ec8e33c905600584bf2e64ba8fb27472fe14a9390e2188fb2b236df0cf7d39e";
+      sha512 = "14d84a42a89b84d2aeca1e4b4f2b2ecb30dd5e940ccb77a7b6337df88d0c73e4cfdaae0c6fdc055e6cbe213ad4652361c3b5f37680e09506da354bcc492cc155";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/sv-SE/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sv-SE/thunderbird-60.3.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8714ecbaf368d5c405224163bc1f0047b498770167dc6ffd53cc1bb0828228cd48933a5ff7e5116634e1c50218d08d27fa667942878a19fa2f0a4398ab0fa458";
+      sha512 = "4a51fbca27bb37b556fd3aaaca45ba0f18129089da8d69d796ea6c13fcf8e65138db7d3f87d355777ce325c7f0e7b7b643d7a0c6067f71ca63e1c37c052d34ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/tr/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/tr/thunderbird-60.3.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e8e62fdc8704f91754be9a97f288d113577039bbca1ed69c01e577cc8813e4302f9cd1842f38a91cb8d9899a7a9317b59e931e65f492e619b6b6c2a736117366";
+      sha512 = "332deb7803f935e67bc3d3e8ff55255f5ac8a6a7f128fef924c78aeb8b4023f0f562b9957dbdf84ba25c4b65a55028a8b341a0764ec4aced8fb127b05c083029";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/uk/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/uk/thunderbird-60.3.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "d948efc3e6bd4c9392fed77f52e77998f5b1a202945a6e4bd3b3bcc8332925c6d8de5d48c9737401e94ac701ee7d9e334819fd3718b600914650ee57bef5a5bc";
+      sha512 = "0c96360839e9e72848b1574c389cd29d71e3225cfaca7292c83f9835c4c9d59cb324b390acb00666861f7a060eedc233ac84dc475536e9b206af75e9fa4edf49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/vi/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/vi/thunderbird-60.3.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "929f5c94418de4df462356e0321088482e1e7ece9fe1838123c12f7649c2762e53d20de75bb77f77bc54add23985653ba77b63502b19912b6bc82f2b0ef1dfa0";
+      sha512 = "b0421b6a3ee1dd95d3282c69d618eadf8f1fb69f72d61bec63fa82544d387780b2f80b2531c48c853fcfb4e9a50d14a79b145d3fe3f9ca0919582876385d63af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/zh-CN/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-CN/thunderbird-60.3.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b746273c7ad7651521d6072f211351c3b585d25ebd48027be3b93a3ce0e09abdaae2a63e97eca013dba046dbadf97f5d4a38fd08bf4a9304c7622881367af73a";
+      sha512 = "22197ee9de592ea02894cf3cffda12267a4999b3fba31a6f90c621aec502834753f09834ed80901f156a385f7af6c1ff4a3d6558a47b2e489f153d1d727d0bd6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.1/linux-i686/zh-TW/thunderbird-60.3.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-TW/thunderbird-60.3.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9251b5688967e87f521bc283b0000194eb98c2ce157aa8befe624146d5dcbf4e7237944d3ae8c0045a0667172fd68616e179fb3ecf6e0f848f7e15a6a2b21f00";
+      sha512 = "8e7e3d7063ef9b5e56f000cfada185ad31951b3ccf7dd9f84455fde7490e3cafef934f0b3501b70d7746464aa5b41180f6f9eeecc7b580d07823bf2ec97d11e8";
     }
     ];
 }

From 61c83b3975fd5fc05cf61407a80fa76217496ee1 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Nov 2018 09:13:23 +0900
Subject: [PATCH 0390/2793] thunderbird: 60.3.0 -> 60.3.2

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 155916c81bf..0ee4137eb23 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -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.3.1";
+  version = "60.3.2";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "266m4kwxiwh1zi60z4gcs54k4w903aximafngmmqaa5nkxnsxh6sp62j1mazdh52g40pzdy9sqb8zkcjsm7dp937kpcl2lvw778lanm";
+    sha512 = "27hdv1c0jgwk6lkkdfy1rx7r29s2girikbbrriwr9v1gvmf7j3vgdldk7wqijjcp185dbp714wh3n5kp1p9f3sa8mf7z6321xby0mf7";
   };
 
   # from firefox, but without sound libraries

From 80756cdb79d68ddf16425767918c79548daa61f8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Nov 2018 01:37:31 +0100
Subject: [PATCH 0391/2793] wlroots: 0.1 -> 0.2

---
 pkgs/development/libraries/wlroots/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 4aff6063183..9791f04fd87 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "wlroots";
-  version = "0.1";
+  version = "0.2";
   meson480 = meson.overrideAttrs (oldAttrs: rec {
     name = pname + "-" + version;
     pname = "meson";
@@ -28,13 +28,13 @@ in stdenv.mkDerivation rec {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c";
+    sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv";
   };
 
-  patches = [ (fetchpatch { # TODO: Only required for version 0.1
-    url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch;
-    sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5";
-  }) ];
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace "version: '0.1.0'" "version: '${version}.0'"
+  '';
 
   # $out for the library, $bin for rootston, and $examples for the example
   # programs (in examples) AND rootston

From 9ac03eb8118d4fe76cdced800eec20e81cbde13a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Nov 2018 01:50:41 +0100
Subject: [PATCH 0392/2793] sway-beta: 1.0-beta.1 -> 1.0-beta.2

---
 pkgs/applications/window-managers/sway/beta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
index 5aebb7ed8dd..fd3e2275b44 100644
--- a/pkgs/applications/window-managers/sway/beta.nix
+++ b/pkgs/applications/window-managers/sway/beta.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "sway";
-  version = "1.0-beta.1";
+  version = "1.0-beta.2";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa";
+    sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw";
   };
 
   nativeBuildInputs = [

From ce6d558c4deebf373eae8723cfb7c181be2be9be Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 13 Nov 2018 23:03:31 -0600
Subject: [PATCH 0393/2793] systems/examples.nix: move riscv function to let
 binding

Makes it easier to use mapAttrs with lib.systems.examples. Now every
entry in it are legitimate systems.
---
 lib/systems/examples.nix       | 13 ++++++++-----
 pkgs/top-level/release-lib.nix |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index a40c3892424..d713989fe1f 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -2,7 +2,14 @@
 # `crossSystem`. They are put here for user convenience, but also used by cross
 # tests and linux cross stdenv building, so handle with care!
 { lib }:
-let platforms = import ./platforms.nix { inherit lib; }; in
+let
+  platforms = import ./platforms.nix { inherit lib; };
+
+  riscv = bits: {
+    config = "riscv${bits}-unknown-linux-gnu";
+    platform = platforms.riscv-multiplatform bits;
+  };
+in
 
 rec {
   #
@@ -92,10 +99,6 @@ rec {
   musl64 = { config = "x86_64-unknown-linux-musl"; };
   musl32  = { config = "i686-unknown-linux-musl"; };
 
-  riscv = bits: {
-    config = "riscv${bits}-unknown-linux-gnu";
-    platform = platforms.riscv-multiplatform bits;
-  };
   riscv64 = riscv "64";
   riscv32 = riscv "32";
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 957de2dcc30..7e7cac95b9c 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -54,7 +54,7 @@ rec {
   # More poor man's memoisation
   pkgsForCross = let
     examplesByConfig = lib.flip lib.mapAttrs'
-      (builtins.removeAttrs lib.systems.examples [ "riscv" ])
+      lib.systems.examples
       (_: crossSystem: nameValuePair crossSystem.config {
         inherit crossSystem;
         pkgsFor = mkPkgsFor crossSystem;

From 9c8fd412248ad907eee7547b19bf3f7583d2c411 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 13 Nov 2018 16:54:08 -0600
Subject: [PATCH 0394/2793] treewide: add emulator to platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You can use stdenv.hostPlatform.emulator to get an executable that
runs cross-built binaries. This could be any emulator. For instance,
we use QEMU to emulate Linux targets and Wine to emulate Windows
targets. To work with qemu, we need to support custom targets.

I’ve reworked the cross tests in pkgs/test/cross to use this
functionality.

Also, I’ve used talloc to cross-execute with the emulator. There
appears to be a cross-execute for all waf builds. In the future, it
would be nice to set this for all waf builds.

Adds stdenv.hostPlatform.qemuArch attrbute to get the qemuArch for
each platform.
---
 lib/systems/default.nix                       | 40 ++++++++++++
 .../virtualization/qemu/default.nix           | 24 +++----
 pkgs/development/libraries/talloc/default.nix | 14 ++--
 pkgs/test/cross/default.nix                   | 64 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0b3475fefb9..25df5e17406 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -66,6 +66,46 @@ rec {
          # uname -r
          release = null;
       };
+
+      qemuArch =
+        if final.isArm then "arm"
+        else if final.isx86_64 then "x86_64"
+        else if final.isx86 then "i386"
+        else {
+          "powerpc" = "ppc";
+          "powerpc64" = "ppc64";
+          "powerpc64le" = "ppc64";
+          "mips64" = "mips";
+          "mipsel64" = "mipsel";
+        }.${final.parsed.cpu.name} or final.parsed.cpu.name;
+
+      emulator = pkgs: let
+        qemu-user = pkgs.qemu.override {
+          smartcardSupport = false;
+          spiceSupport = false;
+          openGLSupport = false;
+          virglSupport = false;
+          vncSupport = false;
+          gtkSupport = false;
+          sdlSupport = false;
+          pulseSupport = false;
+          smbdSupport = false;
+          seccompSupport = false;
+          hostCpuTargets = ["${final.qemuArch}-linux-user"];
+        };
+        wine-name = "wine${toString final.parsed.cpu.bits}";
+        wine = (pkgs.winePackagesFor wine-name).minimal;
+      in
+        if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
+           (final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name ||
+            (final.platform.isi686 && pkgs.stdenv.hostPlatform.isx86_64))
+        then pkgs.runtimeShell
+        else if final.isWindows
+        then "${wine}/bin/${wine-name}"
+        else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
+        then "${qemu-user}/bin/qemu-${final.qemuArch}"
+        else throw "Don't know how to run ${final.config} executables.";
+
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index d9495bd984e..ea330d59555 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,6 +18,10 @@
 , virglSupport ? openGLSupport, virglrenderer
 , smbdSupport ? false, samba
 , hostCpuOnly ? false
+, hostCpuTargets ? (if hostCpuOnly
+                    then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu"
+                          ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"])
+                    else null)
 , nixosTestRunner ? false
 }:
 
@@ -27,11 +31,6 @@ let
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
 
-  hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
-                   else if stdenv.isi686 then "i386-softmmu"
-                   else if stdenv.isAarch32 then "arm-softmmu"
-                   else if stdenv.isAarch64 then "aarch64-softmmu"
-                   else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
 in
 
 stdenv.mkDerivation rec {
@@ -113,7 +112,7 @@ stdenv.mkDerivation rec {
     ++ optional smartcardSupport "--enable-smartcard"
     ++ optional spiceSupport "--enable-spice"
     ++ optional usbredirSupport "--enable-usb-redir"
-    ++ optional hostCpuOnly "--target-list=${hostCpuTargets}"
+    ++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}"
     ++ optional stdenv.isDarwin "--enable-cocoa"
     ++ optional stdenv.isLinux "--enable-linux-aio"
     ++ optional gtkSupport "--enable-gtk"
@@ -135,12 +134,13 @@ stdenv.mkDerivation rec {
     '';
 
   # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
-  postInstall =
-    if stdenv.isx86_64       then ''makeWrapper $out/bin/qemu-system-x86_64  $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isi686    then ''makeWrapper $out/bin/qemu-system-i386    $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else "";
+  postInstall = ''
+    if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then
+      makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \
+                  $out/bin/qemu-kvm \
+                  --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
+    fi
+  '';
 
   passthru = {
     qemu-system-i386 = "bin/qemu-system-i386";
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 7c758d29835..74558760935 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, python, pkgconfig, readline, libxslt
 , docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
+, buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -10,10 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
   };
 
-  nativeBuildInputs = [ pkgconfig fixDarwinDylibNames ];
-  buildInputs = [
-    python readline libxslt docbook_xsl docbook_xml_dtd_42
-  ];
+  nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python
+                        docbook_xsl docbook_xml_dtd_42 ];
+  buildInputs = [ readline libxslt ];
 
   prePatch = ''
     patchShebangs buildtools/bin/waf
@@ -23,10 +23,14 @@ stdenv.mkDerivation rec {
     "--enable-talloc-compat1"
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-compile"
+    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
   ];
+  configurePlatforms = [];
 
   postInstall = ''
-    ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
+    ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index 6f41447ca76..622799106cd 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -1,12 +1,11 @@
-{ pkgs, pkgsCross, lib }:
+{ pkgs, lib }:
 
 let
 
-  emulators = {
-    mingw32 = "WINEDEBUG=-all ${pkgs.winePackages.minimal}/bin/wine";
-    mingwW64 = "WINEDEBUG=-all ${pkgs.wineWowPackages.minimal}/bin/wine";
-    # TODO: add some qemu-based emulaltors here
-  };
+  testedSystems = lib.filterAttrs (name: value: let
+    platform = lib.systems.elaborate value;
+  in platform.isLinux || platform.isWindows
+  ) lib.systems.examples;
 
   getExecutable = pkgs: pkgFun: exec:
     "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}";
@@ -17,6 +16,10 @@ let
   in pkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" {
     nativeBuildInputs = [ pkgs.dos2unix ];
   } ''
+    # Just in case we are using wine, get rid of that annoying extra
+    # stuff.
+    export WINEDEBUG=-all
+
     HOME=$(pwd)
     mkdir -p $out
 
@@ -44,29 +47,29 @@ let
     fi
   '';
 
+  mapMultiPlatformTest = test: lib.mapAttrs (name: system: test rec {
+    crossPkgs = import pkgs.path {
+      localSystem = { inherit (pkgs.hostPlatform) config; };
+      crossSystem = system;
+    };
+
+    emulator = crossPkgs.hostPlatform.emulator pkgs;
+
+    # Apply some transformation on windows to get dlls in the right
+    # place. Unfortunately mingw doesn’t seem to be able to do linking
+    # properly.
+    platformFun = pkg: if crossPkgs.hostPlatform.isWindows then
+      pkgs.buildEnv {
+        name = "${pkg.name}-winlinks";
+        paths = [pkg] ++ pkg.buildInputs;
+      } else pkg;
+  }) testedSystems;
+
 in
 
-lib.mapAttrs (name: emulator: let
-  crossPkgs = pkgsCross.${name};
+lib.mapAttrs (_: mapMultiPlatformTest) {
 
-  # Apply some transformation on windows to get dlls in the right
-  # place. Unfortunately mingw doesn’t seem to be able to do linking
-  # properly.
-  platformFun = pkg: if crossPkgs.hostPlatform.isWindows then
-    pkgs.buildEnv {
-      name = "${pkg.name}-winlinks";
-      paths = [pkg] ++ pkg.buildInputs;
-    } else pkg;
-in {
-
-  hello = compareTest {
-    inherit emulator crossPkgs;
-    hostPkgs = pkgs;
-    exec = "/bin/hello";
-    pkgFun = pkgs: pkgs.hello;
-  };
-
-  file = compareTest {
+  file = {platformFun, crossPkgs, emulator}: compareTest {
     inherit emulator crossPkgs;
     hostPkgs = pkgs;
     exec = "/bin/file";
@@ -77,4 +80,11 @@ in {
     pkgFun = pkgs: platformFun pkgs.file;
   };
 
-}) emulators
+  hello = {platformFun, crossPkgs, emulator}: compareTest {
+    inherit emulator crossPkgs;
+    hostPkgs = pkgs;
+    exec = "/bin/hello";
+    pkgFun = pkgs: pkgs.hello;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cea917e174b..a9db0b49901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12465,7 +12465,7 @@ with pkgs;
   taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
 
   talloc = callPackage ../development/libraries/talloc {
-    python = python2;
+    python = buildPackages.python2;
   };
 
   tclap = callPackage ../development/libraries/tclap {};

From c6db972e8bc6c60d437d27c3188c2e2a9efa4bb2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 20:02:58 -0600
Subject: [PATCH 0395/2793] wget: 1.19.5 -> 1.20

https://lists.gnu.org/archive/html/info-gnu/2018-11/msg00011.html
---
 pkgs/tools/networking/wget/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 0bd99c63596..93f02f32cee 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,12 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19.5";
+  name = "wget-${version}";
+  version = "1.20";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.lz";
-    sha256 = "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9";
+    sha256 = "07k8yd8rdn27x5fbzlnsz4db7z7qnisiqhs7r1b5wzy2b9b0zf5h";
   };
 
   patches = [

From 7df55477fd04b1443051f767fd77ea42cb50ed59 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sun, 14 Oct 2018 00:40:37 -0500
Subject: [PATCH 0396/2793] bees: init at 0.6.1

Introduce an extent-layer (as opposed to the existing file-level) deduplication
system for btrfs. This provides a means of finding similarities within
non-identical files, when they contain identical, aligned blocks.
---
 .../filesystems/bees/bees-service-wrapper     | 223 ++++++++++++++++++
 pkgs/tools/filesystems/bees/default.nix       |  69 ++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 294 insertions(+)
 create mode 100755 pkgs/tools/filesystems/bees/bees-service-wrapper
 create mode 100644 pkgs/tools/filesystems/bees/default.nix

diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper
new file mode 100755
index 00000000000..8ef46afc18f
--- /dev/null
+++ b/pkgs/tools/filesystems/bees/bees-service-wrapper
@@ -0,0 +1,223 @@
+#!@bash@/bin/bash
+PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH
+beesd_bin=@bees@/lib/bees/bees
+# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE
+#!/usr/bin/env bash
+
+shopt -s extglob
+
+# Upstream wrapper requires UUID to be used for configuration.
+
+# However, when declaratively describing a host, we may not know its UUID, and
+# shouldn't need to persist something that will differ between hosts built from
+# the same configuration template.
+
+# Thus, for using bees from NixOS, we have our own wrapper, which supports not
+# just UUID but any specification permitted by findmnt
+
+[[ $bees_debug ]] && { PS4=':${BASH_SOURCE##*/}:$LINENO+'; set -x; }
+
+usage() {
+  cat >&2 <<EOF
+Usage: ${BASH_SOURCE##*/} run|cleanup config-name|fsSpec [idxSizeMB=...] [verbosity=...] [workDir=...] [-- daemon-options...]
+
+  fsSpec should be in a format recognized by findmnt. Alternately,
+  "config-name" may refer to a file that exists in ${bees_config_dir:-/etc/bees}
+  with a .conf extension; if that file does not specify UUID, findmnt will be
+  used in addition.
+
+  Note that while config files may presently use shell arithmetic, use of this
+  functionality is not encouraged going forward: Setting ''idxSizeMB=4096'' is
+  preferred over ''DB_SIZE=$((1024*1024*1024*4))'' or ''DB_SIZE=$(( AL16M * 256 ))'',
+  although both of these are presently supported.
+
+  If fsSpec contains a /, it assumed to be a mount point to be looked up by
+  findmnt, not a config file name.
+
+  daemon-options are passed directly through to the daemon on startup, as
+  documented at https://github.com/Zygo/bees/blob/master/docs/options.md.
+EOF
+  exit 1
+}
+
+die() { echo "$*" >&2; exit 1; }
+
+allConfigNames=( blockdev fsSpec home idxSize idxSizeMB mntDir runDir status verbosity workDir )
+
+# Alternate names for configuration values; "bees_" will always be prepended
+declare -A altConfigNames=(
+  # from original bees wrapper
+  [BEESHOME]=home
+  [BEESSTATUS]=status
+  [MNT_DIR]=mntDir
+  [UUID]=uuid
+  [WORK_DIR]=runDir
+  [DB_SIZE]=idxSize
+)
+
+# legacy bees config files can be arbitrary shell scripts, so we need to actually evaluate them
+sandboxedConfigFileEval() {
+  bash_exe=$(type -P bash) || exit
+  PATH=/var/empty ENV='' BASH_ENV='' AL128K="$((128*1024))" AL16M="$((16*1024*1024))" "$bash_exe" -r ${bees_debug+-x} \
+    -c 'eval "$(</dev/stdin)" >&2; for var; do [[ ${!var} ]] && printf "%q=%s\\0" "$var" "${!var}"; done' \
+    "${!altConfigNames[@]}" "${allConfigNames[@]}" \
+    <"$1"
+}
+
+readConfigFileIfExists() {
+  local line
+  [[ -s $1 ]] || return 1
+  while IFS= read -r -d '' line; do
+    line=${line%%+([[:space:]])"#"*}
+    [[ $line ]] || continue
+    [[ $line = *=* ]] || {
+      printf 'WARNING: Config file line not recognized: %q\n' "$line" >&2
+      continue
+    }
+    set_option "$line"
+  done < <(sandboxedConfigFileEval "$1")
+}
+
+set_option() {
+  local k v
+  k="${1%%=*}" v="${1#*=}"
+  [[ ${altConfigNames[$k]} ]] && k=${altConfigNames[$k]}
+  printf -v "bees_$k" %s "$v"
+}
+
+uuid_re='^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$'
+
+# Shared code for setting configuration used by other operations.
+#
+# Reads from global associative array "opts" containing options passed in as
+# key=value pairs on the command line, looks for config-file overrides, and
+# sets individual global variables.
+_setup() {
+  declare fstype
+  bees_fsSpec=$1; shift
+
+  # Look for file-based configuration, additional to honoring configuration on the command line
+  bees_config_dir="${bees_config_dir:-/etc/bees}"
+  if [[ $bees_fsSpec =~ $uuid_re ]]; then
+    bees_uuid=$bees_fsSpec
+    # If our spec looks like a bare UUID, and no config file exists in the new
+    # format, fall back to legacy config file search mechanism (grep; ewww).
+    if ! readConfigFileIfExists "$bees_config_dir/UUID=$bees_fsSpec.conf"; then
+      # Legacy approach to finding a config file: Grep for a *.conf file
+      # containing the UUID within its text. Permitting spaces around the "="
+      # appears to be a bug, but is retained for compatibility with the
+      # original upstream script.
+      allConfFiles=( "$bees_config_dir"/*.conf )
+      if (( ${#allConfFiles[@]} )); then
+        # in read or readarray with -d '', the NUL terminating the empty string is used as delimiter character.
+        readarray -d '' -t matchingConfFiles < <(grep -E -l -Z "^[^#]*UUID[[:space:]]*=[[:space:]]*" "${allConfFiles[@]}")
+      else
+        matchingConfFiles=( )
+      fi
+      if (( ${#matchingConfFiles[@]} == 1 )); then
+        # Exactly one configuration file exists in our target directory with a reference to the UUID given.
+        bees_config_file=${matchingConfFiles[0]}
+        readConfigFileIfExists "$bees_config_file"
+        echo "NOTE: Please consider renaming $bees_config_file to $bees_config_dir/UUID=$bees_fsSpec" >&2
+        echo "      ...and passing UUID=$bees_fsSpec on startup." >&2
+      elif (( ${#matchingConfFiles[@]} > 1 )); then
+        # The legacy wrapper would silently use the first file and ignore
+        # others, but... no.
+        echo "ERROR: Passed a bare UUID, but multiple configuration files match it:" >&2
+        printf ' - %q\n' "${matchingConfFiles[@]}" >&2
+        die "Unable to continue."
+      fi
+    fi
+  else
+    # For a non-UUID fsSpec that is not a path, look only for a config file
+    # exactly matching its text.
+    #
+    # (Passing a mount point as a fsSpec is only supported with the new
+    # wrapper; all key=value pairs can be passed on the command line in this
+    # mode, so config file support is not needed).
+    [[ $bees_fsSpec = */* ]] || readConfigFileIfExists "$bees_config_dir/$bees_fsSpec.conf"
+  fi
+
+  [[ $bees_uuid ]] || {
+    # if bees_uuid is not in our .conf file, look it up with findmnt
+    read -r bees_uuid fstype < <(findmnt -n -o uuid,fstype "$bees_fsSpec") && [[ $fstype ]] || exit
+    [[ $fstype = btrfs ]] || die "Device type is $fstype, not btrfs"
+  }
+
+  [[ $bees_uuid = */* ]] || readConfigFileIfExists "$bees_config_dir/UUID=$bees_uuid.conf"
+
+  # Honor any values read from config files above; otherwise, set defaults.
+  bees_workDir="${bees_workDir:-.beeshome}"
+  bees_runDir="${bees_runDir:-/run/bees}"
+  bees_mntDir="${bees_mntDir:-$bees_runDir/mnt/$bees_uuid}"
+  bees_home="${bees_home:-$bees_mntDir/$bees_workDir}"
+  bees_status="${bees_status:-${bees_runDir}/$bees_uuid.status}"
+  bees_verbosity="${bees_verbosity:-6}"
+  bees_idxSizeMB="${bees_idxSizeMB:-1024}"
+  bees_idxSize=${bees_idxSize:-"$(( bees_idxSizeMB * 1024 * 1024 ))"}
+  bees_blockdev=${bees_blockdev:-"/dev/disk/by-uuid/$bees_uuid"}
+
+  [[ -b $bees_blockdev ]] || die "Block device $bees_blockdev missing"
+  (( bees_idxSize % (16 * 1024 * 1024) == 0 )) || die "DB size must be divisible by 16MB"
+}
+
+do_run() {
+  local db old_db_size
+
+  _setup "$1"; shift
+  mkdir -p -- "$bees_mntDir" || exit
+
+  # subvol id 5 is reserved for the root subvolume of a btrfs filesystem.
+  mountpoint -q "$bees_mntDir" || mount -osubvolid=5 -- "$bees_blockdev" "$bees_mntDir" || exit
+  if [[ -d $bees_home ]]; then
+    btrfs subvolume show "$bees_home" >/dev/null 2>&1 || die "$bees_home exists but is not a subvolume"
+  else
+    btrfs subvolume create "$bees_home" || exit
+    sync # workaround for Zygo/bees#93
+  fi
+  db=$bees_home/beeshash.dat
+  touch -- "$db"
+
+  old_db_size=$(stat -c %s -- "$db")
+  new_db_size=$bees_idxSize
+
+  if (( old_db_size != new_db_size )); then
+    rm -f -- "$bees_home"/beescrawl."$bees_uuid".dat
+    truncate -s "$new_db_size" -- "$db" || exit
+  fi
+  chmod 700 -- "$bees_home"
+
+  # BEESSTATUS and BEESHOME are the only variables handled by the legacy
+  # wrapper for which getenv() is called in C code.
+  BEESSTATUS=$bees_status BEESHOME=$bees_home exec "${beesd_bin:-/lib/bees/bees}" \
+    --verbose "$bees_verbosity" \
+    "$@" "$bees_mntDir" || exit
+}
+
+do_cleanup() {
+  _setup "$1"; shift
+  mountpoint -q "$bees_mntDir" && umount -l -- "$bees_mntDir" || exit
+}
+
+(( $# >= 2 )) || usage
+declare -f "do_$1" >/dev/null 2>&1 || usage
+mode=$1; shift # must be a do_* function; currently "run" or "cleanup"
+
+declare -a args=( "$1" ); shift  # pass first argument (config-name|fsSpec) through literally
+
+# parse other arguments as key=value pairs, or pass them through literally if they do not match that form.
+# similarly, any option after "--" will be passed through literally.
+while (( $# )); do
+  if [[ $1 = *=* ]]; then
+    set_option "$1"
+  elif [[ $1 = -- ]]; then
+    shift
+    args+=( "$@" )
+    break
+  else
+    args+=( "$1" )
+  fi
+  shift
+done
+
+"do_$mode" "${args[@]}"
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
new file mode 100644
index 00000000000..c43962cb075
--- /dev/null
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, runCommand, makeWrapper, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }:
+
+let
+
+  version = "0.6.1";
+  sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
+
+  bees = stdenv.mkDerivation rec {
+    name = "bees-${version}";
+    inherit version;
+
+    src = fetchFromGitHub {
+      owner = "Zygo";
+      repo = "bees";
+      rev = "v${version}";
+      inherit sha256;
+    };
+
+    buildInputs = [
+      btrfs-progs               # for btrfs/ioctl.h
+      utillinux                 # for uuid.h
+    ];
+
+    nativeBuildInputs = [
+      pythonPackages.markdown   # documentation build
+    ];
+
+    preBuild = ''
+      git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; }
+      export -f git
+    '';
+
+    postBuild = ''
+      unset -f git
+    '';
+
+    buildFlags = [
+      "ETC_PREFIX=/var/run/bees/configs"
+    ];
+
+    makeFlags = [
+      "SHELL=bash"
+      "PREFIX=$(out)"
+      "ETC_PREFIX=$(out)/etc"
+      "BEES_VERSION=${version}"
+      "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system"
+    ];
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/Zygo/bees";
+      description = "Block-oriented BTRFS deduplication service";
+      license = licenses.gpl3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ chaduffy ];
+      longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ";
+    };
+  };
+
+in
+
+runCommand "bees-service-${version}" {
+  inherit bash bees coreutils utillinux;
+  btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
+} ''
+  mkdir -p -- "$out/bin"
+  substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
+  chmod +x "$out"/bin/bees-service-wrapper
+  ln -s ${bees}/bin/beesd "$out"/bin/beesd
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09f566ccd7f..c7fe0a978c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21893,6 +21893,8 @@ with pkgs;
 
   beep = callPackage ../misc/beep { };
 
+  bees = callPackage ../tools/filesystems/bees { };
+
   blackbird = callPackage ../misc/themes/blackbird { };
 
   bootil = callPackage ../development/libraries/bootil { };

From 86db2f394cdc8d96f84c50f92da0e5bb96843b52 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sun, 14 Oct 2018 10:58:56 -0500
Subject: [PATCH 0397/2793] nixos/modules: services.bees init

---
 nixos/modules/module-list.nix        |   1 +
 nixos/modules/services/misc/bees.nix | 123 +++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 nixos/modules/services/misc/bees.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ae5084ca2a2..5074976fafa 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -336,6 +336,7 @@
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/autorandr.nix
+  ./services/misc/bees.nix
   ./services/misc/bepasty.nix
   ./services/misc/canto-daemon.nix
   ./services/misc/calibre-server.nix
diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix
new file mode 100644
index 00000000000..b0ed2d5c286
--- /dev/null
+++ b/nixos/modules/services/misc/bees.nix
@@ -0,0 +1,123 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.beesd;
+
+  logLevels = { emerg = 0; alert = 1; crit = 2; err = 3; warning = 4; notice = 5; info = 6; debug = 7; };
+
+  fsOptions = with types; {
+    options.spec = mkOption {
+      type = str;
+      description = ''
+        Description of how to identify the filesystem to be duplicated by this
+        instance of bees. Note that deduplication crosses subvolumes; one must
+        not configure multiple instances for subvolumes of the same filesystem
+        (or block devices which are part of the same filesystem), but only for
+        completely independent btrfs filesystems.
+        </para>
+        <para>
+        This must be in a format usable by findmnt; that could be a key=value
+        pair, or a bare path to a mount point.
+      '';
+      example = "LABEL=MyBulkDataDrive";
+    };
+    options.hashTableSizeMB = mkOption {
+      type = types.addCheck types.int (n: mod n 16 == 0);
+      default = 1024; # 1GB; default from upstream beesd script
+      description = ''
+        Hash table size in MB; must be a multiple of 16.
+        </para>
+        <para>
+        A larger ratio of index size to storage size means smaller blocks of
+        duplicate content are recognized.
+        </para>
+        <para>
+        If you have 1TB of data, a 4GB hash table (which is to say, a value of
+        4096) will permit 4KB extents (the smallest possible size) to be
+        recognized, whereas a value of 1024 -- creating a 1GB hash table --
+        will recognize only aligned duplicate blocks of 16KB.
+      '';
+    };
+    options.verbosity = mkOption {
+      type = types.enum (attrNames logLevels ++ attrValues logLevels);
+      apply = v: if isString v then logLevels.${v} else v;
+      default = "info";
+      description = "Log verbosity (syslog keyword/level).";
+    };
+    options.workDir = mkOption {
+      type = str;
+      default = ".beeshome";
+      description = ''
+        Name (relative to the root of the filesystem) of the subvolume where
+        the hash table will be stored.
+      '';
+    };
+    options.extraOptions = mkOption {
+      type = listOf str;
+      default = [];
+      description = ''
+        Extra command-line options passed to the daemon. See upstream bees documentation.
+      '';
+      example = literalExample ''
+        [ "--thread-count" "4" ]
+      '';
+    };
+  };
+
+in {
+
+  options.services.beesd = {
+    filesystems = mkOption {
+      type = with types; attrsOf (submodule fsOptions);
+      description = "BTRFS filesystems to run block-level deduplication on.";
+      default = { };
+      example = literalExample ''
+        {
+          root = {
+            spec = "LABEL=root";
+            hashTableSizeMB = 2048;
+            verbosity = "crit";
+            extraOptions = [ "--loadavg-target" "5.0" ];
+          };
+        }
+      '';
+    };
+  };
+  config = {
+    systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" {
+      description = "Block-level BTRFS deduplication for %i";
+      after = [ "sysinit.target" ];
+
+      serviceConfig = let
+        configOpts = [
+          fs.spec
+          "verbosity=${toString fs.verbosity}"
+          "idxSizeMB=${toString fs.hashTableSizeMB}"
+          "workDir=${fs.workDir}"
+        ];
+        configOptsStr = escapeShellArgs configOpts;
+      in {
+        # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in
+        ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
+        ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
+        CPUAccounting = true;
+        CPUWeight = 12;
+        IOSchedulingClass = "idle";
+        IOSchedulingPriority = 7;
+        IOWeight = 10;
+        KillMode = "control-group";
+        KillSignal = "SIGTERM";
+        MemoryAccounting = true;
+        Nice = 19;
+        Restart = "on-abnormal";
+        StartupCPUWeight = 25;
+        StartupIOWeight = 25;
+        SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper"
+      };
+      wantedBy = ["multi-user.target"];
+    }) cfg.filesystems;
+  };
+}

From f50bfe267a312515d88e86c12ae002c4feefcc1f Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Mon, 26 Nov 2018 13:47:58 -0600
Subject: [PATCH 0398/2793] nixos.tests.bees: init

---
 nixos/tests/bees.nix | 55 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 nixos/tests/bees.nix

diff --git a/nixos/tests/bees.nix b/nixos/tests/bees.nix
new file mode 100644
index 00000000000..6f68c2f834f
--- /dev/null
+++ b/nixos/tests/bees.nix
@@ -0,0 +1,55 @@
+import ./make-test.nix ({ lib, ... }:
+{
+  name = "bees";
+
+  machine = { config, pkgs, ... }: {
+    boot.initrd.postDeviceCommands = ''
+      ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb
+      ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
+    '';
+    virtualisation.emptyDiskImages = [ 4096 4096 ];
+    fileSystems = lib.mkVMOverride {
+      "/aux1" = { # filesystem configured to be deduplicated
+        device = "/dev/disk/by-label/aux1";
+        fsType = "btrfs";
+      };
+      "/aux2" = { # filesystem not configured to be deduplicated
+        device = "/dev/disk/by-label/aux2";
+        fsType = "btrfs";
+      };
+    };
+    services.beesd.filesystems = {
+      aux1 = {
+        spec = "LABEL=aux1";
+        hashTableSizeMB = 16;
+        verbosity = "debug";
+      };
+    };
+  };
+
+  testScript =
+  let
+    withRetry = content: maxTests: sleepTime: ''
+      max_tests=${lib.escapeShellArg maxTests}; sleep_time=${lib.escapeShellArg sleepTime}; for ((i=0; i<max_tests; i++)); do ${content} && exit 0; sleep "$sleep_time"; done; exit 1;
+    '';
+    someContentIsShared = loc: ''[[ $(btrfs fi du -s --raw ${lib.escapeShellArg loc}/dedup-me-{1,2} | awk 'BEGIN { count=0; } NR>1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]'';
+  in ''
+    # shut down the instance started by systemd at boot, so we can test our test procedure
+    $machine->succeed("systemctl stop beesd\@aux1.service");
+
+    $machine->succeed("dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8");
+    $machine->succeed("cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2");
+    $machine->succeed("cp --reflink=never /aux1/* /aux2/");
+    $machine->succeed("sync");
+    $machine->fail(q(${someContentIsShared "/aux1"}));
+    $machine->fail(q(${someContentIsShared "/aux2"}));
+    $machine->succeed("systemctl start beesd\@aux1.service");
+
+    # assert that "Set Shared" column is nonzero
+    $machine->succeed(q(${withRetry (someContentIsShared "/aux1") 20 2}));
+    $machine->fail(q(${someContentIsShared "/aux2"}));
+
+    # assert that 16MB hash table size requested was honored
+    $machine->succeed(q([[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]))
+  '';
+})

From 3f806a0ae7f00fc0bb629a8d2d45ffe306db95d7 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Fri, 30 Nov 2018 05:12:24 +1100
Subject: [PATCH 0399/2793] perceptualdiff: init at 2.1

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

diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix
new file mode 100644
index 00000000000..d394a816a49
--- /dev/null
+++ b/pkgs/tools/graphics/perceptualdiff/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, freeimage }:
+
+stdenv.mkDerivation rec {
+  pname = "perceptualdiff";
+  name = "${pname}-${version}";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "myint";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ freeimage ];
+
+  meta = with stdenv.lib; {
+    description = "A program that compares two images using a perceptually based image metric";
+    homepage = "https://github.com/myint/perceptualdiff";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ uri-canva ];
+    platforms = platforms.x86;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a1b72ff1b3..29c4e7cabe6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4662,6 +4662,8 @@ with pkgs;
 
   pepper = callPackage ../tools/admin/salt/pepper { };
 
+  perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
+
   percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup {
     boost = boost159;
   };

From cf1fb28991f2bf2b47b650d1a233049d3aeca1eb Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Nov 2018 03:17:56 -0500
Subject: [PATCH 0400/2793] python3Packages.datrie: fix build (#51250)

---
 pkgs/development/python-modules/datrie/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix
index f9ac491dc81..eb654c65077 100644
--- a/pkgs/development/python-modules/datrie/default.nix
+++ b/pkgs/development/python-modules/datrie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestrunner, hypothesis}:
+, cython, pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
   pname = "datrie";
@@ -10,8 +10,15 @@ buildPythonPackage rec {
     sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
   };
 
+  nativeBuildInputs = [ cython ];
   buildInputs = [ pytest pytestrunner hypothesis ];
 
+  # recompile pxd and pyx for python37
+  # https://github.com/pytries/datrie/issues/52
+  preBuild = ''
+    ./update_c.sh
+  '';
+
   meta = with stdenv.lib; {
     description = "Super-fast, efficiently stored Trie for Python";
     homepage = "https://github.com/kmike/datrie";

From 8d61b9d079de1460d9e1e73f73174bea30fd324d Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Fri, 30 Nov 2018 10:55:09 +0100
Subject: [PATCH 0401/2793] anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7

With recent switch to python 3.7 this was no longer building.

Upstream PR with the same patch: https://github.com/dae/anki/pull/266
---
 pkgs/games/anki/default.nix             |  5 +++--
 pkgs/games/anki/python-3.7-compat.patch | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/games/anki/python-3.7-compat.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index fb43640b2b1..c73afdd0393 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -25,7 +25,7 @@
 }:
 
 buildPythonApplication rec {
-    version = "2.1.6-beta1";
+    version = "2.1.6-beta2";
     name = "anki-${version}";
 
     src = fetchurl {
@@ -35,7 +35,7 @@ buildPythonApplication rec {
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "0yqn8qjx9dyf754jljhyyrk8mahii188nz0yifl1lr3py9sxzbsf";
+      sha256 = "0h71s1j1269x0b8481z8xf019caqglcjs32xlpzk72087ps169fa";
     };
 
     propagatedBuildInputs = [ pyqt5 sqlalchemy
@@ -53,6 +53,7 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
+      ./python-3.7-compat.patch
     ];
 
     buildPhase = ''
diff --git a/pkgs/games/anki/python-3.7-compat.patch b/pkgs/games/anki/python-3.7-compat.patch
new file mode 100644
index 00000000000..8545b39d08c
--- /dev/null
+++ b/pkgs/games/anki/python-3.7-compat.patch
@@ -0,0 +1,23 @@
+commit 3d69aa9ce454a151ba75deafd7de117af2c7307d
+Author: Alexey Lebedeff <binarin@binarin.ru>
+Date:   Fri Nov 30 10:44:39 2018 +0100
+
+    Fix searching for python 3.7
+    
+    3.7 introduced a change to `re.escape()`, which no longer escapes
+    `%`. By using `re.escape("%")` instead of a literal, we can detect
+    a proper form at runtime.
+
+diff --git a/anki/find.py b/anki/find.py
+index 48d0dd1..213216d 100644
+--- a/anki/find.py
++++ b/anki/find.py
+@@ -440,7 +440,7 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
+             # nothing has that field
+             return
+         # gather nids
+-        regex = re.escape(val).replace("_", ".").replace("\\%", ".*")
++        regex = re.escape(val).replace("_", ".").replace(re.escape('%'), ".*")
+         nids = []
+         for (id,mid,flds) in self.col.db.execute("""
+ select id, mid, flds from notes

From 7621523fc19d76a6fe8715a25159557b872fc6af Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Fri, 30 Nov 2018 12:46:14 +0100
Subject: [PATCH 0402/2793] Add bisect_ppx and bisect_ppx-ocamlbuild

---
 .../bisect_ppx-ocamlbuild/default.nix         | 32 ++++++++++++++++++
 .../ocaml-modules/bisect_ppx/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  3 ++
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
 create mode 100644 pkgs/development/ocaml-modules/bisect_ppx/default.nix

diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
new file mode 100644
index 00000000000..e4d5c22c187
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocamlbuild }:
+
+let version = "1.4.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-bisect_ppx-ocamlbuild-${version}";
+
+  src = fetchFromGitHub {
+    owner = "aantron";
+    repo = "bisect_ppx";
+    rev = version;
+    sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
+  };
+
+  buildInputs = [
+    ocaml
+    dune
+    findlib
+    ocamlbuild
+  ];
+
+  buildPhase = "dune build -p bisect_ppx-ocamlbuild";
+
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = https://github.com/aantron/bisect_ppx;
+    platforms = ocaml.meta.platforms or [];
+    description = "Code coverage for OCaml";
+    license = stdenv.lib.licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
new file mode 100644
index 00000000000..7b39cd1968f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocaml-migrate-parsetree, ppx_tools_versioned }:
+
+let version = "1.4.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-bisect_ppx-${version}";
+
+  src = fetchFromGitHub {
+    owner = "aantron";
+    repo = "bisect_ppx";
+    rev = version;
+    sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
+  };
+
+  buildInputs = [
+    ocaml
+    dune
+    findlib
+    ocaml-migrate-parsetree
+    ppx_tools_versioned
+  ];
+
+  buildPhase = "dune build -p bisect_ppx";
+
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = https://github.com/aantron/bisect_ppx;
+    platforms = ocaml.meta.platforms or [];
+    description = "Code coverage for OCaml";
+    license = stdenv.lib.licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index cf06b52c5ba..7d03651eac9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -131,6 +131,9 @@ let
 
     bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
 
+    bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { };
+    bisect_ppx-ocamlbuild = callPackage ../development/ocaml-modules/bisect_ppx-ocamlbuild { };
+
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
     cairo2 = callPackage ../development/ocaml-modules/cairo2 { };

From 3b8d6ef2936f43a55a04080ac5354772f238879a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 30 Nov 2018 13:35:25 +0100
Subject: [PATCH 0403/2793] roundcube: 1.3.7 -> 1.3.8

This is a service release to update the stable version 1.3 of Roundcube
Webmail.  It contains fixes to several bugs backported from the master
branch including a security fix for a reported XSS vulnerability plus
updates to ensure compatibility with PHP 7.3 and recent versions of
Courier-IMAP, Dovecot and MySQL 8. See the complete changelog at
https://github.com/roundcube/roundcubemail/releases/tag/1.3.8
---
 pkgs/servers/roundcube/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 40afd7043e4..c0648f5183d 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchzip }:
 let
-  version = "1.3.7";
+  version = "1.3.8";
 in
 fetchzip rec {
   name= "roundcube-${version}";
 
-  url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; 
-  sha256 = "0xwqy0adynx7066a0cvz9vyg85waax1i4p70kcdkz7q5jnw4jzhf";
- 
+  url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
+  sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks";
+
   extraPostFetch = ''
     ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
     rm -rf $out/installer

From 99d623850f56975f026a56b96be0f79db1ba00f7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Nov 2018 14:23:33 +0100
Subject: [PATCH 0404/2793] wlroots: Fix the build on master

I was testing the build on nixos-unstable but
64d50a00991983e90d6a22f39d03b028602e34d6 added another patch. Since this
patch is already in 0.48.0 it can't be applied again (overriding Meson
isn't optimal but we can't build wlroots with 0.46.1).

I've also dropped the "-Dxcb-xkb=enabled" flag since it was removed
(replaced with Xinput).

Thanks @kenogo for noticing this :)
---
 pkgs/development/libraries/wlroots/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 9791f04fd87..efe7214ab6a 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -17,8 +17,11 @@ let
       inherit pname version;
       sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
     };
-    patches = builtins.filter # Remove gir-fallback-path.patch
-      (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str))
+    # Remove gir-fallback-path.patch and
+    # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0):
+    patches = builtins.filter
+      (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str
+              || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str))
       oldAttrs.patches;
   });
 in stdenv.mkDerivation rec {
@@ -50,7 +53,7 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
-    "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled"
+    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
   ];
 
   postInstall = ''

From 66efb76c75c829d0ca0ee322a68c35eaabbff59d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Nov 2018 15:30:55 +0000
Subject: [PATCH 0405/2793] ocamlPackages.buildDunePackage: fix meta.platforms

---
 pkgs/build-support/ocaml/dune.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index 7386b07f575..4d6ed76aca0 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation ({
     runHook postInstall
   '';
 
-  meta.platform = ocaml.meta.platform;
-
 } // args // {
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
   buildInputs = [ ocaml dune findlib ] ++ buildInputs;
 
+  meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; };
+
 })

From 74e283403c9f10504c1d2ab8c4970289c81a482b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Fri, 30 Nov 2018 17:37:50 +0100
Subject: [PATCH 0406/2793] nixos/borgbackup: allow paths to be empty or
 relative (#51275)

This former necessary in order to exclusively use `--pattern` or `--patterns-from`.
Fixes #51267.
---
 nixos/modules/services/backup/borgbackup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 415a70ea5ad..bf41aee8fe0 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -191,7 +191,7 @@ in {
         options = {
 
           paths = mkOption {
-            type = with types; either path (nonEmptyListOf path);
+            type = with types; either path (listOf str);
             description = "Path(s) to back up.";
             example = "/home/user";
             apply = x: if isList x then x else [ x ];

From e3768c8063e06531320b5519d9a1bba87115cc79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Hrnko?= <jan.hrnko@satoshilabs.com>
Date: Fri, 30 Nov 2018 17:57:47 +0100
Subject: [PATCH 0407/2793] trezord: 2.0.24 -> 2.0.25

---
 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 86fe1d7b008..98079c37f1f 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.24";
+  version = "2.0.25";
 
   # 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 = "1fl2d57qqrrwl995w4b2d57rvl2cxxy6afjmcp648hhb3dnmp7c3";
+    sha256 = "151szgfbikijpwqrvqj43kw38kbbgx2g1khlbj6l4925qba7fycd";
   };
 
   meta = with stdenv.lib; {

From 28e2277305f8c6eeee3f6f773927b956eb903a15 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Nov 2018 12:26:21 -0600
Subject: [PATCH 0408/2793] make-derivation: remove selfConsistent check

version is set in lots of places but might not need to be in a name.

Alternative to #50364.
---
 pkgs/stdenv/generic/make-derivation.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index ec51b5415c1..5f6f608aa7a 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -81,13 +81,6 @@ rec {
     , ... } @ attrs:
 
     let
-      # Check that the name is consistent with pname and version:
-      selfConsistent = (with attrs; attrs ? "name" ->
-        (lib.assertMsg (attrs ? "version" -> lib.strings.hasInfix version name)
-          "version ${version} does not appear in name ${name}" &&
-        lib.assertMsg (attrs ? "pname" -> lib.strings.hasInfix pname name)
-          "pname ${pname} does not appear in name ${name}"));
-
       computedName = if name != "" then name else "${attrs.pname}-${attrs.version}";
 
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
@@ -188,7 +181,7 @@ rec {
         // {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
-          name = assert selfConsistent && validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
+          name = assert validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
             # Fixed-output derivations like source tarballs shouldn't get a host
             # suffix. But we have some weird ones with run-time deps that are
             # just used for their side-affects. Those might as well since the

From a47479ec7ee8c787543bb1d18cf8d724a01a4328 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 29 Nov 2018 19:45:31 -0500
Subject: [PATCH 0409/2793] reptyr: enable on 32-bit ARM Linux and x86 FreeBSD

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

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index d8880542e51..03aceb2b7a8 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "0.6.2";
@@ -20,9 +20,14 @@ stdenv.mkDerivation rec {
 
   makeFlags = ["PREFIX=$(out)"];
   meta = {
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.mit;
-    description = ''A Linux tool to change controlling pty of a process'';
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+      "i686-freebsd"
+      "x86_64-freebsd"
+    ] ++ lib.platforms.arm;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.mit;
+    description = "Reparent a running program to a new terminal";
   };
 }

From 99a720d2bb5fce2a2310f588aaab56eb9b87b8e2 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 30 Nov 2018 11:44:05 -0500
Subject: [PATCH 0410/2793] reptyr: add homepage

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

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 03aceb2b7a8..37f1362e14e 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [raskin];
     license = lib.licenses.mit;
     description = "Reparent a running program to a new terminal";
+    homepage = https://github.com/nelhage/reptyr;
   };
 }

From a8f1e430f2c456f7eec38d8648db4e427458c4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 30 Nov 2018 15:42:11 -0200
Subject: [PATCH 0411/2793] nordic: fix sha256 hash

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

diff --git a/pkgs/misc/themes/nordic/default.nix b/pkgs/misc/themes/nordic/default.nix
index c375e21e3ae..ac24e35c66f 100644
--- a/pkgs/misc/themes/nordic/default.nix
+++ b/pkgs/misc/themes/nordic/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     })
     (fetchurl {
       url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
-      sha256 = "0xnj1am1q26xppp8y07iik648hhgn3gmzqvkdhg3il4qnkndjvld";
+      sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5";
     })
   ];
 

From dc21737eddac6494b24bb96e52b2ec42b1f3f8d8 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 30 Nov 2018 18:57:33 +0100
Subject: [PATCH 0412/2793] ntfy: 2.6.0 -> 2.7.0

---
 .../python-modules/ntfy/default.nix           | 39 -------------------
 pkgs/tools/misc/ntfy/default.nix              | 37 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 38 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ntfy/default.nix
 create mode 100644 pkgs/tools/misc/ntfy/default.nix

diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix
deleted file mode 100644
index efbd1eec35a..00000000000
--- a/pkgs/development/python-modules/ntfy/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, appdirs
-, ruamel_yaml
-, requests
-, emoji
-, sleekxmpp
-, mock
-, psutil
-, python
-# , dbus-python
-}:
-
-buildPythonPackage rec {
-  version = "2.6.0";
-  pname = "ntfy";
-
-  src = fetchFromGitHub {
-    owner = "dschep";
-    repo = "ntfy";
-    rev = "v${version}";
-    sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
-  };
-
-  propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ];
-
-  checkPhase = ''
-    HOME=$(mktemp -d) ${python.interpreter} setup.py test
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A utility for sending notifications, on demand and when commands finish";
-    homepage = http://ntfy.rtfd.org/;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ kamilchm ];
-  };
-
-}
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
new file mode 100644
index 00000000000..26517361ae2
--- /dev/null
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "ntfy";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "dschep";
+    repo = "ntfy";
+    rev = "v${version}";
+    sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
+  };
+
+  checkInputs = with pythonPackages; [
+    mock
+  ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    requests ruamel_yaml appdirs
+    sleekxmpp dns
+    emoji
+    psutil
+    matrix-client
+    dbus-python
+  ];
+
+  checkPhase = ''
+    HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A utility for sending notifications, on demand and when commands finish";
+    homepage = http://ntfy.rtfd.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jfrankenau kamilchm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab155865ecb..93cf1650180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4472,7 +4472,7 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  ntfy = pythonPackages.ntfy;
+  ntfy = callPackage ../tools/misc/ntfy {};
 
   ntopng = callPackage ../tools/networking/ntopng { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5a0d57a2d5..134748260ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2995,8 +2995,6 @@ in {
 
   emoji = callPackage ../development/python-modules/emoji { };
 
-  ntfy = callPackage ../development/python-modules/ntfy { };
-
   ntplib = callPackage ../development/python-modules/ntplib { };
 
   numba = callPackage ../development/python-modules/numba { };

From 8d3a7ff48d8a0d7707b5ce6b0e03376b0c0479bc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:14:05 -0500
Subject: [PATCH 0413/2793] libsignon-glib: unstable-2018-10-24 -> 2.1

---
 pkgs/development/libraries/libsignon-glib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index db2b468bb3a..2e5162dda00 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libsignon-glib";
-  version = "unstable-2018-10-24";
+  version = "2.1";
 
   outputs = [ "out" "dev" "devdoc" "py" ];
 
   src = fetchgit {
     url = "https://gitlab.com/accounts-sso/${pname}";
-    rev = "3639a2e90447e4640a03a44972560afe8f61aa48";
+    rev = "refs/tags/${version}";
+    sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0";
     fetchSubmodules = true;
-    sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
   };
 
   nativeBuildInputs = [

From f966aea21f472aca812caa8e96b2175859ad4e51 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:16:32 -0500
Subject: [PATCH 0414/2793] gsignond: unstable-2018-10-04 -> 1.2.0

---
 pkgs/development/libraries/gsignond/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
index af7aa2b1207..b7b498f9aa1 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -6,16 +6,15 @@
 let
 unwrapped = stdenv.mkDerivation rec {
   pname = "gsignond";
-  version = "unstable-2018-10-04";
-
+  version = "1.2.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchFromGitLab {
     owner = "accounts-sso";
     repo = pname;
-    rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
-    sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
+    rev = version;
+    sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
   };
 
   nativeBuildInputs = [

From 8da5d27db893ee42b84dd2ce801c12bc33086a54 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:24:55 -0500
Subject: [PATCH 0415/2793] gsignondPlugins.mail: 2018-10-04 -> 0.3.0

---
 pkgs/development/libraries/gsignond/plugins/mail.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
index 763e76c9cc9..f0cc27105a1 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "gsignond-plugin-mail-${version}";
-  version = "2018-10-04";
+  pname = "gsignond-plugin-mail";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     owner = "accounts-sso";
     repo = "gsignond-plugin-mail";
-    rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
-    sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
+    rev = version;
+    sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
   };
 
   nativeBuildInputs = [

From 4428c7c4597f5bd2a3f88131cb1ed13158e80bff Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:04:46 -0500
Subject: [PATCH 0416/2793] gsignond: add meta to wrapper

---
 pkgs/development/libraries/gsignond/wrapper.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix
index a5df6bbeafb..04463aac379 100644
--- a/pkgs/development/libraries/gsignond/wrapper.nix
+++ b/pkgs/development/libraries/gsignond/wrapper.nix
@@ -20,4 +20,6 @@ symlinkJoin {
     substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
       --replace ${gsignond} $out
   '';
+
+  inherit (gsignond) meta;
 }

From 66a8c691344e5aabda2f9d0693e8cf748d49e5fc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:05:09 -0500
Subject: [PATCH 0417/2793] gsignondPlugins.lastfm: correct description

---
 pkgs/development/libraries/gsignond/plugins/lastfm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index a23c1487881..929309095c7 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
   meta = with stdenv.lib; {
-    description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
+    description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
     homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ worldofpeace ];

From f5d2cb01701f63ba3777b6be402d33b9fcaa23ec Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:05:25 -0500
Subject: [PATCH 0418/2793] gsignondPlugins.mail: correct description

---
 pkgs/development/libraries/gsignond/plugins/mail.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
index f0cc27105a1..165c90b303a 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
   meta = with stdenv.lib; {
-    description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
+    description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
     homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ worldofpeace ];

From 214ac4bf728d0366a13f889a88578d9261683765 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:05:41 -0500
Subject: [PATCH 0419/2793] gsignondPlugins.oauth: correct description

---
 pkgs/development/libraries/gsignond/plugins/oauth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index ee45430122c..af623bf0d9b 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
   meta = with stdenv.lib; {
-    description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
+    description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
     homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ worldofpeace ];

From 40e234d2ae01b9bd2f6eabe5b49ad3b4ea000faf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:05:56 -0500
Subject: [PATCH 0420/2793] gsignondPlugins.sasl: correct description

---
 pkgs/development/libraries/gsignond/plugins/sasl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 25f20557906..6d3fd6c0380 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
   meta = with stdenv.lib; {
-    description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
+    description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
     homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ worldofpeace ];

From 31740434e7d8ab3831459bdce99b27cf01765635 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:06:58 -0500
Subject: [PATCH 0421/2793] libsignon-glib: use double quotes for description

---
 pkgs/development/libraries/libsignon-glib/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index 2e5162dda00..32e58dcac4b 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = ''
-      A library for managing single signon credentials which can be used from GLib applications
-    '';
+    description = "A library for managing single signon credentials which can be used from GLib applications";
     homepage = https://gitlab.com/accounts-sso/libsignon-glib;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ worldofpeace ];

From ea1be31262c93155c03c953078fa50f27de14de5 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 30 Nov 2018 13:50:47 -0500
Subject: [PATCH 0422/2793] nvidia: expose nvidia_x11_legacy390

---
 nixos/modules/hardware/video/nvidia.nix       |  2 ++
 pkgs/os-specific/linux/nvidia-x11/default.nix | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 21e12395498..c37392841c4 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -20,6 +20,8 @@ let
       kernelPackages.nvidia_x11_legacy304
     else if elem "nvidiaLegacy340" drivers then
       kernelPackages.nvidia_x11_legacy340
+    else if elem "nvidiaLegacy390" drivers then
+      kernelPackages.nvidia_x11_legacy390
     else null;
 
   nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 49f1500f206..c0f0d18dc3e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -16,17 +16,20 @@ let
 in
 rec {
   # Policy: use the highest stable version as the default (on our master).
-  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390;
+  stable = if stdenv.hostPlatform.system != "x86_64-linux"
+    then legacy_390
+    else generic {
+      version = "410.78";
+      sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx";
+      settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77";
+      persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4";
+    };
 
-  stable_410 = generic {
-    version = "410.78";
-    sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx";
-    settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77";
-    persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4";
-  };
+  # No active beta right now
+  beta = stable;
 
   # Last one supporting x86
-  stable_390 = generic {
+  legacy_390 = generic {
     version = "390.87";
     sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw";
     sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
@@ -36,9 +39,6 @@ rec {
     patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
   };
 
-  # No active beta right now
-  beta = stable;
-
   legacy_340 = generic {
     version = "340.107";
     sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 333373f0605..1b32587a6c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14494,6 +14494,7 @@ with pkgs;
 
     nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
     nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
+    nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
     nvidia_x11_beta      = nvidiaPackages.beta;
     nvidia_x11           = nvidiaPackages.stable;
 

From bdb007ddce639bdbc8e82dbc9e672e2cca2e9642 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Nov 2018 21:30:11 +0100
Subject: [PATCH 0423/2793] monkeysphere: Update the comment why the tests
 don't run

---
 pkgs/tools/security/monkeysphere/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index 0cf59dc555c..b1c36871fe6 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -31,8 +31,10 @@ stdenv.mkDerivation rec {
     DESTDIR=$(out)
   '';
 
-  # Not all checks pass yet (NixOS specific problems) and the tests "drain"
-  # entropy (apparently GnuPG still uses /dev/random).
+  # The tests "drain" entropy (GnuPG still uses /dev/random) and they don't run
+  # inside of the sandbox, because nixbld isn't allowed to login via SSH
+  # (/etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell",
+  # sshd: "User nixbld not allowed because shell /noshell does not exist").
   doCheck = false;
   preCheck = ''
     patchShebangs tests/

From 7ba6b65c43706ef7f33a9096272b0c2df6c22f43 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:20 +0000
Subject: [PATCH 0424/2793] =?UTF-8?q?gnome3.adwaita-icon-theme:=203.28.0?=
 =?UTF-8?q?=20=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/adwaita-icon-theme/default.nix   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 1313527e20f..4fa40a6c1b0 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,15 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "adwaita-icon-theme-${version}";
-  version = "3.30.0";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; };
+    sha256 = "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd";
   };
 
   # For convenience, we can specify adwaita-icon-theme only in packages
@@ -24,6 +20,13 @@ stdenv.mkDerivation rec {
   # remove a tree of dirs with no files within
   postInstall = '' rm -rf "$out/locale" '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "adwaita-icon-theme";
+      attrPath = "gnome3.adwaita-icon-theme";
+    };
+  };
+
   meta = with stdenv.lib; {
     platforms = with platforms; linux ++ darwin;
     maintainers = gnome3.maintainers;

From e447800e5f64940ce5328a1080dfa2f536c75b7c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:27 +0000
Subject: [PATCH 0425/2793] =?UTF-8?q?gnome3.aisleriot:=203.22.5=20?=
 =?UTF-8?q?=E2=86=92=203.22.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 7627a45b4d2..d77439b30c5 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "aisleriot-${version}";
-  version = "3.22.5";
+  version = "3.22.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
+    sha256 = "1ysljnrlvzssgbhxcgb28n9k3l0rybxi5lkrm8pg6a4nspaw5mc4";
   };
 
   configureFlags = [

From 3c31467c9d0c918628bd298271a08174591e88ed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:34 +0000
Subject: [PATCH 0426/2793] =?UTF-8?q?atk:=202.28.1=20=E2=86=92=202.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 288bd9a9dd0..7d3ba4d65e0 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "atk";
-  version = "2.28.1";
+  version = "2.30.0";
 in
 
 stdenv.mkDerivation rec {
@@ -12,17 +12,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
+    sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx";
   };
 
-  patches = [
-    # darwin linker arguments https://bugzilla.gnome.org/show_bug.cgi?id=794326
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=369680;
-      sha256 = "11v8fhpsbapa04ifb2268cga398vfk1nq8i628441632zjz1diwg";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

From e29980b37242337f0a67ac8ea4e949974cafe35a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:41 +0000
Subject: [PATCH 0427/2793] =?UTF-8?q?baobab:=203.28.0=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 8d21e9c323b..c29e3ff5200 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "baobab";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
+    sha256 = "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];

From cb842f8533a9871070b323cd53d0edeba22696d5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:47 +0000
Subject: [PATCH 0428/2793] =?UTF-8?q?gnome3.gnome-notes:=203.28.3=20?=
 =?UTF-8?q?=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/{bijiben => gnome-notes}/default.nix        | 12 ++++++------
 pkgs/desktops/gnome-3/default.nix                    |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename pkgs/desktops/gnome-3/apps/{bijiben => gnome-notes}/default.nix (81%)

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/apps/bijiben/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 46c76a8ce17..e39ce00fd65 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -5,13 +5,13 @@
 , gnome3, libxml2 }:
 
 let
-  version = "3.28.3";
+  version = "3.30.3";
 in stdenv.mkDerivation rec {
-  name = "bijiben-${version}";
+  name = "gnome-notes-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0lg92fl6dmrybkxs3gqhyr8rq945y64k51l6s72yiads7pqabli2";
+    url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
+    sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k";
   };
 
   doCheck = true;
@@ -41,13 +41,13 @@ in stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "bijiben";
-      attrPath = "gnome3.bijiben";
+      attrPath = "gnome3.gnome-notes";
     };
   };
 
   meta = with stdenv.lib; {
     description = "Note editor designed to remain simple to use";
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
+    homepage = https://wiki.gnome.org/Apps/Notes;
     license = licenses.gpl3;
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7e4fb77b2b3..c1bb830b2a0 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -246,8 +246,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   accerciser = callPackage ./apps/accerciser { };
 
-  bijiben = callPackage ./apps/bijiben { };
-
   cheese = callPackage ./apps/cheese { };
 
   evolution = callPackage ./apps/evolution { };
@@ -280,6 +278,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-nettool = callPackage ./apps/gnome-nettool { };
 
+  gnome-notes = callPackage ./apps/gnome-notes { };
+
   gnome-photos = callPackage ./apps/gnome-photos {
     gegl = gegl_0_3;
   };
@@ -401,6 +401,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 } // lib.optionalAttrs (config.allowAliases or true) {
 #### Legacy aliases
 
+  bijiben = gnome-notes; # added 2018-09-26
   evolution_data_server = evolution-data-server; # added 2018-02-25
   geocode_glib = geocode-glib; # added 2018-02-25
   glib_networking = glib-networking; # added 2018-02-25

From eb6347bc0553bb4a1817a8d7c2fbb3d27c844aa8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:42:54 +0000
Subject: [PATCH 0429/2793] =?UTF-8?q?gnome3.cheese:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index ab985b1473e..ea2091524c9 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "cheese-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw";
+    sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr";
   };
 
   passthru = {

From 54c3d87de1df27b8ffa3a7b706645344884fa3b1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:02 +0000
Subject: [PATCH 0430/2793] =?UTF-8?q?gnome3.dconf:=200.28.0=20=E2=86=92=20?=
 =?UTF-8?q?0.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/dconf/default.nix | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 219aa4e7475..9c1d7d7d1a9 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, docbook_xsl }:
+{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
 
 let
   pname = "dconf";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "0.28.0";
+  version = "0.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
+    sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
   };
 
   postPatch = ''
@@ -18,12 +18,17 @@ stdenv.mkDerivation rec {
     patchShebangs meson_post_install.py
   '';
 
-  outputs = [ "out" "lib" "dev" ];
+  outputs = [ "out" "lib" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
-  buildInputs = [ glib dbus-glib ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 gtk-doc docbook_xsl docbook_xml_dtd_42 ];
+  buildInputs = [ glib bash-completion dbus ];
 
-  doCheck = false; # fails 2 out of 9 tests, maybe needs dbus daemon?
+  mesonFlags = [
+    "--sysconfdir=/etc"
+    "-Dgtk_doc=true"
+  ];
+
+  doCheck = true;
 
   passthru = {
     updateScript = gnome3.updateScript {

From d6bb24df9f453629315a8962e85c2e3965f5c5f6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:08 +0000
Subject: [PATCH 0431/2793] =?UTF-8?q?gnome3.dconf-editor:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 b1369d8304b..78b43eb5b89 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "dconf-editor";
-  version = "3.28.0";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
+    sha256 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia";
   };
 
   nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection python3 ];

From 013df809d5bd4cdb5b18207754c5107561078a23 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:17 +0000
Subject: [PATCH 0432/2793] =?UTF-8?q?epiphany:=203.28.3.1=20=E2=86=92=203.?=
 =?UTF-8?q?30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 3c9b4de9ea8..28310124718 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -2,15 +2,15 @@
 , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
 , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
 , sqlite, gcr, isocodes, desktop-file-utils, python3
-, gdk_pixbuf, gst_all_1, json-glib }:
+, gdk_pixbuf, gst_all_1, json-glib, libdazzle }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.28.3.1";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9";
+    sha256 = "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc";
   };
 
   # Tests need an X display
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     gdk_pixbuf gnome3.defaultIconTheme gcr
     glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-    gst_all_1.gst-libav json-glib
+    gst_all_1.gst-libav json-glib libdazzle
   ];
 
   postPatch = ''

From 45f75955758f22951ced55df402c1d6656285b57 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:24 +0000
Subject: [PATCH 0433/2793] =?UTF-8?q?evince:=203.28.2=20=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 077ffe65ec4..a0e0f613a56 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, intltool, libxml2
 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
-, librsvg, gobjectIntrospection, yelp-tools
+, librsvg, gobjectIntrospection, yelp-tools, gspell
 , recentListSize ? null # 5 is not enough, allow passing a different number
 , supportXPS ? false    # Open XML Paper Specification via libgxps
 , autoreconfHook
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "evince-${version}";
-  version = "3.28.2";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89";
+    sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9";
   };
 
   passthru = {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     glib gtk3 pango atk gdk_pixbuf libxml2
     gnome3.gsettings-desktop-schemas
     poppler ghostscriptX djvulibre libspectre libarchive
-    libsecret librsvg gnome3.adwaita-icon-theme
+    libsecret librsvg gnome3.adwaita-icon-theme gspell
   ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
 
   configureFlags = [

From 40f9556c9448aa0d763db2375eca1dd6305d3800 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:33 +0000
Subject: [PATCH 0434/2793] =?UTF-8?q?gnome3.evolution:=203.28.5=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 89a16b02893..7b13c59a1a8 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.28.5";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1q1nfga39f44knrcvcxk8ivhl6fvg92g71cq3hcp4a7krb3jwa5v";
+    sha256 = "1ps49js0110lrvg5xiylj9ky0ndp43wrnm0l6p6phmhx4h4477mj";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
@@ -45,6 +45,8 @@ in stdenv.mkDerivation rec {
     };
   };
 
+  PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
+
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = with stdenv.lib; {

From 36f9685aeecbd34a8e9f17e0f8bf078eebcc990f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:41 +0000
Subject: [PATCH 0435/2793] =?UTF-8?q?evolution-data-server:=203.28.5=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/evolution-data-server/default.nix       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 6ed27750dcc..5e6cfe12846 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,17 +1,17 @@
 { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection
-, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata
-, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
+, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3
+, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.28.5";
+  version = "3.30.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1247gv0ggwnd1i2n7iglb3crfapx6s9nrl896bzy9k87fb94hlyr";
+    sha256 = "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv";
   };
 
   patches = [
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     glib libsoup libxml2 gtk gnome-online-accounts
     gcr p11-kit libgweather libgdata libaccounts-glib json-glib
     icu sqlite kerberos openldap webkitgtk glib-networking
+    libcanberra-gtk3 pcre
   ];
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];

From 813c96b7c5b21dd500bb1b4fe7e9a6377fe6d48a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:48 +0000
Subject: [PATCH 0436/2793] =?UTF-8?q?gnome3.file-roller:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/file-roller/default.nix | 5 +++--
 1 file changed, 3 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 1066cea177a..fe307bca797 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
-  version = "3.28.1";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "09y2blmlsccfxc2npcayhicq00r9n03897s1aizkahn1m970hjsp";
+    sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1";
   };
 
   LANG = "en_US.UTF-8"; # postinstall.py
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x postinstall.py # patchShebangs requires executable file
     patchShebangs postinstall.py
+    patchShebangs data/set-mime-type-entry.py
   '';
 
   passthru = {

From f6c9a6729e6b57cb00c3781ddb83f3a1fc4c6ba5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:43:54 +0000
Subject: [PATCH 0437/2793] =?UTF-8?q?gnome3.five-or-more:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/games/five-or-more/default.nix    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

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 e5dfd279bc7..4e302e9f8b1 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -1,25 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3 }:
 
 stdenv.mkDerivation rec {
   name = "five-or-more-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c";
+    sha256 = "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x";
   };
 
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ];
+  buildInputs = [
+    gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "five-or-more"; attrPath = "gnome3.five-or-more"; };
+    updateScript = gnome3.updateScript {
+      packageName = "five-or-more";
+      attrPath = "gnome3.five-or-more";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Five_or_more;
     description = "Remove colored balls from the board by forming lines";

From b9d77e9f518cb2986c093ee53250ec284d855c8a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:17 +0000
Subject: [PATCH 0438/2793] =?UTF-8?q?gdk=5Fpixbuf:=202.36.12=20=E2=86=92?=
 =?UTF-8?q?=202.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gdk-pixbuf/default.nix          | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 9fece4cb7a5..85a65aea562 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,25 +1,16 @@
-{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
 , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.12";
-in
-stdenv.mkDerivation rec {
+  version = "2.38.0";
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
-  # src = fetchurl {
-  #   url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-  #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
-  # };
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "gdk-pixbuf";
-    rev = version;
-    sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x";
   };
 
   patches = [
@@ -28,21 +19,13 @@ stdenv.mkDerivation rec {
     # For now, we are patching the build script to avoid the dependency.
     ./no-mime-sniffing.patch
 
-    # Fix installed tests with meson
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795527
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
-      sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
-    })
-
-    # Add missing test file bug753605-atsize.jpg
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
-      sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
-    })
-
     # Move installed tests to a separate output
     ./installed-tests-path.patch
+
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch;
+      sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92";
+    })
   ];
 
   outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
@@ -99,6 +82,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  preInstall = ''
+    PATH=$PATH:$out/bin # for install script
+  '';
+
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit doCheck;
 

From 5d6e2395ca4c872ae2e67599c87365b0e5813a8f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:24 +0000
Subject: [PATCH 0439/2793] =?UTF-8?q?gnome3.gdm:=203.28.3=20=E2=86=92=203.?=
 =?UTF-8?q?30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gdm/default.nix    | 12 +--
 .../desktops/gnome-3/core/gdm/fix-paths.patch | 28 +++----
 .../gnome-3/core/gdm/sessions_dir.patch       | 74 ++++++++-----------
 3 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 761f6b34ec6..c419df5093e 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
-, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
+, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
-, librsvg, coreutils, xwayland }:
+, librsvg, coreutils, xwayland, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "gdm-${version}";
-  version = "3.28.3";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "12d1cp2dyca8rwh9y9cg8xn6grdp8nmxkkqwg4xpkr8i8ml65n88";
+    sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y";
   };
 
   # Only needed to make it build
@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
     "--enable-gdm-xsession"
     "--with-initial-vt=7"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--with-udevdir=$(out)/lib/udev"
   ];
 
-  nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
+  nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
   buildInputs = [
     glib accountsservice systemd
     gobjectIntrospection libX11 gtk
@@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
   patches = [
     # Change hardcoded paths to nix store paths.
     (substituteAll {
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index adac2dc913c..6b5bd6152bd 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -1,17 +1,17 @@
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
-@@ -450,7 +450,7 @@
+@@ -201,7 +201,7 @@
  #ifdef ENABLE_WAYLAND_SUPPORT
-                         gboolean wayland_enabled = FALSE;
-                         if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
--                                if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
-+                                if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
-                                         session_type = "wayland";
-                                 }
-                         }
+         gboolean wayland_enabled = FALSE;
+         if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
+-                if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
++                if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
+                         return TRUE;
+         }
+ #endif
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
-@@ -147,7 +147,7 @@
+@@ -145,7 +145,7 @@
          GError  *error;
  
          error = NULL;
@@ -20,7 +20,7 @@
                                           NULL, NULL, &status, &error);
          if (! res) {
                  g_debug ("Could not ping plymouth: %s", error->message);
-@@ -165,7 +165,7 @@
+@@ -163,7 +163,7 @@
          GError  *error;
  
          error = NULL;
@@ -29,7 +29,7 @@
                                           NULL, NULL, NULL, &error);
          if (! res) {
                  g_warning ("Could not deactivate plymouth: %s", error->message);
-@@ -180,7 +180,7 @@
+@@ -178,7 +178,7 @@
          GError  *error;
  
          error = NULL;
@@ -38,7 +38,7 @@
          if (! res) {
                  g_warning ("Could not quit plymouth: %s", error->message);
                  g_error_free (error);
-@@ -196,7 +196,7 @@
+@@ -194,7 +194,7 @@
          GError  *error;
  
          error = NULL;
@@ -49,12 +49,12 @@
                  g_error_free (error);
 --- a/data/gdm.service.in
 +++ b/data/gdm.service.in
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ BusName=org.gnome.DisplayManager
  StandardOutput=syslog
  StandardError=inherit
  EnvironmentFile=-@LANG_CONFIG_FILE@
 -ExecReload=/bin/kill -SIGHUP $MAINPID
 +ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
+ KeyringMode=shared
  
  [Install]
- Alias=display-manager.service
diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
index 7722e2550bd..cda0468d349 100644
--- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
@@ -1,52 +1,38 @@
 --- a/daemon/gdm-launch-environment.c
 +++ b/daemon/gdm-launch-environment.c
-@@ -126,7 +126,7 @@
-                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
-                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
-                 "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
--                "XDG_CONFIG_DIRS", NULL
-+                "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL
-         };
-         char *system_data_dirs;
-         int i;
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -345,12 +345,17 @@
-         char **search_dirs;
- 
-         static const char *x_search_dirs[] = {
-+                "/var/empty",
-                 "/etc/X11/sessions/",
-                 DMCONFDIR "/Sessions/",
-                 DATADIR "/gdm/BuiltInSessions/",
-                 DATADIR "/xsessions/",
-         };
- 
-+        if (getenv("GDM_SESSIONS_DIR") != NULL) {
-+                x_search_dirs[0] = getenv("GDM_SESSIONS_DIR");
-+        };
-+
-         static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
- 
-         search_array = g_array_new (TRUE, TRUE, sizeof (char *));
---- a/libgdm/gdm-sessions.c
-+++ b/libgdm/gdm-sessions.c
-@@ -217,6 +217,7 @@
- {
-         int         i;
-         const char *xorg_search_dirs[] = {
-+                "/var/empty/",
-                 "/etc/X11/sessions/",
-                 DMCONFDIR "/Sessions/",
-                 DATADIR "/gdm/BuiltInSessions/",
-@@ -224,6 +225,10 @@
+@@ -143,6 +143,7 @@
+                 "WINDOWPATH",
+                 "XCURSOR_PATH",
+                 "XDG_CONFIG_DIRS",
++                "GDM_SESSIONS_DIR",
                  NULL
          };
+         char *system_data_dirs;
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -364,6 +364,11 @@
+                 g_array_append_val (search_array, dir);
+         }
  
-+        if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
-+                xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR");
++        if (getenv("GDM_SESSIONS_DIR") != NULL) {
++                gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
++                g_array_append_val (search_array, gdm_sessions_dir);
 +        };
 +
+         g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
+ 
+ #ifdef ENABLE_WAYLAND_SUPPORT
+--- a/libgdm/gdm-sessions.c
++++ b/libgdm/gdm-sessions.c
+@@ -236,6 +236,11 @@
+                 g_array_append_val (xorg_search_array, session_dir);
+         }
+ 
++        if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
++                gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
++                g_array_append_val (xorg_search_array, gdm_sessions_dir);
++        };
++
+         g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs));
+ 
  #ifdef ENABLE_WAYLAND_SUPPORT
-         const char *wayland_search_dirs[] = {
-                 DATADIR "/wayland-sessions/",

From 84f1759182b343a22ca68fab0d953f29abd5a883 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:32 +0000
Subject: [PATCH 0440/2793] =?UTF-8?q?gnome3.gedit:=203.28.1=20=E2=86=92=20?=
 =?UTF-8?q?3.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 64ef45f3098..61eda942194 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gedit-${version}";
-  version = "3.28.1";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i";
+    sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];

From 3a154cbbc32f99c735207852ec6667f90caccd6f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:42 +0000
Subject: [PATCH 0441/2793] =?UTF-8?q?gnome3.gjs:=201.52.3=20=E2=86=92=201.?=
 =?UTF-8?q?54.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 5854265d352..4aa12000e11 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gjs-${version}";
-  version = "1.52.3";
+  version = "1.54.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
+    sha256 = "1cd65d4nq5xxlyjz1b83hm5zklyry6lillzf782nr0z97k60vcvn";
   };
 
   passthru = {

From 0149459f42408914ddf0491a890dc69f7061b178 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:51 +0000
Subject: [PATCH 0442/2793] =?UTF-8?q?glib:=202.56.0=20=E2=86=92=202.58.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/glib/default.nix | 51 ++++++++++-----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 508a012c690..de56b6a5d10 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, gettext, pkgconfig, perl, python
-, libiconv, zlib, libffi, pcre, libelf, gnome3
+{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
+, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
 
@@ -43,7 +43,7 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  version = "2.56.0";
+  version = "2.58.1";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
+    sha256 = "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -66,41 +66,38 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs = [ libelf setupHook pcre ]
-    ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount
+  buildInputs = [
+    libelf setupHook pcre
+    bash gnum4 # install glib-gettextize and m4 macros for other apps to use
+  ] ++ optionals stdenv.isLinux [
+    libselinux
+    utillinuxMinimal # for libmount
+  ];
 
-  nativeBuildInputs = [ pkgconfig perl python gettext ];
+  nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales ];
 
   propagatedBuildInputs = [ zlib libffi gettext libiconv ];
 
-  # internal pcre would only add <200kB, but it's relatively common
-  configureFlags = [ "--with-pcre=system" ]
-    ++ optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional stdenv.isSunOS "--disable-dtrace"
-    # Can't run this test when cross-compiling
-    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)
-       [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" ]
-    # GElf only supports elf64 hosts
-    ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf";
+  mesonFlags = [
+    "-Dgtk_doc=true"
+  ];
+
+  LC_ALL = "en_US.UTF-8";
 
   NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP";
 
-  preConfigure = optionalString stdenv.isSunOS ''
-    sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
-  '';
-
-  postConfigure = ''
-    patchShebangs ./gobject/
+  postPatch = ''
+    substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir,"
+    chmod +x gio/tests/gengiotypefuncs.py
+    patchShebangs gio/tests/gengiotypefuncs.py
+    patchShebangs glib/gen-unicode-tables.pl
+    patchShebangs tests/gen-casefold-txt.py
+    patchShebangs tests/gen-casemap-txt.py
   '';
 
   LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
   LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
 
-  preBuild = optionalString stdenv.isDarwin ''
-    export MACOSX_DEPLOYMENT_TARGET=
-  '';
-
-  enableParallelBuilding = true;
   DETERMINISTIC_BUILD = 1;
 
   postInstall = ''

From 3ac85d55b4d863d5a78e8bae3b238a3dd6614363 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:44:57 +0000
Subject: [PATCH 0443/2793] =?UTF-8?q?glib-networking:=202.56.0=20=E2=86=92?=
 =?UTF-8?q?=202.58.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/glib-networking/default.nix          | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 87d26b10027..e8105ef0823 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
 , gsettings-desktop-schemas }:
 
 let
   pname = "glib-networking";
-  version = "2.56.0";
+  version = "2.58.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
+    sha256 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
 
-  patches = [
-    # Use GNUTLS system trust for certificates
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/glib-networking/commit/f1c8feee014007cc913b71357acb609f8d1200df.patch;
-      sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
-    })
-  ];
-
   PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
 
   postPatch = ''

From 4dda564576a66c499db693348dc6c4175a66775d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:14 +0000
Subject: [PATCH 0444/2793] =?UTF-8?q?gnome3.gnome-backgrounds:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index c1f8c08eebf..a938a59f7a0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-backgrounds-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj";
+    sha256 = "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc";
   };
 
   passthru = {

From 83ce7488071ab7abb7df2c46b837921aee911b2a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:21 +0000
Subject: [PATCH 0445/2793] =?UTF-8?q?gnome3.gnome-boxes:=203.28.5=20?=
 =?UTF-8?q?=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 9a9c01fbb1a..574d14bc7af 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, python3
+, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, freerdp, 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
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.5";
+  version = "3.30.3";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1z1qimspx1nw7l79rardxcx2bydj9nmk60vsdb611xzlqa3hkppm";
+    sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s";
   };
 
   doCheck = true;
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ spice-gtk ];
 
   buildInputs = [
-    libvirt-glib glib gtk3 gtk-vnc libxml2
+    libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
     libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
     tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
     gnome3.defaultIconTheme librsvg acl libgudev libsecret
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
+    homepage = https://wiki.gnome.org/Apps/Boxes;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ];

From 3493889bbb1e83e5d142869a4319ebb35a63024c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:27 +0000
Subject: [PATCH 0446/2793] =?UTF-8?q?gnome3.gnome-calculator:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 a5a3bd03e9f..d0ee9cff3e3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-calculator-${version}";
-  version = "3.28.2";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s";
+    sha256 = "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc";
   };
 
   nativeBuildInputs = [

From 3254228ca01f0ce6b7b759ab4c4207e9daa10c4c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:34 +0000
Subject: [PATCH 0447/2793] =?UTF-8?q?gnome3.gnome-calendar:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index d876569d4df..8cc8712a15d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-calendar";
-  version = "3.28.2";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
+    sha256 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s";
   };
 
   passthru = {
@@ -27,8 +27,8 @@ in stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    chmod +x meson_post_install.py # patchShebangs requires executable file
-    patchShebangs meson_post_install.py
+    chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
+    patchShebangs build-aux/meson/meson_post_install.py
   '';
 
   meta = with stdenv.lib; {

From 1d00c5b9354635729e8ec8d8af90b81876ad8740 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:40 +0000
Subject: [PATCH 0448/2793] =?UTF-8?q?gnome3.gnome-characters:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 20154359c08..0c2716de9ef 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
-  version = "3.28.2";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
+    sha256 = "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp";
   };
 
   postPatch = ''

From 3d3ab77fae7838b308477d80918075a4112348e5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:47 +0000
Subject: [PATCH 0449/2793] =?UTF-8?q?gnome3.gnome-chess:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 f7412e02261..caef33f94bd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${version}";
-  version = "3.28.1";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1";
+    sha256 = "153wwh0861qfg53myyc3iwlqm989lbhdrlmsxaibmkxv3pgpl7ma";
   };
 
   nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobjectIntrospection ];

From 25ece79161adda4ff5ed903144cf2c543959d3d3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:45:53 +0000
Subject: [PATCH 0450/2793] =?UTF-8?q?gnome3.gnome-clocks:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 9943bc778ed..19f517c2771 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-clocks-${version}";
-  version = "3.28.0";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl";
+    sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc";
   };
 
   passthru = {

From d15332a392a274e44b1962c4cddbe885afcff666 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:00 +0000
Subject: [PATCH 0451/2793] =?UTF-8?q?gnome3.gnome-color-manager:=203.28.0?=
 =?UTF-8?q?=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 7fe1c2211e2..782a77499f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "gnome-color-manager";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc";
+    sha256 = "105bqqq3yvdn5lx94mkl0d450f0l8lmwfjjcwyls1pycmj0vifwh";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];

From 21f0b27e4f661811df6845405351e1d4140b59a8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:07 +0000
Subject: [PATCH 0452/2793] =?UTF-8?q?gnome3.gnome-contacts:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 2acf04e657a..286bec4a367 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
 , vala, meson, ninja }:
 
 let
-  version = "3.28.2";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
+    sha256 = "1vizpjb3ll7pndxpvwjjplgdn6b2wf0mjqr9fga0p2cj57v00m89";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];

From f5342946c31c762cd46d11d8df4766cfaba9d880 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:15 +0000
Subject: [PATCH 0453/2793] =?UTF-8?q?gnome3.gnome-control-center:=203.28.2?=
 =?UTF-8?q?=20=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/gnome-control-center/default.nix     | 12 ++---
 .../core/gnome-control-center/paths.patch     | 52 +++++++++----------
 2 files changed, 30 insertions(+), 34 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 638c5fe9941..f1423f883d4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
 , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager
+, gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
 , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
@@ -9,13 +9,13 @@
 
 let
   pname = "gnome-control-center";
-  version = "3.28.2";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz";
+    sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
     gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
     accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
-    grilo libpwquality cracklib vino libcanberra-gtk3 libgudev
+    grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
     gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
     networkmanager modemmanager gnome-bluetooth tracker
   ];
@@ -42,8 +42,8 @@ in stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    chmod +x meson_post_install.py # patchShebangs requires executable file
-    patchShebangs meson_post_install.py
+    chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
+    patchShebangs build-aux/meson/meson_post_install.py
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
index ad9187b650e..0c11a7626e4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
@@ -1,15 +1,15 @@
 --- a/panels/color/cc-color-panel.c
 +++ b/panels/color/cc-color-panel.c
-@@ -634,7 +634,7 @@
+@@ -599,7 +599,7 @@
  
    /* run with modal set */
    argv = g_ptr_array_new_with_free_func (g_free);
 -  g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
 +  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
    g_ptr_array_add (argv, g_strdup ("--device"));
-   g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device)));
+   g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
    g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -1136,7 +1136,7 @@
+@@ -1038,7 +1038,7 @@
  
    /* open up gcm-viewer as a info pane */
    argv = g_ptr_array_new_with_free_func (g_free);
@@ -18,38 +18,23 @@
    g_ptr_array_add (argv, g_strdup ("--profile"));
    g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
    g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -1406,7 +1406,6 @@
+@@ -1288,15 +1288,12 @@
+ static void
  gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
  {
-   GtkWidget *widget;
--  gchar *s;
-   CcColorPanelPrivate *priv = prefs->priv;
- 
+-  g_autofree gchar *s = NULL;
+-
    /* get profile */
-@@ -1416,11 +1415,9 @@
+   g_debug ("selected profile = %s",
+      cd_profile_get_filename (profile));
+ 
    /* allow getting profile info */
-   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                "toolbutton_profile_view"));
 -  if (cd_profile_get_filename (profile) != NULL &&
 -      (s = g_find_program_in_path ("gcm-viewer")) != NULL)
 +  if (cd_profile_get_filename (profile) != NULL)
-     {
-       gtk_widget_set_sensitive (widget, TRUE);
--      g_free (s);
-     }
+     gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
    else
-       gtk_widget_set_sensitive (widget, FALSE);
---- a/panels/datetime/test-endianess.c
-+++ b/panels/datetime/test-endianess.c
-@@ -26,7 +26,7 @@
- 	GDir *dir;
- 	const char *name;
- 
--	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
-+	dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL);
- 	if (dir == NULL) {
- 		/* Try with /usr/share/locale/
- 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+     gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
 --- a/panels/datetime/tz.h
 +++ b/panels/datetime/tz.h
 @@ -27,11 +27,7 @@
@@ -67,7 +52,7 @@
  typedef struct _TzLocation TzLocation;
 --- a/panels/region/cc-region-panel.c
 +++ b/panels/region/cc-region-panel.c
-@@ -1388,10 +1388,10 @@
+@@ -1265,10 +1265,10 @@
          }
  
          if (variant && variant[0])
@@ -80,3 +65,14 @@
                                                 layout);
  
          g_spawn_command_line_async (commandline, NULL);
+--- a/tests/datetime/test-endianess.c
++++ b/tests/datetime/test-endianess.c
+@@ -26,7 +26,7 @@
+ 	g_autoptr(GDir) dir = NULL;
+ 	const char *name;
+ 
+-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++	dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL);
+ 	if (dir == NULL) {
+ 		/* Try with /usr/share/locale/
+ 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */

From a5920916e17fb1578432050109dd934fae78b6d2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:22 +0000
Subject: [PATCH 0454/2793] =?UTF-8?q?gnome3.gnome-desktop:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 597f45261a6..f5973d3800b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,25 +1,22 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland
+, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland
 , libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
-  version = "3.28.2";
+  version = "3.30.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
+    sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal";
   };
 
-  # TODO: remove with 3.30
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    pkgconfig which itstool intltool libxslt libxml2 gobjectIntrospection
+    pkgconfig which itstool gettext libxslt libxml2 gobjectIntrospection
     gtk-doc docbook_xsl
   ];
   buildInputs = [

From 17d52ba84efbb6415e1c43abf29af954111d8abe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:29 +0000
Subject: [PATCH 0455/2793] =?UTF-8?q?gnome3.gnome-disk-utility:=203.28.3?=
 =?UTF-8?q?=20=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 587bd38f16b..5d224623c3c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.28.3";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m";
+    sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
   };
 
   passthru = {

From 267e564b2743059c2f74470e8d57be3493c48092 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:37 +0000
Subject: [PATCH 0456/2793] =?UTF-8?q?gnome3.gnome-documents:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 a62965b890a..b0f8f6fbc96 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
-  version = "3.28.2";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq";
+    sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6";
   };
 
   doCheck = true;

From 2757eb7d40557d4cb007493ee1b736c64245e3ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:47 +0000
Subject: [PATCH 0457/2793] =?UTF-8?q?gnome3.gnome-logs:=203.28.5=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 421ef8930c5..c6140a53fd9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
-  version = "3.28.5";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0zw6nx1hckv46hn978g57anp4zq4alvz9dpwibgx02wb6gq1r23a";
+    sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh";
   };
 
   mesonFlags = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    (python3.withPackages (pkgs: with pkgs; [ dogtail ]))
+    python3
     meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
     libxml2 libxslt docbook_xsl docbook_xml_dtd_43
   ];

From 48a7318d5aeff74a1f9f913a04bb3c5ba6b31639 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:46:54 +0000
Subject: [PATCH 0458/2793] =?UTF-8?q?gnome3.gnome-maps:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/gnome-maps/default.nix       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 65270b7124d..a7b96f69873 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
+{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
+, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather
+, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup
 , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
 
 let
   pname = "gnome-maps";
-  version = "3.28.2";
+  version = "3.30.2.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
+    sha256 = "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ intltool wrapGAppsHook file autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext python3 wrapGAppsHook ];
   buildInputs = [
     gobjectIntrospection
     gtk3 geoclue2 gjs libgee folks gfbgraph
@@ -27,11 +27,14 @@ in stdenv.mkDerivation rec {
     webkitgtk
   ];
 
-  # The .service file isn't wrapped with the correct environment
-  # so misses GIR files when started. By re-pointing from the gjs
-  # entry point to the wrapped binary we get back to a wrapped
-  # binary.
-  preConfigure = ''
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+
+    # The .service file isn't wrapped with the correct environment
+    # so misses GIR files when started. By re-pointing from the gjs
+    # entry point to the wrapped binary we get back to a wrapped
+    # binary.
     substituteInPlace "data/org.gnome.Maps.service.in" \
         --replace "Exec=@pkgdatadir@/org.gnome.Maps" \
                   "Exec=$out/bin/gnome-maps"
@@ -48,7 +51,7 @@ in stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/Maps;
     description = "A map application for GNOME 3";
     maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }

From 239364679e8e20bf9d32ad724421f783c9dc9663 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:00 +0000
Subject: [PATCH 0459/2793] =?UTF-8?q?gnome3.gnome-mines:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ab978238cf5..ca21cbd4523 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${version}";
-  version = "3.28.0";
+  version = "3.30.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
+    sha256 = "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z";
   };
 
   # gobjectIntrospection for finding vapi files

From 00eaa166fcd92ae16e8359d45282ecb390dde4b2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:07 +0000
Subject: [PATCH 0460/2793] =?UTF-8?q?gnome3.gnome-music:=203.28.2.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 6602987db37..663f574784c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -2,28 +2,28 @@
 , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
 , gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
 , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
-, itstool, gnome3, gst_all_1 }:
+, itstool, gnome3, gst_all_1, libdazzle, libsoup }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.2.1";
+  version = "3.30.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
+    sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
   buildInputs = with gst_all_1; [
     gtk3 glib libmediaart gnome-online-accounts
     gdk_pixbuf gnome3.defaultIconTheme python3
-    grilo grilo-plugins libnotify
+    grilo grilo-plugins libnotify libdazzle libsoup
     gnome3.gsettings-desktop-schemas tracker
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
   ];
-  propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ];
+  propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ];
 
 
   postPatch = ''

From 1544e140d6bf86fa38cecdc032ea24c7ab1b0f2f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:14 +0000
Subject: [PATCH 0461/2793] =?UTF-8?q?gnome3.gnome-online-accounts:=203.28.?=
 =?UTF-8?q?0=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/gnome-online-accounts/default.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 023e7b2ce72..478e0080ab9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc
-, telepathy-glib, gettext, icu, glib-networking
-, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos
+, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobjectIntrospection
+, gettext, icu, glib-networking
+, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
 }:
 
 let
   pname = "gnome-online-accounts";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
+    sha256 = "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];
@@ -23,16 +23,17 @@ in stdenv.mkDerivation rec {
     "--enable-lastfm"
     "--enable-todoist"
     "--enable-gtk-doc"
+    "--enable-documentation"
   ];
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    pkgconfig vala gettext wrapGAppsHook
-    libxslt docbook_xsl docbook_xsl_ns gtk-doc
+    pkgconfig gobjectIntrospection vala gettext wrapGAppsHook
+    libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
   ];
   buildInputs = [
-    glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup
+    glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup
     gcr kerberos
   ];
 

From 4e4202acdb481b1aee7f7164db01533e9e9906b1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:21 +0000
Subject: [PATCH 0462/2793] =?UTF-8?q?gnome3.gnome-online-miners:=203.26.0?=
 =?UTF-8?q?=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 86e5fba3650..6deefaa3673 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-online-miners-${version}";
-  version = "3.26.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e";
+    sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
   };
 
   passthru = {

From b69722b0c15341d07aa69db83b5d143f316b670f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:27 +0000
Subject: [PATCH 0463/2793] =?UTF-8?q?gnome3.gnome-packagekit:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index dfaf73a9d7f..8fbe24220b6 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-packagekit-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r";
+    sha256 = "1i1hf6833psnq174xm0gjlz5rbrkl8i512y47w7nk8mrrrc31b35";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];

From c06774d0f1389c730e862103bc36c0e19a1c3c17 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:35 +0000
Subject: [PATCH 0464/2793] =?UTF-8?q?gnome3.gnome-photos:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix | 4 ++--
 pkgs/desktops/gnome-3/default.nix                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 2da382e5722..508b8af3f4f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "gnome-photos";
-  version = "3.28.0";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
+    sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f";
   };
 
   # doCheck = true;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index c1bb830b2a0..a27e52694e3 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -46,7 +46,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gtk = gtk3;
   gtkmm = gtkmm3;
   vala = pkgs.vala_0_40;
-  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
+  gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
@@ -281,7 +281,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome-notes = callPackage ./apps/gnome-notes { };
 
   gnome-photos = callPackage ./apps/gnome-photos {
-    gegl = gegl_0_3;
+    gegl = gegl_0_4;
   };
 
   gnome-power-manager = callPackage ./apps/gnome-power-manager { };

From 8de442f3498461896fbdb1b6c8de59ff011fe010 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:40 +0000
Subject: [PATCH 0465/2793] =?UTF-8?q?gnome3.gnome-power-manager:=203.26.0?=
 =?UTF-8?q?=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 58c67e6441f..3f8ce7f4a51 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -14,13 +14,13 @@
 
 let
   pname = "gnome-power-manager";
-  version = "3.26.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
+    sha256 = "0m15x6i279wrfimz9ma2gfjv7jlkca2qbl2wcnxgx1pb3hzrwggm";
   };
 
   passthru = {

From dbddbb263504b0fa068a81319562f7ea3a669a17 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:47 +0000
Subject: [PATCH 0466/2793] =?UTF-8?q?gnome3.gnome-screenshot:=203.26.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 21c28f0e953..fc39ea81223 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-screenshot";
-  version = "3.26.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
+    sha256 = "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8";
   };
 
   doCheck = true;

From fd24e60d86177a50b3edb9107fb3c47dcca2bf17 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:52 +0000
Subject: [PATCH 0467/2793] =?UTF-8?q?gnome3.gnome-session:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-session/default.nix     | 9 ++-------
 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 973613b3319..ceda3dfd56f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-session-${version}";
-  version = "3.28.1";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq";
+    sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa";
   };
 
   patches = [
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    for desktopFile in $(grep -rl "Exec=gnome-session" $out/share)
-    do
-      echo "Patching gnome-session path in: $desktopFile"
-      sed -i "s,Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile
-    done
     wrapProgram "$out/bin/gnome-session" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index 3c56fd730e4..c1b5ebe842f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
@@ -1,11 +1,11 @@
 --- a/gnome-session/gnome-session.in
 +++ b/gnome-session/gnome-session.in
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
    fi
  fi
  
--SETTING=$(gsettings get org.gnome.system.locale region)
-+SETTING=$(@gsettings@ get org.gnome.system.locale region)
+-SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region)
++SETTING=$(G_MESSAGES_DEBUG= @gsettings@ get org.gnome.system.locale region)
  REGION=${SETTING#\'}
  REGION=${REGION%\'}
  

From cf4a89ec36aeed428ab9181d17343c37e48355e1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:47:59 +0000
Subject: [PATCH 0468/2793] =?UTF-8?q?gnome3.gnome-settings-daemon:=203.28.?=
 =?UTF-8?q?1=20=E2=86=92=203.30.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-settings-daemon/default.nix         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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 25758ddea8d..4d708de4304 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-settings-daemon-${version}";
-  version = "3.28.1";
+  version = "3.30.1.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr";
+    sha256 = "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w";
   };
 
   patches = [
@@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
 
   buildInputs = with gnome3; [

From 66c36aea1bf9dcce7349cd75dbd0d2319fe833d2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:05 +0000
Subject: [PATCH 0469/2793] =?UTF-8?q?gnome3.gnome-shell:=203.28.3=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 2b2572ac632..9dc63e0ff73 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,16 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.28.3";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0xm2a8inj2zkrpgkhy69rbqh44q62gpwm4javzbvvvgx0srza90w";
+    sha256 = "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2";
   };
 
-  # Needed to find /etc/NetworkManager/VPN
-  mesonFlags = [ "--sysconfdir=/etc" ];
-
   LANG = "en_US.UTF-8";
 
   nativeBuildInputs = [

From e5c40b8b618abf078ad680499afbad9affd52052 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:11 +0000
Subject: [PATCH 0470/2793] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.28?=
 =?UTF-8?q?.1=20=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 9609cd53796..92430125f7f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
-  version = "3.28.1";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
+    sha256 = "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p";
   };
 
   passthru = {

From 2dd1afd37e08c32660b7806029f3f221389b18e1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:19 +0000
Subject: [PATCH 0471/2793] =?UTF-8?q?gnome3.gnome-software:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-software/default.nix        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 248acfd1789..32a64669252 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
 , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak, fwupd
-, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
+, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.28.2";
+  version = "3.30.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
+    sha256 = "0d2x208qbkx8szkrfddv1bz4rd9awfhbxvh078j7zrrfmzvq7892";
   };
 
   patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42
+    meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43
     valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection
   ];
 
@@ -31,10 +31,8 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Denable-rpm=false"
-    "-Denable-oauth=false"
-    "-Denable-ubuntu-reviews=false"
-    "-Denable-gudev=false"
+    "-Dubuntu_reviews=false"
+    "-Dgudev=false"
   ];
 
   passthru = {

From 9637215623b6f59cf99048b3ba2512ba1e4d0a9f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:25 +0000
Subject: [PATCH 0472/2793] =?UTF-8?q?gnome3.gnome-sudoku:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/games/gnome-sudoku/default.nix    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 23783c46e2b..66f31245e0b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
-, json-glib, qqwing, itstool, libxml2 }:
+{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobjectIntrospection, gettext, gtk3, gnome3, wrapGAppsHook
+, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
   name = "gnome-sudoku-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav";
+    sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f";
   };
 
+  nativeBuildInputs = [ meson ninja vala pkgconfig gobjectIntrospection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
+  buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ];
+
+  postPatch = ''
+    chmod +x post_install.py # patchShebangs requires executable file
+    patchShebangs post_install.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-sudoku"; attrPath = "gnome3.gnome-sudoku"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-sudoku";
+      attrPath = "gnome3.gnome-sudoku";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee
-                  json-glib qqwing itstool libxml2 ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Sudoku;
     description = "Test your logic skills in this number grid puzzle";

From 3c0b77b9574588f1aeac0df64069e7c5a3f4bf8f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:32 +0000
Subject: [PATCH 0473/2793] =?UTF-8?q?gnome3.gnome-system-monitor:=203.28.2?=
 =?UTF-8?q?=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/gnome-system-monitor/default.nix       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 7bee6f3a880..a1e3ece3db4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -1,20 +1,20 @@
 { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
-, bash, gtk3, glib, wrapGAppsHook
+, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
-  version = "3.28.2";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
+    sha256 = "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888";
   };
 
   doCheck = true;
 
   nativeBuildInputs = [
-    pkgconfig gettext itstool wrapGAppsHook
+    pkgconfig gettext itstool wrapGAppsHook meson ninja python3
     polkit # for ITS file
   ];
   buildInputs = [
@@ -22,10 +22,11 @@ stdenv.mkDerivation rec {
     gnome3.gsettings-desktop-schemas systemd
   ];
 
-  # fails to build without --enable-static
-  configureFlags = ["--enable-systemd" "--enable-static"];
-
-  enableParallelBuilding = true;
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+    sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
+  '';
 
   passthru = {
     updateScript = gnome3.updateScript {

From 01a39ac8d5fa1d525dcc2add207fb27feae60d44 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:41 +0000
Subject: [PATCH 0474/2793] =?UTF-8?q?gnome3.gnome-taquin:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 85036c70d19..75f511b17d0 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-taquin-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9";
+    sha256 = "0qijv7wyrjlj56m79la4k7m00712v2m1m994vfx43x3v4isxidgp";
   };
 
   passthru = {

From a1ed87daa1eada69f50bdb4834c1c57985666381 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:48:47 +0000
Subject: [PATCH 0475/2793] =?UTF-8?q?gnome3.gnome-terminal:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 13442af337a..4765edbcf7e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-terminal-${version}";
-  version = "3.28.2";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
+    sha256 = "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb";
   };
 
   buildInputs = [

From b2f1c63364718dc105441c17ee81f8fa9c2780c5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:49:01 +0000
Subject: [PATCH 0476/2793] =?UTF-8?q?gnome3.gnome-tweaks:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index c2c4c8e94a7..1c2562916ca 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-tweaks";
-  version = "3.28.1";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp";
+    sha256 = "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa";
   };
 
   nativeBuildInputs = [

From fe4b53b8c3bcf05bf0a73a6fd4a258cdcc267ad2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:49:11 +0000
Subject: [PATCH 0477/2793] =?UTF-8?q?gobjectIntrospection:=201.56.0=20?=
 =?UTF-8?q?=E2=86=92=201.58.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream now strips absolute paths to their basename on all platforms apart from
Darwin: https://gitlab.gnome.org/GNOME/gobject-introspection/commit/a41abe1868a693387cd5cf85567cf2e0fd6c62df

To get around this without modifying the basename test we simply pass in
`basename=False` when normally generating gir files.
---
 .../absolute_gir_path.patch                   |  6 +-
 .../absolute_shlib_path.patch                 | 67 ++++++++++++-------
 .../gobject-introspection/default.nix         | 25 +++----
 .../macos-shared-library.patch                | 10 +--
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
index f7e1bedd3e1..d4160b51d68 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
@@ -2,10 +2,10 @@
 +++ b/gir/cairo-1.0.gir.in
 @@ -5,7 +5,7 @@
              xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-   <package name="%CAIRO_GIR_PACKAGE%"/>
+   <package name="@CAIRO_GIR_PACKAGE@"/>
    <namespace name="cairo" version="1.0"
--	     shared-library="%CAIRO_SHARED_LIBRARY%"
-+	     shared-library="@cairoLib@/%CAIRO_SHARED_LIBRARY%"
+-	     shared-library="@CAIRO_SHARED_LIBRARY@"
++	     shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@"
  	     c:identifier-prefixes="cairo"
  	     c:symbol-prefixes="cairo">
      <record name="Context" c:type="cairo_t" foreign="1"
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 96e7b553e60..e2525d833f8 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,6 +1,6 @@
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -100,6 +100,39 @@
+@@ -101,6 +101,39 @@
      return group
  
  
@@ -8,7 +8,7 @@
 +    # Newer multiple-output-optimized stdenv has an environment variable
 +    # $outputLib which in turn specifies another variable which then is used as
 +    # the destination for the library contents (${!outputLib}/lib).
-+    store_path = os.environ.get(os.environ.get("outputLib"))
++    store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
 +    if store_path is None:
 +        outputs = os.environ.get("outputs", "out").split()
 +        if "lib" in outputs:
@@ -38,9 +38,9 @@
 +
 +
  def _get_option_parser():
-     parser = optparse.OptionParser('%prog [options] sources')
-     parser.add_option('', "--quiet",
-@@ -209,6 +242,10 @@
+     parser = optparse.OptionParser('%prog [options] sources',
+                                    version='%prog ' + giscanner.__version__)
+@@ -211,6 +244,10 @@
      parser.add_option("", "--filelist",
                        action="store", dest="filelist", default=[],
                        help="file containing headers and sources to be scanned")
@@ -53,48 +53,63 @@
      parser.add_option_group(group)
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
-@@ -63,6 +63,11 @@
-         pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-     return re.compile(pattern % re.escape(library_name))
+@@ -62,6 +62,12 @@
+     $""" % re.escape(library_name), re.VERBOSE)
+ 
  
 +def _ldd_library_nix_pattern(library_name):
 +    nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
 +    pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
 +    return re.compile(pattern % (nix_store_dir, re.escape(library_name)))
 +
- 
++
  # This is a what we do for non-la files. We assume that we are on an
  # ELF-like system where ldd exists and the soname extracted with ldd is
-@@ -112,7 +117,7 @@
-         proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-         patterns = {}
-         for library in libraries:
+ # a filename that can be opened with dlopen().
+@@ -110,17 +116,16 @@ def _resolve_non_libtool(options, binary, libraries):
+         if isinstance(output, bytes):
+             output = output.decode("utf-8", "replace")
+ 
+-        # Use absolute paths on OS X to conform to how libraries are usually
+-        # referenced on OS X systems, and file names everywhere else.
+-        basename = platform.system() != 'Darwin'
+-        return resolve_from_ldd_output(libraries, output, basename=basename)
++        # Never strip away absolute paths in Nix
++        basename = False
++        return resolve_from_ldd_output(libraries, output, basename=basename, fallback_libpath=options.fallback_libpath)
+ 
+ 
+-def resolve_from_ldd_output(libraries, output, basename=False):
++def resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=""):
+     patterns = {}
+     for library in libraries:
+         if not os.path.isfile(library):
 -            patterns[library] = _ldd_library_pattern(library)
 +            patterns[library] = (_ldd_library_pattern(library), _ldd_library_nix_pattern(library))
+     if len(patterns) == 0:
+         return []
  
-         shlibs = []
-         for line in proc.stdout:
-@@ -122,11 +127,14 @@
-             # possible for the name of the binary to match _ldd_library_pattern.
-             if line == binary.args[0] + ':\n':
-                 continue
+@@ -129,11 +134,14 @@ def resolve_from_ldd_output(libraries, output, basename=False):
+         if line.endswith(':'):
+             continue
+         for word in line.split():
 -            for library, pattern in patterns.items():
--                m = pattern.search(line)
+-                m = pattern.match(word)
 +            for library, (pattern, nix_pattern) in patterns.items():
 +                if line.find('@nixStoreDir@') != -1:
-+                    m = nix_pattern.search(line)
++                    m = nix_pattern.match(word)
 +                else:
-+                    m = pattern.search(line)
++                    m = pattern.match(word)
                  if m:
                      del patterns[library]
--                    shlibs.append(_sanitize_install_name(m.group(1)))
-+                    shlibs.append(os.path.join(options.fallback_libpath, _sanitize_install_name(m.group(1))))
+-                    shlibs.append(_sanitize_install_name(m.group()))
++                    shlibs.append(os.path.join(fallback_libpath, _sanitize_install_name(m.group())))
                      break
  
-         if len(patterns) > 0:
+     if len(patterns) > 0:
 --- a/giscanner/utils.py
 +++ b/giscanner/utils.py
-@@ -113,17 +113,11 @@
+@@ -116,17 +116,11 @@
      if dlname is None:
          return None
  
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 71bff07dd97..2cd3d9bd098 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
-, libintl, cctools, cairo, gnome3
+{ stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3
+, libintl, cctools, cairo, gnome3, glibcLocales, fetchpatch
 , substituteAll, nixStoreDir ? builtins.storeDir
 , x11Support ? true
 }:
@@ -9,7 +9,7 @@
 
 let
   pname = "gobject-introspection";
-  version = "1.56.0";
+  version = "1.58.1";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -17,21 +17,22 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
+    sha256 = "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "man" ];
   outputBin = "dev";
-  outputMan = "dev"; # tiny pages
 
-  nativeBuildInputs = [ pkgconfig libintl ];
-  buildInputs = [ flex bison python setupHook/*move .gir*/ ]
+  LC_ALL = "en_US.UTF-8"; # for tests
+
+  nativeBuildInputs = [ meson ninja pkgconfig libintl glibcLocales ];
+  buildInputs = [ flex bison python3 setupHook/*move .gir*/ ]
     ++ stdenv.lib.optional stdenv.isDarwin cctools;
   propagatedBuildInputs = [ libffi glib ];
 
-  preConfigure = ''
-    sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
-  '';
+  mesonFlags = [
+    "--datadir=${placeholder "dev"}/share"
+  ];
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
       cairoLib = "${getLib cairo}/lib";
     });
 
-  doCheck = false; # fails
+  doCheck = true;
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
index 9a1d41cf1e3..9941878c427 100644
--- a/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
+++ b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
@@ -25,12 +25,12 @@ index c93d20c..4d4915d 100644
  
  # Assume ldd output is something vaguely like
  #
-@@ -121,7 +137,7 @@ def _resolve_non_libtool(options, binary, libraries):
-                 m = pattern.search(line)
+@@ -136,7 +152,7 @@ def resolve_from_ldd_output(libraries, output, basename=False):
+                 m = pattern.match(word)
                  if m:
                      del patterns[library]
--                    shlibs.append(m.group(1))
-+                    shlibs.append(_sanitize_install_name(m.group(1)))
+-                    shlibs.append(m.group())
++                    shlibs.append(_sanitize_install_name(m.group()))
                      break
  
-         if len(patterns) > 0:
+     if len(patterns) > 0:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b52e781111d..c91e83c4fb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9901,7 +9901,6 @@ with pkgs;
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;
     inherit (darwin) cctools;
-    python = python2;
   };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };

From 726af32d52a0e533bafc7af013585b548a2dc7d6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:49:19 +0000
Subject: [PATCH 0478/2793] =?UTF-8?q?gsettings-desktop-schemas:=203.28.0?=
 =?UTF-8?q?=20=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gsettings-desktop-schemas/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 657a40d1805..420453a8af3 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gsettings-desktop-schemas-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c";
+    sha256 = "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq";
   };
 
   passthru = {

From b69f2807087dc6c206dc03b000398f739cd37f92 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:49:41 +0000
Subject: [PATCH 0479/2793] =?UTF-8?q?gnome3.gtksourceview:=203.24.6=20?=
 =?UTF-8?q?=E2=86=92=203.24.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 9e1bc5363a1..e9166cb346f 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -5,11 +5,11 @@ let
   checkInputs = [ xvfb_run dbus ];
 in stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
-  version = "3.24.6";
+  version = "3.24.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
+    sha256 = "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy";
   };
 
   propagatedBuildInputs = [

From cb45ce9017ac331ce8e2daccd0ac965b6bfb5b32 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:49:55 +0000
Subject: [PATCH 0480/2793] =?UTF-8?q?gucharmap:=2011.0.1=20=E2=86=92=2011.?=
 =?UTF-8?q?0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 797eb00bd3f..7c9b3e0938c 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -8,7 +8,7 @@ let
   unicode-data = callPackage ./unicode-data.nix {};
 in stdenv.mkDerivation rec {
   name = "gucharmap-${version}";
-  version = "11.0.1";
+  version = "11.0.3";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
@@ -17,18 +17,9 @@ in stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = "gucharmap";
     rev = version;
-    sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi";
+    sha256 = "1a590nxy8jdf6zxh6jdsyvhxyaz94ixx3aa1pj7gicf1aqp26vnh";
   };
 
-  patches = [
-    # Fix locale path to allow split outputs
-    # https://gitlab.gnome.org/GNOME/gucharmap/issues/10
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gucharmap/commit/b2b03f16aa869ac0ec1a05c55c4d4e4c4b513576.patch;
-      sha256 = "1543mcyz96x23m9pzx04ny15m4a2pqmiksl1y5r51k3sw4fyisci";
-    })
-  ];
-
   nativeBuildInputs = [
     pkgconfig wrapGAppsHook unzip intltool itstool
     autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412

From 1852c62c6748178165e5571e5efbbcbd2a68f8c9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:50:01 +0000
Subject: [PATCH 0481/2793] =?UTF-8?q?gvfs:=201.36.2=20=E2=86=92=201.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gvfs/default.nix | 82 ++++++++-------------
 1 file changed, 29 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 6bcf72b8a7e..03f4b0fe687 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,83 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
 , glib, libgudev, udisks2, libgcrypt, libcap, polkit
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
 , gnomeSupport ? false, gnome, makeWrapper
 , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
 , libsecret, libgdata, python3
-# Remove when switching back to meson
-, autoreconfHook, lzma, bzip2
 }:
 
-# TODO: switch to meson when upstream fixes a non-deterministic build failure
-# See https://bugzilla.gnome.org/show_bug.cgi?id=794549
-
-# Meson specific things are commented out and annotated, so switching back
-# should simply require deleting autotools specific things and adding back meson
-# flags etc.
-
 let
   pname = "gvfs";
-  version = "1.36.2";
-in
-stdenv.mkDerivation rec {
+  version = "1.38.1";
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
+    sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd";
   };
 
   postPatch = ''
+    # patchShebangs requires executable file
+    chmod +x codegen.py meson_post_install.py
+    patchShebangs meson_post_install.py
+    patchShebangs codegen.py
     patchShebangs test test-driver
   '';
 
-  # Uncomment when switching back to meson
-  # postPatch = ''
-  #   chmod +x meson_post_install.py # patchShebangs requires executable file
-  #   patchShebangs meson_post_install.py
-  # '';
-
   nativeBuildInputs = [
-    autoreconfHook # Remove when switching to meson
-    # meson ninja
+    meson ninja python3
     pkgconfig gettext makeWrapper
     libxml2 libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs =
-    [ glib libgudev udisks2 libgcrypt
-      libgphoto2 avahi libarchive fuse libcdio
-      samba libmtp libcap polkit libimobiledevice libbluray
-      libcdio-paranoia libnfs openssh
-      # Remove when switching back to meson
-      lzma bzip2
-      # ToDo: a ligther version of libsoup to have FTP/HTTP support?
-    ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
-      libsoup gcr
-      gnome-online-accounts libsecret libgdata
-    ]);
+  buildInputs = [
+    glib libgudev udisks2 libgcrypt dbus
+    libgphoto2 avahi libarchive fuse libcdio
+    samba libmtp libcap polkit libimobiledevice libbluray
+    libcdio-paranoia libnfs openssh
+    # ToDo: a ligther version of libsoup to have FTP/HTTP support?
+  ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
+    libsoup gcr
+    gnome-online-accounts libsecret libgdata
+  ]);
 
-  # Remove when switching back to meson
-  configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
+  mesonFlags = [
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+    "-Dtmpfilesdir=no"
+  ] ++ stdenv.lib.optionals (!gnomeSupport) [
+    "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+    "-Dgoogle=false"
+  ] ++ stdenv.lib.optionals (samba == null) [
+    # Xfce don't want samba
+    "-Dsmb=false"
+  ];
 
-  # Uncomment when switching back to meson
-  # mesonFlags = [
-  #   "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
-  #   "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-  #   "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
-  #   "-Dtmpfilesdir=no"
-  # ] ++ stdenv.lib.optionals (!gnomeSupport) [
-  #   "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
-  #   "-Dgoogle=false"
-  # ] ++ stdenv.lib.optionals (samba == null) [
-  #   # Xfce don't want samba
-  #   "-Dsmb=false"
-  # ];
-
-  enableParallelBuilding = true;
-
-  checkInputs = [ python3 ];
   doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
   doInstallCheck = doCheck;
 

From da25669c5dd31f0f315816385aa466f0e846f6cf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:50:08 +0000
Subject: [PATCH 0482/2793] =?UTF-8?q?gnome3.iagno:=203.28.0=20=E2=86=92=20?=
 =?UTF-8?q?3.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/games/iagno/default.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 4506614b498..a60ebe9590b 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -3,23 +3,25 @@
 
 stdenv.mkDerivation rec {
   name = "iagno-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x";
+    sha256 = "15skh7186gp0k1lvzpv0l7dsr7mhb57njc3wjbgjwixym67h2d1z";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "iagno"; attrPath = "gnome3.iagno"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ];
 
   enableParallelBuilding = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "iagno";
+      attrPath = "gnome3.iagno";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Iagno;
     description = "Computer version of the game Reversi, more popularly called Othello";

From 628ac455f0163812d8d25028512c292327da62cb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:50:16 +0000
Subject: [PATCH 0483/2793] =?UTF-8?q?libdazzle:=203.28.5=20=E2=86=92=203.3?=
 =?UTF-8?q?0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libdazzle/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 0b06aef9524..8cca4bca04b 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
-, gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
-  version = "3.28.5";
+  version = "3.30.2";
   pname = "libdazzle";
 in
 stdenv.mkDerivation {
@@ -13,17 +13,20 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg";
+    sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq";
   };
 
-  nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
+  nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
   buildInputs = [ glib gtk3 ];
 
   mesonFlags = [
     "-Denable_gtk_doc=true"
   ];
 
-  doCheck = true;
+  LC_ALL = "en_US.UTF-8";
+
+  # https://gitlab.gnome.org/GNOME/libdazzle/issues/25
+  doCheck = false;
 
   checkPhase = ''
     export NO_AT_BRIDGE=1

From 3844468c934322a23fc2406a2ef58171d203765b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:50:50 +0000
Subject: [PATCH 0484/2793] =?UTF-8?q?librsvg:=202.42.4=20=E2=86=92=202.44.?=
 =?UTF-8?q?9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 7c94919f344..12bfffb21e9 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "librsvg";
-  version = "2.42.4";
+  version = "2.44.9";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2";
+    sha256 = "1ivg7cz7zlfjhnxvp7z2344r8r0z02mjh4mpgy823az6ps62igwj";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From 6182a3fe4d77ff3b3dc7734e6f82470e76c426a6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:50:56 +0000
Subject: [PATCH 0485/2793] =?UTF-8?q?libsecret:=200.18.5=20=E2=86=92=200.1?=
 =?UTF-8?q?8.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/libsecret/default.nix           | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 4fc0d6688d4..afc1b576b07 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,30 +1,39 @@
-{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl
-, libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }:
+{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
+, libgcrypt, gobjectIntrospection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }:
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.18.5";
+  version = "0.18.6";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
+    sha256 = "0vynag97a9bnnb8ipah45av8xg8jzmhd572rw3zj78s1pa8ciysy";
   };
 
   postPatch = ''
     patchShebangs .
   '';
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl libintl ];
-  buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ];
+  nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl docbook_xml_dtd_42 libintl gobjectIntrospection vala gtk-doc ];
+  buildInputs = [ libgcrypt ];
   # optional: build docs with gtk-doc? (probably needs a flag as well)
 
-  # checkInputs = [ python2 ];
+  enableParallelBuilding = true;
 
-  doCheck = false; # fails. with python3 tests fail to evaluate, with python2 they fail to run python3
+  installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gnome3.gjs ];
+
+  # needs to run after install because typelibs point to absolute paths
+  doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib
+  installCheckPhase = ''
+    export NO_AT_BRIDGE=1
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      make check
+  '';
 
   passthru = {
     updateScript = gnome3.updateScript {

From f78203de37b3f6bab1e534c5e4484e837057a6f6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:03 +0000
Subject: [PATCH 0486/2793] =?UTF-8?q?libsoup:=202.62.2=20=E2=86=92=202.64.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/browsers/midori/default.nix    |  2 +-
 .../development/libraries/libsoup/default.nix | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index f7d4f1a6941..c3273562b0b 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
     libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
-    (libsoup.override {gnomeSupport = true; valaSupport = true;})
+    (libsoup.override {gnomeSupport = true;})
   ] ++ stdenv.lib.optionals zeitgeistSupport [
     zeitgeist
   ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 9849e2600bb..8cd43adbea9 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,39 +1,35 @@
-{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3
-, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection
-, valaSupport ? true, vala_0_40
-, intltool, python3 }:
+{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
+, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection, vala
+, libpsl, python3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libsoup";
-  version = "2.62.2";
+  version = "2.64.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
+    sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm";
   };
 
   postPatch = ''
     patchShebangs libsoup/
-  '' + stdenv.lib.optionalString valaSupport ''
-     substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
   '';
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ python3 sqlite ];
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]
-    ++ stdenv.lib.optionals valaSupport [ vala_0_40 ];
+  buildInputs = [ python3 sqlite libpsl ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
   propagatedBuildInputs = [ glib libxml2 ];
 
-  # glib-networking is a runtime dependency, not a compile-time dependency
-  configureFlags = [
-    "--disable-tls-check"
-    "--enable-vala=${if valaSupport then "yes" else "no"}"
-    "--with-gnome=${if gnomeSupport then "yes" else "no"}"
+  mesonFlags = [
+    "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
+    "-Dgssapi=false"
+    "-Dvapi=true"
+    "-Dgnome=${if gnomeSupport then "true" else "false"}"
   ];
 
-  doCheck = false; # fails with "no: command not found"
+  doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
 
   passthru = {
     propagatedUserEnvPackages = [ glib-networking.out ];

From 70f1b62368a05f59800f18ccad04c812a9a40ba3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:09 +0000
Subject: [PATCH 0487/2793] =?UTF-8?q?gnome3.lightsoff:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/games/lightsoff/default.nix       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index dcffe7cea7f..ccd90c071fe 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -1,19 +1,27 @@
 { stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib }:
+, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib
+, meson, ninja, python3 }:
 
 stdenv.mkDerivation rec {
   name = "lightsoff-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
+    sha256 = "1cv5pkw0n8k5wb98ihx0z1z615w1wc09y884wk608wy40bgq46wp";
   };
 
-  nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2];
-  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+    sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
+  '';
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [
+    vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
+    meson ninja python3
+  ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
 
   passthru = {
     updateScript = gnome3.updateScript {

From 070e918e355b8bd24cc61494be70111af9d92079 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:23 +0000
Subject: [PATCH 0488/2793] =?UTF-8?q?gnome3.metacity:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 46ff2c11813..86e12b58536 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -16,13 +16,13 @@
 
 let
   pname = "metacity";
-  version = "3.28.0";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0kzap0lzlkcgkna3h426xgwrn2zpipy8cfsxpfynnaf74vyas3aw";
+    sha256 = "12kr472gblx7jxh9rvnamy09bkg29ms2pgc0c3373piqmavi24qg";
   };
 
   patches = [

From beb677990045d728fe5bc59b6322b2a1c010089f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:35 +0000
Subject: [PATCH 0489/2793] =?UTF-8?q?gnome3.mutter:=203.28.3=20=E2=86=92?=
 =?UTF-8?q?=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 34830117b77..ca7d73cb17e 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,29 +1,21 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook, fetchpatch }:
+, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.28.3";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
+    sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
   };
 
   passthru = {
     updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
   };
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/mutter/merge_requests/172
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/mutter/commit/62660bbd.patch;
-      sha256 = "1qq8vxlqnyrqh94dc0dh1aj1dsbyw6bwv3x46q5vsscbbxbiv9wk";
-    })
-  ];
-
   configureFlags = [
     "--with-x"
     "--disable-static"

From bb0b136e26ccd6b1a38ae3bde01413a3a7eebb93 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:42 +0000
Subject: [PATCH 0490/2793] =?UTF-8?q?gnome3.nautilus:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.30.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 4201bdb968d..f37a86be4f1 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook
-, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif
+, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif, libseccomp
 , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
 
 let
   pname = "nautilus";
-  version = "3.28.1";
+  version = "3.30.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w";
+    sha256 = "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];
 
   buildInputs = [
     glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
-    tracker tracker-miners gnome-desktop gexiv2
+    tracker tracker-miners gnome-desktop gexiv2 libseccomp
     gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
   ];
 

From 859ad211e91f64a6d9b49a90db1c7dfed2e13e23 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:51:59 +0000
Subject: [PATCH 0491/2793] =?UTF-8?q?orca:=203.28.2=20=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/orca/default.nix     |  9 ++--
 pkgs/applications/misc/orca/fix-paths.patch | 49 +++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 0dfc4b2bc58..802c56b4315 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -3,13 +3,13 @@
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
-, xkbcomp, gsettings-desktop-schemas
+, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
 let
   pname = "orca";
-  version = "3.28.2";
+  version = "3.30.1";
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
@@ -17,12 +17,15 @@ in buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q";
+    sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7";
   };
 
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
+      cat = "${coreutils}/bin/cat";
+      lsof = "${lsof}/bin/lsof";
+      pgrep = "${procps}/bin/pgrep";
       xkbcomp = "${xkbcomp}/bin/xkbcomp";
     })
   ];
diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch
index d3e77773f28..ffb56dbe239 100644
--- a/pkgs/applications/misc/orca/fix-paths.patch
+++ b/pkgs/applications/misc/orca/fix-paths.patch
@@ -1,3 +1,32 @@
+--- a/src/orca/debug.py
++++ b/src/orca/debug.py
+@@ -474,7 +474,7 @@
+     return traceit
+ 
+ def getOpenFDCount(pid):
+-    procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
++    procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
+     procs = procs.decode('UTF-8').split('\n')
+     files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
+ 
+@@ -482,7 +482,7 @@
+ 
+ def getCmdline(pid):
+     try:
+-        openFile = os.popen('cat /proc/%s/cmdline' % pid)
++        openFile = os.popen('@cat@ /proc/%s/cmdline' % pid)
+         cmdline = openFile.read()
+         openFile.close()
+     except:
+@@ -492,7 +492,7 @@
+     return cmdline
+ 
+ def pidOf(procName):
+-    openFile = subprocess.Popen('pgrep %s' % procName,
++    openFile = subprocess.Popen('@pgrep@ %s' % procName,
+                                 shell=True,
+                                 stdout=subprocess.PIPE).stdout
+     pids = openFile.read()
 --- a/src/orca/orca.py
 +++ b/src/orca/orca.py
 @@ -239,7 +239,7 @@
@@ -27,3 +56,23 @@
          stdin=subprocess.PIPE, stdout=None, stderr=None)
      p.communicate(_originalXmodmap)
  
+--- a/src/orca/orca_bin.py.in
++++ b/src/orca/orca_bin.py.in
+@@ -59,7 +59,7 @@
+                 name = "[DEAD]"
+ 
+             try:
+-                cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
++                cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
+             except:
+                 cmdline = '(exception encountered)'
+             else:
+@@ -192,7 +192,7 @@
+ def otherOrcas():
+     """Returns the pid of any other instances of Orca owned by this user."""
+ 
+-    openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(),
++    openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(),
+                                 shell=True,
+                                 stdout=subprocess.PIPE).stdout
+     pids = openFile.read()

From 438011d44e5c8b4ce796f411a446e9562fb085b9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:05 +0000
Subject: [PATCH 0492/2793] =?UTF-8?q?gnome3.polari:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 3bb4b788744..82516fbef94 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "polari";
-  version = "3.28.1";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1066j1lbrkpcxhvrg3gcv7gv8dzqv5ny9qi9dnm8r1dsx2hil9yc";
+    sha256 = "02wxkdq5s5ami9wj9vpqhs6n8qxr299bpmvpvd89mn49x73lq2w2";
   };
 
   propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];

From 036d7d40f34af049789a54e3f898bb24a056eec7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:16 +0000
Subject: [PATCH 0493/2793] =?UTF-8?q?gnome3.seahorse:=203.20.0=20=E2=86=92?=
 =?UTF-8?q?=203.30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/seahorse/default.nix         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 179b60e98c1..4d02eaf4d18 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,33 +1,38 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib
+{ stdenv, fetchurl, vala, meson, ninja
+, pkgconfig, gtk3, glib, gobjectIntrospection
 , wrapGAppsHook, itstool, gnupg, libsoup
-, gnome3, gpgme
+, gnome3, gpgme, python3, openldap
 , libsecret, avahi, p11-kit, openssh }:
 
 let
   pname = "seahorse";
-  version = "3.20.0";
+  version = "3.30";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
+    sha256 = "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp";
   };
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig vala itstool wrapGAppsHook
+    python3 gobjectIntrospection
+  ];
   buildInputs = [
     gtk3 glib gnome3.gcr
     gnome3.gsettings-desktop-schemas gnupg
     gnome3.defaultIconTheme gpgme
     libsecret avahi libsoup p11-kit
-    openssh
+    openssh openldap
   ];
 
+  postPatch = ''
+    patchShebangs build-aux/
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From bb3a7342c375ed2706ef547d386380ad8770ecb7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:24 +0000
Subject: [PATCH 0494/2793] =?UTF-8?q?shotwell:=200.28.2=20=E2=86=92=200.30?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/shotwell/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index be572ca32f9..8eba574ef83 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,23 +1,23 @@
 { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
 , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
-, gobjectIntrospection, itstool, libgdata }:
+, gobjectIntrospection, itstool, libgdata, python3 }:
 
 # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
 
 let
   pname = "shotwell";
-  version = "0.28.2";
+  version = "0.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n";
+    sha256 = "01hsmig06hjv34yf9y60hv2gml593xfkza4ilq4b22gr8l4v2qip";
   };
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection
+    meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobjectIntrospection
   ];
 
   buildInputs = [
@@ -28,8 +28,9 @@ in stdenv.mkDerivation rec {
     gnome3.gcr gnome3.defaultIconTheme libgdata
   ];
 
-  postInstall = ''
-    glib-compile-schemas $out/share/glib-2.0/schemas
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file
+    patchShebangs build-aux/meson/postinstall.py
   '';
 
   passthru = {

From bcc8e6d2a9eb849a49b095bd6abdb955b02bde4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:30 +0000
Subject: [PATCH 0495/2793] =?UTF-8?q?simple-scan:=203.28.1=20=E2=86=92=203?=
 =?UTF-8?q?.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/simple-scan/default.nix      | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 3d7e78fa18d..415306273c7 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,19 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.28.1";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a";
+    sha256 = "0dknvdjlnxrp9nxd3yr8wyjc4kv94nwglss8pr6rfvl4hnlly53i";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "simple-scan"; };
-  };
-
-  buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
-                gtk libwebp packagekit sane-backends vala ];
+  buildInputs = [
+    cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
+    gtk libwebp packagekit sane-backends vala
+  ];
   nativeBuildInputs = [
     meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
     # For setup hook
@@ -25,30 +23,16 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs data/meson_compile_gschema.py
-
-    sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in
   '';
 
-  postInstall = ''
-    mkdir -p $out/share/icons
-    mv $out/share/simple-scan/icons/* $out/share/icons/
-    (
-    cd ${gnome3.defaultIconTheme}/share/icons/Adwaita
-    for f in `find . | grep 'scanner\.'`
-    do
-      local outFile="`echo "$out/share/icons/hicolor/$f" | sed \
-        -e 's#/devices/#/apps/#g' \
-        -e 's#scanner\.#simple-scan\.#g'`"
-      mkdir -p "`realpath -m "$outFile/.."`"
-      cp "$f" "$outFile"
-    done
-    )
-  '';
-
-  enableParallelBuilding = true;
-
   doCheck = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "simple-scan";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Simple scanning utility";
     longDescription = ''
@@ -59,7 +43,7 @@ stdenv.mkDerivation rec {
       XSANE uses. This means that all existing scanners will work and the
       interface is well tested.
     '';
-    homepage = https://launchpad.net/simple-scan;
+    homepage = https://gitlab.gnome.org/GNOME/simple-scan;
     license = licenses.gpl3Plus;
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;

From ade896e8a9fd3b140c144a845ea13f7a9f994074 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:36 +0000
Subject: [PATCH 0496/2793] =?UTF-8?q?gnome3.sushi:=203.28.3=20=E2=86=92=20?=
 =?UTF-8?q?3.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/sushi/default.nix | 48 ++++++++------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 1881293a213..c8dbe58e2c2 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,45 +1,35 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter-gtk, clutter-gst, gnome3, gtksourceview
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
+, clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs
+, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
 , gdk_pixbuf, librsvg, gtk3, harfbuzz }:
 
 stdenv.mkDerivation rec {
   name = "sushi-${version}";
-  version = "3.28.3";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw";
+    sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; };
-  };
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ file intltool gobjectIntrospection glib gtk3
-                  clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
-                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
-                  gnome3.evince icu makeWrapper harfbuzz ];
+  nativeBuildInputs = [ pkgconfig file intltool gobjectIntrospection wrapGAppsHook ];
+  buildInputs = [
+    glib gtk3 gnome3.evince icu harfbuzz
+    clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf
+    librsvg libmusicbrainz5 webkitgtk
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    # cannot find -laspell, -lhspell
+    aspell hspell
+  ];
 
   enableParallelBuilding = true;
 
-  postConfigure = ''
-    substituteInPlace src/libsushi/sushi-font-widget.h \
-        --replace "<hb-ft.h>" "<harfbuzz/hb-ft.h>"
-    substituteInPlace src/libsushi/sushi-font-widget.c \
-        --replace "<hb-glib.h>" "<harfbuzz/hb-glib.h>"
-  '';
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "sushi";
+      attrPath = "gnome3.sushi";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = "https://en.wikipedia.org/wiki/Sushi_(software)";

From e56f97cd64b55304bc3fa11153c67b82f3bf9016 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:42 +0000
Subject: [PATCH 0497/2793] =?UTF-8?q?gnome3.swell-foop:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 fec448ff47c..5e0f01174e4 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "swell-foop";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
+    sha256 = "00h795clcyzch1sgcxflslv2q03vsz2j5xyy4ghbg6a6dgg8a0ax";
   };
 
   passthru = {

From 18d6f1f3fda4c13dabed55a5c85b393c45d40527 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:52:59 +0000
Subject: [PATCH 0498/2793] =?UTF-8?q?gnome3.tracker-miners:=202.1.3=20?=
 =?UTF-8?q?=E2=86=92=202.1.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktops/gnome-3/core/tracker-miners/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 1f28c9f0fd0..5e57a22906c 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -8,11 +8,11 @@ let
   pname = "tracker-miners";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "2.1.3";
+  version = "2.1.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz";
+    sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm";
   };
 
   nativeBuildInputs = [
@@ -63,6 +63,7 @@ in stdenv.mkDerivation rec {
   mesonFlags = [
     # TODO: tests do not like our sandbox
     "-Dfunctional_tests=false"
+    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
   ];
 
   patches = [
@@ -77,13 +78,6 @@ in stdenv.mkDerivation rec {
     })
   ];
 
-  # Symlinks require absolute path and we still cannot use placeholders
-  # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131
-  # https://github.com/NixOS/nixpkgs/pull/37693
-  preConfigure = ''
-    mesonFlagsArray+=("-Ddbus_services=$out/share/dbus-1/services")
-  '';
-
   postInstall = ''
     glib-compile-schemas "$out/share/glib-2.0/schemas"
   '';

From a27dd0aa886a19fe165726c5d28af5f4e81acbd4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:53:07 +0000
Subject: [PATCH 0499/2793] =?UTF-8?q?gnome3.vte:=200.52.2=20=E2=86=92=200.?=
 =?UTF-8?q?54.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 3fff1dab39c..05db98ba424 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vte-${version}";
-  version = "0.52.2";
+  version = "0.54.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg";
+    sha256 = "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj";
   };
 
   passthru = {

From 0cdc4ab47657c08b2f07c47c91b76a3bd9c2c583 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:53:15 +0000
Subject: [PATCH 0500/2793] =?UTF-8?q?yelp:=203.28.1=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 0a7918d01bf..26bcb317190 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "yelp-${version}";
-  version = "3.28.1";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8";
+    sha256 = "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4";
   };
 
   nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];

From 9dc7dee1b3a5fc15a6a8ee0538a2fb0c3242eca2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 00:53:22 +0000
Subject: [PATCH 0501/2793] =?UTF-8?q?gnome3.yelp-xsl:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index e5ed1f31d70..7e98012998d 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "yelp-xsl-${version}";
-  version = "3.28.0";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc";
+    sha256 = "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw";
   };
 
   passthru = {

From e60cf52805a736c5332dc667d72c7129850e98a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 15:18:43 +0200
Subject: [PATCH 0502/2793] vala_0_42: init at 0.42.3

---
 pkgs/desktops/gnome-3/default.nix           | 2 +-
 pkgs/development/compilers/vala/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix             | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a27e52694e3..92614bf5718 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -45,7 +45,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome3 = self // { recurseForDerivations = false; };
   gtk = gtk3;
   gtkmm = gtkmm3;
-  vala = pkgs.vala_0_40;
+  vala = pkgs.vala_0_42;
   gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
 
 # Simplify the nixos module and gnome packages
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index fb2d9fc535a..1100c22cf6f 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -68,5 +68,11 @@ in rec {
     sha256  = "1qjbwhifwwqbdg5zilvnwm4n76g8p7jwqs3fa0biw3rylzqm193d";
   };
 
-  vala = vala_0_38;
+  vala_0_42 = generic {
+    major   = "0.42";
+    minor   = "3";
+    sha256  = "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz";
+  };
+
+  vala = vala_0_42;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c91e83c4fb0..4b4ebd3ca2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7532,6 +7532,7 @@ with pkgs;
     vala_0_36
     vala_0_38
     vala_0_40
+    vala_0_42
     vala;
 
   valadoc = callPackage ../development/tools/valadoc { };

From a268c6049b26136a24296a3a5f53da86fb8e51aa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 15:20:20 +0200
Subject: [PATCH 0503/2793] =?UTF-8?q?webkitgtk:=202.20.5=20=E2=86=92=202.2?=
 =?UTF-8?q?2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/libraries/webkitgtk/{2.20.nix => default.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.20.nix => default.nix} (96%)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/default.nix
similarity index 96%
rename from pkgs/development/libraries/webkitgtk/2.20.nix
rename to pkgs/development/libraries/webkitgtk/default.nix
index bb493d16a36..7eae5819daf 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.5";
+  version = "2.22.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m";
+    sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l";
   };
 
   patches = optionals stdenv.isDarwin [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b4ebd3ca2e..c8a25f0209e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12763,7 +12763,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix {
+  webkitgtk220x = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzzFull;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
     stdenv = overrideCC stdenv gcc6;

From b053afde9a1c68f3eeceb24b857fef1074f9f95b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 22:40:26 +0200
Subject: [PATCH 0504/2793] telepathy-glib: clean up

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

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index ca6a4997abf..934b2350727 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,21 +1,27 @@
 { stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
-, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:
+, gobjectIntrospection, vala, glibcLocales }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.24.1";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
     sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
   };
 
-  configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
+  configureFlags = [
+    "--enable-vala-bindings"
+  ];
   LC_ALL = "en_US.UTF-8";
-  propagatedBuildInputs = [dbus-glib glib gobjectIntrospection];
+  propagatedBuildInputs = [ dbus-glib glib ];
 
-  nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;
+  nativeBuildInputs = [ pkgconfig libxslt gobjectIntrospection vala ];
   buildInputs = [ glibcLocales python2 ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
   '';

From 994a20f5d46456a2626ae739b67dfffae62d0846 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 22:48:01 +0200
Subject: [PATCH 0505/2793] vala: enable parallel building

---
 pkgs/development/compilers/vala/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 1100c22cf6f..41362323044 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -31,6 +31,8 @@ let
     ] ++ lib.optional (atLeast "0.38") graphviz
       ++ extraBuildInputs;
 
+    enableParallelBuilding = true;
+
     doCheck = false; # fails, requires dbus daemon
 
     meta = with stdenv.lib; {

From 3ad7dc091e77fe74174a92aff31d4b55f8866ed9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 01:14:28 +0200
Subject: [PATCH 0506/2793] =?UTF-8?q?libpsl:=200.17.0=20=E2=86=92=200.20.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index f5c92e11c35..65da1f8e9d1 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu
-, libxslt, pkgconfig, python2 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, icu
+, libxslt, pkgconfig, python3 }:
 
 let
 
@@ -11,21 +11,21 @@ let
     owner = "publicsuffix";
   };
 
-  libVersion = "0.17.0";
+  libVersion = "0.20.2";
 
 in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
   version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
-    sha256 = "08dbl6ihnlf0kj4c9pdpjv9mmw7p676pzh1q184wl32csra5pzdd";
+    sha256 = "0ijingxpnvl5xnna32j93ijagvjsvw2lhj71q39hz9xhzjzrda9b";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
   };
 
   buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc pkgconfig python3 ];
 
   postPatch = ''
     substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
@@ -33,7 +33,6 @@ in stdenv.mkDerivation rec {
   '';
 
   preAutoreconf = ''
-    mkdir m4
     gtkdocize
   '';
 

From dc5afbd775fd4ee584ed82b74df1d4dec5816fcc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 03:08:07 +0200
Subject: [PATCH 0507/2793] =?UTF-8?q?gtk3:=203.22.30=20=E2=86=92=203.24.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 015843c0539..9d99ef6697b 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
 with stdenv.lib;
 
 let
-  version = "3.22.30";
+  version = "3.24.1";
 in
 stdenv.mkDerivation rec {
   name = "gtk+3-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
+    sha256 = "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38";
   };
 
   outputs = [ "out" "dev" ];

From 9696e36d9d8d99ee4a8f34726688289cfaea5c60 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 13:37:06 +0200
Subject: [PATCH 0508/2793] gnome3.gconf: remove

The throw statement broke building gnome3 attribute set. Since 18.09
has already been branched off, we just remove the warning.
---
 pkgs/desktops/gnome-3/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 92614bf5718..4ebd81ec4b7 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -395,9 +395,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome-video-effects = callPackage ./misc/gnome-video-effects { };
 
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
-
-  # TODO: remove this after 18.09 has forked off
-  gconf = throw "gconf is deprecated since 2009 and has been removed from the package set. Use gnome2.GConf instead. For more details see https://github.com/NixOS/nixpkgs/pull/43268";
 } // lib.optionalAttrs (config.allowAliases or true) {
 #### Legacy aliases
 

From 8d078e5000515bc5f5cd5d0f0ab62ee1e671994b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Sep 2018 13:53:24 +0200
Subject: [PATCH 0509/2793] libhttpseverywhere: fix build

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 81e5f0fe73e..0664da50b91 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf
+{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40
 , gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:
 
 let
@@ -12,7 +12,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
   };
 
-  nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ];
+  # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1
+  nativeBuildInputs = [ vala_0_40 gobjectIntrospection meson ninja pkgconfig ];
   buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
 
   mesonFlags = [ "-Denable_valadoc=true" ];

From 1f914b56e84ca307f6b85a6956350557b4897914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 10:18:31 +0000
Subject: [PATCH 0510/2793] =?UTF-8?q?sysprof:=203.28.1=20=E2=86=92=203.30.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/profiling/sysprof/default.nix            | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index a01d7dd4290..f032669990b 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , desktop-file-utils
 , fetchurl
-, fetchpatch
 , gettext
 , glib
 , gtk3
@@ -17,7 +16,7 @@
 , gnome3
 }:
 let
-  version = "3.28.1";
+  version = "3.30.0";
   pname = "sysprof";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -26,18 +25,9 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
+    sha256 = "0qrzcs60m44mmj7ln9815kfgvi2pjlhmk0p4vjc0dw3pw95jrk99";
   };
 
-  patches = [
-    # fix includedir in pkgconfig
-    # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/2
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/sysprof/commit/d19a496bb55b8646e866df8bb07bc6ad3c55eaf2.patch;
-      sha256 = "15w6di9c4n1gsymkpk413f5f9gd3iq23wdkzs01y9xrxwqpm7hm4";
-    })
-  ];
-
   nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
   buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 

From 269f7f56c466edd0e02ffd25be0a89dbc30247f9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Sep 2018 14:55:06 +0000
Subject: [PATCH 0511/2793] =?UTF-8?q?gnome3.atomix:=203.29.3=20=E2=86=92?=
 =?UTF-8?q?=203.30.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 f7a18f4c5c3..b8171ef3185 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "atomix";
-  version = "3.29.3";
+  version = "3.30.0.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1k8bvwywpvw5f13pw40brk6c3rz2mdz9cd4zhcawg7qdm77dvcvb";
+    sha256 = "0hvr36m8ixa172zblv29fga1cn9yb84zqbisb21msfkwia2pabw3";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];

From d02d548e33423bf9f76b893a02c1b67ce63c8275 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Sep 2018 14:56:55 +0000
Subject: [PATCH 0512/2793] =?UTF-8?q?gnome3.gnome-getting-started-docs:=20?=
 =?UTF-8?q?3.28.2=20=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/gnome-getting-started-docs/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 de54b6f92e1..e7a1954c892 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
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-getting-started-docs-${version}";
-  version = "3.28.2";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
+    sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k";
   };
 
   passthru = {

From bd2c80a42efbde6d29e722abd206a0fcd45b1683 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Sep 2018 14:57:44 +0000
Subject: [PATCH 0513/2793] =?UTF-8?q?gnome3.gnome-user-docs:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d17be1e7182..7062dbafce8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
-  version = "3.28.2";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
+    sha256 = "1pgsrvd79rqxa183wsmzh422y2zsg7fl5hskgc0s87jsc8b57fkg";
   };
 
   passthru = {

From e09e735a09f47d087a47982e050a58d041f89ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 08:02:16 +0200
Subject: [PATCH 0514/2793] spidermonkey_60: init at 60.3.0

A new test checks and fails if we're building in js/src, so we create a build
dir like Arch does.
---
 pkgs/desktops/gnome-3/core/gjs/default.nix    |  4 +-
 .../interpreters/spidermonkey/60.nix          | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/spidermonkey/60.nix

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 4aa12000e11..43048fc4399 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection
-, spidermonkey_52, pango, readline, glib, libxml2, dbus, gdk_pixbuf
+, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk_pixbuf
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_52 ];
+  propagatedBuildInputs = [ spidermonkey_60 ];
 
   configureFlags = [
     "--enable-installed-tests"
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
new file mode 100644
index 00000000000..de65006be95
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
+
+let
+  version = "60.3.0";
+in stdenv.mkDerivation rec {
+  name = "spidermonkey-${version}";
+
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
+    sha256 = "0qak5gmkx8xm88xgnxdmj4z7sivbbvmg2v029fp9q5ms38cg6rjm";
+  };
+
+  buildInputs = [ readline icu zlib nspr ];
+  nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
+
+  patches = [
+    (fetchpatch {
+      url = https://bug1415202.bmoattachments.org/attachment.cgi?id=8926363;
+      sha256 = "082ryrvqa3lvs67v3sq9kf2jshf4qp1fpi195wffc40jdrl8fnin";
+    })
+  ];
+
+  preConfigure = ''
+    export CXXFLAGS="-fpermissive"
+    export LIBXUL_DIST=$out
+    export PYTHON="${python2.interpreter}"
+
+    # We can't build in js/src/, so create a build dir
+    mkdir obj
+    cd obj/
+    configureScript=../js/src/configure
+  '';
+
+  # We need the flags specified here for gjs:
+  # https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/bc8829439a4f1019d0c56a293ddd84e936fdf9f9/org.gnome.Sdk.json.in#L744
+  configureFlags = [
+    "--with-system-zlib"
+    "--with-system-icu"
+    "--with-intl-api"
+    "--enable-readline"
+    "--enable-shared-js"
+    "--enable-posix-nspr-emulation"
+    "--disable-jemalloc"
+    "--enable-release"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
+    maintainers = [ maintainers.abbradar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8a25f0209e..e9775212f83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7993,6 +7993,7 @@ with pkgs;
       stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   }));
   spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
+  spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
   spidermonkey = spidermonkey_31;
 
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };

From a3d6b0a4b1934b82e799b13e47cc3950930b6f97 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Sep 2018 17:17:53 +0200
Subject: [PATCH 0515/2793] =?UTF-8?q?pitivi:=200.99.0=20=E2=86=92=200.999.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/video/pitivi/default.nix | 25 +++++++++++-----------
 pkgs/top-level/all-packages.nix            | 11 +---------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 57ee1cf1275..7ce1aa67708 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
-, python3Packages, gst, gtk3
+{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
+, python3Packages, gst_all_1, gtk3
 , gobjectIntrospection, librsvg, gnome3, libnotify
 , meson, ninja
 }:
 
 let
-  version = "0.99";
+  version = "0.999";
 
   # gst-transcoder will eventually be merged with gstreamer (according to
   # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we
   # don't bother exposing the package to all of nixpkgs.
   gst-transcoder = stdenv.mkDerivation rec {
-    version = "1.12.2";
+    version = "1.14.1";
     name = "gst-transcoder-${version}";
-    src = fetchurl {
-      name = "${name}.tar.gz";
-      url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz";
-      sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9";
+    src = fetchFromGitHub {
+      owner = "pitivi";
+      repo = "gst-transcoder";
+      rev = version;
+      sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
     };
-    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ];
-    buildInputs = with gst; [ gstreamer gst-plugins-base ];
+    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection python3 ];
+    buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ];
   };
 
 in python3Packages.buildPythonApplication rec {
@@ -27,7 +28,7 @@ in python3Packages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69";
+    sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb";
   };
 
   format = "other";
@@ -50,7 +51,7 @@ in python3Packages.buildPythonApplication rec {
     gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas libnotify
     gst-transcoder
-  ] ++ (with gst; [
+  ] ++ (with gst_all_1; [
     gstreamer gst-editing-services
     gst-plugins-base (gst-plugins-good.override { gtkSupport = true; })
     gst-plugins-bad gst-plugins-ugly gst-libav gst-validate
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9775212f83..7104065b7d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4714,16 +4714,7 @@ with pkgs;
 
   pick = callPackage ../tools/misc/pick { };
 
-  pitivi = callPackage ../applications/video/pitivi {
-    gst = gst_all_1 //
-      { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation
-          (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ];
-                    # Fix this build error in ./tests/examples/waylandsink:
-                    #   main.c:28:2: error: #error "Wayland is not supported in GTK+"
-                    configureFlags = attrs.configureFlags or [] ++ [ "--enable-wayland=no" ];
-                  });
-      };
-  };
+  pitivi = callPackage ../applications/video/pitivi { };
 
   pulumi-bin = callPackage ../tools/admin/pulumi { };
 

From 2c8565a3ce84c29372c0875e285c29cc374ee6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 8 Sep 2018 07:58:17 +0200
Subject: [PATCH 0516/2793] nixos/gdm: use XDG_DATA_DIRS to find sessions

Gdm now searches for session files in XDG_DATA_DIRS so we no longer need the
sessions_dir.patch.
---
 .../services/x11/display-managers/gdm.nix     |  2 +-
 pkgs/desktops/gnome-3/core/gdm/default.nix    |  4 --
 .../gnome-3/core/gdm/sessions_dir.patch       | 38 -------------------
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6cc30b218f4..226fee7491c 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -116,7 +116,7 @@ in
         environment = {
           GDM_X_SERVER_EXTRA_ARGS = toString
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
-          GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions";
+          XDG_DATA_DIRS = "${cfg.session.desktops}/share/";
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
         } // optionalAttrs (xSessionWrapper != null) {
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index c419df5093e..691049cf655 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
     # 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
 
     # Allow specifying a wrapper for running the session command.
diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
deleted file mode 100644
index cda0468d349..00000000000
--- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/daemon/gdm-launch-environment.c
-+++ b/daemon/gdm-launch-environment.c
-@@ -143,6 +143,7 @@
-                 "WINDOWPATH",
-                 "XCURSOR_PATH",
-                 "XDG_CONFIG_DIRS",
-+                "GDM_SESSIONS_DIR",
-                 NULL
-         };
-         char *system_data_dirs;
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -364,6 +364,11 @@
-                 g_array_append_val (search_array, dir);
-         }
- 
-+        if (getenv("GDM_SESSIONS_DIR") != NULL) {
-+                gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
-+                g_array_append_val (search_array, gdm_sessions_dir);
-+        };
-+
-         g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
- 
- #ifdef ENABLE_WAYLAND_SUPPORT
---- a/libgdm/gdm-sessions.c
-+++ b/libgdm/gdm-sessions.c
-@@ -236,6 +236,11 @@
-                 g_array_append_val (xorg_search_array, session_dir);
-         }
- 
-+        if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
-+                gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
-+                g_array_append_val (xorg_search_array, gdm_sessions_dir);
-+        };
-+
-         g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs));
- 
- #ifdef ENABLE_WAYLAND_SUPPORT

From 372f97f7158b3d7f9c1beee4f4fa1d45acf3c17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 11 Sep 2018 22:49:43 +0200
Subject: [PATCH 0517/2793] pythonPackages.pygobject3: 3.26.1 -> 3.30.2

---
 .../python-modules/pygobject/3.nix            | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index c6264f08de8..430fcf62e93 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,28 +1,40 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection,
+pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
 
 buildPythonPackage rec {
-  major = "3.26";
-  minor = "1";
-  version = "${major}.${minor}";
-  format = "other";
   pname = "pygobject";
-  name = pname + "-" + version;
+  version = "3.30.2";
+
+  format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
-    sha256 = "1afi0jdjd9sanrzjwhv7z1k7qxlb91fqa6yqc2dbpjkhkjdpnmzm";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "15zd4w43js048y7fd1kdi6wpvccz1njjy60xw1ckvfy1qhikbz54";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  mesonFlags = [
+    "-Dpython=python${if isPy3k then "3" else "2" }"
+  ];
+
+  nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [ glib gobjectIntrospection ]
                  ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
-  meta = {
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "python3.pkgs.${pname}3";
+    };
+  };
+
+  meta = with stdenv.lib; {
     homepage = https://pygobject.readthedocs.io/;
     description = "Python bindings for Glib";
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
   };
 }

From d678b0c4ba671f1d9cde927a489339e78fcd2dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 11 Sep 2018 20:56:00 +0000
Subject: [PATCH 0518/2793] =?UTF-8?q?gnome3.gnome-panel:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 5c40b4c8f44..b9522e1e3f4 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -23,7 +23,7 @@
 
 let
   pname = "gnome-panel";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -31,15 +31,15 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1004cp9cxqpic9lsraqn5c1739acn4sn4ql3c1fja99hv22h1ziv";
+    sha256 = "12q0l7wy6hzl46i7xpvv82ka3bn14z0jg6fhv5xhnk7j9mkbmgqw";
   };
 
   patches = [
     # https://github.com/NixOS/nixpkgs/issues/36468
-    # https://gitlab.gnome.org/GNOME/gnome-panel/issues/6
+    # https://gitlab.gnome.org/GNOME/gnome-panel/issues/8
     (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/be26e170a10c297949a6d9f3cbc70b6caaf04b56.patch;
-      sha256 = "10gxl9fwbv5j0s1lz7gkz6wqpda5wfzs49r5khbk1h05lv0hk4l4";
+      url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/77be9c3507bd1b5d70d97649b85ec9f47f6c359c.patch;
+      sha256 = "00b1ihnc6hp2g6x1v1njbc6mhsk44izl2wigviibmka2znfk03nv";
     })
   ];
 

From 845bc0de0ea1deb213a51ed461eedf33f91187e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Sep 2018 09:33:20 +0200
Subject: [PATCH 0519/2793] gnome3.geary: fix build with webkit-2.22.0

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 9077d663523..a39375126f0 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -2,7 +2,7 @@
 , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
 , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
 , gobjectIntrospection, libpthreadstubs, sqlite
-, gnome3, librsvg, gnome-doc-utils, webkitgtk }:
+, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
 
 let
   pname = "geary";
@@ -16,6 +16,22 @@ stdenv.mkDerivation rec {
     sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm";
   };
 
+  patches = [
+    # Fix build with webkitgtk-2.22
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch;
+      sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi";
+    })
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch;
+      sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg";
+    })
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch;
+      sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l";
+    })
+  ];
+
   nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
   buildInputs = [
     gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite

From 305c7114a4903b4d6cf771fcecf2805663d23d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Sep 2018 07:49:25 +0000
Subject: [PATCH 0520/2793] =?UTF-8?q?gnome3.gnome-applets:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/misc/gnome-applets/default.nix    | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index cbf8bc9707b..de0d70ae42f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -1,7 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
-, autoreconfHook
 , intltool
 , itstool
 , libxml2
@@ -28,36 +26,16 @@
 
 let
   pname = "gnome-applets";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0wd6pirv57rcxm5d32r1s3ni7sp26gnqd4qhjciw0pn5ak627y5h";
+    sha256 = "1cvl32486kqw301wy40l1a1sdhanra7bx4smq0a3lmnl3x01zg43";
   };
 
-  patches = [
-    # https://github.com/NixOS/nixpkgs/issues/36468
-    # https://gitlab.gnome.org/GNOME/gnome-applets/issues/3
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1ee719581c33d7d640ae9f656e4e9b192bafef78.patch;
-      sha256 = "05wim7d2ii3pxph3n3am76cvnxmkfpggk0cpy8p5xgm3hcibwfrf";
-    })
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1fa778b01f0e6b70678b0e5755ca0ed7a093fa75.patch;
-      sha256 = "0kppqywn0ab18p64ixz0b58cn5bpqf0xy71bycldlc5ybpdx5mq0";
-    })
-
-    # https://gitlab.gnome.org/GNOME/gnome-applets/issues/4
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/e14482a90e6113f211e9328d8c39a69bdf5111d8.patch;
-      sha256 = "10ac0kk38hxqh8yvdlriyyv809qrxbpy9ihp01gizhiw7qpz97ff";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoreconfHook
     intltool
     itstool
     pkgconfig

From 05dff03bc16f14002aa4a7369e2e16263cd6c875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Sep 2018 07:49:51 +0000
Subject: [PATCH 0521/2793] =?UTF-8?q?gnome3.gnome-flashback:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/misc/gnome-flashback/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index f3f2cf99257..fe5345f1a6e 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -25,13 +25,13 @@
 
 let
   pname = "gnome-flashback";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ra8bfwgwqw47zx2h1q999g7l4dnqh7sv02if3zk8pkw3sm769hg";
+    sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57";
   };
 
   patches =[
@@ -41,11 +41,11 @@ in stdenv.mkDerivation rec {
       gnomeSession = gnome-session;
     })
 
-    # https://github.com/NixOS/nixpkgs/issues/36468
-    # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/3
+    # overrides do not respect gsettingsschemasdir
+    # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9
     (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/eabd34f64adc43b8783920bd7a2177ce21f83fbc.patch;
-      sha256 = "116c5zy8cp7d06mrsn943q7vj166086jzrfzfqg7yli14pmf9w1a";
+     url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch;
+     sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh";
     })
   ];
 

From ec1ba5d3f59f0964a0182220e475d460f704155a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Sep 2018 12:53:06 +0200
Subject: [PATCH 0522/2793] =?UTF-8?q?gnome3.gnome-usage:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/gnome-usage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index 0f7a89b3c52..f5420a0c944 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-usage";
-  version = "3.28.0";
+  version = "3.30.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
+    sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];

From 46448f27a894b812a9c13dd42384572d003be115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Sep 2018 13:29:52 +0200
Subject: [PATCH 0523/2793] libunique: Don't fail on deprecated-declarations

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

diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index 2bb53dd2b97..8559731d707 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   # patches from Gentoo portage
   patches = [
     ./1.1.6-compiler-warnings.patch

From e2fb5c302b703ece42200648744733ad4f38184d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Sep 2018 14:27:01 +0200
Subject: [PATCH 0524/2793] gnome3.folks: fix build

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

diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index ec059873dcb..289311e9c03 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobjectIntrospection
 , vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus
 , telepathy-glib, evolution-data-server, libsecret, db }:
 
@@ -16,9 +16,11 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
   # dbus_daemon needed for tests
-  buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    dbus-glib telepathy-glib evolution-data-server dbus
+    libsecret libxml2 libsoup nspr nss db
+  ];
+  nativeBuildInputs = [ pkgconfig intltool vala gobjectIntrospection ];
 
   configureFlags = [ "--disable-fatal-warnings" ];
 

From 109b9e3c059e7070bbeb3dc113808cc2fc8e312d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Sep 2018 20:28:23 +0200
Subject: [PATCH 0525/2793] =?UTF-8?q?gnome3.gpaste:=203.28.2=20=E2=86=92?=
 =?UTF-8?q?=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gpaste/default.nix | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index add6addaec0..21c25dafef3 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.28.2";
+  version = "3.30.2";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1zfx73qpw976hyzp5k569lywsq2b6dbnnzf2cvhjvn3mvkw8pin2";
+    sha256 = "0vlbvv6rjxq7h9cl3ilndjk7d51ac1x7agj8k6a7bwjx8h1fr62x";
   };
 
   patches = [
@@ -16,24 +16,28 @@ stdenv.mkDerivation rec {
 
   # TODO: switch to substituteAll with placeholder
   # https://github.com/NixOS/nix/issues/1846
-  # https://github.com/NixOS/nixpkgs/pull/37693
   postPatch = ''
     substituteInPlace src/gnome-shell/extension.js \
-      --subst-var-by typelibPath "$out/lib/girepository-1.0"
+      --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
     substituteInPlace src/gnome-shell/prefs.js \
-      --subst-var-by typelibPath "$out/lib/girepository-1.0"
+      --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
     substituteInPlace src/libgpaste/settings/gpaste-settings.c \
-      --subst-var-by gschemasCompiled "$out/share/gsettings-schemas/${name}/glib-2.0/schemas"
+      --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
   '';
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
-  buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme
-                  gtk3 gnome3.gnome-control-center dbus
-                  clutter pango appstream-glib systemd gobjectIntrospection ];
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig vala appstream-glib wrapGAppsHook
+  ];
+  buildInputs = [
+    glib gjs mutter gtk3 dbus
+    clutter pango gobjectIntrospection
+  ];
 
-  configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings"
-                     "--with-dbusservicesdir=$(out)/share/dbus-1/services"
-                     "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
+  configureFlags = [
+    "--with-controlcenterdir=${placeholder "out"}/share/gnome-control-center/keybindings"
+    "--with-dbusservicesdir=${placeholder "out"}/share/dbus-1/services"
+    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
+  ];
 
   enableParallelBuilding = true;
 

From e80ef11e5e44bc200a6b5cc722e61d6e5a1e52d1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Sep 2018 23:37:03 +0200
Subject: [PATCH 0526/2793] zeitgeist: fix build

---
 .../libraries/zeitgeist/default.nix           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 7acbaa260a0..b3c205ddab1 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38
+{ stdenv, fetchFromGitLab, pkgconfig, glib, sqlite, gobjectIntrospection, vala
 , autoconf, automake, libtool, gettext, dbus, telepathy-glib
 , gtk3, json-glib, librdf_raptor2, dbus-glib
 , pythonSupport ? true, python2Packages
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
   version = "1.0.1";
   name = "zeitgeist-${version}";
 
-  src = fetchgit {
-    url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
+  outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "zeitgeist";
+    repo = "zeitgeist";
     rev = "v${version}";
     sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44";
   };
@@ -18,13 +22,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ];
+  nativeBuildInputs = [
+    autoconf automake libtool pkgconfig gettext gobjectIntrospection vala python2Packages.python
+  ];
   buildInputs = [
     glib sqlite dbus telepathy-glib dbus-glib
     gtk3 json-glib librdf_raptor2 python2Packages.rdflib
   ];
 
-  prePatch = "patchShebangs .";
+  postPatch = ''
+    patchShebangs data/ontology2code
+  '';
 
   enableParallelBuilding = true;
 
@@ -32,11 +40,9 @@ stdenv.mkDerivation rec {
     moveToOutput lib/${python2Packages.python.libPrefix} "$py"
   '';
 
-  outputs = [ "out" ] ++ stdenv.lib.optional pythonSupport "py";
-
   meta = with stdenv.lib; {
     description = "A service which logs the users's activities and events";
-    homepage = https://launchpad.net/zeitgeist;
+    homepage = http://zeitgeist.freedesktop.org/;
     maintainers = with maintainers; [ lethalman ];
     license = licenses.gpl2;
     platforms = platforms.linux;

From ab51dc1bea88827f64570e7e8aca5a3530be86b2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 00:40:23 +0000
Subject: [PATCH 0527/2793] =?UTF-8?q?gnome3.gnome-devel-docs:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 c23ff2e6515..534c23da82c 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-devel-docs-${version}";
-  version = "3.28.0";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074";
+    sha256 = "1sssxagf0aaiyld8731247qq74bnrnq4arr7mpjrg0j6gwdfgxia";
   };
 
   passthru = {

From c36ffca064664a612f2430379a96ca27a120b978 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 05:02:42 +0200
Subject: [PATCH 0528/2793] gnome3.pomodoro: fix build

---
 pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 82e56d3f96c..4c3fd5a6c72 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
+{ stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
   dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,
   glib, gobjectIntrospection, libpeas
 }:
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
     sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1";
   };
 
+  patches = [
+    # build with Vala ≥ 0.42
+    (fetchpatch {
+      url = https://github.com/codito/gnome-pomodoro/commit/36778823ca5bd94b2aa948e5d8718f84d99d9af0.patch;
+      sha256 = "0a9x0p5wny3an9xawam9nhpffw5m4kgwj5jvv0g6c2lwlfzrx2rh";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook vala autoconf-archive libtool intltool appstream-glib
     wrapGAppsHook pkgconfig libxml2

From c0b58d95322cdd9eff4cc3429123f02b17a2948a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 03:18:50 +0000
Subject: [PATCH 0529/2793] =?UTF-8?q?gnome-builder:=203.28.4=20=E2=86=92?=
 =?UTF-8?q?=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editors/gnome-builder/default.nix         | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 9e890e172e5..9f871eec799 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -3,7 +3,6 @@
 , desktop-file-utils
 , docbook_xsl
 , docbook_xml_dtd_43
-, fetchpatch
 , fetchurl
 , flatpak
 , glibcLocales
@@ -12,7 +11,7 @@
 , gspell
 , gtk-doc
 , gtk3
-, gtksourceview3
+, gtksourceview4
 , hicolor-icon-theme
 , json-glib
 , jsonrpc-glib
@@ -31,14 +30,14 @@
 , wrapGAppsHook
 }:
 let
-  version = "3.28.4";
+  version = "3.30.0";
   pname = "gnome-builder";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05";
+    sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak";
   };
 
   nativeBuildInputs = [
@@ -67,7 +66,7 @@ in stdenv.mkDerivation {
     gnome3.vte
     gspell
     gtk3
-    gtksourceview3
+    gtksourceview4
     json-glib
     jsonrpc-glib
     libdazzle
@@ -87,24 +86,6 @@ in stdenv.mkDerivation {
     patchShebangs build-aux/meson/post_install.py
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "absolute-shared-library-path.patch";
-      url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/1011cabc519fd7322e2d695c79bfce3e18ff6200.patch";
-      sha256 = "1g12zziidzrphp527aa8sklfaln4qpjprkz73f0c9w5ph6k252fw";
-    })
-    (fetchpatch {
-      name = "python-libprefix.patch";
-      url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/43494ce83a347f369ed4cfb8dd71d3b93452736b.patch";
-      sha256 = "0kgi3n3g13n1j4xa61ln9xiahcfdc43bxi5mw4yva2d5px445msf";
-    })
-    (fetchpatch {
-      name = "ostree-dependency.patch";
-      url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/8b11773b65c95f464a0de16b91318c1ca73deeae.patch";
-      sha256 = "18r4hd90id0w6r0lzqpw83bcj45nm9jhr46a0ffi1mcayb18mgbk";
-    })
-  ];
-
   mesonFlags = [
     "-Dpython_libprefix=${python3.libPrefix}"
     "-Dwith_docs=true"

From 13e17e57e635571f381783ae469f04c3ff76bfca Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 03:31:07 +0000
Subject: [PATCH 0530/2793] =?UTF-8?q?jsonrpc-glib:=203.28.1=20=E2=86=92=20?=
 =?UTF-8?q?3.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index a73122d8253..a7f58a6af8f 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 let
-  version = "3.28.1";
+  version = "3.30.0";
   pname = "jsonrpc-glib";
 in
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0avff2ldjvwrb8rnzlgslagdjf6x7bmdx69rsq20k6f38icw4ang";
+    sha256 = "0z7v2kld9gyh0faarbs82vrdvg8h6a01x9mxlrwkxbghjgmq05w4";
   };
 
   mesonFlags = [

From 8f85b506a90b3a68076ba5e6e3b5aadc5699bdb4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 04:45:45 +0000
Subject: [PATCH 0531/2793] =?UTF-8?q?at-spi2-atk:=202.26.2=20=E2=86=92=202?=
 =?UTF-8?q?.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index f1db64cc9ea..2962e099f25 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -18,11 +18,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "at-spi2-atk";
-  version = "2.26.2";
+  version = "2.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
+    sha256 = "16lav8k3mcxf2hblfh95zcw41glmb92wwwwljrf10yza0h85gqg2";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ]

From 62da0be55192fa73059757cffdfdf51ed891ff59 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 04:46:02 +0000
Subject: [PATCH 0532/2793] =?UTF-8?q?at-spi2-core:=202.28.0=20=E2=86=92=20?=
 =?UTF-8?q?2.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index d9251c2bdc5..1cec75ccc3d 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "at-spi2-core";
-  version = "2.28.0";
+  version = "2.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
+    sha256 = "0azvgdmmivfz1fki25mz582gmwvfpajcnqhlq7s53nhr7lwzax81";
   };
 
   outputs = [ "out" "dev" ];

From 1ccf2626ee649a660ad4c6e84754cd267afea6c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 15:33:05 +0200
Subject: [PATCH 0533/2793] =?UTF-8?q?gnomeExtensions.dash-to-dock:=2063=20?=
 =?UTF-8?q?=E2=86=92=2064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 152b9522bef..62420bf42b2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-dash-to-dock-${version}";
-  version = "v63";
+  version = "64";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    rev = "extensions.gnome.org-" + version;
-    sha256 = "140ih4l3nn2lbgw684xjvkhqxflr1xg2vm1m46z632bb0y3py4yg";
+    rev = "extensions.gnome.org-v" + version;
+    sha256 = "1cfkdi4raim50wif47fly4c0lzyamysv40qd5ppr1h824bamzxcm";
   };
 
   nativeBuildInputs = [

From 02ebd47dfa925da523452fc616cfdc7db66a3927 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 15:35:10 +0200
Subject: [PATCH 0534/2793] =?UTF-8?q?gnomeExtensions.dash-to-panel:=2011?=
 =?UTF-8?q?=20=E2=86=92=2016?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 3baedbf0c59..de442d912b3 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-dash-to-panel-${version}";
-  version = "11";
+  version = "16";
 
   src = fetchFromGitHub {
     owner = "jderose9";
     repo = "dash-to-panel";
     rev = "v${version}";
-    sha256 = "1bfcnrhw6w8yrz8sw520kwwshmplkg4awpvz07kg4d73m6zn4mw2";
+    sha256 = "1gi2qfinafihax0j0rbs1k5nf6msdv86gzl2vfkc8s6gfkncv9bp";
   };
 
   buildInputs = [

From 9a4932b1ad6934021367145db3da723c69acb17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Sep 2018 17:58:40 +0200
Subject: [PATCH 0535/2793] gnomeExtensions.icon-hider: 19 -> 20

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

diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index 7ad26a7c6d4..4c9d277dceb 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-icon-hider-${version}";
-  version = "19";
+  version = "20";
 
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "gnome-shell-extension-icon-hider";
     rev = "v${version}";
-    sha256 = "0cifm6cmxwxrrrva41wvjvrzsdqaczfbillf2vv3wsb60dqr6h39";
+    sha256 = "0z2rfr0nlp5zhlfxd6y0sxrxf7dj8sknimn6skxlbdm1xawl1fin";
   };
 
   uuid = "icon-hider@kalnitsky.org";

From 7e082a47064638167d7fc17c75ac8a918b3018df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Sep 2018 18:01:55 +0200
Subject: [PATCH 0536/2793] gnomeExtensions.nohotcorner: 16.0 -> 17.0

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

diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index 4061c3bb5cc..a2dbe5051e5 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-nohotcorner-${version}";
-  version = "16.0";
+  version = "17.0";
 
   src = fetchFromGitHub {
     owner = "HROMANO";
     repo = "nohotcorner";
     rev = "v${version}";
-    sha256 = "042lv4pvzsxv6spa8k1hji1bfqj893arx55p56mmm20wa5dr5qm3";
+    sha256 = "0jmm6diiqf2wgrj33pgh813c8qxznbbp5rqsngq9vj6vvizqbwh3";
   };
 
   # Taken from the extension download link at

From e7bd4f87e45c7bc8aab962c508a44d254774052a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Sep 2018 18:04:25 +0200
Subject: [PATCH 0537/2793] gnomeExtensions.system-monitor: 33 -> 36

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

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index b4b34d91c18..8bafbd003d5 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
-  version = "33";
+  version = "36";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
     rev = "v${version}";
-    sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
+    sha256 = "0x3r189h5264kjxsm18d34gzb5ih8l4pz7i9qks9slcnzaiw4y0z";
   };
 
   buildInputs = [

From 47f67c64b8d93f1d1628fc7bc324af81feaa752a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 17:01:45 +0000
Subject: [PATCH 0538/2793] =?UTF-8?q?gnome-latex:=203.30.1=20=E2=86=92=203?=
 =?UTF-8?q?.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/gnome-latex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
index 055ac050b54..71d0f9450f2 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, wrapGAppsHook
 , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
 let
-  version = "3.30.1";
+  version = "3.30.2";
   pname = "gnome-latex";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8";
+    sha256 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

From 7dc92f639c7d1bdf36a86318dbe3a983d32e7563 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 17:07:56 +0000
Subject: [PATCH 0539/2793] =?UTF-8?q?gtksourceview4:=204.0.0=20=E2=86=92?=
 =?UTF-8?q?=204.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gtksourceview/4.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 7cd9de4b06b..0a417e719ac 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -5,11 +5,11 @@ let
   checkInputs = [ xvfb_run dbus ];
 in stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
-  version = "4.0.0";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
+    sha256 = "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x";
   };
 
   propagatedBuildInputs = [
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gtksourceview";
-      attrPath = "gnome3.gtksourceview";
+      attrPath = "gtksourceview4";
     };
   };
 

From e22da7680ed9c1651b4ca46dbca6ebc9175367d1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Sep 2018 01:40:23 +0200
Subject: [PATCH 0540/2793] empathy: fix build

---
 pkgs/desktops/gnome-3/core/empathy/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index f4aeb6c53db..7b2365b6a15 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf
-, telepathy-glib, telepathy-farstream
+, file, librsvg, gnome3, gdk_pixbuf, python3
+, telepathy-glib, telepathy-farstream, glibcLocales
 , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
 , telepathy-logger, libnotify, clutter, libsoup, gnutls
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
     sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "empathy"; };
-  };
-
   propagatedUserEnvPkgs = [
     gnome-online-accounts shared-mime-info
   ];
@@ -30,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [
     pkgconfig libtool intltool itstool file wrapGAppsHook
-    libxml2 libxslt yelp-xsl
+    libxml2 libxslt yelp-xsl python3 glibcLocales
   ];
   buildInputs = [
     gtk3 glib webkitgtk icu gnome-online-accounts
@@ -49,6 +45,14 @@ stdenv.mkDerivation rec {
     cheese libgudev
   ];
 
+  LC_ALL = "en_US.UTF-8";
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "empathy";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Empathy;
     description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";

From 10b481c6ed3f85fe47522257d0eb806a64e5d2cb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 17 Sep 2018 11:02:56 +0000
Subject: [PATCH 0541/2793] =?UTF-8?q?template-glib:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
index 6ce02d588a9..73bf69f6c0d 100644
--- a/pkgs/development/libraries/template-glib/default.nix
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 let
-  version = "3.28.0";
+  version = "3.30.0";
   pname = "template-glib";
 in
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18bic41f9cx8h6n5bz80z4ridb8c1h1yscicln8zsn23zmp44x3c";
+    sha256 = "0j9ndswl3fc0ymbqd6kk7yw3sniij3dgczc665p06wgw3cwhssfg";
   };
 
   buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];

From 9d8ea55e301d56fdc1f4062c8623d36e2eb3dc90 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 17 Sep 2018 11:04:29 +0000
Subject: [PATCH 0542/2793] =?UTF-8?q?python3.pkgs.pyatspi:=202.26.0=20?=
 =?UTF-8?q?=E2=86=92=202.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 5960551abc7..539e16abe57 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyatspi";
-  version = "2.26.0";
+  version = "2.30.0";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xdnix7gxzgf75xy9ris4dd6b05mqwicw190b98xqmypydyf95n6";
+    sha256 = "11g7dx21brfmi5vrq289cw983rydalx0cy91afv5gigyadsmyam2";
   };
 
   buildInputs = [

From 38c529f57aa50c1cdb36c1af0488dac363629b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 14 Sep 2018 13:50:04 +0200
Subject: [PATCH 0543/2793] glib: use absolute path for `gio-launch-desktop`

glib tries to look up `gio-launch-desktop` in the path which obviously can fail.
Specifically this now happens when launching gnome-shell.
---
 pkgs/development/libraries/glib/default.nix       | 15 ++++++++++++++-
 .../glib/fix-gio-launch-desktop-path.patch        | 11 +++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de56b6a5d10..1eb50fc4f10 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -59,7 +59,11 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.hostPlatform.isMusl [
       ./quark_init_on_demand.patch
       ./gobject_init_on_demand.patch
-    ] ++ [ ./schema-override-variable.patch ];
+    ] ++ [
+      ./schema-override-variable.patch
+      # Require substituteInPlace in postPatch
+      ./fix-gio-launch-desktop-path.patch
+    ];
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
   outputBin = "dev";
@@ -88,6 +92,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir,"
+
+    # substitute fix-gio-launch-desktop-path.patch
+    substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"
+
     chmod +x gio/tests/gengiotypefuncs.py
     patchShebangs gio/tests/gengiotypefuncs.py
     patchShebangs glib/gen-unicode-tables.pl
@@ -106,6 +114,11 @@ stdenv.mkDerivation rec {
       mv "$dev/bin/$app" "$bin/bin"
     done
 
+    # Add gio-launch-desktop to $out so we can refer to it from $dev
+    mkdir $out/bin
+    mv "$dev/bin/gio-launch-desktop" "$out/bin/"
+    ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
+
     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|"
diff --git a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
new file mode 100644
index 00000000000..4fdec2dd7e7
--- /dev/null
+++ b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
@@ -0,0 +1,11 @@
+--- a/gio/gdesktopappinfo.c
++++ b/gio/gdesktopappinfo.c
+@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
+ 
+           /* Fall back on usual searching in $PATH */
+           if (tmp == NULL)
+-            tmp = "gio-launch-desktop";
++            tmp = "@bindir@/gio-launch-desktop";
+           g_once_init_leave (&gio_launch_desktop_path, tmp);
+         }
+ 

From 0cd638b2917f749cb60f0b96be0c804953856b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 17 Sep 2018 17:29:58 +0200
Subject: [PATCH 0544/2793] playerctl: switch to meson and fix build

---
 pkgs/tools/audio/playerctl/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index d2a7358ff8f..497e17e3cc0 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib,
-  pkgconfig, gobjectIntrospection }:
+{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
@@ -12,13 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    which autoconf automake libtool gnome2.gtkdoc glib
-    gobjectIntrospection
-  ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  buildInputs = [ glib ];
 
-  preConfigure = "./autogen.sh";
+  # docs somehow crashes the install phase:
+  # https://github.com/acrisci/playerctl/issues/85
+  mesonFlags = [ "-Dgtk-doc=false" ];
 
   meta = with stdenv.lib; {
     description = "Command-line utility and library for controlling media players that implement MPRIS";

From 153f3f867b134e19b4e0778b5b976b4555602e50 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 17 Sep 2018 13:12:44 -0400
Subject: [PATCH 0545/2793] gnome3.mutter328: init

---
 pkgs/desktops/gnome-3/core/mutter/3.28.nix | 55 ++++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix          |  5 ++
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.28.nix

diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
new file mode 100644
index 00000000000..50da3c99865
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -0,0 +1,55 @@
+{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
+, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "mutter-${version}";
+  version = "3.28.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz";
+    sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
+  };
+
+  configureFlags = [
+    "--with-x"
+    "--disable-static"
+    "--enable-shape"
+    "--enable-sm"
+    "--enable-startup-notification"
+    "--enable-xsync"
+    "--enable-verbose-mode"
+    "--with-libcanberra"
+    "--with-xwayland-path=${xwayland}/bin/Xwayland"
+    "--enable-compile-warnings=maximum"
+  ];
+
+  propagatedBuildInputs = [
+    # required for pkgconfig to detect mutter-clutter
+    libXtst
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
+
+  buildInputs = with gnome3; [
+    glib gobjectIntrospection gtk gsettings-desktop-schemas upower
+    gnome-desktop cairo pango cogl clutter zenity libstartup_notification
+    gnome3.geocode-glib libinput libgudev libwacom
+    libcanberra-gtk3 zenity xkeyboard_config libxkbfile
+    libxkbcommon pipewire
+  ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/mutter" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 4ebd81ec4b7..7050147e920 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -179,6 +179,11 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   mutter = callPackage ./core/mutter { };
 
+  # Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3
+  # A more detailed explaination can be seen here https://decathorpe.com/2018/09/04/call-for-help-pantheon-on-fedora-29.html
+  # See Also: https://github.com/elementary/gala/issues/303
+  mutter328 = callPackage ./core/mutter/3.28.nix { };
+
   nautilus = callPackage ./core/nautilus { };
 
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {

From 16f31fb8e4147fc52c23f2295c32fd4ceb4619f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Sep 2018 17:36:08 +0200
Subject: [PATCH 0546/2793] xfce.xfce4-namebar-plugin: Specify vala_0_40

---
 pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
index 61035571f53..8c6c91e2519 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, python2, vala
+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40
 , gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];
-  buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ];
+  buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ];
 
   postPatch = ''
     substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"

From ef67f0d2c82be7617b20fde054680587403e040e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Sep 2018 17:43:34 +0200
Subject: [PATCH 0547/2793] telepathy-salut: use standard pkgconfig

Building glib with selinux support caused the build to fail due to selinux being
specificed in `Required.private` in gio-2.0.pc. `pkgconfigUpstream` isn't
patched to handle `Required.private` properly.
---
 .../networking/instant-messengers/telepathy/salut/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 68c81d38078..0bc9b3124ee 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
-, libuuid, openssl, pcre, sqlite, pkgconfigUpstream }:
+, libuuid, openssl, pcre, sqlite, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
     sqlite pcre telepathy-glib.python ];
 
-  nativeBuildInputs = [ libxslt pkgconfigUpstream ];
+  nativeBuildInputs = [ libxslt pkgconfig ];
 
   configureFlags = [ "--disable-avahi-tests" ];
 

From 8968d2008394de05080865647b8ed2352f2be860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Sep 2018 17:55:11 +0200
Subject: [PATCH 0548/2793] planner: don't error on deprecrated declarations

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

diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 85dfd024d50..7bc02e786e1 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -23,6 +23,9 @@ in stdenv.mkDerivation {
     sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g";
   };
 
+  # planner-popup-button.c:81:2: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations]
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   nativeBuildInputs = with gnome2; [
     pkgconfig
     intltool

From 1eaa4540405eaf10388c879747690a002836a058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Sep 2018 18:08:59 +0200
Subject: [PATCH 0549/2793] ldmtool: don't fail on deprecated declarations

---
 pkgs/tools/misc/ldmtool/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index 266db2ac811..aaff5c96d69 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
        -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g'
    '';
 
+   # ldm.c:951:5: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations]
+   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
    configureScript = "sh autogen.sh";
 
    nativeBuildInputs = [ pkgconfig ];

From 0b83fc3fe400276da7024dfe6f0594a80711394b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Sep 2018 23:38:43 +0200
Subject: [PATCH 0550/2793] gnucash24: add `pcre` fix build

---
 pkgs/applications/office/gnucash/2.4.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix
index 9aa4cc64315..40c91d6488d 100644
--- a/pkgs/applications/office/gnucash/2.4.nix
+++ b/pkgs/applications/office/gnucash/2.4.nix
@@ -2,6 +2,7 @@
 , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
 , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
 , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
+, pcre
 }:
 
 /* If you experience GConf errors when running GnuCash on NixOS, see
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
     libgnomeprint goffice enchant gettext intltool perl guile slibGuile
     swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
     perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
-    hicolor-icon-theme
+    hicolor-icon-theme pcre
   ];
   propagatedUserEnvPkgs = [ gconf ];
 

From e6fb8655009399b0a0e0f2adebafce6c8c4e3857 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 12 Aug 2018 19:38:57 +0200
Subject: [PATCH 0551/2793] libhandy: init at 0.0.5

---
 .../libraries/libhandy/default.nix            | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/libraries/libhandy/default.nix

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
new file mode 100644
index 00000000000..683dd670198
--- /dev/null
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobjectIntrospection, vala
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, gtk3, gnome3
+, dbus, xvfb_run, libxml2
+}:
+
+let
+  pname = "libhandy";
+  version = "0.0.5";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" "devdoc" "glade" ];
+  outputBin = "dev";
+
+  src = fetchFromGitLab {
+    domain = "source.puri.sm";
+    owner = "Librem5";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig gobjectIntrospection vala
+    gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
+  checkInputs = [ dbus xvfb_run ];
+
+  mesonFlags = [
+    "-Dgtk_doc=true"
+  ];
+
+  PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
+  PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
+
+  doCheck = true;
+
+  checkPhase = ''
+    export NO_AT_BRIDGE=1
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      meson test --print-errorlogs
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library full of GTK+ widgets for mobile phones";
+    homepage = https://source.puri.sm/Librem5/libhandy;
+    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 7104065b7d7..0f06b02de50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3910,6 +3910,8 @@ with pkgs;
 
   libgaminggear = callPackage ../development/libraries/libgaminggear { };
 
+  libhandy = callPackage ../development/libraries/libhandy { };
+
   libipfix = callPackage ../development/libraries/libipfix { };
 
   libircclient = callPackage ../development/libraries/libircclient { };

From 3782e127bcc5ae712dc35bf4af783cb3316c25d0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Sep 2018 03:00:08 +0200
Subject: [PATCH 0552/2793] gnome-podcasts: init at 0.4.6

---
 .../audio/gnome-podcasts/default.nix          | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/audio/gnome-podcasts/default.nix

diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
new file mode 100644
index 00000000000..c8db1ac6d10
--- /dev/null
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
+, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
+
+# TODO: build from git for easier updates
+# rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
+  version = "0.4.6";
+  name = "gnome-podcasts-${version}";
+
+  src = fetchurl {
+    url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
+    sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
+  };
+
+  # src = fetchFromGitLab {
+  #   domain = "gitlab.gnome.org";
+  #   owner = "World";
+  #   repo = "podcasts";
+  #   rev = version;
+  #   sha256 = "15xj98dhxvys0cnya9488qsfsm0ys1wy69wkc39z8j6hwdm7byq2";
+  # };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
+  ];
+  buildInputs = [
+    glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
+  ];
+
+  # cargoSha256 = "0721b5f700vvvzvmdl8nfjaa6j412q1fjssgrjv8n6rmn9z13d2v";
+
+  postPatch = ''
+    chmod +x scripts/compile-gschema.py # patchShebangs requires executable file
+    patchShebangs scripts/compile-gschema.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Listen to your favorite podcasts";
+    homepage = https://wiki.gnome.org/Apps/Podcasts;
+    license = licenses.gpl3;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f06b02de50..2a9fad2a3e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2934,6 +2934,8 @@ with pkgs;
 
   gnome-builder = callPackage ../applications/editors/gnome-builder { };
 
+  gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
+
   gnokii = callPackage ../tools/misc/gnokii { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };

From 52e61752ee3781f07a434509c75399043761ce34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 22 Sep 2018 23:07:02 +0200
Subject: [PATCH 0553/2793] gnucash: don't fail on glib-2.58's new
 deprecrations

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

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 683db389fed..e3c03eef9b9 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ dconf ];
 
+  # glib-2.58 deprecrated g_type_class_add_private
+  # Should probably be removed next version bump
+  CXXFLAGS = [ "-Wno-deprecated-declarations" ];
+
   postPatch = ''
     patchShebangs .
   '';

From f28ff4cf7faa1279c4ed7e9e6795489774b1a086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 23 Sep 2018 01:07:02 +0200
Subject: [PATCH 0554/2793] purple-facebook: Remove unused mercurial dependency

Having python3 in the PATH and python2's setuptools and enum in PYTHONPATH
breaks any python3 script. Having mercurial in buildInputs makes this
condition true, breaking glib's python scripts, which after 2.58 use python3.

Mercurial isn't actually needed in buildInputs, so removing mercurial is a
simple fix.
---
 .../pidgin-plugins/purple-facebook/default.nix                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 8eb086a9807..150c47b9b50 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } :
+{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, autoreconfHook }:
 
 
 let
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [pidgin glib json-glib mercurial];
+  buildInputs = [ pidgin glib json-glib ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From 14a1a4be31977e84babebfc0e602d1248605dc3a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 13:24:44 +0100
Subject: [PATCH 0555/2793] gnome-recipes: init at 2.0.2

---
 .../misc/gnome-recipes/default.nix            | 79 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/applications/misc/gnome-recipes/default.nix

diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix
new file mode 100644
index 00000000000..154af4efc9b
--- /dev/null
+++ b/pkgs/applications/misc/gnome-recipes/default.nix
@@ -0,0 +1,79 @@
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gnome3
+, desktop-file-utils
+, gettext
+, itstool
+, python3
+, wrapGAppsHook
+, gtk3
+, glib
+, libsoup
+, gnome-online-accounts
+, rest
+, json-glib
+, gnome-autoar
+, gspell
+, libcanberra }:
+
+let
+  pname = "gnome-recipes";
+  version = "2.0.2";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    desktop-file-utils
+    gettext
+    itstool
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    libsoup
+    gnome-online-accounts
+    rest
+    json-glib
+    gnome-autoar
+    gspell
+    libcanberra
+  ];
+
+  # https://github.com/NixOS/nixpkgs/issues/36468
+  # https://gitlab.gnome.org/GNOME/recipes/issues/76
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+  postPatch = ''
+    chmod +x src/list_to_c.py
+    patchShebangs src/list_to_c.py
+    patchShebangs meson_post_install.py
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Recipe management application for GNOME";
+    homepage = https://wiki.gnome.org/Apps/Recipes;
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a9fad2a3e2..aee064f742b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17210,6 +17210,10 @@ with pkgs;
 
   gnome-mpv = callPackage ../applications/video/gnome-mpv { };
 
+  gnome-recipes = callPackage ../applications/misc/gnome-recipes {
+    inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell;
+  };
+
   gollum = callPackage ../applications/misc/gollum { };
 
   googleearth = callPackage ../applications/misc/googleearth { };

From 89594d9258359201f0cbd91e0485fa5ddb615261 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Sep 2018 13:53:06 +0000
Subject: [PATCH 0556/2793] =?UTF-8?q?gnome3.grilo-plugins:=200.3.7=20?=
 =?UTF-8?q?=E2=86=92=200.3.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/grilo-plugins/default.nix        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index f03259c3540..124db927236 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, intltool, sqlite
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite
 , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
 , gmime, json-glib, avahi, tracker, dleyna-server, itstool }:
 
 let
   pname = "grilo-plugins";
-  version = "0.3.7";
-  major = stdenv.lib.versions.majorMinor version;
+  version = "0.3.8";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
-    sha256 = "0838mm7sdfwsiw022rjb27dlbbxncpx5jrpv3qzfadli66y3nbzw";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac";
   };
 
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
-
-  nativeBuildInputs = [ pkgconfig intltool itstool ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ];
   buildInputs = [
     gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
     lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts
@@ -36,7 +33,7 @@ in stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Projects/Grilo;
     description = "A collection of plugins for the Grilo framework";
     maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
+    license = licenses.lgpl21;
     platforms = platforms.linux;
   };
 }

From f6ad14a50e2c6d20f73670961e714f482aab29c5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Sep 2018 01:47:40 +0200
Subject: [PATCH 0557/2793] =?UTF-8?q?gnome3.eog:=203.28.3=20=E2=86=92=203.?=
 =?UTF-8?q?28.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 bf5465b16c2..6d897472d68 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "eog";
-  version = "3.28.3";
+  version = "3.28.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
+    sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection python3 ];

From 21505290ee534ab5d651389e9facf66b8ae6f40c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Sep 2018 04:56:02 +0200
Subject: [PATCH 0558/2793] =?UTF-8?q?json-glib:=201.4.2=20=E2=86=92=201.4.?=
 =?UTF-8?q?4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/json-glib/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index be83dbc52f4..44dd12c7750 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
+{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext
 , gobjectIntrospection, fixDarwinDylibNames, gnome3
 }:
 
 let
   pname = "json-glib";
-  version = "1.4.2";
+  version = "1.4.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";
+    sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j";
   };
 
   propagatedBuildInputs = [ glib ];
   nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/json-glib/issues/27
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff";
-      sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
 
   doCheck = true;

From b83ff40a5e012347ce1e3023faa1826a10e0e943 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 28 Sep 2018 21:56:30 +0200
Subject: [PATCH 0559/2793] =?UTF-8?q?gnome3.libgda:=205.2.4=20=E2=86=92=20?=
 =?UTF-8?q?5.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/libgda/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index 002310c5276..93e18f51916 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -9,25 +9,17 @@ assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
   name = "libgda-${version}";
-  version = "5.2.4";
+  version = "5.2.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
+    sha256 = "1j4hxhiwr4i8rgbn2ck93y1c2b792sfzlrq7abyjx8h8ik1f9lp3";
   };
 
   passthru = {
     updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; };
   };
 
-  patches = [
-    (fetchurl {
-      name = "libgda-fix-encoding-of-copyright-headers.patch";
-      url = https://bug787685.bugzilla-attachments.gnome.org/attachment.cgi?id=359901;
-      sha256 = "11qj7f7zsiw8jy18vlwz2prlxpg4iq350sws3qwfwsv0lnmncmfq";
-    })
-  ];
-
   configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ]
     ++ (optional (mysqlSupport) "--with-mysql=yes")
     ++ (optional (postgresSupport) "--with-postgres=yes");

From 181a9865fc93bc4f6ca44022f2dadaf135802ddc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 28 Sep 2018 21:58:26 +0200
Subject: [PATCH 0560/2793] =?UTF-8?q?gnome3.tracker:=202.1.4=20=E2=86=92?=
 =?UTF-8?q?=202.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

systemd sure service files are no longer installed by default when the build
can't find systemd, so we need to manually specificy the install dir.
---
 pkgs/desktops/gnome-3/core/tracker/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index c53324dd9b3..385a4c3d1d6 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2
+{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
 , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
 , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
 
 let
   pname = "tracker";
-  version = "2.1.4";
+  version = "2.1.6";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
+    sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq";
   };
 
   nativeBuildInputs = [
@@ -30,10 +30,19 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddbus_services=share/dbus-1/services"
+    "-Dsystemd_user_services=lib/systemd/user"
     # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
     "-Dfunctional_tests=false"
   ];
 
+  patches = [
+    # Always generate tracker-sparql.h in time
+    (fetchurl {
+      url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff;
+      sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws";
+    })
+  ];
+
   postPatch = ''
     patchShebangs utils/g-ir-merge/g-ir-merge
     patchShebangs utils/data-generators/cc/generate

From d359635ab41bcea7de439465299570c0d6a5f576 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 29 Sep 2018 03:34:39 +0200
Subject: [PATCH 0561/2793] gnome3.gnome-remote-desktop: init at 0.1.6

---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-remote-desktop.nix  | 18 ++++++++
 .../core/gnome-remote-desktop/default.nix     | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 4 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 75e8446523f..e476efb79a3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -246,6 +246,7 @@
   ./services/desktops/gnome3/gnome-documents.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
+  ./services/desktops/gnome3/gnome-remote-desktop.nix
   ./services/desktops/gnome3/gnome-online-miners.nix
   ./services/desktops/gnome3/gnome-terminal-server.nix
   ./services/desktops/gnome3/gnome-user-share.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
new file mode 100644
index 00000000000..021f4f9534b
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
@@ -0,0 +1,18 @@
+# Remote desktop daemon using Pipewire.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.gnome3.gnome-remote-desktop = {
+      enable = mkEnableOption "Remote Desktop support using Pipewire";
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
+    systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
new file mode 100644
index 00000000000..6fab2d5b0b7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
+, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-remote-desktop-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "jadahl";
+    repo = "gnome-remote-desktop";
+    rev = version;
+    sha256 = "1d49kxhi1bn8ssh6nybg7d6zajqwc653czbsms2d59dbhj8mn75f";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
+
+  buildInputs = [
+    glib pipewire systemd libvncserver libsecret libnotify
+    gdk_pixbuf # For libnotify
+  ];
+
+  postPatch = ''
+    substituteInPlace meson.build --replace pipewire-0.1 pipewire-0.2
+
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
+  mesonFlags = [
+    "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop;
+    description = "GNOME Remote Desktop server";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7050147e920..26600bf0e62 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -121,6 +121,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-online-miners = callPackage ./core/gnome-online-miners { };
 
+  gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
+
   gnome-session = callPackage ./core/gnome-session { };
 
   gnome-shell = callPackage ./core/gnome-shell { };

From e02516db7558a45cc8a516192bf520fef1fb6801 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 29 Sep 2018 03:36:50 +0200
Subject: [PATCH 0562/2793] nixos/gnome3: enable remote desktop on wayland

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 pkgs/desktops/gnome-3/core/mutter/default.nix          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0d5b860d461..72109cf31af 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -107,6 +107,7 @@ in {
     services.gnome3.gnome-documents.enable = mkDefault true;
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-online-accounts.enable = mkDefault true;
+    services.gnome3.gnome-remote-desktop.enable = mkDefault true;
     services.gnome3.gnome-terminal-server.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
     services.gnome3.gvfs.enable = true;
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index ca7d73cb17e..e15dd783150 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"

From fcf066983d851138f7dfca7c5020c9f4ff4e2fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 17 Oct 2018 09:02:32 +0200
Subject: [PATCH 0563/2793] gxneur: don't fail on new glib deprecration

---
 pkgs/applications/misc/gxneur/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index 9def56aa98c..7d19a9cb110 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur

From 3fdfde44c65e246a19cbb2afb86153e5b64dcdb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 17 Oct 2018 09:18:22 +0200
Subject: [PATCH 0564/2793] hardinfo: fix build with new libsoup

---
 pkgs/tools/system/hardinfo/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
index a2bffab3a98..0c6f812cb3e 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
   # Fixes '#error You must compile this program without "-O"'
   hardeningDisable = [ "all" ];
 
+  # Ignore undefined references to a bunch of libsoup symbols
+  NIX_LDFLAGS = "--unresolved-symbol=ignore-all";
+
   preConfigure = ''
     patchShebangs configure
 

From abb694f5622731149ad4bea90cb1273134be8bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 17 Oct 2018 10:57:55 +0200
Subject: [PATCH 0565/2793] gitg: 3.26.0 -> 3.30.1

---
 pkgs/desktops/gnome-3/misc/gitg/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index c50db12f6b0..d94d14719c5 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,35 +1,39 @@
 { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
 , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection
 , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
+, meson, ninja, python3
  }:
 
 let
   pname = "gitg";
-  version = "3.26.0";
+  version = "3.30.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
+    sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
   };
 
-  preCheck = ''
-    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+    sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
+
+    substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
   '';
+
   doCheck = true;
 
   enableParallelBuilding = true;
 
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
   buildInputs = [
     gtk3 glib json-glib libgee libpeas gnome3.libsoup
     libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
     libsecret gobjectIntrospection gnome3.adwaita-icon-theme
   ];
 
-  nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ];
+  nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
 
   preFixup = ''
     gappsWrapperArgs+=(

From b1f55d27bcbad7df514e45113f39885f12f6b8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 17 Oct 2018 10:59:36 +0200
Subject: [PATCH 0566/2793] gnome3.zenity: 3.28.1 -> 3.30.0

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

diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 2eb515d971b..e80c437afda 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "zenity-${version}";
-  version = "3.28.1";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv";
+    sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
   };
 
   passthru = {

From 98c02413dbe0e031e4623ecb49ab9673004aeada Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Mon, 24 Sep 2018 23:49:26 -0400
Subject: [PATCH 0567/2793] gnomeExtensions.icon-hider: 20 -> 21

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

diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index 4c9d277dceb..bc397dc7122 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-icon-hider-${version}";
-  version = "20";
+  version = "21";
 
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "gnome-shell-extension-icon-hider";
     rev = "v${version}";
-    sha256 = "0z2rfr0nlp5zhlfxd6y0sxrxf7dj8sknimn6skxlbdm1xawl1fin";
+    sha256 = "0l0jb0ishaq00d4kdfvv5p7pj7b45dz57y3j2ihqr695bzb6b9hr";
   };
 
   uuid = "icon-hider@kalnitsky.org";

From 10d43b28ad3785db621b9508b9284f238fb38e39 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Mon, 24 Sep 2018 23:50:02 -0400
Subject: [PATCH 0568/2793] gnomeExtensions.nohotcorner: 17.0 -> 18.0

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

diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index a2dbe5051e5..07622e07a72 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-nohotcorner-${version}";
-  version = "17.0";
+  version = "18.0";
 
   src = fetchFromGitHub {
     owner = "HROMANO";
     repo = "nohotcorner";
     rev = "v${version}";
-    sha256 = "0jmm6diiqf2wgrj33pgh813c8qxznbbp5rqsngq9vj6vvizqbwh3";
+    sha256 = "0vajiys93gs7fs9v6brgf8fplkmh28j103in3wq04l34cx5sqkks";
   };
 
   # Taken from the extension download link at

From 999cd7f8dc890af2b1785c64fd160ad322283134 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Tue, 25 Sep 2018 00:12:48 -0400
Subject: [PATCH 0569/2793] gnomeExtensions.caffeine: unstable-2017-06-21 ->
 unstable-2018-09-25

---
 pkgs/desktops/gnome-3/extensions/caffeine/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index cc945159716..1de85ab36d2 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-caffeine-${version}";
-  version = "unstable-2017-06-21";
+  version = "unstable-2018-09-25";
 
   src = fetchFromGitHub {
     owner = "eonpatapon";
     repo = "gnome-shell-extension-caffeine";
-    rev = "ce0d0d4d3a9fed4b35b82cf59609a00502862271";
-    sha256 = "01gf9c8nhhm78iakqf30900y6lywxks1pm5h2cs0jvp8d3ygd7sd";
+    rev = "71b6392c53e063563602c3d919c0ec6a4c5c9733";
+    sha256 = "170zyxa41hvyi463as650nw3ygr297901inr3xslrhvjq1qacxri";
   };
 
   uuid = "caffeine@patapon.info";

From 55cbc8b0e9dc1741c7dfee165f1162a1cd4637a4 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Fri, 19 Oct 2018 23:17:36 -0400
Subject: [PATCH 0570/2793] gnomeExtensions.no-title-bar: 8 -> 9

---
 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index 43e94ce6bfb..e1dedd2a88b 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-no-title-bar-${version}";
-  version = "8";
+  version = "9";
 
   src = fetchFromGitHub {
     owner = "franglais125";
     repo = "no-title-bar";
     rev = "v${version}";
-    sha256 = "0n3ayf7k2icy913sjl1d6iwm21i8fivv0f7wj7gck8q7q2j7i3bz";
+    sha256 = "02zm61fg40r005fn2rvgrbsz2hbcsmp2hkhyilqbmpilw35y0nbq";
   };
 
   nativeBuildInputs = [

From 0192b5aa54a025c7736629353acbc935f57e04e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 13 Nov 2018 09:11:07 +0100
Subject: [PATCH 0571/2793] gnome3: add hedning to maintainers

---
 pkgs/desktops/gnome-3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 26600bf0e62..536bec1d362 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,7 +3,7 @@
 lib.makeScope pkgs.newScope (self: with self; {
   updateScript = callPackage ./update.nix { };
 
-  maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning ];
 
   corePackages = with gnome3; [
     pkgs.desktop-file-utils

From 4da3f08a2c6b6ef3fb4723e81c84c1211c9234bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 13 Nov 2018 12:20:01 +0100
Subject: [PATCH 0572/2793] deepin.go-gir-generator: fix dde-api with
 gobject-introspection 1.58+

---
 pkgs/desktops/deepin/go-gir-generator/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 183ae58fecd..b8797b5ba3a 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection,
-  libgudev, deepin }:
+  libgudev, deepin, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
   };
 
+  patches = [
+    # fix: dde-api build error with gobject-introspection 1.58+
+    (fetchurl {
+      url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch;
+      sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     go

From 7ee05feb4e8e8f30c09f3d2a4fe2defaed9ce6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 13 Nov 2018 14:58:46 +0100
Subject: [PATCH 0573/2793] gnome3.devhelp: 3.30.0 -> 3.30.1

---
 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 b20a85b9e71..246dd1592da 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "devhelp-${version}";
-  version = "3.30.0";
+  version = "3.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
+    sha256 = "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection python3 ];

From 6fa5ea6e6b5ccbcd1e360fe61eb58438123e5143 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Wed, 14 Nov 2018 12:12:30 +0900
Subject: [PATCH 0574/2793] gem-config: Add missing dependencies for gio and
 gtk2

---
 pkgs/development/ruby-modules/gem-config/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index c429eaec035..cf12b56a36e 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -23,6 +23,7 @@
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
+, libselinux ? null, libsepol ? null
 }@args:
 
 let
@@ -156,7 +157,7 @@ in
 
   gio2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre gobjectIntrospection ];
+    buildInputs = [ gtk2 pcre gobjectIntrospection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -167,7 +168,7 @@ in
   };
 
   gtk2 = attrs: {
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
     buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
     # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
     CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";

From f82c95ecbdc2912e0d2e9ff3f1940fe508a499da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 14 Nov 2018 23:13:38 +0100
Subject: [PATCH 0575/2793] gnome3.gnome-characters: add gnome-desktop typelib

---
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 0c2716de9ef..54c36fc333a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -23,7 +23,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobjectIntrospection ];
-  buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
+  buildInputs = [
+    glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
+    gnome3.defaultIconTheme libunistring
+    # typelib
+    gnome3.gnome-desktop
+  ];
 
   mesonFlags = [
     "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"

From 10f8039990eed03a8f6c0b34d8314993b9193275 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Nov 2018 22:33:47 +0100
Subject: [PATCH 0576/2793] =?UTF-8?q?vala=5F0=5F40:=200.40.6=20=E2=86=92?=
 =?UTF-8?q?=200.40.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 41362323044..a721625b1f4 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -66,8 +66,8 @@ in rec {
 
   vala_0_40 = generic {
     major   = "0.40";
-    minor   = "6";
-    sha256  = "1qjbwhifwwqbdg5zilvnwm4n76g8p7jwqs3fa0biw3rylzqm193d";
+    minor   = "11";
+    sha256  = "0xhm61kjdws167pafcji43s7icfvpq58lkbq3irb1jv3icjr3i8z";
   };
 
   vala_0_42 = generic {

From d5ba27a70082bcd465258a83087f7ad4292593ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 17 Nov 2018 16:06:27 +0100
Subject: [PATCH 0577/2793] gnome3.gnome-desktop: fix path substitution

`substituteAll` intentionally doesn't work with all caps:
https://github.com/NixOS/nixpkgs/issues/28086
---
 pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 2 +-
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index ee9b012b6e4..59191bddd9a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -8,7 +8,7 @@
 -	    "--ro-bind", "/usr", "/usr",
 -	    "--ro-bind", "/lib", "/lib",
 -	    "--ro-bind", "/lib64", "/lib64",
-+	    "@BUBBLEWRAP_BIN@",
++	    "@bubblewrap_bin@",
 +      "--ro-bind", "/nix/store", "/nix/store",
  	    "--proc", "/proc",
  	    "--dev", "/dev",
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index f5973d3800b..b283454b5c0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./bubblewrap-paths.patch;
-      BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap";
+      bubblewrap_bin = "${bubblewrap}/bin/bwrap";
     })
   ];
 

From 3faeab2c484463d4e2323abe3f5c5470aea36f6b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 19 Nov 2018 22:16:12 +0100
Subject: [PATCH 0578/2793] =?UTF-8?q?meld:=203.30.2=20=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/version-management/meld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index a37b4b7b05c..6c06bcabb26 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "meld";
-  version = "3.18.2";
+  version = "3.18.3";
   inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r";
+    sha256 = "0vn1qx60f8113x8wh7f4bflhzir1vx7p0wdfi7nbip6fh8gaf3ln";
   };
 
   buildInputs = [

From 05a71d24cee7ae597455d862e1bd093e3f4799f4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 19 Nov 2018 22:17:59 +0100
Subject: [PATCH 0579/2793] =?UTF-8?q?gnome3.gexiv2:=200.10.8=20=E2=86=92?=
 =?UTF-8?q?=200.10.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 94f5f4ef799..30872b88e44 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -2,14 +2,14 @@
 
 let
   pname = "gexiv2";
-  version = "0.10.8";
+  version = "0.10.9";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0088m7p044n741ly1m6i7w25z513h9wpgyw0rmx5f0sy3vyjiic1";
+    sha256 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8";
   };
 
   preConfigure = ''

From 7f0bfab3730418e92f2d3d734a5774d7bfb2eea0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 20:34:13 +0100
Subject: [PATCH 0580/2793] =?UTF-8?q?gnome3.grilo:=200.3.6=20=E2=86=92=200?=
 =?UTF-8?q?.3.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/grilo/default.nix | 29 ++++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index de50cc69ed0..1744d723325 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, vala, glib, liboauth, gtk3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 let
   pname = "grilo";
-  version = "0.3.6"; # if you change minor, also change ./setup-hook.sh
+  version = "0.3.7"; # if you change minor, also change ./setup-hook.sh
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,26 +13,25 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "14cwpk9jxi8rfjcmkav37zf0m52b1lqpkpkz858h80jqvn1clr8y";
+    sha256 = "1dz965l743r4bhj78wij9k1mb6635gnkb1lnk9j7gw9dd5qsyfza";
   };
 
+  patches = [
+    # Fix meson build: https://gitlab.gnome.org/GNOME/grilo/merge_requests/34
+    (fetchurl {
+      url = "https://gitlab.gnome.org/GNOME/grilo/commit/166612aeff09e5fc2fec1f62185c84cbdcf8f889.diff";
+      sha256 = "07zamy927iaa7knrwq5yxz7ypl1i02pymkcdrg5l55alhdvb81pw";
+    })
+  ];
+
   setupHook = ./setup-hook.sh;
 
-  configureFlags = [
-    "--enable-grl-pls"
-    "--enable-grl-net"
-    "--enable-gtk-doc"
+  mesonFlags = [
+    "-Dgtk_doc=true"
   ];
 
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$dev/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
   nativeBuildInputs = [
-    file intltool pkgconfig gobjectIntrospection vala
+    meson ninja pkgconfig gettext gobjectIntrospection vala
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ];

From cb7a36c355142fdbb20a05d700f9abe59bd8b167 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 20:56:00 +0100
Subject: [PATCH 0581/2793] nemiver.updateScript: allow unstable versions

---
 pkgs/desktops/gnome-3/devtools/nemiver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index d48565716c4..c8440037d3c 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript {
       packageName = "nemiver";
       attrPath = "gnome3.nemiver";
+      versionPolicy = "none";
     };
   };
 

From 1fe7aaf6927d9735ee990df7957e63db3ed076f6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 20:59:23 +0100
Subject: [PATCH 0582/2793] empathy.updateScript: allow unstable versions

---
 pkgs/desktops/gnome-3/core/empathy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 7b2365b6a15..1a4ef2a1cf4 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "empathy";
+      versionPolicy = "none";
     };
   };
 

From 195fc315efe63c87e8ff040927e60a5a871e6bdd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 21:01:27 +0100
Subject: [PATCH 0583/2793] gnome3.gnome-system-log.updateScript: allow
 unstable versions

---
 pkgs/desktops/gnome-3/core/gnome-system-log/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index 23a41b6d6ae..f31fbc3d3f4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -22,6 +22,7 @@ in stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript {
       packageName = pname;
       attrPath = "gnome3.${pname}";
+      versionPolicy = "none";
     };
   };
 

From 79ad3690f9473fe6ca54d20c2b655043df0a3bee Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 21:03:10 +0100
Subject: [PATCH 0584/2793] gnome3.gtksourceviewmm.updateScript: allow unstable
 versions

---
 pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index 15e9ac41d6c..6a0ee7fb56a 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; attrPath = "gnome3.gtksourceviewmm"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gtksourceviewmm";
+      attrPath = "gnome3.gtksourceviewmm";
+      versionPolicy = "none";
+    };
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 18e2f058459a1e7de26cfeedb52a2bcc9be78a8d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 21:03:38 +0100
Subject: [PATCH 0585/2793] gtk-vnc.updateScript: allow unstable versions

---
 pkgs/tools/admin/gtk-vnc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index bd3b2392c7e..8200864de4f 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gtk-vnc";
+      versionPolicy = "none";
     };
   };
 

From f19b76bc564662b8118e459b4552d09ddb8aa366 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 21:52:08 +0100
Subject: [PATCH 0586/2793] =?UTF-8?q?cantarell-fonts:=200.100=20=E2=86=92?=
 =?UTF-8?q?=200.110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/data/fonts/cantarell-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 7a0b8559b59..08fb87c9f7e 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -2,20 +2,20 @@
 
 let
   pname = "cantarell-fonts";
-  version = "0.100";
+  version = "0.110";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81";
+    sha256 = "19rll0h4xjn83lqm0zc4088y0vkrx1wxg8jz9imvgd8snmfxfm54";
   };
 
   nativeBuildInputs = [ meson ninja gettext appstream-glib ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1";
+  outputHash = "052nxmhw2j8yvcj90r8xhjf0mzim8h6syip7winxb28vavj6jnba";
 
   passthru = {
     updateScript = gnome3.updateScript {

From 440d84cfb1c7a8c31d68e1ebf20750c4ef22f3b1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Nov 2018 21:53:55 +0100
Subject: [PATCH 0587/2793] gnome3.updateScript: improve pre-release detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously all versions with minor >= 90 were considered pre-release,
which failed to consider versions like 0.100.

Let’s limit the range to 90–99 and 900–999.
---
 pkgs/desktops/gnome-3/find-latest-version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py
index d9155fe2393..b0359f79969 100644
--- a/pkgs/desktops/gnome-3/find-latest-version.py
+++ b/pkgs/desktops/gnome-3/find-latest-version.py
@@ -12,7 +12,7 @@ def odd_unstable(version_str, selected):
         return True
 
     even = version[1] % 2 == 0
-    prerelease = version[1] >= 90
+    prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000)
     stable = even and not prerelease
     if selected == 'stable':
         return stable

From 3a3afc739f18ea03b8437c0511e799cd489fa6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 21 Nov 2018 14:39:51 +0100
Subject: [PATCH 0588/2793] cantarell-fonts: ad-hoc fix for build

`GETTEXTDATADIRS` isn't populated correctly due to empty buildInputs. Borrow from
`GETTEXTDATADIRS_FOR_BUILD` until we fix gettext's envHook.

see: https://github.com/NixOS/nixpkgs/issues/50855
---
 pkgs/data/fonts/cantarell-fonts/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 08fb87c9f7e..03d2e85d6af 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -13,6 +13,12 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja gettext appstream-glib ];
 
+  # ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855
+  # until we fix gettext's envHook
+  preBuild = ''
+    export GETTEXTDATADIRS="$GETTEXTDATADIRS_FOR_BUILD"
+  '';
+
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = "052nxmhw2j8yvcj90r8xhjf0mzim8h6syip7winxb28vavj6jnba";

From 338b3fd11dd6f8aeea4d99e61e80a9f198fd1848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 22 Nov 2018 15:05:02 +0100
Subject: [PATCH 0589/2793] gobjectIntrospection: test our own patches

We patch gobject-introspection somewhat heavily, so add some unit tests that
will catch potential errors when we're eg. updating the patches.

There's two tests:

- Basic test for absolute nix store paths (testing absolute_shlib_path.patch)
- Test for macos `@rpath` sanitizing, including
  fallback_libpath (macos-shared-library.patch)
---
 .../gobject-introspection/default.nix         |  4 ++
 .../gobject-introspection/test_shlibs.patch   | 50 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/gobject-introspection/test_shlibs.patch

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 2cd3d9bd098..51274f0cdca 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./macos-shared-library.patch
+    (substituteAll {
+      src = ./test_shlibs.patch;
+      inherit nixStoreDir;
+    })
     (substituteAll {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
diff --git a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch b/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
new file mode 100644
index 00000000000..c3152982d19
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
@@ -0,0 +1,50 @@
+--- a/tests/scanner/test_shlibs.py
++++ b/tests/scanner/test_shlibs.py
+@@ -10,6 +10,46 @@ from giscanner.shlibs import resolve_from_ldd_output
+ 
+ class TestLddParser(unittest.TestCase):
+ 
++    def test_resolve_from_ldd_output_nix(self):
++        output = '''\
++            libglib-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0 (0x00007f0ee1b28000)
++            libgobject-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgobject-2.0.so.0 (0x00007f0ee18cf000)
++            libgio-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0 (0x00007f0ee1502000)
++            libxml2.so.2 => @nixStoreDir@/72mxkk74cv266snkjpz1kwl1i2rg8rpc-libxml2-2.9.8/lib/libxml2.so.2 (0x00007f0ee119c000)
++            libsqlite3.so.0 => @nixStoreDir@/ck5ay23hsmlc67pg3m34kzd1k2hhvww0-sqlite-3.24.0/lib/libsqlite3.so.0 (0x00007f0ee0e98000)
++            libpsl.so.5 => @nixStoreDir@/qn3l2gn7m76f318676wflrs2z6d4rrkj-libpsl-0.20.2-list-2017-02-03/lib/libpsl.so.5 (0x00007f0ee0c88000)
++            libc.so.6 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libc.so.6 (0x00007f0ee08d4000)
++            libpcre.so.1 => @nixStoreDir@/hxbq8lpc53qsf1bc0dfcsm47wmcxzjvh-pcre-8.42/lib/libpcre.so.1 (0x00007f0ee0662000)
++            @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f0ee20ff000)
++            libblkid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libblkid.so.1 (0x00007f0edd0cd000)
++            libuuid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libuuid.so.1 (0x00007f0edcec5000)
++            librt.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/librt.so.1 (0x00007f0edccbd000)
++            libstdc++.so.6 => @nixStoreDir@/3v5r7fkrbkw2qajadvjbf6p6qriz9p1i-gcc-7.3.0-lib/lib/libstdc++.so.6 (0x00007f0edc936000)
++            libgcc_s.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libgcc_s.so.1 (0x00007f0edc720000)
++        '''
++        libraries = ['glib-2.0', 'gio-2.0']
++
++        self.assertEqual(
++            ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0',
++             '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'],
++            resolve_from_ldd_output(libraries, output, basename=False))
++
++    def test_resolve_from_ldd_output_macos(self):
++        output = '''\
++            @rpath/libatk-1.0.0.dylib
++            @rpath/libgstreamer-1.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++            /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libglib-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++            /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libintl.dylib (compatibility version 0.0.0, current version 0.0.0)
++            /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libgobject-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++            /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.50.4)
++        '''
++        libraries = ['atk-1.0']
++        fallback_libpath = '@nixStoreDir@/1ynd5b01z87c1nw75k5iy7sq49hpkw53-atk-2.30.0/lib'
++
++        self.assertEqual(
++            [ '%s/libatk-1.0.0.dylib' % fallback_libpath ],
++            resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=fallback_libpath))
++
+     def test_resolve_from_ldd_output(self):
+         output = '''\
+             libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)
+

From 2b87ed7c329767eb49ae24646bbc745864fb34fa Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 25 Nov 2018 15:06:26 +0100
Subject: [PATCH 0590/2793] opencv4: init at 4.0.0

---
 pkgs/development/libraries/opencv/4.x.nix | 307 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   6 +
 pkgs/top-level/python-packages.nix        |   5 +
 3 files changed, 318 insertions(+)
 create mode 100644 pkgs/development/libraries/opencv/4.x.nix

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
new file mode 100644
index 00000000000..407070506ab
--- /dev/null
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -0,0 +1,307 @@
+{ lib, stdenv
+, fetchurl, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig, unzip, zlib, pcre, hdf5
+, glog, boost, google-gflags, protobuf
+, config
+
+, enableJPEG      ? true, libjpeg
+, enablePNG       ? true, libpng
+, enableTIFF      ? true, libtiff
+, enableWebP      ? true, libwebp
+, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
+, enableJPEG2K    ? true, jasper
+, enableEigen     ? true, eigen
+, enableOpenblas  ? true, openblas
+, enableContrib   ? true
+
+, enableCuda      ? (config.cudaSupport or false), cudatoolkit
+
+, enableUnfree    ? false
+, enableIpp       ? false
+, enablePython    ? false, pythonPackages
+, enableGtk2      ? false, gtk2
+, enableGtk3      ? false, gtk3
+, enableVtk       ? false, vtk
+, enableFfmpeg    ? false, ffmpeg
+, enableGStreamer ? false, gst_all_1
+, enableTesseract ? false, tesseract, leptonica
+, enableTbb       ? false, tbb
+, enableOvis      ? false, ogre
+, enableGPhoto2   ? false, libgphoto2
+, enableDC1394    ? false, libdc1394
+, enableDocs      ? false, doxygen, graphviz-nox
+
+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
+}:
+
+let
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner  = "opencv";
+    repo   = "opencv";
+    rev    = version;
+    sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
+  };
+
+  contribSrc = fetchFromGitHub {
+    owner  = "opencv";
+    repo   = "opencv_contrib";
+    rev    = version;
+    sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
+  };
+
+  # Contrib must be built in order to enable Tesseract support:
+  buildContrib = enableContrib || enableTesseract || enableOvis;
+
+  # See opencv/3rdparty/ippicv/ippicv.cmake
+  ippicv = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
+      sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
+    } + "/ippicv";
+    files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
+      if stdenv.hostPlatform.system == "x86_64-linux" then
+      { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
+      else if stdenv.hostPlatform.system == "i686-linux" then
+      { ${name "lnx_ia32"}    = "4f38432c30bfd6423164b7a24bbc98a0"; }
+      else if stdenv.hostPlatform.system == "x86_64-darwin" then
+      { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
+      else
+      throw "ICV is not available for this platform (or not yet supported by this package)";
+    dst = ".cache/ippicv";
+  };
+
+  # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
+  vgg = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
+      sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
+    };
+    files = {
+      "vgg_generated_48.i"  = "e8d0dcd54d1bcfdc29203d011a797179";
+      "vgg_generated_64.i"  = "7126a5d9a8884ebca5aea5d63d677225";
+      "vgg_generated_80.i"  = "7cd47228edec52b6d82f46511af325c5";
+      "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
+    };
+    dst = ".cache/xfeatures2d/vgg";
+  };
+
+  # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
+  boostdesc = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
+      sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
+    };
+    files = {
+      "boostdesc_bgm.i"          = "0ea90e7a8f3f7876d450e4149c97c74f";
+      "boostdesc_bgm_bi.i"       = "232c966b13651bd0e46a1497b0852191";
+      "boostdesc_bgm_hd.i"       = "324426a24fa56ad9c5b8e3e0b3e5303e";
+      "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
+      "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
+      "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
+      "boostdesc_lbgm.i"         = "0ae0675534aa318d9668f2a179c2a052";
+    };
+    dst = ".cache/xfeatures2d/boostdesc";
+  };
+
+  # See opencv_contrib/modules/face/CMakeLists.txt
+  face = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "8afa57abc8229d611c4937165d20e2a2d9fc5a12";
+      sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v";
+    };
+    files = {
+      "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05";
+    };
+    dst = ".cache/data";
+  };
+
+  # See opencv/modules/gapi/cmake/DownloadADE.cmake
+  ade = rec {
+    src = fetchurl {
+      url = "https://github.com/opencv/ade/archive/${name}";
+      sha256 = "1r85vdkvcka7bcxk69pd0ai4hld4iakpj4xl0xbinx3p9pv5a4l8";
+    };
+    name = "v0.1.1d.zip";
+    md5 = "37479d90e3a5d47f132f512b22cbe206";
+    dst = ".cache/ade";
+  };
+
+  # See opencv/cmake/OpenCVDownload.cmake
+  installExtraFiles = extra : with lib; ''
+    mkdir -p "${extra.dst}"
+  '' + concatStrings (flip mapAttrsToList extra.files (name : md5 : ''
+    ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
+  ''));
+  installExtraFile = extra: ''
+    mkdir -p "${extra.dst}"
+    ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}"
+  '';
+
+  opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
+
+  printEnabled = enabled : if enabled then "ON" else "OFF";
+in
+
+stdenv.mkDerivation rec {
+  name = "opencv-${version}";
+  inherit version src;
+
+  postUnpack = lib.optionalString buildContrib ''
+    cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
+  '';
+
+  patches =
+    # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
+    # PR: https://github.com/opencv/opencv_contrib/pull/1913
+    lib.optional buildContrib (fetchpatch {
+      url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
+      sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
+      stripLen = 2;
+      extraPrefix = "opencv_contrib/";
+    }) ++
+    # https://github.com/opencv/opencv/pull/13254
+    lib.optional enablePython (fetchpatch {
+      url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
+      sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
+    });
+
+  # 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
+  # what appears to be some stray headers in dnn/misc/tensorflow
+  # in contrib when generating the Python bindings:
+  postPatch = ''
+    sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+    sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
+  '';
+
+  preConfigure =
+    installExtraFile ade +
+    lib.optionalString enableIpp (installExtraFiles ippicv) + (
+    lib.optionalString buildContrib ''
+      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
+
+      ${installExtraFiles vgg}
+      ${installExtraFiles boostdesc}
+      ${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
+    ++ lib.optional enableGtk2 gtk2
+    ++ lib.optional enableGtk3 gtk3
+    ++ lib.optional enableVtk vtk
+    ++ lib.optional enableJPEG libjpeg
+    ++ lib.optional enablePNG libpng
+    ++ lib.optional enableTIFF libtiff
+    ++ lib.optional enableWebP libwebp
+    ++ lib.optionals enableEXR [ openexr ilmbase ]
+    ++ lib.optional enableJPEG2K jasper
+    ++ lib.optional enableFfmpeg ffmpeg
+    ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
+                     [ VideoDecodeAcceleration bzip2 ]
+    ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
+    ++ lib.optional enableOvis ogre
+    ++ lib.optional enableGPhoto2 libgphoto2
+    ++ lib.optional enableDC1394 libdc1394
+    ++ lib.optional enableEigen eigen
+    ++ lib.optional enableOpenblas openblas
+    # There is seemingly no compile-time flag for Tesseract.  It's
+    # simply enabled automatically if contrib is built, and it detects
+    # tesseract & leptonica.
+    ++ lib.optionals enableTesseract [ tesseract leptonica ]
+    ++ lib.optional enableTbb tbb
+    ++ lib.optional enableCuda cudatoolkit
+    ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
+    ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
+
+  propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
+
+  nativeBuildInputs = [ cmake pkgconfig unzip ];
+
+  NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
+
+  # Configure can't find the library without this.
+  OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
+
+  cmakeFlags = [
+    "-DOPENCV_GENERATE_PKGCONFIG=ON"
+    "-DWITH_OPENMP=ON"
+    "-DBUILD_PROTOBUF=OFF"
+    "-DPROTOBUF_UPDATE_FILES=ON"
+    "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
+    "-DBUILD_TESTS=OFF"
+    "-DBUILD_PERF_TESTS=OFF"
+    "-DBUILD_DOCS=${printEnabled enableDocs}"
+    (opencvFlag "IPP" enableIpp)
+    (opencvFlag "TIFF" enableTIFF)
+    (opencvFlag "JASPER" enableJPEG2K)
+    (opencvFlag "WEBP" enableWebP)
+    (opencvFlag "JPEG" enableJPEG)
+    (opencvFlag "PNG" enablePNG)
+    (opencvFlag "OPENEXR" enableEXR)
+    (opencvFlag "CUDA" enableCuda)
+    (opencvFlag "CUBLAS" enableCuda)
+    (opencvFlag "TBB" enableTbb)
+  ] ++ lib.optionals enableCuda [
+    "-DCUDA_FAST_MATH=ON"
+    "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+    "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "-DWITH_OPENCL=OFF"
+    "-DWITH_LAPACK=OFF"
+  ] ++ lib.optionals enablePython [
+    "-DOPENCV_SKIP_PYTHON_LOADER=ON"
+  ];
+
+  enableParallelBuilding = true;
+
+  postBuild = lib.optionalString enableDocs ''
+    make doxygen
+  '';
+
+  # By default $out/lib/pkgconfig/opencv4.pc looks something like this:
+  #
+  #   prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0
+  #   exec_prefix=${prefix}
+  #   libdir=${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib
+  #   includedir_old=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4/opencv
+  #   includedir_new=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4
+  #   ...
+  #   Libs: -L${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib ...
+  # Note that ${exec_prefix} is set to $out but that $out is also appended to
+  # ${exec_prefix}. This causes linker errors in downstream packages so we strip
+  # of $out after the ${exec_prefix} and ${prefix} prefixes:
+  postInstall = ''
+    sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
+      "$out/lib/pkgconfig/opencv4.pc"
+  '';
+
+  hardeningDisable = [ "bindnow" "relro" ];
+
+  passthru = lib.optionalAttrs enablePython { pythonPath = []; };
+
+  meta = with stdenv.lib; {
+    description = "Open Computer Vision Library with more than 500 algorithms";
+    homepage = https://opencv.org/;
+    license = with licenses; if enableUnfree then unfree else bsd3;
+    maintainers = with maintainers; [mdaiter basvandijk];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54dedf8eb9f..284a4308a62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11663,6 +11663,12 @@ with pkgs;
     enableCuda = false;
   };
 
+  opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
+    enableCuda = config.cudaSupport or false;
+    inherit (darwin) cf-private;
+    inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
+  };
+
   openexr = callPackage ../development/libraries/openexr { };
 
   openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 83353f6beac..d4171981346 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1291,6 +1291,11 @@ in {
     pythonPackages = self;
   });
 
+  opencv4 = toPythonModule (pkgs.opencv4.override {
+    enablePython = true;
+    pythonPackages = self;
+  });
+
   openidc-client = callPackage ../development/python-modules/openidc-client {};
 
   idna = callPackage ../development/python-modules/idna { };

From aa358e6ee7faaf4b1b9ca6690b022bdacbb398c4 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 25 Nov 2018 11:22:51 +0100
Subject: [PATCH 0591/2793] opencv3: 3.4.3 -> 3.4.4

---
 pkgs/development/libraries/opencv/3.x.nix | 33 ++++++++++++++++-------
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 64aa11e1763..f948cbb062f 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, fetchurl, fetchFromGitHub
+, fetchurl, fetchFromGitHub, fetchpatch
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
 , glog, boost, google-gflags, protobuf
 , config
@@ -31,29 +31,31 @@
 , enableDC1394    ? false, libdc1394
 , enableDocs      ? false, doxygen, graphviz-nox
 
-, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
 }:
 
 let
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
+    sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
     rev    = version;
-    sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
+    sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
   };
 
   # Contrib must be built in order to enable Tesseract support:
   buildContrib = enableContrib || enableTesseract;
 
+  useSystemProtobuf = ! stdenv.isDarwin;
+
   # See opencv/3rdparty/ippicv/ippicv.cmake
   ippicv = {
     src = fetchFromGitHub {
@@ -145,6 +147,13 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
   '';
 
+  patches =
+    # https://github.com/opencv/opencv/pull/13254
+    lib.optional enablePython (fetchpatch {
+      url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
+      sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
+    });
+
   # 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
@@ -171,7 +180,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs =
-       [ zlib pcre hdf5 glog boost google-gflags protobuf ]
+       [ zlib pcre hdf5 glog boost google-gflags ]
+    ++ lib.optional useSystemProtobuf protobuf
     ++ lib.optional enablePython pythonPackages.python
     ++ lib.optional enableGtk2 gtk2
     ++ lib.optional enableGtk3 gtk3
@@ -197,7 +207,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optional enableTbb tbb
     ++ lib.optional enableCuda cudatoolkit
-    ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
+    ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
     ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -211,8 +221,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DWITH_OPENMP=ON"
-    "-DBUILD_PROTOBUF=OFF"
-    "-DPROTOBUF_UPDATE_FILES=ON"
+    "-DBUILD_PROTOBUF=${printEnabled (!useSystemProtobuf)}"
+    "-DPROTOBUF_UPDATE_FILES=${printEnabled useSystemProtobuf}"
     "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
     "-DBUILD_TESTS=OFF"
     "-DBUILD_PERF_TESTS=OFF"
@@ -234,6 +244,8 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isDarwin [
     "-DWITH_OPENCL=OFF"
     "-DWITH_LAPACK=OFF"
+  ] ++ lib.optionals enablePython [
+    "-DOPENCV_SKIP_PYTHON_LOADER=ON"
   ];
 
   enableParallelBuilding = true;
@@ -254,7 +266,8 @@ stdenv.mkDerivation rec {
   # ${exec_prefix}. This causes linker errors in downstream packages so we strip
   # of $out after the ${exec_prefix} prefix:
   postInstall = ''
-    sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
+    sed -i "s|{exec_prefix}/$out|{exec_prefix}|" \
+      "$out/lib/pkgconfig/opencv.pc"
   '';
 
   hardeningDisable = [ "bindnow" "relro" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54dedf8eb9f..5326ff18bd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11656,6 +11656,7 @@ with pkgs;
 
   opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
     enableCuda = config.cudaSupport or false;
+    inherit (darwin) cf-private;
     inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
   };
 

From 4ed2dd919b316a75d2b2c5bbfa5b45e332384945 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Fri, 30 Nov 2018 16:16:28 +0100
Subject: [PATCH 0592/2793] gandi-cli: 0.19 -> 1.3

---
 pkgs/tools/networking/gandi-cli/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index be488e788b4..99db0ab2507 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
 
-with pythonPackages;
+with python3Packages;
 
-buildPythonPackage rec {
-  namePrefix = "";
-  name = "gandi-cli-${version}";
-  version = "0.19";
+buildPythonApplication rec {
+  pname = "gandi-cli";
+  version = "1.3";
 
   src = fetchFromGitHub {
-    sha256 = "0xbf97p75zl6sjxqcgmaa4p5rax2h6ixn8srwdr4rsx2zz9dpwgp";
-    rev = version;
-    repo = "gandi.cli";
     owner = "Gandi";
+    repo = "gandi.cli";
+    rev = version;
+    sha256 = "07i1y88j5awsw7qadk7gnmax8mi7vgh1nflnc8j54z53fjyamlcs";
   };
 
   propagatedBuildInputs = [ click ipy pyyaml requests ];
@@ -22,6 +21,6 @@ buildPythonPackage rec {
     description = "Command-line interface to the public Gandi.net API";
     homepage = http://cli.gandi.net/;
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ckampka ];
   };
 }
-

From 607aefd9721fdbf71f96699b5f4e81a2e9a8b07e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 30 Nov 2018 17:14:39 -0500
Subject: [PATCH 0593/2793] geoclue2: 2.4.12 -> 2.5.1

---
 .../development/libraries/geoclue/default.nix | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index da7041b6786..a716b78cdc7 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
-, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
+, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
 , withDemoAgent ? false
 }:
 
@@ -7,17 +7,20 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "geoclue-${version}";
-  version = "2.4.12";
+  version = "2.5.1";
 
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "geoclue";
+    repo = "geoclue";
+    rev = version;
+    sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook gobjectIntrospection
+    pkgconfig meson ninja wrapGAppsHook python3 vala gobjectIntrospection
     # devdoc
     gtk-doc docbook_xsl docbook_xml_dtd_412
   ];
@@ -30,26 +33,20 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib glib-networking ];
 
-  # Whitelist elementary's agent
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch";
-      sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4";
-    })
+  mesonFlags = [
+    "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
+    "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
+  ] ++ optionals stdenv.isDarwin [
+    "-D3g-source=false"
+    "-Dcdma-source=false"
+    "-Dmodem-gps-source=false"
+    "-Dnmea-source=false"
   ];
 
-  configureFlags = [
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    "--enable-introspection"
-    "--enable-gtk-doc"
-    "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
-  ] ++ optionals stdenv.isDarwin [
-    "--disable-silent-rules"
-    "--disable-3g-source"
-    "--disable-cdma-source"
-    "--disable-modem-gps-source"
-    "--disable-nmea-source"
-  ];
+  postPatch = ''
+    chmod +x demo/install-file.py
+    patchShebangs demo/install-file.py
+  '';
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";

From 3a3513e7e7d4c252d6240a62d377ef723509d8c0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 30 Nov 2018 23:29:34 +0100
Subject: [PATCH 0594/2793] webkitgtk220x: drop

---
 .../mailreaders/astroid/default.nix           |  4 +-
 pkgs/development/libraries/webkitgtk/2.22.nix | 83 -------------------
 .../libraries/webkitgtk/default.nix           |  4 +-
 pkgs/top-level/all-packages.nix               | 19 ++---
 4 files changed, 9 insertions(+), 101 deletions(-)
 delete mode 100644 pkgs/development/libraries/webkitgtk/2.22.nix

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 8dd23df7749..006684ecc10 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
 , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
 , makeWrapper, python3, python3Packages
 , vim ? vim_configurable.override {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas
+  buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
                   python3 python3Packages.pygobject3
                   notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
                   glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix
deleted file mode 100644
index 4411b4e8434..00000000000
--- a/pkgs/development/libraries/webkitgtk/2.22.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ 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.4";
-
-  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 = "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs";
-  };
-
-  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/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 7eae5819daf..4411b4e8434 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.22.2";
+  version = "2.22.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l";
+    sha256 = "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs";
   };
 
   patches = optionals stdenv.isDarwin [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aee064f742b..0036c182be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12749,7 +12749,11 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk220x;
+  webkitgtk = callPackage ../development/libraries/webkitgtk {
+    harfbuzz = harfbuzzFull;
+    inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzzFull.override {
@@ -12759,19 +12763,6 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk220x = callPackage ../development/libraries/webkitgtk {
-    harfbuzz = harfbuzzFull;
-    inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
-    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 61bdaad9a9221f19a7c12d8b1b654e6e54d2be32 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 28 Nov 2018 22:10:15 -0500
Subject: [PATCH 0595/2793] sd-image: Slims the ext4 filesystem even more.

This is to try and squeeze more lost space from the image, so that hydra
starts building it again.

The fsck previous to the resize2fs is required so resize2fs works.

The one afterwards is a sanity check.

Using `-M` from resize2fs will not give much saved space due to a known
(in the manual) issue.

```
[samueldr@aarch64:~/nixpkgs]$ ls -lh result-*/*/*.img
-r--r--r-- 1 root root 2.2G Jan  1  1970 result-original/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 2.1G Jan  1  1970 result-M/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 1.9G Jan  1  1970 result-slimmed/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
```

```
[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-original
/nix/store/c8k9n78gylx293rjh762fr05a069kxp2-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3844125000

[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-slimmed
/nix/store/962238skj5mnzhrsmjy23dyzmxk77sp4-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3447473208
```
---
 nixos/lib/make-ext4-fs.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 88be8b73ab3..694142a5123 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -94,5 +94,24 @@ pkgs.stdenv.mkDerivation {
         cat errorlog
         return 1
       fi
+
+      (
+        # Resizes **snugly** to its actual limits (or closer to)
+        free=$(dumpe2fs $out | grep '^Free blocks:')
+        blocksize=$(dumpe2fs $out | grep '^Block size:')
+        blocks=$(dumpe2fs $out | grep '^Block count:')
+        blocks=$((''${blocks##*:})) # format the number.
+        blocksize=$((''${blocksize##*:})) # format the number.
+        # System can't boot with 0 blocks free.
+        # Add 16MiB of free space
+        fudge=$(( 16 * 1024 * 1024 / blocksize ))
+        size=$(( blocks - ''${free##*:} + fudge ))
+
+        echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
+        EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
+      )
+
+      # And a final fsck, because of the previous truncating.
+      fsck.ext4 -n -f $out
     '';
 }

From 4ec1e155587587673a95bbcff72952585d449cc8 Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Sat, 1 Dec 2018 01:28:03 +0100
Subject: [PATCH 0596/2793] libretro.dolphin: add missing dependencies to fix
 build

---
 pkgs/misc/emulators/retroarch/cores.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 7a0a48db118..3f20390fba7 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -150,7 +150,7 @@ in with stdenv.lib.licenses;
       cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
       gettext glib gtk2 hidapi
       libevdev udev
-    ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
+    ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXinerama libXxf86vm ]);
   }).override {
     cmakeFlags = [
         "-DLINUX_LOCAL_DEV=true"

From 7b8d9700e1f298ea3441297a46eba62ddd2f671f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 30 Nov 2018 18:46:04 -0600
Subject: [PATCH 0597/2793] nixos/chrony: don't emit initstepslew when servers
 is empty

Setting the server list to be empty is useful e.g. for hardware-only
or virtualized reference clocks that are passed through to the system
directly. In this case, initstepslew has no effect, so don't emit it.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/chrony.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 9b8005e706a..89ab899a1ed 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -12,7 +12,7 @@ let
     ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
 
     ${optionalString
-      cfg.initstepslew.enabled
+      (cfg.initstepslew.enabled && (cfg.servers != []))
       "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
     }
 

From ee14496ae2777ed24d0ed0292f466b106f9cfb15 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 30 Nov 2018 18:48:06 -0600
Subject: [PATCH 0598/2793] nixos/dhcpcd: (try to) restart chrony in the
 exitHook

As the comment notes, restarts/exits of dhcpcd generally require
restarting the NTP service since, if name resolution fails for a pool of
servers, the service might break itself. To be on the safe side, try
restarting Chrony in these instances, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index efdbca5d52e..c217ccaa405 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -71,7 +71,7 @@ let
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation. This also
           # applies to openntpd.
-          ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true
+          ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service || true
       fi
 
       ${cfg.runHook}

From 92aba635d26c82e902f87c033acf42e9c57d87ea Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 1 Dec 2018 01:21:27 +0000
Subject: [PATCH 0599/2793] mpd: 0.20.21 -> 0.20.23

https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.20.23/NEWS

Includes a fix for the build failure:
https://hydra.nixos.org/build/85119443/nixlog/1
---
 pkgs/servers/mpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 500f612eb02..740fd4739ab 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -36,7 +36,7 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "21";
+  minor = "23";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${version}";
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
     owner  = "MusicPlayerDaemon";
     repo   = "MPD";
     rev    = "v${version}";
-    sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3";
+    sha256 = "1z1pdgiddimnmck0ardrpxkvgk1wn9zxri5wfv5ppasbb7kfm350";
   };
 
   patches = [ ./x86.patch ];

From f15aecd1bb5333afa730af354b3e1458f284daa5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:35:16 -0500
Subject: [PATCH 0600/2793] aws-google-auth: init at 0.0.29

---
 pkgs/tools/admin/aws-google-auth/default.nix | 62 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/tools/admin/aws-google-auth/default.nix

diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix
new file mode 100644
index 00000000000..5d4ba0bfbc8
--- /dev/null
+++ b/pkgs/tools/admin/aws-google-auth/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, beautifulsoup4
+, boto3
+, configparser
+, keyring
+, keyrings-alt
+, lxml
+, pillow
+, requests
+, six
+, tabulate
+, tzlocal
+, nose
+, mock
+, withU2F ? false, python-u2flib-host
+}:
+
+buildPythonApplication rec {
+  pname = "aws-google-auth";
+  version = "0.0.29";
+
+  # Pypi doesn't ship the tests, so we fetch directly from GitHub
+  # https://github.com/cevoaustralia/aws-google-auth/issues/120
+  src = fetchFromGitHub {
+    owner = "cevoaustralia";
+    repo = "aws-google-auth";
+    rev = version;
+    sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia";
+  };
+
+  propagatedBuildInputs = [ 
+    beautifulsoup4
+    boto3
+    configparser
+    keyring
+    keyrings-alt
+    lxml
+    pillow
+    requests
+    six
+    tabulate
+    tzlocal
+  ] ++ lib.optional withU2F python-u2flib-host;
+  
+  checkInputs = [ 
+    mock
+    nose 
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  meta = with lib; {
+    description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On";
+    homepage = https://github.com/cevoaustralia/aws-google-auth;
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3f6f5f3225..3183af86a0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -607,6 +607,8 @@ with pkgs;
 
   aws-env = callPackage ../tools/admin/aws-env { };
 
+  aws-google-auth = pythonPackages.callPackage ../tools/admin/aws-google-auth { };
+
   aws-okta = callPackage ../tools/security/aws-okta { };
 
   aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };

From 7fa0befcc7d495ae3dc193559c1418c0b1efa09f Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 1 Dec 2018 09:38:42 +0800
Subject: [PATCH 0601/2793] ghc-8.4: fix build targeting arm

Fixes https://ghc.haskell.org/trac/ghc/ticket/15780
---
 pkgs/development/compilers/ghc/8.4.4.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 32a9095e123..901582b7a92 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -109,7 +109,11 @@ stdenv.mkDerivation (rec {
       name = "D4388.diff";
       sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
     })
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
+    ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
+      url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
+      sha256 = "1czx12qcl088vjn7mqxvyja4b2ia2n09c28br8c777fd0xk069pm";
+    });
 
   postPatch = "patchShebangs .";
 

From b074a40f74c298d7a6a722733291747bda331618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sat, 27 Oct 2018 18:34:56 +0900
Subject: [PATCH 0602/2793] mdadm: use shared system-sendmail

---
 pkgs/os-specific/linux/mdadm/default.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index c6c5f843690..d2fc9cf0d26 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,18 +1,5 @@
-{ stdenv, writeScript
-, fetchurl, groff
-}:
+{ stdenv, writeScript, fetchurl, groff, system-sendmail }:
 
-let
-  sendmail-script = writeScript "sendmail-script" ''
-    #!/bin/sh
-
-    if [ -x /run/wrappers/bin/sendmail ]; then
-      /run/wrappers/bin/sendmail "$@"
-    else
-      /run/current-system/sw/bin/sendmail "$@"
-    fi
-  '';
-in
 stdenv.mkDerivation rec {
   name = "mdadm-4.1";
 
@@ -23,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # This is to avoid self-references, which causes the initrd to explode
   # in size and in turn prevents mdraid systems from booting.
-  allowedReferences = [ stdenv.cc.libc.out sendmail-script ];
+  allowedReferences = [ stdenv.cc.libc.out system-sendmail ];
 
   patches = [ ./no-self-references.patch ];
 
@@ -40,7 +27,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile
+        -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile
   '';
 
   meta = with stdenv.lib; {

From 6ed379f77f087fbba6c7899ded53c314b95519f4 Mon Sep 17 00:00:00 2001
From: Ashijit Pramanik <ashijit007@gmail.com>
Date: Sat, 1 Dec 2018 12:22:34 +0530
Subject: [PATCH 0603/2793] manticore: 2017-08-22 -> 2018-09-29

---
 pkgs/development/compilers/manticore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 2c8fe186612..efbf8561b7f 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
 
 let
-  rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2";
+  rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
 in stdenv.mkDerivation rec {
   name = "manticore-${version}";
-  version = "2017.08.22";
+  version = "2018.09.29";
  
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
-    sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73";
+    sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
     inherit rev;
   };
 

From 81567cb82804277e7aa81c6c6f4672963ce873ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 1 Dec 2018 09:12:34 +0100
Subject: [PATCH 0604/2793] python.pkgs.docutils: set LANG in case of darwin
 and python3

This should allow the Python3 version to be built while preventing mass-rebuilds.
---
 pkgs/development/python-modules/docutils/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index c31cfceebba..57cb34ebf59 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchurl
 , buildPythonPackage
 , isPy3k
@@ -14,11 +15,13 @@ buildPythonPackage rec {
     sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
   };
 
-  checkPhase = if isPy3k then ''
+  # Only Darwin needs LANG, but we could set it in general.
+  # It's done here conditionally to prevent mass-rebuilds.
+  checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" '' + (if isPy3k then ''
     ${python.interpreter} test3/alltests.py
   '' else ''
     ${python.interpreter} test/alltests.py
-  '';
+  '');
 
   # Create symlinks lacking a ".py" suffix, many programs depend on these names
   postFixup = ''

From 19bffeee70043b7e9f8f7287b632078c05996d35 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Sat, 1 Dec 2018 11:05:28 +0100
Subject: [PATCH 0605/2793] anki: Use `fetchpatch` for python compatibilty
 patch

---
 pkgs/games/anki/default.nix             | 12 +++++++++++-
 pkgs/games/anki/python-3.7-compat.patch | 23 -----------------------
 2 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/games/anki/python-3.7-compat.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c73afdd0393..3f837886116 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -4,6 +4,7 @@
 , lib
 , python
 , fetchurl
+, fetchpatch
 , lame
 , mplayer
 , libpulseaudio
@@ -53,7 +54,16 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
-      ./python-3.7-compat.patch
+
+      # This is needed to fix python 3.7 compatibilty, where the
+      # behaviour of `re.escape()` was changed in a way that it no
+      # longer escapes `%`. This patch detects this difference at
+      # runtime and makes anki work with any python version.
+      # Upstream PR: https://github.com/dae/anki/pull/266
+      (fetchpatch {
+        url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
+        sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
+      })
     ];
 
     buildPhase = ''
diff --git a/pkgs/games/anki/python-3.7-compat.patch b/pkgs/games/anki/python-3.7-compat.patch
deleted file mode 100644
index 8545b39d08c..00000000000
--- a/pkgs/games/anki/python-3.7-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 3d69aa9ce454a151ba75deafd7de117af2c7307d
-Author: Alexey Lebedeff <binarin@binarin.ru>
-Date:   Fri Nov 30 10:44:39 2018 +0100
-
-    Fix searching for python 3.7
-    
-    3.7 introduced a change to `re.escape()`, which no longer escapes
-    `%`. By using `re.escape("%")` instead of a literal, we can detect
-    a proper form at runtime.
-
-diff --git a/anki/find.py b/anki/find.py
-index 48d0dd1..213216d 100644
---- a/anki/find.py
-+++ b/anki/find.py
-@@ -440,7 +440,7 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
-             # nothing has that field
-             return
-         # gather nids
--        regex = re.escape(val).replace("_", ".").replace("\\%", ".*")
-+        regex = re.escape(val).replace("_", ".").replace(re.escape('%'), ".*")
-         nids = []
-         for (id,mid,flds) in self.col.db.execute("""
- select id, mid, flds from notes

From cb452d02c2adf9067f5b98fe7dbe183dc1124c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Sat, 1 Dec 2018 01:35:25 +0100
Subject: [PATCH 0606/2793] whipper: 0.7.0 -> 0.7.2

---
 pkgs/applications/audio/whipper/default.nix | 13 ++--
 pkgs/applications/audio/whipper/paths.patch | 73 ---------------------
 2 files changed, 8 insertions(+), 78 deletions(-)

diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index fa5845c260b..8b93175ce35 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -3,17 +3,17 @@
 
 python2.pkgs.buildPythonApplication rec {
   name = "whipper-${version}";
-  version = "0.7.0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "whipper-team";
     repo = "whipper";
     rev = "v${version}";
-    sha256 = "04m8s0s9dcnly9l6id8vv99n9kbjrjid79bss52ay9yvwng0frmj";
+    sha256 = "17cn11c6c62pfhhp6vcslxpanb0czh2xbxq1g6wd7bpmgw38yd8v";
   };
 
   pythonPath = with python2.pkgs; [
-    pygobject2 musicbrainzngs urllib3 chardet
+    pygobject3 musicbrainzngs urllib3 chardet
     pycdio setuptools mutagen CDDB
     requests
   ];
@@ -25,11 +25,14 @@ python2.pkgs.buildPythonApplication rec {
   patches = [
     (substituteAll {
       src = ./paths.patch;
-      inherit cdrdao cdparanoia utillinux flac sox;
-      accurateripChecksum = accuraterip-checksum;
+      inherit cdparanoia;
     })
   ];
 
+  makeWrapperArgs = [
+    "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}"
+  ];
+
   # some tests require internet access
   # https://github.com/JoeLametta/whipper/issues/291
   doCheck = false;
diff --git a/pkgs/applications/audio/whipper/paths.patch b/pkgs/applications/audio/whipper/paths.patch
index 9fe9f7a57c5..14b5384330d 100644
--- a/pkgs/applications/audio/whipper/paths.patch
+++ b/pkgs/applications/audio/whipper/paths.patch
@@ -1,16 +1,3 @@
---- 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 @@
@@ -43,63 +30,3 @@
 +        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)

From fbf0efc6a72a831c3dd89598fe8c596e2949929d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 29 Nov 2018 17:10:15 +0100
Subject: [PATCH 0607/2793] elk: 6.3.2 -> 6.5.1

---
 nixos/modules/services/search/kibana.nix      |  5 ++++-
 .../development/tools/misc/kibana/default.nix | 15 +++++++++++----
 .../kibana/disable-nodejs-version-check.patch | 19 +++++++++++++++++++
 pkgs/misc/logging/beats/6.x.nix               | 11 +++++++++--
 pkgs/servers/search/elasticsearch/default.nix | 12 +++++++++---
 pkgs/servers/search/elasticsearch/plugins.nix |  8 ++++----
 pkgs/tools/misc/logstash/default.nix          |  4 ++--
 pkgs/top-level/all-packages.nix               |  5 +++--
 8 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch

diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index ca36bba58c0..3539b3ddb4f 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -149,7 +149,10 @@ in {
       after = [ "network.target" "elasticsearch.service" ];
       environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
+        ExecStart =
+          "${cfg.package}/bin/kibana" +
+          " --config ${cfgFile}" +
+          " --path.data ${cfg.dataDir}";
         User = "kibana";
         WorkingDirectory = cfg.dataDir;
       };
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index 72321f560c7..9d5e94e7d76 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -18,12 +18,12 @@ let
   shas =
     if enableUnfree
     then {
-      "x86_64-linux"  = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
-      "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
+      "x86_64-linux"  = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v";
+      "x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3";
     }
     else {
-      "x86_64-linux"  = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
-      "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
+      "x86_64-linux"  = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa";
+      "x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr";
     };
 
   # For the correct phantomjs version see:
@@ -47,6 +47,13 @@ in stdenv.mkDerivation rec {
     sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
   };
 
+  patches = [
+    # Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0.
+    # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
+    # disable the version check.
+    ./disable-nodejs-version-check.patch
+  ];
+
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
new file mode 100644
index 00000000000..12a81566a72
--- /dev/null
+++ b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch
@@ -0,0 +1,19 @@
+diff -Naur a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
+--- a/src/setup_node_env/node_version_validator.js	2018-11-16 03:28:42.000000000 +0100
++++ b/src/setup_node_env/node_version_validator.js	2018-12-01 12:19:48.238337176 +0100
+@@ -26,7 +26,7 @@
+ var currentVersion = process && process.version || null;
+ var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
+ var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
+-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion;
++var isVersionValid = !!currentVersion && !!requiredVersion;
+ 
+ // Validates current the NodeJS version compatibility when Kibana starts.
+ if (!isVersionValid) {
+@@ -35,4 +35,4 @@
+   // Actions to apply when validation fails: error report + exit.
+   console.error(errorMessage);
+   process.exit(1);
+-}
+\ No newline at end of file
++}
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index 59d7379e06c..ce8bf44bfc0 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap }:
+{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
 
 let beat = package : extraArgs : buildGoPackage (rec {
       name = "${package}-${version}";
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "0ymg6y6v0mdhs1rs11fn33xdp3r6v85563z0f4p7s22j1kd3nd6r";
+        sha256 = "1qnrq9bhk7csgcxycb8c7975lq0p7cxw29i6sji777zv4hn7442m";
       };
 
       goPackagePath = "github.com/elastic/beats";
@@ -39,4 +39,11 @@ in {
       PostgreSQL, Redis or Thrift and correlate the messages into transactions.
     '';
   };
+  journalbeat6  = beat "journalbeat" {
+    meta.description = ''
+      Journalbeat is an open source data collector to read and forward
+      journal entries from Linuxes with systemd.
+    '';
+    buildInputs = [ systemd.dev ];
+  };
 }
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 5a43a30257e..0cf81a4c2d6 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -19,14 +19,20 @@ stdenv.mkDerivation (rec {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
     sha256 =
       if enableUnfree
-      then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh"
-      else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4";
+      then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp"
+      else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs";
   };
 
   patches = [ ./es-home-6.x.patch ];
 
   postPatch = ''
-    sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
+    substituteInPlace bin/elasticsearch-env --replace \
+      "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \
+      "ES_CLASSPATH=\"$out/lib/*\""
+
+    substituteInPlace bin/elasticsearch-cli --replace \
+      "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \
+      "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\""
   '';
 
   buildInputs = [ makeWrapper jre_headless utillinux ]
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 330a81a422c..4451b010446 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -27,7 +27,7 @@ in {
     version = "${elk6Version}";
     src = fetchurl {
       url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip";
-      sha256 = "1m4z05wixjrq4nlbdjyhvprkrwxjym8aba18scmzfn25fhbjgvkz";
+      sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v";
     };
     meta = with stdenv.lib; {
       homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
@@ -42,7 +42,7 @@ in {
     version = "${elk6Version}";
     src = pkgs.fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip";
-      sha256 = "1i7ksy69132sr84h51lamgq967yz3a3dw0b54nckxpqwad9pcpj0";
+      sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1";
     };
     meta = with stdenv.lib; {
       homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2;
@@ -54,10 +54,10 @@ in {
   search_guard = esPlugin rec {
     name = "elastic-search-guard-${version}";
     pluginName = "search-guard";
-    version = "${elk6Version}-22.3";
+    version = "${elk6Version}-23.2";
     src = fetchurl rec {
       url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip";
-      sha256 = "1r71h4h9bmxak1mq5gpm19xq5ji1gry1kp3sjmm8azy4ykdqdncx";
+      sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb";
     };
     meta = with stdenv.lib; {
       homepage = https://github.com/floragunncom/search-guard;
diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 4f15ba90d39..9f3c441ffcd 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
     sha256 =
       if enableUnfree
-      then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr"
-      else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w";
+      then "01mkb9fr63m3ilp4cbbjccid5m8yc7iqhnli12ynfabsf7302fdz"
+      else "0r60183yyywabinsv9pkd8sx0wq68h740xi3172fypjfdcqs0g9c";
   };
 
   dontBuild         = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00b1a7c0542..4ea798123f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -917,7 +917,8 @@ with pkgs;
     filebeat6
     heartbeat6
     metricbeat6
-    packetbeat6;
+    packetbeat6
+    journalbeat6;
 
   filebeat = filebeat6;
   heartbeat = heartbeat6;
@@ -2453,7 +2454,7 @@ with pkgs;
 
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
   elk5Version = "5.6.9";
-  elk6Version = "6.3.2";
+  elk6Version = "6.5.1";
 
   elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
   elasticsearch6 = callPackage ../servers/search/elasticsearch { };

From d9b650f4cc5ba78835285963eeef8a7c23b593f8 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 1 Dec 2018 12:57:55 +0100
Subject: [PATCH 0608/2793] pythonPackages.cypari2: 1.3.1 -> 2.0.1 (#49446)

---
 pkgs/applications/science/math/sage/sage-src.nix   | 14 ++++++++++++++
 .../development/python-modules/cypari2/default.nix |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 5d729d9c5fd..b7355dca309 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -113,6 +113,20 @@ stdenv.mkDerivation rec {
       rev = "db10d327ade93711da735a599a67580524e6f7b4";
       sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
     })
+
+    # https://trac.sagemath.org/ticket/26493
+    (fetchpatch {
+      name = "cypari-upgrade-dependency.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=e93130960a1a20112bff096f53bc48ffcdfe5ab2";
+      sha256 = "03zh5288aasy47d964rs8vhaxds397rsp85ssbbrkap8702r4bjh";
+    })
+    # https://trac.sagemath.org/ticket/26442
+    (fetchpatch {
+      name = "cypari-2.0.0.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=7905b39a510c2e09b1ebf0d4a11342bfe3c0d236";
+      sha256 = "0v8p5x1b6mnkb2j3a95iva9dmq4pxi154zz4nmj79dcyqi51crwm";
+      excludes = [ "build/*" ];
+    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches;
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index a77e98dae4c..d67bb95a91a 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "1.3.1";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
+    sha256 = "11nqp40nji8bz4zn7j8sbzin93l65kf8s1sc76lvbsbkswaxdyij";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

From 5afbdde38c7cf981128fc304f634bcc161018a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 09:00:51 +0000
Subject: [PATCH 0609/2793] gdb: switch to python3 by default

---
 pkgs/development/tools/misc/gdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 103f1131148..864ee05cf83 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -6,7 +6,7 @@
 # Run time
 , ncurses, readline, gmp, mpfr, expat, zlib, dejagnu
 
-, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python ? null
+, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
 , guile ? null
 
 }:
@@ -16,7 +16,7 @@ let
   version = "8.2";
 in
 
-assert pythonSupport -> python != null;
+assert pythonSupport -> python3 != null;
 
 stdenv.mkDerivation rec {
   name =
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
 
   buildInputs = [ ncurses readline gmp mpfr expat zlib guile ]
-    ++ stdenv.lib.optional pythonSupport python
+    ++ stdenv.lib.optional pythonSupport python3
     ++ stdenv.lib.optional doCheck dejagnu;
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];

From 5e591a0087daaeb55076b2f9c1c00fe3db07c737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 10:50:54 +0000
Subject: [PATCH 0610/2793] python3.pkgs.python-engineio: init at 3.0.0

---
 .../python-engineio/default.nix               | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-engineio/default.nix

diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
new file mode 100644
index 00000000000..1ea6dd89f2a
--- /dev/null
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, six
+, eventlet
+, mock
+, iana-etc
+, libredirect
+, aiohttp
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "python-engineio";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "miguelgrinberg";
+    repo = "python-engineio";
+    rev = "v${version}";
+    sha256 = "1v510fhn0li808ar2cmwh5nijacy5x60q9x4gm0b34j6mkmc59ph";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  checkInputs = [
+    eventlet
+    mock
+    aiohttp
+    tornado
+  ];
+
+  # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
+  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
+      LD_PRELOAD=${libredirect}/lib/libredirect.so
+  '';
+  postCheck = "unset NIX_REDIRECTS LD_PRELOAD";
+
+  meta = with stdenv.lib; {
+    description = "Engine.IO server";
+    homepage = http://github.com/miguelgrinberg/python-engineio/;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d34c61d4b8..37c8557517b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -633,6 +633,8 @@ in {
 
   python-binance = callPackage ../development/python-modules/python-binance { };
 
+  python-engineio = callPackage ../development/python-modules/python-engineio { };
+
   python-hosts = callPackage ../development/python-modules/python-hosts { };
 
   python-lz4 = callPackage ../development/python-modules/python-lz4 { };

From 5b23da0595ac7cbec2864b1be26e92ec8e240149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 10:51:45 +0000
Subject: [PATCH 0611/2793] python3.pkgs.python-socketio: init at 2.1.0

---
 .../python-socketio/default.nix               | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-socketio/default.nix

diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
new file mode 100644
index 00000000000..274adb9d424
--- /dev/null
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, python-engineio
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "python-socketio";
+  version = "2.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10457ahvi16iyshmynr0j9palfsbnpzya8p1nmlhzrcr11fsnkb7";
+  };
+
+  propagatedBuildInputs = [
+    six
+    python-engineio
+  ];
+
+  checkInputs = [ mock ];
+  # tests only on github, but latest github release not tagged
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Socket.IO server";
+    homepage = http://github.com/miguelgrinberg/python-socketio/;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37c8557517b..6f1680414ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -662,6 +662,8 @@ in {
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
 
+  python-socketio = callPackage ../development/python-modules/python-socketio { };
+
   python-utils = callPackage ../development/python-modules/python-utils { };
 
   pytimeparse =  callPackage ../development/python-modules/pytimeparse { };

From 3ad4a31c17c4aadb218b5fe859c4965fe285e6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 10:52:33 +0000
Subject: [PATCH 0612/2793] python3.pkgs.pygdbmi: init at 0.9.0.0

---
 .../python-modules/pygdbmi/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pygdbmi/default.nix

diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix
new file mode 100644
index 00000000000..fc19ab26573
--- /dev/null
+++ b/pkgs/development/python-modules/pygdbmi/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, gdb
+}:
+
+buildPythonPackage rec {
+  pname = "pygdbmi";
+  version = "0.9.0.0";
+
+  src = fetchFromGitHub {
+    #inherit pname version;
+    #inherit pname version;
+    owner = "cs01";
+    repo = "pygdbmi";
+    rev = version;
+    sha256 = "12xq9iajgqz23dska5x63hrx75icr5bwwswnmba0y69y39s0jpsj";
+  };
+
+  checkInputs = [ gdb ];
+
+  postPatch = ''
+    # tries to execute flake8,
+    # which is likely to break on flake8 updates
+    echo "def main(): return 0" > tests/static_tests.py
+  '';
+
+  meta = with lib; {
+    description = "Parse gdb machine interface output with Python";
+    homepage = https://github.com/cs01/pygdbmi;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f1680414ba..40c2edc8b0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -554,6 +554,8 @@ in {
 
   pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
 
+  pygdbmi = callPackage ../development/python-modules/pygdbmi { };
+
   pygmo = callPackage ../development/python-modules/pygmo { };
 
   pygobject2 = callPackage ../development/python-modules/pygobject { };

From 13b5fa18bbf6f54c12e5d6bd6349e2b1bca28c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 10:53:06 +0000
Subject: [PATCH 0613/2793] python3.pkgs.flask-socketio: init at 3.1.0

---
 .../python-modules/flask-socketio/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-socketio/default.nix

diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix
new file mode 100644
index 00000000000..d722ce03417
--- /dev/null
+++ b/pkgs/development/python-modules/flask-socketio/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, python-socketio
+, coverage
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-SocketIO";
+  version = "3.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a7188b35f7874903f554b3a1a3a4465213e765c4f17182fa5cb3d9f6915da4c1";
+  };
+
+  propagatedBuildInputs = [
+    flask
+    python-socketio
+  ];
+
+  checkInputs = [ coverage ];
+  # tests only on github, but lates release there is not tagged
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Socket.IO integration for Flask applications";
+    homepage = http://github.com/miguelgrinberg/Flask-SocketIO/;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40c2edc8b0f..a93bae80a82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2369,6 +2369,8 @@ in {
 
   flask-silk = callPackage ../development/python-modules/flask-silk { };
 
+  flask-socketio = callPackage ../development/python-modules/flask-socketio { };
+
   flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
 
   flask_testing = callPackage ../development/python-modules/flask-testing { };

From 28af9e45b05f082d1a65e793ebd8ca2210121c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 10:53:40 +0000
Subject: [PATCH 0614/2793] gdbgui: 0.13.0.0 -> 0.13.1.1

---
 .../development/tools/misc/gdbgui/default.nix |  49 ++-
 .../tools/misc/gdbgui/requirements.nix        | 336 ------------------
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 32 insertions(+), 355 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gdbgui/requirements.nix

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index 29bf92d2b6e..36e83564346 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -1,21 +1,41 @@
-{ stdenv, python27Packages, gdb, pkgs }:
-let
-  deps = import ./requirements.nix { inherit pkgs; };
-in
-python27Packages.buildPythonApplication rec {
+{ stdenv
+, buildPythonApplication
+, fetchPypi
+, gdb
+, iana-etc
+, libredirect
+, flask
+, flask-socketio
+, flask-compress
+, pygdbmi
+, pygments
+, gevent
+, breakpointHook
+, }:
+
+buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.13.0.0";
+  version = "0.13.1.1";
 
   buildInputs = [ gdb ];
-  propagatedBuildInputs = builtins.attrValues deps.packages;
+  propagatedBuildInputs = [
+    flask
+    flask-socketio
+    flask-compress
+    pygdbmi
+    pygments
+    gevent
+  ];
 
-  src = python27Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
-    sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz";
+    sha256 = "1ypxgkxwb443ndyrmsa7zx2hn0d9b3s7n2w49ngfghd3l8k0yvi2";
   };
 
   postPatch = ''
     echo ${version} > gdbgui/VERSION.txt
+    # remove upper version bound
+    sed -ie 's!, <.*"!"!' setup.py
   '';
 
   postInstall = ''
@@ -23,15 +43,8 @@ python27Packages.buildPythonApplication rec {
       --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]}
   '';
 
-  # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
-  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \
-      LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
-  '';
-
-  postCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    unset NIX_REDIRECTS LD_PRELOAD
-  '';
+  # tests do not work without stdout/stdin
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A browser-based frontend for GDB";
diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix
deleted file mode 100644
index 273f9db0c39..00000000000
--- a/pkgs/development/tools/misc/gdbgui/requirements.nix
+++ /dev/null
@@ -1,336 +0,0 @@
-# generated using pypi2nix tool (version: 1.8.1)
-# See more at: https://github.com/garbas/pypi2nix
-#
-# COMMAND:
-#   pypi2nix -V 2.7 -r requirements.txt
-#
-
-{ pkgs ? import <nixpkgs> {}
-}:
-
-let
-
-  inherit (pkgs) makeWrapper;
-  inherit (pkgs.stdenv.lib) fix' extends;
-
-  pythonPackages =
-  import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {
-    inherit pkgs;
-    inherit (pkgs) stdenv;
-    python = pkgs.python27Full;
-    # patching pip so it does not try to remove files when running nix-shell
-    overrides =
-      self: super: {
-        bootstrapped-pip = super.bootstrapped-pip.overrideDerivation (old: {
-          patchPhase = old.patchPhase + ''
-            sed -i               -e "s|paths_to_remove.remove(auto_confirm)|#paths_to_remove.remove(auto_confirm)|"                -e "s|self.uninstalled = paths_to_remove|#self.uninstalled = paths_to_remove|"                  $out/${pkgs.python35.sitePackages}/pip/req/req_install.py
-          '';
-        });
-      };
-  };
-
-  commonBuildInputs = [];
-  commonDoCheck = false;
-
-  withPackages = pkgs':
-    let
-      pkgs = builtins.removeAttrs pkgs' ["__unfix__"];
-      interpreter = pythonPackages.buildPythonPackage {
-        name = "python27Full-interpreter";
-        buildInputs = [ makeWrapper ] ++ (builtins.attrValues pkgs);
-        buildCommand = ''
-          mkdir -p $out/bin
-          ln -s ${pythonPackages.python.interpreter}               $out/bin/${pythonPackages.python.executable}
-          for dep in ${builtins.concatStringsSep " "               (builtins.attrValues pkgs)}; do
-            if [ -d "$dep/bin" ]; then
-              for prog in "$dep/bin/"*; do
-                if [ -f $prog ]; then
-                  ln -s $prog $out/bin/`basename $prog`
-                fi
-              done
-            fi
-          done
-          for prog in "$out/bin/"*; do
-            wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH"
-          done
-          pushd $out/bin
-          ln -s ${pythonPackages.python.executable} python
-          ln -s ${pythonPackages.python.executable}               python2
-          popd
-        '';
-        passthru.interpreter = pythonPackages.python;
-      };
-    in {
-      __old = pythonPackages;
-      inherit interpreter;
-      mkDerivation = pythonPackages.buildPythonPackage;
-      packages = pkgs;
-      overrideDerivation = drv: f:
-        pythonPackages.buildPythonPackage (drv.drvAttrs // f drv.drvAttrs //                                            { meta = drv.meta; });
-      withPackages = pkgs'':
-        withPackages (pkgs // pkgs'');
-    };
-
-  python = withPackages {};
-
-  generated = self: {
-
-    "Flask" = python.mkDerivation {
-      name = "Flask-0.12.2";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/eb/12/1c7bd06fcbd08ba544f25bf2c6612e305a70ea51ca0eda8007344ec3f123/Flask-0.12.2.tar.gz"; sha256 = "49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."Jinja2"
-      self."Werkzeug"
-      self."click"
-      self."itsdangerous"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/pallets/flask/";
-        license = licenses.bsdOriginal;
-        description = "A microframework based on Werkzeug, Jinja2 and good intentions";
-      };
-    };
-
-
-
-    "Flask-Compress" = python.mkDerivation {
-      name = "Flask-Compress-1.4.0";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/0e/2a/378bd072928f6d92fd8c417d66b00c757dc361c0405a46a0134de6fd323d/Flask-Compress-1.4.0.tar.gz"; sha256 = "468693f4ddd11ac6a41bca4eb5f94b071b763256d54136f77957cfee635badb3"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."Flask"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "https://libwilliam.github.io/flask-compress/";
-        license = licenses.mit;
-        description = "Compress responses in your Flask app with gzip.";
-      };
-    };
-
-
-
-    "Flask-SocketIO" = python.mkDerivation {
-      name = "Flask-SocketIO-2.9.3";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/a0/ac/4024b73e071d5a000a998d6f26ba0a090011d5abdc7aa41f2774173c3276/Flask-SocketIO-2.9.3.tar.gz"; sha256 = "df23f790db8529c543bd0b54165215c342cf6955a4a1f605650e759197a46d59"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."Flask"
-      self."python-socketio"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/miguelgrinberg/Flask-SocketIO/";
-        license = licenses.mit;
-        description = "Socket.IO integration for Flask applications";
-      };
-    };
-
-
-
-    "Jinja2" = python.mkDerivation {
-      name = "Jinja2-2.10";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/56/e6/332789f295cf22308386cf5bbd1f4e00ed11484299c5d7383378cf48ba47/Jinja2-2.10.tar.gz"; sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."MarkupSafe"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://jinja.pocoo.org/";
-        license = licenses.bsdOriginal;
-        description = "A small but fast and easy to use stand-alone template engine written in pure python.";
-      };
-    };
-
-
-
-    "MarkupSafe" = python.mkDerivation {
-      name = "MarkupSafe-1.0";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz"; sha256 = "a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/pallets/markupsafe";
-        license = licenses.bsdOriginal;
-        description = "Implements a XML/HTML/XHTML Markup safe string for Python";
-      };
-    };
-
-
-
-    "Pygments" = python.mkDerivation {
-      name = "Pygments-2.2.0";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz"; sha256 = "dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://pygments.org/";
-        license = licenses.bsdOriginal;
-        description = "Pygments is a syntax highlighting package written in Python.";
-      };
-    };
-
-
-
-    "Werkzeug" = python.mkDerivation {
-      name = "Werkzeug-0.14.1";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9f/08/a3bb1c045ec602dc680906fc0261c267bed6b3bb4609430aff92c3888ec8/Werkzeug-0.14.1.tar.gz"; sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "https://www.palletsprojects.org/p/werkzeug/";
-        license = licenses.bsdOriginal;
-        description = "The comprehensive WSGI web application library.";
-      };
-    };
-
-
-
-    "click" = python.mkDerivation {
-      name = "click-6.7";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz"; sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/mitsuhiko/click";
-        license = licenses.bsdOriginal;
-        description = "A simple wrapper around optparse for powerful command line utilities.";
-      };
-    };
-
-
-
-    "gevent" = python.mkDerivation {
-      name = "gevent-1.2.2";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz"; sha256 = "4791c8ae9c57d6f153354736e1ccab1e2baf6c8d9ae5a77a9ac90f41e2966b2d"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."greenlet"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://www.gevent.org/";
-        license = licenses.mit;
-        description = "Coroutine-based network library";
-      };
-    };
-
-
-
-    "greenlet" = python.mkDerivation {
-      name = "greenlet-0.4.12";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/be/76/82af375d98724054b7e273b5d9369346937324f9bcc20980b45b068ef0b0/greenlet-0.4.12.tar.gz"; sha256 = "e4c99c6010a5d153d481fdaf63b8a0782825c0721506d880403a3b9b82ae347e"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "https://github.com/python-greenlet/greenlet";
-        license = licenses.mit;
-        description = "Lightweight in-process concurrent programming";
-      };
-    };
-
-
-
-    "itsdangerous" = python.mkDerivation {
-      name = "itsdangerous-0.24";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz"; sha256 = "cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/mitsuhiko/itsdangerous";
-        license = licenses.bsdOriginal;
-        description = "Various helpers to pass trusted data to untrusted environments and back.";
-      };
-    };
-
-
-
-    "pygdbmi" = python.mkDerivation {
-      name = "pygdbmi-0.8.2.0";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4e/34/a8c86d85e0d3d8df2c289657a55c19408dbdbf0b1468859e7f1a745ae8ff/pygdbmi-0.8.2.0.tar.gz"; sha256 = "47cece65808ca42edf6966ac48e2aedca7ae1c675c4d2f0d001c7f3a7fa245fe"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "https://github.com/cs01/pygdbmi";
-        license = licenses.mit;
-        description = "Parse gdb machine interface output with Python";
-      };
-    };
-
-
-
-    "python-engineio" = python.mkDerivation {
-      name = "python-engineio-2.0.2";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e5/91/f6fd80298e68b4ca22a1a9cc3091116e2fef22fd8fb017ad9e5c6ec6ddcc/python-engineio-2.0.2.tar.gz"; sha256 = "46c710a72c3b2a8511b0d7963c46e200010f8ea3eb0721ce15603d0f23e993c4"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."six"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/miguelgrinberg/python-engineio/";
-        license = licenses.mit;
-        description = "Engine.IO server";
-      };
-    };
-
-
-
-    "python-socketio" = python.mkDerivation {
-      name = "python-socketio-1.8.4";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/58/a9/52af6a7ad0805977afc838ed394f8d26d078ef61e8c1bdd632801c58ef3a/python-socketio-1.8.4.tar.gz"; sha256 = "13807ce17e85371d15b31295a43b1fac1c0dba1eb5fc233353a3efd53aa122cc"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [
-      self."python-engineio"
-      self."six"
-    ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://github.com/miguelgrinberg/python-socketio/";
-        license = licenses.mit;
-        description = "Socket.IO server";
-      };
-    };
-
-
-
-    "six" = python.mkDerivation {
-      name = "six-1.11.0";
-      src = pkgs.fetchurl { url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz"; sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; };
-      doCheck = commonDoCheck;
-      buildInputs = commonBuildInputs;
-      propagatedBuildInputs = [ ];
-      meta = with pkgs.stdenv.lib; {
-        homepage = "http://pypi.python.org/pypi/six/";
-        license = licenses.mit;
-        description = "Python 2 and 3 compatibility utilities";
-      };
-    };
-
-  };
-  localOverridesFile = ./requirements_override.nix;
-  overrides = import localOverridesFile { inherit pkgs python; };
-  commonOverrides = [
-
-  ];
-  allOverrides =
-    (if (builtins.pathExists localOverridesFile)
-     then [overrides] else [] ) ++ commonOverrides;
-
-in python.withPackages
-   (fix' (pkgs.lib.fold
-            extends
-            generated
-            allOverrides
-         )
-   )
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65cae31a998..edd9c330d78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8522,7 +8522,7 @@ with pkgs;
 
   gede = libsForQt59.callPackage ../development/tools/misc/gede { };
 
-  gdbgui = callPackage ../development/tools/misc/gdbgui { };
+  gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
 
   pmd = callPackage ../development/tools/analysis/pmd { };
 

From 5e9922e800195b482dbdd206cee84c0a8c8654fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 11:00:16 +0000
Subject: [PATCH 0615/2793] python3.pkgs.unicorn: enable python3

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

diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index b20843d0fc2..de317ec1844 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, buildPackages, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   name  = "${pname}-${version}";
@@ -10,7 +10,8 @@ buildPythonPackage rec {
     sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg";
   };
 
-  disabled = isPy3k;
+  # needs python2 at build time
+  PYTHON="${buildPackages.python2.interpreter}";
 
   setupPyBuildFlags = [ "--plat-name" "linux" ];
 

From 5db3428fa3192d6093bbc59c2589087de2cd2fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Dec 2018 11:01:45 +0000
Subject: [PATCH 0616/2793] pwndbg: switch to python3

---
 .../development/tools/misc/pwndbg/default.nix | 19 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 257e822edd9..e299a7b0eb8 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -1,4 +1,18 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }:
+{ stdenv
+, fetchFromGitHub
+, makeWrapper
+, gdb
+, future
+, isort
+, psutil
+, pycparser
+, pyelftools
+, python-ptrace
+, ROPGadget
+, six
+, unicorn
+, pygments
+, }:
 
 stdenv.mkDerivation rec {
   name = "pwndbg-${version}";
@@ -13,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = [
     future
     isort
     psutil
@@ -24,7 +38,6 @@ stdenv.mkDerivation rec {
     six
     unicorn
     pygments
-    enum34
   ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edd9c330d78..8ebe8bc9f38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4978,7 +4978,7 @@ with pkgs;
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
-  pwndbg = callPackage ../development/tools/misc/pwndbg { };
+  pwndbg = python3Packages.callPackage ../development/tools/misc/pwndbg { };
 
   pycangjie = pythonPackages.pycangjie;
 

From 062602d81e9b12320698ff32356cf03444cfae51 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 1 Dec 2018 15:00:19 +0100
Subject: [PATCH 0617/2793] nixos/sway-beta: Improve the wrapper

According to the dbus-launch documentation [0] "--exit-with-session"
shouldn't be used: "This option is not recommended, since it will
consume input from the terminal where it was started; it is mainly
provided for backwards compatibility." And it also states: "To start a
D-Bus session within a text-mode session, do not use dbus-launch.
Instead, see dbus-run-session(1)."

The new wrapper also avoids starting an additional D-Bus session if
DBUS_SESSION_BUS_ADDRESS is already set.

Fix #51303.

[0]: https://dbus.freedesktop.org/doc/dbus-launch.1.html
[1]: https://dbus.freedesktop.org/doc/dbus-run-session.1.html
---
 nixos/modules/programs/sway-beta.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
index 8447f94ca25..7fc5979a38a 100644
--- a/nixos/modules/programs/sway-beta.nix
+++ b/nixos/modules/programs/sway-beta.nix
@@ -7,8 +7,19 @@ let
   swayPackage = cfg.package;
 
   swayWrapped = pkgs.writeShellScriptBin "sway" ''
-    ${cfg.extraSessionCommands}
-    exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway "$@"
+    set -o errexit
+
+    if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+      export _SWAY_WRAPPER_ALREADY_EXECUTED=1
+      ${cfg.extraSessionCommands}
+    fi
+
+    if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
+      export DBUS_SESSION_BUS_ADDRESS
+      exec ${swayPackage}/bin/sway "$@"
+    else
+      exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@"
+    fi
   '';
   swayJoined = pkgs.symlinkJoin {
     name = "sway-joined";

From 8560887e887e1dc2218554e99f755eefdd4bd42b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Dec 2018 14:07:00 +0100
Subject: [PATCH 0618/2793] usbutils: fix usb.ids path

The utility switched from /usr/share to ${datadir}, but it is still not enough
for use. It would be nice if upstream provided configure flag.
---
 pkgs/os-specific/linux/usbutils/default.nix     | 17 +++++++++--------
 pkgs/os-specific/linux/usbutils/fix-paths.patch | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/os-specific/linux/usbutils/fix-paths.patch

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 8d53756d510..d58c5a7e67c 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
+{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata }:
 
 stdenv.mkDerivation rec {
   name = "usbutils-010";
@@ -8,14 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb1 ];
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit hwdata;
+    })
+  ];
 
-  postInstall =
-    ''
-      substituteInPlace $out/bin/lsusb.py \
-        --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids
-    '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libusb1 ];
 
   meta = with stdenv.lib; {
     homepage = http://www.linux-usb.org/;
diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch
new file mode 100644
index 00000000000..d75c68505ef
--- /dev/null
+++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -51,11 +51,11 @@
+ 	usbreset.c
+ 
+ lsusb.py: $(srcdir)/lsusb.py.in
+-	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++	sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
+ 	chmod 755 $@
+ 
+ lsusb.8: $(srcdir)/lsusb.8.in
+-	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++	sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
+ 
+ usb-devices.1: $(srcdir)/usb-devices.1.in
+ 	sed 's|VERSION|$(VERSION)|g' $< >$@

From 7476972553ddb8a6c96f2d79675625c23dc5d70c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Nov 2018 06:08:47 -0500
Subject: [PATCH 0619/2793] git-secrets: install manpage

---
 .../git-and-tools/git-secrets/default.nix     | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index a2f0c8ae414..fb85bb7da46 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -1,40 +1,32 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, git }:
+{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:
 
-let
+stdenv.mkDerivation rec {
+  name = "git-secrets-${version}";
   version = "1.2.1";
-  repo = "git-secrets";
-
-in stdenv.mkDerivation {
-  name = "${repo}-${version}";
 
   src = fetchFromGitHub {
-    inherit repo;
     owner = "awslabs";
+    repo = "git-secrets";
     rev = "${version}";
     sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
   };
 
-  buildInputs = [ makeWrapper git];
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
 
-  # buildPhase = ''
-  #  make man # TODO: need rst2man.py
-  # '';
-  
   installPhase = ''
-    install -D git-secrets $out/bin/git-secrets
+    install -m755 -Dt $out/bin git-secrets
+    install -m444 -Dt $out/share/man/man1 git-secrets.1
 
     wrapProgram $out/bin/git-secrets \
-      --prefix PATH : "${lib.makeBinPath [ git ]}"
-
-    # TODO: see above note on rst2man.py
-    # mkdir $out/share
-    # cp -r man $out/share
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}"
   '';
 
-  meta = {
-    description = "Prevents you from committing passwords and other sensitive information to a git repository";
+  meta = with stdenv.lib; {
+    description = "Prevents you from committing secrets and credentials into git repositories";
     homepage = https://github.com/awslabs/git-secrets;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.asl20;
+    platforms = platforms.all;
   };
 }

From 7905c38c74a730951ec0a87ba45780e107f86cc5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Nov 2018 07:55:49 -0500
Subject: [PATCH 0620/2793] fedpkg: fix patch

---
 .../python-modules/fedpkg-buildfix.diff          | 14 --------------
 .../python-modules/fedpkg/default.nix            |  6 ++----
 .../python-modules/fedpkg/fix-paths.patch        | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fedpkg-buildfix.diff
 create mode 100644 pkgs/development/python-modules/fedpkg/fix-paths.patch

diff --git a/pkgs/development/python-modules/fedpkg-buildfix.diff b/pkgs/development/python-modules/fedpkg-buildfix.diff
deleted file mode 100644
index b9d46d7c741..00000000000
--- a/pkgs/development/python-modules/fedpkg-buildfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py	2014-02-04 16:12:37.021993713 +0100
-+++ b/setup.py	2014-02-04 16:11:42.653995607 +0100
-@@ -13,8 +13,8 @@
-     package_dir = {'': 'src'},
-     packages = ['fedpkg'],
-     scripts = ['src/bin/fedpkg'],
--    data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
--                  ('/etc/rpkg', ['src/fedpkg.conf']),
--                  ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
-+    data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
-+                  ('etc/rpkg', ['src/fedpkg.conf']),
-+                  ('libexec/', ['src/fedpkg-fixbranches.py']),
-                  ]
- )
diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix
index 0230466e6e3..e23a3e4a0d6 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/python-modules/fedpkg/default.nix
@@ -3,16 +3,14 @@
 buildPythonPackage rec {
   pname = "fedpkg";
   version = "1.29";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
+    url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
     sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
   };
-
-  #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+  patches = [ ./fix-paths.patch ];
   propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
 
   doCheck = false; # requires fedora_cert which isn't used anymore
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/python-modules/fedpkg/fix-paths.patch
new file mode 100644
index 00000000000..1831337a585
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg/fix-paths.patch
@@ -0,0 +1,16 @@
+--- orig/setup.py
++++ new/setup.py
+@@ -27,10 +27,10 @@
+         'bin/fedpkg',
+         'bin/fedpkg-stage',
+     ],
+-    data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
+-                ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
++    data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
++                ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
+                                'conf/etc/rpkg/fedpkg-stage.conf']),
+-                ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
++                ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
+                 ],
+ 
+     tests_require=['nose', 'mock'],

From c220fe8e88b0869e2686de035f02585238e02228 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Dec 2018 10:59:34 -0500
Subject: [PATCH 0621/2793] fedpkg: promote to python application

---
 pkgs/development/{python-modules => tools}/fedpkg/default.nix | 4 ++--
 .../{python-modules => tools}/fedpkg/fix-paths.patch          | 0
 pkgs/top-level/all-packages.nix                               | 2 ++
 pkgs/top-level/python-packages.nix                            | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/{python-modules => tools}/fedpkg/default.nix (84%)
 rename pkgs/development/{python-modules => tools}/fedpkg/fix-paths.patch (100%)

diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
similarity index 84%
rename from pkgs/development/python-modules/fedpkg/default.nix
rename to pkgs/development/tools/fedpkg/default.nix
index e23a3e4a0d6..7c82dc9d32a 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+{ stdenv, buildPythonApplication, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "fedpkg";
   version = "1.29";
 
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/tools/fedpkg/fix-paths.patch
similarity index 100%
rename from pkgs/development/python-modules/fedpkg/fix-paths.patch
rename to pkgs/development/tools/fedpkg/fix-paths.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0dd..7f0811fd408 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8533,6 +8533,8 @@ with pkgs;
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };
 
+  fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
+
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be0cfdb6ce3..2c1c772a7a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1655,8 +1655,6 @@ in {
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";
 
-  fedpkg = callPackage ../development/python-modules/fedpkg { };
-
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };

From 60b743853ba8abe4ad775f4b042961241eaf5761 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 1 Dec 2018 10:02:49 -0600
Subject: [PATCH 0622/2793] lm_sensors: 3.4.0 -> 3.5.0

* lm_sensors: 3.4.0 -> 3.5.0 (#51117)

Using releases posted on github,
they work and I'm not sure how those fedora URL's are found anyway.

* lm_sensors: cleanup
---
 pkgs/os-specific/linux/lm-sensors/default.nix | 24 +++----
 .../linux/lm-sensors/musl-fix-includes.patch  | 62 -------------------
 2 files changed, 9 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch

diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 04ce60c87b0..0536ba064a3 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -1,28 +1,22 @@
-{ sensord ? false,
-  stdenv, fetchurl, bison, flex, which, perl,
-  rrdtool ? null
+{ stdenv, fetchzip, bison, flex, which, perl
+, sensord ? false, rrdtool ? null
 }:
 
 assert sensord -> rrdtool != null;
 
 stdenv.mkDerivation rec {
   name = "lm-sensors-${version}";
-  version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash
+  version = "3.5.0";
 
-  src = fetchurl {
-    urls = [
-      # "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";
+  src = fetchzip {
+    url = "https://github.com/lm-sensors/lm-sensors/archive/V${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj";
   };
 
-  buildInputs = [ bison flex which perl ]
+  nativeBuildInputs = [ bison flex which ];
+  buildInputs = [ perl ]
    ++ stdenv.lib.optional sensord rrdtool;
 
-  patches = [ ./musl-fix-includes.patch ];
-
   preBuild = ''
     makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
     ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://hwmon.wiki.kernel.org/lm_sensors;
     description = "Tools for reading hardware sensors";
-    license = with licenses; [ gpl2 lgpl21 ];
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch b/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch
deleted file mode 100644
index 501f2dd762c..00000000000
--- a/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- lm_sensors-3.3.4.orig/prog/dump/isadump.c
-+++ lm_sensors-3.3.4/prog/dump/isadump.c
-@@ -36,13 +36,7 @@
- #include "util.h"
- #include "superio.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
---- lm_sensors-3.3.4.orig/prog/dump/isaset.c
-+++ lm_sensors-3.3.4/prog/dump/isaset.c
-@@ -32,13 +32,7 @@
- #include <string.h>
- #include "util.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
---- lm_sensors-3.3.4.orig/prog/dump/superio.c
-+++ lm_sensors-3.3.4/prog/dump/superio.c
-@@ -20,12 +20,7 @@
- */
- 
- #include <stdlib.h>
--
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- #include "superio.h"
- 
---- lm_sensors-3.3.4.orig/prog/dump/util.c
-+++ lm_sensors-3.3.4/prog/dump/util.c
-@@ -11,12 +11,7 @@
- #include <stdio.h>
- #include "util.h"
- 
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- /* Return 1 if we should continue, 0 if we should abort */
- int user_ack(int def)

From bc2d26fd8f5f0e179cb739817b220bfa81da950e Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 1 Dec 2018 17:03:40 +0100
Subject: [PATCH 0623/2793] dwm-status: 1.4.0 -> 1.4.1

---
 .../window-managers/dwm/dwm-status.nix             | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 16a67030736..f88ef63bc2e 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,15 +1,21 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
-, enableAlsaUtils ? true, alsaUtils }:
+, enableAlsaUtils ? true, alsaUtils, bash, coreutils }:
+
+let
+  binPath = stdenv.lib.makeBinPath [
+    alsaUtils bash coreutils
+  ];
+in
 
 rustPlatform.buildRustPackage rec {
   name = "dwm-status-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = "dwm-status";
     rev = version;
-    sha256 = "1v9ksv8hdxhpm7vs71p9s1y3gnahczza0w4wyrk2fsc6x2kwlh6x";
+    sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
@@ -19,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = lib.optionalString enableAlsaUtils ''
     wrapProgram $out/bin/dwm-status \
-      --prefix "PATH" : "${alsaUtils}/bin"
+      --prefix "PATH" : "${binPath}"
   '';
 
   meta = with stdenv.lib; {

From 813e74a2bf6cf445ee43224733692d219440fc70 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:12:30 -0500
Subject: [PATCH 0624/2793] sbt: 1.2.6 -> 1.2.7

---
 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 dce19a1d839..d6eed35e30a 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.6";
+  version = "1.2.7";
 
   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 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
+    sha256 = "10g7a1j2knbqmnbpvfhy1rqdg2pflmasz879ax59pv3mvgccn996";
   };
 
   patchPhase = ''

From ff4bf6067e6571006df3c258f6cf46adb3ddf0d5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:16:25 -0500
Subject: [PATCH 0625/2793] kernel: Remove 4.18.x

4.18 series is EOL
---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 11 -----------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.18.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
deleted file mode 100644
index fa9338fd800..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "4.18.20";
-
-  # 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 = "0lzn2w8zagqk3sp6jsp155xggm1c277xjh8m0nvddvdp1yg33b38";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0dd..cc18e0a0611 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14395,16 +14395,6 @@ with pkgs;
       ];
   };
 
-  linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.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_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -14600,7 +14590,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_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   # Don't forget to update linuxPackages_latest!
 

From 995004634f6e26fece223a953c45029e7bfba0a0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:17:21 -0500
Subject: [PATCH 0626/2793] kernel: 4.4.165 -> 4.4.166

---
 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 01bcc6f2525..a32424565d3 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.165";
+  version = "4.4.166";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19zmigb1avq63n0cbvsqaw9ygddwx13mrvl80p92abw7ns26b2va";
+    sha256 = "0nj1wvsf1c843hp9ww68gpwsjdviax67dpffafsq78ask7yyy45z";
   };
 } // (args.argsOverride or {}))

From 182a6557e301908354565fba0ba02fb24ef641b6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:18:10 -0500
Subject: [PATCH 0627/2793] kernel: 4.9.141 -> 4.9.142

---
 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 2fc57a104ea..01328250186 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.141";
+  version = "4.9.142";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "09mc5sxzzxmks20vslimaaaw0aamjcc3lvpyjydmr78s25q5zfsp";
+    sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil";
   };
 } // (args.argsOverride or {}))

From 8f23a4616fc035e83ee794ab8829eeb521986282 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:18:38 -0500
Subject: [PATCH 0628/2793] kernel: 4.14.84 -> 4.14.85

---
 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 6254ed7fac0..008c23ee9af 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.84";
+  version = "4.14.85";
 
   # 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 = "0653fg6p0wg81i4mj8n4lghn8h8jx3pkbyp6sm22p2b1rwpgj893";
+    sha256 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4";
   };
 } // (args.argsOverride or {}))

From d97f3cb647cbaa080eb421f731b6aca20e1e89de Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 1 Dec 2018 11:19:04 -0500
Subject: [PATCH 0629/2793] kernel: 4.19.5 -> 4.19.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 54b03fc88be..ccdb95b1411 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.5";
+  version = "4.19.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 = "0xggarlff54l9zxm5qr14nzd514xxg8i1akyxzlb0znfkk19x0wc";
+    sha256 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4";
   };
 } // (args.argsOverride or {}))

From 54ed86852e921948cbd35bc7e228ebfca38c4d47 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sat, 1 Dec 2018 17:45:37 +0100
Subject: [PATCH 0630/2793] Switch to buildDunePackage, and remove redundancies

---
 .../bisect_ppx-ocamlbuild/default.nix         | 35 +++----------------
 .../ocaml-modules/bisect_ppx/default.nix      | 19 +++-------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index e4d5c22c187..602956ee760 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -1,32 +1,7 @@
-{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocamlbuild }:
+{ buildDunePackage, bisect_ppx, ocamlbuild }:
 
-let version = "1.4.0"; in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-bisect_ppx-ocamlbuild-${version}";
-
-  src = fetchFromGitHub {
-    owner = "aantron";
-    repo = "bisect_ppx";
-    rev = version;
-    sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h";
-  };
-
-  buildInputs = [
-    ocaml
-    dune
-    findlib
-    ocamlbuild
-  ];
-
-  buildPhase = "dune build -p bisect_ppx-ocamlbuild";
-
-  inherit (dune) installPhase;
-
-  meta = {
-    homepage = https://github.com/aantron/bisect_ppx;
-    platforms = ocaml.meta.platforms or [];
-    description = "Code coverage for OCaml";
-    license = stdenv.lib.licenses.mpl20;
-  };
+buildDunePackage rec {
+  inherit (bisect_ppx) version src meta;
+  pname = "bisect_ppx-ocamlbuild";
+  buildInputs = [ ocamlbuild ];
 }
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index 7b39cd1968f..9999cd06fca 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, ocaml, dune, findlib, ocaml-migrate-parsetree, ppx_tools_versioned }:
+{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }:
 
-let version = "1.4.0"; in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-bisect_ppx-${version}";
+buildDunePackage rec {
+  pname = "bisect_ppx";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "aantron";
@@ -13,21 +12,13 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    ocaml
-    dune
-    findlib
     ocaml-migrate-parsetree
     ppx_tools_versioned
   ];
 
-  buildPhase = "dune build -p bisect_ppx";
-
-  inherit (dune) installPhase;
-
   meta = {
-    homepage = https://github.com/aantron/bisect_ppx;
-    platforms = ocaml.meta.platforms or [];
     description = "Code coverage for OCaml";
     license = stdenv.lib.licenses.mpl20;
+    homepage = https://github.com/aantron/bisect_ppx;
   };
 }

From 59a94b57f07594f4544896dd90c71a948d1ea089 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Nov 2018 18:03:19 +0100
Subject: [PATCH 0631/2793] update.nix: Run update scripts in parallel

To make updating large attribute sets faster, the update scripts
are now run in parallel.

Please note the following changes in semantics:

- The string passed to updateScript needs to be a path to an executable file.
- The updateScript can also be a list: the tail elements will then be passed
  to the head as command line arguments.
---
 doc/stdenv.xml                                | 37 +++++++++
 maintainers/scripts/update.nix                | 53 +++++--------
 maintainers/scripts/update.py                 | 79 +++++++++++++++++++
 .../browsers/firefox-bin/default.nix          |  2 +-
 .../browsers/firefox-bin/update.nix           |  4 +-
 .../networking/browsers/firefox/update.nix    |  2 +
 pkgs/applications/office/mendeley/default.nix |  2 +-
 pkgs/applications/office/mendeley/update.nix  |  3 +-
 pkgs/desktops/deepin/update.nix               |  3 +-
 pkgs/desktops/gnome-3/update.nix              |  3 +-
 .../libraries/safefile/default.nix            |  1 +
 .../tools/build-managers/gup/default.nix      |  1 +
 pkgs/development/web/nodejs/update.nix        |  4 +-
 pkgs/os-specific/linux/tp_smapi/default.nix   |  2 +-
 pkgs/os-specific/linux/tp_smapi/update.nix    |  3 +-
 .../package-management/nix-pin/default.nix    |  1 +
 .../nix-update-source/default.nix             |  3 +-
 17 files changed, 159 insertions(+), 44 deletions(-)
 create mode 100644 maintainers/scripts/update.py

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 208b5e9cf30..a90a377b3f2 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -671,6 +671,43 @@ passthru = {
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>passthru.updateScript</varname>
+    </term>
+    <listitem>
+     <para>
+      A script to be run by <filename>maintainers/scripts/update.nix</filename> when
+      the package is matched. It needs to be an executable file, either on the file
+      system:
+<programlisting>
+passthru.updateScript = ./update.sh;
+</programlisting>
+      or inside the expression itself:
+<programlisting>
+passthru.updateScript = writeScript "update-zoom-us" ''
+  #!/usr/bin/env nix-shell
+  #!nix-shell -i bash -p curl pcre common-updater-scripts
+
+  set -eu -o pipefail
+
+  version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
+  update-source-version zoom-us "$version"
+'';
+</programlisting>
+      The attribute can also contain a list, a script followed by arguments to be passed to it:
+<programlisting>
+passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
+</programlisting>
+      Note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
+     </para>
+
+     <para>
+      For information about how to run the updates, execute
+      <cmdsynopsis><command>nix-shell</command> <arg>maintainers/scripts/update.nix</arg></cmdsynopsis>.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </section>
  <section xml:id="sec-stdenv-phases">
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 8d1e47c6bc9..120cd5552f4 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -1,6 +1,8 @@
 { package ? null
 , maintainer ? null
 , path ? null
+, max-workers ? null
+, keep-going ? null
 }:
 
 # TODO: add assert statements
@@ -105,26 +107,23 @@ let
         % nix-shell maintainers/scripts/update.nix --argstr path gnome3
 
     to run update script for all package under an attribute path.
+
+    You can also add
+
+        --argstr max-workers 8
+
+    to increase the number of jobs in parallel, or
+
+        --argstr keep-going true
+
+    to continue running when a single update fails.
   '';
 
-  runUpdateScript = package: ''
-    echo -ne " - ${package.name}: UPDATING ..."\\r
-    ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log
-    CODE=$?
-    if [ "$CODE" != "0" ]; then
-      echo " - ${package.name}: ERROR       "
-      echo ""
-      echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
-      echo ""
-      cat ${(builtins.parseDrvName package.name).name}.log
-      echo ""
-      echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
-      exit $CODE
-    else
-      rm ${(builtins.parseDrvName package.name).name}.log
-    fi
-    echo " - ${package.name}: DONE.       "
-  '';
+  packageData = package: {
+    name = package.name;
+    pname = (builtins.parseDrvName package.name).name;
+    updateScript = pkgs.lib.toList package.updateScript;
+  };
 
 in pkgs.stdenv.mkDerivation {
   name = "nixpkgs-update-script";
@@ -139,21 +138,7 @@ in pkgs.stdenv.mkDerivation {
     exit 1
   '';
   shellHook = ''
-    echo ""
-    echo "Going to be running update for following packages:"
-    echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}"
-    echo ""
-    read -n1 -r -p "Press space to continue..." confirm
-    if [ "$confirm" = "" ]; then
-      echo ""
-      echo "Running update for:"
-      ${builtins.concatStringsSep "\n" (map runUpdateScript packages)}
-      echo ""
-      echo "Packages updated!"
-      exit 0
-    else
-      echo "Aborting!"
-      exit 1
-    fi
+    unset shellHook # do not contaminate nested shells
+    exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"}
   '';
 }
diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
new file mode 100644
index 00000000000..eb7d0ef2647
--- /dev/null
+++ b/maintainers/scripts/update.py
@@ -0,0 +1,79 @@
+import argparse
+import concurrent.futures
+import json
+import os
+import subprocess
+import sys
+
+updates = {}
+
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+def run_update_script(package):
+    eprint(f" - {package['name']}: UPDATING ...")
+
+    subprocess.run(package['updateScript'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
+
+
+def main(max_workers, keep_going, packages):
+    with open(sys.argv[1]) as f:
+        packages = json.load(f)
+
+    eprint()
+    eprint('Going to be running update for following packages:')
+    for package in packages:
+        eprint(f" - {package['name']}")
+    eprint()
+
+    confirm = input('Press Enter key to continue...')
+    if confirm == '':
+        eprint()
+        eprint('Running update for:')
+
+        with concurrent.futures.ProcessPoolExecutor(max_workers=max_workers) as executor:
+            for package in packages:
+                updates[executor.submit(run_update_script, package)] = package
+
+            for future in concurrent.futures.as_completed(updates):
+                package = updates[future]
+
+                try:
+                    future.result()
+                    eprint(f" - {package['name']}: DONE.")
+                except subprocess.CalledProcessError as e:
+                    eprint(f" - {package['name']}: ERROR")
+                    eprint()
+                    eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
+                    eprint()
+                    eprint(e.stdout.decode('utf-8'))
+                    with open(f"{package['pname']}.log", 'wb') as f:
+                        f.write(e.stdout)
+                    eprint()
+                    eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
+
+                    if not keep_going:
+                        sys.exit(1)
+
+        eprint()
+        eprint('Packages updated!')
+        sys.exit()
+    else:
+        eprint('Aborting!')
+        sys.exit(130)
+
+parser = argparse.ArgumentParser(description='Update packages')
+parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='Number of updates to run concurrently', nargs='?', default=4)
+parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure')
+parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts')
+
+if __name__ == '__main__':
+    args = parser.parse_args()
+
+    try:
+        main(args.max_workers, args.keep_going, args.packages)
+    except (KeyboardInterrupt, SystemExit) as e:
+        for update in updates:
+            update.cancel()
+
+        sys.exit(e.code if isinstance(e, SystemExit) else 130)
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index c81c7934985..2d9692c0528 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
   # update with:
   # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
   passthru.updateScript = import ./update.nix {
-    inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
+    inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
     baseUrl =
       if channel == "devedition"
         then "http://archive.mozilla.org/pub/devedition/releases/"
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index df928f88c38..ee022e329f9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -1,4 +1,5 @@
-{ name
+{ stdenv
+, name
 , channel
 , writeScript
 , xidel
@@ -17,6 +18,7 @@ let
     channel != "release";
 
 in writeScript "update-${name}" ''
+  #!${stdenv.shell}
   PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
   set -eux
   pushd ${basePath}
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index a831d823118..07ae2c040e6 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -1,4 +1,5 @@
 { writeScript
+, stdenv
 , lib
 , xidel
 , common-updater-scripts
@@ -13,6 +14,7 @@
 }:
 
 writeScript "update-${attrPath}" ''
+  #!${stdenv.shell}
   PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
 
   url=${baseUrl}
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 5b6271db83b..aa9317d2ffd 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation {
   dontStrip = true;
   dontPatchElf = true;
 
-  updateScript = import ./update.nix { inherit writeScript; };
+  updateScript = import ./update.nix { inherit stdenv writeScript; };
 
   meta = with stdenv.lib; {
     homepage = http://www.mendeley.com;
diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix
index cb9ee02702d..147c95b8e7b 100644
--- a/pkgs/applications/office/mendeley/update.nix
+++ b/pkgs/applications/office/mendeley/update.nix
@@ -1,6 +1,7 @@
-{ writeScript }:
+{ stdenv, writeScript }:
 
 writeScript "update-mendeley" ''
+  #!${stdenv.shell}
   function follow() {
     local URL=$1
     while true; do
diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix
index 761ead015c6..22a6acb8ce3 100644
--- a/pkgs/desktops/deepin/update.nix
+++ b/pkgs/desktops/deepin/update.nix
@@ -1,4 +1,4 @@
-{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
+{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
 { name, ignored-versions ? "^2014\\.|^v[0-9]+" }:
 
 let
@@ -9,6 +9,7 @@ let
 in
 
 writeScript "update-${packageName}" ''
+  #!${stdenv.shell}
   set -o errexit
   set -x
 
diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix
index b7a6ce16d11..216ae9cb8b3 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome-3/update.nix
@@ -1,9 +1,10 @@
-{ lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }:
+{ stdenv, lib, writeScript, python3, common-updater-scripts, coreutils, gnugrep, gnused }:
 { packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }:
 
 let
   python = python3.withPackages (p: [ p.requests ]);
 in writeScript "update-${packageName}" ''
+  #!${stdenv.shell}
   set -o errexit
   PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]}
   latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable")
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index 159bad4c68e..d09e45a2d1e 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = ''
+      #!${stdenv.shell}
       cd ${toString ./.}
       ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix
     '';
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index f6d5b7b9b59..7fd80148831 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     cp -r python/bin $out/bin
   '';
   passthru.updateScript = ''
+    #!${stdenv.shell}
     set -e
     echo
     cd ${toString ./.}
diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix
index 9ff11982b65..bf6951dc688 100644
--- a/pkgs/development/web/nodejs/update.nix
+++ b/pkgs/development/web/nodejs/update.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , writeScript
 , coreutils
 , curl
@@ -11,6 +12,7 @@
 }:
 
 writeScript "update-nodejs" ''
+  #!${stdenv.shell}
   PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]}
 
   HOME=`mktemp -d`
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 25eeb889cc2..89c6639748d 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.updateScript = import ./update.nix {
-    inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts;
+    inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts;
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix
index 94eb44b744c..1b6dfd90b1e 100644
--- a/pkgs/os-specific/linux/tp_smapi/update.nix
+++ b/pkgs/os-specific/linux/tp_smapi/update.nix
@@ -1,6 +1,7 @@
-{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
+{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
 
 writeScript "update-tp_smapi" ''
+#!${stdenv.shell}
 PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]}
 
 tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index f5d62b250e2..063c173a401 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -26,6 +26,7 @@ let self = stdenv.mkDerivation rec {
         let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in
         { inherit (impl) augmentedPkgs pins callPackage; };
       updateScript = ''
+        #!${stdenv.shell}
         set -e
         echo
         cd ${toString ./.}
diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
index e7eb497b4b9..7584496f258 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
+{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
 python3Packages.buildPythonApplication rec {
   version = "0.6.3";
   name = "nix-update-source-${version}";
@@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec {
         overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; });
       };
     updateScript = ''
+      #!${stdenv.shell}
       set -e
       echo
       cd ${toString ./.}

From 5ea1bbcf01d0e75b99d1d89a2f7d2881d390f94c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 02:06:04 -0600
Subject: [PATCH 0632/2793] pqiv: 2.10.4 -> 2.11

https://github.com/phillipberndt/pqiv/releases/tag/2.11
---
 pkgs/applications/graphics/pqiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index e4f565b3b05..ec4ce69d5e8 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation (rec {
   name = "pqiv-${version}";
-  version = "2.10.4";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
     rev = version;
-    sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9";
+    sha256 = "06cwm28b7j1skwp21s5snmj1pqh3xh6y2i5v4w3pz0b8k3053h9i";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From da85dee6e213b25051196fe4810192ee862d4006 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 04:23:09 -0600
Subject: [PATCH 0633/2793] aminal: 0.7.4 -> 0.7.5

---
 pkgs/applications/misc/aminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index ebf78be7a08..0fd43d16c63 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "aminal-${version}";
-  version = "0.7.4";
+  version = "0.7.5";
 
   goPackagePath = "github.com/liamg/aminal";
 
@@ -36,7 +36,7 @@ buildGoPackage rec {
     owner = "liamg";
     repo = "aminal";
     rev = "v${version}";
-    sha256 = "0wnzxjlv98pi3gy4hp3d19pwpa4kf1h5rqy03s9bcqdbpb1v1b7v";
+    sha256 = "0q9jgjkf64s0d4izz7q82835yxw200agpdq9kcm0ybmddld3bwkh";
   };
 
   preBuild = ''

From 4c6d2e4f21a8405bda552f99862d64793346b3e8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 02:05:39 -0600
Subject: [PATCH 0634/2793] aminal: 0.7.5 -> 0.7.6

---
 pkgs/applications/misc/aminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 0fd43d16c63..93453cad8ac 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "aminal-${version}";
-  version = "0.7.5";
+  version = "0.7.6";
 
   goPackagePath = "github.com/liamg/aminal";
 
@@ -36,7 +36,7 @@ buildGoPackage rec {
     owner = "liamg";
     repo = "aminal";
     rev = "v${version}";
-    sha256 = "0q9jgjkf64s0d4izz7q82835yxw200agpdq9kcm0ybmddld3bwkh";
+    sha256 = "0fg8k4xzs5nxjggqpn25mia4z8dlpzfk0qzfk503cyx0kfmynxf7";
   };
 
   preBuild = ''

From a523abdfc39c2aaa251a28b1de16d5384e7904e8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 21:03:33 -0600
Subject: [PATCH 0635/2793] tabbed: 20160425 -> 20180310

---
 pkgs/applications/window-managers/tabbed/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 3bb79f6a77d..a9c0f993d77 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tabbed-20160425";
+  name = "tabbed-20180310";
 
   src = fetchgit {
     url = https://git.suckless.org/tabbed;
-    rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164";
-    sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri";
+    rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3";
+    sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss";
   };
 
   inherit patches;

From c4feda8b01e55dc488f9f3f82b65ef044083fdbb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 19:09:06 -0600
Subject: [PATCH 0636/2793] or-tools: v6.9.1 -> v6.10

https://github.com/google/or-tools/releases/tag/v6.10
---
 .../libraries/science/math/or-tools/default.nix   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 5294c779a32..5c142d5f0c8 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "or-tools-${version}";
-  version = "v6.9.1";
+  version = "v6.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = version;
-    sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+    sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
   };
 
   # The original build system uses cmake which does things like pull
@@ -33,17 +33,6 @@ stdenv.mkDerivation rec {
     make install_cc prefix=$out
   '';
 
-  patches = [
-    # In "expected" way of compilation, the glog package is compiled
-    # with gflags support which then makes gflags header transitively
-    # included through glog. However in nixpkgs we don't compile glog
-    # with gflags so we have to include it ourselves. Upstream should
-    # always include gflags to support both ways I think.
-    #
-    # Upstream ticket: https://github.com/google/or-tools/issues/902
-    ./gflags-include.patch
-  ];
-
   nativeBuildInputs = [
     cmake lsb-release which zlib
   ];

From 70c2e88c96ebc7b51a7fc6250c65287c9cba8965 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 19:18:32 -0600
Subject: [PATCH 0637/2793] or-tools: touchup

---
 .../libraries/science/math/or-tools/default.nix          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 5c142d5f0c8..5deaf25f61b 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -25,13 +25,10 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  buildPhase = ''
-    make cc
-  '';
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+  buildFlags = [ "cc" ];
 
-  installPhase = ''
-    make install_cc prefix=$out
-  '';
+  installTargets = [ "install_cc" ];
 
   nativeBuildInputs = [
     cmake lsb-release which zlib

From 046e7980f958189391812a2417a4ad108610635e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 19:20:25 -0600
Subject: [PATCH 0638/2793] or-tools: parallel

---
 pkgs/development/libraries/science/math/or-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 5deaf25f61b..c302d36cf50 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     google-gflags glog protobuf cbc
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/google/or-tools;
     license = licenses.asl20;

From cd14ad53c324b1461d140247f0eb7cdc851a0f98 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 19:46:17 -0600
Subject: [PATCH 0639/2793] or-tools: appease warning re:python3, try testing

---
 .../libraries/science/math/or-tools/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index c302d36cf50..415e57e5d3c 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, google-gflags, which
-, lsb-release, glog, protobuf, cbc, zlib }:
+, lsb-release, glog, protobuf, cbc, zlib, python3 }:
 
 stdenv.mkDerivation rec {
   name = "or-tools-${version}";
@@ -28,10 +28,13 @@ stdenv.mkDerivation rec {
   makeFlags = [ "prefix=${placeholder "out"}" ];
   buildFlags = [ "cc" ];
 
+  checkTarget = "test_cc";
+  doCheck = true;
+
   installTargets = [ "install_cc" ];
 
   nativeBuildInputs = [
-    cmake lsb-release which zlib
+    cmake lsb-release which zlib python3
   ];
   propagatedBuildInputs = [
     google-gflags glog protobuf cbc

From cb73495f0295a7d0571803b00f89a46fc3cd0164 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 1 Dec 2018 20:41:07 +0100
Subject: [PATCH 0640/2793] sagenb: fix matplotlib path

---
 pkgs/applications/science/math/sage/sagenb.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
index 5adfde4388a..bbd403177f3 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -55,6 +55,7 @@ buildPythonPackage rec {
 
   # let sagenb use mathjax
   postInstall = ''
-    ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/mathjax"
+    mkdir -p "$out/${python.sitePackages}/sagenb/data"
+    ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax"
   '';
 }

From 1151a0182d2c5bdf08623388452538dc472e29bc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 13:54:27 -0600
Subject: [PATCH 0641/2793] gecode: 6.0.0 -> 6.1.0

https://github.com/Gecode/gecode/releases/tag/release-6.1.0
---
 pkgs/development/libraries/gecode/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 83ec0edfb49..06bfa282566 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   name = "gecode-${version}";
-  version = "6.0.0";
+  version = "6.1.0";
 
-  src = fetchurl {
-    url = "http://www.gecode.org/download/${name}.tar.gz";
-    sha256 = "0dp7bm6k790jx669y4jr0ffi5cdfpwsqm1ykj2c0zh56jsgs6hfs";
+  src = fetchFromGitHub {
+    owner = "Gecode";
+    repo = "gecode";
+    rev = "release-${version}";
+    sha256 = "1ijjy8ppx7djnkrkawsd00rmlf24qh1z13aap0h1azailw1pbrg4";
   };
 
   enableParallelBuilding = true;

From bf3a98ce04fb0158a6ffa3fad020e4966b7de37a Mon Sep 17 00:00:00 2001
From: Nicolas Schneider <nioncode+git@gmail.com>
Date: Sat, 1 Dec 2018 21:09:33 +0100
Subject: [PATCH 0642/2793] Fix qtbase cmake for gui plugins [Qt 5.6, 5.9]

This is 54377280f0883e35c9389049e0ea9c0a3183750b ported to Qt 5.6 and 5.9
LTS versions.
---
 .../libraries/qt-5/5.6/default.nix            |  2 +-
 .../qt-5/5.6/qtbase-fixguicmake.patch         | 30 +++++++++++++++++++
 .../libraries/qt-5/5.9/default.nix            |  2 +-
 .../qt-5/5.9/qtbase-fixguicmake.patch         | 30 +++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 8732b106134..e815cc8f70f 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -46,7 +46,7 @@ let
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ];
+    qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
new file mode 100644
index 00000000000..8b46d432812
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0bbc871..3673634 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+-        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        set(imported_location \"${PLUGIN_LOCATION}\")
+         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+         set_target_properties(Qt5::${Plugin} PROPERTIES
+             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+index 5baf0fd..3583745 100644
+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+ 
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+ 
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index fbf0001220b..6fcb7a0dc5e 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -38,7 +38,7 @@ let
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
+    qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
new file mode 100644
index 00000000000..8b46d432812
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0bbc871..3673634 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+-        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++        set(imported_location \"${PLUGIN_LOCATION}\")
+         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+         set_target_properties(Qt5::${Plugin} PROPERTIES
+             \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+index 5baf0fd..3583745 100644
+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+ 
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+ 
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

From 303e4d7f1ab711407db72e92c07f64351db701e2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 14:07:37 -0600
Subject: [PATCH 0643/2793] gecode: more deps, build w/gist support but make
 optional

Also rename "gecode_4" attribute since this is version 6?
---
 pkgs/development/libraries/gecode/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 06bfa282566..3a3609f955b 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "gecode-${version}";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ perl ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ perl gmp mpfr ]
+    ++ stdenv.lib.optional enableGist qtbase;
 
   meta = with stdenv.lib; {
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a0611..45f330cbb7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9714,8 +9714,8 @@ with pkgs;
   gdbm = callPackage ../development/libraries/gdbm { };
 
   gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
-  gecode_4 = callPackage ../development/libraries/gecode { };
-  gecode = gecode_4;
+  gecode_6 = qt5.callPackage ../development/libraries/gecode { };
+  gecode = gecode_6;
 
   gephi = callPackage ../applications/science/misc/gephi { };
 

From 0e570199ded1075fe9e491711417c28d02d9b5d4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 1 Dec 2018 21:26:37 +0100
Subject: [PATCH 0644/2793] sage: fix jmol integration

---
 pkgs/applications/science/math/sage/env-locations.nix | 2 +-
 pkgs/applications/science/math/sage/sage-env.nix      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix
index 9d94e9ca5e3..9ec8d5cd83e 100644
--- a/pkgs/applications/science/math/sage/env-locations.nix
+++ b/pkgs/applications/science/math/sage/env-locations.nix
@@ -39,7 +39,7 @@ writeTextFile rec {
     export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
     export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
     export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
-    export JMOL_DIR="${jmol}"
+    export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar
     export JSMOL_DIR="${jmol}/share/jsmol"
     export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
     export THREEJS_DIR="${three}/lib/node_modules/three"
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 725ca043867..c071f894550 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -44,6 +44,7 @@
 , zlib
 , gsl
 , ntl
+, jdk
 }:
 
 # This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -91,6 +92,7 @@ let
     lcalc
     rubiks
     flintqs
+    jdk # only needed for `jmol` which may be replaced in the future
   ]
   ));
 in

From f00b8b028d228dfd602f19a8f935b78d7a9dd265 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 15:02:20 -0600
Subject: [PATCH 0645/2793] gecode: remove maintainer per request

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

diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 3a3609f955b..2d5556b3502 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gecode.org;
     description = "Toolkit for developing constraint-based systems";
     platforms = platforms.all;
-    maintainers = [ maintainers.manveru ];
+    maintainers = [ ];
   };
 }

From 2256273c6b453f626e7f4fd1317b9b332b45db6a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Dec 2018 17:09:05 -0500
Subject: [PATCH 0646/2793] fedpkg: add fedora_cert as dependency

[1: 1b9fd365819] Removed fedora_cert from nixpkgs, but fedpkg 1.29 still
it required at runtime.

1: 1b9fd36581951b8a8c51e6e1cc792c1589135717
   fedora_cert: remove package
---
 pkgs/development/tools/fedpkg/default.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index 7c82dc9d32a..5548b20de83 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, buildPythonApplication, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
 
-buildPythonApplication rec {
+let
+  fedora_cert = buildPythonPackage rec {
+    name = "fedora-cert";
+    version = "0.6.0.2";
+    format = "other";
+
+    src = fetchurl {
+      url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
+      sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
+    };
+    propagatedBuildInputs = [ python_fedora pyopenssl ];
+    doCheck = false;
+  };
+in buildPythonApplication rec {
   pname = "fedpkg";
   version = "1.29";
 
@@ -11,9 +24,7 @@ buildPythonApplication rec {
     sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
   };
   patches = [ ./fix-paths.patch ];
-  propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
-
-  doCheck = false; # requires fedora_cert which isn't used anymore
+  propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
 
   meta = with stdenv.lib; {
     description = "Subclass of the rpkg project for dealing with rpm packaging";

From 7041972128a5192640fada3abe38b4ae1cf8b99c Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Sun, 2 Dec 2018 08:25:40 +1000
Subject: [PATCH 0647/2793] scilab-bin: adding bin/scilab symlink (#51346)

Should fix #51343, merely adding a scilab symlink within the bin/ directory, so that it can be detected by SageMath.
---
 pkgs/applications/science/math/scilab-bin/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 54b262fe505..4b143ed8243 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
     cp -r . "$out/opt/scilab-${ver}/"
     mkdir "$out/bin"
     ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab-${ver}"
+    ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab"
     ln -s "scilab-${ver}" "$out/bin/scilab-${majorVer}"
   '';
 

From 9cd4ce98bfc11292fbebc6b85d14bb386e82c9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 12 Nov 2018 20:34:19 +0100
Subject: [PATCH 0648/2793] nixos/luksroot: Check whether the device already
 exists

The new reuse behaviour is cool and really useful but it breaks one of
my use cases. When using kexec, I have a script which will unlock the
disks in my initrd. However, do_open_passphrase will fail if the disk is
already unlocked.
---
 nixos/modules/system/boot/luksroot.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 018e7b2e7f8..ff3f2a1398a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -118,6 +118,11 @@ let
     do_open_passphrase() {
         local passphrase
 
+        # Return if already unlocked
+        if ! cryptsetup status "${name}" > /dev/null; then
+          return
+        fi
+
         while true; do
             echo -n "Passphrase for ${device}: "
             passphrase=

From 6ca50c3deb65eef9f9f0a91e82ddc0e17cc0115a Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sat, 1 Dec 2018 23:47:39 +0100
Subject: [PATCH 0649/2793] bisect_ppx-ocamlbuild: Propagate ocamlbuild

---
 .../development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index 602956ee760..fd3e7d58ae3 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -3,5 +3,5 @@
 buildDunePackage rec {
   inherit (bisect_ppx) version src meta;
   pname = "bisect_ppx-ocamlbuild";
-  buildInputs = [ ocamlbuild ];
+  propagatedBuildInputs = [ ocamlbuild ];
 }

From 35f6d1cda44842e07373824041feb2f27b3fa373 Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sat, 1 Dec 2018 19:51:49 +0100
Subject: [PATCH 0650/2793] loop: init at unstable-2018-10-02

---
 pkgs/tools/misc/loop/default.nix          | 24 +++++++++++++++++++++++
 pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ++++++++++++
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/misc/loop/default.nix
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
new file mode 100644
index 00000000000..f86f3041aba
--- /dev/null
+++ b/pkgs/tools/misc/loop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "loop-unstable-2018-10-02";
+  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
+
+  src = fetchFromGitHub {
+    owner = "Miserlou";
+    repo  = "Loop";
+    rev   = version;
+    sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
+  };
+
+  cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
+
+  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+
+  meta = with stdenv.lib; {
+    description = "UNIX's missing `loop` command";
+    homepage = https://github.com/Miserlou/Loop;
+    maintainers = with maintainers; [ koral ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch
new file mode 100644
index 00000000000..f991a604f33
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_lock.patch
@@ -0,0 +1,12 @@
+diff --git a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+
+ [[package]]
+ name = "loop-rs"
+-version = "0.3.5"
++version = "0.4.0"
+ dependencies = [
+  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
new file mode 100644
index 00000000000..b95afac470f
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_toml.patch
@@ -0,0 +1,18 @@
+diff --git a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -15,9 +15,9 @@ license = "MIT"
+-structopt = "0.2" 
++structopt = "0.2.10" 
+ humantime = "1.1.1"
+-atty = "0.2"
++atty = "0.2.11"
+-regex = "1.0.0"
++regex = "1.0.5"
+-subprocess = "0.1.12"
++subprocess = "0.1.14"
+-tempfile = "3.0.3"
++tempfile = "3.0.4"
+ 
+ [[bin]]
+ name = "loop"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719ff9a5d6b..ca4312349ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22118,6 +22118,8 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
+  loop = callPackage ../tools/misc/loop { };
+
   mailcore2 = callPackage ../development/libraries/mailcore2 {
     icu = icu58;
   };

From 0d2355d7e37ec5ea87cad880d27626b89fafe36d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 1 Dec 2018 23:56:01 +0100
Subject: [PATCH 0651/2793] minecraft: Fix versions <1.13

---
 pkgs/games/minecraft/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 76edc512b0e..32830d6f3d0 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper
-, jdk, jre, libpulseaudio
+, jdk, jre, libpulseaudio, libXxf86vm
 }:
 
 let
@@ -13,6 +13,11 @@ let
     categories = "Game;";
   };
 
+  libPath = stdenv.lib.makeLibraryPath [
+    libpulseaudio
+    libXxf86vm # Needed only for versions <1.13
+  ];
+
 in stdenv.mkDerivation {
   name = "minecraft-2015-07-24";
 
@@ -30,7 +35,7 @@ in stdenv.mkDerivation {
 
     makeWrapper ${jre}/bin/java $out/bin/minecraft \
       --add-flags "-jar $out/share/minecraft/minecraft.jar" \
-      --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
+      --suffix LD_LIBRARY_PATH : ${libPath}
 
     cp $src $out/share/minecraft/minecraft.jar
     cp -r ${desktopItem}/share/applications $out/share

From 30f090ff7b3bc35dc36ae2d47ff96a022af5f25d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 00:50:37 +0100
Subject: [PATCH 0652/2793] gnome3.updateScript: reuse gnome-update-script

---
 pkgs/desktops/gnome-3/update.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix
index 216ae9cb8b3..2ee72d46993 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome-3/update.nix
@@ -3,10 +3,14 @@
 
 let
   python = python3.withPackages (p: [ p.requests ]);
-in writeScript "update-${packageName}" ''
-  #!${stdenv.shell}
-  set -o errexit
-  PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]}
-  latest_tag=$(python "${./find-latest-version.py}" "${packageName}" "${versionPolicy}" "stable")
-  update-source-version "${attrPath}" "$latest_tag"
-''
+  updateScript = writeScript "gnome-update-script" ''
+    #!${stdenv.shell}
+    set -o errexit
+    package_name="$1"
+    attr_path="$2"
+    version_policy="$3"
+    PATH=${lib.makeBinPath [ common-updater-scripts coreutils gnugrep gnused python ]}
+    latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable")
+    update-source-version "$attr_path" "$latest_tag"
+  '';
+in [ updateScript packageName attrPath versionPolicy ]

From 2d7c6d088e395cff0c158a683b52f7f95548cccd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 16:46:55 -0600
Subject: [PATCH 0653/2793] sqlite: 3.25.3 -> 3.26.0

---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 pkgs/development/libraries/sqlite/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index f3d69f09444..0a63f5e778a 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.25.3";
+  version = "3.26.0";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7";
+    sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index c98164ae63b..100f7fec06a 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.25.3";
+  version = "3.26.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0";
+    sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx";
   };
 
   outputs = [ "bin" "dev" "out" ];

From c154ecfc3841fb6693b6e1585da2afb16bf8e8cd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Dec 2018 17:34:28 -0500
Subject: [PATCH 0654/2793] vdirsyncer: fix build

- Add support for build on darwin
---
 pkgs/tools/misc/vdirsyncer/default.nix | 19 +++++++++++++++++--
 pkgs/top-level/all-packages.nix        |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index c273ef87968..49583ee2890 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }:
+{ stdenv, python3Packages, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, Security }:
 
 # Packaging documentation at:
 # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
@@ -16,7 +16,7 @@ let
     inherit src;
     sourceRoot = name + "/rust";
     cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q";
-    buildInputs = [ pkgconfig openssl ];
+    buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
   };
 in pythonPackages.buildPythonApplication rec {
   inherit version pname src native;
@@ -35,6 +35,21 @@ in pythonPackages.buildPythonApplication rec {
 
   checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ];
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/80a42e4c6c18ca4db737bc6700c50a3866832bbb.patch;
+      sha256 = "1vrhn0ma3y08w6f5abhl3r5rq30g60h1bp3wmyszw909hyvyzp5l";
+    })
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch;
+      sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
+    })
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch;
+      sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80";
+    })
+  ];
+
   postPatch = ''
     sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a0611..baf74815715 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19502,7 +19502,9 @@ with pkgs;
 
   vcv-rack = callPackage ../applications/audio/vcv-rack { };
 
-  vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
+  vdirsyncer = callPackage ../tools/misc/vdirsyncer {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 

From 4226ddc0340cd492ee46f840c21b407bc229cadb Mon Sep 17 00:00:00 2001
From: John Boehr <john@johnboehr.is>
Date: Mon, 9 Apr 2018 18:16:33 -0700
Subject: [PATCH 0655/2793] nixos/cockroachdb: create new service

This also includes a full end-to-end CockroachDB clustering test to
ensure everything basically works. However, this test is not currently
enabled by default, though it can be run manually. See the included
comments in the test for more information.

Closes #51306. Closes #38665.

Co-authored-by: Austin Seipp <aseipp@pobox.com>
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/databases/cockroachdb.nix        | 221 ++++++++++++++++++
 nixos/tests/cockroachdb.nix                   | 126 ++++++++++
 4 files changed, 350 insertions(+)
 create mode 100644 nixos/modules/services/databases/cockroachdb.nix
 create mode 100644 nixos/tests/cockroachdb.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c368cd91186..d9ba2efa0c8 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -337,6 +337,7 @@
       alerta = 310;
       minetest = 311;
       rss2email = 312;
+      cockroachdb = 313;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -634,6 +635,7 @@
       alerta = 310;
       minetest = 311;
       rss2email = 312;
+      cockroachdb = 313;
 
       # 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 75e8446523f..7a6fbab7c36 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -212,6 +212,7 @@
   ./services/databases/aerospike.nix
   ./services/databases/cassandra.nix
   ./services/databases/clickhouse.nix
+  ./services/databases/cockroachdb.nix
   ./services/databases/couchdb.nix
   ./services/databases/firebird.nix
   ./services/databases/foundationdb.nix
diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix
new file mode 100644
index 00000000000..1bc20a25804
--- /dev/null
+++ b/nixos/modules/services/databases/cockroachdb.nix
@@ -0,0 +1,221 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.cockroachdb;
+  crdb = cfg.package;
+
+  escape    = builtins.replaceStrings ["%"] ["%%"];
+  ifNotNull = v: s: optionalString (!isNull v) s;
+
+  startupCommand = lib.concatStringsSep " "
+    [ # Basic startup
+      "${crdb}/bin/cockroach start"
+      "--logtostderr"
+      "--store=${cfg.dataDir}"
+      (ifNotNull cfg.locality "--locality='${cfg.locality}'")
+
+      # WebUI settings
+      "--http-addr='${cfg.http.address}:${toString cfg.http.port}'"
+
+      # Cluster listen address
+      "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'"
+
+      # Cluster configuration
+      (ifNotNull cfg.join "--join=${cfg.join}")
+
+      # Cache and memory settings. Must be escaped.
+      "--cache='${escape cfg.cache}'"
+      "--max-sql-memory='${escape cfg.maxSqlMemory}'"
+
+      # Certificate/security settings.
+      (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}")
+    ];
+
+    addressOption = descr: defaultPort: {
+      address = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "Address to bind to for ${descr}";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = defaultPort;
+        description = "Port to bind to for ${descr}";
+      };
+    };
+in
+
+{
+  options = {
+    services.cockroachdb = {
+      enable = mkEnableOption "CockroachDB Server";
+
+      listen = addressOption "intra-cluster communication" 26257;
+
+      http = addressOption "http-based Admin UI" 8080;
+
+      locality = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          An ordered, comma-separated list of key-value pairs that describe the
+          topography of the machine. Topography might include country,
+          datacenter or rack designations. Data is automatically replicated to
+          maximize diversities of each tier. The order of tiers is used to
+          determine the priority of the diversity, so the more inclusive
+          localities like country should come before less inclusive localities
+          like datacenter.  The tiers and order must be the same on all nodes.
+          Including more tiers is better than including fewer. For example:
+
+              country=us,region=us-west,datacenter=us-west-1b,rack=12
+              country=ca,region=ca-east,datacenter=ca-east-2,rack=4
+
+              planet=earth,province=manitoba,colo=secondary,power=3
+        '';
+      };
+
+      join = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "The addresses for connecting the node to a cluster.";
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/cockroachdb";
+        description = "Location where CockroachDB stores its table files";
+      };
+
+      insecure = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Run in insecure mode.";
+      };
+
+      certsDir = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "The path to the certificate directory.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "cockroachdb";
+        description = "User account under which CockroachDB runs";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "cockroachdb";
+        description = "User account under which CockroachDB runs";
+      };
+
+      openPorts = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Open firewall ports for cluster communication by default";
+      };
+
+      cache = mkOption {
+        type = types.str;
+        default = "25%";
+        description = ''
+          The total size for caches.
+
+          This can be a percentage, expressed with a fraction sign or as a
+          decimal-point number, or any bytes-based unit. For example, "25%",
+          "0.25" both represent 25% of the available system memory. The values
+          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+        '';
+      };
+
+      maxSqlMemory = mkOption {
+        type = types.str;
+        default = "25%";
+        description = ''
+          The maximum in-memory storage capacity available to store temporary
+          data for SQL queries.
+
+          This can be a percentage, expressed with a fraction sign or as a
+          decimal-point number, or any bytes-based unit. For example, "25%",
+          "0.25" both represent 25% of the available system memory. The values
+          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.cockroachdb;
+        description = ''
+          The CockroachDB derivation to use for running the service.
+          
+          This would primarily be useful to enable Enterprise Edition features
+          in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
+          only contain open source features and open source code).
+        '';
+      };
+    };
+  };
+
+  config = mkIf config.services.cockroachdb.enable {
+    assertions = [
+      { assertion = !cfg.insecure -> !(isNull cfg.certsDir);
+        message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)";
+      }
+    ];
+
+    environment.systemPackages = [ crdb ];
+
+    users.users = optionalAttrs (cfg.user == "cockroachdb") (singleton
+      { name        = "cockroachdb";
+        description = "CockroachDB Server User";
+        uid         = config.ids.uids.cockroachdb;
+        group       = cfg.group;
+      });
+
+    users.groups = optionalAttrs (cfg.group == "cockroachdb") (singleton
+      { name = "cockroachdb";
+        gid  = config.ids.gids.cockroachdb;
+      });
+
+    networking.firewall.allowedTCPPorts = lib.optionals cfg.openPorts
+      [ cfg.http.port cfg.listen.port ];
+
+    systemd.services.cockroachdb =
+      { description   = "CockroachDB Server";
+        documentation = [ "man:cockroach(1)" "https://www.cockroachlabs.com" ];
+
+        after    = [ "network.target" "time-sync.target" ];
+        requires = [ "time-sync.target" ];
+        wantedBy = [ "multi-user.target" ];
+
+        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
+
+        preStart = ''
+          if ! test -e ${cfg.dataDir}; then
+            mkdir -m 0700 -p ${cfg.dataDir}
+            chown -R ${cfg.user} ${cfg.dataDir}
+          fi
+        '';
+
+        serviceConfig =
+          { ExecStart = startupCommand;
+            Type = "notify";
+            User = cfg.user;
+            PermissionsStartOnly = true;
+
+            Restart = "always";
+            TimeoutStopSec="60";
+            RestartSec="10";
+            StandardOutput="syslog";
+            StandardError="syslog";
+            SyslogIdentifier="cockroach";
+          };
+      };
+  };
+
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+}
diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix
new file mode 100644
index 00000000000..56c624d8cf2
--- /dev/null
+++ b/nixos/tests/cockroachdb.nix
@@ -0,0 +1,126 @@
+# This performs a full 'end-to-end' test of a multi-node CockroachDB cluster
+# using the built-in 'cockroach workload' command, to simulate a semi-realistic
+# test load. It generally takes anywhere from 3-5 minutes to run and 1-2GB of
+# RAM (though each of 3 workers gets 1GB allocated)
+#
+# CockroachDB requires synchronized system clocks within a small error window
+# (~500ms by default) on each node in order to maintain a multi-node cluster.
+# Cluster joins that are outside this window will fail, and nodes that skew
+# outside the window after joining will promptly get kicked out.
+#
+# To accomodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
+# driver inside a guest. This driver allows the host machine to pass its clock
+# through to the guest as a hardware clock that appears as a Precision Time
+# Protocol (PTP) Clock device, generally /dev/ptp0. PTP devices can be measured
+# and used as hardware reference clocks (similar to an on-board GPS clock) by
+# NTP software. In our case, we use Chrony to synchronize to the reference
+# clock.
+#
+# This test is currently NOT enabled as a continuously-checked NixOS test.
+# Ideally, this test would be run by Hydra and Borg on all relevant changes,
+# except:
+#
+#   - Not every build machine is compatible with the ptp_kvm driver.
+#     Virtualized EC2 instances, for example, do not support loading the ptp_kvm
+#     driver into guests. However, bare metal builders (e.g. Packet) do seem to
+#     work just fine. In practice, this means x86_64-linux builds would fail
+#     randomly, depending on which build machine got the job. (This is probably
+#     worth some investigation; I imagine it's based on ptp_kvm's usage of paravirt
+#     support which may not be available in 'nested' environments.)
+#
+#   - ptp_kvm is not supported on aarch64, otherwise it seems likely Cockroach
+#     could be tested there, as well. This seems to be due to the usage of
+#     the TSC in ptp_kvm, which isn't supported (easily) on AArch64. (And:
+#     testing stuff, not just making sure it builds, is important to ensure
+#     aarch64 support remains viable.)
+#
+# For future developers who are reading this message, are daring and would want
+# to fix this, some options are:
+#
+#   - Just test a single node cluster instead (boring and less thorough).
+#   - Move all CI to bare metal packet builders, and we can at least do x86_64-linux.
+#   - Get virtualized clocking working in aarch64, somehow.
+#   - Add a 4th node that acts as an NTP service and uses no PTP clocks for
+#     references, at the client level. This bloats the node and memory
+#     requirements, but would probably allow both aarch64/x86_64 to work.
+#
+
+let
+
+  # Creates a node. If 'joinNode' parameter, a string containing an IP address,
+  # is non-null, then the CockroachDB server will attempt to join/connect to
+  # the cluster node specified at that address.
+  makeNode = locality: myAddr: joinNode:
+    { nodes, pkgs, lib, config, ... }:
+
+    {
+      # Bank/TPC-C benchmarks take some memory to complete
+      virtualisation.memorySize = 1024;
+
+      # Install the KVM PTP "Virtualized Clock" driver. This allows a /dev/ptp0
+      # device to appear as a reference clock, synchronized to the host clock.
+      # Because CockroachDB *requires* a time-synchronization mechanism for
+      # the system time in a cluster scenario, this is necessary to work.
+      boot.kernelModules = [ "ptp_kvm" ];
+
+      # Enable and configure Chrony, using the given virtualized clock passed
+      # through by KVM.
+      services.chrony.enable = true;
+      services.chrony.servers = lib.mkForce [ ];
+      services.chrony.extraConfig = ''
+        refclock PHC /dev/ptp0 poll 2 prefer require refid KVM
+        makestep 0.1 3
+      '';
+
+      # Enable CockroachDB. In order to ensure that Chrony has performed its
+      # first synchronization at boot-time (which may take ~10 seconds) before
+      # starting CockroachDB, we block the ExecStartPre directive using the
+      # 'waitsync' command. This ensures Cockroach doesn't have its system time
+      # leap forward out of nowhere during startup/execution.
+      #
+      # Note that the default threshold for NTP-based skew in CockroachDB is
+      # ~500ms by default, so making sure it's started *after* accurate time
+      # synchronization is extremely important.
+      services.cockroachdb.enable = true;
+      services.cockroachdb.insecure = true;
+      services.cockroachdb.openPorts = true;
+      services.cockroachdb.locality = locality;
+      services.cockroachdb.listen.address = myAddr;
+      services.cockroachdb.join = lib.mkIf (joinNode != null) joinNode;
+
+      # Hold startup until Chrony has performed its first measurement (which
+      # will probably result in a full timeskip, thanks to makestep)
+      systemd.services.cockroachdb.preStart = ''
+        ${pkgs.chrony}/bin/chronyc waitsync
+      '';
+    };
+
+in import ./make-test.nix ({ pkgs, ...} : {
+  name = "cockroachdb";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers;
+    [ thoughtpolice ];
+
+  nodes = rec {
+    node1 = makeNode "country=us,region=east,dc=1"  "192.168.1.1" null;
+    node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
+    node3 = makeNode "country=eu,region=west,dc=2"  "192.168.1.3" "192.168.1.1";
+  };
+
+  # NOTE: All the nodes must start in order and you must NOT use startAll, because
+  # there's otherwise no way to guarantee that node1 will start before the others try
+  # to join it.
+  testScript = ''
+    $node1->start;
+    $node1->waitForUnit("cockroachdb");
+
+    $node2->start;
+    $node2->waitForUnit("cockroachdb");
+
+    $node3->start;
+    $node3->waitForUnit("cockroachdb");
+
+    $node1->mustSucceed("cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1");
+    $node1->mustSucceed("cockroach workload init bank 'postgresql://root\@192.168.1.1:26257?sslmode=disable'");
+    $node1->mustSucceed("cockroach workload run bank --duration=1m 'postgresql://root\@192.168.1.1:26257?sslmode=disable'");
+  '';
+})

From 77255a3cd71d226e7845b7db387c704f833e78cb Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 1 Dec 2018 06:13:42 +0000
Subject: [PATCH 0656/2793] xfsprogs: 4.14.0 -> 4.19.0

xfsprogs started using icu in bff5d1a4e8df8a23957e5739850754991ad2b9c8, part of v4.16.0

xfsprogs-4.15.0-docdir.patch is needed to avoid cyclic references in the outputs.

./glibc-2.27.patch is no longer necessary as it was included in xfsprogs 8041435de7ed028a27ecca64302945ad455c69a6
---
 pkgs/tools/filesystems/xfsprogs/default.nix   | 17 +++---
 .../filesystems/xfsprogs/glibc-2.27.patch     | 53 -------------------
 2 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index d38e26edec6..2894ddf28dd 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,36 +1,35 @@
-{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }:
+{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux, pkgconfig, icu }:
 
 let
   gentooPatch = name: sha256: fetchpatch {
-    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=f4055adc94e11d182033a71e32f97b357c034aff";
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=2517dd766cf84d251631f4324f7ec4bce912abb9";
     inherit sha256;
   };
 in
 
 stdenv.mkDerivation rec {
   name = "xfsprogs-${version}";
-  version = "4.14.0";
+  version = "4.19.0";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
     rev = "v${version}";
-    sha256 = "19mg3avm188xz215hqbbh7251q27qwm7g1xr8ffrjwvzmdq55rxj";
+    sha256 = "18728hzfxr1bg4bdzqlxjs893ac1zwlfr7nmc2q4a1sxs0sphd1d";
   };
 
   outputs = [ "bin" "dev" "out" "doc" ];
 
-  nativeBuildInputs = [ autoconf automake libtool gettext ];
+  nativeBuildInputs = [ autoconf automake libtool gettext pkgconfig ];
   propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h>
-  buildInputs = [ readline ];
+  buildInputs = [ readline icu ];
 
   enableParallelBuilding = true;
 
   # Why is all this garbage needed? Why? Why?
   patches = [
-    (gentooPatch "xfsprogs-4.12.0-sharedlibs.patch" "1i081749x91jvlrw84l4a3r081vqcvn6myqhnqbnfcfhd64h12bq")
-    (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s")
+    (gentooPatch "xfsprogs-4.15.0-sharedlibs.patch" "0bv2naxpiw7vcsg8p1v2i47wgfda91z1xy1kfwydbp4wmb4nbyyv")
+    (gentooPatch "xfsprogs-4.15.0-docdir.patch" "1srgdidvq2ka0rmfdwpqp92fapgh53w1h7rajm4nnby5vp2v8dfr")
     (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7")
-    ./glibc-2.27.patch
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch
deleted file mode 100644
index 1f398b1daa8..00000000000
--- a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8041435de7ed028a27ecca64302945ad455c69a6 Mon Sep 17 00:00:00 2001
-From: "Darrick J. Wong" <darrick.wong@oracle.com>
-Date: Mon, 5 Feb 2018 14:38:02 -0600
-Subject: xfs_io: fix copy_file_range symbol name collision
-
-glibc 2.27 has a copy_file_range wrapper, so we need to change our
-internal function out of the way to avoid compiler warnings.
-
-Reported-by: fredrik@crux.nu
-Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-Reviewed-by: Eric Sandeen <sandeen@redhat.com>
-Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
----
- io/copy_file_range.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/io/copy_file_range.c b/io/copy_file_range.c
-index d1dfc5a..99fba20 100644
---- a/io/copy_file_range.c
-+++ b/io/copy_file_range.c
-@@ -42,13 +42,18 @@ copy_range_help(void)
- "));
- }
- 
-+/*
-+ * Issue a raw copy_file_range syscall; for our test program we don't want the
-+ * glibc buffered copy fallback.
-+ */
- static loff_t
--copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
-+copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
- {
- 	loff_t ret;
- 
- 	do {
--		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
-+		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
-+				len, 0);
- 		if (ret == -1) {
- 			perror("copy_range");
- 			return errno;
-@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
- 		copy_dst_truncate();
- 	}
- 
--	ret = copy_file_range(fd, &src, &dst, len);
-+	ret = copy_file_range_cmd(fd, &src, &dst, len);
- 	close(fd);
- 	return ret;
- }
--- 
-cgit v1.1
-

From d23acab3a365eb0f620c0849a3ffb8b6c72f8a4d Mon Sep 17 00:00:00 2001
From: Magnus Jonsson <jmagnusj@gmail.com>
Date: Sun, 25 Nov 2018 11:49:24 -0500
Subject: [PATCH 0657/2793] ocamlPackages.opti: init at 1.0.3

---
 maintainers/maintainer-list.nix                |  5 +++++
 .../development/ocaml-modules/opti/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix              |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/opti/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 87c144f0d42..6c6a57d341f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2052,6 +2052,11 @@
     github = "jluttine";
     name = "Jaakko Luttinen";
   };
+  jmagnusj = {
+    email = "jmagnusj@gmail.com";
+    github = "magnusjonsson";
+    name = "Johan Magnus Jonsson";
+  };
   jmettes = {
     email = "jonathan@jmettes.com";
     github = "jmettes";
diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix
new file mode 100644
index 00000000000..7b084e61688
--- /dev/null
+++ b/pkgs/development/ocaml-modules/opti/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, buildDunePackage }:
+
+buildDunePackage rec {
+  pname = "opti";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz";
+    sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e";
+  };
+
+  meta = with stdenv.lib; {
+    description = "DSL to generate fast incremental C code from declarative specifications";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jmagnusj ];
+    homepage = https://github.com/magnusjonsson/opti;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index cf06b52c5ba..dfe90b34b4c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -552,6 +552,8 @@ let
 
     opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };
 
+    opti = callPackage ../development/ocaml-modules/opti { };
+
     otfm = callPackage ../development/ocaml-modules/otfm { };
 
     otr = callPackage ../development/ocaml-modules/otr { };

From 47f57712474944065d6bc562680400f159b58b1b Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 1 Dec 2018 07:35:47 +0000
Subject: [PATCH 0658/2793] libtorrentRasterbar: 1.1.10 -> 1.1.11

---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 6b5182fa992..cd8192e34fb 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.10";
+  version = "1.1.11";
   formattedVersion = lib.replaceChars ["."] ["_"] version;
 
   # Make sure we override python, so the correct version is chosen
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "libtorrent-${formattedVersion}";
-    sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms";
+    rev = "libtorrent_${formattedVersion}";
+    sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
   };
 
   enableParallelBuilding = true;

From 0b695faa07c8a01da2ffeaee40577dcfdfd98ed8 Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Wed, 28 Nov 2018 12:44:42 +0300
Subject: [PATCH 0659/2793] xfsprogs: fix cross compilation

---
 pkgs/tools/filesystems/xfsprogs/default.nix | 12 +++++++++---
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index d38e26edec6..0a6cc4f03fd 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }:
+{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline
+, buildPackages, libuuid
+}:
 
 let
   gentooPatch = name: sha256: fetchpatch {
@@ -19,8 +21,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "doc" ];
 
-  nativeBuildInputs = [ autoconf automake libtool gettext ];
-  propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h>
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [
+    autoconf automake libtool gettext
+    libuuid # codegen tool uses libuuid
+  ];
+  propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
   buildInputs = [ readline ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7104b05f26e..a06c5374450 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6303,7 +6303,7 @@ with pkgs;
     gnome_python = gnome2.gnome_python;
   };
 
-  xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; };
+  xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
   libxfs = xfsprogs.dev;
 
   xml2 = callPackage ../tools/text/xml/xml2 { };

From 458abdc9c47f2723727c2a6f994bbf9344c20ef2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 19:46:50 -0600
Subject: [PATCH 0660/2793] aminal: 0.7.6 -> 0.7.8

---
 pkgs/applications/misc/aminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 93453cad8ac..77f758394e5 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "aminal-${version}";
-  version = "0.7.6";
+  version = "0.7.8";
 
   goPackagePath = "github.com/liamg/aminal";
 
@@ -36,7 +36,7 @@ buildGoPackage rec {
     owner = "liamg";
     repo = "aminal";
     rev = "v${version}";
-    sha256 = "0fg8k4xzs5nxjggqpn25mia4z8dlpzfk0qzfk503cyx0kfmynxf7";
+    sha256 = "02gamvvs56w4zwqdvalbsgb2gbh0398gl7qk36pgyqkcgj3bcwv8";
   };
 
   preBuild = ''

From 011c890a62fe4db4d4bb239ce232442bfc541715 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 22:25:55 -0600
Subject: [PATCH 0661/2793] nss: generate url from version (doesn't change
 derivation hash)

Makes future upgrades easier...
---
 pkgs/development/libraries/nss/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index e559b9a076a..4e6911058de 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,13 +5,15 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
+  version = "3.40";
+  underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.40";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_40_RTM/src/${name}.tar.gz";
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
     sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
   };
 

From e1adb093b761681da830d3ed0a4a9f832f30c31f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 22:27:13 -0600
Subject: [PATCH 0662/2793] nss: 3.40 -> 3.40.1

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 4e6911058de..4d48ae0b12b 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
-  version = "3.40";
+  version = "3.40.1";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
-    sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
+    sha256 = "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy";
   };
 
   buildInputs = [ perl zlib sqlite ]

From d250c9fc4cb9413e6ad5034216fb7ef50a0845f6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 23:10:39 -0600
Subject: [PATCH 0663/2793] libwebp: 1.0.0 -> 1.0.1

https://github.com/webmproject/libwebp/releases/tag/v1.0.1

Also:

https://groups.google.com/a/webmproject.org/d/msg/webp-discuss/gXMAt-IYpiQ/AuPEJGq6AQAJ

(that post announces -rc2, next post after explains this is now 1.0.1)
---
 pkgs/development/libraries/libwebp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 8cd0536e294..0e8533a5639 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
-    sha256 = "0nr2hd4iv61fphdbx49g96a56jkmdm9n2qss7jpkg1pii11rq9c4";
+    sha256 = "08nr124aqlfpmdawpfizp56x93pvhr0v741fz78s1zyv49a4lx4c";
   };
 
   configureFlags = [

From 02282130d095056e6f0096344144314651a917c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 23:29:28 -0600
Subject: [PATCH 0664/2793] yubikey-manager: 1.0.0 -> 1.0.1

https://developers.yubico.com/yubikey-manager/Release_Notes.html

https://github.com/Yubico/yubikey-manager/releases/tag/yubikey-manager-1.0.1
---
 pkgs/tools/misc/yubikey-manager/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 140e322c862..5b96b7c18fc 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-1.0.0";
+  name = "yubikey-manager-1.0.1";
 
   srcs = fetchurl {
     url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
-    sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd";
+    sha256 = "0i7w1f89hqlw7g800fjhbb6yvq9wjmj5d7w7p6v8bkyvk645v48z";
   };
 
   propagatedBuildInputs =
@@ -40,6 +40,7 @@ pythonPackages.buildPythonPackage rec {
   meta = with lib; {
     homepage = https://developers.yubico.com/yubikey-manager;
     description = "Command line tool for configuring any YubiKey over all USB transports.";
+
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ benley ];

From a4adec8654fa2b1f33c3217acb4f87271d04ae70 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 23:39:44 -0600
Subject: [PATCH 0665/2793] v4l_utils: 1.16.0 -> 1.16.2

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

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index f586ea50398..2a9d42988b5 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -8,18 +8,18 @@
 
 stdenv.mkDerivation rec {
   name = "v4l-utils-${version}";
-  version = "1.16.0";
+  version = "1.16.2";
 
   src = fetchurl {
     url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
-    sha256 = "1b8bx9zfaw0crjkfh0wwyixbv4683mkw0cb3nxwc7fl489c2bd7i";
+    sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc";
   };
 
   outputs = [ "out" "dev" ];
 
   configureFlags =
     if withUtils then [
-      "--with-udevdir=\${out}/lib/udev"
+      "--with-udevdir=${placeholder "out"}/lib/udev"
     ] else [
       "--disable-v4l-utils"
     ];

From d7118788a4edd36531d780462fd3e14618217eb1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Dec 2018 23:44:13 -0600
Subject: [PATCH 0666/2793] live555: 2018.10.17 -> 2018.11.26

http://lists.live555.com/pipermail/live-devel/2018-November/021099.html

Also add videolan as alternative hosting since can't use official...
---
 pkgs/development/libraries/live555/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 527a0d0705d..6463f83d282 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -3,11 +3,14 @@
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 stdenv.mkDerivation rec {
   name = "live555-${version}";
-  version = "2018.10.17";
+  version = "2018.11.26";
 
   src = fetchurl { # the upstream doesn't provide a stable URL
-    url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz";
-    sha256 = "1s69ipvdc6ldscp0cr1zpsll8xc3qcagr95nl84x7b1rbg4xjs3w";
+    urls = [
+      "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
+      "https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
+    ];
+    sha256 = "0izvy50xmyycrl7aj43kj1w9k8lcsmdqwwqk1cdizmc4wmj56f5k";
   };
 
   postPatch = ''

From 02b1a4ab759bdb9ab2fa1020dad6d2d214eb4c7d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 2 Dec 2018 00:17:37 -0600
Subject: [PATCH 0667/2793] s-tui: 0.8.2 -> 0.8.3

https://github.com/amanusk/s-tui/releases/tag/v0.8.3

Drop patch, including it was the reason for this release :).
---
 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 35a26eb7dae..5d4ed355ba9 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.8.2";
+  version = "0.8.3";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh";
+    sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 8776ceafc3ccd29bc35b73248a0c9009aceafeda Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 1 Dec 2018 22:27:52 -0500
Subject: [PATCH 0668/2793] solargraph: 0.28.2 -> 0.29.1

---
 .../ruby-modules/solargraph/Gemfile.lock      | 18 +++++------
 .../ruby-modules/solargraph/default.nix       |  6 ++--
 .../ruby-modules/solargraph/gemset.nix        | 30 +++++++------------
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index 5c1db601988..a936dd25d92 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -2,7 +2,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    coderay (1.1.2)
     eventmachine (1.2.7)
     htmlentities (4.3.4)
     jaro_winkler (1.5.1)
@@ -11,34 +10,33 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    solargraph (0.28.2)
-      coderay (~> 1.1)
+    solargraph (0.29.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
       kramdown (~> 1.16)
-      parser (~> 2.4)
+      parser (~> 2.3)
       reverse_markdown (~> 1.0, >= 1.0.5)
       rubocop (~> 0.52)
       thor (~> 0.19, >= 0.19.4)
       tilt (~> 2.0)
       yard (~> 0.9)
-    thor (0.20.0)
-    tilt (2.0.8)
+    thor (0.20.3)
+    tilt (2.0.9)
     unicode-display_width (1.4.0)
     yard (0.9.16)
 
@@ -49,4 +47,4 @@ DEPENDENCIES
   solargraph!
 
 BUNDLED WITH
-   1.16.3
+   1.17.1
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index 39520fdb0ba..2f60dacd358 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -7,9 +7,9 @@ bundlerApp rec {
 
   meta = with lib; {
     description = "IDE tools for the Ruby language";
-    homepage    = http://www.github.com/castwide/solargraph;
-    license     = licenses.mit;
+    homepage = http://www.github.com/castwide/solargraph;
+    license = licenses.mit;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 2f46db60984..bfb5496444a 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -7,14 +7,6 @@
     };
     version = "2.4.0";
   };
-  coderay = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -76,10 +68,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
+      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
       type = "gem";
     };
-    version = "2.5.1.2";
+    version = "2.5.3.0";
   };
   powerpack = {
     source = {
@@ -110,10 +102,10 @@
     dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0110r4yqi6nn97bp2myah76plv6a7daxnm9k04k64n1y4zpqm256";
+      sha256 = "1ivk049z3mp12nc6v1wn35bsq1g7nz1i2r4xwzqf0v25hm2v7n1i";
       type = "gem";
     };
-    version = "0.59.2";
+    version = "0.60.0";
   };
   ruby-progressbar = {
     source = {
@@ -124,29 +116,29 @@
     version = "1.10.0";
   };
   solargraph = {
-    dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    dependencies = ["eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xvxifq5871fh2c34hjvsqn38nw4s63d599vbs5mlrrvdl3c5s01";
+      sha256 = "12sy1rdz2fk3aba43701qp1250xm8w26rlizypd6h5rnmmqm5q54";
       type = "gem";
     };
-    version = "0.28.2";
+    version = "0.29.1";
   };
   thor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.20.3";
   };
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
       type = "gem";
     };
-    version = "2.0.8";
+    version = "2.0.9";
   };
   unicode-display_width = {
     source = {

From 09d877865e23a2e304fe377446f29946ef9ee1d5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 1 Dec 2018 22:20:04 -0500
Subject: [PATCH 0669/2793] antibody: 4.0.0 -> 4.0.2

---
 pkgs/shells/zsh/antibody/default.nix |  11 +-
 pkgs/shells/zsh/antibody/deps.nix    | 183 +++++++++++----------------
 2 files changed, 78 insertions(+), 116 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 92a6628dcda..29e79c0e503 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,24 +2,23 @@
 
 buildGoPackage rec {
   name = "antibody-${version}";
-  version = "4.0.0";
-  rev = "v${version}";
+  version = "4.0.2";
 
   goPackagePath = "github.com/getantibody/antibody";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner  = "getantibody";
     repo   = "antibody";
-    sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz";
+    rev = "v${version}";
+    sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv";
   };
 
   goDeps = ./deps.nix;
 
   meta = with lib; {
     description = "The fastest shell plugin manager";
-    homepage    = https://github.com/getantibody/antibody;
-    license     = licenses.mit;
+    homepage = https://github.com/getantibody/antibody;
+    license = licenses.mit;
     maintainers = with maintainers; [ worldofpeace ];
   };
 }
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
index b824358fbba..bdd53a9d142 100644
--- a/pkgs/shells/zsh/antibody/deps.nix
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -1,110 +1,73 @@
-[
-  {
-    goPackagePath  = "github.com/alecthomas/kingpin";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/kingpin";
-      rev =  "a39589180ebd6bbf43076e514b55f20a95d43086";
-      sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
-    };
-  }
-  {
-    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/caarlos0/gohome";
-    fetch = {
-      type = "git";
-      url = "https://github.com/caarlos0/gohome";
-      rev =  "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
-      sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/getantibody/folder";
-    fetch = {
-      type = "git";
-      url = "https://github.com/getantibody/folder";
-      rev =  "479aa91767d47bc27599e6ebc7fd07945dd38132";
-      sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
-    };
-  }
-  {
-    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 =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
-      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
-      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
-      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
-    };
-  }
-  {
-    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 =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
-      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
-    };
-  }
-]
+[{
+  goPackagePath = "github.com/getantibody/folder";
+  fetch = {
+    type = "git";
+    url = "https://github.com/getantibody/folder";
+    rev = "479aa91767d47bc27599e6ebc7fd07945dd38132";
+    sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
+  };
+}{
+  goPackagePath = "github.com/alecthomas/units";
+  fetch = {
+    type = "git";
+    url = "https://github.com/alecthomas/units";
+    rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+    sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+  };
+}{
+  goPackagePath = "github.com/alecthomas/template";
+  fetch = {
+    type = "git";
+    url = "https://github.com/alecthomas/template";
+    rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+    sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+  };
+}{
+  goPackagePath = "github.com/caarlos0/gohome";
+  fetch = {
+    type = "git";
+    url = "https://github.com/caarlos0/gohome";
+    rev = "75f08ebc60b144c5c3178115baedce176fdcfe99";
+    sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz";
+  };
+}{
+  goPackagePath = "github.com/alecthomas/kingpin";
+  fetch = {
+    type = "git";
+    url = "https://github.com/alecthomas/kingpin";
+    rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+    sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
+  };
+}{
+  goPackagePath = "golang.org/x/sync";
+  fetch = {
+    type = "git";
+    url = "https://go.googlesource.com/sync";
+    rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+    sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+  };
+}{
+  goPackagePath = "golang.org/x/crypto";
+  fetch = {
+    type = "git";
+    url = "https://go.googlesource.com/crypto";
+    rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+    sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+  };
+}{
+  goPackagePath = "golang.org/x/sys";
+  fetch = {
+    type = "git";
+    url = "https://go.googlesource.com/sys";
+    rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+    sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+  };
+}{
+  goPackagePath = "golang.org/x/net";
+  fetch = {
+    type = "git";
+    url = "https://go.googlesource.com/net";
+    rev = "2491c5de3490fced2f6cff376127c667efeed857";
+    sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+  };
+}]

From 10f40f3ac601e5eecc2b7d4fd884401328c1e146 Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Sun, 2 Dec 2018 17:53:40 +1000
Subject: [PATCH 0670/2793] scilab-bin: adding application launchers Moving the
 desktop configuration files from opt/scilab-$ver/share/applications to
 share/applications, making the required changes, and moving the icons in
 opt/scilab-$ver/share/icons to share/icons. Moving locales, appdata and mime
 out of there opt/scilab-${ver} too. Also removing unneeded scilab-${ver} and
 scilab-${majorVer} symlinks from bin/.

---
 .../science/math/scilab-bin/default.nix       | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 4b143ed8243..c3a74d14bc0 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -61,10 +61,40 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/opt/scilab-${ver}"
     cp -r . "$out/opt/scilab-${ver}/"
+
+    # Create bin/ dir
     mkdir "$out/bin"
-    ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab-${ver}"
+
+    # Creating executable symlinks
     ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab"
-    ln -s "scilab-${ver}" "$out/bin/scilab-${majorVer}"
+    ln -s "$out/opt/scilab-${ver}/bin/scilab-cli" "$out/bin/scilab-cli"
+    ln -s "$out/opt/scilab-${ver}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli"
+
+    # Creating desktop config dir
+    mkdir -p "$out/share/applications"
+
+    # Moving desktop config files
+    mv $out/opt/scilab-${ver}/share/applications/*.desktop $out/share/applications
+
+    # Fixing Exec paths and launching each app with a terminal
+    sed -i -e "s|Exec=|Exec=$out/opt/scilab-${ver}/bin/|g" \
+           -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop
+
+    # Moving icons to the appropriate locations
+    for path in $out/opt/scilab-${ver}/share/icons/hicolor/*/*/*
+    do
+      newpath=$(echo $path | sed 's|/opt/scilab-${ver}||g')
+      filename=$(echo $path | sed 's|.*/||g')
+      dir=$(echo $newpath | sed "s|$filename||g")
+      mkdir -p $dir
+      mv $path $newpath
+    done
+
+    # Removing emptied folders
+    rm -rf $out/opt/scilab-${ver}/share/{applications,icons}
+
+    # Moving other share/ folders
+    mv $out/opt/scilab-${ver}/share/{appdata,locale,mime} $out/share
   '';
 
   meta = {

From 6a0bbbdc57002df8ba085bab5dfc4307e55ab805 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 2 Dec 2018 11:13:33 +0200
Subject: [PATCH 0671/2793] oxipng: 2.1.6 -> 2.1.8

---
 pkgs/tools/graphics/oxipng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index c5737554b77..10b4dd4a031 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "2.1.6";
+  version = "2.1.8";
   name = "oxipng-${version}";
 
   src = fetchFromGitHub {
     owner = "shssoichiro";
     repo = "oxipng";
     rev = "v${version}";
-    sha256 = "0n3v2dxybfkf07hb4p2hbhhkwx907b85wzj8wa4whwil89igyrdm";
+    sha256 = "18ld65vm58s6x918g6bhfkrg7lw2lca8daidv88ff14wm5khjvik";
   };
 
-  cargoSha256 = "1ycacwhwbn27i81jpp55m1446b9a50knlqv0kzkjcv8yf27213y9";
+  cargoSha256 = "034i8hgi0zgv085bimlja1hl3nd096rqpi167pw6rda5aj18c625";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/shssoichiro/oxipng;

From 2489b4a8bfbb38ec53e5c50d8b5ad6fbb0edf830 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 2 Dec 2018 12:18:22 +0300
Subject: [PATCH 0672/2793] jemalloc: add option disable-initial-exec-tls

---
 pkgs/development/libraries/jemalloc/common.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index 5ac1067d92f..6e83b9637c1 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,11 +1,15 @@
 { version, sha256 }:
-{ stdenv, fetchurl,
+{ stdenv, fetchurl
 # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
 # then stops downstream builds (mariadb in particular) from detecting it. This
 # option should remove the prefix and give us a working jemalloc.
 # Causes segfaults with some software (ex. rustc), but defaults to true for backward
 # compatibility. Ignored on non OSX.
-stripPrefix ? true }:
+, stripPrefix ? true
+, disableInitExecTls ? false
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "jemalloc-${version}";
@@ -17,7 +21,11 @@ stdenv.mkDerivation rec {
   };
 
   # see the comment on stripPrefix
-  configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix=";
+  configureFlags = []
+    ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ]
+    ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ]
+  ;
+
   doCheck = true;
 
   enableParallelBuilding = true;

From 44a167495f23598f1f6f92b1245d2f23d9de5aa9 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 2 Dec 2018 13:41:17 +0300
Subject: [PATCH 0673/2793] mariadb: build with custom jamalloc

---
 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 65cae31a998..60a784da991 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13588,6 +13588,7 @@ with pkgs;
 
   mariadb = callPackage ../servers/sql/mariadb {
     asio = asio_1_10;
+    jemalloc = jemalloc.override ({ disableInitExecTls = true; });
     inherit (darwin) cctools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
   };

From ed0cee645f6747190ded18780c45c906332d0b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Dec 2018 16:16:01 +0100
Subject: [PATCH 0674/2793] audit-tmpdir hook: use abspath matching on RPATH
 entries

This ensures that RPATH entries like "/foo/build/bar" doesn't trigger a
match when TMPDIR is "/build/bar". (I've had this problem with a
prebuilt package.)
---
 pkgs/build-support/setup-hooks/audit-tmpdir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index 43ea0d6caec..291f7f306f7 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -20,7 +20,7 @@ auditTmpdir() {
         if [[ "$i" =~ .build-id ]]; then continue; fi
 
         if isELF "$i"; then
-            if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then
+            if { printf :; patchelf --print-rpath "$i"; } | grep -q -F ":$TMPDIR/"; then
                 echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
                 exit 1
             fi

From ad28261ad2c812948bdedaf9e05a3beafda4055d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 2 Dec 2018 11:34:26 +0100
Subject: [PATCH 0675/2793] audit-tmpdir hook: clean up whitespace

---
 pkgs/build-support/setup-hooks/audit-tmpdir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index 291f7f306f7..5264ce39851 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -26,7 +26,7 @@ auditTmpdir() {
             fi
         fi
 
-        if  isScript "$i"; then
+        if isScript "$i"; then
             if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
                 if grep -q -F "$TMPDIR/" "$i"; then
                     echo "wrapper script $i contains a forbidden reference to $TMPDIR/"

From 3775f1e53ec04a8e71fa4f32675846febadc2a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 10:45:13 +0000
Subject: [PATCH 0676/2793] linuxPackages_4_18.nvidia_x11_legacy304: mark as
 broken on 4.18 and newer

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 1 +
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 49f1500f206..016d03a61f8 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -75,5 +75,6 @@ rec {
         '';
     in applyPatches [ "fix-typos" ];
     patches = maybePatch_drm_legacy;
+    broken = stdenv.lib.versionAtLeast kernel.version "4.18";
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index a40a6434493..be378d66caf 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -10,6 +10,7 @@
 
 , prePatch ? ""
 , patches ? []
+, broken ? false
 }:
 
 { stdenv, callPackage, pkgsi686Linux, fetchurl
@@ -91,6 +92,7 @@ let
       platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
+      inherit broken;
     };
   };
 

From 95cbb71abecf50a2c616b1ab60f866f427cc1fd7 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 2 Dec 2018 12:18:47 +0100
Subject: [PATCH 0677/2793] nixos/nm-applet: add nm-applet program

---
 nixos/doc/manual/release-notes/rl-1903.xml |  4 +-
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/programs/nm-applet.nix       | 43 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/programs/nm-applet.nix

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 376a5355f7c..65cc166c9a0 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -39,7 +39,9 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+    <para>
+     <literal>./programs/nm-applet.nix</literal>
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 75e8446523f..f81877d57d2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -106,6 +106,7 @@
   ./programs/mininet.nix
   ./programs/mtr.nix
   ./programs/nano.nix
+  ./programs/nm-applet.nix
   ./programs/npm.nix
   ./programs/oblogout.nix
   ./programs/plotinus.nix
diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
new file mode 100644
index 00000000000..311a75deb19
--- /dev/null
+++ b/nixos/modules/programs/nm-applet.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.nm-applet;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    programs.nm-applet = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable nm-applet.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.user.services.nm-applet = {
+      description = "Network manager applet";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
+    };
+
+  };
+
+}

From b3662053b3b05160dcb5759e583c9aedb85722ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 11:34:26 +0000
Subject: [PATCH 0678/2793] nixos/nm-applet: make the module smaller

more readable imho
---
 nixos/modules/programs/nm-applet.nix | 33 ++--------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
index 311a75deb19..e42219e9638 100644
--- a/nixos/modules/programs/nm-applet.nix
+++ b/nixos/modules/programs/nm-applet.nix
@@ -1,43 +1,14 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
-let
-  cfg = config.programs.nm-applet;
-in
-
 {
+  options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet";
 
-  ###### interface
-
-  options = {
-
-    programs.nm-applet = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable nm-applet.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
+  config = lib.mkIf config.programs.nm-applet.enable {
     systemd.user.services.nm-applet = {
       description = "Network manager applet";
       wantedBy = [ "graphical-session.target" ];
       partOf = [ "graphical-session.target" ];
       serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
     };
-
   };
-
 }

From a51a99c69041d155892bde91be4993fb29bbea65 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 12:41:15 +0100
Subject: [PATCH 0679/2793] gobject-introspection: rename package

camelCase package name was a huge inconsistency in GNOME package set.
---
 nixos/modules/config/no-x-libs.nix                   |  2 +-
 pkgs/applications/audio/cozy-audiobooks/default.nix  |  4 ++--
 pkgs/applications/audio/gpodder/default.nix          |  4 ++--
 pkgs/applications/audio/lollypop/default.nix         |  4 ++--
 pkgs/applications/audio/mopidy/default.nix           |  4 ++--
 pkgs/applications/audio/mopidy/local-images.nix      |  4 ++--
 pkgs/applications/audio/pithos/default.nix           |  4 ++--
 pkgs/applications/audio/quodlibet/default.nix        |  4 ++--
 pkgs/applications/audio/sonata/default.nix           |  4 ++--
 pkgs/applications/audio/vocal/default.nix            |  4 ++--
 .../display-managers/lightdm/default.nix             |  4 ++--
 pkgs/applications/editors/gnome-builder/default.nix  |  4 ++--
 pkgs/applications/editors/quilter/default.nix        |  4 ++--
 pkgs/applications/editors/rednotebook/default.nix    |  4 ++--
 pkgs/applications/graphics/mypaint/default.nix       |  4 ++--
 pkgs/applications/graphics/photoflow/default.nix     |  4 ++--
 .../graphics/rapid-photo-downloader/default.nix      |  4 ++--
 pkgs/applications/graphics/shotwell/default.nix      |  4 ++--
 pkgs/applications/misc/font-manager/default.nix      |  4 ++--
 pkgs/applications/misc/gImageReader/default.nix      |  4 ++--
 pkgs/applications/misc/gramps/default.nix            |  4 ++--
 pkgs/applications/misc/guake/default.nix             |  4 ++--
 pkgs/applications/misc/kupfer/default.nix            |  4 ++--
 pkgs/applications/misc/notejot/default.nix           |  4 ++--
 pkgs/applications/misc/onboard/default.nix           |  4 ++--
 pkgs/applications/misc/orca/default.nix              |  4 ++--
 pkgs/applications/misc/pdf-quench/default.nix        |  2 +-
 pkgs/applications/misc/pdfpc/default.nix             |  4 ++--
 pkgs/applications/misc/plank/default.nix             |  4 ++--
 pkgs/applications/misc/redshift/default.nix          |  4 ++--
 pkgs/applications/misc/regextester/default.nix       |  4 ++--
 pkgs/applications/misc/safeeyes/default.nix          |  4 ++--
 pkgs/applications/misc/sequeler/default.nix          |  4 ++--
 pkgs/applications/misc/solaar/default.nix            |  4 ++--
 pkgs/applications/misc/synapse/default.nix           |  4 ++--
 pkgs/applications/misc/terminator/default.nix        |  4 ++--
 pkgs/applications/misc/tootle/default.nix            |  4 ++--
 pkgs/applications/misc/udiskie/default.nix           |  4 ++--
 pkgs/applications/misc/workrave/default.nix          |  4 ++--
 .../networking/browsers/eolie/default.nix            |  4 ++--
 pkgs/applications/networking/corebird/default.nix    |  4 ++--
 pkgs/applications/networking/ftp/taxi/default.nix    |  4 ++--
 .../networking/instant-messengers/dino/default.nix   |  4 ++--
 .../networking/instant-messengers/gajim/default.nix  |  4 ++--
 .../instant-messengers/telepathy/logger/default.nix  |  4 ++--
 .../networking/mailreaders/balsa/default.nix         |  4 ++--
 .../networking/newsreaders/liferea/default.nix       |  4 ++--
 .../networking/syncthing-gtk/default.nix             |  4 ++--
 pkgs/applications/networking/transporter/default.nix |  4 ++--
 .../networking/weather/meteo/default.nix             |  4 ++--
 pkgs/applications/office/aesop/default.nix           |  4 ++--
 pkgs/applications/office/autokey/default.nix         |  4 ++--
 pkgs/applications/office/bookworm/default.nix        |  4 ++--
 pkgs/applications/office/spice-up/default.nix        |  4 ++--
 pkgs/applications/office/tryton/default.nix          |  4 ++--
 pkgs/applications/science/math/nasc/default.nix      |  4 ++--
 pkgs/applications/search/catfish/default.nix         |  4 ++--
 .../applications/version-management/meld/default.nix |  4 ++--
 pkgs/applications/video/gnomecast/default.nix        |  4 ++--
 pkgs/applications/video/kazam/default.nix            |  4 ++--
 pkgs/applications/video/mpv/scripts/mpris.nix        |  4 ++--
 pkgs/applications/video/pitivi/default.nix           |  6 +++---
 .../virtualization/virt-manager/default.nix          |  4 ++--
 .../applications/window-managers/awesome/default.nix |  4 ++--
 pkgs/applications/window-managers/i3/i3ipc-glib.nix  |  4 ++--
 pkgs/desktops/deepin/deepin-terminal/default.nix     |  4 ++--
 pkgs/desktops/deepin/go-gir-generator/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/apps/accerciser/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/apps/glade/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix   |  4 ++--
 .../gnome-3/apps/gnome-characters/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix  |  4 ++--
 .../gnome-3/apps/gnome-documents/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix   |  4 ++--
 .../gnome-3/apps/gnome-sound-recorder/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix |  4 ++--
 pkgs/desktops/gnome-3/apps/polari/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/apps/seahorse/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/core/eog/default.nix           |  4 ++--
 pkgs/desktops/gnome-3/core/evince/default.nix        |  4 ++--
 .../gnome-3/core/evolution-data-server/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/folks/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/core/gcr/default.nix           |  4 ++--
 pkgs/desktops/gnome-3/core/gdm/default.nix           |  4 ++--
 pkgs/desktops/gnome-3/core/geocode-glib/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/core/gjs/default.nix           |  4 ++--
 .../gnome-3/core/gnome-bluetooth/default.nix         |  4 ++--
 .../gnome-3/core/gnome-calculator/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix |  4 ++--
 pkgs/desktops/gnome-3/core/gnome-menus/default.nix   |  4 ++--
 .../gnome-3/core/gnome-online-accounts/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix   |  4 ++--
 .../desktops/gnome-3/core/gnome-software/default.nix |  4 ++--
 pkgs/desktops/gnome-3/core/grilo/default.nix         |  4 ++--
 .../core/gsettings-desktop-schemas/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/gsound/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/core/gucharmap/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/core/libgdata/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/core/libgee/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/core/libgepub/default.nix      |  4 ++--
 .../gnome-3/core/libgnome-keyring/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/core/libgweather/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/libgxps/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/libpeas/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/libzapojit/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/core/mutter/3.28.nix           |  4 ++--
 pkgs/desktops/gnome-3/core/mutter/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/core/rest/default.nix          |  4 ++--
 pkgs/desktops/gnome-3/core/rygel/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/core/simple-scan/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/sushi/default.nix         |  4 ++--
 .../gnome-3/core/totem-pl-parser/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/core/totem/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/core/tracker/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/vte/2.90.nix              |  4 ++--
 pkgs/desktops/gnome-3/core/vte/default.nix           |  4 ++--
 pkgs/desktops/gnome-3/default.nix                    |  2 +-
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/games/gnome-chess/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/games/gnome-mines/default.nix  |  6 +++---
 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix |  4 ++--
 pkgs/desktops/gnome-3/misc/california/default.nix    |  4 ++--
 pkgs/desktops/gnome-3/misc/geary/default.nix         |  4 ++--
 pkgs/desktops/gnome-3/misc/gexiv2/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/misc/gfbgraph/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/misc/gitg/default.nix          |  4 ++--
 pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/misc/gpaste/default.nix        |  4 ++--
 pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/misc/libmediaart/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/misc/pomodoro/default.nix      |  4 ++--
 pkgs/desktops/mate/mate-menus/default.nix            |  4 ++--
 pkgs/desktops/mate/mate-polkit/default.nix           |  4 ++--
 .../pantheon/apps/pantheon-terminal/default.nix      |  4 ++--
 .../xfce4-vala-panel-appmenu-plugin/default.nix      |  4 ++--
 pkgs/desktops/xfce4-13/libxfce4ui/default.nix        |  4 ++--
 pkgs/desktops/xfce4-13/libxfce4util/default.nix      |  4 ++--
 .../haskell-modules/configuration-nix.nix            |  2 +-
 .../development/haskell-modules/hackage-packages.nix | 12 ++++++------
 .../libraries/accountsservice/default.nix            |  4 ++--
 .../development/libraries/appstream-glib/default.nix |  4 ++--
 pkgs/development/libraries/appstream/default.nix     |  4 ++--
 pkgs/development/libraries/at-spi2-core/default.nix  |  4 ++--
 pkgs/development/libraries/atk/default.nix           |  4 ++--
 pkgs/development/libraries/bamf/default.nix          |  4 ++--
 pkgs/development/libraries/clutter-gtk/default.nix   |  4 ++--
 pkgs/development/libraries/clutter/default.nix       |  4 ++--
 pkgs/development/libraries/cogl/default.nix          |  4 ++--
 pkgs/development/libraries/dee/default.nix           |  4 ++--
 pkgs/development/libraries/farstream/default.nix     |  4 ++--
 pkgs/development/libraries/flatpak/default.nix       |  4 ++--
 pkgs/development/libraries/gcab/default.nix          |  4 ++--
 pkgs/development/libraries/gdk-pixbuf/default.nix    |  6 +++---
 pkgs/development/libraries/geis/default.nix          |  4 ++--
 pkgs/development/libraries/geoclue/default.nix       |  4 ++--
 pkgs/development/libraries/gmime/2.nix               |  4 ++--
 pkgs/development/libraries/gmime/3.nix               |  4 ++--
 .../libraries/gobject-introspection/default.nix      |  3 +--
 pkgs/development/libraries/goocanvas/2.x.nix         |  4 ++--
 pkgs/development/libraries/granite/default.nix       |  4 ++--
 pkgs/development/libraries/gsettings-qt/default.nix  |  4 ++--
 pkgs/development/libraries/gsignond/default.nix      |  4 ++--
 .../libraries/gsignond/plugins/lastfm.nix            |  4 ++--
 pkgs/development/libraries/gsignond/plugins/mail.nix |  4 ++--
 .../development/libraries/gsignond/plugins/oauth.nix |  4 ++--
 pkgs/development/libraries/gsignond/plugins/sasl.nix |  4 ++--
 pkgs/development/libraries/gspell/default.nix        |  4 ++--
 pkgs/development/libraries/gssdp/default.nix         |  4 ++--
 .../development/libraries/gstreamer/base/default.nix |  4 ++--
 .../development/libraries/gstreamer/core/default.nix |  4 ++--
 pkgs/development/libraries/gstreamer/ges/default.nix |  4 ++--
 .../libraries/gstreamer/rtsp-server/default.nix      |  4 ++--
 .../libraries/gstreamer/validate/default.nix         |  4 ++--
 pkgs/development/libraries/gtk+/2.x.nix              |  4 ++--
 pkgs/development/libraries/gtk+/3.x.nix              |  4 ++--
 .../libraries/gtk-mac-integration/default.nix        |  4 ++--
 pkgs/development/libraries/gtksourceview/3.x.nix     |  4 ++--
 pkgs/development/libraries/gtksourceview/4.x.nix     |  4 ++--
 pkgs/development/libraries/gtkspell/3.nix            |  4 ++--
 pkgs/development/libraries/gupnp-av/default.nix      |  4 ++--
 pkgs/development/libraries/gupnp-dlna/default.nix    |  4 ++--
 pkgs/development/libraries/gupnp-igd/default.nix     |  4 ++--
 pkgs/development/libraries/gupnp/default.nix         |  4 ++--
 pkgs/development/libraries/gusb/default.nix          |  4 ++--
 pkgs/development/libraries/json-glib/default.nix     |  4 ++--
 pkgs/development/libraries/jsonrpc-glib/default.nix  |  4 ++--
 pkgs/development/libraries/keybinder/default.nix     |  4 ++--
 pkgs/development/libraries/keybinder3/default.nix    |  4 ++--
 pkgs/development/libraries/lasso/default.nix         |  4 ++--
 .../libraries/libaccounts-glib/default.nix           |  4 ++--
 .../libraries/libappindicator/default.nix            |  4 ++--
 pkgs/development/libraries/libblockdev/default.nix   |  4 ++--
 pkgs/development/libraries/libchamplain/default.nix  |  4 ++--
 pkgs/development/libraries/libdazzle/default.nix     |  4 ++--
 pkgs/development/libraries/libdbusmenu/default.nix   |  4 ++--
 pkgs/development/libraries/libgrss/default.nix       |  4 ++--
 pkgs/development/libraries/libgtop/default.nix       |  4 ++--
 pkgs/development/libraries/libgudev/default.nix      |  4 ++--
 pkgs/development/libraries/libhandy/default.nix      |  4 ++--
 .../libraries/libhttpseverywhere/default.nix         |  4 ++--
 pkgs/development/libraries/libical/default.nix       |  4 ++--
 pkgs/development/libraries/libindicate/default.nix   |  4 ++--
 pkgs/development/libraries/libinfinity/default.nix   |  4 ++--
 pkgs/development/libraries/liblangtag/default.nix    |  4 ++--
 pkgs/development/libraries/libmanette/default.nix    |  4 ++--
 pkgs/development/libraries/libmx/default.nix         |  4 ++--
 pkgs/development/libraries/libnotify/default.nix     |  4 ++--
 pkgs/development/libraries/libosinfo/default.nix     |  4 ++--
 pkgs/development/libraries/librsvg/default.nix       |  4 ++--
 pkgs/development/libraries/libsecret/default.nix     |  4 ++--
 .../development/libraries/libsignon-glib/default.nix |  4 ++--
 pkgs/development/libraries/libskk/default.nix        |  4 ++--
 pkgs/development/libraries/libsoup/default.nix       |  4 ++--
 pkgs/development/libraries/libunique/3.x.nix         |  4 ++--
 pkgs/development/libraries/libunity/default.nix      |  4 ++--
 pkgs/development/libraries/libvirt-glib/default.nix  |  4 ++--
 pkgs/development/libraries/libwnck/3.x.nix           |  4 ++--
 pkgs/development/libraries/libxklavier/default.nix   |  4 ++--
 pkgs/development/libraries/osm-gps-map/default.nix   |  4 ++--
 pkgs/development/libraries/pango/default.nix         |  4 ++--
 pkgs/development/libraries/polkit/default.nix        |  6 +++---
 pkgs/development/libraries/poppler/0.61.nix          |  4 ++--
 pkgs/development/libraries/poppler/default.nix       |  4 ++--
 pkgs/development/libraries/spice-gtk/default.nix     |  4 ++--
 .../development/libraries/telepathy/glib/default.nix |  4 ++--
 pkgs/development/libraries/template-glib/default.nix |  4 ++--
 pkgs/development/libraries/uhttpmock/default.nix     |  4 ++--
 pkgs/development/libraries/umockdev/default.nix      |  4 ++--
 pkgs/development/libraries/webkitgtk/2.4.nix         |  4 ++--
 pkgs/development/libraries/webkitgtk/default.nix     |  4 ++--
 pkgs/development/libraries/zeitgeist/default.nix     |  4 ++--
 pkgs/development/python-modules/dogtail/default.nix  |  4 ++--
 .../python-modules/goocalendar/default.nix           |  4 ++--
 pkgs/development/python-modules/graph-tool/2.x.x.nix |  4 ++--
 .../python-modules/gst-python/default.nix            |  4 ++--
 pkgs/development/python-modules/gtimelog/default.nix |  2 +-
 pkgs/development/python-modules/matplotlib/2.nix     |  4 ++--
 .../python-modules/matplotlib/default.nix            |  4 ++--
 .../python-modules/neovim_gui/default.nix            |  2 +-
 pkgs/development/python-modules/pygobject/3.nix      |  4 ++--
 pkgs/development/python-modules/xdot/default.nix     |  4 ++--
 pkgs/development/ruby-modules/gem-config/default.nix |  6 +++---
 pkgs/development/tools/misc/d-feet/default.nix       |  4 ++--
 pkgs/development/tools/valadoc/default.nix           |  4 ++--
 pkgs/games/gshogi/default.nix                        |  4 ++--
 pkgs/misc/drivers/sc-controller/default.nix          |  4 ++--
 pkgs/os-specific/linux/firmware/fwupd/default.nix    |  4 ++--
 pkgs/os-specific/linux/piper/default.nix             |  4 ++--
 pkgs/os-specific/linux/tiscamera/default.nix         |  4 ++--
 pkgs/os-specific/linux/udisks/2-default.nix          |  4 ++--
 pkgs/os-specific/linux/upower/default.nix            |  4 ++--
 pkgs/tools/X11/wpgtk/default.nix                     |  4 ++--
 pkgs/tools/X11/xpra/default.nix                      |  4 ++--
 pkgs/tools/admin/gtk-vnc/default.nix                 |  4 ++--
 pkgs/tools/audio/beets/default.nix                   |  4 ++--
 pkgs/tools/audio/playerctl/default.nix               |  4 ++--
 pkgs/tools/bluetooth/blueman/default.nix             |  4 ++--
 pkgs/tools/graphics/vips/default.nix                 |  4 ++--
 .../inputmethods/ibus-engines/ibus-anthy/default.nix |  4 ++--
 .../inputmethods/ibus-engines/ibus-table/default.nix |  4 ++--
 .../ibus-engines/ibus-typing-booster/default.nix     |  4 ++--
 pkgs/tools/inputmethods/ibus/default.nix             |  4 ++--
 pkgs/tools/inputmethods/libkkc/default.nix           |  4 ++--
 pkgs/tools/misc/clipster/default.nix                 |  4 ++--
 pkgs/tools/misc/colord/default.nix                   |  4 ++--
 pkgs/tools/misc/hashit/default.nix                   |  4 ++--
 pkgs/tools/misc/ldmtool/default.nix                  |  4 ++--
 pkgs/tools/misc/ostree/default.nix                   |  4 ++--
 pkgs/tools/misc/rpm-ostree/default.nix               |  4 ++--
 pkgs/tools/misc/system-config-printer/default.nix    |  4 ++--
 pkgs/tools/networking/network-manager/applet.nix     |  4 ++--
 pkgs/tools/networking/network-manager/default.nix    |  4 ++--
 pkgs/tools/networking/network-manager/dmenu.nix      |  4 ++--
 pkgs/tools/package-management/packagekit/default.nix |  4 ++--
 pkgs/tools/security/gencfsm/default.nix              |  4 ++--
 pkgs/tools/security/onioncircuits/default.nix        |  4 ++--
 pkgs/top-level/aliases.nix                           |  1 +
 pkgs/top-level/all-packages.nix                      |  2 +-
 pkgs/top-level/lua-packages.nix                      |  4 ++--
 282 files changed, 564 insertions(+), 564 deletions(-)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index d9ecaa4818b..37e66c64542 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -35,7 +35,7 @@ with lib;
       networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
       pinentry = super.pinentry_ncurses;
-      gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; };
+      gobject-introspection = super.gobject-introspection.override { x11Support = false; };
     }));
   };
 }
diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
index 1b996f9f0c5..3d7d63c4be6 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -8,7 +8,7 @@
 , desktop-file-utils
 , gtk3
 , gst_all_1
-, gobjectIntrospection
+, gobject-introspection
 , python3Packages
 , file
 , cairo
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook
     appstream-glib
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index ccd20a6b7b2..342f495767d 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python3, python3Packages, intltool
 , glibcLocales, gnome3, gtk3, wrapGAppsHook
-, ipodSupport ? false, libgpod, gobjectIntrospection
+, ipodSupport ? false, libgpod, gobject-introspection
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = [
     python3
-    gobjectIntrospection
+    gobject-introspection
     gnome3.defaultIconTheme
   ];
 
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index f68d93fa69d..df43e5ed3b3 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, meson, ninja, pkgconfig
 , python3, gtk3, gst_all_1, libsecret, libsoup
 , appstream-glib, desktop-file-utils, gnome3
-, gobjectIntrospection, wrapGAppsHook }:
+, gobject-introspection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
   version = "0.9.611";
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec  {
   nativeBuildInputs = with python3.pkgs; [
     appstream-glib
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index a782cf839bf..81b14a69453 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
-, gst_all_1, glib-networking, gobjectIntrospection
+, gst_all_1, glib-networking, gobject-introspection
 }:
 
 pythonPackages.buildPythonApplication rec {
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
 
   buildInputs = with gst_all_1; [
     gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
-    glib-networking gobjectIntrospection
+    glib-networking gobject-introspection
   ];
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix
index 3e10904f3e6..2ffc736572b 100644
--- a/pkgs/applications/audio/mopidy/local-images.nix
+++ b/pkgs/applications/audio/mopidy/local-images.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
+{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-local-images";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
   };
 
-  buildInputs = [ gobjectIntrospection ];
+  buildInputs = [ gobject-introspection ];
 
   checkInputs = [
     pythonPackages.mock
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index 1d3fffb549d..c7bb1a4193f 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify
+{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobject-introspection, libnotify
 , gst_all_1, wrapGAppsHook }:
 
 pythonPackages.buildPythonApplication rec {
@@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec {
   buildInputs = [ wrapGAppsHook ];
 
   propagatedBuildInputs =
-    [ gtk3 gobjectIntrospection libnotify ] ++
+    [ gtk3 gobject-introspection libnotify ] ++
     (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
     (with pythonPackages; [ pygobject3 pylast ]);
 
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index e26c2496d56..6c930ceb05a 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, glib-networking, gobjectIntrospection,
+  tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
   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 glib-networking 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 gobject-introspection ]
     ++ (if xineBackend then [ xineLib ] else with gst_all_1;
     [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
 
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 0affe5dc89d..3aaaae85639 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
-, python3Packages, gnome3, gtk3, gobjectIntrospection}:
+, python3Packages, gnome3, gtk3, gobject-introspection}:
 
 let
   inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
@@ -29,7 +29,7 @@ in buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    gobjectIntrospection gtk3 pygobject3
+    gobject-introspection gtk3 pygobject3
   ];
 
   # The optional tagpy dependency (for editing metadata) is not yet
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index af8b3ac9394..75f67adf464 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk
-, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }:
+, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "vocal";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    gobjectIntrospection
+    gobject-introspection
     libxml2
     ninja
     pkgconfig
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index da7189f9196..36928a29897 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb
 , glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox
-, polkit, accountsservice, gtk-doc, gnome3, gobjectIntrospection, vala
+, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala
 , withQt4 ? false, qt4
 , withQt5 ? false, qtbase
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     automake
     gnome3.yelp-tools
     gnome3.yelp-xsl
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     intltool
     itstool
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 9f871eec799..a66b3ba6322 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -7,7 +7,7 @@
 , flatpak
 , glibcLocales
 , gnome3
-, gobjectIntrospection
+, gobject-introspection
 , gspell
 , gtk-doc
 , gtk3
@@ -46,7 +46,7 @@ in stdenv.mkDerivation {
     docbook_xsl
     docbook_xml_dtd_43
     glibcLocales # for Meson's gtkdochelper
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     hicolor-icon-theme
     meson
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 87ffd3256a8..b9fe90be9fb 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3
 , granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
-, discount, gobjectIntrospection, wrapGAppsHook }:
+, discount, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "quilter";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 9a181f3dae7..de9a089ec8c 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonApplication, fetchFromGitHub
-, gdk_pixbuf, glib, gobjectIntrospection, gtk3, gtksourceview, pango, webkitgtk
+, gdk_pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
 , pygobject3, pyyaml
 }:
 
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   # We have not packaged tests.
   doCheck = false;
 
-  nativeBuildInputs = [ gobjectIntrospection ];
+  nativeBuildInputs = [ gobject-introspection ];
 
   propagatedBuildInputs = [
     gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index a22f9c7ac1f..36c7e7e2fb3 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme
+{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme
 , gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     intltool pkgconfig scons swig wrapGAppsHook
-    gobjectIntrospection # for setup hook
+    gobject-introspection # for setup hook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index 6f3bf69889c..db41ee0566f 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -1,4 +1,4 @@
-{ 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, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
 
 stdenv.mkDerivation {
   name = "photoflow-unstable-2018-08-28";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     pkgconfig
     swig
     automake
-    gobjectIntrospection
+    gobject-introspection
     cmake
     ninja
   ];
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 59d6fec45da..36087aa84bb 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python3Packages
-, file, intltool, gobjectIntrospection, libgudev
+, file, intltool, gobject-introspection, libgudev
 , udisks, glib, gnome3, gst_all_1, libnotify
 , exiv2, exiftool, qt5, gdk_pixbuf
 }:
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
       --replace "import problemnotification" "import raphodo.problemnotification"
   '';
 
-  nativeBuildInputs = [ file intltool gobjectIntrospection ];
+  nativeBuildInputs = [ file intltool gobject-introspection ];
 
   buildInputs = [
     libgudev
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 8eba574ef83..aef7143f7e0 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
 , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
-, gobjectIntrospection, itstool, libgdata, python3 }:
+, gobject-introspection, itstool, libgdata, python3 }:
 
 # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobjectIntrospection
+    meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 54392b03bfb..998074e8aa0 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool,
   pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
-  librsvg, vala, gnome3, wrapGAppsHook, gobjectIntrospection
+  librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     gnome3.yelp-tools
     wrapGAppsHook
     # For setup hook
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 18998f1fe09..75783805fa3 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -6,7 +6,7 @@
 
 # Gtk deps
 # upstream gImagereader supports Qt too
-, gtk3, gobjectIntrospection, wrapGAppsHook
+, gtk3, gobject-introspection, wrapGAppsHook
 , gnome3, gtkspell3, gtkspellmm, cairomm
 }:
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
     # Gtk specific
     wrapGAppsHook
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 413679afd21..920bec56a9b 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
-  pango, gobjectIntrospection, wrapGAppsHook,
+  pango, gobject-introspection, wrapGAppsHook,
 # Optional packages:
  enableOSM ? true, osm-gps-map,
  enableGraphviz ? true, graphviz,
@@ -13,7 +13,7 @@ in buildPythonApplication rec {
   name = "gramps-${version}";
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] 
+  buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] 
     # Map support
     ++ stdenv.lib.optional enableOSM osm-gps-map
     # Graphviz support
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 52105f49c56..0541468345e 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales
+{ stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
@@ -14,7 +14,7 @@ in python3.pkgs.buildPythonApplication rec {
     sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm";
   };
 
-  nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
+  nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook python3.pkgs.pip glibcLocales ];
 
   buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];
 
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index 0b07767d760..33a2cf93209 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , intltool
 , python3Packages
-, gobjectIntrospection
+, gobject-introspection
 , gtk3
 , libwnck3
 , keybinder3
@@ -25,7 +25,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [
     wrapGAppsHook intltool
     # For setup hook
-    gobjectIntrospection wafHook
+    gobject-introspection wafHook
   ];
   buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
   propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index 09c49135ca1..7ad834f8172 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite
-, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }:
+, gtk3, gnome3, gtksourceview, json-glib, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "notejot";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index 78105ea535d..dbd79ba3e1b 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -7,7 +7,7 @@
 , glib
 , glibcLocales
 , gnome3
-, gobjectIntrospection
+, gobject-introspection
 , gsettings-desktop-schemas
 , gtk3
 , hunspell
@@ -88,7 +88,7 @@ in python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [
     glibcLocales
-    gobjectIntrospection # populate GI_TYPELIB_PATH
+    gobject-introspection # populate GI_TYPELIB_PATH
     intltool
     pkgconfig
   ];
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 802c56b4315..f52215fa4a2 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, fetchurl, buildPythonApplication
-, autoreconfHook, wrapGAppsHook, gobjectIntrospection
+, autoreconfHook, wrapGAppsHook, gobject-introspection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
@@ -32,7 +32,7 @@ in buildPythonApplication rec {
 
   nativeBuildInputs = [
     autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
-    intltool yelp-tools itstool gobjectIntrospection
+    intltool yelp-tools itstool gobject-introspection
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 0829c4f91cc..f604684b19a 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
   nativeBuildInputs = [ wrapGAppsHook ];
   buildInputs = with pkgs; [
     gtk3
-    gobjectIntrospection
+    gobject-introspection
     goocanvas2
     poppler_gi
   ];
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index adfd9fa7eac..8b536e49316 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake pkgconfig vala
     # For setup hook
-    gobjectIntrospection
+    gobject-introspection
   ];
   buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
     libpthreadstubs makeWrapper librsvg pcre ];
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 46e26666b40..f9291117ed4 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
 , bamf, gdk_pixbuf, libdbusmenu-gtk3, file
-, wrapGAppsHook, autoreconfHook, gobjectIntrospection }:
+, wrapGAppsHook, autoreconfHook, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "plank";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     intltool
     libxml2 # xmllint
     wrapGAppsHook
-    gobjectIntrospection
+    gobject-introspection
     autoreconfHook
   ];
 
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 2bf4a011e59..d8512754f6a 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool
-, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
+, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection
 , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
 
 , withQuartz ? stdenv.isDarwin, ApplicationServices
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     gtk3
     python
     hicolor-icon-theme
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index 6f056292d77..2b902d27a35 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -9,7 +9,7 @@
 , gnome3
 , meson
 , ninja
-, gobjectIntrospection
+, gobject-introspection
 , gsettings-desktop-schemas
 , vala_0_40
 , wrapGAppsHook }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     gettext
-    gobjectIntrospection
+    gobject-introspection
     libxml2
     vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index e0c5946d564..54c2a68fd59 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
+{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
 }:
 
 let inherit (python3Packages) python buildPythonApplication fetchPypi;
@@ -16,7 +16,7 @@ in buildPythonApplication rec {
 
   buildInputs = [
     gtk3
-    gobjectIntrospection
+    gobject-introspection
     gnome3.defaultIconTheme
     gnome3.adwaita-icon-theme
   ];
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 24f4cbfe8ef..2f91a9fa449 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, python3, desktop-file-utils
+, meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
 , gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
 
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
+  nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
 
   buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
 
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index e26071dd361..cb64365a944 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,4 +1,4 @@
-{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}:
+{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
 pythonPackages.buildPythonApplication rec {
   name = "solaar-unstable-${version}";
   version = "2018-02-02";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
   };
 
-  propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3];
+  propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3];
   postInstall = ''
     wrapProgram "$out/bin/solaar" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 0da0b83d64a..ebae6fd7cfe 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection
+, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
 }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig gettext vala_0_38
     # For setup hook
-    gobjectIntrospection
+    gobject-introspection
   ];
   buildInputs = [
     glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 2fef852ace9..f32a27b9b78 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection
+{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection
 , libnotify, wrapGAppsHook, gnome3
 }:
 
@@ -11,7 +11,7 @@ python2.pkgs.buildPythonApplication rec {
     sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69";
   };
 
-  nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ];
   buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ];
   propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ];
 
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index d7a7de36877..9043f9c42ca 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, python3
-, gnome3, vala, gobjectIntrospection, wrapGAppsHook
+, gnome3, vala, gobject-introspection, wrapGAppsHook
 , gtk3, granite
 , json-glib, glib, glib-networking
 }:
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobject-introspection wrapGAppsHook ];
   buildInputs = [
     gtk3 granite json-glib glib glib-networking
     gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 5b75fbbc08e..5d96918e42d 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, asciidoc-full, gettext
-, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
+, gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
 , udisks2, wrapGAppsHook
 , buildPythonApplication
 , docopt
@@ -26,7 +26,7 @@ buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = [
-    gettext gobjectIntrospection gtk3 libnotify docopt
+    gettext gobject-introspection gtk3 libnotify docopt
     pygobject3 pyyaml udisks2 libappindicator-gtk3
   ];
 
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index f20ef722a8c..7e54f943856 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, wrapGAppsHook
 , autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
-, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
+, gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
 , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
 , gst-plugins-good, libsigcxx }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libICE libSM libXScrnSaver libXtst cheetah
-    gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
+    gobject-introspection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
     dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
   ];
 
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 91b1099bfb8..3e6b9fce6d0 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, meson, ninja, pkgconfig
 , python3, gtk3, libsecret, gst_all_1, webkitgtk
 , glib-networking, gtkspell3, hunspell, desktop-file-utils
-, gobjectIntrospection, wrapGAppsHook }:
+, gobject-introspection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec {
   name = "eolie-${version}";
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 5dd4cbb52c2..1ee2c694e0b 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
-, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
 , glib-networking, python3 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
-    gobjectIntrospection # for setup hook
+    gobject-introspection # for setup hook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
index 503b685ce28..bd17e86d898 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
-, gtk3, gnome3, libsoup, libsecret, gobjectIntrospection, wrapGAppsHook }:
+, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "taxi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 2c5d7005ef8..d437e5346c5 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
-, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
+, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
 , xorg, libXdmcp, libxkbcommon
 , libnotify, libsoup
 , libgcrypt
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qrencode
-    gobjectIntrospection
+    gobject-introspection
     glib-networking
     glib
     gnome3.libgee
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 0f9cff4fd8d..83591722568 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,5 +1,5 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
-, python, gtk3, gobjectIntrospection
+, python, gtk3, gobject-introspection
 , nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow
 , xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
@@ -30,7 +30,7 @@ buildPythonApplication rec {
   '';
 
   buildInputs = [
-    gobjectIntrospection gtk3 gnome3.defaultIconTheme
+    gobject-introspection gtk3 gnome3.defaultIconTheme
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
     ++ optional enableSecrets libsecret
     ++ optional enableSpelling gspell
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index f6e3baadb4e..8c777cd3f7d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
-, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }:
+, gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    makeWrapper pkgconfig intltool libxslt gobjectIntrospection
+    makeWrapper pkgconfig intltool libxslt gobject-introspection
   ];
   buildInputs = [
     dbus-glib libxml2 sqlite telepathy-glib
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 571a4895147..410175e1c62 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
   webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
-  libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
+  libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
   hicolor-icon-theme, wrapGAppsHook
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     intltool
-    gobjectIntrospection
+    gobject-introspection
     hicolor-icon-theme
     wrapGAppsHook
   ];
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 6e87735a9f6..7f7b03f71d2 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
 , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
 , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
-, gobjectIntrospection, glib-networking, hicolor-icon-theme
+, gobject-introspection, glib-networking, hicolor-icon-theme
 }:
 
 let
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
-    libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection
+    libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection
     librsvg glib-networking libnotify hicolor-icon-theme
   ] ++ (with gst_all_1; [
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 9d720bee05e..389d32d5a7c 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
 , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
 , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
-, bcrypt, gobjectIntrospection }:
+, bcrypt, gobject-introspection }:
 
 buildPythonApplication rec {
   version = "0.9.4";
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [
     wrapGAppsHook
     # For setup hook populating GI_TYPELIB_PATH
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 55abd22b605..c5b329b5f0a 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -9,7 +9,7 @@
 , gnome3
 , libxml2
 , gettext
-, gobjectIntrospection
+, gobject-introspection
 , appstream-glib
 , desktop-file-utils
 , magic-wormhole
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     appstream-glib
     desktop-file-utils
     gettext
-    gobjectIntrospection # For setup hook
+    gobject-introspection # For setup hook
     libxml2
     meson
     ninja
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 6d431a436ad..3dba90f964f 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -1,6 +1,6 @@
 { 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 }:
+, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "meteo";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index b510fe950a3..74a56b1f6ca 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
-, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
+, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "aesop";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index 0a6268f8452..e4b89ef3610 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection
+{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
 , gnome3, libappindicator-gtk3, libnotify }:
 
 python3Packages.buildPythonApplication rec {
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   # Note: no dependencies included for Qt GUI because Qt ui is poorly
   # maintained—see https://github.com/autokey/autokey/issues/51
 
-  buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview
+  buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview
     libappindicator-gtk3 libnotify ];
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index 4408af7f45c..04b2072967a 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3
-, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
+, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "bookworm";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     bash
-    gobjectIntrospection
+    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index 3141223d728..a32ad677c25 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -6,7 +6,7 @@
 , gtk3
 , granite
 , gnome3
-, gobjectIntrospection
+, gobject-introspection
 , json-glib
 , cmake
 , ninja
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ninja
     gettext
     libxml2
-    gobjectIntrospection # For setup hook
+    gobject-introspection # For setup hook
   ];
   buildInputs = [
     gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 0543bb07a11..833cb7fc56a 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -2,7 +2,7 @@
 , python2Packages
 , pkgconfig
 , librsvg
-, gobjectIntrospection
+, gobject-introspection
 , atk
 , gtk3
 , gtkspell3
@@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec {
     inherit pname version;
     sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4";
   };
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   propagatedBuildInputs = with python2Packages; [
     chardet
     dateutil
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index 73fa2a5e678..4afaa5194db 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -8,7 +8,7 @@
 , cmake
 , vala_0_40
 , libqalculate
-, gobjectIntrospection
+, gobject-introspection
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
     vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     cmake
-    gobjectIntrospection # for setup-hook
+    gobject-introspection # for setup-hook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index c36baae0621..ab34c6bec92 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection,
+{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
   findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
   wrapGAppsHook
 }:
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
     file
     which
     intltool
-    gobjectIntrospection
+    gobject-introspection
     wrapGAppsHook
   ];
 
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6c06bcabb26..bc45d8bb752 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
-, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
+, libxml2, gobject-introspection, gtk3, gnome3, cairo, file
 }:
 
 
@@ -20,7 +20,7 @@ in buildPythonApplication rec {
     gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo
     gnome3.defaultIconTheme gnome3.dconf file
   ];
-  propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
+  propagatedBuildInputs = [ gobject-introspection pygobject3 gtk3 ];
 
   installPhase = ''
     mkdir -p "$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix
index 74ae6faec90..d840f43163c 100644
--- a/pkgs/applications/video/gnomecast/default.nix
+++ b/pkgs/applications/video/gnomecast/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, gtk3, gobjectIntrospection, ffmpeg, wrapGAppsHook }:
+{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
 
 with python3Packages;
 buildPythonApplication rec {
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [ wrapGAppsHook ];
   propagatedBuildInputs = [
     PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python
-    gtk3 gobjectIntrospection
+    gtk3 gobject-introspection
   ];
 
   preFixup = ''
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 9ffd62d068a..9d549c2aecc 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobjectIntrospection
+{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
 , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f";
   };
 
-  nativeBuildInputs = [ gobjectIntrospection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
+  nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
   buildInputs = [
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3
     keybinder3 libappindicator-gtk3
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index c72714598d6..778dc52d96a 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gobjectIntrospection, mpv }:
+{ stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }:
 
 stdenv.mkDerivation rec {
   name = "mpv-mpris-${version}.so";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ gobjectIntrospection mpv ];
+  buildInputs = [ gobject-introspection mpv ];
 
   installPhase = ''
     cp mpris.so $out
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 7ce1aa67708..bce8e3981d1 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
 , python3Packages, gst_all_1, gtk3
-, gobjectIntrospection, librsvg, gnome3, libnotify
+, gobject-introspection, librsvg, gnome3, libnotify
 , meson, ninja
 }:
 
@@ -19,7 +19,7 @@ let
       rev = version;
       sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
     };
-    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection python3 ];
+    nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection python3 ];
     buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ];
   };
 
@@ -47,7 +47,7 @@ in python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ];
 
   buildInputs = [
-    gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound
+    gobject-introspection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound
     gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas libnotify
     gst-transcoder
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index f2cbe75b869..52732f0c5f1 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python3Packages, intltool, file
 , wrapGAppsHook, gtk-vnc, vte, avahi, dconf
-, gobjectIntrospection, libvirt-glib, system-libvirt
+, gobject-introspection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
 , spiceSupport ? true, spice-gtk ? null
 , cpio, e2fsprogs, findutils, gzip
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [
     wrapGAppsHook intltool file
-    gobjectIntrospection # for setup hook populating GI_TYPELIB_PATH
+    gobject-introspection # for setup hook populating GI_TYPELIB_PATH
   ];
 
   buildInputs =
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index c23284d0b52..8823daaa6d9 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
-, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
+, xcb-util-cursor, makeWrapper, pango, gobject-introspection, unclutter
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
 , which, dbus, nettools, git, asciidoc, doxygen
 , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
@@ -30,7 +30,7 @@ with luaPackages; stdenv.mkDerivation rec {
   ];
 
   propagatedUserEnvPkgs = [ hicolor-icon-theme ];
-  buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
+  buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
                   git lgi libpthreadstubs libstartup_notification
                   libxdg_basedir lua nettools pango xcb-util-cursor
                   xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 87e11774d43..6f709c999f4 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb
 , autoreconfHook, json-glib, gtk-doc, which
-, gobjectIntrospection
+, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook which pkgconfig ];
 
-  buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ];
+  buildInputs = [ libxcb json-glib gtk-doc xproto gobject-introspection ];
 
 
   preAutoreconf = ''
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 2c87180802b..70e15441436 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
-  gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect,
+  gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect,
   gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg,
   libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck,
   deepin-menu, deepin-shortcut-viewer, deepin }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ninja
     vala
     gettext
-    gobjectIntrospection # For setup hook
+    gobject-introspection # For setup hook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index b8797b5ba3a..d33837b21c3 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection,
+{ stdenv, fetchFromGitHub, pkgconfig, go, gobject-introspection,
   libgudev, deepin, fetchurl }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     libgudev
   ];
 
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index feb865743e6..5de7d93f49c 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
 , itstool, libxml2, python3Packages, at-spi2-core
 , dbus, intltool, libwnck3 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig wrapGAppsHook itstool intltool
-    gobjectIntrospection # For setup hook
+    gobject-introspection # For setup hook
   ];
   buildInputs = [
     gtk3 libxml2 python3Packages.python python3Packages.pyatspi
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index c4be9d7259c..39e0f2ba23e 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, python3
-, pkgconfig, gtk3, glib, gobjectIntrospection
+, pkgconfig, gtk3, glib, gobject-introspection
 , wrapGAppsHook, itstool, libxml2, docbook_xsl
 , gnome3, gdk_pixbuf, libxslt }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection
+    pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobject-introspection
   ];
   buildInputs = [
     gtk3 glib libxml2 python3 python3.pkgs.pygobject3
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 574d14bc7af..357cd42d66b 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, freerdp, libvirt, spice-gtk, python3
+, glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, 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 python3
+    meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobject-introspection desktop-file-utils python3
   ];
 
   # Required for USB redirection PolicyKit rules file
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 54c36fc333a..047f9bc2210 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
-, gobjectIntrospection, gjs, libunistring }:
+, gobject-introspection, gjs, libunistring }:
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
   buildInputs = [
     glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
     gnome3.defaultIconTheme libunistring
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 19f517c2771..30323cf62f5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
-, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
+, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
 , gnome3, gdk_pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2
-    gobjectIntrospection # for finding vapi files
+    gobject-introspection # for finding vapi files
   ];
   buildInputs = [
     gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index b0f8f6fbc96..7db869dc3b4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -3,7 +3,7 @@
 , itstool, libxslt, webkitgtk, libgdata
 , gnome-desktop, libzapojit, libgepub
 , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
-, gobjectIntrospection, inkscape, poppler_utils
+, gobject-introspection, inkscape, poppler_utils
 , desktop-file-utils, wrapGAppsHook, python3 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 glib gnome3.gsettings-desktop-schemas
     gdk_pixbuf gnome3.defaultIconTheme evince
-    libsoup webkitgtk gjs gobjectIntrospection
+    libsoup webkitgtk gjs gobject-introspection
     tracker tracker-miners libgdata
     gnome-desktop libzapojit libgepub
   ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index a7b96f69873..07c00f5b632 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather
+, gobject-introspection, gdk_pixbuf, librsvg, libgweather
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup
 , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext python3 wrapGAppsHook ];
   buildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     gtk3 geoclue2 gjs libgee folks gfbgraph
     geocode-glib libchamplain libsoup
     gdk_pixbuf librsvg libgweather
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 663f574784c..3edf1f5dd40 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,6 +1,6 @@
 { stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
 , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
-, gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
+, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
 , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
 , itstool, gnome3, gst_all_1, libdazzle, libsoup }:
 
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d";
   };
 
-  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
   buildInputs = with gst_all_1; [
     gtk3 glib libmediaart gnome-online-accounts
     gdk_pixbuf gnome3.defaultIconTheme python3
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 1f6e86d4943..7b88204c5ea 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }:
 
 let
   pname = "gnome-sound-recorder";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0y0srj1hvr1waa35p6dj1r1mlgcsscc0i99jni50ijp4zb36fjqy";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
   buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
 
   # TODO: fix this in gstreamer
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 93c8d414764..6a827b7f0e3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
 , libgweather, intltool, itstool, geoclue2, gnome-desktop }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
   buildInputs = [
-    gtk3 gjs gobjectIntrospection gnome-desktop
+    gtk3 gjs gobject-introspection gnome-desktop
     libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
   ];
 
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 82516fbef94..080fa664b0d 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -1,6 +1,6 @@
 { stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
-, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
+, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
 , gnome3, wrapGAppsHook, telepathy-logger, gspell }:
 
 let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
-    desktop-file-utils gobjectIntrospection appstream-glib
+    desktop-file-utils gobject-introspection appstream-glib
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 4d02eaf4d18..af5b861ab47 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vala, meson, ninja
-, pkgconfig, gtk3, glib, gobjectIntrospection
+, pkgconfig, gtk3, glib, gobject-introspection
 , wrapGAppsHook, itstool, gnupg, libsoup
 , gnome3, gpgme, python3, openldap
 , libsecret, avahi, p11-kit, openssh }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig vala itstool wrapGAppsHook
-    python3 gobjectIntrospection
+    python3 gobject-introspection
   ];
   buildInputs = [
     gtk3 glib gnome3.gcr
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 78b43eb5b89..0d583dccf76 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
-, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }:
+, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
 
 let
   pname = "dconf-editor";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia";
   };
 
-  nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection python3 ];
+  nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ];
 
   buildInputs = [ glib gtk3 gnome3.dconf ];
 
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 6d897472d68..679974f28f9 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, python3 }:
+, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobject-introspection, python3 }:
 
 let
   pname = "eog";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection python3 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
 
   buildInputs = [
     libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index a0e0f613a56..4867335af12 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, intltool, libxml2
 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
-, librsvg, gobjectIntrospection, yelp-tools, gspell
+, librsvg, gobject-introspection, yelp-tools, gspell
 , recentListSize ? null # 5 is not enough, allow passing a different number
 , supportXPS ? false    # Open XML Paper Specification via libgxps
 , autoreconfHook
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook
+    pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook
   ];
 
   buildInputs = [
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 5e6cfe12846..c88d8c9c381 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection
+{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection
 , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3
 , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
+    cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala
   ];
   buildInputs = with gnome3; [
     glib libsoup libxml2 gtk gnome-online-accounts
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 289311e9c03..2eb33cde975 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobjectIntrospection
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection
 , vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus
 , telepathy-glib, evolution-data-server, libsecret, db }:
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     dbus-glib telepathy-glib evolution-data-server dbus
     libsecret libxml2 libsoup nspr nss db
   ];
-  nativeBuildInputs = [ pkgconfig intltool vala gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
 
   configureFlags = [ "--disable-fatal-warnings" ];
 
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index ea2883a5716..2cfdb518dfa 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
 , libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3
+, gobject-introspection, makeWrapper, libxslt, vala, gnome3
 , python2 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection libxslt makeWrapper vala ];
 
   buildInputs = let
     gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 691049cf655..135200ee3c4 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
 , accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
+, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
 , librsvg, coreutils, xwayland, fetchpatch }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
   buildInputs = [
     glib accountsservice systemd
-    gobjectIntrospection libX11 gtk
+    gobject-introspection libX11 gtk
     libcanberra-gtk3 pam plymouth librsvg
   ];
 
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index 3924f003346..ce5f46534c7 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "geocode-glib-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
   };
 
-  nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];
+  nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
   buildInputs = with gnome3; [ glib libsoup json-glib ];
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 43048fc4399..ac3a25b7dc7 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobject-introspection
 , spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk_pixbuf
 , makeWrapper }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "installedTests" ];
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
+  buildInputs = [ libxml2 gobject-introspection gtk3 glib pango readline dbus ];
 
   propagatedBuildInputs = [ spidermonkey_60 ];
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 2db256c323f..b065025327f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
-, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection
+, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }:
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection
+    meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobject-introspection
     gtk-doc docbook_xsl docbook_xml_dtd_43 python3
   ];
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index d0ee9cff3e3..4a37599b136 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, python3
+, gtk3, glib, gtksourceview3, wrapGAppsHook, gobject-introspection, python3
 , gnome3, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3
-    gobjectIntrospection # for finding vapi files
+    gobject-introspection # for finding vapi files
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index b283454b5c0..b98a6a2d676 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
 , gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland
-, libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }:
+, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    pkgconfig which itstool gettext libxslt libxml2 gobjectIntrospection
+    pkgconfig which itstool gettext libxslt libxml2 gobject-introspection
     gtk-doc docbook_xsl
   ];
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index 8a316b60f02..9d49eb5e007 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gnome-menus-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib gobjectIntrospection ];
+  buildInputs = [ intltool glib gobject-introspection ];
 
   meta = {
     homepage = https://www.gnome.org;
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 478e0080ab9..677117b6b78 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobjectIntrospection
+, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection
 , gettext, icu, glib-networking
 , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
 }:
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    pkgconfig gobjectIntrospection vala gettext wrapGAppsHook
+    pkgconfig gobject-introspection vala gettext wrapGAppsHook
     libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
   ];
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 9dc63e0ff73..c1d5a5a916b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,7 +2,7 @@
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, gobjectIntrospection, gstreamer, wrapGAppsHook, libxslt
+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
 , sassc, systemd, gst_all_1 }:
 
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     gnome3.gnome-clocks # schemas needed
     at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
     gst_all_1.gst-plugins-good # recording
-    gobjectIntrospection
+    gobject-introspection
 
     # not declared at build time, but typelib is needed at runtime
     libgweather networkmanagerapplet
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 32a64669252..fc822be4e0e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
-, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak, fwupd
+, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
 , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43
-    valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection
+    valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 1744d723325..acde7a38572 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
+, libxml2, gnome3, gobject-introspection, libsoup }:
 
 let
   pname = "grilo";
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext gobjectIntrospection vala
+    meson ninja pkgconfig gettext gobject-introspection vala
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ];
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 420453a8af3..dad0c8850b2 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection
   # just for passthru
 , gnome3 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  buildInputs = [ glib gobjectIntrospection ];
+  buildInputs = [ glib gobject-introspection ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
index 4468ce78f40..b0384c1ebb0 100644
--- a/pkgs/desktops/gnome-3/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }:
 
 let
   pname = "gsound";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection libtool gnome3.vala ];
   buildInputs = [ glib libcanberra ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 7c9b3e0938c..a968bfd2b56 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -2,7 +2,7 @@
 , glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
 , wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
 , docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
-, callPackage, unzip, gobjectIntrospection }:
+, callPackage, unzip, gobject-introspection }:
 
 let
   unicode-data = callPackage ./unicode-data.nix {};
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig wrapGAppsHook unzip intltool itstool
     autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412
-    yelp-tools libxml2 desktop-file-utils gobjectIntrospection
+    yelp-tools libxml2 desktop-file-utils gobject-introspection
   ];
 
   buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ];
diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index be32528ef6c..4cbf0a78d89 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib
-, gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }:
+, gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }:
 
 let
   pname = "libgdata";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
 
   buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
+    [ pkgconfig libsoup intltool libxml2 glib gobject-introspection
       liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];
 
   propagatedBuildInputs = [ json-glib ];
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index ea0860a3c4e..2de8b430843 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }:
 let
   pname = "libgee";
   version = "0.20.1";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];
   buildInputs = [ glib ];
 
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index ad7d2a8ebd4..26531a61ffa 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3
 , webkitgtk, libsoup, libxml2, libarchive }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
   buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index 867e08de00e..bc0f5683a75 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }:
 
 let
   pname = "libgnome-keyring";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ];
+  propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index b0d3679b1b7..f9feb21749a 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, docbook_xml_dtd_43, gobjectIntrospection, python3, tzdata, geocode-glib, vala, gnome3 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, 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 docbook_xml_dtd_43 gobjectIntrospection python3 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
   buildInputs = [ glib gtk libsoup libxml2 geocode-glib ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index 68193bad583..852a546f4bf 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo
 , libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch
 }:
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
   buildInputs = [ glib cairo freetype libjpeg libtiff ];
   propagatedBuildInputs = [ libarchive ];
 
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index 03c79a27d81..fdbeb94c505 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python3Packages, ncurses
+, glib, gtk3, gobject-introspection, python3Packages, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ];
   propagatedBuildInputs = [
     # Required by libpeas-1.0.pc
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 42a7832a241..5c029176787 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobject-introspection }:
 let
   pname = "libzapojit";
   version = "0.0.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
   propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 50da3c99865..e80212713aa 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
 , pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
 
   buildInputs = with gnome3; [
-    glib gobjectIntrospection gtk gsettings-desktop-schemas upower
+    glib gobject-introspection gtk gsettings-desktop-schemas upower
     gnome-desktop cairo pango cogl clutter zenity libstartup_notification
     gnome3.geocode-glib libinput libgudev libwacom
     libcanberra-gtk3 zenity xkeyboard_config libxkbfile
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index e15dd783150..9a1418cbe0a 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
 , pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
 
   buildInputs = with gnome3; [
-    glib gobjectIntrospection gtk gsettings-desktop-schemas upower
+    glib gobject-introspection gtk gsettings-desktop-schemas upower
     gnome-desktop cairo pango cogl clutter zenity libstartup_notification
     gnome3.geocode-glib libinput libgudev libwacom
     libcanberra-gtk3 zenity xkeyboard_config libxkbfile
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
index b00e4c623d2..70cc31cd706 100644
--- a/pkgs/desktops/gnome-3/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/core/rest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }:
 
 let
   pname = "rest";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libsoup gobjectIntrospection];
+  buildInputs = [ glib libsoup gobject-introspection];
 
   configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
 
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
index ef088632897..5d60500b363 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -1,4 +1,4 @@
-{ 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 }:
+{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobject-introspection, 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";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook
+    pkgconfig vala gettext libxml2 gobject-introspection gtk-doc wrapGAppsHook
   ];
   buildInputs = [
     glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 415306273c7..ef79f972ff0 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
 , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
-, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }:
+, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
     # For setup hook
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index c8dbe58e2c2..77c216e7376 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
+{ stdenv, fetchurl, pkgconfig, file, intltool, gobject-introspection, glib
 , clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs
 , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
 , gdk_pixbuf, librsvg, gtk3, harfbuzz }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj";
   };
 
-  nativeBuildInputs = [ pkgconfig file intltool gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig file intltool gobject-introspection wrapGAppsHook ];
   buildInputs = [
     glib gtk3 gnome3.evince icu harfbuzz
     clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf
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 cb10213631c..baf42b88e15 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "totem-pl-parser-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
   buildInputs = [ gmime libxml2 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 2082dc0ac05..baecba8d355 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, intltool, gst_all_1
 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info
-, pkgconfig, gtk3, glib, gobjectIntrospection
+, pkgconfig, gtk3, glib, gobject-introspection
 , wrapGAppsHook, itstool, libxml2, vala, gnome3
 , gdk_pixbuf, tracker, nautilus }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ];
   buildInputs = [
     gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 385a4c3d1d6..14795064cb4 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2
+{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
 , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
 , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection
+    meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
     gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
     python2 # for data-generators
   ];
diff --git a/pkgs/desktops/gnome-3/core/vte/2.90.nix b/pkgs/desktops/gnome-3/core/vte/2.90.nix
index 7cd72ceee42..52bf198f29c 100644
--- a/pkgs/desktops/gnome-3/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/core/vte/2.90.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   versionMajor = "0.36";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ];
+  buildInputs = [ gobject-introspection intltool gnome3.glib gnome3.gtk3 ncurses ];
 
   configureFlags = [ "--enable-introspection" ];
 
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 05db98ba424..96b18a7d7c5 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
+, gnome3, ncurses, gobject-introspection, vala, libxml2, gnutls
 , gperf, pcre2
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; };
   };
 
-  nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ];
+  nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ];
   buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 536bec1d362..436b12d1064 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -35,7 +35,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3
+  inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
     clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle;
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 246dd1592da..052cd49998d 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, python3
+, glib, amtk, appstream-glib, gobject-introspection, python3
 , webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection python3 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
   buildInputs = [
     glib gtk3 webkitgtk amtk
     gnome3.defaultIconTheme gsettings-desktop-schemas
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index caef33f94bd..dca598ce314 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection
+{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobject-introspection
 , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "153wwh0861qfg53myyc3iwlqm989lbhdrlmsxaibmkxv3pgpl7ma";
   };
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
   buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index ca21cbd4523..7896595de18 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }:
 
 stdenv.mkDerivation rec {
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z";
   };
 
-  # gobjectIntrospection for finding vapi files
-  nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
+  # gobject-introspection for finding vapi files
+  nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
   buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 66f31245e0b..eaa9f3a1c8d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobjectIntrospection, gettext, gtk3, gnome3, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook
 , json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f";
   };
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig gobjectIntrospection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
   buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index 7c90d8fa4e4..8024f66650e 100644
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobject-introspection
 , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
 
 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
   };
 
-  nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobject-introspection ];
   buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index a39375126f0..7bb54904fb0 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
 , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
 , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
-, gobjectIntrospection, libpthreadstubs, sqlite
+, gobject-introspection, libpthreadstubs, sqlite
 , gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
 
 let
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
+  nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];
   buildInputs = [
     gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
     libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 30872b88e44..d74faf09fb7 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala }:
 
 let
   pname = "gexiv2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ exiv2 ];
 
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 7e2709fc1c1..f4c0d6134c0 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json-glib, gobjectIntrospection }:
+, gnome3, libsoup, json-glib, gobject-introspection }:
 
 let
   pname = "gfbgraph";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   buildInputs = [ glib gnome3.gnome-online-accounts ];
   propagatedBuildInputs = [ libsoup json-glib gnome3.rest ];
 
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index d94d14719c5..b424a8a7969 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
-, json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection
+, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
 , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
 , meson, ninja, python3
  }:
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 glib json-glib libgee libpeas gnome3.libsoup
     libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
-    libsecret gobjectIntrospection gnome3.adwaita-icon-theme
+    libsecret gobject-introspection gnome3.adwaita-icon-theme
   ];
 
   nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 056aaaa28fc..c80c8b977cf 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3
-, gtk3, glib, gobjectIntrospection, libarchive
+, gtk3, glib, gobject-introspection, libarchive
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gtk3 glib ];
-  propagatedBuildInputs = [ libarchive gobjectIntrospection ];
+  propagatedBuildInputs = [ libarchive gobject-introspection ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 1c2562916ca..d985eac4030 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup
 , itstool, libxml2, python3Packages
-, gnome3, gdk_pixbuf, libnotify, gobjectIntrospection, wrapGAppsHook }:
+, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
 
 let
   pname = "gnome-tweaks";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
     gdk_pixbuf gnome3.defaultIconTheme
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
-    gnome3.mutter gnome3.gnome-desktop gobjectIntrospection
+    gnome3.mutter gnome3.gnome-desktop gobject-introspection
     gnome3.nautilus
     # Makes it possible to select user themes through the `user-theme` extension
     gnome3.gnome-shell-extensions
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 21c25dafef3..fd71f1f2a23 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter
-, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
+, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version = "3.30.2";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib gjs mutter gtk3 dbus
-    clutter pango gobjectIntrospection
+    clutter pango gobject-introspection
   ];
 
   configureFlags = [
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index f5f6b799b4b..8d078ea41e7 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2
-, gtk-doc, gobjectIntrospection, libgit2, glib, python3 }:
+, gtk-doc, gobject-introspection, libgit2, glib, python3 }:
 
 stdenv.mkDerivation rec {
   name = "libgit2-glib-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala gtk-doc gobjectIntrospection
+    meson ninja pkgconfig vala gtk-doc gobject-introspection
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
index d8a564ac17e..fac5db94387 100644
--- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
 
 let
   pname = "libmediaart";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   buildInputs = [ glib gdk_pixbuf ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 4c3fd5a6c72..0a9b9bcfe9b 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
   dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,
-  glib, gobjectIntrospection, libpeas
+  glib, gobject-introspection, libpeas
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib gobjectIntrospection libpeas
+    glib gobject-introspection libpeas
     dbus-glib libcanberra gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings-desktop-schemas
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 957da4504eb..94a7f572b16 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python, mate }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-menus-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ glib gobjectIntrospection python ];
+  buildInputs = [ glib gobject-introspection python ];
 
   makeFlags = [
     "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index a65077872cf..b5d87acded8 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit, mate }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mate }:
 
 stdenv.mkDerivation rec {
   name = "mate-polkit-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3
-    gobjectIntrospection
+    gobject-introspection
     libappindicator-gtk3
     libindicator-gtk3
     polkit
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 7f259d66954..95d371959e5 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.4";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl cmake vala_0_38 pkgconfig wrapGAppsHook
     # For setup hook
-    gobjectIntrospection
+    gobject-introspection
   ];
   buildInputs = with gnome3; [
     glib gtk3 granite libnotify gettext vte_290 libgee
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 21705b0fb5e..694f6772282 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
   glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
-  xfce, libwnck3, libdbusmenu, gobjectIntrospection }:
+  xfce, libwnck3, libdbusmenu, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "xfce4-vala-panel-appmenu-plugin-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
                   glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
                   at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
-                  libwnck3 libdbusmenu gobjectIntrospection ];
+                  libwnck3 libdbusmenu gobject-introspection ];
 
   patches = [
     (substituteAll {
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
index 51f5fca8d1a..f6997551262 100644
--- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3, libICE, libSM
+{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM
 , libstartup_notification ? null, libxfce4util, xfconf }:
 
 mkXfceDerivation rec {
@@ -8,7 +8,7 @@ mkXfceDerivation rec {
 
   sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
 
-  buildInputs =  [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ];
+  buildInputs =  [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
   propagatedBuildInputs = [ libxfce4util libICE libSM ];
 
   meta = with lib; {
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
index fe9974ca573..6a3b633cd09 100644
--- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkXfceDerivation, gobjectIntrospection }:
+{ lib, mkXfceDerivation, gobject-introspection }:
 
 mkXfceDerivation rec {
   category = "xfce";
@@ -7,7 +7,7 @@ mkXfceDerivation rec {
 
   sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";
 
-  buildInputs = [ gobjectIntrospection ];
+  buildInputs = [ gobject-introspection ];
 
   meta = with lib; {
     description = "Extension library for Xfce";
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 590f7f0d971..f0d629ad5e4 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -474,7 +474,7 @@ self: super: builtins.intersectAttrs super {
   hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
 
   # This propagates this to everything depending on haskell-gi-base
-  haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
+  haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobject-introspection;
 
   # requires valid, writeable $HOME
   hatex-guide = overrideCabal super.hatex-guide (drv: {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c6e9204372b..05b5f286f19 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -85842,7 +85842,7 @@ self: {
 
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
+     , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -85854,11 +85854,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gobjectIntrospection ];
+       libraryPkgconfigDepends = [ gobject-introspection ];
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) gobjectIntrospection;};
+     }) {inherit (pkgs.gnome3) gobject-introspection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -98981,7 +98981,7 @@ self: {
 
   "haskell-gi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
+     , directory, doctest, filepath, glib, gobject-introspection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
      , text, transformers, xdg-basedir, xml-conduit
      }:
@@ -98994,12 +98994,12 @@ self: {
          haskell-gi-base mtl pretty-show process regex-tdfa safe text
          transformers xdg-basedir xml-conduit
        ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       libraryPkgconfigDepends = [ glib gobject-introspection ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobjectIntrospection;};
+         inherit (pkgs.gnome3) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 66d540f8d66..b42240a26c4 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow
-, gobjectIntrospection, polkit, systemd, coreutils, meson, dbus
+, gobject-introspection, polkit, systemd, coreutils, meson, dbus
 , ninja, python3 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];
 
-  buildInputs = [ glib intltool gobjectIntrospection polkit systemd dbus ];
+  buildInputs = [ glib intltool gobject-introspection polkit systemd dbus ];
 
   mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system"
                  "-Dlocalstatedir=/var" ];
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 831d0cc0f71..9569f51ba79 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
-, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant
+, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
 , sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
 , libuuid, json-glib, meson, gperf, ninja
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib gettext sqlite libsoup
     attr acl libuuid json-glib
-    libarchive gobjectIntrospection gperf
+    libarchive gobject-introspection gperf
   ];
   propagatedBuildInputs = [ gtk3 ];
 
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 19b82fcffa3..f53b63472cc 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
 , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
-, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection
+, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
 , pcre, itstool, gperf, vala
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja pkgconfig gettext
     libxslt xmlto docbook_xsl docbook_xml_dtd_45
-    gobjectIntrospection itstool vala
+    gobject-introspection itstool vala
   ];
 
   buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 1cec75ccc3d..cae67480964 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -4,7 +4,7 @@
 , meson
 , ninja
 , pkgconfig
-, gobjectIntrospection
+, gobject-introspection
 
 , dbus
 , glib
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]
     # Fixup rpaths because of meson, remove with meson-0.47
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
   buildInputs = [ dbus glib libX11 libXtst libXi ];
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 7d3ba4d65e0..b56c84f57bd 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
-, fixDarwinDylibNames, gobjectIntrospection, gnome3
+, fixDarwinDylibNames, gobject-introspection, gnome3
 }:
 
 let
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
 
   propagatedBuildInputs = [
     # Required by atk.pc
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index b2c7bf5d644..e741305f991 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
-, libstartup_notification, gobjectIntrospection, gtk-doc, docbook_xsl
+, libstartup_notification, gobject-introspection, gtk-doc, docbook_xsl
 , xorgserver, dbus, python2 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     automake
     docbook_xsl
     gnome3.gnome-common
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     libtool
     pkgconfig
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 6c895116531..d59bc5161af 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, meson, ninja
-, gobjectIntrospection, clutter, gtk3, gnome3 }:
+, gobject-introspection, clutter, gtk3, gnome3 }:
 
 let
   pname = "clutter-gtk";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 090f85554b6..7095a808540 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, libinput, libgudev, libxkbcommon
+, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
 }:
 
 let
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon
+      atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index f35335e4be7..e4296810f35 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
-, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3
+, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
 , mesa_noglu
 , gstreamerSupport ? true, gst_all_1 }:
 
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
-      glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu
+      glib gdk_pixbuf gobject-introspection wayland mesa_noglu
       libGL libXrandr libXfixes libXcomposite libXdamage
     ]
     ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 1288f4ac2f5..fb7ec512319 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig
-, glib, icu, gobjectIntrospection }:
+, glib, icu, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "dee-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v";
   };
 
-  buildInputs = [ glib gobjectIntrospection icu ];
+  buildInputs = [ glib gobject-introspection icu ];
   nativeBuildInputs = [ python pkgconfig ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 924fb52b090..e884bb41e20 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base
-, gst-python, gupnp-igd, gobjectIntrospection
+, gst-python, gupnp-igd, gobject-introspection
 , gst-plugins-good, gst-plugins-bad, gst-libav
 }:
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ libnice python pygobject2 gupnp-igd libnice ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
 
   propagatedBuildInputs = [
     gstreamer gst-plugins-base gst-python
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 693d50e9330..41ab930a30e 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,5 +1,5 @@
 { 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, xdg-dbus-proxy, p11-kit
+, gobject-introspection, 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 }:
 
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
+    autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection
     gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
   ];
 
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index dc0ca5fffa3..0b5f1002c23 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig
+{ stdenv, fetchurl, gettext, gobject-introspection, pkgconfig
 , meson, ninja, glibcLocales, git, vala, glib, zlib
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr";
   };
 
-  nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobject-introspection ];
 
   buildInputs = [ glib zlib ];
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 85a65aea562..20f05d28bfe 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
 , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
+, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
 
 let
   pname = "gdk-pixbuf";
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
-    gtk-doc gobjectIntrospection makeWrapper
+    gtk-doc gobject-introspection makeWrapper
   ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
     "-Ddocs=true"
     "-Djasper=true"
     "-Dx11=true"
-    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+    "-Dgir=${if gobject-introspection != null then "true" else "false"}"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index fa3aa77cd3a..e1f243f8fd3 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -7,7 +7,7 @@
 , evemu
 , frame
 , gdk_pixbuf
-, gobjectIntrospection
+, gobject-introspection
 , grail
 , gtk3
 , libX11
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     [ pygobject3  ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
-  buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail
+  buildInputs = [ atk dbus evemu frame gdk_pixbuf gobject-introspection grail
     gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
   ];
 
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index da7041b6786..c405002b6d6 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
-, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+, modemmanager, avahi, glib-networking, wrapGAppsHook, gobject-introspection
 , withDemoAgent ? false
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook gobjectIntrospection
+    pkgconfig intltool wrapGAppsHook gobject-introspection
     # devdoc
     gtk-doc docbook_xsl docbook_xml_dtd_412
   ];
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index b25f5c90bfa..1c6dfc4a852 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version = "2.6.23";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   propagatedBuildInputs = [ glib zlib libgpgerror ];
   configureFlags = [ "--enable-introspection=yes" ];
 
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 443200c17b1..d036140567f 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version = "3.2.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ gobjectIntrospection zlib gpgme libidn2 libunistring ];
+  buildInputs = [ gobject-introspection zlib gpgme libidn2 libunistring ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib ];
   configureFlags = [ "--enable-introspection=yes" ];
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 51274f0cdca..3dc66aec159 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -3,7 +3,7 @@
 , substituteAll, nixStoreDir ? builtins.storeDir
 , x11Support ? true
 }:
-# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
+# now that gobject-introspection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
 # In that case its about 6MB which could be separated
 
@@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "gobjectIntrospection";
     };
   };
 
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index ef36a9c076f..99b1307179a 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
 
 let
   version = "2.0.4";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
-  buildInputs = [ gtk3 cairo glib gobjectIntrospection ];
+  buildInputs = [ gtk3 cairo glib gobject-introspection ];
 
   configureFlags = [
     "--disable-python"
diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index ae2decb68ac..2113b4f690b 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }:
+{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "granite";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     gettext
-    gobjectIntrospection
+    gobject-introspection
     ninja
     pkgconfig
     vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 9e893932a64..3f9cd8120d8 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }:
+{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gsettings-qt-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     qmake
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
index af7aa2b1207..21838680dc4 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
-, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl
+, sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl
 , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
 , symlinkJoin, gsignondPlugins, plugins }:
 
@@ -23,7 +23,7 @@ unwrapped = stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     docbook_xsl
     glibcLocales
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     meson
     ninja
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index a23c1487881..a65ab767baa 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }:
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gsignond-plugin-lastfm-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
index 763e76c9cc9..e8b8091bc24 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gsignond-plugin-mail-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index ee45430122c..0da6745bb4e 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check
 , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
-, docbook_xsl, glibcLocales, gobjectIntrospection }:
+, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gsignond-plugin-oauth-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     docbook_xsl
     glibcLocales
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     meson
     ninja
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 25f20557906..b09bc0e60ab 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
-, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }:
+, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gsignond-plugin-sasl-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     docbook_xsl
     glibcLocales
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     meson
     ninja
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 0145272c281..776125a7537 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobject-introspection, gnome3 }:
 
 let
   pname = "gspell";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
 
-  nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ];
+  nativeBuildInputs = [ pkgconfig vala gobject-introspection libxml2 ];
   buildInputs = [ glib gtk3 isocodes ];
 
   passthru = {
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 0d77018eee5..ed1e5b6faab 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
 
 stdenv.mkDerivation rec {
   name = "gssdp-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ libsoup gtk3 ];
   propagatedBuildInputs = [ glib ];
 
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index c67526fb712..0acdf71fb72 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, lib
-, pkgconfig, meson, ninja, gettext, gobjectIntrospection
+, pkgconfig, meson, ninja, gettext, gobject-introspection
 , python3, gstreamer, orc, pango, libtheora
 , libintl, libopus
 , enableX11 ? stdenv.isLinux, libXv
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python3 gettext gobjectIntrospection ]
+  nativeBuildInputs = [ pkgconfig python3 gettext gobject-introspection ]
 
   # Broken meson with Darwin. Should hopefully be fixed soon. Tracking
   # in https://bugzilla.gnome.org/show_bug.cgi?id=781148.
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index c1f2b2f006c..2c1faac387e 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja
-, pkgconfig, gettext, gobjectIntrospection
+, pkgconfig, gettext, gobject-introspection
 , bison, flex, python3, glib, makeWrapper
 , libcap,libunwind, darwin
 , lib
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection
+    meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection
   ];
   buildInputs =
        lib.optionals stdenv.isLinux [ libcap libunwind ]
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 56d17b49cbb..6e1f2f4a2c5 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja
 , pkgconfig, python, gst-plugins-base, libxml2
-, flex, perl, gettext, gobjectIntrospection
+, flex, perl, gettext, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ];
 
   propagatedBuildInputs = [ gst-plugins-base libxml2 ];
 
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 624b967765c..6236edec6a4 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig
-, gst-plugins-base, gettext, gobjectIntrospection
+, gst-plugins-base, gettext, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja gettext gobjectIntrospection pkgconfig ];
+  nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ];
 
   buildInputs = [ gst-plugins-base ];
 }
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index abcdd0b9305..916185bf7ec 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
-, python, gobjectIntrospection, json-glib
+, python, gobject-introspection, json-glib
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig gobjectIntrospection
+    pkgconfig gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 4bf42e1b5b6..266abe16c10 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk_pixbuf, xlibsWrapper, gobjectIntrospection
+, gdk_pixbuf, xlibsWrapper, gobject-introspection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? true, cups ? null
 , gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ setupHook perl pkgconfig gettext gobject-introspection ];
 
   patches = [
     ./2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 9d99ef6697b..421029a9d55 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection
 , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
 , x11Support ? stdenv.isLinux
 , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ];
+  nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ];
 
   patches = [
     ./3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 0171a4b6833..26d0b5c3595 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "gtk-mac-integration-2.0.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ gtk ];
 
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index e9166cb346f..58c8ebccc3c 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
-, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 let
   checkInputs = [ xvfb_run dbus ];
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
+  nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]
     ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [ atk cairo glib pango libxml2 gettext ];
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 0a417e719ac..4ff1e999145 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
-, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 let
   checkInputs = [ xvfb_run dbus ];
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ]
+  nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]
     ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [ atk cairo glib pango libxml2 ];
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 11031511000..6d428837680 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobjectIntrospection, vala}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}:
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection vala ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
   buildInputs = [ aspell gtk3 enchant2 isocodes ];
   propagatedBuildInputs = [ enchant2 ];
 
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 7491da7c3e2..5e68a027470 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-av-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ gupnp glib libxml2 ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index aba95889b69..a6c11a569cf 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-dlna-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 50107959786..05c8522aebc 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
+{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-igd-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
   };
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig gettext gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   propagatedBuildInputs = [ glib gupnp ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 45adf46ff36..648209125fe 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ./fix-requires.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
   propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index f445f90f308..78a2d365033 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
 , glib, systemd, libusb1, vala, hwdata
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja pkgconfig gettext
     gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
-    gobjectIntrospection vala
+    gobject-introspection vala
   ];
   buildInputs = [ systemd glib ];
 
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 44dd12c7750..9a18b025fab 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext
-, gobjectIntrospection, fixDarwinDylibNames, gnome3
+, gobject-introspection, fixDarwinDylibNames, gnome3
 }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index a7f58a6af8f..7eee8201f57 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 let
   version = "3.30.0";
   pname = "jsonrpc-glib";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
   buildInputs = [ glib json-glib ];
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 20ab104874d..abbb2457f6a 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk2, python2Packages, lua, gobjectIntrospection
+, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
 }:
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     autoconf automake libtool gnome3.gnome-common gtk-doc gtk2
-    python pygtk lua gobjectIntrospection
+    python pygtk lua gobject-introspection
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index fe7482ed56e..91ad59ad27a 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection
+, gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
   buildInputs = [
     gnome3.gnome-common gtk-doc gtk3
-    libX11 libXext libXrender gobjectIntrospection
+    libX11 libXext libXrender gobject-introspection
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index 873ccc5665d..54d33e5f425 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
+{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
 
 stdenv.mkDerivation rec {
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
+  buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
 
   configurePhase = ''
     ./configure --with-pkg-config=$PKG_CONFIG_PATH \
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index e8e23ed5ffb..525ec6e35f6 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
-, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobjectIntrospection }:
+, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "libaccounts-glib-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_43
     docbook_xsl
     glibcLocales
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     meson
     ninja
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 8bf0e4bcb93..46cc30a8944 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -5,7 +5,7 @@
 , glib, dbus-glib, gtkVersion ? "3"
 , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
 , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, python2Packages, gobjectIntrospection, vala
+, python2Packages, gobject-introspection, vala
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
  }:
 
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     glib dbus-glib
-    python pygobject2 pygtk gobjectIntrospection vala
+    python pygobject2 pygtk gobject-introspection vala
   ] ++ (if gtkVersion == "2"
     then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
     else [ libindicator-gtk3 ]);
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index b99a3c7059a..eb38c2e38a6 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
-, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml
+, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, libyaml
 , cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
 }:
 
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobjectIntrospection
+    autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 95b1ad074b0..b8d25f48b3b 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
-, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
+, clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:
 
 let
   pname = "libchamplain";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];
 
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 8cca4bca04b..bef7a161dd3 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
+{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq";
   };
 
-  nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
+  nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
   buildInputs = [ glib gtk3 ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index 730cef6f696..8fbbae43f61 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, file
 , pkgconfig, intltool
 , glib, dbus-glib, json-glib
-, gobjectIntrospection, vala_0_38, gnome-doc-utils
+, gobject-introspection, vala_0_38, gnome-doc-utils
 , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
 
 with lib;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib dbus-glib json-glib
-    gobjectIntrospection vala_0_38 gnome-doc-utils
+    gobject-introspection vala_0_38 gnome-doc-utils
   ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
 
   postPatch = ''
diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix
index 548114b642f..430ebcfd309 100644
--- a/pkgs/development/libraries/libgrss/default.nix
+++ b/pkgs/development/libraries/libgrss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
 
 let
   version = "0.7.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
   };
 
-  nativeBuildInputs = [ pkgconfig vala gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ glib libxml2 libsoup ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index bab7ede2d6e..fcc76938b3e 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }:
 let
   pname = "libgtop";
   version = "2.38.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index e07622eb13a..d3dea766cbb 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }:
 
 let
   pname = "libgudev";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   buildInputs = [ udev glib ];
 
   # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 683dd670198..7e80ec817d1 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobjectIntrospection, vala
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , gtk3, gnome3
 , dbus, xvfb_run, libxml2
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gobjectIntrospection vala
+    meson ninja pkgconfig gobject-introspection vala
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
   buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 0664da50b91..c1ec533ba5b 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40
-, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:
+, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
 
 let
   pname = "libhttpseverywhere";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   };
 
   # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1
-  nativeBuildInputs = [ vala_0_40 gobjectIntrospection meson ninja pkgconfig ];
+  nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ];
   buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
 
   mesonFlags = [ "-Denable_valadoc=true" ];
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 93586341dc4..9d892069b26 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobjectIntrospection
+{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection
 , python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    perl pkgconfig cmake ninja vala gobjectIntrospection
+    perl pkgconfig cmake ninja vala gobject-introspection
     (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
     gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
   ];
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 1f5ee90337a..f6dc85b629d 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -4,7 +4,7 @@
 , pkgconfig, autoconf
 , glib, dbus-glib, libdbusmenu
 , gtkVersion ? "3", gtk2 ? null, gtk3 ? null
-, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
+, pythonPackages, gobject-introspection, vala, gnome-doc-utils
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
  }:
 
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
     sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ];
+  nativeBuildInputs = [ pkgconfig autoconf gobject-introspection vala gnome-doc-utils ];
 
   buildInputs = [
     glib dbus-glib libdbusmenu
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index 78c0fd6fb26..c57590aad21 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -1,7 +1,7 @@
 { gtkWidgets ? false # build GTK widgets for libinfinity
 , avahiSupport ? false # build support for Avahi in libinfinity
 , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
-, gobjectIntrospection
+, gobject-introspection
 , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss
 , libintl }:
 
@@ -21,7 +21,7 @@ let
 
     outputs = [ "bin" "out" "dev" "man" "devdoc" ];
 
-    nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ];
+    nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
     buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]
       ++ stdenv.lib.optional gtkWidgets gtk3
       ++ stdenv.lib.optional avahiSupport avahi;
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index d57d75c5cae..6a9cab16e7e 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext
-, pkgconfig, glib, libxml2, gobjectIntrospection, gnome-common, unzip
+, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip
 }:
 
 stdenv.mkDerivation rec {
@@ -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 gobject-introspection gnome-common
     unzip ];
   nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ];
 
diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix
index 51d2e49eb35..258fbc2657b 100644
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/pkgs/development/libraries/libmanette/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection
+{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection
 , glib, libgudev, libevdev, gnome3 }:
 
 let
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ];
   buildInputs = [ glib libgudev libevdev ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index 42bcf5b6474..6653025eb05 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , libtool, pkgconfig, automake, autoconf, intltool
-, glib, gobjectIntrospection, gtk2, gtk-doc
+, glib, gobject-introspection, gtk2, gtk-doc
 , clutter, clutter-gtk
 }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     automake autoconf libtool
     intltool
-    gobjectIntrospection glib
+    gobject-introspection glib
     gtk2 gtk-doc clutter clutter-gtk
   ];
 
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index 11f2731eb72..d427f7decf8 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook
-, glib, gdk_pixbuf, gobjectIntrospection }:
+, glib, gdk_pixbuf, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   ver_maj = "0.7";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   # disable tests as we don't need to depend on gtk+(2/3)
   configureFlags = [ "--disable-tests" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook gobject-introspection ];
   buildInputs = [ glib gdk_pixbuf ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index d4c324d4f23..e0f3be23070 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl
 , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl
+    pkgconfig vala intltool gobject-introspection gtk-doc docbook_xsl
   ];
   buildInputs = [ glib libsoup libxml2 libxslt ];
   checkInputs = [ check curl perl ];
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 12bfffb21e9..5a5fa3e279a 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintl, darwin, rust, gnome3
 , withGTK ? false, gtk3 ? null
-, vala, gobjectIntrospection }:
+, vala, gobject-introspection }:
 
 let
   pname = "librsvg";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ]
+  nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobject-introspection ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       ApplicationServices
     ]);
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index afc1b576b07..5b3a00b12d4 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
-, libgcrypt, gobjectIntrospection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }:
+, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }:
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl docbook_xml_dtd_42 libintl gobjectIntrospection vala gtk-doc ];
+  nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc ];
   buildInputs = [ libgcrypt ];
   # optional: build docs with gtk-doc? (probably needs a flag as well)
 
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index db2b468bb3a..0e6bdb80cdd 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }:
+{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libsignon-glib";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_412
     docbook_xml_dtd_43
     docbook_xsl
-    gobjectIntrospection
+    gobject-introspection
     gtk-doc
     meson
     ninja
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index cf943d45b4d..19ebbd363e1 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub,
   libtool, gettext, pkgconfig,
-  vala, gnome-common, gobjectIntrospection,
+  vala, gnome-common, gobject-introspection,
   libgee, json-glib, skk-dicts, libxkbcommon }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ skk-dicts libxkbcommon ];
-  nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ];
+  nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ];
   propagatedBuildInputs = [ libgee json-glib ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 8cd43adbea9..e59282553fb 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
-, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection, vala
+, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
 , libpsl, python3 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = [ python3 sqlite libpsl ];
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
   propagatedBuildInputs = [ glib libxml2 ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index 1a4f16046fc..a072591ca9d 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, dbus, dbus-glib, gtk3, gobjectIntrospection
+, dbus, dbus-glib, gtk3, gobject-introspection
 , gtkdoc, docbook_xml_dtd_45, docbook_xsl
 , libxslt, libxml2 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
+  buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
 
   meta = {
     homepage = https://wiki.gnome.org/Attic/LibUnique;
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index f9f0b2b6555..52f01229c4a 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
-, glib, vala, dee, gobjectIntrospection, libdbusmenu
+, glib, vala, dee, gobject-introspection, libdbusmenu
 , gtk3, intltool, gnome-common, python3, icu }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     gnome-common
-    gobjectIntrospection
+    gobject-introspection
     intltool
     libtool
     pkgconfig
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index d26b830e249..74c3d24560c 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
-, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
+, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl
 , xen, libapparmor, vala
 }:
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig vala ];
   buildInputs = [
     libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
-    python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor
+    python pygobject2 gobject-introspection libcap_ng numactl libapparmor
   ] ++ stdenv.lib.optionals stdenv.isx86_64 [
     xen
   ];
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 3137ac2c8f2..eb591d4e184 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}:
+{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3}:
 
 let
   pname = "libwnck";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{
 
   configureFlags = [ "--enable-introspection" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
   propagatedBuildInputs = [ libX11 gtk3 ];
 
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 263796cdc78..773389e60f5 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
-, glib, isocodes, gobjectIntrospection }:
+, glib, isocodes, gobject-introspection }:
 
 let
   version = "5.4";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
 
-  buildInputs = [ gobjectIntrospection ];
+  buildInputs = [ gobject-introspection ];
 
   preAutoreconf = ''
     export NOCONFIGURE=1
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index b7033ea4ddf..981ec2f0a3a 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,4 +1,4 @@
-{ cairo, fetchzip, glib, gnome3, gobjectIntrospection, pkgconfig, stdenv }:
+{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "osm-gps-map-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
-    cairo glib gobjectIntrospection
+    cairo glib gobject-introspection
   ] ++ (with gnome3; [
     gnome-common gtk libsoup
   ]);
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 6b5a0a35971..7b1d69ed42b 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
-, libintl, gobjectIntrospection, darwin, fribidi, gnome3
+, libintl, gobject-introspection, darwin, fribidi, gnome3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
 }:
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
   buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     Carbon
     CoreGraphics
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 6675bbf9183..625e0d3e104 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl
-, intltool, spidermonkey_52 , gobjectIntrospection, libxslt, docbook_xsl, dbus
+, intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus
 , docbook_xml_dtd_412, gtk-doc, coreutils
 , useSystemd ? stdenv.isLinux, systemd
 , doCheck ? stdenv.isLinux
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
   nativeBuildInputs =
-    [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection perl ]
+    [ gtk-doc pkgconfig autoreconfHook intltool gobject-introspection perl ]
     ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
   buildInputs =
-    [ glib expat pam spidermonkey_52 gobjectIntrospection ]
+    [ glib expat pam spidermonkey_52 gobject-introspection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 1e86b19ad5a..633c3d69618 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -2,7 +2,7 @@
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
-, introspectionSupport ? false, gobjectIntrospection ? null
+, introspectionSupport ? false, gobject-introspection ? null
 , utils ? false
 , minimal ? false, suffix ? "glib"
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     [ zlib freetype fontconfig libjpeg openjpeg ]
     ++ optionals (!minimal) [ cairo lcms curl ]
     ++ optional qt5Support qtbase
-    ++ optional introspectionSupport gobjectIntrospection;
+    ++ optional introspectionSupport gobject-introspection;
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index acfae1fc888..53ed04527a8 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -2,7 +2,7 @@
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
-, introspectionSupport ? false, gobjectIntrospection ? null
+, introspectionSupport ? false, gobject-introspection ? null
 , utils ? false, nss ? null
 , minimal ? false, suffix ? "glib"
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     ++ optionals (!minimal) [ cairo lcms curl ]
     ++ optional qt5Support qtbase
     ++ optional utils nss
-    ++ optional introspectionSupport gobjectIntrospection;
+    ++ optional introspectionSupport gobject-introspection;
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index a42084ba841..bc583f732db 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1
-, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
+, openssl, libpulseaudio, pixman, gobject-introspection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
 , withPolkit ? true, polkit, acl, usbutils
 , vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }:
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile
   ] ++ optionals withPolkit [ polkit acl usbutils ] ;
 
-  nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobject-introspection ];
 
   PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 934b2350727..7436da50319 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
-, gobjectIntrospection, vala, glibcLocales }:
+, gobject-introspection, vala, glibcLocales }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.24.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   LC_ALL = "en_US.UTF-8";
   propagatedBuildInputs = [ dbus-glib glib ];
 
-  nativeBuildInputs = [ pkgconfig libxslt gobjectIntrospection vala ];
+  nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ];
   buildInputs = [ glibcLocales python2 ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
index 73bf69f6c0d..2b63bab0ead 100644
--- a/pkgs/development/libraries/template-glib/default.nix
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 let
   version = "3.30.0";
   pname = "template-glib";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
-  nativeBuildInputs = [ glib gobjectIntrospection ];
+  nativeBuildInputs = [ glib gobject-introspection ];
 
   mesonFlags = [
     "-Denable_gtk_doc=true"
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 377ceba59e7..6eef95309aa 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }:
+{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version="0.5.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ];
+  buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
 
   preConfigure = "./autogen.sh";
 
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 912bcac55cd..0bf7fb59e32 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection
+{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobject-introspection
 , pkgconfig, glib, systemd, libgudev, vala }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib systemd libgudev ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig vala gobject-introspection ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 7b62de69123..9030149fc8a 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, pruneLibtoolFiles
+, pkgconfig, which, gettext, gobject-introspection, 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 pruneLibtoolFiles
+    pkgconfig which gettext gobject-introspection pruneLibtoolFiles
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 4411b4e8434..e18142eb1d0 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
-, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
+, pkgconfig, gettext, gobject-introspection, 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
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake ninja perl python2 ruby bison gperf
-    pkgconfig gettext gobjectIntrospection
+    pkgconfig gettext gobject-introspection
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index b3c205ddab1..b072fb1d4e9 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkgconfig, glib, sqlite, gobjectIntrospection, vala
+{ stdenv, fetchFromGitLab, pkgconfig, glib, sqlite, gobject-introspection, vala
 , autoconf, automake, libtool, gettext, dbus, telepathy-glib
 , gtk3, json-glib, librdf_raptor2, dbus-glib
 , pythonSupport ? true, python2Packages
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
 
   nativeBuildInputs = [
-    autoconf automake libtool pkgconfig gettext gobjectIntrospection vala python2Packages.python
+    autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python
   ];
   buildInputs = [
     glib sqlite dbus telepathy-glib dbus-glib
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index 2d193616e5f..804267268d7 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -5,7 +5,7 @@
 , pyatspi
 , pycairo
 , at-spi2-core
-, gobjectIntrospection
+, gobject-introspection
 , gtk3
 , gsettings-desktop-schemas
 , fetchurl
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     ./nix-support.patch
   ];
 
-  nativeBuildInputs = [ gobjectIntrospection dbus xvfb_run ]; # for setup hooks
+  nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks
   propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
index 4324b357f29..e746b304e8b 100644
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , pkgconfig
 , gtk3
-, gobjectIntrospection
+, gobject-introspection
 , pygtk
 , pygobject3
 , goocanvas2
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "ca3950c2728916d9fb703c886f3940ac9b76739f99ec840b0e1c2c282510e1ab";
   };
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection ];
   propagatedBuildInputs = [
     pygtk
     pygobject3
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index aa8050de088..cd8f7c0c91b 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
 pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
-gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
+gobject-introspection, pygobject3, gtk3, matplotlib, ncurses,
 buildPythonPackage }:
 
 buildPythonPackage rec {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     sparsehash
     # drawing
     cairomm
-    gobjectIntrospection
+    gobject-introspection
     gtk3
     pycairo
     matplotlib
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 96da9bcf4f6..2b9703452dc 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3
-, gobjectIntrospection, gst-plugins-base, isPy3k
+, gobject-introspection, gst-plugins-base, isPy3k
 }:
 
 let
@@ -46,7 +46,7 @@ in buildPythonPackage rec {
     substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"}
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig python gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ];
 
   mesonFlags = [
     "-Dpython=python${if isPy3k then "3" else "2"}"
diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix
index 40115f398c6..7f0ba451af6 100644
--- a/pkgs/development/python-modules/gtimelog/default.nix
+++ b/pkgs/development/python-modules/gtimelog/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   LC_ALL="en_US.UTF-8";
 
   # TODO: AppIndicator
-  propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
+  propagatedBuildInputs = [ pkgs.gobject-introspection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
 
   checkPhase = ''
     substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix
index f073e7baa4e..dec34c64f0a 100644
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -2,7 +2,7 @@
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
 , enableGhostscript ? false, ghostscript ? null, gtk3
-, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
+, enableGtk2 ? false, pygtk ? null, gobject-introspection
 , enableGtk3 ? false, cairo
 , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
 , enableQt ? false, pyqt4
@@ -42,7 +42,7 @@ buildPythonPackage rec {
       libpng pkgconfig mock pytz ]
     ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
     ++ stdenv.lib.optional enableGtk2 pygtk
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
+    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
     ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
     ++ stdenv.lib.optionals enableQt [ pyqt4 ]
     ++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 2cd7557bac7..718eb2de425 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -2,7 +2,7 @@
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
 , enableGhostscript ? true, ghostscript ? null, gtk3
-, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
+, enableGtk2 ? false, pygtk ? null, gobject-introspection
 , enableGtk3 ? false, cairo
 , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
 , enableQt ? false, pyqt4
@@ -44,7 +44,7 @@ buildPythonPackage rec {
       libpng pkgconfig mock pytz ]
     ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
     ++ stdenv.lib.optional enableGtk2 pygtk
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
+    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
     ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
     ++ stdenv.lib.optionals enableQt [ pyqt4 ];
 
diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix
index da3a0591f7c..e6d36a37089 100644
--- a/pkgs/development/python-modules/neovim_gui/default.nix
+++ b/pkgs/development/python-modules/neovim_gui/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
   };
 
-  propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobjectIntrospection pkgs.makeWrapper pkgs.gtk3 ];
+  propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ];
 
   patchPhase = ''
     sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 430fcf62e93..acc8ee71311 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection,
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
 pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   ];
 
   nativeBuildInputs = [ pkgconfig meson ninja ];
-  buildInputs = [ glib gobjectIntrospection ]
+  buildInputs = [ glib gobject-introspection ]
                  ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 5ca6e03fbf4..68d097d71d6 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
-, wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }:
+, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }:
 
 buildPythonPackage rec {
   pname = "xdot";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ];
+  propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ];
 
   meta = with lib; {
     description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index cf12b56a36e..9a2aaa91ad8 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -22,7 +22,7 @@
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
-, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
+, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
 , libselinux ? null, libsepol ? null
 }@args:
 
@@ -157,7 +157,7 @@ in
 
   gio2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre gobjectIntrospection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
+    buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -176,7 +176,7 @@ in
 
   gobject-introspection = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gobjectIntrospection gtk2 pcre ];
+    buildInputs = [ gobject-introspection gtk2 pcre ];
   };
 
   grpc = attrs: {
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index ae8f17c213a..6c4ff49d90f 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }:
+, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobject-introspection }:
 
 let
   pname = "d-feet";
@@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
-  buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ];
+  buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ];
 
   propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
 
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index fba5fe91ed8..a36e251a4a2 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
+{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
 stdenv.mkDerivation rec {
   version = "0.36.1";
   name = "valadoc-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
   };
 
-  nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ];
   buildInputs = [ graphviz glib gnome3.libgee expat ];
 
   passthru = {
diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix
index 9759eb8956a..d3fff64ada6 100644
--- a/pkgs/games/gshogi/default.nix
+++ b/pkgs/games/gshogi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonApplication, fetchFromGitHub
-, gtk3, gobjectIntrospection
+, gtk3, gobject-introspection
 , wrapGAppsHook, python3Packages }:
 
 buildPythonApplication rec {
@@ -17,7 +17,7 @@ buildPythonApplication rec {
 
   buildInputs = [
     gtk3
-    gobjectIntrospection
+    gobject-introspection
   ];
 
   nativeBuildInputs = [ wrapGAppsHook ];
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index b504002b7d9..d9f68b3e2ec 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook
-, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg
+, gtk3, gobject-introspection, libappindicator-gtk3, librsvg
 , evdev, pygobject3, pylibacl, pytest, bluez
 , linuxHeaders
 , libX11, libXext, libXfixes, libusb1, udev
@@ -18,7 +18,7 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [ wrapGAppsHook ];
 
-  buildInputs = [ gtk3 gobjectIntrospection libappindicator-gtk3 librsvg ];
+  buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ];
 
   propagatedBuildInputs = [ evdev pygobject3 pylibacl ];
 
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index eabb27f6ae2..f006565a95d 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk-doc, pkgconfig, gobjectIntrospection, intltool
+{ stdenv, fetchurl, gtk-doc, pkgconfig, gobject-introspection, intltool
 , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking
 , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
 , gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
 
   nativeBuildInputs = [
-    meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info
+    meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
     valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
   ];
   buildInputs = [
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index a3ae0b74f12..9be17ade149 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3
 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
-, gobjectIntrospection }:
+, gobject-introspection }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "piper-${version}";
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb";
   };
 
-  nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
   buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ];
   propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
 
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
index d4d6ae18ce6..53b6cbc3401 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -8,7 +8,7 @@
 , libusb1
 , libzip
 , glib
-, gobjectIntrospection
+, gobject-introspection
 , gst_all_1
 , libwebcam
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libusb1
     libzip
     glib
-    gobjectIntrospection
+    gobject-introspection
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     libwebcam
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 4f59828098c..e0340a0b784 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, intltool, gnused
 , 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
+, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43
 , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
 }:
 
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig gnome3.gnome-common libtool intltool gobjectIntrospection
+    pkgconfig gnome3.gnome-common libtool intltool gobject-introspection
     gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl
   ];
 
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 6c6e411000a..0aaa31163ac 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib
 , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1
-, useSystemd ? true, systemd, gobjectIntrospection
+, useSystemd ? true, systemd, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]
+    [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobject-introspection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index b6ba431da9d..374d3e112ca 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick,
-  gobjectIntrospection, gtk3, wrapGAppsHook, gnome3 }:
+  gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
 
 python36Packages.buildPythonApplication rec {
   pname = "wpgtk";
@@ -22,7 +22,7 @@ python36Packages.buildPythonApplication rec {
   buildInputs = [
     wrapGAppsHook
     gtk3
-    gobjectIntrospection
+    gobject-introspection
     gnome3.adwaita-icon-theme
     libxslt
   ];
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 5f9c4accc72..ecbd36e1162 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -3,7 +3,7 @@
 , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
-, gst_all_1, pulseaudio, gobjectIntrospection
+, gst_all_1, pulseaudio, gobject-introspection
 , pam }:
 
 with lib;
@@ -28,7 +28,7 @@ in buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ];
   buildInputs = [
     cython
 
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 8200864de4f..ec31d3ebbe9 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gobjectIntrospection
+{ stdenv, fetchurl, gobject-introspection
 , gnutls, cairo, libtool, glib, pkgconfig
 , cyrus_sasl, intltool, libpulseaudio
 , libgcrypt, gtk3, vala, gnome3
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    python3 pkgconfig intltool libtool gobjectIntrospection vala
+    python3 pkgconfig intltool libtool gobject-introspection vala
   ];
   buildInputs = [
     gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 1cba381a57b..8d2bf5e634c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins
-, pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
+, pythonPackages, imagemagick, gobject-introspection, gst_all_1
 , fetchpatch
 
 # Attributes needed for tests of the external plugins
@@ -121,7 +121,7 @@ in pythonPackages.buildPythonApplication rec {
     pythonPackages.unidecode
     pythonPackages.gst-python
     pythonPackages.pygobject3
-    gobjectIntrospection
+    gobject-introspection
   ] ++ optional enableAcoustid      pythonPackages.pyacoustid
     ++ optional (enableFetchart
               || enableEmbyupdate
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index 497e17e3cc0..15e7a772bbd 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobjectIntrospection }:
+{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
   buildInputs = [ glib ];
 
   # docs somehow crashes the install phase:
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 9769896313e..fe180e8abc9 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
-, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
+, hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection
 , withPulseAudio ? true, libpulseaudio }:
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobjectIntrospection intltool pkgconfig pythonPackages.cython
+    gobject-introspection intltool pkgconfig pythonPackages.cython
     pythonPackages.wrapPython wrapGAppsHook
   ];
 
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 489442e4c2a..7381238e4ac 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   autoreconfHook,
   gtk-doc,
-  gobjectIntrospection,
+  gobject-introspection,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ];
   buildInputs = [ glib libxml2 fftw orc lcms
     imagemagick openexr libtiff libjpeg
     libgsf libexif python27 libpng expat ]
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index c7f7369ba88..bd5645fe721 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, anthy, ibus, glib, gobjectIntrospection, gtk3, python3
+, anthy, ibus, glib, gobject-introspection, gtk3, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ];
 
   buildInputs = [
-    anthy glib gobjectIntrospection gtk3 ibus (python3.withPackages (ps: [ps.pygobject3]))
+    anthy glib gobject-introspection gtk3 ibus (python3.withPackages (ps: [ps.pygobject3]))
   ];
 
   nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index d09806402af..9b7895d614b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, docbook2x, pkgconfig
-, gtk3, dconf, gobjectIntrospection
+, gtk3, dconf, gobject-introspection
 , ibus, python3 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    dconf gtk3 gobjectIntrospection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
+    dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
   ];
 
   nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
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 86ff8e68fe7..1514959ea04 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
-, wrapGAppsHook, gobjectIntrospection
+, wrapGAppsHook, gobject-introspection
 }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./hunspell-dirs.patch ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobject-introspection ];
   buildInputs = [ python ibus gtk3 m17n_lib ];
 
   preFixup = ''
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 3b6f3c989a3..16580aac955 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
-, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
+, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2
 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
 , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
 , buildPackages }:
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     dbus
     dconf
     gdk_pixbuf
-    gobjectIntrospection
+    gobject-introspection
     gtk2
     gtk3
     isocodes
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
index 7311b09008b..33de43b6f5e 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, vala, gobjectIntrospection, intltool, python2Packages, glib
+, vala, gobject-introspection, intltool, python2Packages, glib
 , pkgconfig
 , libgee, json-glib, marisa, libkkc-data
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    vala gobjectIntrospection
+    vala gobject-introspection
     python2Packages.python python2Packages.marisa
     intltool glib pkgconfig
   ];
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index e71ba3bf58e..7b501d097bb 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -1,5 +1,5 @@
 {fetchFromGitHub , stdenv, python3, gtk3, libwnck3,
- gobjectIntrospection, wrapGAppsHook }:
+ gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation  rec {
   name = "clipster-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation  rec {
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
 
-  buildInputs =  [ pythonEnv gtk3 libwnck3 gobjectIntrospection wrapGAppsHook ];
+  buildInputs =  [ pythonEnv gtk3 libwnck3 gobject-introspection wrapGAppsHook ];
 
   installPhase = ''
     sed -i 's/python/python3/g' clipster
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index e442850fbaa..8edcf6e6629 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
-, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40
+, gobject-introspection, argyllcms, meson, ninja, libxml2, vala_0_40
 , libgudev, sane-backends, gnome3, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "-Denable-docs=false"
   ];
 
-  nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobjectIntrospection makeWrapper ];
+  nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobject-introspection makeWrapper ];
 
   buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ];
 
diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix
index 46e460db354..0cb839c26ff 100644
--- a/pkgs/tools/misc/hashit/default.nix
+++ b/pkgs/tools/misc/hashit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobject-introspection, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "hashit";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobjectIntrospection
+    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index aaff5c96d69..c6b544f9e0a 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid,
-  libtool, readline, gobjectIntrospection, json-glib, lvm2, libxslt, docbook_xsl }:
+  libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
    name = "ldmtool-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
    nativeBuildInputs = [ pkgconfig ];
    buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin
-     libtool readline gobjectIntrospection json-glib libuuid
+     libtool readline gobject-introspection json-glib libuuid
    ];
 
    meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 25cba56449c..fc3d016757b 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
 , glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
 , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
 }:
@@ -46,7 +46,7 @@ in stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc
+    autoconf automake libtool pkgconfig gtk-doc gobject-introspection which yacc
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 75b9dd15fb7..feb8fa4fbc1 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig,
-  gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake,
+  gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake,
   libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
   bubblewrap, pcre, check, python }:
 
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkgconfig which autoconf automake libtool cmake gperf
-    gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42
+    gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42
   ];
   buildInputs = [
     libcap ostree rpm glib systemd polkit bubblewrap
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index c898761e424..02583343117 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
 , docbook_xml_dtd_412, docbook_xsl
 , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
-, gobjectIntrospection, libsecret
+, gobject-introspection, libsecret
 , cups-filters
 , pythonPackages
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib udev libusb1 cups
     pythonPackages.python
-    libnotify gobjectIntrospection gdk_pixbuf pango atk
+    libnotify gobject-introspection gdk_pixbuf pango atk
     libsecret
   ];
 
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index bead4556cb7..406cf0a04ea 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, python3
+, libgudev, jansson, wrapGAppsHook, gobject-introspection, 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 python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
+  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 66d9434a470..7b06b521aaa 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,7 +1,7 @@
 { 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
+, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
 , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }:
 
@@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     systemd libuuid polkit ppp libndp curl
-    bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson
+    bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson
   ];
 
   propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ];
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 93827eebb57..665db4cc287 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -1,5 +1,5 @@
 { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
-, gobjectIntrospection }:
+, gobject-introspection }:
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb";
   };
 
-  buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ];
+  buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];
 
   dontBuild = true;
 
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 5ba387a12f8..3c7ab447f00 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, lib
 , intltool, glib, pkgconfig, polkit, python, sqlite
-, gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
+, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
 # TODO: set enableNixBackend to true, as soon as it builds
 , nix, enableNixBackend ? false, boost
 , enableCommandNotFound ? false
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic";
   };
 
-  buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ]
+  buildInputs = [ glib polkit python gobject-introspection vala_0_38 ]
                   ++ lib.optional enableSystemd systemd
                   ++ lib.optional enableBashCompletion bash-completion;
   propagatedBuildInputs = [ sqlite nix boost ];
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 9398b38cb34..27bdc51c768 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection
+, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake intltool libtool vala glib encfs
     gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
-    wrapGAppsHook gobjectIntrospection  ];
+    wrapGAppsHook gobject-introspection  ];
 
   patches = [ ./makefile-mkdir.patch ];
 
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 24840426fd4..81164c1eb77 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobjectIntrospection, defaultIconTheme }:
+{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }:
 
 pythonPackages.buildPythonApplication rec {
   name = "onioncircuits-${version}";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm";
   };
 
-  buildInputs = [ intltool gtk3 gobjectIntrospection ];
+  buildInputs = [ intltool gtk3 gobject-introspection ];
   propagatedBuildInputs =  with pythonPackages; [ stem distutils_extra pygobject3 ];
 
   postFixup = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 02971c5dcff..94edaf6dbee 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -113,6 +113,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
+  gobjectIntrospection = gobject-introspection; # added 2018-12-02
   goimports = gotools; # added 2018-09-16
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ebe8bc9f38..83b6bc874e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9895,7 +9895,7 @@ with pkgs;
   gns3-gui = gns3Packages.guiStable;
   gns3-server = gns3Packages.serverStable;
 
-  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
+  gobject-introspection = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;
     inherit (darwin) cctools;
   };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 8a93f5dff5b..749a7e15611 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -7,7 +7,7 @@
 
 { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig
 , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
-, glib, gobjectIntrospection, libevent, zlib, autoreconfHook, gnum4
+, glib, gobject-introspection, libevent, zlib, autoreconfHook, gnum4
 , mysql, postgresql, cyrus_sasl
 , fetchFromGitHub, libmpack, which, fetchpatch, writeText
 }:
@@ -927,7 +927,7 @@ let
     };
 
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ glib gobjectIntrospection lua ];
+    buildInputs = [ glib gobject-introspection lua ];
 
     makeFlags = [ "LUA_VERSION=${lua.luaversion}" ];
 

From 4c7b012d8513a8ada12c30e211e95269ae39bab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 11:45:51 +0000
Subject: [PATCH 0680/2793] networkmanager-applet: set default icon theme

---
 pkgs/tools/networking/network-manager/applet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index bead4556cb7..63c142d760a 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
     polkit isocodes mobile-broadband-provider-info libgudev
     modemmanager jansson glib-networking
-    libappindicator-gtk3
+    libappindicator-gtk3 gnome3.defaultIconTheme
   ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
 
   nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];

From 595c1e0a36ed6569676cdabc76c8784e76996ce9 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Sun, 2 Dec 2018 14:20:13 +0100
Subject: [PATCH 0681/2793] gitea: 1.5.3 -> 1.6.0

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.0
---
 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 8ee43dc16c1..3af24ffe759 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.3";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "1f8cbsd3kn4v2a6c57rwh9slgvss7gnxs96yhcy2ddwyycf6i04d";
+    sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''

From bc98e5e8601baeb102c6c5194bf5e9c597c86ff9 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Sat, 20 Oct 2018 19:33:22 +0200
Subject: [PATCH 0682/2793] systrayhelper: 0.0.3 -> 0.0.4

---
 pkgs/tools/misc/systrayhelper/default.nix |  8 ++++----
 pkgs/tools/misc/systrayhelper/deps.nix    | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index e812d6799fe..73e144d93aa 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "systrayhelper-${version}";
-  version = "0.0.3";
-  rev = "0953942245566bf358ba937af840947100380e15";
+  version = "0.0.4";
+  rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
 
   goPackagePath = "github.com/ssbc/systrayhelper";
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev = "v${version}";
     owner = "ssbc";
     repo = "systrayhelper";
-    sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6";
+    sha256 = "1iq643brha5q6w2v1hz5l3d1z0pqzqr43gpwih4cnx3m5br0wg2k";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix
index 67ec6662d98..93c984337e6 100644
--- a/pkgs/tools/misc/systrayhelper/deps.nix
+++ b/pkgs/tools/misc/systrayhelper/deps.nix
@@ -59,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/getlantern/systray";
-      rev =  "3fd1443dac5c8297999189fe28d5836b2b075b66";
-      sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh";
+      rev =  "e31397f8c6928d98a8a9a7e80087aebcf0090beb";
+      sha256 = "0ahb6qjd2c43nbbg0ssm76ilbzs9dq43a89f7fj6c029nympjmqn";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev =  "c059e472caf75dbe73903f6521a20abac245b17f";
-      sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "d0be0721c37eeb5299f245a996a483160fc36940";
-      sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
+      rev =  "8e24a49d80f82323e1c4db1b5da3e0f31171a151";
+      sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724";
     };
   }
-]
+]
\ No newline at end of file

From 855cd9f3a8f66deea70197fe73e9aa79a441a2e0 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Sun, 2 Dec 2018 22:52:12 +0900
Subject: [PATCH 0683/2793] dpt-rp1-py: init at 2018-10-16

---
 pkgs/tools/misc/dpt-rp1-py/default.nix | 28 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/dpt-rp1-py/default.nix

diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix
new file mode 100644
index 00000000000..8e5b15e5ee5
--- /dev/null
+++ b/pkgs/tools/misc/dpt-rp1-py/default.nix
@@ -0,0 +1,28 @@
+{ lib, python3Packages, fetchFromGitHub }:
+python3Packages.buildPythonApplication rec {
+  pname = "dpt-rp1-py";
+  version = "2018-10-16";
+
+  src = fetchFromGitHub {
+    owner = "janten";
+    repo = pname;
+    rev = "4551b4432f8470de5f2ad9171105f731a6259395";
+    sha256 = "176y5j31aci1vpi8v6r5ki55432fbdsazh9bsyzr90im9zimkffl";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = with python3Packages; [
+    httpsig
+    requests
+    pbkdf2
+    urllib3
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/janten/dpt-rp1-py;
+    description = "Python script to manage Sony DPT-RP1 without Digital Paper App";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mt-caret ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index baf74815715..90ffbfdd871 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -697,6 +697,8 @@ with pkgs;
 
   dkimpy = with pythonPackages; toPythonApplication dkimpy;
 
+  dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
+
   ecdsautils = callPackage ../tools/security/ecdsautils { };
 
   sedutil = callPackage ../tools/security/sedutil { };

From a04a512f343ccdb50068f61954f50ae9ad701460 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 1 Dec 2018 18:32:32 +0100
Subject: [PATCH 0684/2793] Treewide: use HTTPS on NonGNU domains

---
 pkgs/applications/audio/lash/default.nix                  | 2 +-
 pkgs/applications/audio/lingot/default.nix                | 2 +-
 pkgs/applications/audio/normalize/default.nix             | 2 +-
 pkgs/applications/audio/sonata/default.nix                | 2 +-
 pkgs/applications/editors/emacs-modes/bbdb/3.nix          | 2 +-
 .../editors/emacs-modes/color-theme/default.nix           | 2 +-
 pkgs/applications/misc/gksu/default.nix                   | 2 +-
 pkgs/applications/misc/xlog/default.nix                   | 2 +-
 pkgs/applications/window-managers/ratpoison/default.nix   | 2 +-
 .../gnome-2/desktop/mail-notification/default.nix         | 2 +-
 pkgs/development/guile-modules/guile-lib/default.nix      | 2 +-
 pkgs/development/libraries/acl/default.nix                | 2 +-
 pkgs/development/libraries/attr/default.nix               | 2 +-
 pkgs/development/libraries/libchop/default.nix            | 4 ++--
 pkgs/development/libraries/libgksu/default.nix            | 2 +-
 pkgs/development/libraries/libnih/default.nix             | 2 +-
 pkgs/development/libraries/libunwind/default.nix          | 2 +-
 pkgs/development/libraries/png++/default.nix              | 2 +-
 pkgs/development/misc/avr/libc/default.nix                | 2 +-
 pkgs/development/tools/guile/g-wrap/default.nix           | 2 +-
 pkgs/development/tools/java/fastjar/default.nix           | 2 +-
 pkgs/development/tools/misc/avrdude/default.nix           | 2 +-
 pkgs/development/tools/misc/texi2html/default.nix         | 2 +-
 pkgs/development/tools/misc/uisp/default.nix              | 2 +-
 pkgs/development/tools/quilt/default.nix                  | 2 +-
 pkgs/games/crack-attack/default.nix                       | 2 +-
 pkgs/os-specific/linux/dmidecode/default.nix              | 2 +-
 pkgs/os-specific/linux/sysvinit/default.nix               | 2 +-
 pkgs/servers/quagga/default.nix                           | 2 +-
 pkgs/tools/X11/autocutsel/default.nix                     | 2 +-
 pkgs/tools/X11/xbindkeys/default.nix                      | 2 +-
 pkgs/tools/archivers/atool/default.nix                    | 2 +-
 pkgs/tools/backup/duplicity/default.nix                   | 4 ++--
 pkgs/tools/backup/duply/default.nix                       | 4 ++--
 pkgs/tools/backup/store-backup/default.nix                | 2 +-
 pkgs/tools/compression/lzip/default.nix                   | 2 +-
 pkgs/tools/filesystems/davfs2/default.nix                 | 2 +-
 pkgs/tools/graphics/fim/default.nix                       | 2 +-
 pkgs/tools/graphics/icoutils/default.nix                  | 2 +-
 pkgs/tools/inputmethods/m17n-db/default.nix               | 2 +-
 pkgs/tools/inputmethods/m17n-lib/default.nix              | 2 +-
 pkgs/tools/inputmethods/m17n-lib/otf.nix                  | 2 +-
 pkgs/tools/misc/fileschanged/default.nix                  | 2 +-
 pkgs/tools/misc/renameutils/default.nix                   | 2 +-
 pkgs/tools/networking/flvstreamer/default.nix             | 2 +-
 pkgs/tools/security/oath-toolkit/default.nix              | 2 +-
 pkgs/tools/text/numdiff/default.nix                       | 2 +-
 pkgs/tools/typesetting/lout/default.nix                   | 8 ++++----
 48 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index da61eee3b64..9d295073597 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation  rec {
     longDescription = ''
       Session management system for GNU/Linux audio applications.
     '';
-    homepage = http://www.nongnu.org/lash;
+    homepage = https://www.nongnu.org/lash;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 389db3d548d..d2ec92e0654 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Not a Guitar-Only tuner";
-    homepage = http://www.nongnu.org/lingot/;
+    homepage = https://www.nongnu.org/lingot/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index a727160ff29..85c902d3839 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmad ];
 
   meta = with stdenv.lib; {
-    homepage = http://normalize.nongnu.org/;
+    homepage = https://www.nongnu.org/normalize/;
     description = "Audio file normalizer";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 0affe5dc89d..cc3b274d2c4 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -61,7 +61,7 @@ in buildPythonApplication rec {
        - Commandline control
        - Available in 24 languages
     '';
-    homepage = http://www.nongnu.org/sonata/;
+    homepage = https://www.nongnu.org/sonata/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.rvl ];
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
index 44116fbac0c..15ffece1c04 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://savannah.nongnu.org/projects/bbdb/;
+    homepage = https://savannah.nongnu.org/projects/bbdb/;
     description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
index a3d76a307c7..407b9e58f0b 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Emacs-lisp mode for skinning your Emacs";
-    homepage = http://www.nongnu.org/color-theme;
+    homepage = https://www.nongnu.org/color-theme;
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 712c2081f10..4af776674e6 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       programs that need to ask a user's password to run another program
       as another user.
     '';
-    homepage = http://www.nongnu.org/gksu/;
+    homepage = https://www.nongnu.org/gksu/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix
index 3ba7062b7bb..4f7a7c3a75a 100644
--- a/pkgs/applications/misc/xlog/default.nix
+++ b/pkgs/applications/misc/xlog/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
          location in latitude and longitude and distance and heading in kilometers or miles,
          both for short and long path. 
       '';
-    homepage = http://www.nongnu.org/xlog;
+    homepage = https://www.nongnu.org/xlog;
     maintainers = [ maintainers.mafo ];
     license = licenses.gpl3;
     platforms = platforms.unix;
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index fded0ee24a5..a69d3164a13 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nongnu.org/ratpoison/;
+    homepage = https://www.nongnu.org/ratpoison/;
     description = "Simple mouse-free tiling window manager";
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index 1547c364b51..ac9a87299ab 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tray status icon, which notifies us when new email arrives";
-    homepage = http://www.nongnu.org/mailnotify/;
+    homepage = https://www.nongnu.org/mailnotify/;
     license = with licenses; [ gpl3 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.eleanor ];
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 35eb4667bd6..c3aa8400791 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
       modules into a coherent library.  Think "a down-scaled, limited-scope CPAN
       for Guile".
     '';
-    homepage = "http://www.nongnu.org/guile-lib/";
+    homepage = "https://www.nongnu.org/guile-lib/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index f9bb982a784..f9559d94174 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   installTargets = [ "install" "install-lib" "install-dev" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://savannah.nongnu.org/projects/acl";
+    homepage = "https://savannah.nongnu.org/projects/acl";
     description = "Library and tools for manipulating access control lists";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 944f33b7a3f..f859894cd47 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://savannah.nongnu.org/projects/attr/";
+    homepage = "https://savannah.nongnu.org/projects/attr/";
     description = "Library and tools for manipulating extended attributes";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index f524c940255..c802bd68ab0 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   patches = [ ./gets-undeclared.patch ./size_t.patch ];
 
   nativeBuildInputs = [ pkgconfig gperf ];
-  
+
   buildInputs =
     [ zlib bzip2 lzo
       libgcrypt
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
          line.  It is written in C and has Guile (Scheme) bindings.
       '';
 
-    homepage = http://nongnu.org/libchop/;
+    homepage = https://www.nongnu.org/libchop/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ];
     platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 0af0a1227f3..9bec00b9f52 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
       user.  It provides X authentication facilities for running
       programs in an X session.
     '';
-    homepage = http://www.nongnu.org/gksu/;
+    homepage = https://www.nongnu.org/gksu/;
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 22eb8ed64dd..a4b0b26a345 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "libnih-${version}";
 
   src = fetchurl {
-    url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
+    url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
     sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
   };
 
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 6a32ccf5c1b..2453484cb9c 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails
 
   meta = with stdenv.lib; {
-    homepage = http://www.nongnu.org/libunwind;
+    homepage = https://www.nongnu.org/libunwind;
     description = "A portable and efficient API to determine the call-chain of a program";
     maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index ef4b3ea7e01..54a563c518f 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.nongnu.org/pngpp/;
+    homepage = https://www.nongnu.org/pngpp/;
     description = "C++ wrapper for libpng library";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index ab9a696afb0..05790a81e65 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "a C runtime library for AVR microcontrollers";
-    homepage = http://savannah.nongnu.org/projects/avr-libc/;
+    homepage = https://savannah.nongnu.org/projects/avr-libc/;
     license = licenses.bsd3;
     platforms = [ "avr-none" ];
     maintainers = with maintainers; [ mguentner ];
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 80c9ce3d432..78f2e967123 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       inter-language calls.  It currently only supports generating Guile
       wrappers for C functions.
     '';
-    homepage = "http://www.nongnu.org/g-wrap/";
+    homepage = "https://www.nongnu.org/g-wrap/";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index f9e1d9a0842..8469b1b1272 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -22,7 +22,7 @@ let version = "0.98"; in
         the stock `jar' program running without a JIT.
       '';
 
-      homepage = http://savannah.nongnu.org/projects/fastjar/;
+      homepage = https://savannah.nongnu.org/projects/fastjar/;
 
       license = stdenv.lib.licenses.gpl2Plus;
       platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 4475e58207e..39f98ae0028 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       download/upload/manipulate the ROM and EEPROM contents of AVR
       microcontrollers using the in-system programming technique (ISP).
     '';
-    homepage = http://www.nongnu.org/avrdude/;
+    homepage = https://www.nongnu.org/avrdude/;
     license = licenses.gpl2Plus;
     platforms = with platforms; linux ++ darwin;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index 28eb95fd08b..b094f05e951 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "Perl script which converts Texinfo source files to HTML output";
-    homepage = http://www.nongnu.org/texi2html/;
+    homepage = https://www.nongnu.org/texi2html/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index 6e2498bde64..1727f772006 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
     license = stdenv.lib.licenses.gpl2;
-    homepage = http://savannah.nongnu.org/projects/uisp;
+    homepage = https://savannah.nongnu.org/projects/uisp;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index fe6aeb3fa6e..7986fb2b134 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://savannah.nongnu.org/projects/quilt;
+    homepage = https://savannah.nongnu.org/projects/quilt;
     description = "Easily manage large numbers of patches";
 
     longDescription = ''
diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix
index 838bdfc9e49..bb06bec411b 100644
--- a/pkgs/games/crack-attack/default.nix
+++ b/pkgs/games/crack-attack/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
-    homepage = http://www.nongnu.org/crack-attack/;
+    homepage = https://www.nongnu.org/crack-attack/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.piotr ];
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 49163cc8b79..a4ec902f762 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   makeFlags = "prefix=$(out)";
 
   meta = with stdenv.lib; {
-    homepage = http://www.nongnu.org/dmidecode/;
+    homepage = https://www.nongnu.org/dmidecode/;
     description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 2e8cf0125e5..7f84e1cc9b4 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    homepage = http://www.nongnu.org/sysvinit/;
+    homepage = https://www.nongnu.org/sysvinit/;
     description = "Utilities related to booting and shutdown";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index c6f150938ac..1d8f0c36cae 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       It is more than a routed replacement, it can be used as a Route Server and
       a Route Reflector.
     '';
-    homepage = http://www.nongnu.org/quagga/;
+    homepage = https://www.nongnu.org/quagga/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ tavyc ];
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index ae7daa1db10..c9bf7141804 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = http://www.nongnu.org/autocutsel/;
+    homepage = https://www.nongnu.org/autocutsel/;
     description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index e633ba4f794..4e4e49bd946 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 guile ];
 
   meta = {
-    homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html;
+    homepage = https://www.nongnu.org/xbindkeys/xbindkeys.html;
     description = "Launch shell commands with your keyboard or your mouse under X Window";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index c5a2a7ffee0..e305a1739f7 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureScript = "${bash}/bin/bash configure";
 
   meta = {
-    homepage = http://www.nongnu.org/atool;
+    homepage = https://www.nongnu.org/atool;
     description = "Archive command line helper";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index cbe02a0593e..b5accb3b82b 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec {
   version = "0.7.18.2";
 
   src = fetchurl {
-    url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
     sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2";
   };
 
@@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
-    homepage = http://www.nongnu.org/duplicity;
+    homepage = https://www.nongnu.org/duplicity;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ peti ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index f11a387e5fe..2ce6f7e92e7 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
     description = "Shell front end for the duplicity backup tool";
     longDescription = ''
       Duply is a shell front end for the duplicity backup tool
-      http://duplicity.nongnu.org/. It greatly simplifies it's usage by
+      https://www.nongnu.org/duplicity. It greatly simplifies its usage by
       implementing backup job profiles, batch commands and more. Who says
       secure backups on non-trusted spaces are no child's play?
     '';
-    homepage = http://duply.net/;
+    homepage = https://duply.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bjornfor ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 80ff97f097d..3dbf138ed57 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A backup suite that stores files on other disks";
-    homepage = http://savannah.nongnu.org/projects/storebackup;
+    homepage = https://savannah.nongnu.org/projects/storebackup;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 49677e98813..6b1d123a066 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.nongnu.org/lzip/lzip.html;
+    homepage = https://www.nongnu.org/lzip/lzip.html;
     description = "A lossless data compressor based on the LZMA algorithm";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
index 37ee611f054..2b6d0f6e669 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"];
 
   meta = {
-    homepage = http://savannah.nongnu.org/projects/davfs2;
+    homepage = https://savannah.nongnu.org/projects/davfs2;
     description = "Mount WebDAV shares like a typical filesystem";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 066c181f53c..7303f27fe11 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       to be a highly customizable and scriptable for users who are comfortable
       with software like the VIM text editor or the Mutt mail user agent.
     '';
-    homepage = http://www.nongnu.org/fbi-improved/;
+    homepage = https://www.nongnu.org/fbi-improved/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 3ab2232e26c..b16dbe21985 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.nongnu.org/icoutils/;
+    homepage = https://www.nongnu.org/icoutils/;
     description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index dd8e96f8a6f..ba78f1ba02f 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    homepage = http://www.nongnu.org/m17n/;
+    homepage = https://www.nongnu.org/m17n/;
     description = "Multilingual text processing library (database)";
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index 12b669c8777..a4c9006cb24 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ m17n_db ];
 
   meta = {
-    homepage = http://www.nongnu.org/m17n/;
+    homepage = https://www.nongnu.org/m17n/;
     description = "Multilingual text processing library (runtime)";
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix
index 95eea764187..05231b385db 100644
--- a/pkgs/tools/inputmethods/m17n-lib/otf.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://www.nongnu.org/m17n/;
+    homepage = https://www.nongnu.org/m17n/;
     description = "Multilingual text processing library (libotf)";
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix
index f761c1ec4c5..6818bb708bb 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/pkgs/tools/misc/fileschanged/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://www.nongnu.org/fileschanged/;
+    homepage = https://www.nongnu.org/fileschanged/;
     description = "A command-line utility that reports when files have been altered";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix
index 8b6fec8d021..b5e5d64dda6 100644
--- a/pkgs/tools/misc/renameutils/default.nix
+++ b/pkgs/tools/misc/renameutils/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ readline ];
 
   meta = {
-    homepage = http://www.nongnu.org/renameutils/;
+    homepage = https://www.nongnu.org/renameutils/;
     description = "A set of programs to make renaming of files faster";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index 02d3bebcd30..b5e61bee4df 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    homepage = http://savannah.nongnu.org/projects/flvstreamer;
+    homepage = https://savannah.nongnu.org/projects/flvstreamer;
 
     maintainers = [ stdenv.lib.maintainers.thammers ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 9bd3f372672..03233917e2a 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Components for building one-time password authentication systems";
-    homepage = http://www.nongnu.org/oath-toolkit/;
+    homepage = https://www.nongnu.org/oath-toolkit/;
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 4741fecb90c..1320f824fdf 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       line by line and field by field, ignoring small numeric differences
       or/and different numeric formats
     '';
-    homepage = http://www.nongnu.org/numdiff/;
+    homepage = https://www.nongnu.org/numdiff/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ndowens ];
     platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix
index 09aed52265b..85c0bacf315 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/pkgs/tools/typesetting/lout/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "mirror://savannah/lout/${name}.tar.gz"      # new!
       "mirror://sourceforge/lout/${name}.tar.gz"   # to be phased out
       # XXX: We could add the CTAN mirrors
-      # (see http://www.ctan.org/tex-archive/support/lout/).
+      # (see https://www.ctan.org/tex-archive/support/lout/).
     ];
     sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix";
   };
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
       went back to the beginning.
     '';
 
-    # Author's page: http://www.cs.usyd.edu.au/~jeff/
-    # Wiki: http://lout.wiki.sourceforge.net/
-    homepage = http://savannah.nongnu.org/projects/lout/;
+    # Author's page: http://jeffreykingston.id.au/lout/
+    # Wiki: https://sourceforge.net/p/lout/wiki/
+    homepage = https://savannah.nongnu.org/projects/lout/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 

From bf102825efa1deb8de1afca4ed7541c098f6b068 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Sun, 2 Dec 2018 15:24:17 +0100
Subject: [PATCH 0685/2793] nixos/containers: Add assertion for container name
 length

When privateNetwork is enabled, currently the container's interface name
is derived from the container name. However, there's a hard limit
on the size of interface names. To avoid conflicts and other issues,
we set a limit on the container name when privateNetwork is enabled.

Fixes #38509
---
 nixos/modules/virtualisation/containers.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 2fcc0f25425..fba69f7b42b 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -457,6 +457,16 @@ in
                       { boot.isContainer = true;
                         networking.hostName = mkDefault name;
                         networking.useDHCP = false;
+                        assertions = [
+                          {
+                            assertion =  config.privateNetwork -> stringLength name < 12;
+                            message = ''
+                              Container name `${name}` is too long: When `privateNetwork` is enabled, container names can
+                              not be longer than 11 characters, because the container's interface name is derived from it.
+                              This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509
+                            '';
+                          }
+                        ];
                       };
                     in [ extraConfig ] ++ (map (x: x.value) defs);
                   prefix = [ "containers" name ];

From 0f868d8116e0d0922d2ab0a2df109e985472f0bf Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 1 Dec 2018 19:49:28 +0100
Subject: [PATCH 0686/2793] Treewide: use HTTPS on SourceForge

---
 pkgs/applications/audio/faust/faust1.nix               | 2 +-
 pkgs/applications/audio/faust/faust2.nix               | 2 +-
 pkgs/applications/editors/textadept/default.nix        | 2 +-
 pkgs/applications/misc/eaglemode/default.nix           | 2 +-
 pkgs/applications/misc/gtk2fontsel/default.nix         | 2 +-
 pkgs/applications/networking/esniper/default.nix       | 2 +-
 pkgs/applications/science/math/maxima/default.nix      | 2 +-
 pkgs/applications/science/misc/motu-client/default.nix | 4 ++--
 pkgs/development/compilers/fpc/default.upstream        | 2 +-
 pkgs/development/interpreters/lush/default.upstream    | 2 +-
 pkgs/development/interpreters/regina/default.upstream  | 2 +-
 pkgs/development/libraries/judy/default.nix            | 2 +-
 pkgs/development/libraries/libe-book/default.upstream  | 2 +-
 pkgs/development/libraries/libmwaw/default.upstream    | 2 +-
 pkgs/development/libraries/libodfgen/default.upstream  | 2 +-
 pkgs/development/libraries/librevenge/default.upstream | 2 +-
 pkgs/development/libraries/tinyxml/2.6.2.nix           | 2 +-
 pkgs/development/python-modules/mmpython/default.nix   | 2 +-
 pkgs/games/gltron/default.nix                          | 2 +-
 pkgs/games/quantumminigolf/default.upstream            | 2 +-
 pkgs/games/soi/default.nix                             | 2 +-
 pkgs/os-specific/linux/conspy/default.upstream         | 2 +-
 pkgs/servers/dict/dictd-db.nix                         | 6 +++---
 pkgs/servers/p910nd/default.nix                        | 2 +-
 pkgs/tools/graphics/asymptote/default.upstream         | 2 +-
 pkgs/tools/graphics/dmtx-utils/default.upstream        | 2 +-
 pkgs/tools/graphics/scanbd/default.nix                 | 2 +-
 pkgs/tools/text/poedit/default.nix                     | 2 +-
 28 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index bf5bb781585..6e47d921d34 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -18,7 +18,7 @@ let
 
   meta = with stdenv.lib; {
     homepage = http://faust.grame.fr/;
-    downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+    downloadPage = https://sourceforge.net/projects/faudiostream/files/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ magnetophon pmahoney ];
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index cfb37e5761a..383d2deb10b 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -27,7 +27,7 @@ let
 
   meta = with stdenv.lib; {
     homepage = http://faust.grame.fr/;
-    downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+    downloadPage = https://sourceforge.net/projects/faudiostream/files/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ magnetophon pmahoney ];
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 818183b9852..f17f5a9a26a 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -64,7 +64,7 @@ let
   gtdialog_url   = "http://foicica.com/gtdialog/download/" + gtdialog_zip;
   lspawn_url     = "http://foicica.com/lspawn/download/" + lspawn_zip;
 
-  scintilla_url  = "http://prdownloads.sourceforge.net/scintilla/" + scintilla_tgz;
+  scintilla_url  = "mirror://sourceforge/scintilla/" + scintilla_tgz;
   lua_url        = "http://www.lua.org/ftp/" + lua_tgz;
   lpeg_url       = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz;
   lfs_url        = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip;
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index b08ce5baa5b..0404ef8ce22 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
   # I use 'yes y' to skip a build error linking with xineLib,
   # because xine stopped exporting "_x_vo_new_port"
-  #  http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
+  #  https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
   buildPhase = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
     perl make.pl build
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index 347d76860ef..cf409b4c185 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       Trivial, but useful nonetheless.
     '';
     homepage = http://gtk2fontsel.sourceforge.net/;
-    downloadPage = http://sourceforge.net/projects/gtk2fontsel/;
+    downloadPage = https://sourceforge.net/projects/gtk2fontsel/;
     license = licenses.gpl2;
     maintainers = [ maintainers.prikhi ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index ca4d8f2f49f..87e0584c931 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl curl ];
 
   # Add support for CURL_CA_BUNDLE variable.
-  # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
+  # Fix <https://sourceforge.net/p/esniper/bugs/648/>.
   patches = [ ./find-ca-bundle.patch ];
 
   postInstall = ''
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 892b9d9520e..9f6e281849d 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation ({
 
   # Failures in the regression test suite won't abort the build process. We run
   # the suite only so that potential errors show up in the build log. See also:
-  # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
+  # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
   doCheck = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
index 0994bb1ca38..d4367ef7e2d 100644
--- a/pkgs/applications/science/misc/motu-client/default.nix
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -12,10 +12,10 @@ python27Packages.buildPythonApplication rec {
     homepage = https://github.com/quiet-oceans/motuclient-setuptools;
     description = "CLI to query oceanographic data to Motu servers";
     longDescription = ''
-      Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
+      Access data from (motu)[https://sourceforge.net/projects/cls-motu/] servers.
       This is a refactored fork of the original release in order to simplify integration,
       deployment and packaging. Upstream code can be found at
-      http://sourceforge.net/projects/cls-motu/ .
+      https://sourceforge.net/projects/cls-motu/ .
     '';
     license = licenses.lgpl3Plus;
     maintainers = [ maintainers.lsix ];
diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream
index 7c11fb4761e..9f16c1b645c 100644
--- a/pkgs/development/compilers/fpc/default.upstream
+++ b/pkgs/development/compilers/fpc/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/freepascal/files/Source/
+url https://sourceforge.net/projects/freepascal/files/Source/
 SF_version_dir
 version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
 SF_redirect
diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream
index 4a94595f772..8a8b08fcd68 100644
--- a/pkgs/development/interpreters/lush/default.upstream
+++ b/pkgs/development/interpreters/lush/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/lush/files/lush2/
+url https://sourceforge.net/projects/lush/files/lush2/
 version_link '[.]tar[.]gz/download$'
 SF_redirect
 minimize_overwrite
diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream
index 7b3c6905a1c..481d9848f83 100644
--- a/pkgs/development/interpreters/regina/default.upstream
+++ b/pkgs/development/interpreters/regina/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/
+url https://sourceforge.net/projects/regina-rexx/files/regina-rexx/
 SF_version_dir
 SF_version_tarball
 SF_redirect
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index 1e687ff722b..01ba605b506 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   # gcc 4.8 optimisations break judy.
-  # http://sourceforge.net/p/judy/mailman/message/31995144/
+  # https://sourceforge.net/p/judy/mailman/message/31995144/
   preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
     configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
   '';
diff --git a/pkgs/development/libraries/libe-book/default.upstream b/pkgs/development/libraries/libe-book/default.upstream
index 30a6d390787..a06a9af99bb 100644
--- a/pkgs/development/libraries/libe-book/default.upstream
+++ b/pkgs/development/libraries/libe-book/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libebook/files/
+url https://sourceforge.net/projects/libebook/files/
 SF_version_dir libe-book-
 version_link '[.]tar.xz/download$'
 SF_redirect
diff --git a/pkgs/development/libraries/libmwaw/default.upstream b/pkgs/development/libraries/libmwaw/default.upstream
index 0db6d23a52f..bcfb53770e1 100644
--- a/pkgs/development/libraries/libmwaw/default.upstream
+++ b/pkgs/development/libraries/libmwaw/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libmwaw/files/libmwaw/
+url https://sourceforge.net/projects/libmwaw/files/libmwaw/
 SF_version_dir libmwaw-
 version_link '[.]tar.xz/download$'
 SF_redirect
diff --git a/pkgs/development/libraries/libodfgen/default.upstream b/pkgs/development/libraries/libodfgen/default.upstream
index 44f66561bd8..bd78e974e42 100644
--- a/pkgs/development/libraries/libodfgen/default.upstream
+++ b/pkgs/development/libraries/libodfgen/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libwpd/files/libodfgen/
+url https://sourceforge.net/projects/libwpd/files/libodfgen/
 SF_version_dir libodfgen-
 version_link '[.]tar.xz/download$'
 SF_redirect
diff --git a/pkgs/development/libraries/librevenge/default.upstream b/pkgs/development/libraries/librevenge/default.upstream
index 48b678a392a..78e47f83433 100644
--- a/pkgs/development/libraries/librevenge/default.upstream
+++ b/pkgs/development/libraries/librevenge/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libwpd/files/librevenge/
+url https://sourceforge.net/projects/libwpd/files/librevenge/
 SF_version_dir librevenge-
 version_link '[.]tar.xz/download$'
 SF_redirect
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index 2ec9c57e241..d61076e569b 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     # add pkgconfig file
     ./2.6.2-add-pkgconfig.patch
 
-    # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
+    # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
     ./2.6.2-entity.patch
 
     # Use CC, CXX, and LD from environment
diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix
index c35b2e35cfb..0a41b6e3c87 100644
--- a/pkgs/development/python-modules/mmpython/default.nix
+++ b/pkgs/development/python-modules/mmpython/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   pname = "mmpython";
 
   src = fetchurl {
-    url = http://sourceforge.net/projects/mmpython/files/latest/download;
+    url = https://sourceforge.net/projects/mmpython/files/latest/download;
     sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy";
     name = "${pname}-${version}.tar.gz";
   };
diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix
index 610fba5057d..bd3ae0b2e12 100644
--- a/pkgs/games/gltron/default.nix
+++ b/pkgs/games/gltron/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   patches = [ ./gentoo-prototypes.patch ];
 
   postPatch = ''
-     # Fix http://sourceforge.net/p/gltron/bugs/15
+     # Fix https://sourceforge.net/p/gltron/bugs/15
      sed -i /__USE_MISC/d lua/src/lib/liolib.c
   '';
 
diff --git a/pkgs/games/quantumminigolf/default.upstream b/pkgs/games/quantumminigolf/default.upstream
index 813c3643a3c..a994bb1a6cb 100644
--- a/pkgs/games/quantumminigolf/default.upstream
+++ b/pkgs/games/quantumminigolf/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/
+url https://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/
 SF_version_dir
 version_link '[.]tar[.][^.]+/download$'
 SF_redirect
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 8d102e98433..7f9f49f363a 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.free;
-    downloadPage = http://sourceforge.net/projects/soi/files/;
+    downloadPage = https://sourceforge.net/projects/soi/files/;
   };
 }
diff --git a/pkgs/os-specific/linux/conspy/default.upstream b/pkgs/os-specific/linux/conspy/default.upstream
index 3eeacf34694..3f9ff3e4a82 100644
--- a/pkgs/os-specific/linux/conspy/default.upstream
+++ b/pkgs/os-specific/linux/conspy/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/conspy/files/
+url https://sourceforge.net/projects/conspy/files/
 version_link 'conspy-[-0-9.]+/$'
 version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$'
 SF_redirect
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 70cd362c5ea..065218a5b95 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -29,15 +29,15 @@ let
    };
 in rec {
   deu2eng = makeDictdDBFreedict (fetchurl {
-    url = http://prdownloads.sourceforge.net/freedict/deu-eng.tar.gz;
+    url = mirror://sourceforge/freedict/deu-eng.tar.gz;
     sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
   }) "deu-eng" "de_DE";
   eng2deu = makeDictdDBFreedict (fetchurl {
-    url = http://prdownloads.sourceforge.net/freedict/eng-deu.tar.gz;
+    url = mirror://sourceforge/freedict/eng-deu.tar.gz;
     sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
   }) "eng-deu" "en_EN";
   nld2eng = makeDictdDBFreedict (fetchurl {
-    url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz;
+    url = mirror://sourceforge/freedict/nld-eng.tar.gz;
     sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";
   }) "nld-eng" "nl_NL";
   eng2nld =  makeDictdDBFreedict (fetchurl {
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index bcf1255ff4a..1f58c309aa5 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       this protocol and the syntax is lp=remotehost%9100 in /etc/printcap.
     '';
     homepage = http://p910nd.sourceforge.net/;
-    downloadPage = http://sourceforge.net/projects/p910nd/;
+    downloadPage = https://sourceforge.net/projects/p910nd/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/pkgs/tools/graphics/asymptote/default.upstream
index 3739390fd1d..e86d81ba443 100644
--- a/pkgs/tools/graphics/asymptote/default.upstream
+++ b/pkgs/tools/graphics/asymptote/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/asymptote/files/
+url https://sourceforge.net/projects/asymptote/files/
 SF_version_dir
 version_link 'src[.]tgz/download$'
 SF_redirect
diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream
index 8768681642e..2bb7fe31bf7 100644
--- a/pkgs/tools/graphics/dmtx-utils/default.upstream
+++ b/pkgs/tools/graphics/dmtx-utils/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libdmtx/files/libdmtx/
+url https://sourceforge.net/projects/libdmtx/files/libdmtx/
 SF_version_dir
 version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$'
 SF_redirect
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 402628f0fc8..5dbbd20cd82 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       scanbuttond project. 
     '';
     homepage = http://scanbd.sourceforge.net/;
-    downloadPage = http://sourceforge.net/projects/scanbd/;
+    downloadPage = https://sourceforge.net/projects/scanbd/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 5ed59ff12c3..53d8cf8a8a2 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "poedit-1.5.7";
 
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/poedit/${name}.tar.gz";
+    url = "mirror://sourceforge/poedit/${name}.tar.gz";
     sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4";
   };
 

From 93e511c31927013e95d485d2eae7ebf08c40d009 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 1 Dec 2018 18:07:00 +0100
Subject: [PATCH 0687/2793] Treewide: use HTTPS on GNU Savannah domains

HTTP -> HTTPS for:
- http://savannah.gnu.org/
- http://git.savannah.gnu.org/
- http://download.savannah.gnu.org/
- http://svn.savannah.gnu.org/
---
 pkgs/applications/audio/mi2ly/default.nix         | 2 +-
 pkgs/applications/audio/mi2ly/default.upstream    | 2 +-
 pkgs/applications/audio/mimms/default.nix         | 2 +-
 pkgs/applications/editors/emacs-modes/bbdb/3.nix  | 2 +-
 pkgs/applications/editors/leafpad/default.nix     | 2 +-
 pkgs/applications/misc/devilspie2/default.nix     | 2 +-
 pkgs/applications/misc/xlog/default.nix           | 2 +-
 pkgs/development/compilers/gcl/2.6.13-pre.nix     | 2 +-
 pkgs/development/interpreters/guile/1.8.nix       | 2 +-
 pkgs/development/interpreters/guile/2.0.nix       | 2 +-
 pkgs/development/libraries/gnu-config/default.nix | 6 +++---
 pkgs/development/libraries/gnutls-kdh/generic.nix | 2 +-
 pkgs/development/libraries/gsl/gsl-1_16.nix       | 2 +-
 pkgs/development/libraries/readline/6.2.nix       | 2 +-
 pkgs/development/libraries/readline/6.3.nix       | 2 +-
 pkgs/development/libraries/readline/7.0.nix       | 2 +-
 pkgs/development/misc/avr/libc/default.nix        | 2 +-
 pkgs/development/tools/gnulib/default.nix         | 2 +-
 pkgs/development/tools/java/fastjar/default.nix   | 2 +-
 pkgs/development/tools/misc/cppi/default.nix      | 2 +-
 pkgs/games/cuyo/default.nix                       | 2 +-
 pkgs/games/liquidwar/5.nix                        | 2 +-
 pkgs/tools/backup/store-backup/default.nix        | 2 +-
 pkgs/tools/inputmethods/m17n-db/default.nix       | 2 +-
 pkgs/tools/inputmethods/m17n-lib/default.nix      | 2 +-
 pkgs/tools/inputmethods/m17n-lib/otf.nix          | 2 +-
 pkgs/tools/text/gnupatch/default.nix              | 2 +-
 pkgs/top-level/all-packages.nix                   | 4 ++--
 28 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix
index 4dfc7b13046..58c1690a9bb 100644
--- a/pkgs/applications/audio/mi2ly/default.nix
+++ b/pkgs/applications/audio/mi2ly/default.nix
@@ -6,7 +6,7 @@ let
     version="0.12";
     name="${baseName}-${version}";
     hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
-    url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
+    url="https://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
     sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
   };
   buildInputs = [
diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/pkgs/applications/audio/mi2ly/default.upstream
index 131f0e3a71d..0b2607989aa 100644
--- a/pkgs/applications/audio/mi2ly/default.upstream
+++ b/pkgs/applications/audio/mi2ly/default.upstream
@@ -1,3 +1,3 @@
-url http://download.savannah.gnu.org/releases/mi2ly/
+url https://download.savannah.gnu.org/releases/mi2ly/
 ensure_choice
 version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'
diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
index b9b840682d7..2d301a8b6a9 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/pkgs/applications/audio/mimms/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   version = "3.2";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
+    url = "https://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
     sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
index 15ffece1c04..d20ab53bf7e 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "bbdb-3.1.2";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
     sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05";
   };
 
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index dd3fb542da7..c3b46cf61df 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "0.8.18.1";
   name = "leafpad-${version}";
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
     sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
   };
 
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 1ea45c3574a..4fb9ca5fa71 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.43";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
     sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc";
   };
 
diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix
index 4f7a7c3a75a..c0b0ef63369 100644
--- a/pkgs/applications/misc/xlog/default.nix
+++ b/pkgs/applications/misc/xlog/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "2.0.15";
   
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
     sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j";
   };
 
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 71a6eaa8db8..1e8bdbd4e68 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88";
-    url = "http://git.savannah.gnu.org/r/gcl.git";
+    url = "https://git.savannah.gnu.org/r/gcl.git";
     rev = "refs/tags/Version_2_6_13pre50";
   };
 
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 13a0d45dbe4..6a97c397397 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   # One test fails.
   # ERROR: file: "libtest-asmobs", message: "file not found"
   # This is fixed here:
-  # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
+  # <https://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
   doCheck = false;
   doInstallCheck = doCheck;
 
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ea34fd61f3b..921f4b03abc 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -41,7 +41,7 @@
   patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
     (fetchpatch {
       # Fixes stability issues with 00-repl-server.test
-      url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
+      url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
       sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
     })
     ./riscv.patch
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index a14d7486e96..3f0fcafa447 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -5,11 +5,11 @@ let
 
   # Don't use fetchgit as this is needed during Aarch64 bootstrapping
   configGuess = fetchurl {
-    url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
+    url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
     sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
   };
   configSub = fetchurl {
-    url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
+    url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
     sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
   };
 in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Attempt to guess a canonical system name";
-    homepage = http://savannah.gnu.org/projects/config;
+    homepage = https://savannah.gnu.org/projects/config;
     license = licenses.gpl3;
     # In addition to GPLv3:
     #   As a special exception to the GNU General Public License, if you
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index a81cd91fdc7..d1d3c8575b0 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
-  # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
+  # <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.  Also an apparent race in the generation of
   # systemkey-args.h.
   enableParallelBuilding = false;
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix
index ede2b51c559..577b05abeff 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
     (fetchpatch {
       name = "bug-39055.patch";
-      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
+      url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
       sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
     })
   ];
diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index e97b31896c1..54aa42439d9 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
       desire its capabilities.
     '';
 
-    homepage = http://savannah.gnu.org/projects/readline/;
+    homepage = https://savannah.gnu.org/projects/readline/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index cfa70f423db..cbe6c083cb4 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       desire its capabilities.
     '';
 
-    homepage = http://savannah.gnu.org/projects/readline/;
+    homepage = https://savannah.gnu.org/projects/readline/;
 
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 9c0c3d31b4b..e96b4f1ebe2 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       desire its capabilities.
     '';
 
-    homepage = http://savannah.gnu.org/projects/readline/;
+    homepage = https://savannah.gnu.org/projects/readline/;
 
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 05790a81e65..4527a8700f6 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "avr-libc-${version}";
 
   src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
+    url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
     sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
   };
 
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index f7aad74cf9b..a545e715ea6 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnulib-20180226";
 
   src = fetchgit {
-    url = "http://git.savannah.gnu.org/r/gnulib.git";
+    url = "https://git.savannah.gnu.org/r/gnulib.git";
     rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
     sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
   };
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index 8469b1b1272..403bfeabfd0 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -5,7 +5,7 @@ let version = "0.98"; in
     name = "fastjar-${version}";
 
     src = fetchurl {
-      url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
+      url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
       sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
     };
 
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 148c08d9c86..e4d123dece1 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://savannah.gnu.org/projects/cppi/;
+    homepage = https://savannah.gnu.org/projects/cppi/;
 
     description = "A C preprocessor directive indenter";
 
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix
index 69c7adfd284..19d857a8e78 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/pkgs/games/cuyo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.1.0";
   
   src = fetchurl {
-     url = http://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz;
+     url = https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz;
      sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c";
      };
 
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index dfb2934cf77..d748c96da24 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   version = "5.6.4";
   name = "liquidwar5-${version}";
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
     sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
   };
 
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 3dbf138ed57..4f8c234b752 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl makeWrapper ];
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
+    url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2";
     sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78";
   };
 
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index ba78f1ba02f..8732d1a816d 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "m17n-db-1.8.0";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
     sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
   };
 
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index a4c9006cb24..baf57ed9049 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "m17n-lib-1.8.0";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
     sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
   };
 
diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix
index 05231b385db..a69f46e9678 100644
--- a/pkgs/tools/inputmethods/m17n-lib/otf.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libotf-0.9.16";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
     sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8";
   };
 
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 238dba3a9f1..edea95d7d69 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
          more original files, producing patched versions.
       '';
 
-    homepage = http://savannah.gnu.org/projects/patch;
+    homepage = https://savannah.gnu.org/projects/patch;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0dd..8c2ff260622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -294,8 +294,8 @@ with pkgs;
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-    url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
-    meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/";
+    url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
+    meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
   } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; };
 
   # gitlab example

From 0498ccd076e0c11b052dc0246033a35f2d51f983 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 1 Dec 2018 19:22:13 +0100
Subject: [PATCH 0688/2793] Treewide: use HTTPS on GNU domains

HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
---
 doc/languages-frameworks/haskell.section.md               | 2 +-
 doc/meta.xml                                              | 8 ++++----
 nixos/doc/manual/configuration/adding-custom-packages.xml | 2 +-
 nixos/modules/services/editors/emacs.xml                  | 2 +-
 pkgs/applications/editors/ed/default.nix                  | 2 +-
 pkgs/applications/editors/emacs-modes/emms/default.nix    | 4 ++--
 .../editors/emacs-modes/let-alist/default.nix             | 4 ++--
 pkgs/applications/editors/emacs/25.nix                    | 2 +-
 pkgs/applications/editors/emacs/default.nix               | 2 +-
 pkgs/applications/editors/emacs/macport.nix               | 2 +-
 pkgs/applications/editors/moe/default.nix                 | 2 +-
 pkgs/applications/editors/zile/default.nix                | 2 +-
 pkgs/applications/misc/gv/default.nix                     | 2 +-
 pkgs/applications/misc/hello/default.nix                  | 2 +-
 .../networking/instant-messengers/freetalk/default.nix    | 2 +-
 .../science/electronics/archimedes/default.nix            | 2 +-
 pkgs/applications/science/math/pspp/default.nix           | 2 +-
 pkgs/applications/version-management/arch/default.nix     | 2 +-
 pkgs/applications/version-management/rcs/default.nix      | 2 +-
 pkgs/data/documentation/std-man-pages/default.nix         | 2 +-
 pkgs/data/fonts/freefont-ttf/default.nix                  | 2 +-
 pkgs/data/misc/miscfiles/default.nix                      | 2 +-
 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/snapshot/default.nix       | 4 ++--
 pkgs/development/compilers/gprolog/default.nix            | 2 +-
 pkgs/development/compilers/mit-scheme/default.nix         | 2 +-
 pkgs/development/guile-modules/guile-gnome/default.nix    | 2 +-
 pkgs/development/guile-modules/guile-opengl/default.nix   | 2 +-
 pkgs/development/guile-modules/guile-sdl/default.nix      | 2 +-
 pkgs/development/interpreters/gnu-apl/default.nix         | 2 +-
 pkgs/development/interpreters/guile/1.8.nix               | 2 +-
 pkgs/development/interpreters/guile/2.0.nix               | 4 ++--
 pkgs/development/interpreters/guile/default.nix           | 2 +-
 pkgs/development/libraries/ccrtp/1.8.nix                  | 2 +-
 pkgs/development/libraries/ccrtp/default.nix              | 2 +-
 pkgs/development/libraries/commoncpp2/default.nix         | 2 +-
 pkgs/development/libraries/gcc/libstdc++/5.nix            | 2 +-
 pkgs/development/libraries/gdbm/default.nix               | 2 +-
 pkgs/development/libraries/gettext/default.nix            | 2 +-
 pkgs/development/libraries/glibc/common.nix               | 2 +-
 pkgs/development/libraries/glpk/default.nix               | 2 +-
 pkgs/development/libraries/gnutls/generic.nix             | 2 +-
 pkgs/development/libraries/gsasl/default.nix              | 2 +-
 pkgs/development/libraries/gsl/default.nix                | 4 ++--
 pkgs/development/libraries/gsl/gsl-1_16.nix               | 4 ++--
 pkgs/development/libraries/gss/default.nix                | 2 +-
 pkgs/development/libraries/libbfd/default.nix             | 2 +-
 pkgs/development/libraries/libcdio/default.nix            | 2 +-
 pkgs/development/libraries/libiberty/default.nix          | 2 +-
 pkgs/development/libraries/libiconv/default.nix           | 2 +-
 pkgs/development/libraries/libidn/default.nix             | 2 +-
 pkgs/development/libraries/libmicrohttpd/default.nix      | 2 +-
 pkgs/development/libraries/libopcodes/default.nix         | 2 +-
 pkgs/development/libraries/libsigsegv/default.nix         | 2 +-
 pkgs/development/libraries/libtasn1/default.nix           | 2 +-
 pkgs/development/libraries/libunistring/default.nix       | 2 +-
 pkgs/development/libraries/libxmi/default.nix             | 2 +-
 pkgs/development/libraries/lightning/default.nix          | 2 +-
 pkgs/development/libraries/ncurses/default.nix            | 2 +-
 pkgs/development/libraries/osip/default.nix               | 2 +-
 pkgs/development/libraries/pth/default.nix                | 2 +-
 pkgs/development/libraries/ucommon/default.nix            | 2 +-
 pkgs/development/libraries/vcdimager/default.nix          | 2 +-
 pkgs/development/python-modules/pycdio/default.nix        | 2 +-
 .../tools/build-managers/gnumake/4.2/default.nix          | 2 +-
 pkgs/development/tools/gnulib/default.nix                 | 2 +-
 pkgs/development/tools/misc/autoconf-archive/default.nix  | 2 +-
 pkgs/development/tools/misc/autoconf/2.13.nix             | 2 +-
 pkgs/development/tools/misc/autoconf/2.64.nix             | 2 +-
 pkgs/development/tools/misc/autoconf/default.nix          | 2 +-
 pkgs/development/tools/misc/autogen/default.nix           | 2 +-
 pkgs/development/tools/misc/automake/automake-1.11.x.nix  | 4 ++--
 pkgs/development/tools/misc/automake/automake-1.16.x.nix  | 2 +-
 pkgs/development/tools/misc/binutils/default.nix          | 2 +-
 pkgs/development/tools/misc/cflow/default.nix             | 2 +-
 pkgs/development/tools/misc/complexity/default.nix        | 2 +-
 pkgs/development/tools/misc/ddd/default.nix               | 2 +-
 pkgs/development/tools/misc/dejagnu/default.nix           | 4 ++--
 pkgs/development/tools/misc/gdb/default.nix               | 2 +-
 pkgs/development/tools/misc/gengetopt/default.nix         | 2 +-
 pkgs/development/tools/misc/global/default.nix            | 2 +-
 pkgs/development/tools/misc/gnum4/default.nix             | 2 +-
 pkgs/development/tools/misc/gperf/3.0.x.nix               | 2 +-
 pkgs/development/tools/misc/gperf/default.nix             | 2 +-
 pkgs/development/tools/misc/help2man/default.nix          | 2 +-
 pkgs/development/tools/misc/libtool/default.nix           | 2 +-
 pkgs/development/tools/misc/libtool/libtool2.nix          | 2 +-
 pkgs/development/tools/misc/texinfo/common.nix            | 2 +-
 pkgs/development/tools/parsing/bison/2.x.nix              | 2 +-
 pkgs/development/tools/parsing/bison/3.x.nix              | 2 +-
 pkgs/games/ball-and-paddle/default.nix                    | 2 +-
 pkgs/games/gnuchess/default.upstream                      | 2 +-
 pkgs/games/gnugo/default.nix                              | 2 +-
 pkgs/games/gtypist/default.nix                            | 2 +-
 pkgs/games/liquidwar/default.nix                          | 2 +-
 pkgs/games/xboard/default.nix                             | 7 ++++---
 pkgs/games/xboard/default.upstream                        | 2 +-
 pkgs/servers/dico/default.nix                             | 2 +-
 pkgs/servers/http/myserver/default.nix                    | 2 +-
 pkgs/servers/mail/mailman/default.nix                     | 2 +-
 pkgs/servers/pies/default.nix                             | 2 +-
 pkgs/servers/shishi/default.nix                           | 2 +-
 pkgs/servers/sip/sipwitch/default.nix                     | 2 +-
 pkgs/shells/bash/4.4.nix                                  | 2 +-
 pkgs/shells/rush/default.nix                              | 2 +-
 pkgs/tools/X11/xnee/default.nix                           | 2 +-
 pkgs/tools/archivers/cpio/default.nix                     | 2 +-
 pkgs/tools/archivers/gnutar/default.nix                   | 2 +-
 pkgs/tools/archivers/sharutils/default.nix                | 2 +-
 pkgs/tools/cd-dvd/xorriso/default.nix                     | 2 +-
 pkgs/tools/filesystems/nixpart/0.4/parted.nix             | 2 +-
 pkgs/tools/graphics/barcode/default.nix                   | 4 ++--
 pkgs/tools/graphics/plotutils/default.nix                 | 2 +-
 pkgs/tools/misc/bc/default.nix                            | 2 +-
 pkgs/tools/misc/coreutils/default.nix                     | 2 +-
 pkgs/tools/misc/datamash/default.nix                      | 2 +-
 pkgs/tools/misc/findutils/default.nix                     | 2 +-
 pkgs/tools/misc/grub/2.0x.nix                             | 2 +-
 pkgs/tools/misc/grub/trusted.nix                          | 2 +-
 pkgs/tools/misc/idutils/default.nix                       | 2 +-
 pkgs/tools/misc/parallel/default.nix                      | 2 +-
 pkgs/tools/misc/parted/default.nix                        | 2 +-
 pkgs/tools/misc/recutils/default.nix                      | 2 +-
 pkgs/tools/misc/screen/default.nix                        | 2 +-
 pkgs/tools/misc/stow/default.nix                          | 2 +-
 pkgs/tools/misc/time/default.nix                          | 2 +-
 pkgs/tools/misc/uucp/default.nix                          | 2 +-
 pkgs/tools/networking/dropbear/default.nix                | 2 +-
 pkgs/tools/networking/inetutils/default.nix               | 2 +-
 pkgs/tools/networking/jwhois/default.nix                  | 2 +-
 pkgs/tools/networking/mailutils/default.nix               | 2 +-
 pkgs/tools/networking/wget/default.nix                    | 2 +-
 pkgs/tools/security/gnu-pw-mgr/default.nix                | 2 +-
 pkgs/tools/system/acct/default.nix                        | 2 +-
 pkgs/tools/system/ddrescue/default.nix                    | 2 +-
 pkgs/tools/system/fdisk/default.nix                       | 4 ++--
 pkgs/tools/system/freeipmi/default.nix                    | 4 ++--
 pkgs/tools/system/mcron/default.nix                       | 2 +-
 pkgs/tools/system/which/default.nix                       | 2 +-
 pkgs/tools/text/diffutils/default.nix                     | 2 +-
 pkgs/tools/text/enscript/default.nix                      | 2 +-
 pkgs/tools/text/gawk/default.nix                          | 2 +-
 pkgs/tools/text/gnugrep/default.nix                       | 2 +-
 pkgs/tools/text/gnused/422.nix                            | 2 +-
 pkgs/tools/text/gnused/default.nix                        | 2 +-
 pkgs/tools/text/groff/default.nix                         | 2 +-
 pkgs/tools/text/recode/default.nix                        | 2 +-
 pkgs/tools/text/source-highlight/default.nix              | 2 +-
 pkgs/tools/text/wdiff/default.nix                         | 2 +-
 pkgs/tools/typesetting/tex/auctex/default.nix             | 2 +-
 155 files changed, 178 insertions(+), 177 deletions(-)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 7677c366191..74b7a9f961e 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -935,7 +935,7 @@ The implementation can be found in the
 [integer-gmp](http://hackage.haskell.org/package/integer-gmp) package.
 
 A potential problem with this is that GMP is licensed under the
-[GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html),
+[GNU Lesser General Public License (LGPL)](https://www.gnu.org/copyleft/lesser.html),
 a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5,
 you may distribute a program that is designed to be compiled and dynamically
 linked with the library under the terms of your choice (i.e., commercially) but
diff --git a/doc/meta.xml b/doc/meta.xml
index 3abfe016d70..774ed2db750 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -14,7 +14,7 @@ meta = with stdenv.lib; {
     GNU Hello is a program that prints "Hello, world!" when you run it.
     It is fully customizable.
   '';
-  homepage = http://www.gnu.org/software/hello/manual/;
+  homepage = https://www.gnu.org/software/hello/manual/;
   license = licenses.gpl3Plus;
   maintainers = [ maintainers.eelco ];
   platforms = platforms.all;
@@ -35,7 +35,7 @@ $ nix-env -qa hello --json
     "hello": {
         "meta": {
             "description": "A program that produces a familiar, friendly greeting",
-            "homepage": "http://www.gnu.org/software/hello/manual/",
+            "homepage": "https://www.gnu.org/software/hello/manual/",
             "license": {
                 "fullName": "GNU General Public License version 3 or later",
                 "shortName": "GPLv3+",
@@ -135,7 +135,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     <listitem>
      <para>
       The package’s homepage. Example:
-      <literal>http://www.gnu.org/software/hello/manual/</literal>
+      <literal>https://www.gnu.org/software/hello/manual/</literal>
      </para>
     </listitem>
    </varlistentry>
@@ -146,7 +146,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     <listitem>
      <para>
       The page where a link to the current version can be found. Example:
-      <literal>http://ftp.gnu.org/gnu/hello/</literal>
+      <literal>https://ftp.gnu.org/gnu/hello/</literal>
      </para>
     </listitem>
    </varlistentry>
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index 028a9427534..cdcfa10b820 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -31,7 +31,7 @@ $ cd nixpkgs
  <para>
   The second possibility is to add the package outside of the Nixpkgs tree. For
   instance, here is how you specify a build of the
-  <link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
+  <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
   package directly in <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 6cf20cf4aa7..1ac53c818a7 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -11,7 +11,7 @@
       Rodney Lorrimar @rvl
   -->
  <para>
-  <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> is an
+  <link xlink:href="https://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.
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 536b319cab0..afbd6d908c3 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/ed/;
+    homepage = https://www.gnu.org/software/ed/;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix
index c873a7c0ca8..f966989b5a3 100644
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emms/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # These guys don't use ftp.gnu.org...
-    url = "http://www.gnu.org/software/emms/download/${name}.tar.gz";
+    url = "https://www.gnu.org/software/emms/download/${name}.tar.gz";
     sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav";
   };
 
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
       support, with no effort from your side.
     '';
 
-    homepage = http://www.gnu.org/software/emms/;
+    homepage = https://www.gnu.org/software/emms/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
index 05ddfbf6c16..f6fee846f92 100644
--- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix
+++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "let-alist-1.0.3";
 
   src = fetchurl {
-    url = "http://elpa.gnu.org/packages/let-alist-1.0.3.el";
+    url = "https://elpa.gnu.org/packages/let-alist-1.0.3.el";
     sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://elpa.gnu.org/packages/let-alist.html;
+    homepage = https://elpa.gnu.org/packages/let-alist.html;
     description = "Easily let-bind values of an assoc-list by their names";
     license = stdenv.lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index 6576cd54472..d9f0b211f15 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The extensible, customizable GNU text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
+    homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index e95d2b61535..948d8cb9867 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The extensible, customizable GNU text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
+    homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 7070ce59738..3b32eef4e03 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
+    homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ jwiegley matthewbauer ];
     platforms   = platforms.darwin;
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 764877a11cb..64843b2f070 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       completion, directory browser, duplicate removal from prompt histories,
       delimiter matching, text conversion from/to UTF-8, romanization, etc.
     '';
-    homepage = http://www.gnu.org/software/moe/;
+    homepage = https://www.gnu.org/software/moe/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 7213b22c949..ae3871bb87a 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       compiles to about 130Kb.
     '';
 
-    homepage = http://www.gnu.org/software/zile/;
+    homepage = https://www.gnu.org/software/zile/;
 
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 036cb104b48..f94f8f5dd70 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = {
-    homepage = http://www.gnu.org/software/gv/;
+    homepage = https://www.gnu.org/software/gv/;
     description = "PostScript/PDF document viewer";
 
     longDescription = ''
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 7998d30f253..c0a39d2d91d 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       GNU Hello is a program that prints "Hello, world!" when you run it.
       It is fully customizable.
     '';
-    homepage = http://www.gnu.org/software/hello/manual/;
+    homepage = https://www.gnu.org/software/hello/manual/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.eelco ];
     platforms = platforms.all;
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 5146f3a0e39..2c27853c944 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
-    downloadPage = "http://www.gnu.org/software/freetalk/";
+    downloadPage = "https://www.gnu.org/software/freetalk/";
   };
 }
diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix
index a6a5f68755a..016760bde02 100644
--- a/pkgs/applications/science/electronics/archimedes/default.nix
+++ b/pkgs/applications/science/electronics/archimedes/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GNU package for semiconductor device simulations";
-    homepage = http://www.gnu.org/software/archimedes;
+    homepage = https://www.gnu.org/software/archimedes;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 1afbc2b72e5..c53e87caa9a 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.gnu.org/software/pspp/;
+    homepage = https://www.gnu.org/software/pspp/;
     description = "A free replacement for SPSS, a program for statistical analysis of sampled data";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index 3dd8b9f860d..bc62004065b 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GNU Arch (aka. `tla'), a distributed revision control system";
-    homepage = http://www.gnu.org/software/gnu-arch/;
+    homepage = https://www.gnu.org/software/gnu-arch/;
     license = "GPL";
   };
 }
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 5acced4ac07..df1739aea57 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-std=c99" ];
 
   meta = {
-    homepage = http://www.gnu.org/software/rcs/;
+    homepage = https://www.gnu.org/software/rcs/;
     description = "Revision control system";
     longDescription =
       '' The GNU Revision Control System (RCS) manages multiple revisions of
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 04683ceddb3..34597135500 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ STD manual pages";
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = "GPL/LGPL";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index 87b3abe2911..39118716f6f 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -19,7 +19,7 @@ fetchzip rec {
       (PostScript Type0, TrueType, OpenType...) fonts covering the ISO
       10646/Unicode UCS (Universal Character Set).
     '';
-    homepage = http://www.gnu.org/software/freefont/;
+    homepage = https://www.gnu.org/software/freefont/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.all;
     maintainers = [];
diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix
index 30fede80251..4e1d1e02a2f 100644
--- a/pkgs/data/misc/miscfiles/default.nix
+++ b/pkgs/data/misc/miscfiles/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/miscfiles/;
+    homepage = https://www.gnu.org/software/miscfiles/;
     license = licenses.gpl2Plus;
     description = "Collection of files not of crucial importance for sysadmins";
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index a7a8011b2e6..9cfe03d6655 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -335,7 +335,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -397,7 +397,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index a3ba03f517a..9b23fe78599 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -348,7 +348,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -409,7 +409,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 95e3d7b8492..5db2ac3d413 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -353,7 +353,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -414,7 +414,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index ff48e485a9a..99c79a99dce 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -355,7 +355,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -416,7 +416,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 9235908f14c..d790246717d 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -367,7 +367,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 363694dcf4e..80d57c9d538 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -304,7 +304,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -345,7 +345,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 586fb2b44e1..a07f6f1feb2 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -269,7 +269,7 @@ stdenv.mkDerivation ({
     then "install-strip"
     else "install";
 
-  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -317,7 +317,7 @@ stdenv.mkDerivation ({
   inherit (stdenv) is64bit;
 
   meta = {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index b12b055342c..a0cc27b37e2 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://www.gnu.org/software/gprolog/;
+    homepage = https://www.gnu.org/software/gprolog/;
     description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
     license = stdenv.lib.licenses.lgpl3Plus;
 
diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index f254e91e5c6..ef7ad9b3266 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
          development cycle.
       '';
 
-    homepage = http://www.gnu.org/software/mit-scheme/;
+    homepage = https://www.gnu.org/software/mit-scheme/;
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 12648cab7dc..26fffac0a13 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       guile-gnome a comprehensive environment for developing modern
       applications.
     '';
-    homepage = "http://www.gnu.org/software/guile-gnome/";
+    homepage = "https://www.gnu.org/software/guile-gnome/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix
index f854c71c240..e1e04ecfe69 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Guile bindings for the OpenGL graphics API";
-    homepage = "http://gnu.org/s/guile-opengl";
+    homepage = "https://www.gnu.org/software/guile-opengl/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index 5f887c3a7be..a606b3ecf28 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Guile bindings for SDL";
-    homepage = "http://gnu.org/s/guile-sdl";
+    homepage = "https://www.gnu.org/software/guile-sdl/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 599126d2eff..f60e5d28614 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Free interpreter for the APL programming language";
-    homepage    = http://www.gnu.org/software/apl/;
+    homepage    = https://www.gnu.org/software/apl/;
     license     = licenses.gpl3Plus;
     maintainers = [ maintainers.kovirobi ];
     platforms   = with platforms; linux ++ darwin;
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 6a97c397397..fd270dedefc 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Embeddable Scheme implementation";
-    homepage    = http://www.gnu.org/software/guile/;
+    homepage    = https://www.gnu.org/software/guile/;
     license     = stdenv.lib.licenses.lgpl2Plus;
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 921f4b03abc..b65dfb1d4a1 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -94,7 +94,7 @@
 
   meta = {
     description = "Embeddable Scheme implementation";
-    homepage    = http://www.gnu.org/software/guile/;
+    homepage    = https://www.gnu.org/software/guile/;
     license     = stdenv.lib.licenses.lgpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
     platforms   = stdenv.lib.platforms.all;
@@ -114,7 +114,7 @@
 //
 
 (stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  # Work around <http://bugs.gnu.org/14201>.
+  # Work around <https://bugs.gnu.org/14201>.
   SHELL = "/bin/sh";
   CONFIG_SHELL = "/bin/sh";
 })
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index aacc5dc49a1..1943b10bdca 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -90,7 +90,7 @@
 
   meta = {
     description = "Embeddable Scheme implementation";
-    homepage    = http://www.gnu.org/software/guile/;
+    homepage    = https://www.gnu.org/software/guile/;
     license     = stdenv.lib.licenses.lgpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
     platforms   = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix
index bd83a5c79d5..db2d177b710 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/pkgs/development/libraries/ccrtp/1.8.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
-    homepage = http://www.gnu.org/software/ccrtp/;
+    homepage = https://www.gnu.org/software/ccrtp/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 5df7c2279c5..cd9d031788a 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An implementation of the IETF real-time transport protocol (RTP)";
-    homepage = http://www.gnu.org/software/ccrtp/;
+    homepage = https://www.gnu.org/software/ccrtp/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix
index f578cd2f87d..0c5ab758583 100644
--- a/pkgs/development/libraries/commoncpp2/default.nix
+++ b/pkgs/development/libraries/commoncpp2/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
          to build native threading applications for Microsoft Windows.
       '';
 
-    homepage = http://www.gnu.org/software/commoncpp/;
+    homepage = https://www.gnu.org/software/commoncpp/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index f8397052b77..4762d1fb119 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = licenses.lgpl3Plus;
     description = "GNU Compiler Collection, version ${version} -- C++ standard library";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index ca4c0bc744b..9b1fc2b4ac5 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
          package also provides traditional dbm and ndbm interfaces.
       '';
 
-    homepage = http://www.gnu.org/software/gdbm/;
+    homepage = https://www.gnu.org/software/gdbm/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 1b2f6bbc222..8ed898813ae 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       GNU packages produce multi-lingual messages.
     '';
 
-    homepage = http://www.gnu.org/software/gettext/;
+    homepage = https://www.gnu.org/software/gettext/;
 
     maintainers = with maintainers; [ zimbatm vrthra ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 042f5ca90ba..50d8c6e268c 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -187,7 +187,7 @@ stdenv.mkDerivation ({
   doCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/libc/;
+    homepage = https://www.gnu.org/software/libc/;
     description = "The GNU C Library";
 
     longDescription =
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 481ae32bdc6..1d35c0696d2 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
          programming language and organized in the form of a library.
       '';
 
-    homepage = http://www.gnu.org/software/glpk/;
+    homepage = https://www.gnu.org/software/glpk/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 081d896a6e0..05243824142 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
        tampering, or message forgery."
     '';
 
-    homepage = http://www.gnu.org/software/gnutls/;
+    homepage = https://www.gnu.org/software/gnutls/;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ eelco wkennington fpletz ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index a1df933149f..899aa116b2c 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
          (e.g. IMAP, SMTP, etc.) to authenticate peers. 
        '';
 
-    homepage = http://www.gnu.org/software/gsasl/;
+    homepage = https://www.gnu.org/software/gsasl/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ shlevy ];
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 8a419d67865..9fd3f8a7a99 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     # ToDo: there might be more impurities than FMA support check
-    ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+    ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
   ];
 
   # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
-    homepage = http://www.gnu.org/software/gsl/;
+    homepage = https://www.gnu.org/software/gsl/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix
index 577b05abeff..f569d9c3ea1 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     # ToDo: there might be more impurities than FMA support check
-    ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+    ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
     (fetchpatch {
       name = "bug-39055.patch";
       url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
-    homepage = http://www.gnu.org/software/gsl/;
+    homepage = https://www.gnu.org/software/gsl/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 0cc6a07e083..9f3bb3c7ead 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/gss/;
+    homepage = https://www.gnu.org/software/gss/;
     description = "Generic Security Service";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ bjg wkennington ];
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index c02e2108f23..57c3e123377 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       It is associated with GNU Binutils, and elsewhere often distributed with
       it.
     '';
-    homepage = http://www.gnu.org/software/binutils/;
+    homepage = https://www.gnu.org/software/binutils/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ericson2314 ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index 9dc3c1d11ba..5c50d093243 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       ISO-9660 filesystems (libiso9660), as well as utility
       programs such as an audio CD player and an extractor.
     '';
-    homepage = http://www.gnu.org/software/libcdio/;
+    homepage = https://www.gnu.org/software/libcdio/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index bcc85abbd3e..ab1858c51a6 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://gcc.gnu.org/;
+    homepage = https://gcc.gnu.org/;
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
     maintainers = with maintainers; [ abbradar ericson2314 ];
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index d9773a1be4d..92b6ec43d40 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       applications.
     '';
 
-    homepage = http://www.gnu.org/software/libiconv/;
+    homepage = https://www.gnu.org/software/libiconv/;
     license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 66ae352525f..8291499daf3 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/libidn/;
+    homepage = https://www.gnu.org/software/libidn/;
     description = "Library for internationalized domain names";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 4462fca7b64..b284f321895 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.lgpl2Plus;
 
-    homepage = http://www.gnu.org/software/libmicrohttpd/;
+    homepage = https://www.gnu.org/software/libmicrohttpd/;
 
     maintainers = with maintainers; [ eelco vrthra fpletz ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 2c59fa03ea0..a1db11d9a8e 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library from binutils for manipulating machine code";
-    homepage = http://www.gnu.org/software/binutils/;
+    homepage = https://www.gnu.org/software/binutils/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ericson2314 ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 306c73a9b55..b50a7c371a7 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true; # not cross;
 
   meta = {
-    homepage = http://www.gnu.org/software/libsigsegv/;
+    homepage = https://www.gnu.org/software/libsigsegv/;
     description = "Library to handle page faults in user mode";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 5762291568c..341e2cd1c77 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/libtasn1/;
+    homepage = https://www.gnu.org/software/libtasn1/;
     description = "An ASN.1 library";
     longDescription = ''
       Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 312a5c11810..e066c072367 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   meta = {
-    homepage = http://www.gnu.org/software/libunistring/;
+    homepage = https://www.gnu.org/software/libunistring/;
 
     description = "Unicode string library";
 
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 81c5b5e2891..aff5f8ac445 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Library for rasterizing 2-D vector graphics";
-    homepage = http://www.gnu.org/software/libxmi/;
+    homepage = https://www.gnu.org/software/libxmi/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 2ad14efa322..3f963c7ca19 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://www.gnu.org/software/lightning/;
+    homepage = https://www.gnu.org/software/lightning/;
     description = "Run-time code generation library";
     longDescription = ''
       GNU lightning is a library that generates assembly language code
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 77de18de2b0..7db78af340c 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
       ported to OS/2 Warp!
     '';
 
-    homepage = http://www.gnu.org/software/ncurses/;
+    homepage = https://www.gnu.org/software/ncurses/;
 
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 814158276ce..6ee934c60c3 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = stdenv.lib.licenses.lgpl21Plus;
-    homepage = http://www.gnu.org/software/osip/;
+    homepage = https://www.gnu.org/software/osip/;
     description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index 90dc647233d..7a0eba2d67a 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The GNU Portable Threads library";
-    homepage = http://www.gnu.org/software/pth;
+    homepage = https://www.gnu.org/software/pth;
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 416cf53ab49..53e10b468ba 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ library to facilitate using C++ design patterns";
-    homepage = http://www.gnu.org/software/commoncpp/;
+    homepage = https://www.gnu.org/software/commoncpp/;
     license = stdenv.lib.licenses.lgpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index ddecf4a96a7..480b8f7bcd7 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libcdio ];
 
   meta = with lib; {
-    homepage = http://www.gnu.org/software/vcdimager/;
+    homepage = https://www.gnu.org/software/vcdimager/;
     description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
     platforms = platforms.unix;
     license = licenses.gpl2;
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 4c7dc52e79b..6d670006014 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/libcdio/;
+    homepage = https://www.gnu.org/software/libcdio/;
     description = "Wrapper around libcdio (CD Input and Control library)";
     maintainers = with maintainers; [ rycee ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 95466d843d6..98804f0ebe8 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "man" "info" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/make/;
+    homepage = https://www.gnu.org/software/make/;
     description = "A tool to control the generation of non-source files from sources";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index a545e715ea6..18af16d3652 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.gnu.org/software/gnulib/;
+    homepage = https://www.gnu.org/software/gnulib/;
     description = "Central location for code to be shared among GNU packages";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index cb64a4c876b..d051e1d5759 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Archive of autoconf m4 macros";
-    homepage = http://www.gnu.org/software/autoconf-archive/;
+    homepage = https://www.gnu.org/software/autoconf-archive/;
     license = licenses.gpl3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix
index d4748337626..9e777e53cf6 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13'';
 
   meta = {
-    homepage = http://www.gnu.org/software/autoconf/;
+    homepage = https://www.gnu.org/software/autoconf/;
     description = "Part of the GNU Build System";
     branch = "2.13";
 
diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix
index 31df050d5f8..98b55e31f60 100644
--- a/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/autoconf/;
+    homepage = https://www.gnu.org/software/autoconf/;
     description = "Part of the GNU Build System";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index e9ea0ea1ea4..304b4fddf0d 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/autoconf/;
+    homepage = https://www.gnu.org/software/autoconf/;
     description = "Part of the GNU Build System";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 265d425bbcf..ff5ce659d2e 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Automated text and program generation tool";
     license = with licenses; [ gpl3Plus lgpl3Plus ];
-    homepage = http://www.gnu.org/software/autogen/;
+    homepage = https://www.gnu.org/software/autogen/;
     platforms = platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 8f437af0ada..a5aa44abcde 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
   # available upstream; see
-  # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
+  # <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
   builder = ./builder.sh;
 
   setupHook = ./setup-hook.sh;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.11";
-    homepage = http://www.gnu.org/software/automake/;
+    homepage = https://www.gnu.org/software/automake/;
     description = "GNU standard-compliant makefile generator";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 478fc14d680..1e432a6e149 100644
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.15";
-    homepage = http://www.gnu.org/software/automake/;
+    homepage = https://www.gnu.org/software/automake/;
     description = "GNU standard-compliant makefile generator";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 2d2884eda3e..46f4700f314 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
       They also include the BFD (Binary File Descriptor) library,
       `gprof', `nm', `strip', etc.
     '';
-    homepage = http://www.gnu.org/software/binutils/;
+    homepage = https://www.gnu.org/software/binutils/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ericson2314 ];
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 16098bda3ee..b2dbf65bcb0 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/cflow/;
+    homepage = https://www.gnu.org/software/cflow/;
 
     maintainers = [ maintainers.vrthra ];
 
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index 41bfa520e62..d95c67fea6d 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/complexity/;
+    homepage = https://www.gnu.org/software/complexity/;
 
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix
index 7238bcdeb6b..c51a5f50474 100644
--- a/pkgs/development/tools/misc/ddd/default.nix
+++ b/pkgs/development/tools/misc/ddd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   patches = [ ./gcc44.patch ];
 
   meta = {
-    homepage = http://www.gnu.org/software/ddd;
+    homepage = https://www.gnu.org/software/ddd;
     description = "Graphical front-end for command-line debuggers";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index d9fab774b76..26eaf707b2b 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # details.
 
   # The test-suite needs to have a non-empty stdin:
-  #   http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
+  #   https://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
   checkPhase = ''
     # Provide `runtest' with a log name, otherwise it tries to run
     # `whoami', which fails when in a chroot.
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       Tool command language.
     '';
 
-    homepage = http://www.gnu.org/software/dejagnu/;
+    homepage = https://www.gnu.org/software/dejagnu/;
     license = licenses.gpl2Plus;
 
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 103f1131148..49b7f3ca824 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
       program was doing at the moment it crashed.
     '';
 
-    homepage = http://www.gnu.org/software/gdb/;
+    homepage = https://www.gnu.org/software/gdb/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index 304f16942ea..b6758cb0bc2 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
          fills a struct
       '';
 
-    homepage = http://www.gnu.org/software/gengetopt/;
+    homepage = https://www.gnu.org/software/gengetopt/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index f0f21f8f4d5..cc6dde53bb9 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       independence of any editor.  It runs on a UNIX (POSIX) compatible
       operating system like GNU and BSD.
     '';
-    homepage = http://www.gnu.org/software/global/;
+    homepage = https://www.gnu.org/software/global/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pSub peterhoeg ];
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 12a5b8f2adc..f477d42fcf1 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch;
 
   meta = {
-    homepage = http://www.gnu.org/software/m4/;
+    homepage = https://www.gnu.org/software/m4/;
     description = "GNU M4, a macro processor";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix
index bfada264d50..e203f931b43 100644
--- a/pkgs/development/tools/misc/gperf/3.0.x.nix
+++ b/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/gperf/;
+    homepage = https://www.gnu.org/software/gperf/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index b88a107bdbc..cd0854d2beb 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/gperf/;
+    homepage = https://www.gnu.org/software/gperf/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 44ec787a1a5..ca48af64196 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
          ‘--version’ output of other commands.
       '';
 
-    homepage = http://www.gnu.org/software/help2man/;
+    homepage = https://www.gnu.org/software/help2man/;
 
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 23cc2c87a51..f56a59c4270 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       documentation for details.
     '';
 
-    homepage = http://www.gnu.org/software/libtool/;
+    homepage = https://www.gnu.org/software/libtool/;
 
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index bd7f62a7bcd..0fb3dfed744 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       documentation for details.
     '';
 
-    homepage = http://www.gnu.org/software/libtool/;
+    homepage = https://www.gnu.org/software/libtool/;
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 391179e2eb3..613fd2673d5 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     && !stdenv.isSunOS; # flaky
 
   meta = {
-    homepage = http://www.gnu.org/software/texinfo/;
+    homepage = https://www.gnu.org/software/texinfo/;
     description = "The GNU documentation system";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix
index 019c154a6b7..e9aa33d2f60 100644
--- a/pkgs/development/tools/parsing/bison/2.x.nix
+++ b/pkgs/development/tools/parsing/bison/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # M4 = "${m4}/bin/m4";
 
   meta = {
-    homepage = http://www.gnu.org/software/bison/;
+    homepage = https://www.gnu.org/software/bison/;
     description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index bae134ea3a5..70b3ab3cb2c 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/bison/;
+    homepage = https://www.gnu.org/software/bison/;
     description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix
index 1391ca70223..a8b5f9fea4d 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/pkgs/games/ball-and-paddle/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/ballandpaddle/;
+    homepage = https://www.gnu.org/software/ballandpaddle/;
 
     maintainers = [ ];
 
diff --git a/pkgs/games/gnuchess/default.upstream b/pkgs/games/gnuchess/default.upstream
index e1d1d5f2eeb..f19dca51add 100644
--- a/pkgs/games/gnuchess/default.upstream
+++ b/pkgs/games/gnuchess/default.upstream
@@ -1 +1 @@
-url http://ftp.gnu.org/gnu/chess/
+url https://ftp.gnu.org/gnu/chess/
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 133a00b67bb..2952edaa78d 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://www.gnu.org/software/gnugo/;
+    homepage = https://www.gnu.org/software/gnugo/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index 0f19537c62f..b29b045a421 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/gtypist;
+    homepage = https://www.gnu.org/software/gtypist;
     description = "Universal typing tutor";
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 1ff1f96b5a2..9a6ff4e0ae8 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Quick tactics game";
-    homepage = http://www.gnu.org/software/liquidwar6/;
+    homepage = https://www.gnu.org/software/liquidwar6/;
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 442aad46fea..c2c0dc764df 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -9,12 +9,12 @@ let
     version="4.9.1";
     name="${baseName}-${version}";
     hash="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
+    url="https://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
     sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
   };
   buildInputs = [
-    libX11 xproto libXt libXaw libSM libICE libXmu 
-    libXext gnuchess texinfo libXpm pkgconfig librsvg 
+    libX11 xproto libXt libXaw libSM libICE libXmu
+    libXext gnuchess texinfo libXpm pkgconfig librsvg
     cairo pango gtk2
   ];
 in
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''GUI for chess engines'';
+    homepage = https://www.gnu.org/software/xboard/;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/games/xboard/default.upstream b/pkgs/games/xboard/default.upstream
index 1e649bba505..2e5af5d0872 100644
--- a/pkgs/games/xboard/default.upstream
+++ b/pkgs/games/xboard/default.upstream
@@ -1 +1 @@
-url http://ftp.gnu.org/gnu/xboard/
+url https://ftp.gnu.org/gnu/xboard/
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index 0e4c392c7a3..d64f5915881 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Flexible dictionary server and client implementing RFC 2229";
-    homepage    = http://www.gnu.org/software/dico/;
+    homepage    = https://www.gnu.org/software/dico/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux;
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index b4ed3324491..b18e1ea162f 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       built-in features.  Share your files in minutes!
     '';
 
-    homepage = http://www.gnu.org/software/myserver/;
+    homepage = https://www.gnu.org/software/myserver/;
 
     license = lib.licenses.gpl3Plus;
 
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 87e0d219c9c..91445afa97d 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "DIRSETGID=:" ];
 
   meta = {
-    homepage = http://www.gnu.org/software/mailman/;
+    homepage = https://www.gnu.org/software/mailman/;
     description = "Free software for managing electronic mail discussion and e-newsletter lists";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index 73af60e55c4..a113d583cb1 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/pies/;
+    homepage = https://www.gnu.org/software/pies/;
 
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index b066ff18bfd..6c4e515d422 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage    = http://www.gnu.org/software/shishi/;
+    homepage    = https://www.gnu.org/software/shishi/;
     description = "An implementation of the Kerberos 5 network security system";
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ bjg lovek323 wkennington ];
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 9a6f2b0b5e1..1252153b79a 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Secure peer-to-peer VoIP server that uses the SIP protocol";
-    homepage = http://www.gnu.org/software/sipwitch/;
+    homepage = https://www.gnu.org/software/sipwitch/;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 6f970e1b7ad..e5e33c76d20 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/bash/;
+    homepage = https://www.gnu.org/software/bash/;
     description =
       "GNU Bourne-Again Shell, the de facto standard shell on Linux" +
         (if interactive then " (for interactive use)" else "");
diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index 9a5f7a753d3..3bfafdc46a0 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
          sftp-server or scp, that lack this ability.
       '';
 
-    homepage = http://www.gnu.org/software/rush/;
+    homepage = https://www.gnu.org/software/rush/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index b31a512e84a..c7fd376a8ed 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/xnee/;
+    homepage = https://www.gnu.org/software/xnee/;
 
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index c38dc7bbfbe..44943109ee1 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/cpio/;
+    homepage = https://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 0cde7206984..5633a9fa152 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = false; # fails
 
   meta = {
-    homepage = http://www.gnu.org/software/tar/;
+    homepage = https://www.gnu.org/software/tar/;
     description = "GNU implementation of the `tar' archiver";
 
     longDescription = ''
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 292c0be20e5..a03c9610e35 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
          by a copy of the shell. unshar may also process files containing
          concatenated shell archives.
       '';
-    homepage = http://www.gnu.org/software/sharutils/;
+    homepage = https://www.gnu.org/software/sharutils/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.ndowens ];
     platforms = platforms.all;
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index f396cbad955..1469a68bf0e 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/xorriso/;
+    homepage = https://www.gnu.org/software/xorriso/;
 
     maintainers = [ maintainers.vrthra ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index f7071e45232..046fe81e64a 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       which also serves as a sample implementation and script backend.
     '';
 
-    homepage = http://www.gnu.org/software/parted/;
+    homepage = https://www.gnu.org/software/parted/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 4fa9fff97d3..de09c2b2780 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     description = "GNU barcode generator";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux; # Maybe other non-darwin Unix
-    downloadPage = "http://ftp.gnu.org/gnu/barcode/";
+    downloadPage = "https://ftp.gnu.org/gnu/barcode/";
     updateWalker = true;
-    homepage = http://ftp.gnu.org/gnu/barcode/;
+    homepage = https://www.gnu.org/software/barcode/;
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index 0d1890bb670..61e21b1a33d 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
          graphics.
       '';
 
-    homepage = http://www.gnu.org/software/plotutils/;
+    homepage = https://www.gnu.org/software/plotutils/;
 
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 922d34e2d36..111ab254acc 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GNU software calculator";
-    homepage = http://www.gnu.org/software/bc/;
+    homepage = https://www.gnu.org/software/bc/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index de97e94ae42..fb4284d555f 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.gnu.org/software/coreutils/;
+    homepage = https://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";
 
     longDescription = ''
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 064fd00cc27..d8591647ad3 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files";
-    homepage = http://www.gnu.org/software/datamash/;
+    homepage = https://www.gnu.org/software/datamash/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub vrthra ];
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index d19117d4dcd..9db66480cb1 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.gnu.org/software/findutils/;
+    homepage = https://www.gnu.org/software/findutils/;
     description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
 
     longDescription = ''
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 481a07ef491..71d4abd9ca4 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
          operating system (e.g., GNU).
       '';
 
-    homepage = http://www.gnu.org/software/grub/;
+    homepage = https://www.gnu.org/software/grub/;
 
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 0e867d7cffd..d4d79c6e59f 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -21,7 +21,7 @@ let
 
   po_src = fetchurl {
     name = "grub-2.02-beta2.tar.gz";
-    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
+    url = "https://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
     sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
 
   };
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index 99f19889201..959be2a4eb1 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       contents of certain character strings.
     '';
 
-    homepage = http://www.gnu.org/software/idutils/;
+    homepage = https://www.gnu.org/software/idutils/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ ];
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index dfaca9cd88e..fec81b580f3 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
          it possible to use output from GNU Parallel as input for other
          programs.
       '';
-    homepage = http://www.gnu.org/software/parallel/;
+    homepage = https://www.gnu.org/software/parallel/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub vrthra ];
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 709246269f8..4934252bed9 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
       which also serves as a sample implementation and script backend.
     '';
 
-    homepage = http://www.gnu.org/software/parted/;
+    homepage = https://www.gnu.org/software/parted/;
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index 3dd3baed099..df53235d0ef 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
          number of named fields.
       '';
 
-    homepage = http://www.gnu.org/software/recutils/;
+    homepage = https://www.gnu.org/software/recutils/;
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index fd641ea613d..c7a630b837a 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/screen/;
+    homepage = https://www.gnu.org/software/screen/;
     description = "A window manager that multiplexes a physical terminal";
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index 0468d2d8a63..18a6df657f5 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     '';
 
     license = stdenv.lib.licenses.gpl3Plus;
-    homepage = http://www.gnu.org/software/stow/;
+    homepage = https://www.gnu.org/software/stow/;
 
     maintainers = with stdenv.lib.maintainers; [ the-kenny jgeerds ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 892afb4ee1c..8f297542a3c 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = stdenv.lib.licenses.gpl3Plus;
-    homepage = http://www.gnu.org/software/time/;
+    homepage = https://www.gnu.org/software/time/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index acb42a7a8d2..0fae40a5c96 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
          just found one of the finest UUCP implementations available.
       '';
 
-    homepage = http://www.gnu.org/software/uucp/uucp.html;
+    homepage = https://www.gnu.org/software/uucp/uucp.html;
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index be2e43a8947..32d55d2009a 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
 
-  # http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
+  # https://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
   preConfigure = ''
     makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib
   '';
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index c050758a8ee..1d2bfdc9118 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
          traceroute, uucpd, and whois.
       '';
 
-    homepage = http://www.gnu.org/software/inetutils/;
+    homepage = https://www.gnu.org/software/inetutils/;
     license = licenses.gpl3Plus;
 
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index be8e9e210d1..e9f43da981c 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
-    homepage = http://www.gnu.org/software/jwhois/;
+    homepage = https://www.gnu.org/software/jwhois/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index f4e14d98248..d6c67005295 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
 
     maintainers = with maintainers; [ orivej vrthra ];
 
-    homepage = http://www.gnu.org/software/mailutils/;
+    homepage = https://www.gnu.org/software/mailutils/;
 
     # Some of the dependencies fail to build on {cyg,dar}win.
     platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 0bd99c63596..8e3234910e4 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/wget/;
+    homepage = https://www.gnu.org/software/wget/;
 
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.all;
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
index d58585c4069..2139b7c84af 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "gnu-pw-mgr-${version}";
   version = "2.4.2";
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
+    url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
     sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
   };
 
diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index ca8fbdcf031..669c91adf10 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/acct/;
+    homepage = https://www.gnu.org/software/acct/;
 
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 6c852efe96e..22348ea6ebc 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
          second and successive copies.
       '';
 
-    homepage = http://www.gnu.org/software/ddrescue/ddrescue.html;
+    homepage = https://www.gnu.org/software/ddrescue/ddrescue.html;
 
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix
index 9a4ac260ecc..0aea3ced3b5 100644
--- a/pkgs/tools/system/fdisk/default.nix
+++ b/pkgs/tools/system/fdisk/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, parted, libuuid, gettext, guile }:
 
 stdenv.mkDerivation rec {
-  name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
+  name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
 
   src = fetchurl {
     url = "mirror://gnu/fdisk/${name}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/fdisk/;
+    homepage = https://www.gnu.org/software/fdisk/;
 
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 9c7a5b36c5b..5fd4136e3c2 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
          info.
       '';
 
-    homepage = http://www.gnu.org/software/freeipmi/;
-    downloadPage = "http://www.gnu.org/software/freeipmi/download.html";
+    homepage = https://www.gnu.org/software/freeipmi/;
+    downloadPage = "https://www.gnu.org/software/freeipmi/download.html";
 
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index dbc679eb8ad..1831041063b 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       when jobs should be run.  Mcron was written by Dale Mellor.
     '';
 
-    homepage = http://www.gnu.org/software/mcron/;
+    homepage = https://www.gnu.org/software/mcron/;
 
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index 870e1b3a398..be2892e52e8 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://ftp.gnu.org/gnu/which/;
+    homepage = https://www.gnu.org/software/which/;
     platforms = platforms.all;
     license = licenses.gpl3;
   };
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index fff81fbc860..68b2e512101 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/diffutils/diffutils.html;
+    homepage = https://www.gnu.org/software/diffutils/diffutils.html;
     description = "Commands for showing the differences between files (diff, cmp, etc.)";
     license = licenses.gpl3;
     platforms = platforms.unix;
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index 37121e68f66..24ac649026a 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = http://www.gnu.org/software/enscript/;
+    homepage = https://www.gnu.org/software/enscript/;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 15d54f4a2a4..e7b79997f02 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/gawk/;
+    homepage = https://www.gnu.org/software/gawk/;
     description = "GNU implementation of the Awk programming language";
 
     longDescription = ''
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 089f3094b54..0b6f36bea72 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/grep/;
+    homepage = https://www.gnu.org/software/grep/;
     description = "GNU implementation of the Unix grep command";
 
     longDescription = ''
diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix
index 16d4f20fe8e..3a9856c3dd3 100644
--- a/pkgs/tools/text/gnused/422.nix
+++ b/pkgs/tools/text/gnused/422.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "info" ];
 
   meta = {
-    homepage = http://www.gnu.org/software/sed/;
+    homepage = https://www.gnu.org/software/sed/;
     description = "GNU sed, a batch stream editor";
 
     longDescription = ''
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 4bdddb8c50b..4fa1a44f4ae 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
 
   meta = {
-    homepage = http://www.gnu.org/software/sed/;
+    homepage = https://www.gnu.org/software/sed/;
     description = "GNU sed, a batch stream editor";
 
     longDescription = ''
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index ab0f8893bfd..88d487da9b9 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/groff/;
+    homepage = https://www.gnu.org/software/groff/;
     description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index f097ed5c0fa..9edbaff9929 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.gnu.org/software/recode/;
+    homepage = https://www.gnu.org/software/recode/;
     description = "Converts files between various character sets and usages";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index dc297afc9ad..d1858d6508d 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Source code renderer with syntax highlighting";
-    homepage = http://www.gnu.org/software/src-highlite/;
+    homepage = https://www.gnu.org/software/src-highlite/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
     longDescription =
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index df2ef215069..001ed1addaa 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ which ];
 
   meta = {
-    homepage = http://www.gnu.org/software/wdiff/;
+    homepage = https://www.gnu.org/software/wdiff/;
     description = "Comparing files on a word by word basis";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index b8682260976..5444914f7a4 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -30,7 +30,7 @@ let auctex = stdenv.mkDerivation ( rec {
 
   meta = {
     description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
-    homepage = http://www.gnu.org/software/auctex;
+    homepage = https://www.gnu.org/software/auctex;
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl3;
   };

From b560dd9047c16a6572f62c944e12b9c239bdbf64 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 2 Dec 2018 15:54:20 +0100
Subject: [PATCH 0689/2793] elasticsearch: make sure to patchelf the x-pack-ml
 binaries

---
 pkgs/servers/search/elasticsearch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 0cf81a4c2d6..d22395e0133 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (rec {
   nativeBuildInputs = [ autoPatchelfHook ];
   runtimeDependencies = [ zlib ];
   postFixup = ''
-    for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
+    for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
       echo "patching $exe..."
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
     done

From 9e8f6176e52a4a3e9991bf77288b6732b8e8226f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 2 Dec 2018 17:31:47 +0100
Subject: [PATCH 0690/2793] pythonPackages.ruamel_yaml: 0.15.35 -> 0.15.80

This fixes the build error with Python 3.7.
---
 pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index 59674d82c90..619b2fb5eb3 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "ruamel.yaml";
-  version = "0.15.35";
+  version = "0.15.80";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd";
+    sha256 = "1rhlshff9csjwn64x11b9a7gbxccs1vd7rdiqwlhifjxax8k682g";
   };
 
   # Tests cannot load the module to test

From ffb5ebe9e0055a9d4478a7d7c72af4e0b0cd0ad1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 2 Dec 2018 07:15:51 -0500
Subject: [PATCH 0691/2793] pythonPackages.effect: 0.11.0 -> 0.12.0

---
 pkgs/development/python-modules/effect/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
index 3a026103a15..8e4ad446746 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -8,12 +8,12 @@
 , testtools
 }:
 buildPythonPackage rec {
-  version = "0.11.0";
+  version = "0.12.0";
   pname = "effect";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
+    sha256 = "0s8zsncq4l0ar2b4dijf8yzrk13x2swr1w2nb30s1p5jd6r24czl";
   };
   checkInputs = [
     pytest
@@ -24,10 +24,8 @@ buildPythonPackage rec {
     attrs
   ];
   checkPhase = ''
-    pytest .
+    pytest
   '';
-  # Tests fails on python3.7 https://github.com/python-effect/effect/issues/78
-  doCheck = !isPy37;
   meta = with lib; {
     description = "Pure effects for Python";
     homepage = https://github.com/python-effect/effect;

From 50071c4475faefb1c921e476a175b387b2307cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 17:27:35 +0000
Subject: [PATCH 0692/2793] Revert "nixos/luksroot: Check whether the device
 already exists"

This reverts commit 9cd4ce98bfc11292fbebc6b85d14bb386e82c9a8.

This might be broken for some people: https://github.com/NixOS/nixpkgs/pull/50281#issuecomment-443516289
---
 nixos/modules/system/boot/luksroot.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index ff3f2a1398a..018e7b2e7f8 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -118,11 +118,6 @@ let
     do_open_passphrase() {
         local passphrase
 
-        # Return if already unlocked
-        if ! cryptsetup status "${name}" > /dev/null; then
-          return
-        fi
-
         while true; do
             echo -n "Passphrase for ${device}: "
             passphrase=

From d96a1bd9335daa10d91b771e42515e7678af865a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 2 Dec 2018 12:23:31 -0600
Subject: [PATCH 0693/2793] yubikey-manager: lazy-load completions, touchup
 library path generation

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

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 5b96b7c18fc..e80eee2db3a 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -26,12 +26,13 @@ pythonPackages.buildPythonPackage rec {
     ];
 
   makeWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib"
+    "--prefix" "LD_LIBRARY_PATH" ":"
+    (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])
   ];
 
   postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true
+    mkdir -p $out/share/bash-completion/completions
+    _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/29169

From 22aac3b921c3856c7c64c1ff74a403e8281939bb Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 2 Dec 2018 19:24:49 +0100
Subject: [PATCH 0694/2793] all-packages.nix: Alias self to res, deprecating
 self

For historical reasons, self was ill-named. This removes its usages
from all-packages.nix and provides a deprecation message for those
who use a patched Nixpkgs.

Some packages seem to depend on the peculiarities of res, as can
be seen by making res into an alias of pkgs (normally "self").
The super variable doesn't have all that is needed.

Therefore the simple fix is not guaranteed to work and as such,
usages of res need to be changed to pkgs or super, case by case.
---
 pkgs/top-level/all-packages.nix | 95 +++++++++++++++++++--------------
 pkgs/top-level/stage.nix        |  2 +-
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c47fb047448..4b9be0bcbeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6,10 +6,23 @@
  * Hint: ### starts category names.
  */
 { lib, noSysDirs, config}:
-self: pkgs:
+res: pkgs: super:
 
 with pkgs;
 
+let
+  self =
+    builtins.trace ''
+        It seems that you are using a patched Nixpkgs that references the self
+        variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
+        named, so its usage needs attention. Please use pkgs for packages or super
+        for functions.
+      ''
+      res; # Do *NOT* use res in your fork. It will be removed.
+
+  # TODO: turn self into an error
+
+in
 {
 
   # Allow callPackage to fill in the pkgs argument
@@ -813,7 +826,7 @@ with pkgs;
 
   androidsdk = androidenv.androidsdk_8_0;
 
-  androidsdk_extras = self.androidenv.androidsdk_8_0_extras;
+  androidsdk_extras = res.androidenv.androidsdk_8_0_extras;
 
   webos = recurseIntoAttrs {
     cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };
@@ -3532,7 +3545,7 @@ with pkgs;
 
   jid = callPackage ../development/tools/jid { };
 
-  jing = self.jing-trang;
+  jing = res.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
   jira-cli = callPackage ../development/tools/jira_cli { };
@@ -4825,23 +4838,23 @@ with pkgs;
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
-  pinentry_ncurses = self.pinentry.override {
+  pinentry_ncurses = res.pinentry.override {
     gtk2 = null;
   };
 
-  pinentry_emacs = self.pinentry.override {
+  pinentry_emacs = res.pinentry.override {
     enableEmacs = true;
   };
 
-  pinentry_gnome = self.pinentry.override {
+  pinentry_gnome = res.pinentry.override {
     gcr = gnome3.gcr;
   };
 
-  pinentry_qt4 = self.pinentry.override {
+  pinentry_qt4 = res.pinentry.override {
     qt = qt4;
   };
 
-  pinentry_qt5 = self.pinentry.override {
+  pinentry_qt5 = res.pinentry.override {
     qt = qt5.qtbase;
   };
 
@@ -8574,11 +8587,11 @@ with pkgs;
   gputils = callPackage ../development/tools/misc/gputils { };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
-  gradle = self.gradleGen.gradle_latest;
-  gradle_2_14 = self.gradleGen.gradle_2_14;
-  gradle_2_5 = self.gradleGen.gradle_2_5;
-  gradle_3_5 = self.gradleGen.gradle_3_5;
-  gradle_4_10 = self.gradleGen.gradle_4_10;
+  gradle = res.gradleGen.gradle_latest;
+  gradle_2_14 = res.gradleGen.gradle_2_14;
+  gradle_2_5 = res.gradleGen.gradle_2_5;
+  gradle_3_5 = res.gradleGen.gradle_3_5;
+  gradle_4_10 = res.gradleGen.gradle_4_10;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.
@@ -9059,7 +9072,7 @@ with pkgs;
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (darwin) xnu bootstrap_cmds cctools;
   };
-  valgrind-light = self.valgrind.override { gdb = null; };
+  valgrind-light = res.valgrind.override { gdb = null; };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
@@ -9645,7 +9658,7 @@ with pkgs;
     inherit (darwin) cf-private;
     inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
   };
-  fltk = self.fltk13;
+  fltk = res.fltk13;
 
   flyway = callPackage ../development/tools/flyway { };
 
@@ -9658,7 +9671,7 @@ with pkgs;
 
   freetts = callPackage ../development/libraries/freetts { };
 
-  frog = self.languageMachines.frog;
+  frog = res.languageMachines.frog;
 
   fstrcmp = callPackage ../development/libraries/fstrcmp { };
 
@@ -9726,11 +9739,11 @@ with pkgs;
   };
 
   gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   geoclue2 = callPackage ../development/libraries/geoclue {};
@@ -10128,7 +10141,7 @@ with pkgs;
   gumbo = callPackage ../development/libraries/gumbo { };
 
   gvfs = callPackage ../development/libraries/gvfs {
-    gnome = self.gnome3;
+    gnome = res.gnome3;
   };
 
   gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@@ -11356,7 +11369,7 @@ with pkgs;
   libxml2 = callPackage ../development/libraries/libxml2 { };
 
   libxml2Python = pkgs.buildEnv { # slightly hacky
-    name = "libxml2+py-${self.libxml2.version}";
+    name = "libxml2+py-${res.libxml2.version}";
     paths = with libxml2; [ dev bin py ];
     inherit (libxml2) passthru;
     # the hook to find catalogs is hidden by buildEnv
@@ -11789,9 +11802,9 @@ with pkgs;
   };
 
   pcre = callPackage ../development/libraries/pcre { };
-  pcre16 = self.pcre.override { variant = "pcre16"; };
+  pcre16 = res.pcre.override { variant = "pcre16"; };
   # pcre32 seems unused
-  pcre-cpp = self.pcre.override { variant = "cpp"; };
+  pcre-cpp = res.pcre.override { variant = "cpp"; };
 
   pcre2 = callPackage ../development/libraries/pcre2 { };
 
@@ -12692,7 +12705,7 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6;
   });
 
-  v8_static = lowPrio (self.v8.override { static = true; });
+  v8_static = lowPrio (res.v8.override { static = true; });
 
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
 
@@ -15635,7 +15648,7 @@ with pkgs;
   inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
 
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
@@ -15877,16 +15890,16 @@ with pkgs;
   libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
 
 
-  go-ethereum = self.altcoins.go-ethereum;
-  ethabi = self.altcoins.ethabi;
+  go-ethereum = res.altcoins.go-ethereum;
+  ethabi = res.altcoins.ethabi;
 
-  parity = self.altcoins.parity;
-  parity-beta = self.altcoins.parity-beta;
-  parity-ui = self.altcoins.parity-ui;
+  parity = res.altcoins.parity;
+  parity-beta = res.altcoins.parity-beta;
+  parity-ui = res.altcoins.parity-ui;
 
-  stellar-core = self.altcoins.stellar-core;
+  stellar-core = res.altcoins.stellar-core;
 
-  particl-core = self.altcoins.particl-core;
+  particl-core = res.altcoins.particl-core;
 
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
@@ -15981,7 +15994,7 @@ with pkgs;
   };
   bitwig-studio2 =  callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
     inherit (gnome3) zenity;
-    inherit (self) bitwig-studio1;
+    inherit (res) bitwig-studio1;
   };
   bitwig-studio = bitwig-studio2;
 
@@ -16661,7 +16674,7 @@ with pkgs;
   espeak-classic = callPackage ../applications/audio/espeak { };
 
   espeak-ng = callPackage ../applications/audio/espeak-ng { };
-  espeak = self.espeak-ng;
+  espeak = res.espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
@@ -16954,7 +16967,7 @@ with pkgs;
     inherit (pkgs.gnome3) defaultIconTheme;
   };
 
-  firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped {
+  firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
     browserName = "firefox";
     name = "firefox-beta-bin-" +
       (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version;
@@ -16969,7 +16982,7 @@ with pkgs;
     inherit (pkgs.gnome3) defaultIconTheme;
   };
 
-  firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped {
+  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
     browserName = "firefox";
     nameSuffix = "-devedition";
     name = "firefox-devedition-bin-" +
@@ -20860,7 +20873,7 @@ with pkgs;
 
   ut2004Packages = callPackage ../games/ut2004 { };
 
-  ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ];
+  ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
 
   vapor = callPackage ../games/vapor { love = love_0_8; };
 
@@ -20997,8 +21010,8 @@ with pkgs;
       # Included for backwards compatibility
       libsoup libwnck gtk-doc gnome-doc-utils;
 
-    gtk = self.gtk2;
-    gtkmm = self.gtkmm2;
+    gtk = res.gtk2;
+    gtkmm = res.gtkmm2;
   });
 
   gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
@@ -22051,7 +22064,7 @@ with pkgs;
 
   fakenes = callPackage ../misc/emulators/fakenes { };
 
-  faust = self.faust2;
+  faust = res.faust2;
 
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
@@ -22274,7 +22287,7 @@ with pkgs;
      parameter set to the right value for your deployment target.
   */
   nixos = configuration:
-    (import (self.path + "/nixos/lib/eval-config.nix") {
+    (import (res.path + "/nixos/lib/eval-config.nix") {
       inherit (pkgs.stdenv.hostPlatform) system;
       modules = [(
                   { lib, ... }: {
@@ -22553,7 +22566,7 @@ with pkgs;
   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 = self.samsung-unified-linux-driver_4_01_17;
+  samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 1d412a6582c..276350e56e6 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -91,7 +91,7 @@ let
   allPackages = self: super:
     let res = import ./all-packages.nix
       { inherit lib noSysDirs config; }
-      res self;
+      res self super;
     in res;
 
   aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);

From 1918257770f742e65a5c3bc478e29534517be97f Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Mon, 3 Dec 2018 00:11:54 +0530
Subject: [PATCH 0695/2793] font-lock-plus: fix recipe

Used the wiki fetcher which doesn't seem to exist.

Replaced with a fake repo. Doesnt seem to be used.
---
 .../editors/emacs-modes/font-lock-plus/default.nix     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index b4ee54f3bd3..fdb28f44719 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, lib, melpaBuild }:
+{ fetchurl, lib, melpaBuild, writeText }:
 
 melpaBuild {
-  pname = "font-lock-plus";
+  pname = "font-lock+";
   version = "20180101.25";
 
   src = fetchurl {
@@ -10,11 +10,7 @@ melpaBuild {
     name = "font-lock+.el";
   };
 
-  recipe = fetchurl {
-    url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
-    sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
-    name = "font-lock-plus";
-  };
+  recipe = writeText "recipe" "(font-lock+ :fetcher github :repo \"\")";
 
   meta = {
     homepage = "https://melpa.org/#/font-lock+";

From 3ba88670ab49d9820abf22eea6821cd08272b9bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 18:53:24 +0000
Subject: [PATCH 0696/2793] linux_latest-libre: update patchset for kernel
 version

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 31cad258921..c240bdc364d 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
-    rev = "15295";
-    sha256 = "03kqbjy7w9zg6ry86h9sxa33z0rblznhba109lwmjwy0wx7yk1cs";
+    rev = "15715";
+    sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
   }
 , ...
 }:

From 409d2af6df75a3b36d7aa6eef8cae68ab5828067 Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Mon, 3 Dec 2018 05:05:10 +1000
Subject: [PATCH 0697/2793] openra: adding individual executables for each mod

OpenRA desktop configuration files presently fail to launch the various mods, as the executable files (`openra-ra` for Red Alert, `openra-cnc` for Tiberian Dawn and `openra-d2k` for Dune 2K) they rely on are not present in this package.
---
 pkgs/games/openra/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index d0649237b12..130a413f1ae 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -69,5 +69,11 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra"
+    printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=ra" > $out/bin/openra-ra
+    chmod +x $out/bin/openra-ra
+    printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=cnc" > $out/bin/openra-cnc
+    chmod +x $out/bin/openra-cnc
+    printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=d2k" > $out/bin/openra-d2k
+    chmod +x $out/bin/openra-d2k
   '';
 }

From 7875c34f1288e6ed5c063b81323b88b01d148de7 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Sun, 2 Dec 2018 14:14:39 -0500
Subject: [PATCH 0698/2793] jq: fix download hash

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

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index b7b2b5066b9..307968a6844 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
-    sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn";
+    sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x";
   };
 
   outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];

From 953be3e283459c89d89e4ec204472aa880a85674 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 1 Dec 2018 15:10:27 +0300
Subject: [PATCH 0699/2793] mariadb: change location configuration file to
 /etc/my.cnf

---
 nixos/modules/services/databases/mysql.nix | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 0325c679773..df6f3876585 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -29,21 +29,6 @@ let
   installOptions =
     "${mysqldAndInstallOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
 
-  myCnf = pkgs.writeText "my.cnf"
-  ''
-    [mysqld]
-    port = ${toString cfg.port}
-    datadir = ${cfg.dataDir}
-    ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
-    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
-    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
-    ${optionalString (cfg.ensureUsers != [])
-    ''
-      plugin-load-add = auth_socket.so
-    ''}
-    ${cfg.extraOptions}
-  '';
-
 in
 
 {
@@ -242,6 +227,21 @@ in
 
     environment.systemPackages = [mysql];
 
+    environment.etc."my.cnf".text =
+    ''
+      [mysqld]
+      port = ${toString cfg.port}
+      datadir = ${cfg.dataDir}
+      ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
+      ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
+      ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
+      ${optionalString (cfg.ensureUsers != [])
+      ''
+        plugin-load-add = auth_socket.so
+      ''}
+      ${cfg.extraOptions}
+    '';
+
     systemd.services.mysql = let
       hasNotify = (cfg.package == pkgs.mariadb);
     in {
@@ -263,7 +263,7 @@ in
             if ! test -e ${cfg.dataDir}/mysql; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
-                ${mysql}/bin/mysql_install_db ${installOptions}
+                ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions}
                 touch /tmp/mysql_init
             fi
 
@@ -274,7 +274,7 @@ in
         serviceConfig = {
           Type = if hasNotify then "notify" else "simple";
           RuntimeDirectory = "mysqld";
-          ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+          ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions}";
         };
 
         postStart = ''

From e3b02a49c9aaa3625b6e2e60522c28a98c65ca3b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 24 Nov 2018 17:46:44 -0600
Subject: [PATCH 0700/2793] i3-lock-color: broken on clang

(cherry picked from commit ff12b98820bccc8f2ddb3f82ba7d12391375042e)
---
 pkgs/applications/window-managers/i3/lock-color.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 8c775833c28..45d142632d1 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -58,5 +58,7 @@ stdenv.mkDerivation rec {
     # Needs the SSE2 instruction set. See upstream issue
     # https://github.com/chrjguill/i3lock-color/issues/44
     platforms = platforms.x86;
+
+    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From e8a3c91b0e27da1edd3973b2207cd536602746aa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 24 Nov 2018 17:48:22 -0600
Subject: [PATCH 0701/2793] hugs: broken on clang

(cherry picked from commit 4861aecfae43f96589034567546ec200225c1d7e)
---
 pkgs/development/interpreters/hugs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index 2177ae22db5..aaa788cfb4b 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ joachifm ];
     license = licenses.bsd3;
     platforms = platforms.all;
+    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From b57f6b26a710fff5e9e50b10f89d6e38fa111ab9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Nov 2018 14:51:51 -0600
Subject: [PATCH 0702/2793] tinyfugue: only works on linux

(cherry picked from commit 420352fae8ddb11da757bd2f2f10c2dc6650bc58)
---
 pkgs/games/tinyfugue/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix
index dcae182ed17..f230a70c088 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/pkgs/games/tinyfugue/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       with any type of text MUD.
     '';
     license = licenses.gpl2;
-    platforms = ncurses.meta.platforms;
+    platforms = platforms.linux;
     maintainers = [ maintainers.KibaFox ];
   };
 }

From 5e2394ae3cdc142ad92209a9c81993a00d78c8c0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Nov 2018 14:52:27 -0600
Subject: [PATCH 0703/2793] rofi: only works on linux

(cherry picked from commit 568079277c5a8b6711db9ac0e3f4567bdffa8747)
---
 pkgs/applications/misc/rofi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 2d22d87c49a..63b047976b3 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = https://davedavenport.github.io/rofi;
     license = licenses.mit;
     maintainers = with maintainers; [ mbakke garbas ma27 ];
-    platforms = with platforms; unix;
+    platforms = with platforms; linux;
   };
 }

From b4087750c3912ad1ed8b8bfb2cb5d09517ff608d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Nov 2018 14:52:43 -0600
Subject: [PATCH 0704/2793] flent/http-getter: broken on clang

(cherry picked from commit a5dcde16bbe737914849536362d15eb5a9675297)
---
 pkgs/applications/networking/flent/http-getter.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
index 63c18d6e092..3e63d19b855 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     description = "Simple getter for HTTP URLs using cURL";
     platforms = platforms.unix;
     license = licenses.gpl3;
+    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From 9ddc2ec27db0453597532eee589bcf20a158a36f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Nov 2018 14:53:31 -0600
Subject: [PATCH 0705/2793] tsocks: broken on darwin

(cherry picked from commit 83982dc675ecf0fb6860d8077335c39e96d6c739)
---
 pkgs/development/libraries/tsocks/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index 149b2260792..bcc91d058f0 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ edwtjo phreedom ];
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 7a2c07d29bf9bb7582e5df2dfcb879278d65a8e8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Nov 2018 17:26:00 -0600
Subject: [PATCH 0706/2793] kmod: enable on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is needed to build linux kernels on darwin. While we can’t
actually use it to load kernel modules, we can use it to create
indexes of modules on macOS.

(cherry picked from commit ebb31480e8a45efbaff4c4a212bdfc0b053adde0)
---
 pkgs/os-specific/linux/kmod/darwin.patch | 123 +++++++++++++++++++++++
 pkgs/os-specific/linux/kmod/default.nix  |  10 +-
 2 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kmod/darwin.patch

diff --git a/pkgs/os-specific/linux/kmod/darwin.patch b/pkgs/os-specific/linux/kmod/darwin.patch
new file mode 100644
index 00000000000..69dbf479f9f
--- /dev/null
+++ b/pkgs/os-specific/linux/kmod/darwin.patch
@@ -0,0 +1,123 @@
+diff --git a/Makefile.am b/Makefile.am
+index 194e111..0a095b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -80,8 +80,7 @@ EXTRA_DIST += libkmod/README \
+ 	libkmod/COPYING testsuite/COPYING tools/COPYING COPYING
+ 
+ libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
+-	-version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
+-	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
++	-version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE)
+ libkmod_libkmod_la_DEPENDENCIES = \
+ 	shared/libshared.la \
+ 	${top_srcdir}/libkmod/libkmod.sym
+@@ -91,8 +90,7 @@ libkmod_libkmod_la_LIBADD = \
+ 
+ noinst_LTLIBRARIES += libkmod/libkmod-internal.la
+ libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
+-libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
+-	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
++libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS)
+ libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
+ libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
+ 
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 889f264..6f0a285 100644
+--- a/libkmod/libkmod-module.c
++++ b/libkmod/libkmod-module.c
+@@ -787,7 +787,11 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod,
+ 	flags &= KMOD_REMOVE_FORCE;
+ 	flags |= KMOD_REMOVE_NOWAIT;
+ 
++#if defined(__linux__)
+ 	err = delete_module(mod->name, flags);
++#else
++	err = -1;
++#endif
+ 	if (err != 0) {
+ 		err = -errno;
+ 		ERR(mod->ctx, "could not remove '%s': %m\n", mod->name);
+@@ -879,7 +883,11 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
+ 	}
+ 	size = kmod_file_get_size(mod->file);
+ 
++#if defined(__linux__)
+ 	err = init_module(mem, size, args);
++#else
++	err = -1;
++#endif
+ init_finished:
+ 	if (err < 0) {
+ 		err = -errno;
+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
+index 429ffbd..17a3b9c 100644
+--- a/libkmod/libkmod-signature.c
++++ b/libkmod/libkmod-signature.c
+@@ -17,7 +17,10 @@
+  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#if defined(__linux__)
+ #include <endian.h>
++#endif
++
+ #include <inttypes.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/shared/macro.h b/shared/macro.h
+index 4fc5405..b5a2702 100644
+--- a/shared/macro.h
++++ b/shared/macro.h
+@@ -71,3 +71,7 @@
+ #endif
+ 
+ #define UNIQ __COUNTER__
++
++ #if !defined(__linux__)
++#define program_invocation_short_name getprogname()
++#endif
+diff --git a/shared/missing.h b/shared/missing.h
+index 4c0d136..ad8ec0f 100644
+--- a/shared/missing.h
++++ b/shared/missing.h
+@@ -45,6 +45,9 @@ static inline int finit_module(int fd, const char *uargs, int flags)
+ #endif
+ 
+ #if !HAVE_DECL_BE32TOH
++
++#if defined(__linux__)
++
+ #include <endian.h>
+ #include <byteswap.h>
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+@@ -52,4 +55,16 @@ static inline int finit_module(int fd, const char *uargs, int flags)
+ #else
+ #define be32toh(x) (x)
+ #endif
++
++#elif defined(__APPLE__)
++
++#include <libkern/OSByteOrder.h>
++#define be32toh(x) OSSwapBigToHostInt32(x)
++
++#else
++
++#error No be32toh known for platform
++
++#endif
++
+ #endif
+diff --git a/shared/util.c b/shared/util.c
+index fd2028d..ecb0141 100644
+--- a/shared/util.c
++++ b/shared/util.c
+@@ -367,7 +367,7 @@ char *path_make_absolute_cwd(const char *p)
+ 	if (path_is_absolute(p))
+ 		return strdup(p);
+ 
+-	cwd = get_current_dir_name();
++	cwd = getcwd(NULL, 0);
+ 	if (!cwd)
+ 		return NULL;
+ 
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 43d69ac9574..cace828685a 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }:
+{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig
+, libxslt, xz, elf-header }:
 
 let
   systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
@@ -14,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
-  buildInputs = [ xz ];
+  buildInputs = [ xz elf-header ];
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -22,7 +23,8 @@ in stdenv.mkDerivation rec {
     "--with-modulesdirs=${modulesDirs}"
   ];
 
-  patches = [ ./module-dir.patch ];
+  patches = [ ./module-dir.patch ]
+    ++ lib.optional stdenv.isDarwin ./darwin.patch;
 
   postInstall = ''
     for prog in rmmod insmod lsmod modinfo modprobe depmod; do
@@ -37,6 +39,6 @@ in stdenv.mkDerivation rec {
     homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";
     license = licenses.lgpl21;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 820927cb2c2ccb5bd9a938337228ea9c78400b49 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Nov 2018 17:13:41 -0600
Subject: [PATCH 0707/2793] btrfs-progs: fix on cross compilation

Fixes #50925

(cherry picked from commit 04978d152e8e8e0c2f82cbb8c2addc4ecc93c79c)
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 252f25ad8fa..1d6285331c4 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python pythonPackages.setuptools
   ];
 
-  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
+  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python ];
 
   # gcc bug with -O1 on ARM with gcc 4.8
   # This should be fine on all platforms so apply universally

From 527bad18d08b5f6b2c1496e684db0ec16eaf51c3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Nov 2018 02:21:01 +0000
Subject: [PATCH 0708/2793] coqPackages: recurse into the attribute set

But do not build the packages on hydra.
---
 pkgs/top-level/coq-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index d1e0ab011be..188ab06b969 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -88,7 +88,9 @@ in rec {
   coqPackages_8_7 = mkCoqPackages coq_8_7;
   coqPackages_8_8 = mkCoqPackages coq_8_8;
   coqPackages_8_9 = mkCoqPackages coq_8_9;
-  coqPackages = coqPackages_8_8;
+  coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
+    coqPackages_8_8
+  );
   coq = coqPackages.coq;
 
 }

From db9ddfa00c8815f118b61a9be6e35156380883b0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 2 Dec 2018 16:42:10 -0500
Subject: [PATCH 0709/2793] Revert "flent/http-getter: broken on clang"

Failed to evaluate.

This reverts commit b4087750c3912ad1ed8b8bfb2cb5d09517ff608d.
---
 pkgs/applications/networking/flent/http-getter.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
index 3e63d19b855..63c18d6e092 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
     description = "Simple getter for HTTP URLs using cURL";
     platforms = platforms.unix;
     license = licenses.gpl3;
-    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From f07266bfc8c12f734c883eca869638922b00d5f2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 2 Dec 2018 16:46:31 -0500
Subject: [PATCH 0710/2793] Revert "hugs: broken on clang"

This reverts commit e8a3c91b0e27da1edd3973b2207cd536602746aa.
---
 pkgs/development/interpreters/hugs/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index aaa788cfb4b..2177ae22db5 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -45,6 +45,5 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ joachifm ];
     license = licenses.bsd3;
     platforms = platforms.all;
-    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From 8480738ca90382622fb7d113127a72c387ae388f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 2 Dec 2018 16:50:47 -0500
Subject: [PATCH 0711/2793] Revert "i3-lock-color: broken on clang"

This reverts commit e3b02a49c9aaa3625b6e2e60522c28a98c65ca3b.
---
 pkgs/applications/window-managers/i3/lock-color.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 45d142632d1..8c775833c28 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -58,7 +58,5 @@ stdenv.mkDerivation rec {
     # Needs the SSE2 instruction set. See upstream issue
     # https://github.com/chrjguill/i3lock-color/issues/44
     platforms = platforms.x86;
-
-    broken = stdenv.hostPlatform.cc.isClang;
   };
 }

From be2e63edc46d79fd23e19aedde80d8ee062a4936 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 2 Dec 2018 17:12:16 -0500
Subject: [PATCH 0712/2793] pythonPackages.sybil: fix build (#51392)

---
 pkgs/development/python-modules/sybil/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index c78016d7296..8b1677a7b84 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchPypi
+{ stdenv, buildPythonApplication, fetchPypi, fetchpatch
 , pytest, nose }:
 
 buildPythonApplication rec {
@@ -10,6 +10,13 @@ buildPythonApplication rec {
     sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch;
+      sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2";
+    })
+  ];
+
   checkInputs = [ pytest nose ];
 
   checkPhase = ''

From ff5eba906ae727d7b1d08190b5b8b124a53998e6 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 6 Nov 2018 15:18:54 +0200
Subject: [PATCH 0713/2793] rspamd: drop gmime dependency, it is not used
 anymore

---
 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 b9dd07adde9..9cbe0a65414 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, perl
-, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu, libfann }:
+, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu, libfann }:
 
 let libmagic = file;  # libmagic provided by file package ATM
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann ];
+  buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu libfann ];
 
   cmakeFlags = [
     "-DDEBIAN_BUILD=ON"

From 1b59c4a6cca61411773c254570635fb74105889d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 6 Nov 2018 16:44:40 +0200
Subject: [PATCH 0714/2793] rspamd: Make libfann and libgd optional

GD is experimental and never-enabled-by-default.
---
 pkgs/servers/mail/rspamd/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 9cbe0a65414..41109289531 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, perl
-, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu, libfann }:
+{ stdenv, lib, fetchFromGitHub, cmake, perl
+, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
+, libfann, gd
+, withFann ? true
+, withGd ? false
+}:
 
 let libmagic = file;  # libmagic provided by file package ATM
 in
@@ -16,7 +20,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu libfann ];
+  buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu ]
+    ++ lib.optional withFann libfann
+    ++ lib.optional withGd gd;
 
   cmakeFlags = [
     "-DDEBIAN_BUILD=ON"
@@ -24,7 +30,8 @@ stdenv.mkDerivation rec {
     "-DDBDIR=/var/lib/rspamd"
     "-DLOGDIR=/var/log/rspamd"
     "-DLOCAL_CONFDIR=/etc/rspamd"
-  ];
+  ] ++ lib.optional withFann "-DENABLE_FANN=ON"
+    ++ lib.optional withGd "-DENABLE_GD=ON";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/vstakhov/rspamd;

From e77fa3682470d1e4cd3e42db72749dbc5777ea21 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 6 Nov 2018 16:50:04 +0200
Subject: [PATCH 0715/2793] rspamd: build with jemalloc

(by upstream author's suggestion)
---
 pkgs/servers/mail/rspamd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 41109289531..b101167a94d 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, cmake, perl
 , file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
-, libfann, gd
+, libfann, gd, jemalloc
 , withFann ? true
 , withGd ? false
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu ]
+  buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
     ++ lib.optional withFann libfann
     ++ lib.optional withGd gd;
 
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     "-DDBDIR=/var/lib/rspamd"
     "-DLOGDIR=/var/log/rspamd"
     "-DLOCAL_CONFDIR=/etc/rspamd"
+    "-DENABLE_JEMALLOC=ON"
   ] ++ lib.optional withFann "-DENABLE_FANN=ON"
     ++ lib.optional withGd "-DENABLE_GD=ON";
 

From 12a5b53ce27851b9807b3eb7772f324229c7bc88 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 8 Nov 2018 18:01:46 +0200
Subject: [PATCH 0716/2793] rspamd: enable openblas support for neural networks

---
 pkgs/servers/mail/rspamd/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index b101167a94d..12777eb49f0 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,8 +1,9 @@
 { stdenv, lib, fetchFromGitHub, cmake, perl
 , file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
-, libfann, gd, jemalloc
+, libfann, gd, jemalloc, openblas
 , withFann ? true
 , withGd ? false
+, withBlas ? true
 }:
 
 let libmagic = file;  # libmagic provided by file package ATM
@@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig perl ];
   buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
     ++ lib.optional withFann libfann
-    ++ lib.optional withGd gd;
+    ++ lib.optional withGd gd
+    ++ lib.optional withBlas openblas;
 
   cmakeFlags = [
     "-DDEBIAN_BUILD=ON"

From 3e1acb0b44fbad845d27cdce987474f5eb4be912 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 8 Nov 2018 18:00:15 +0200
Subject: [PATCH 0717/2793] hyperscan: init at 5.0.0

---
 .../libraries/hyperscan/default.nix           | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/development/libraries/hyperscan/default.nix

diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
new file mode 100644
index 00000000000..35966442da2
--- /dev/null
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -0,0 +1,69 @@
+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python27
+, boost
+}:
+
+# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
+#         pcap used only in examples, pkgconfig used only to check for pcre
+#         which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
+#         I not see any reason (for now) to backport 8.41.
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "hyperscan";
+  version = "5.0.0";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "hyperscan";
+    sha256 = "017dxg0n3gn9i4j27rcvpnp4rkqgycqni6x5d15dqpidl7zg7059";
+    rev = "v${version}";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [ boost ];
+  nativeBuildInputs = [ cmake ragel python27 ];
+
+  cmakeFlags = [
+    "-DFAT_RUNTIME=ON"
+    "-DBUILD_AVX512=ON"
+    "-DBUILD_STATIC_AND_SHARED=ON"
+  ];
+
+  prePatch = ''
+    sed -i '/examples/d' CMakeLists.txt
+  '';
+
+  postInstall = ''
+    mkdir -p $dev/lib
+    mv $out/lib/*.a $dev/lib/
+    ln -sf $out/lib/libhs.so $dev/lib/
+    ln -sf $out/lib/libhs_runtime.so $dev/lib/
+  '';
+
+  postFixup = ''
+    sed -i "s,$out/include,$dev/include," $dev/lib/pkgconfig/libhs.pc
+    sed -i "s,$out/lib,$dev/lib," $dev/lib/pkgconfig/libhs.pc
+  '';
+
+  meta = {
+    description = "High-performance multiple regex matching library";
+    longDescription = ''
+      Hyperscan is a high-performance multiple regex matching library.
+      It follows the regular expression syntax of the commonly-used
+      libpcre library, but is a standalone library with its own C API.
+
+      Hyperscan uses hybrid automata techniques to allow simultaneous
+      matching of large numbers (up to tens of thousands) of regular
+      expressions and for the matching of regular expressions across 
+      streams of data.
+
+      Hyperscan is typically used in a DPI library stack.
+    '';
+
+    homepage = https://www.hyperscan.io/;
+    maintainers = with lib.maintainers; [ avnik ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..a1635b5963c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10201,6 +10201,8 @@ with pkgs;
 
   hyena = callPackage ../development/libraries/hyena { mono = mono4; };
 
+  hyperscan = callPackage ../development/libraries/hyperscan { };
+
   icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({
     nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
   } //

From b73b02255edde30d9c4f21c2afd05c27ad266074 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 8 Nov 2018 04:04:08 +0200
Subject: [PATCH 0718/2793] rspamd: enable hyperscan

---
 pkgs/servers/mail/rspamd/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 12777eb49f0..ae1dc431263 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,11 +1,14 @@
 { stdenv, lib, fetchFromGitHub, cmake, perl
 , file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
-, libfann, gd, jemalloc, openblas
+, hyperscan, libfann, gd, jemalloc, openblas
 , withFann ? true
 , withGd ? false
 , withBlas ? true
+, withHyperscan ? stdenv.isx86_64
 }:
 
+assert withHyperscan -> stdenv.isx86_64;
+
 let libmagic = file;  # libmagic provided by file package ATM
 in
 
@@ -24,6 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
     ++ lib.optional withFann libfann
     ++ lib.optional withGd gd
+    ++ lib.optional withHyperscan hyperscan
     ++ lib.optional withBlas openblas;
 
   cmakeFlags = [
@@ -34,6 +38,7 @@ stdenv.mkDerivation rec {
     "-DLOCAL_CONFDIR=/etc/rspamd"
     "-DENABLE_JEMALLOC=ON"
   ] ++ lib.optional withFann "-DENABLE_FANN=ON"
+    ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
     ++ lib.optional withGd "-DENABLE_GD=ON";
 
   meta = with stdenv.lib; {

From 2fd6de33509cd67f4930538cc9a63e35cd29856f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 24 Nov 2018 01:37:20 +0200
Subject: [PATCH 0719/2793] rspamd: 1.8.1 -> 1.8.2

Also update homepage link, and fetch from org's github, instead author's
private fork.
---
 pkgs/servers/mail/rspamd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index ae1dc431263..c5dfc4a90fd 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -14,13 +14,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
-    owner = "vstakhov";
+    owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld";
+    sha256 = "0al4d8h3ssxcx191d4crywz7dsp61lklc9m5z36a90a8w97v76bv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withGd "-DENABLE_GD=ON";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/vstakhov/rspamd;
+    homepage = https://rspamd.com;
     license = licenses.asl20;
     description = "Advanced spam filtering system";
     maintainers = with maintainers; [ avnik fpletz ];

From 713f5e270b63c65120cea007d9f56f80f14323f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 2 Dec 2018 23:30:27 +0000
Subject: [PATCH 0720/2793] Revert "btrfs-progs: fix on cross compilation"

This reverts commit 820927cb2c2ccb5bd9a938337228ea9c78400b49.

Broke the native build: https://github.com/NixOS/nixpkgs/commit/820927cb2c2ccb5bd9a938337228ea9c78400b49#commitcomment-31529024
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 1d6285331c4..252f25ad8fa 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python, pythonPackages
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages
 }:
 
 stdenv.mkDerivation rec {
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python pythonPackages.setuptools
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools
   ];
 
-  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python ];
+  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
 
   # gcc bug with -O1 on ARM with gcc 4.8
   # This should be fine on all platforms so apply universally

From 15383e8403c311567ad516fe0f17a3dc4d0c1378 Mon Sep 17 00:00:00 2001
From: Julian Vassev <jvassev@gmail.com>
Date: Sun, 2 Dec 2018 15:37:56 -0800
Subject: [PATCH 0721/2793] vault: 0.11.2 -> 0.11.5

Update bash completion method as described in
https://www.vaultproject.io/docs/commands/#autocompletion
---
 pkgs/tools/security/vault/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 597047a679b..84c35bd36a6 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,23 +1,14 @@
 { 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";
-    rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
-    sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.11.2";
+  version = "0.11.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa";
+    sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
@@ -39,7 +30,7 @@ in stdenv.mkDerivation rec {
     cp pkg/*/* $out/bin/
     find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
 
-    cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
+    echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
   '';
 
   meta = with stdenv.lib; {

From 5f2b8de75c70498052fd1f7f96e4bb35ebeec10f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 3 Dec 2018 00:44:33 +0100
Subject: [PATCH 0722/2793] Revert "pythonPackages.cypari2: 1.3.1 -> 2.0.1
 (#49446)" (#51414)

This reverts commit d9b650f4cc5ba78835285963eeef8a7c23b593f8.

The update is causing segfaults. See
https://trac.sagemath.org/ticket/26442.
---
 pkgs/applications/science/math/sage/sage-src.nix   | 14 --------------
 .../development/python-modules/cypari2/default.nix |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index b7355dca309..5d729d9c5fd 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -113,20 +113,6 @@ stdenv.mkDerivation rec {
       rev = "db10d327ade93711da735a599a67580524e6f7b4";
       sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
     })
-
-    # https://trac.sagemath.org/ticket/26493
-    (fetchpatch {
-      name = "cypari-upgrade-dependency.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?id=e93130960a1a20112bff096f53bc48ffcdfe5ab2";
-      sha256 = "03zh5288aasy47d964rs8vhaxds397rsp85ssbbrkap8702r4bjh";
-    })
-    # https://trac.sagemath.org/ticket/26442
-    (fetchpatch {
-      name = "cypari-2.0.0.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=7905b39a510c2e09b1ebf0d4a11342bfe3c0d236";
-      sha256 = "0v8p5x1b6mnkb2j3a95iva9dmq4pxi154zz4nmj79dcyqi51crwm";
-      excludes = [ "build/*" ];
-    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches;
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index d67bb95a91a..a77e98dae4c 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.0.1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11nqp40nji8bz4zn7j8sbzin93l65kf8s1sc76lvbsbkswaxdyij";
+    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

From 6c22b5a1d786c4c2fdf009b87c83bb078237098b Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 3 Dec 2018 00:57:52 +0100
Subject: [PATCH 0723/2793] libnids: init at 1.24

---
 pkgs/tools/networking/libnids/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/libnids/default.nix

diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix
new file mode 100644
index 00000000000..ef753127c67
--- /dev/null
+++ b/pkgs/tools/networking/libnids/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }:
+stdenv.mkDerivation {
+  pname = "libnids";
+  version = "1.24";
+  src = fetchzip {
+    url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz";
+    sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1";
+  };
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpcap glib libnet ];
+
+  /*
+  Quoting the documentation of glib: g_thread_init has been deprecated since
+  version 2.32 and should not be used in newly-written code.  This function is
+  no longer necessary. The GLib threading system is automatically initialized
+  at the start of your program.
+
+  this is necessary for dsniff to compile; otherwise g_thread_init is a missing
+  symbol when linking (?!?)
+  */
+  NIX_CFLAGS_COMPILE="-Dg_thread_init= ";
+
+  meta = with stdenv.lib; {
+    description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x";
+    homepage = http://libnids.sourceforge.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.symphorien ];
+    # probably also bsd and solaris
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a0611..6c58fa68abc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3959,6 +3959,8 @@ with pkgs;
 
   libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
 
+  libnids = callPackage ../tools/networking/libnids { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   libmpack = callPackage ../development/libraries/libmpack { };

From 0a91d701340645d345594b8dd4223a756a722d3c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 3 Dec 2018 00:59:11 +0100
Subject: [PATCH 0724/2793] dsniff: init at 2.4b1

---
 pkgs/tools/networking/dsniff/default.nix | 82 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/tools/networking/dsniff/default.nix

diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
new file mode 100644
index 00000000000..41acb533a3d
--- /dev/null
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl_1_1 }:
+let
+  /*
+  dsniff's build system unconditionnaly wants static libraries and does not
+  support multi output derivations. We do some overriding to give it
+  satisfaction.
+  */
+  staticdb = symlinkJoin {
+    inherit (db) name;
+    paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ];
+    postBuild = ''
+      rm $out/lib/*.so*
+    '';
+  };
+  pcap = symlinkJoin {
+    inherit (libpcap) name;
+    paths = [ libpcap ];
+    postBuild = ''
+      cp -rs $out/include/pcap $out/include/net
+      # prevent references to libpcap
+      rm $out/lib/*.so*
+    '';
+  };
+  net = symlinkJoin {
+    inherit (libnet) name;
+    paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ];
+    postBuild = ''
+      # prevent dynamic linking, now that we have a static library
+      rm $out/lib/*.so*
+    '';
+  };
+  nids = libnids.overrideAttrs(old: {
+    dontDisableStatic = true;
+  });
+  ssl = symlinkJoin {
+    inherit (openssl_1_1) name;
+    paths = with openssl_1_1.override { static = true; }; [ out dev ];
+  };
+in stdenv.mkDerivation {
+  pname = "dsniff";
+  version = "2.4b1";
+  # upstream is so old that nearly every distribution packages the beta version.
+  # Also, upstream only serves the latest version, so we use debian's sources.
+  # this way we can benefit the numerous debian patches to be able to build
+  # dsniff with recent libraries.
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "pkg-security-team";
+    repo = "dsniff";
+    rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/")
+    sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g";
+    name = "dsniff.tar.gz";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ glib pcap ];
+  NIX_CFLAGS_LINK = "-lglib-2.0";
+  postPatch = ''
+    for patch in debian/patches/*.patch; do
+      patch < $patch
+    done;
+  '';
+  configureFlags = [
+    "--with-db=${staticdb}"
+    "--with-libpcap=${pcap}"
+    "--with-libnet=${net}"
+    "--with-libnids=${nids}"
+    "--with-openssl=${ssl}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "collection of tools for network auditing and penetration testing";
+    longDescription = ''
+      dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI.
+    '';
+    homepage = https://www.monkey.org/~dugsong/dsniff/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.symphorien ];
+    # bsd and solaris should work as well
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c58fa68abc..ecab87c027e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22975,6 +22975,8 @@ with pkgs;
     inherit (darwin) libresolv;
   };
 
+  dsniff = callPackage ../tools/networking/dsniff {};
+
   wal-g = callPackage ../tools/backup/wal-g {};
 
   tlwg = callPackage ../data/fonts/tlwg { };

From 7369c3a06d1e09dea7e93718429120c59c6179b8 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 2 Dec 2018 19:32:30 -0500
Subject: [PATCH 0725/2793] vscode-extensions.ms-python.python: 2018.10.1 ->
 2018.11.0

---
 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 39e1341e15e..6860a0d2ad0 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.10.1";
-    sha256 = "1j9nf09v31lmrjkxf7p1d78d064x6afzh0dvssmk3sjm2c5r432k";
+    version = "2018.11.0";
+    sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl";
   };
 
   postPatch = ''

From 70092febc4e66dfef7d545415e5e89baf13aab24 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 2 Dec 2018 19:34:22 -0500
Subject: [PATCH 0726/2793] vscode-extensions.WakaTime.vscode-wakatime: 1.2.3
 -> 1.2.4

---
 pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index fe7943dbefb..48e7c9268ee 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -7,8 +7,8 @@ in
     mktplcRef = {
       name = "vscode-wakatime";
       publisher = "WakaTime";
-      version = "1.2.3";
-      sha256 = "1n7bxkwgpip11k6d7zc3ifp9zb6p7f27f4x4g584wisrnfnqj1bp";
+      version = "1.2.4";
+      sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb";
     };
 
     postPatch = ''

From 1e589ad15323136ecf0d1d5c30b5a093082417ed Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 3 Dec 2018 00:49:37 +0000
Subject: [PATCH 0727/2793] nodejs.updateScript: fix evaluation

---
 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 ea764ef22e6..a9c08e1c5b7 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -101,7 +101,7 @@ in
     '';
 
     passthru.updateScript = import ./update.nix {
-      inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
+      inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
       inherit (stdenv) lib;
       majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
     };

From bf5b39ed498a7a59922b615d080727e2c8768401 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 3 Dec 2018 00:49:53 +0000
Subject: [PATCH 0728/2793] thunderbird.updateScript: fix evaluation

---
 .../applications/networking/mailreaders/thunderbird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 0ee4137eb23..a372a92e948 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -202,6 +202,6 @@ in stdenv.mkDerivation rec {
   passthru.updateScript = import ./../../browsers/firefox/update.nix {
     attrPath = "thunderbird";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
-    inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
+    inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
   };
 }

From e75ecf777b93228f889fbe8c6642bde1a1804c13 Mon Sep 17 00:00:00 2001
From: hlolli <hlolli@gmail.com>
Date: Mon, 3 Dec 2018 02:11:16 +0100
Subject: [PATCH 0729/2793] python-qt init 3.2

---
 .../libraries/python-qt/default.nix           | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/python-qt/default.nix

diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
new file mode 100644
index 00000000000..e1f2596f87c
--- /dev/null
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, python, qmake,
+  qtwebengine, qtxmlpatterns,
+  qttools, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "3.2";
+  name = "python-qt-${version}";
+
+  src = fetchurl {
+    url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
+    sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c";
+  };
+
+  hardeningDisable = [ "all" ];
+
+  nativeBuildInputs = [ qmake qtwebengine  qtxmlpatterns qttools ];
+
+  buildInputs = [ python unzip ];
+
+  qmakeFlags = [ "PythonQt.pro"
+                 "INCLUDEPATH+=${python}/include/python3.6"
+                 "PYTHON_PATH=${python}/bin"
+                 "PYTHON_LIB=${python}/lib"];
+
+  unpackCmd = "unzip $src";
+
+  installPhase = ''
+    mkdir -p $out/include/PythonQt
+    cp -r ./lib $out
+    cp -r ./src/* $out/include/PythonQt
+    cp extensions/PythonQt_QtAll/PythonQt_QtAll.h $out/include/PythonQt
+    cp extensions/PythonQt_QtAll/PythonQt_QtAll.cpp $out/include/PythonQt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications.";
+    homepage = http://pythonqt.sourceforge.net/;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hlolli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..3962037210f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11912,6 +11912,14 @@ with pkgs;
 
   pybind11 = callPackage ../development/libraries/pybind11 { };
 
+  python-qt = callPackage ../development/libraries/python-qt {
+    python = python27;
+    qmake = qt59.qmake;
+    qttools = qt59.qttools;
+    qtwebengine = qt59.qtwebengine;
+    qtxmlpatterns = qt59.qtxmlpatterns;
+  };
+
   re2 = callPackage ../development/libraries/re2 { };
 
   qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };

From 5058d365a1876614ca2a48d8ced389ab032664d2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 2 Dec 2018 20:26:22 -0500
Subject: [PATCH 0730/2793] pyre: 0.0.17 -> 0.0.18

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

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 02772f9f791..c71e9e821da 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -3,12 +3,12 @@
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
-  pyre-version = "0.0.17";  # also change typeshed revision below with $pyre-src/.typeshed-version
+  pyre-version = "0.0.18";  # also change typeshed revision below with $pyre-src/.typeshed-version
   pyre-src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyre-check";
     rev = "v${pyre-version}";
-    sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis";
+    sha256 = "1sy1lk9j3hq20dabfkr9s4r7prrcndrs345a5iqz6yzvakr4r74d";
   };
   versionFile = writeScript "version.ml" ''
     cat > "./version.ml" <<EOF
@@ -21,6 +21,7 @@ let
     let log_version_banner () =
       Log.info "Running as pid: %d" (Pid.to_int (Unix.getpid ()));
       Log.info "Version: %s" (version ());
+      Log.info "Build info: %s" (build_info ())
     EOF
   '';
  pyre-bin = stdenv.mkDerivation {

From 808f05808b40c9092a54cfab7799c13cdb8a5db5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 2 Dec 2018 19:34:55 -0600
Subject: [PATCH 0731/2793] kmod: avoid mass rebuild
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

elf-header shouldn’t be needed on linux
---
 pkgs/os-specific/linux/kmod/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index cace828685a..8a09d7fea09 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
-  buildInputs = [ xz elf-header ];
+  buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header;
 
   configureFlags = [
     "--sysconfdir=/etc"

From 3b32c920d569c1653d2a3ee84b0aa1f24bf34a85 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 2 Dec 2018 17:47:53 -0600
Subject: [PATCH 0732/2793] systems/parse.nix: support eabihf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

eabihf is an abi that can be used with ARM architectures that support
the “hard float”. It should probably only be used with ARM32 when you
are absolutely sure your binaries will run on ARM systems with a FPU.

Also, add an example "armhf-embedded" to match the preexisting
arm-embedded system. qmk_firmware needs hard float in a few places, so
add them here to get that to work.

Fixes #51184
---
 lib/systems/examples.nix                      |  4 ++++
 lib/systems/parse.nix                         | 23 +++++++++++--------
 .../development/misc/qmk_firmware/default.nix | 13 ++++++++++-
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index c799b9ec449..608db00a968 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -110,6 +110,10 @@ rec {
     config = "arm-none-eabi";
     libc = "newlib";
   };
+  armhf-embedded = {
+    config = "arm-none-eabihf";
+    libc = "newlib";
+  };
 
   aarch64-embedded = {
     config = "aarch64-none-elf";
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 73b065689d0..7db09fc550e 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -209,8 +209,15 @@ rec {
   abis = setTypes types.openAbi {
     cygnus       = {};
     msvc         = {};
-    eabi         = {};
-    elf         = {};
+
+    # Note: eabi is specific to ARM and PowerPC.
+    # On PowerPC, this corresponds to PPCEABI.
+    # On ARM, this corresponds to ARMEABI.
+    eabi         = { float = "soft"; };
+    eabihf       = { float = "hard"; };
+
+    # Other architectures should use ELF in embedded situations.
+    elf          = {};
 
     androideabi  = {};
     android      = {
@@ -272,10 +279,8 @@ rec {
     "2" = # We only do 2-part hacks for things Nix already supports
       if elemAt l 1 == "cygwin"
         then { cpu = elemAt l 0;                      kernel = "windows";  abi = "cygnus";   }
-      else if (elemAt l 1 == "eabi")
-        then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
-      else if (elemAt l 1 == "elf")
-        then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
+      else if (elemAt l 1) == "elf"
+      then { cpu = elemAt l 0; vendor = "unknown";    kernel = "none";     abi = elemAt l 1; }
       else   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
@@ -286,10 +291,8 @@ rec {
         then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows";  abi = "gnu"; }
       else if hasPrefix "netbsd" (elemAt l 2)
         then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }
-      else if (elemAt l 2 == "eabi")
-        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
-      else if (elemAt l 2 == "elf")
-        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
+      else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
+        then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
       else throw "Target specification with 3 components is ambiguous";
     "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
   }.${toString (length l)}
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
index 0a7b4fd9d9a..0ec8664dac9 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , avrgcc, avrbinutils
-, gcc-arm-embedded, binutils-arm-embedded
+, gcc-arm-embedded, gcc-armhf-embedded
 , teensy-loader-cli, dfu-programmer, dfu-util }:
 
 let version = "0.6.144";
@@ -14,12 +14,23 @@ in stdenv.mkDerivation {
     sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
     fetchSubmodules = true;
   };
+  postPatch = ''
+    substituteInPlace tmk_core/arm_atsam.mk \
+      --replace arm-none-eabi arm-none-eabihf
+    rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk
+  '';
   buildFlags = "all:default";
+  doCheck = true;
+  checkTarget = "test:all";
+  installPhase = ''
+    mkdir $out
+  '';
   NIX_CFLAGS_COMPILE = "-Wno-error";
   nativeBuildInputs = [
     avrgcc
     avrbinutils
     gcc-arm-embedded
+    gcc-armhf-embedded
     teensy-loader-cli
     dfu-programmer
     dfu-util
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..1310af493c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23027,7 +23027,7 @@ with pkgs;
     avrgcc = pkgsCross.avr.buildPackages.gcc;
     avrbinutils = pkgsCross.avr.buildPackages.binutils;
     gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
-    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
+    gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc;
   };
 
   newlib = callPackage ../development/misc/newlib { };

From 4594b18070a6dab57a815e8ecc500b8a25c3f5a8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Dec 2018 20:14:48 -0600
Subject: [PATCH 0733/2793] nixos/chrony: fix misplaced ConditionCapability=
 directive

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/chrony.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 89ab899a1ed..77f70257700 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -113,6 +113,7 @@ in
           chown chrony:chrony ${stateDir} ${keyFile}
         '';
 
+        unitConfig.ConditionCapability = "CAP_SYS_TIME";
         serviceConfig =
           { Type = "forking";
             ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
@@ -121,8 +122,8 @@ in
             ProtectSystem = "full";
             PrivateTmp = "yes";
 
-            ConditionCapability = "CAP_SYS_TIME";
           };
+
       };
   };
 }

From 9ca3414e05c4a04f6a2810f0c9c1babdb8977f67 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 2 Dec 2018 21:16:24 +0000
Subject: [PATCH 0734/2793] nixos/cockroachdb: supply defaultText for the
 package option

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

diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix
index 1bc20a25804..8de1e78633d 100644
--- a/nixos/modules/services/databases/cockroachdb.nix
+++ b/nixos/modules/services/databases/cockroachdb.nix
@@ -149,6 +149,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.cockroachdb;
+        defaultText = "pkgs.cockroachdb";
         description = ''
           The CockroachDB derivation to use for running the service.
           

From 9572ebe3b8a66b42535e55c046ddf932525cdd17 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Fri, 16 Nov 2018 19:17:18 +1100
Subject: [PATCH 0735/2793] mnist: init at 2018-11-16

---
 pkgs/data/machine-learning/mnist/default.nix | 45 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/data/machine-learning/mnist/default.nix

diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix
new file mode 100644
index 00000000000..26b06b4e652
--- /dev/null
+++ b/pkgs/data/machine-learning/mnist/default.nix
@@ -0,0 +1,45 @@
+{ stdenvNoCC, fetchurl }:
+let
+  srcs = {
+    train-images = fetchurl {
+      url = "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz";
+      sha256 = "029na81z5a1c9l1a8472dgshami6f2iixs3m2ji6ym6cffzwl3s4";
+    };
+    train-labels = fetchurl {
+      url = "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz";
+      sha256 = "0p152200wwx0w65sqb65grb3v8ncjp230aykmvbbx2sm19556lim";
+    };
+    test-images = fetchurl {
+      url = "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz";
+      sha256 = "1rn4vfigaxn2ms24bf4jwzzflgp3hvz0gksvb8j7j70w19xjqhld";
+    };
+    test-labels = fetchurl {
+      url = "http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz";
+      sha256 = "1imf0i194ndjxzxdx87zlgn728xx3p1qhq1ssbmnvv005vwn1bpp";
+    };
+  };
+in
+  stdenvNoCC.mkDerivation rec {
+    name = "mnist-${version}";
+    version = "2018-11-16";
+    installPhase = ''
+      mkdir -p $out
+      ln -s "${srcs.train-images}" "$out/${srcs.train-images.name}"
+      ln -s "${srcs.train-labels}" "$out/${srcs.train-labels.name}"
+      ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}"
+      ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}"
+    '';
+    phases = [ "installPhase" ];
+    meta = with stdenvNoCC.lib; {
+      description = "A large database of handwritten digits";
+      longDescription = ''
+        The MNIST database (Modified National Institute of Standards and
+        Technology database) is a large database of handwritten digits that is
+        commonly used for training various image processing systems.
+      '';
+      homepage = http://yann.lecun.com/exdb/mnist/index.html;
+      license = licenses.cc-by-sa-30;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ cmcdragonkai ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be30a885759..ecf3716e926 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15404,6 +15404,8 @@ with pkgs;
 
   medio = callPackage ../data/fonts/medio { };
 
+  mnist = callPackage ../data/machine-learning/mnist { };
+
   mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
   monoid = callPackage ../data/fonts/monoid { };

From e0e8486a067080a42435c82b007a95e2f9601d88 Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Mon, 3 Dec 2018 05:15:52 +0100
Subject: [PATCH 0736/2793] mill-bin: init at 0.3.5

---
 maintainers/maintainer-list.nix               |  5 +++
 .../tools/build-managers/mill/default.nix     | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/mill/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6c6a57d341f..f49a1d38bd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4937,4 +4937,9 @@
     github = "mredaelli";
     name = "Massimo Redaelli";
   };
+  scalavision = {
+    email = "scalavision@gmail.com";
+    github = "scalavision";
+    name = "Tom Sorlie";
+  };
 }
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
new file mode 100644
index 00000000000..73a9f745545
--- /dev/null
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "mill-${version}";
+  version = "0.3.5";
+
+  src = fetchurl {
+    url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
+    sha256 = "19ka81f6vjr85gd8cadn0fv0i0qcdspx2skslfksklxdxs2gasf8";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+  dontConfigure = true;
+  dontBuild = true;
+    
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 "$src" "$out/bin/.mill-wrapped"
+    # can't use wrapProgram because it sets --argv0
+    makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.lihaoyi.com/mill;
+    license = licenses.mit;
+    description = "A build tool for Scala, Java and more";
+    longDescription = ''
+      Mill is a build tool borrowing ideas from modern tools like Bazel, to let you build
+      your projects in a way that's simple, fast, and predictable. Mill has built in
+      support for the Scala programming language, and can serve as a replacement for
+      SBT, but can also be extended to support any other language or platform via
+      modules (written in Java or Scala) or through an external subprocesses.
+    '';
+    maintainers = with maintainers; [ scalavision ];
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..d0c0cddad5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8926,6 +8926,8 @@ with pkgs;
   scons = sconsPackages.scons_3_0_1;
   scons_2_5_1 = sconsPackages.scons_2_5_1;
 
+  mill = callPackage ../development/tools/build-managers/mill { };
+
   sbt = callPackage ../development/tools/build-managers/sbt { };
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;

From 62b4b790b7cd0ddf2358940df9a0b2c7db3ca2d4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 2 Dec 2018 23:45:58 -0500
Subject: [PATCH 0737/2793] mill-bin: nitpicks

---
 maintainers/maintainer-list.nix                        | 10 +++++-----
 pkgs/development/tools/build-managers/mill/default.nix |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f49a1d38bd9..5d77f75c65c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3861,6 +3861,11 @@
     github = "sboosali";
     name = "Sam Boosalis";
   };
+  scalavision = {
+    email = "scalavision@gmail.com";
+    github = "scalavision";
+    name = "Tom Sorlie";
+  };
   schmitthenner = {
     email = "development@schmitthenner.eu";
     github = "fkz";
@@ -4937,9 +4942,4 @@
     github = "mredaelli";
     name = "Massimo Redaelli";
   };
-  scalavision = {
-    email = "scalavision@gmail.com";
-    github = "scalavision";
-    name = "Tom Sorlie";
-  };
 }
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 73a9f745545..b909b3953fa 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, jre, makeWrapper }:
+
 stdenv.mkDerivation rec {
   name = "mill-${version}";
   version = "0.3.5";
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   unpackPhase = "true";
   dontConfigure = true;
   dontBuild = true;
-    
+
   installPhase = ''
     runHook preInstall
     install -Dm555 "$src" "$out/bin/.mill-wrapped"
@@ -36,5 +37,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ scalavision ];
     platforms = stdenv.lib.platforms.all;
   };
-
 }

From 2b585ece44579a17116b0a89d94f7d4f73a913b2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 2 Dec 2018 23:17:35 -0600
Subject: [PATCH 0738/2793] radare2: 3.1.0 -> 3.1.1

https://github.com/radare/radare2/releases/tag/3.1.1
---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 88d68e2fd19..aa8741989f4 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20222";
-    gittap = "3.1.0";
-    gittip = "c033496ebc7034e52a84be9cdb2d2dfad6a4cfac";
-    rev = "3.1.0";
-    version = "3.1.0";
-    sha256 = "0ggqda8433n7p4yivn7l0807i5wwf0vww2p8v90ri66nasbzvl16";
+    version_commit = "20285";
+    gittap = "3.1.1";
+    gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
+    rev = "3.1.1";
+    version = "3.1.1";
+    sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20222";
+    version_commit = "20285";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From 92cba3aa0c6c4c20afb9a3da0ea42fc31b94273e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 08:19:07 +0000
Subject: [PATCH 0739/2793] pyre: remove unused makeWrapper

---
 pkgs/development/tools/pyre/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index c71e9e821da..fb6c8dd84be 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -29,8 +29,6 @@ let
 
   src = pyre-src;
 
-  nativeBuildInputs = [ makeWrapper ];
-
   buildInputs = with ocamlPackages; [
     ocaml
     findlib

From 3d444cfd8e0a02f5854104c06cbcc0f6905ae6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 08:19:28 +0000
Subject: [PATCH 0740/2793] pyre: simplify build phases

---
 pkgs/development/tools/pyre/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index fb6c8dd84be..87066284bfe 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -44,32 +44,29 @@ let
     # python36Packages.python36Full # TODO
   ];
 
-  buildPhase = ''
+  preBuild = ''
     # build requires HOME to be set
-    export HOME=.
+    export HOME=$TMPDIR
 
     # "external" because https://github.com/facebook/pyre-check/pull/8/files
     sed "s/%VERSION%/external/" dune.in > dune
 
-    cp ${versionFile} ./scripts/generate-version-number.sh
+    ln -sf ${versionFile} ./scripts/generate-version-number.sh
 
     mkdir $(pwd)/build
     export OCAMLFIND_DESTDIR=$(pwd)/build
     export OCAMLPATH=$OCAMLPATH:$(pwd)/build
-
-    make release
   '';
 
-  checkPhase = ''
-    make test
-    # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
-  '';
+  buildFlags = [ "release" ];
+
+  doCheck = true;
+  # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
 
   # Note that we're not installing the typeshed yet.
   # Improvement for a future version.
   installPhase = ''
-    mkdir -p $out/bin
-    cp ./_build/default/main.exe $out/bin/pyre.bin
+    install -D ./_build/default/main.exe $out/bin/pyre.bin
   '';
 
   meta = with stdenv.lib; {

From e59970e3c409c7ee539e1c09b0d066339017c3ba Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Nov 2018 10:50:26 +0000
Subject: [PATCH 0741/2793] coqPackages.math-classes: 1.0.7 -> 8.8.1

---
 pkgs/development/coq-modules/math-classes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 1831cd0c571..364366ced49 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "coq${coq.coq-version}-math-classes-${version}";
-  version = "1.0.7";
+  version = "8.8.1";
 
   src = fetchFromGitHub {
-    owner = "math-classes";
+    owner = "coq-community";
     repo = "math-classes";
     rev = version;
-    sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi";
+    sha256 = "05vlrrwnlfhd7l3xwn4zwpnkwvziw84zpd9775c6ffb83z48ri1r";
   };
 
   buildInputs = [ coq bignums ];

From ec21607d14b6a3cd7fe5a3dd805bfa18f6a0776e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 7 Nov 2018 17:53:39 +0100
Subject: [PATCH 0742/2793] intel-gmmlib: init at 18.3.0

---
 .../libraries/intel-gmmlib/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/intel-gmmlib/default.nix

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
new file mode 100644
index 00000000000..f61c507c764
--- /dev/null
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  name = "intel-gmmlib-${version}";
+  version = "18.3.0";
+
+  src = fetchFromGitHub {
+    owner  = "intel";
+    repo   = "gmmlib";
+    rev    = name;
+    sha256 = "1x1p4xvi870vjka2ag6rmmw897hl7zhav1sgwhnrzrggsx9jrw80";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/intel/gmmlib;
+    license = licenses.mit;
+    description = "Intel Graphics Memory Management Library";
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 333373f0605..7291ebe3887 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10253,6 +10253,8 @@ with pkgs;
 
   iniparser = callPackage ../development/libraries/iniparser { };
 
+  intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
+
   intltool = callPackage ../development/tools/misc/intltool { };
 
   ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix {};

From e9b18349c952c8a17a04722fef0471020cd06cf3 Mon Sep 17 00:00:00 2001
From: hlolli <hlolli@gmail.com>
Date: Mon, 3 Dec 2018 10:55:15 +0100
Subject: [PATCH 0743/2793] csound-qt init: 0.9.6-beta2

---
 .../audio/csound/csound-qt/default.nix        | 49 +++++++++++++++++++
 .../audio/csound/csound-qt/rtmidipath.patch   | 17 +++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/audio/csound/csound-qt/default.nix
 create mode 100644 pkgs/applications/audio/csound/csound-qt/rtmidipath.patch

diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
new file mode 100644
index 00000000000..e9415335388
--- /dev/null
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, csound, desktop-file-utils,
+  fetchFromGitHub, python, python-qt, qmake,
+  qtwebengine, rtmidi, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "csound-qt-${version}";
+  version = "0.9.6-beta2";
+
+  src = fetchFromGitHub {
+    owner = "CsoundQt";
+    repo = "CsoundQt";
+    rev = "${version}";
+    sha256 = "12jv7cvns3wj2npha0mvpn88kkkfsxsvhgzs2wrw04kbrvbhbffi";
+  };
+
+  patches = [ ./rtmidipath.patch ];
+
+  nativeBuildInputs = [ qmake qtwebengine ];
+
+  buildInputs = [ csound desktop-file-utils rtmidi unzip ];
+
+  qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt"
+                 "CSOUND_INCLUDE_DIR=${csound}/include/csound"
+                 "CSOUND_LIBRARY_DIR=${csound}/lib"
+                 "RTMIDI_DIR=${rtmidi.src}"
+                 "PYTHONQT_SRC_DIR=${python-qt}/lib"
+                 "PYTHONQT_LIB_DIR=${python-qt}/lib"
+                 "LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so"
+                 "LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so"
+                 "INCLUDEPATH+=${python-qt}/include/PythonQt"
+                 "INCLUDEPATH+=${python}/include/python2.7"
+                 "INSTALL_DIR=$(out)"
+                 "SHARE_DIR=$(out)/share"
+                 ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r bin $out
+    make install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features.";
+    homepage = https://csoundqt.github.io/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ hlolli ];
+  };
+}
diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
new file mode 100644
index 00000000000..f9522adb4b3
--- /dev/null
+++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
@@ -0,0 +1,17 @@
+diff --git a/src/src.pri b/src/src.pri
+index e5e0c896..9a9fa513 100644
+--- a/src/src.pri
++++ b/src/src.pri
+@@ -155,9 +155,9 @@ pythonqt {
+         "src/pyqcsobject.cpp"
+ }
+ rtmidi {
+-    HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h"
+-    SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp"
+-    INCLUDEPATH += src/../$${RTMIDI_DIR}
++    HEADERS += "$${RTMIDI_DIR}/RtMidi.h"
++    SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp"
++    INCLUDEPATH += $${RTMIDI_DIR}
+ }
+
+ perfThread_build {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3962037210f..65de3bceb40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16179,6 +16179,12 @@ with pkgs;
 
   csound = callPackage ../applications/audio/csound { };
 
+  csound-qt = callPackage ../applications/audio/csound/csound-qt {
+    python = python27;
+    qmake = qt59.qmake;
+    qtwebengine = qt59.qtwebengine;
+  };
+
   cinepaint = callPackage ../applications/graphics/cinepaint {
     fltk = fltk13;
     libpng = libpng12;

From 53f1ffa4d3b47c0c30e67fd12ad47be1a74ac2cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 08:32:41 +0000
Subject: [PATCH 0744/2793] nix-review: 0.6.1 -> 1.0.1

- use nix build instead of nix-build
- writes per-build log in the current working directory
- symlinks the builds in the current working directory
- detects & deduplicates build aliases
- markdown reports
- filter builds by regex
- generate nix expression files that can be build by the user
---
 pkgs/tools/package-management/nix-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 2000bcb92d0..0409df7906c 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "0.6.1";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "0ggw90zp40mms4hpphcn1vy1764rbvl2ix45h26v0wkn32cbqn49";
+    sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh";
   };
 
   makeWrapperArgs = [

From de23f0b9228af00aaa2ba29cab1ee0e863648b16 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 15 Nov 2018 23:10:00 +0100
Subject: [PATCH 0745/2793] iwd: 0.11 -> 0.12

---
 pkgs/os-specific/linux/iwd/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index a7a78be6a10..acf28a1bca7 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.14";
-     sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6";
+     rev = "0.15";
+     sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j";
+    sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn";
   };
 
   nativeBuildInputs = [
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
     "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
     "--with-systemd-unitdir=$(out)/lib/systemd/system/"
     "--localstatedir=/var/"
+    "--enable-wired"
   ];
 
   postUnpack = ''
@@ -59,6 +60,8 @@ in stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
+    substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
+                      --replace /bin/false ${coreutils}/bin/false
     substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
                       --replace /bin/false ${coreutils}/bin/false
   '';

From 57ec5d0edcd4bd89a9e152d88511dc89935423ef Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 3 Dec 2018 11:56:25 +0100
Subject: [PATCH 0746/2793] bloop: 1.0.0 -> 1.1.0

---
 pkgs/development/tools/build-managers/bloop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 50b1d09ef93..c535740e5c8 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.0.0";
+  version = "1.1.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,7 +16,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
+    outputHash     = "090ig5k1bd3pv4i8x6byyf9wda1430xysnbcllflcz6cf2ccjy2k";
   };
 in
 stdenv.mkDerivation rec {

From 7aa8b68ab720ab11f36b3547d4734e922ffecae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 3 Dec 2018 12:37:22 +0100
Subject: [PATCH 0747/2793] geoclue: fix gobject-introspection naming

gobjectIntrospection is now named gobject-introspection.
---
 pkgs/development/libraries/geoclue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 173aac0c52e..f2eeb9ae40b 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
-, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
+, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
 , withDemoAgent ? false
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobjectIntrospection
+    pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
     # devdoc
     gtk-doc docbook_xsl docbook_xml_dtd_412
   ];

From d59498f653cdc00fad7116fa7160cc4efeba53c6 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 3 Dec 2018 09:44:39 +0100
Subject: [PATCH 0748/2793] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 474 ++++++++++++++--------------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3f1147aa80e..48a8a444db4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -33,12 +33,12 @@
   };
 
   agda-vim = buildVimPluginFrom2Nix {
-    name = "agda-vim-2018-10-29";
+    name = "agda-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
-      rev = "75853188f15175728e938e1e69da8916148d7f7a";
-      sha256 = "1xv3il21fl602hilb3hk1r2bsbnf8brjyv61hprxsj8xd2s36a4d";
+      rev = "4fefe386a8a85161ace928e2f0e0ab4fe8581505";
+      sha256 = "1i61wvrpn15qs206rnq9bbwgv6wxf76p5j79v2fabh06lyw4dn3q";
     };
   };
 
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-10-31";
+    name = "ale-2018-11-30";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "4b841b55869e3ec5b02806f9b2fe962ffdca2750";
-      sha256 = "0wa8phv4b6n1akaii8qy9c0lr17vm4bqgz5chjx28zs73jfxsf2i";
+      rev = "1d4f98553852499e0f8ebd951db6ada2b1d973e3";
+      sha256 = "112i5722364xi8vsipwi9wvrxnzzvisfwbzwqmk01ag0lnlj2qg4";
     };
   };
 
@@ -113,12 +113,12 @@
   };
 
   base16-vim = buildVimPluginFrom2Nix {
-    name = "base16-vim-2018-10-08";
+    name = "base16-vim-2018-11-30";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
-      rev = "7e9af12d680d81cc1277c07ef5acee8c83828f3f";
-      sha256 = "1al00wf0bf61r0bfsfbq8g2qq8sbzj6z8c85787d3qfinvniz0cl";
+      rev = "2073e2dd9fa0172ccdba92b3f0df25642a69f7db";
+      sha256 = "1d6d2aca73rvhz7gpi2d1g2il9qy45pfw1kbrrqgvmik016i6l1y";
     };
   };
 
@@ -133,22 +133,22 @@
   };
 
   calendar-vim = buildVimPluginFrom2Nix {
-    name = "calendar-vim-2018-10-23";
+    name = "calendar-vim-2018-11-02";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "3c6a7677543824aab0eb9946d376fe5d45a935c5";
-      sha256 = "0jnk2hi9n1p7fqclifiyckrcady6fbkag6z29v7n6bbzhvz0qzzs";
+      rev = "8f6c29be2a20af974ff907876a4b6ba9581c346f";
+      sha256 = "14rvav878ya0a0j5jic9zap5r5ccwdhg26rypjnn8rqnkra2f99a";
     };
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-09-22";
+    name = "caw-vim-2018-11-07";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f";
-      sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4";
+      rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
+      sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
     };
   };
 
@@ -314,12 +314,12 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-10-28";
+    name = "ctrlp-vim-2018-11-22";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "5e40e555d31d9cce2188d9fa724d1debcad28aa6";
-      sha256 = "1skn8p527541w1kynk08dfpai2wlbmylw5sa4z2b7kmmnxa1lq47";
+      rev = "e953ee7a80dc96cd00c20ed6fe82e0e817d977ff";
+      sha256 = "1qnh4w9wb0r7lf5sw37kq29rq887hihga3cxw766mk8rwb2ad3kv";
     };
   };
 
@@ -344,12 +344,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-10-28";
+    name = "denite-nvim-2018-11-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "0a089bb122eb88e182420334a4f1df0c22917856";
-      sha256 = "1virb8lr591jbzmb91dhki32jx9g15a89dsxbh0vy9lcawaikypj";
+      rev = "db2d7c307e70a4575baea3097e0977b59696e855";
+      sha256 = "1l1ny781c1glqwkkhny5d80z186l485ixkwlshcyrmd8p8wnfb6m";
     };
   };
 
@@ -375,23 +375,23 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-10-20";
+    name = "deoplete-go-2018-11-23";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
-      rev = "8bb6d5f51ca825ef88d474c8aa9231692d6c2961";
-      sha256 = "15qwhkx24m7drahksrsvvpdzj9wpm0k1722ry6sdwgd40q8d3jrh";
+      rev = "75f3d42ef71a07c06778cab56e76b994a42a55c3";
+      sha256 = "1b42mcflc5fzi0fhgr99cyrdapbd79gcwgb4qnqg6b8bbn488kyv";
       fetchSubmodules = true;
     };
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-10-24";
+    name = "deoplete-jedi-2018-11-21";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "4ffb3a5ace39143813d63c7f78137bf8478b91e9";
-      sha256 = "1fik8snm6f7f337qidlkkhgri756rgyaswk3ndfiqw5vj673r4dw";
+      rev = "9d9796a53ae402e469fa5ea8766102ba40259230";
+      sha256 = "1dpczpzwvjlmszaia5i90bj4q62va3dckw6rjgy1j3lzj7w2izaf";
       fetchSubmodules = true;
     };
   };
@@ -417,83 +417,83 @@
   };
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
-    name = "deoplete-ternjs-2018-06-05";
+    name = "deoplete-ternjs-2018-11-29";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
-      rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57";
-      sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i";
+      rev = "ebdc48ecd29f8cae0659e5cdd2c30bd869839ca8";
+      sha256 = "19zlgnavlqqq4rqwa1j1wglg921xdjhy8c71wfgh5492gmm1vr5x";
     };
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-10-28";
+    name = "deoplete-nvim-2018-11-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a2";
-      sha256 = "1ixjrf1rrdznfprd9w5fx86k0ni67c9amgvwwbbzhqz3i1zgwc3g";
+      rev = "acae3732524443ecb53af2f4c8078af47381a180";
+      sha256 = "0qm0plgri6bf4bm6mvhqkpl075gdr03n5939vi99v4wy3iymh5w5";
     };
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-10-25";
+    name = "dhall-vim-2018-12-02";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "aac9deeb695c810fee8a702fc5fca99a26f1d4bd";
-      sha256 = "17avn55dixv0rxhc3jzpnadkvldrbq7r81nwgnzi4xlr3fjxjwfc";
+      rev = "caec6efbfc537f1a3a7bf6c5b0f6ab9cffa6911c";
+      sha256 = "0r9jd6pq94sjrsppa1avm4x01y01m9vv64p89l32vrpkrczgxgfa";
     };
   };
 
   direnv-vim = buildVimPluginFrom2Nix {
-    name = "direnv-vim-2017-12-29";
+    name = "direnv-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
-      rev = "4d6271f0facd57a478c0d02895775dc01f577c5c";
-      sha256 = "1vfg4hrxbqc96w694cn9gzjvwkscd111fp6dqlh7wpd2z3ciw07h";
+      rev = "f93eac061ce211d701e2269418d7e55dc6bab5ca";
+      sha256 = "1nfizxzscyq8rqln3hfj648vzavlisgnjay2m6gnd29lnymqrr8l";
     };
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-10-20";
+    name = "echodoc-vim-2018-11-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "3fa121e0a0abee0762867a01b25f4e891594da6e";
-      sha256 = "17qckl9x1yd70zxgwvpkh5nwx8zs5f6d8xismd0rbpigd08qd06q";
+      rev = "1cad58aed10e999b64008fed12401d5919552863";
+      sha256 = "15ndcaypw10jrdmscgrh969lrhb6jhh43d6a4ymam16ljg5590z2";
     };
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
-    name = "editorconfig-vim-2018-10-14";
+    name = "editorconfig-vim-2018-11-15";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "736451ae203c5e3bcce39f1be11d68009b783d82";
-      sha256 = "01j2y02z23ylydkm7yij2m9nimk54m06ik2hyldj99yz8qi5vp18";
+      rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3";
+      sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza";
       fetchSubmodules = true;
     };
   };
 
   elm-vim = buildVimPluginFrom2Nix {
-    name = "elm-vim-2018-06-18";
+    name = "elm-vim-2018-11-13";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
-      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
-      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
+      rev = "d22c0ba13afb554257a8c176962e2216cc18edd1";
+      sha256 = "03lmbv4zkjdnyzrna7g9pqdgf3jqhi9g59fzjnay4af59hijs1v3";
     };
   };
 
   emmet-vim = buildVimPluginFrom2Nix {
-    name = "emmet-vim-2018-10-06";
+    name = "emmet-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
-      rev = "7a4bf3463ef1e2c08393218fc67a8729c00948a5";
-      sha256 = "15y5h7b6ll7nngaq9i44xb88rw2jg5ahbvybdn7kdf0nq1m3z409";
+      rev = "e6fb10d22a9bd2a02c386c81486a065e71c6a92d";
+      sha256 = "0fadqgvirmdl1acb39v05q2sw24fc40w4bcj05f4maj4lqbxkwqv";
       fetchSubmodules = true;
     };
   };
@@ -509,12 +509,12 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-09-15";
+    name = "falcon-2018-11-30";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "0dbdbf568321bc29ac143370d1b75dc651fd083f";
-      sha256 = "0scds1fc433qcnghxplczama83w65iza9dhq3qnyhr085hyisck3";
+      rev = "070f2132266d85059f36496ed277527d5b8f00a1";
+      sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
     };
   };
 
@@ -580,12 +580,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-10-22";
+    name = "fzf-vim-2018-11-27";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "50707b089b1c61fcdb300ec1ecbc4249ead4af11";
-      sha256 = "1h0x701jcj2zwyzaxlzzfax3z8jxrn255wawxcjw9fskz9kldd68";
+      rev = "95f025ef2dbc8fedf124521904a80c1879acd359";
+      sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc";
     };
   };
 
@@ -600,22 +600,22 @@
   };
 
   gist-vim = buildVimPluginFrom2Nix {
-    name = "gist-vim-2016-10-10";
+    name = "gist-vim-2018-11-09";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
-      rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
-      sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
+      rev = "3abf2444bb6a7744a64b4a2c2b02d6761a7de072";
+      sha256 = "197j6bhyfggxka9mycyk3mr6sawf7rnaz74csk47d2qlkfs4zf0v";
     };
   };
 
   gitv = buildVimPluginFrom2Nix {
-    name = "gitv-2018-06-10";
+    name = "gitv-2018-11-24";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
-      rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
-      sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
+      rev = "38daefcbb4375f79396c81860f077264fe9a3ae4";
+      sha256 = "19v1v1wb1shh50if1jgiqy4bvja1lv6zy1fald3c48zl9303x8gq";
     };
   };
 
@@ -750,33 +750,33 @@
   };
 
   jedi-vim = buildVimPluginFrom2Nix {
-    name = "jedi-vim-2018-10-14";
+    name = "jedi-vim-2018-11-08";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "b6dfc5fd49c26d4dbe9f54c814956567a7a9b3a8";
-      sha256 = "11wvynjl1m23vdp4wvirhmm7vnpji5affbyhwz67yjkvh6c42xqa";
+      rev = "2f65c636f83139b9982b1c1c90cb7f34915ad815";
+      sha256 = "02sdgczj7r19xvni1xd7kf3rhibxx36zsca42wjb605s6qgmkvph";
       fetchSubmodules = true;
     };
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    name = "Jenkinsfile-vim-syntax-2018-09-25";
+    name = "Jenkinsfile-vim-syntax-2018-11-25";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
-      rev = "030cd312f7de1786bb5a1f392fa59f7a105054df";
-      sha256 = "17lw8rd2fhybwkhrz8lg1p7b552ki669kr2wlpjb6agkgaiifj8q";
+      rev = "57c50f21de4a710d7f1c1e50d7ecc7e8d5301cec";
+      sha256 = "0my1zpw5g2bjyx0d027a8klys7kgqg51n9pi773bhk0smqwmfp2b";
     };
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-10-21";
+    name = "julia-vim-2018-11-23";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "934618a71bcf64ff0fb94780dc1aefa58e81470a";
-      sha256 = "1pw4snax7ibxhd8xff41lb86vk7a38yrcq85p89sis6nln6larq5";
+      rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d";
+      sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka";
     };
   };
 
@@ -801,12 +801,12 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-09-17";
+    name = "lightline-vim-2018-11-24";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "47765c787ddc981c2eab6105ade84067d164893c";
-      sha256 = "1r5xpss99jfkvc5dngg877dhmirwnrwppql7ysbab50wfx4hv5c6";
+      rev = "688240e0ef849cdc8457822658cedf10358c75d6";
+      sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv";
     };
   };
 
@@ -861,12 +861,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-10-15";
+    name = "ncm2-2018-11-17";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "4aaf9e1e313109d32fd2b64a5299416357d901b2";
-      sha256 = "09rg3pa0yirhsn1x558k3bzh6fyy4whnfqlm89wvmzxw6rm8xnpw";
+      rev = "07aaaaa143a1dff32c2fbc967f4bc574cf40cb03";
+      sha256 = "1vi6dprwzrknnmqxp47hacc9gaa9bafdzm5ihs09yg3rwi0drjbl";
     };
   };
 
@@ -921,12 +921,12 @@
   };
 
   neco-look = buildVimPluginFrom2Nix {
-    name = "neco-look-2018-01-21";
+    name = "neco-look-2018-11-09";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
-      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
-      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
+      rev = "8c3951acb93b72dda4572859928ef7b372485596";
+      sha256 = "1gd692yc1x3753rxg58hwc7nwmm4rjr03y1xaczy1qahq1bm9a40";
     };
   };
 
@@ -951,12 +951,12 @@
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix {
-    name = "neocomplete-vim-2018-03-28";
+    name = "neocomplete-vim-2018-11-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
-      rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
-      sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
+      rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40";
+      sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq";
     };
   };
 
@@ -991,22 +991,22 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-10-29";
+    name = "neomake-2018-12-02";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "c15d51ea9f622b8bce469a18833a6ac64f6a1193";
-      sha256 = "1l15y0di6k4v0vrwpd86lp2n5ljfjnzncgpxwmbhqb2xznr7caq7";
+      rev = "bbdd0847ef06e3a1b7fe9ea2bec8dd9fbd9068f7";
+      sha256 = "17l15i9zgwv7m802k4zpv53116zbg0fsl6kqy83aql2xn8yr1amy";
     };
   };
 
   neomru-vim = buildVimPluginFrom2Nix {
-    name = "neomru-vim-2017-10-01";
+    name = "neomru-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
-      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
-      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
+      rev = "0126deb4d38b497e3c81e5226b275392c1dbce3a";
+      sha256 = "048avhjld8nwdvxcvxnwrbfyps4ialq8zbjmaj6qg06327wbwk89";
     };
   };
 
@@ -1021,22 +1021,22 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-10-23";
+    name = "neosnippet-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "32583e605ebe96bba805bdf0d526b951345c8b3e";
-      sha256 = "105jnnw35ffxwx6zqazh6rizwqdndqc3n656xhljfng33c0lr5mk";
+      rev = "9f87934708db75cfafd3ec957c11cfe190281c5f";
+      sha256 = "03frmqsxw047j4im2gacr8xiarck6dwpp32b0hza39bmsimc09m7";
     };
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-10-17";
+    name = "neoyank-vim-2018-11-08";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
-      rev = "ba337d80769c4f2f19c04df4349a196f52fe5094";
-      sha256 = "0sq595xlijz6xsil2z21kf4662cvmzzm6bsvysfz43wgl16dd5s6";
+      rev = "ecce36986f02358bd4377c52a61bfebe0287fce0";
+      sha256 = "0pf82pb3mm2pgi6nc6s3a3jzlfgi7c80qr9x7bc6ddzkhw1v92jn";
     };
   };
 
@@ -1051,22 +1051,22 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-10-31";
+    name = "nerdtree-2018-11-29";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "8d005db94f8d1a214d172aeb1008d016c3d201e2";
-      sha256 = "0f8dljl45ph668kwjf0py0891i3aqfdijplarxnblbkp2zn5ij7g";
+      rev = "c905a5d7b87051e574c2e72fae57e56c456ba2f4";
+      sha256 = "178nv2jbxn7a8m1amy075m1iwif9bnj9cfz278rzj7i5fr50gqp8";
     };
   };
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
-    name = "nerdtree-git-plugin-2017-03-12";
+    name = "nerdtree-git-plugin-2018-11-15";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
-      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
-      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+      rev = "8931d911fac1b5958ef084accee43c03a8c72485";
+      sha256 = "1yv465afdf9wm65q335mx816wxmg1zzwj4gls2hsbxqymzm3l6br";
     };
   };
 
@@ -1111,12 +1111,12 @@
   };
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
-    name = "nvimdev-nvim-2018-10-05";
+    name = "nvimdev-nvim-2018-11-07";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "ef05db6817d8083f8daf9ddd99b79acc364d57a6";
-      sha256 = "1c44pwsjllhcmlabz9pc9qb5p6lgilfzdsx4rcjc8q8ixijc7w99";
+      rev = "2acfca2a9a55fd66a235cf2e6f602ba1d46add25";
+      sha256 = "164pmlnqkrbffkcx5fha40w75dq1ydx5226shrghwp9ag9kwdvav";
     };
   };
 
@@ -1131,12 +1131,12 @@
   };
 
   open-browser-vim = buildVimPluginFrom2Nix {
-    name = "open-browser-vim-2018-04-26";
+    name = "open-browser-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
-      rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
-      sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
+      rev = "b900ff9d39bb36891704bd0fe76737ee3a7ac2b9";
+      sha256 = "1sws0pzm13cgl7mf6938xjmh23hk02agf23zfx5rdb4d2lcn4ir3";
     };
   };
 
@@ -1261,12 +1261,12 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-09-13";
+    name = "ranger-vim-2018-11-30";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
-      rev = "63e22fd424107579aaf782f3b2c83d76a691fdeb";
-      sha256 = "1337il7j45ydb432qnmaqcz8bigwny752nrl6c2vsc0qv3xd11ls";
+      rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
+      sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
     };
   };
 
@@ -1321,12 +1321,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-10-26";
+    name = "rust-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "039b7c7c4f0b9fec9879027d6700229c33daae3e";
-      sha256 = "09g9q91qvbrrb2hrybdw6p8jm3q3v9j9yffpm9q0nz6g8p6zi8xq";
+      rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
+      sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
     };
   };
 
@@ -1421,12 +1421,12 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-10-18";
+    name = "syntastic-2018-11-24";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
-      rev = "89e485c7f8b1f285b43bb397394f22b79021aac1";
-      sha256 = "0xy54pllpr2bn1wp2fhq5nwrjpcclp61mhzls99cbzzpxfiwirlz";
+      rev = "0d25f4fb4203e600a28e776847d4beca254d3f84";
+      sha256 = "1c3icnpbl7wrgqs67dc1pl7942za01mhsl7fwrcb0njwqkhmkamp";
     };
   };
 
@@ -1481,12 +1481,12 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-10-24";
+    name = "targets-vim-2018-11-01";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
-      rev = "19586689fab6f1ff81743a675645f62adf745b0b";
-      sha256 = "0bvx3dynbsralywkhsi9yjr188ayczp263di3y00dzwymxh7m1p5";
+      rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
+      sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
     };
   };
 
@@ -1591,42 +1591,42 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-09-26";
+    name = "unite-vim-2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
-      rev = "e68ccde4192b3faa3717897e65dc7dd8ab87524a";
-      sha256 = "1r22lwzs92ylzl0hs0ny36vr787jwkf65da9dv0zvz2p5ank5ykw";
+      rev = "77ae78f277896bc560a46a27a51c49f04b6d4ce1";
+      sha256 = "06asqf2hkszz4i9c676jvax6gbqzrcpqckjjb0dy175vifsiclnv";
     };
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-10-22";
+    name = "verilog_systemverilog-vim-2018-11-18";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "4809e36569363bc3b44c981cda842d5bb31e95ff";
-      sha256 = "124ak7596b19rz4vk2f05z6wkfhfrlawlz0y4am8fm4y1mdxsprm";
+      rev = "c1d30130cdf3420fa9043e4b875a63eebb868f02";
+      sha256 = "1hrlzqmpyvjciczcijaag53ms1wn4i2f10irjlm0c3wynsxx9khp";
     };
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-10-30";
+    name = "vim-2018-11-25";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "66755a9cb9bdea62720812a1165132de6ff62468";
-      sha256 = "0zca3spgnf00rxa0h5x79ydycz41b0xli7bgwpnbxannzxqswhiy";
+      rev = "f24e259073994b4f76d125332954d26748fcc581";
+      sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
     };
   };
 
   vim-abolish = buildVimPluginFrom2Nix {
-    name = "vim-abolish-2018-10-25";
+    name = "vim-abolish-2018-11-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "56a76a8c10ca91f3e8f0a2cd9afa2be32d262e24";
-      sha256 = "087l7mvb0rzcdfmrmng82s0abli6w2i4cbyiwps9k588sfcj0w7h";
+      rev = "b95463a1cffd8fc9aff2a1ff0ae9327944948699";
+      sha256 = "1cvhylz6hgvl63zhlrxqrjqqp07pm29i436xv33dzzhdp8dcj1mp";
     };
   };
 
@@ -1821,22 +1821,22 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-11-01";
+    name = "vim-airline-2018-11-22";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "6516b1b4dccef543d489177431050fe8a5c5c99c";
-      sha256 = "0x4vdxz31vqyd3qy8vr4gcdc649nz72axris5fxj8ln5zphlr6ll";
+      rev = "bd468dacfe874fd669ec69522b550d3e1371cf56";
+      sha256 = "0a92a42xnx0rif7r85mrp7jhzmlnbaiqafpc8bn1848bbq9wg880";
     };
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
-    name = "vim-airline-themes-2018-10-25";
+    name = "vim-airline-themes-2018-11-15";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "65217b41da31f05d305b819f2a42a803dd0db434";
-      sha256 = "1pv9plmbmygcnkbkdjp7gr3rp42zdh4qkmv2cfbndhdfx4yd331g";
+      rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9";
+      sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8";
     };
   };
 
@@ -1921,12 +1921,12 @@
   };
 
   vim-closetag = buildVimPluginFrom2Nix {
-    name = "vim-closetag-2018-09-03";
+    name = "vim-closetag-2018-11-07";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
-      rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb";
-      sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy";
+      rev = "6fe822a730d4a5774ce6ffbb3bd88062e18ada9a";
+      sha256 = "1pa0dpb6d20acvlkgpcjb358m658q23666m567lvs849bjzsdlwp";
     };
   };
 
@@ -1971,12 +1971,12 @@
   };
 
   vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "vim-colorschemes-2017-08-22";
+    name = "vim-colorschemes-2018-11-20";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
-      rev = "eab315701f4627967fd62582eefc4e37a3745786";
-      sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
+      rev = "2f532d0564534accf09cecfa9a1e3639865367ee";
+      sha256 = "0d96slqnnn1vahzham3syd904rk2iwn9py4brzas9x09k1qw2gb3";
     };
   };
 
@@ -2001,12 +2001,12 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-10-20";
+    name = "vim-css-color-2018-11-20";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "0ee02ec9753c74d356106f0a0c4ddb0dcf9705f0";
-      sha256 = "1fqngj2a4ky4z96vjryjfkblnr50jw99cfzc7xsjjpdy8j7wvrfk";
+      rev = "8d640e4c5d89dde55ef79d43fee1c8ecd12495b9";
+      sha256 = "17lmdvxnp1y6wvzfzv9yk962ixc549jc80g0zc820734dp27x0l3";
     };
   };
 
@@ -2051,12 +2051,12 @@
   };
 
   vim-dirvish = buildVimPluginFrom2Nix {
-    name = "vim-dirvish-2018-06-20";
+    name = "vim-dirvish-2018-11-15";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "c273c462d774ed2db5f6d382265cf5897e554de0";
-      sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d";
+      rev = "ba3be081de598878edf9624f5c4cb06961b6e842";
+      sha256 = "1bcwj0w5v67mba4m4abmcxncawxz6dpflz34flpcn8869rsghbgv";
     };
   };
 
@@ -2211,22 +2211,22 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-10-28";
+    name = "vim-fugitive-2018-11-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a";
-      sha256 = "1ma9zxqf0ybl6y6qd9wjp97lgrwvgzpqy5zca0c6da29gm03kb02";
+      rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
+      sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
     };
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-10-05";
+    name = "vim-ghost-2018-11-28";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "8a3acdde943688d52407b5da08988dfc528ea10c";
-      sha256 = "0x7mgziyx8gs5cc37c4rm0hrzgzpg4klnkfviyj2k3h4qqj9hkaj";
+      rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa";
+      sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw";
     };
   };
 
@@ -2251,12 +2251,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-10-18";
+    name = "vim-gitgutter-2018-11-26";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "0597380f6b22f43a3ea6ff8364d5c239bb2504ea";
-      sha256 = "18v4y616q29al2lx62gkcv5q9ka8042dk8y6i9b5jmyjfwps0q53";
+      rev = "c2651aefbd92dca05de1943619df965b848f9b4f";
+      sha256 = "1wsmmym3l3r57r8s972iflv1pcsidk8yjb9w4y2rh7dbgf6rkbqr";
     };
   };
 
@@ -2271,12 +2271,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-10-23";
+    name = "vim-go-2018-12-01";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "d5ce080c25806d68189be641e19996898138f1a4";
-      sha256 = "09kq1zjq98vzy8gjgxiqkb7ibl3wpjz8lkzqjm110axxmx01b317";
+      rev = "3577e475ac6f1089e0a32d2921989a4279e9867b";
+      sha256 = "10i3jzwp0rgdyyzmkdvpxfxq2i1dk3hdcxanbi4gm0xh8zs1c0h2";
     };
   };
 
@@ -2291,22 +2291,22 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-10-30";
+    name = "vim-grepper-2018-11-08";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "a55a14b97dc8ac848eeb95e71d095b75197ba665";
-      sha256 = "08p5dp43z9bxllr5fvl3hgnyqyxlvpbfczw1ydncmzvrqqccrx08";
+      rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
+      sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
     };
   };
 
   vim-gutentags = buildVimPluginFrom2Nix {
-    name = "vim-gutentags-2018-06-13";
+    name = "vim-gutentags-2018-11-17";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
-      rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e";
-      sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4";
+      rev = "93616e4c0ccfafe52ae329c7dd220d7b5c7d5f80";
+      sha256 = "12qcf34fxgzsilx1wkh219avvkq7a5q9x3kdcqy3ai8g05fpx619";
     };
   };
 
@@ -2341,12 +2341,12 @@
   };
 
   vim-hdevtools = buildVimPluginFrom2Nix {
-    name = "vim-hdevtools-2017-03-11";
+    name = "vim-hdevtools-2018-11-19";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
-      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
-      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
+      rev = "ab33578bbdbcbd80050faf43e4adee1653fe34dc";
+      sha256 = "1xvjz6yidcywn1xmdqlxsz68lmkx6rmiqf6q2gfz56pzq1mfmski";
     };
   };
 
@@ -2471,12 +2471,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-10-09";
+    name = "vim-javacomplete2-2018-11-14";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "a3af9721afcd3ce8972dd4ab0f40da947245c2fa";
-      sha256 = "0pgfgf82dv0dys2d4dq48d0n4gnbmxbqpvsy3fwmqdrw9zn9bw79";
+      rev = "cc9eb84b43b455ed61e647eac577fd6b850f0e8b";
+      sha256 = "0xxashigb3jifhwcsbi8mdzhd049mi1naaaih69cmmvzwrs3ik1p";
     };
   };
 
@@ -2562,12 +2562,12 @@
   };
 
   vim-lawrencium = buildVimPluginFrom2Nix {
-    name = "vim-lawrencium-2017-01-11";
+    name = "vim-lawrencium-2018-11-04";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
-      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
-      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+      rev = "2e09de2ab8ac7a11387340647670ea6c1e4ef08c";
+      sha256 = "17j3wy15rkfx7xwgnmipmg7skmf57rw4xndkjgws6jqm9xgvj6jb";
     };
   };
 
@@ -2592,12 +2592,12 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-10-29";
+    name = "vim-localvimrc-2018-11-06";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "109962b3b7359ee2978417264b168ac6842db9cf";
-      sha256 = "13jpp5g91bynl91n8i8q8ldicii3ns42fq3hlnjcrhz5ml734wlf";
+      rev = "e84959d05472ce2000883b1f73ea34302894bdb9";
+      sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw";
     };
   };
 
@@ -2642,12 +2642,12 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-06-14";
+    name = "vim-monokai-pro-2018-12-03";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
-      rev = "75b2794a057f0ea6b2485ae622e92bb0687d4c9b";
-      sha256 = "1l9cdsilpzyg9y0az7627gi10qyfyjxn9dvi571q7n1vrv6nhl2d";
+      rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
+      sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
     };
   };
 
@@ -2822,12 +2822,12 @@
   };
 
   vim-plug = buildVimPluginFrom2Nix {
-    name = "vim-plug-2018-09-12";
+    name = "vim-plug-2018-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "b6050d6f03f3e2792589535249e3c997d3e94461";
-      sha256 = "11x10l75q6k4z67yyk5ll25fqpgb2ma88vplrakw3k41g79xn9d9";
+      rev = "734d9a11b5a6354e6a66e152dee5d311233e033c";
+      sha256 = "07j8wyqvqamr2dr1vdk84913jihw7arm4drnd2zmy0d7g00ngyzn";
     };
   };
 
@@ -2882,12 +2882,12 @@
   };
 
   vim-puppet = buildVimPluginFrom2Nix {
-    name = "vim-puppet-2018-09-24";
+    name = "vim-puppet-2018-11-15";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
-      rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b";
-      sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v";
+      rev = "4793b074ddbfc05ed0189e19de343870611e4bdc";
+      sha256 = "0q24dmbdsskz97xhdig9r9m7l8hyyzsmza1b0m7bc2y269fsiim0";
     };
   };
 
@@ -2902,12 +2902,12 @@
   };
 
   vim-quickrun = buildVimPluginFrom2Nix {
-    name = "vim-quickrun-2018-10-16";
+    name = "vim-quickrun-2018-11-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
-      rev = "9dbda9dcdc8ef3150c414b9b1ea347b04b942665";
-      sha256 = "06ssvyk84097vqzyrnrmxsr63diy8mjy8mv8xkhq5cmvqhavz91s";
+      rev = "875253cf98415de2aef411a50f35e2d7cb94aeac";
+      sha256 = "0l6f2m840c74md0799gch6l6m6nax30q8blpg2xrqmm7v0lrl50q";
     };
   };
 
@@ -2932,12 +2932,12 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-10-31";
+    name = "vim-rhubarb-2018-11-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "42072cc349c46db79c0a4411d399a2fe31cfda7e";
-      sha256 = "020fshfrwbycs4saci58k625330i2ndfh6lqnxz5h0pp2m5y6jp8";
+      rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324";
+      sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr";
     };
   };
 
@@ -2982,12 +2982,12 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-07-27";
+    name = "vim-scriptease-2018-11-03";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
-      rev = "2619a1f5f63b670578ed0a504a6f844807804436";
-      sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl";
+      rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
+      sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
     };
   };
 
@@ -3012,12 +3012,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-10-31";
+    name = "vim-signify-2018-11-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "4e7faba8d32d56d80090dedc5328849a7128b73a";
-      sha256 = "0wm1kgklvd4b52lrqb9l7n511p8kaw8y9707962l4nrp8cbrbs31";
+      rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
+      sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
     };
   };
 
@@ -3052,12 +3052,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-10-27";
+    name = "vim-snippets-2018-11-27";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "06161e65cd238d5f462f21e3f549c61860db85d1";
-      sha256 = "10n94s90jjwsg58cm5lrcs553mwsdyvy34rmf6xsa2mq9ql21vy1";
+      rev = "97e4ae4fe8d4e8af8c7d1a1d0c41e34ac81cf636";
+      sha256 = "1spf9bvn0a5cx3nhgzj6i5aqrh47v27a8rjxi3im2n1is0gyar7r";
     };
   };
 
@@ -3092,12 +3092,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-10-31";
+    name = "vim-startify-2018-11-28";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "356562270684d8d1647daf0faaf76ac90740990c";
-      sha256 = "0qc9ifq4blixda0kyc0zhmqi6cqz44xnk9x17p0p9qqidf1s1l1r";
+      rev = "e25fbe1c0d6f8cda83c0e300d70f9b8009e4134f";
+      sha256 = "0j3yr5g97s8lb9z68rx5clbg7af74r5y3rlgj5jx0mxlxx3yysyc";
     };
   };
 
@@ -3172,22 +3172,22 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-08-02";
+    name = "vim-terraform-2018-11-19";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "7c11252da45c6508524e022d1f2588134902d8d1";
-      sha256 = "1qnjjcin934i7yd2fd0xapraindrpavnik1fasv10x5dw8yzxyrs";
+      rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
+      sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-10-24";
+    name = "vim-test-2018-11-22";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "cecb28e55a29ecde7cea926852998c47027bd759";
-      sha256 = "1av9fmva2ki180wikfik3yl83hzirj43rwhwwms65bk590cf4h95";
+      rev = "c4b732003d120d60a2fc009423e34d80fb212651";
+      sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
     };
   };
 
@@ -3212,22 +3212,22 @@
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
-    name = "vim-tmux-navigator-2018-10-19";
+    name = "vim-tmux-navigator-2018-11-03";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "7eb75a10e3ab0504673a0e7eb32af6e5521b80ec";
-      sha256 = "0kafk2b8zxwx354p8inww0cyrw9w4arbiixbvvhrhxks7cccfxx6";
+      rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466";
+      sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc";
     };
   };
 
   vim-toml = buildVimPluginFrom2Nix {
-    name = "vim-toml-2018-09-25";
+    name = "vim-toml-2018-11-27";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "2069e7413d8eaab567fa320723c4af24bb437f3a";
-      sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i";
+      rev = "06f6c1346be834c7c971d6d1d4f876e5699119bf";
+      sha256 = "12sp45p2ixkvrs9sdyx0m8bc6yn1c2qr0vqbr04c5ac94km1rdar";
     };
   };
 
@@ -3282,22 +3282,22 @@
   };
 
   vim-vue = buildVimPluginFrom2Nix {
-    name = "vim-vue-2018-10-08";
+    name = "vim-vue-2018-11-11";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
-      rev = "720ca48e0207f2aca331b9d949ce9d4ff5702737";
-      sha256 = "1cqny4vppyaw29g6bx1qlfdjb5fa0avpy41jkidazv76ym4ahi2x";
+      rev = "e306929b27bea08ab505de7a4617e642b56b6dcd";
+      sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16";
     };
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-10-27";
+    name = "vim-wakatime-2018-11-25";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "656853504feb4aab3168e007aab5a1aee355bff5";
-      sha256 = "1dpi6dc1gdwq4smsis9nxd2p3cq9jm88yj3kn12gfrsb5w1j9k7q";
+      rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
+      sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
     };
   };
 
@@ -3372,12 +3372,12 @@
   };
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
-    name = "vimpreviewpandoc-2018-05-12";
+    name = "vimpreviewpandoc-2018-11-05";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
-      rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
-      sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
+      rev = "61d34f27b6d47da6523b682e32a155f65867d46e";
+      sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm";
     };
   };
 
@@ -3402,12 +3402,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-11-01";
+    name = "vimtex-2018-12-02";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "2aae07e67034f4806d45500a967bf5775ab22baf";
-      sha256 = "1ng1ps5f2vh7xs5lfkid7zwvcjglynw53xvd301zpjbgln2gv3fz";
+      rev = "c3d40a9bc136bbe01739b193e188f3ad450edaa5";
+      sha256 = "1mgji6w1630npqps3mysapqg08zd7abvkr3vvdl4ns7f582rm2b6";
     };
   };
 
@@ -3523,12 +3523,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-10-14";
+    name = "youcompleteme-2018-11-27";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6ba";
-      sha256 = "14v7kqv4d2013imc5qkh22lwl5d9x419jjfj5qinld04n56banmv";
+      rev = "75bf1738dcac502fa2d04e87116a3ce65249be8c";
+      sha256 = "19mdhpiqkn9zr23b55cpx66lwmm2a6kdss98dwzib3swr3dgcvcg";
       fetchSubmodules = true;
     };
   };
@@ -3564,12 +3564,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-09-21";
+    name = "zig-vim-2018-11-17";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2";
-      sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g";
+      rev = "0479c0ade7c27210e3a7982d36bd2673d560ffa9";
+      sha256 = "1ndbrzvkiyy55avmk6z7x7qd5b9v4ylc7i8n9xlcas90q6cjw9ga";
     };
   };
 

From 3b2bf761df5d1c75f4b5a26ec72c373562289ee9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 07:43:04 -0500
Subject: [PATCH 0749/2793] linux: 4.20-rc4 -> 4.20-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 0c4158790bd..6c06354f394 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.20-rc4";
-  modDirVersion = "4.20.0-rc4";
+  version = "4.20-rc5";
+  modDirVersion = "4.20.0-rc5";
   extraMeta.branch = "4.20";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kni1l1gk9mva7ym091mrkn9f2bdbh80i7589ahk6j5blpj9m3ns";
+    sha256 = "0dixig8vismk40x4a719psyi39nqcv7yrisjdnj3s2ym9rljyypz";
   };
 
   # Should the testing kernels ever be built on Hydra?

From ee1f6e20b2a1b7d28e8d3ae949ab0fd98cd85818 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 08:11:39 -0500
Subject: [PATCH 0750/2793] slack: Add dark-mode version

---
 .../instant-messengers/slack/default.nix        | 17 ++++++++++++++++-
 pkgs/top-level/all-packages.nix                 |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 529a530a4a3..51b6fb1d69c 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, makeWrapper
+{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
 , systemd, xorg }:
@@ -88,6 +88,21 @@ in stdenv.mkDerivation {
     substituteInPlace $out/share/applications/slack.desktop \
       --replace /usr/bin/ $out/bin/ \
       --replace /usr/share/ $out/share/
+  '' + stdenv.lib.optionalString darkMode ''
+    cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
+    document.addEventListener('DOMContentLoaded', function() {
+    let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
+    $.ajax({
+        url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css',
+        success: function(css) {
+            \$("<style></style>").appendTo('head').html(css + tt__customCss);
+            \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}');
+            \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}');
+            \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}');
+        }
+      });
+    });
+    EOF
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73de74dd9b0..3f83f1fd9e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17350,6 +17350,7 @@ with pkgs;
   jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
+  slack-dark = self.slack.override { darkMode = true; };
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 

From 26de2d17809fffa91d433316037433d457828632 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 2 Dec 2018 14:17:26 -0600
Subject: [PATCH 0751/2793] gnumake: disable subsecond mtime on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gnumake can support subsecond mtimes if it is available. But Darwin
doesn’t support setting subsecond mtimes until 10.13! So we can just
disable this check to avoid the issue where most of our built tools
use seconds but make uses nanoseconds. Might fix some parallel issues
along the way.

Fixes #51221
---
 .../tools/build-managers/gnumake/4.2/default.nix      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 95466d843d6..4db0c18dae1 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -27,7 +27,16 @@ stdenv.mkDerivation {
   nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
   buildInputs = stdenv.lib.optionals guileSupport [ guile ];
 
-  configureFlags = stdenv.lib.optional guileSupport "--with-guile";
+  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+
+    # Make uses this test to decide whether it should keep track of
+    # subseconds. Apple made this possible with APFS and macOS 10.13.
+    # However, we still support macOS 10.11 and 10.12. Binaries built
+    # in Nixpkgs will be unable to use futimens to set mtime less than
+    # a second. So, tell Make to ignore nanoseconds in mtime here by
+    # overriding the autoconf test for the struct.
+    # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
+    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
 
   outputs = [ "out" "man" "info" ];
 

From caed71efb655d0a73ba6355e0292541de381cf69 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Mon, 3 Dec 2018 16:14:16 +0100
Subject: [PATCH 0752/2793] nvidia_legacy_340: Remove unneeded/failing patch

The patch is not applying and no longer needed after upgrade in
045575e744cd581a20929c63590d9b555099c22d. Now the same result is
achieved by the following lines in the driver package itself:

    #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
    #define nv_drm_pci_init drm_legacy_pci_init
    #define nv_drm_pci_exit drm_legacy_pci_exit
    #else
    #define nv_drm_pci_init drm_pci_init
    #define nv_drm_pci_exit drm_pci_exit
    #endif
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 016d03a61f8..aa604cd9776 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -47,7 +47,7 @@ rec {
     persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
     useGLVND = false;
 
-    patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
+    patches = [ ./vm_operations_struct-fault.patch ];
   };
 
   legacy_304 = generic {

From 57c801fa598b1e46e298e3622f72c8f477051241 Mon Sep 17 00:00:00 2001
From: eburimu <43167692+eburimu@users.noreply.github.com>
Date: Mon, 3 Dec 2018 17:49:12 +0200
Subject: [PATCH 0753/2793] gperf: fix cross compilation (#51210)

* fix: gperf 3.0 cross compilation

* fix: gperf-30 cross compilation, remove unused parameter
---
 pkgs/development/tools/misc/gperf/3.0.x.nix   |  4 +-
 .../tools/misc/gperf/gperf-ar-fix.patch       | 46 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/gperf/gperf-ar-fix.patch

diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix
index e203f931b43..4a8b2e8daab 100644
--- a/pkgs/development/tools/misc/gperf/3.0.x.nix
+++ b/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "gperf-3.0.4";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+  patches = [ ./gperf-ar-fix.patch ];
   meta = {
     description = "Perfect hash function generator";
 
diff --git a/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch b/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch
new file mode 100644
index 00000000000..942d726d76e
--- /dev/null
+++ b/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch
@@ -0,0 +1,46 @@
+--- gperf-3.0.4/lib/configure.ac	2009-01-15 02:24:31.000000000 +0200
++++ gperf-3.0.4.patched/lib/configure.ac	2018-11-29 06:37:20.968627533 +0300
+@@ -21,10 +21,12 @@
+ 
+ AC_PREREQ([2.60])
+ AC_INIT([hash.cc])
++m4_include([../aclocal.m4])
+ AC_PROG_MAKE_SET
+ dnl
+ dnl           checks for programs
+ dnl
++AC_SUBST([AR])
+ AC_PROG_CC
+                       dnl sets variable CC
+ AC_PROG_CPP
+--- gperf-3.0.4/lib/Makefile.in	2008-08-23 21:52:48.000000000 +0300
++++ gperf-3.0.4.patched/lib/Makefile.in	2018-11-29 06:36:43.161998888 +0300
+@@ -41,7 +41,7 @@
+ # Both C and C++ compiler
+ OBJEXT = @OBJEXT@
+ # Other
+-AR = ar
++AR = @AR@
+ AR_FLAGS = rc
+ RANLIB = @RANLIB@
+ MV = mv
+--- gperf-3.0.4/doc/configure.ac	2009-01-15 02:24:31.000000000 +0200
++++ gperf-3.0.4.patched/doc/configure.ac	2018-11-29 06:36:00.961288421 +0300
+@@ -21,6 +21,7 @@
+ 
+ AC_PREREQ([2.60])
+ AC_INIT([gperf.1])
++m4_include([../aclocal.m4])
+ PACKAGE=gperf
+ AC_SUBST([PACKAGE])
+ AC_PROG_MAKE_SET
+--- gperf-3.0.4/src/configure.ac	2009-01-15 02:24:30.000000000 +0200
++++ gperf-3.0.4.patched/src/configure.ac	2018-11-29 06:34:21.718576658 +0300
+@@ -21,6 +21,7 @@
+ 
+ AC_PREREQ([2.60])
+ AC_INIT([main.cc])
++m4_include([../aclocal.m4])
+ AC_CONFIG_HEADER([config.h])
+ AC_PROG_MAKE_SET
+ dnl

From c89b05e26ff065ad91a2d6b68272da7cf3c95e69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:52 +0100
Subject: [PATCH 0754/2793] python: Flask-PyMongo: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index f32f402a325..4f814b6642c 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yi1r13p3l1d5dpdfnyp239l6l17nwvyky8y62nmmqxlsp2ja9hi";
+    sha256 = "112625c5d5b4e35aad301ef9e937b7275043d310d75bd76e2b2dd07147c8217a";
   };
 
   checkInputs = [ pytest ];

From c9c0bbc68c0c9bb9d203e025606cbacec720a00d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:52 +0100
Subject: [PATCH 0755/2793] python: absl-py: 0.4.1 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index a087eaeca83..60a704f5610 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.4.1";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6e70506fb4d867cf269af7bcc27b744c36bbc4c516f0f8ccf2039956deea72";
+    sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
   };
 
   propagatedBuildInputs = [ six ];

From b7ecee98e7eb146a35c29317075757303ec109a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:52 +0100
Subject: [PATCH 0756/2793] python: aioeventlet: 0.4 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix
index 73d4b278058..f137484a824 100644
--- a/pkgs/development/python-modules/aioeventlet/default.nix
+++ b/pkgs/development/python-modules/aioeventlet/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aioeventlet";
-  version = "0.4";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y";
+    sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a";
   };
 
   propagatedBuildInputs = [ eventlet trollius asyncio ];

From 2f7b1fd06b42c986904c867da78d7a1dcab2166a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:52 +0100
Subject: [PATCH 0757/2793] python: aiohttp-jinja2: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 9f307f24dfa..78669e70718 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-jinja2";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df1ba60b8779d232a23e5e38589b85f6430e9ace5adce546353155349bdea023";
+    sha256 = "aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c";
   };
 
   propagatedBuildInputs = [ aiohttp jinja2 ];

From dabe54f373ce14b62855f436f6cb633a5f8a0d3d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0758/2793] python: alembic: 1.0.0 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index cb70d3760c8..6402b1ea0b7 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e";
+    sha256 = "04bcb970ca8659c3607ddd8ffd86cc9d6a99661c9bc590955e8813c66bfa582b";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

From 8ae6e4cc90027171ac7498dfe06cba67485fa232 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0759/2793] python: argh: 0.26.1 -> 0.26.2

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

diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix
index 04508b3cc1e..3de0815d7b2 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/pkgs/development/python-modules/argh/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "argh";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6";
+    sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
   };
 
   buildInputs = [ pytest py mock pkgs.glibcLocales ];

From e9db9aca94cfa23e3df18d6d72ac46818540bd29 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0760/2793] python: atomicwrites: 1.1.5 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix
index b93ff7825fc..44eb1b09d83 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/pkgs/development/python-modules/atomicwrites/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "atomicwrites";
-  version = "1.1.5";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585";
+    sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee";
   };
 
   meta = with stdenv.lib; {

From 6ed588816d1820031f110c2e951c9012a2146373 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0761/2793] python: attrs: 18.1.0 -> 18.2.0

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

diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index c443d17e066..0fe8241c215 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "18.1.0";
+  version = "18.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";
+    sha256 = "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69";
   };
 
   # macOS needs clang for testing

From bf271cbcf1833ff866fc1ff1d427d76558758c4d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0762/2793] python: av: 0.5.3 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 4440edc2236..a3ebb3641a8 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "0.5.3";
+  version = "6.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k5nbff8c2wxc8wnyn1qghndbd2rjck1y3552s63w41mccj1k1qr";
+    sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
   };
 
   buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];

From afca3626f9879113cef6b4c14485702b2bfac6b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0763/2793] python: awkward: 0.3.0 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 6bbcd170382..47d3ae25fc0 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.0";
+  version = "0.4.3";
   pname = "awkward";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693";
+    sha256 = "41cca910df0faaa30bb9a7682826f3d6f099cb1fd2af452f45a1dd99305db579";
   };
 
   propagatedBuildInputs = [ numpy ];

From a0f18dcbead814a0551c8e3ca2d96fa7a4280e71 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0764/2793] python: aws-adfs: 0.12.1 -> 1.12.2

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

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index bce64a635e3..dc7e3148400 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -2,12 +2,12 @@
 , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
 
 buildPythonPackage rec {
-  version = "0.12.1";
+  version = "1.12.2";
   pname = "aws-adfs";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72725d7005252b96ccfa9719fe4beec2b86301bff894d4d97a50fc1d05393fd8";
+    sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3";
   };
 
   # Relax version constraint

From 0557a566ba90524fd174fea31a1795ba92eff0f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0765/2793] python: aws-sam-translator: 1.6.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 64c75b3c092..307cd9b84b0 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.6.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10";
+    sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b";
   };
 
   # Tests are not included in the PyPI package

From b93aab2d89697f23276ac939b37e3341ed09f2fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0766/2793] python: aws-xray-sdk: 1.1.2 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index a16f6c7415f..838a0cf063b 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "aws-xray-sdk";
-  version = "1.1.2";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef";
+    sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a";
   };
 
   propagatedBuildInputs = [

From 149b48d73f4845425ac7995987dfe4d0d747446c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:53 +0100
Subject: [PATCH 0767/2793] python: azure: 0.11.0 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix
index c021e483d94..541cf1e7270 100644
--- a/pkgs/development/python-modules/azure/default.nix
+++ b/pkgs/development/python-modules/azure/default.nix
@@ -10,13 +10,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.11.0";
+  version = "4.0.0";
   pname = "azure";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
+    sha256 = "7d6afa332fccffe1a9390bcfac5122317eec657c6029f144d794603a81cd0e50";
   };
 
   propagatedBuildInputs = [ dateutil pyopenssl requests ]

From 9de8d9bda6736011359a7d1db4563b87a35bbd40 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0768/2793] python: azure-common: 1.0.0 -> 1.1.16

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

diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index 00cc67d34bd..ad2ef52224b 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -7,14 +7,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "1.1.16";
   pname = "azure-common";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491";
+    sha256 = "2606ae77ff81c0036965b92ec2efe03eaec02a66714140ca0f7aa401b8b9bbb0";
   };
 
   propagatedBuildInputs = [ azure-nspkg ];

From 2e2916b6472cad57392ccc8331ed9a9e16d46c48 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0769/2793] python: azure-mgmt-compute: 0.20.0 -> 4.3.1

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

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 4ea60f2f29a..e460b0ac625 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.20.0";
+  version = "4.3.1";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
+    sha256 = "5b0c2390af3e29d910e3d6e7a72b0be59d6e15933740dd193129217c000e4fed";
   };
 
   preConfigure = ''

From a944d0fcc824360a7abc992b33abbe5518a3a3e7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0770/2793] python: azure-mgmt-network: 0.20.1 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index fd47f8895fd..beb0a7f895d 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.20.1";
+  version = "2.2.1";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
+    sha256 = "a4327bccc435ca4f829ac18f82f17923b490958c202af7a86044ccabeaaa5401";
   };
 
   preConfigure = ''

From 8d58469a61b7df300e77818a2e1dab7bb4902ba5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0771/2793] python: azure-mgmt-nspkg: 1.0.0 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index aa037b48b4f..cf977539d5d 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "3.0.2";
   pname = "azure-mgmt-nspkg";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
+    sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
   };
 
   propagatedBuildInputs = [ azure-nspkg ];

From 4218dc2ba7e5a80455172e5d6b209f7ebb29ec2f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0772/2793] python: azure-mgmt-resource: 0.20.1 -> 2.0.0

---
 .../python-modules/azure-mgmt-resource/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index b60e3aee340..557cf8e315a 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -7,13 +7,13 @@
 
 
 buildPythonPackage rec {
-  version = "0.20.1";
+  version = "2.0.0";
   pname = "azure-mgmt-resource";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
+    sha256 = "2e83289369be88d0f06792118db5a7d4ed7150f956aaae64c528808da5518d7f";
   };
 
   preConfigure = ''

From 95569262bb178273719abab189ae045ef21651ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0773/2793] python: azure-mgmt-storage: 0.20.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 2e0523bb25c..ec45d5ae8f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.20.0";
+  version = "3.0.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
+    sha256 = "24c52b9dcb5e224ca9572d6ec39b53d332bdfe01818e85ec1cc1b5bedf16ce07";
   };
 
   preConfigure = ''

From 808f4074391ee9c089e37177f24118ed7e4fc453 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0774/2793] python: azure-nspkg: 1.0.0 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix
index fb06758c5d4..f95db7b1c59 100644
--- a/pkgs/development/python-modules/azure-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-nspkg/default.nix
@@ -4,13 +4,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "3.0.2";
   pname = "azure-nspkg";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "293f286c15ea123761f30f5b1cb5adebe5f1e5009efade923c6dd1e017621bf7";
+    sha256 = "e7d3cea6af63e667d87ba1ca4f8cd7cb4dfca678e4c55fc1cedb320760e39dd0";
   };
 
   meta = with pkgs.lib; {

From 52a86ad768f5742e750afb21672e4c3024cb6e70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0775/2793] python: azure-servicemanagement-legacy: 0.20.1 ->
 0.20.6

---
 .../python-modules/azure-servicemanagement-legacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 8fb27be0e51..8148fe78e53 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.20.1";
+  version = "0.20.6";
   pname = "azure-servicemanagement-legacy";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs";
+    sha256 = "c883ff8fa3d4f4cb7b9344e8cb7d92a9feca2aa5efd596237aeea89e5c10981d";
   };
 
   propagatedBuildInputs = [ azure-common requests ];

From a61c10b3a28171922c15d440e446f00bfeeefbc2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0776/2793] python: bleach: 2.1.4 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 3c5f1d44190..7cd55c9e647 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "bleach";
-  version = "2.1.4";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8";
+    sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718";
   };
 
   checkInputs = [ pytest pytestrunner ];

From ac71c0a6349ec22f5f1b24376673c2f53742a909 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0777/2793] python: blessings: 1.6 -> 1.7

---
 .../python-modules/blessings/default.nix            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix
index d1785169654..23e9067ea33 100644
--- a/pkgs/development/python-modules/blessings/default.nix
+++ b/pkgs/development/python-modules/blessings/default.nix
@@ -1,20 +1,29 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, six
+, nose
 }:
 
 buildPythonPackage rec {
   pname = "blessings";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd";
+    sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d";
   };
 
   # 4 failing tests, 2to3
   doCheck = false;
 
+  propagatedBuildInputs = [ six ];
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/erikrose/blessings;
     description = "A thin, practical wrapper around terminal coloring, styling, and positioning";

From bdef3e6c05bc1c15acd47f66379217e9abf18c91 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0778/2793] python: bokeh: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 567ea4518f8..67dbe0fa9d1 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn";
+    sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
   };
 
   disabled = isPyPy;

From b00f4a217826609cae996bef04d8db930d053433 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0779/2793] python: botocore: 1.10.84 -> 1.12.37

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 989b6e944de..c684d9ad5fc 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.10.84";
+  version = "1.12.37";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3e4b5a2c903ea30d19d41ea2f65d0e51dce54f4f4c4dfd6ecd7b04f240844a8";
+    sha256 = "eed1b39027ee882ebd0df10dcb7307db20fc4b468debae513dc183743e850d17";
   };
 
   propagatedBuildInputs = [

From bc1468fae65ea253c2ecc9b4190cf9b63b5aa416 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:54 +0100
Subject: [PATCH 0780/2793] python: buildbot: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 0110aa92c06..c8bc14d3dc1 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -24,11 +24,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "1.4.0";
+    version = "1.5.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx";
+      sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52";
     };
 
     propagatedBuildInputs = [

From fcc2a86c8fa2a7c00bf167bde8cfcc33acde4b1e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0781/2793] python: CairoSVG: 2.1.3 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 68b1924e5a8..29a1504675a 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.1.3";
+  version = "2.2.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
+    sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
   };
 
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];

From e20176dd6308d14d6c552eb9854c1c2b3cc29935 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0782/2793] python: python-can: 2.2.1 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 1072b33bc1b..dadd55ab040 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "python-can";
-  version = "2.2.1";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b";
+    sha256 = "0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07";
   };
 
   propagatedBuildInputs = [ wrapt pyserial ];

From b237b249aae3b99d09aca397075cdceed5447f2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0783/2793] python: certifi: 2018.8.24 -> 2018.10.15

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

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 40b3338fdec..ef8d1e52fe0 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2018.8.24";
+  version = "2018.10.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638";
+    sha256 = "6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a";
   };
 
   meta = {

From b49375a55753042491010ca5c2250f86d8ee60b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0784/2793] python: chainer: 4.4.0 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index d0467888a88..2b9441b7662 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "4.4.0";
+  version = "5.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9cc4d43e1ea3e0766e211e4e755dbb879f2cf27a805cfa52e32b99fd1e5f24dd";
+    sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee";
   };
 
   checkInputs = [

From 541f09c90228a72cf32c34c98e54adcf207764c5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0785/2793] python: channels: 2.1.3 -> 2.1.5

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

diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index cdcfc72000d..74994154f2e 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,11 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "channels";
-  version = "2.1.3";
+  version = "2.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d503d18b92cef488ba68808a2205e055d29a6a1abae92d277f8f7a9c8752f13";
+    sha256 = "48f97f1801e0a8da6d01430d16d4ed8bd460d4ec3130c66075fb94b12bb30a67";
   };
 
   # Files are missing in the distribution

From 909cefae28d469f275cf5d617bfc3067ff0d3855 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0786/2793] python: CherryPy: 17.3.0 -> 18.0.1

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

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index cb3c48c0882..8e35c7c2d37 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "CherryPy";
-  version = "17.3.0";
+  version = "18.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d";
+    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
   };
 
   propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

From 7c054a717cfac9dc4724181a9898afed58ce8c73 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0787/2793] python: cli_helpers: 1.0.2 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 69b811a94f4..799ad0473ea 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "cli_helpers";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z5rqm8pznj6bvivm2al8rsxm82rai8hc9bqrgh3ksnbzg2kfy7p";
+    sha256 = "7c2038bba0c41f41acae0f6e660ff3b00d69f55d9d968f024952cace78111e12";
   };
 
   propagatedBuildInputs = [

From fe0af1ce777abf99a3fd851a86f2000326153207 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0788/2793] python: click: 6.7 -> 7.0

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

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 68a4662d282..5733f43dbd4 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "6.7";
+  version = "7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
+    sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7";
   };
 
   patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {

From b4beb6c7e07e7929a7f918a8a249d55c5c35b85e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0789/2793] python: clize: 3.0 -> 4.0.3

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

diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index 8456f8d473b..d2eac77a14b 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "clize";
-  version = "3.0";
+  version = "4.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm";
+    sha256 = "dbcfba5571dc30aaf90dc98fc279e2aab69d0f8f3665fc0394fbc10a87a2be60";
   };
 
   buildInputs = [ dateutil ];

From 8037a504036243b5a07771bf2388690772991b1d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0790/2793] python: cloudpickle: 0.5.6 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index b00d210a464..feb215a6e7a 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cloudpickle";
-  version = "0.5.6";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0390ecb3731ac035d74c34651460f4a683e9ef7443861712b8d56c20c2f92113";
+    sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1";
   };
 
   buildInputs = [ pytest mock ];

From 0c75bcf56d0d7dc65aa4ba06361c6ce9112bbdaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0791/2793] python: ClusterShell: 1.8 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix
index 617b0ea101f..4120dda5460 100644
--- a/pkgs/development/python-modules/clustershell/default.nix
+++ b/pkgs/development/python-modules/clustershell/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "ClusterShell";
-  version = "1.8";
+  version = "1.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m";
+    sha256 = "e913efb4fe017eed9731d5ad8be397509e7f1966e6cb6441ee2bce074b16b310";
   };
 
   propagatedBuildInputs = [ pyyaml ];

From e97c15c638f8142c1588aef92542eefdff0b081e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:55 +0100
Subject: [PATCH 0792/2793] python: CommonMark: 0.7.5 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
index d6cd69f6c8a..63d84f3da77 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "CommonMark";
-  version = "0.7.5";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0";
+    sha256 = "abcbc854e0eae5deaf52ae5e328501b78b4a0758bf98ac8bb792fce993006084";
   };
 
   preCheck = ''

From c192f64290c5df377f017369b77593186762511b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0793/2793] python: cornice: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index dc7c9c334d3..2c7660807d6 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cornice";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7f8db903ba06c2584c7db4474459de3565d90b5e4ae4b97c687840e11d5b7fd";
+    sha256 = "c88f246aa6a84a0cdbaa8231a062c60e18ad9c0a65dc178f536ce5eb3a831418";
   };
 
   propagatedBuildInputs = [ pyramid simplejson six venusian ];

From d9aafc960956ce326ae0bcea898e5b21b7729d53 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0794/2793] python: coveralls: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index d0e26e2e07a..cda30943b0e 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -16,12 +16,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7ddb2e3114db9604a7cb1fcc68a7dcca32dce346f5ba568c99979b38e166f5a6";
+    sha256 = "ab638e88d38916a6cedbf80a9cd8992d5fa55c77ab755e262e00b36792b7cd6d";
   };
 
   checkInputs = [

From 8b37a55c983fbebb2be4b5949a434df6b45209fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0795/2793] python: cufflinks: 0.13.0 -> 0.14.5

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

diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 885b31d716c..0f8a223cf00 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "cufflinks";
-  version = "0.13.0";
+  version = "0.14.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "59f1bae67aaa5042c8f9f94caba44b9b8e6e530ce9e81f6e06b643aca253d2f4";
+    sha256 = "304f9a30b753e36a9d398133543c9b48214fcf0535d971871894fc3058799c5f";
   };
 
   propagatedBuildInputs = [ pandas plotly colorlover ];

From 3c0306e7936f23654b31037061a46c37f343e89b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0796/2793] python: cupy: 4.4.1 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index f9f400408a7..908506bcd9c 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "4.4.1";
+  version = "5.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d46a3eea628a17b9c3f446e4b13513a1f0cc0b9930214417b41c90dcf0bb427f";
+    sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d";
   };
 
   checkInputs = [

From b5c135825e0853553588f48159daf3f10c97e378 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0797/2793] python: cx_Oracle: 6.4.1 -> 7.0.0

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

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index a4ad178cb34..cd61c8b4ac7 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
-  version = "6.4.1";
+  version = "7.0.0";
 
   buildInputs = [ odpic ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6";
+    sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828";
   };
 
   preConfigure = ''

From 7c9ca654801d472563ddac4bf488ebdabc2bb491 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0798/2793] python: cypari2: 1.3.1 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index a77e98dae4c..08209c96d4e 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "1.3.1";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
+    sha256 = "3512d8a78217dfd3ac431b470453342188f70b2053386678a1ec3c74aae7427a";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

From 496d7531697b0e06437dcf154c06c46b74b62087 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0799/2793] python: daemonize: 2.4.2 -> 2.4.7

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

diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix
index 68863c61ada..89c89bcbe7a 100644
--- a/pkgs/development/python-modules/daemonize/default.nix
+++ b/pkgs/development/python-modules/daemonize/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "daemonize";
-  version = "2.4.2";
+  version = "2.4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2";
+    sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
   };
 
   meta = with stdenv.lib; {

From 0ba38d37a87e164b9d144d1f6899daca54198fec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0800/2793] python: dask: 0.18.2 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index e1572ab5321..a300a478366 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.18.2";
+  version = "0.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc";
+    sha256 = "fe48f364ec06b5a32f23358bd17e089e42abebdd341768a13c683d539e12107a";
   };
 
   checkInputs = [ pytest ];

From 6e8d5badc5e01b0ae522c0a4e91f577702c2c162 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0801/2793] python: dask-glm: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index 13af6d9da8a..ec241fb9f6c 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -11,12 +11,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.0";
+  version = "0.2.0";
   pname = "dask-glm";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a38d17538558fe6a3457cd67eed0a90a5dff51a9eaebb496efb68fc432ed89a";
+    sha256 = "58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5";
   };
 
   checkInputs = [ pytest ];

From d91b32ff47361d2c7f3744f2456c2b03d887ef00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0802/2793] python: dask-image: 0.1.2 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index ed576bcc02b..7b12d1fcc22 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.2";
+  version = "0.2.0";
   pname = "dask-image";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "401e2c345a582eb2859a4a2a4a6fcfbc85beece59705f3ead9b6708a0cd183e7";
+    sha256 = "bece2ea347f963dc0168c7d5fdfd11e51b47d9c857d3bc56144d7c146964a23f";
   };
 
   checkInputs = [ pytest scikitimage ];

From b8a0dd42adb8ad6623e0deeb917af84e31cfbd55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0803/2793] python: dask-jobqueue: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index e6ac86660c1..94ecd10f45f 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   pname = "dask-jobqueue";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c73dae82b2a1d2a9f4ef17778f0de7a9237671a7fd3374aadd9d2bc07e92e848";
+    sha256 = "e559077fd27b68c325f06e3666e7072913f5282ad62347a233ca95ae00a4ced7";
   };
 
   checkInputs = [ pytest ];

From dd59bc5f30ca66b93eab4e0f60c8b74014c9d410 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0804/2793] python: dask-ml: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index 0f53bcc225d..48a545789db 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -19,12 +19,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.10.0";
+  version = "0.11.0";
   pname = "dask-ml";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4b6ca548c7282c1b6983e696e4bdfa0a2d7b51b168928b9322ea7a4b9a9f20f9";
+    sha256 = "a9e8e69494560dc23534adb236e88b3b21dc30a156648453c9c6e4b27ff2df96";
   };
 
   checkInputs = [ pytest xgboost tensorflow joblib distributed ];

From c1d8e21e1bc8cc6dac0fae4291b19fa9f396d858 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:56 +0100
Subject: [PATCH 0805/2793] python: python-dateutil: 2.7.3 -> 2.7.5

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

diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index ab078c656e7..fc8f5671490 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
 buildPythonPackage rec {
   pname = "python-dateutil";
-  version = "2.7.3";
+  version = "2.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
+    sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02";
   };
 
   propagatedBuildInputs = [ six setuptools_scm ];

From e684f009a992eb3926eab68a071e250e873f0919 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0806/2793] python: ddt: 1.0.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix
index 2fb9e9e990b..0399f93bab0 100644
--- a/pkgs/development/python-modules/ddt/default.nix
+++ b/pkgs/development/python-modules/ddt/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "ddt";
-  version = "1.0.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a";
+    sha256 = "898364fc34b27981b925171a0011c174c94633cb678eb1fac05fe7a234c7912c";
   };
 
   meta = with stdenv.lib; {

From 5a42cc9a8456a0b638d19982e3e57ef1133efdf9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0807/2793] python: dependency-injector: 3.13.2 -> 3.14.0

---
 .../python-modules/dependency-injector/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 05f1c965f40..7714d08fd95 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.13.2";
+  version = "3.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kgb40qspibr1x8ksv0whrr7v0jy20dnqzmc591hm2y4kwzl5hdw";
+    sha256 = "14b2e48c272b546c1a2e76943df0e8e28b5a791cdec5388bc526132b10b09d42";
   };
 
   propagatedBuildInputs = [ six ];

From fbd0c6baf7b311367e7bfa6d0c182f18b9afc102 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0808/2793] python: detox: 0.13 -> 0.15

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

diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix
index 3e2c814292b..6f7688ad35e 100644
--- a/pkgs/development/python-modules/detox/default.nix
+++ b/pkgs/development/python-modules/detox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "detox";
-  version = "0.13";
+  version = "0.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f0c2af9c29f8e200a50b561ccc531df3087c80e7d3de6cfa9828f5fea3c8f56c";
+    sha256 = "accde1a79b621df9dfd55b97460e80743a771a3d9a1acd900489a4355f0cc8c7";
   };
 
   buildInputs = [ pytest ];

From 83ca2119faa05b236d10946ab70808ff4615287b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0809/2793] python: devpi-common: 3.2.3 -> 3.3.1

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

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 4fe8756c961..185ab310510 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.2.3";
+  version = "3.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d2ecae3a92b2da62ecc6586d1c40d265e61bce70d7f1be2327e8b98598ba2687";
+    sha256 = "30833581d03e07d7574b2ff698d213c984777dd44dd47c45c54d31858c694c94";
   };
 
   propagatedBuildInputs = [ requests py ];

From ece0fe6d3d27e2509f7a5f495ae5f7c666ad00fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0810/2793] python: dftfit: 0.4.22 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix
index 01bd23c4b6f..016a3a919f1 100644
--- a/pkgs/development/python-modules/dftfit/default.nix
+++ b/pkgs/development/python-modules/dftfit/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "dftfit";
-  version = "0.4.22";
+  version = "0.5.0";
   disabled = (!isPy3k);
 
   src = fetchPypi {
      inherit pname version;
-     sha256 = "06dbdc21cf9ed199bfceae5301172bee2164a3b9ef6f0814a089530c320ebb3a";
+     sha256 = "fd9e777157669d004e7c25adce3e7c697234283384c99aa0c23454173a14a7a8";
   };
 
   buildInputs = [ pytestrunner ];

From 690e2e91e148c00edf92041e08304cbf15eef7f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0811/2793] python: django-colorful: 1.2 -> 1.3

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

diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix
index 7da878880da..84dca56b22b 100644
--- a/pkgs/development/python-modules/django_colorful/default.nix
+++ b/pkgs/development/python-modules/django_colorful/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-colorful";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y34hzvfrm1xbxrd8frybc9yzgqvz4c07frafipjikw7kfjsw8az";
+    sha256 = "fd246f2fb297ed074dc4349966d33a1c82d0308b7fb0d6ef6e2e76b90cefffb7";
   };
 
   # Tests aren't run

From fa26d8e36143d2ff6a6a4a6710ac042daff202d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0812/2793] python: django-environ: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix
index 1e5936e6089..f95babfe233 100644
--- a/pkgs/development/python-modules/django_environ/default.nix
+++ b/pkgs/development/python-modules/django_environ/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "django-environ";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ylw16v5z46ckn8ynbx2zjam6nvipl0xxcr6icrf6driv02q8bzf";
+    sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde";
   };
 
   # The testsuite fails to modify the base environment

From 2cb9a75b9259fc480db52e4795a6778b725de89e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0813/2793] python: django_evolution: 0.7.5 -> 0.7.8

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

diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix
index 92ed3d572a1..45447b70ae6 100644
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ b/pkgs/development/python-modules/django_evolution/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "django_evolution";
-  version = "0.7.5";
+  version = "0.7.8";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv";
+    sha256 = "493ff2adad760990ce8cf87c13955af85d4dcff097427bc3619ed01672fac4a8";
   };
 
   propagatedBuildInputs = [ django ];

From 5f69916e7a7b8f6ba444d973c01a61aeaa5e06bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0814/2793] python: django-modelcluster: 0.6.2 -> 4.2

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

diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 3a2aad16ba5..0b0ddf5f0f2 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "django-modelcluster";
-  version = "0.6.2";
+  version = "4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx";
+    sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8";
   };
 
   doCheck = false;

From 57b2ebb853be25c638536bdf95861b9d585eba30 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0815/2793] python: django-reversion: 1.10.1 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 038a3d439fa..0f6c942b3ac 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "1.10.1";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w";
+    sha256 = "98cb09c2227b14a0f88faaf4f747a716a5b1f183768959fe6035cbc12c3adbfe";
   };
 
   propagatedBuildInputs = [ django ];

From 6c84aae1968ab34815de4a75260dfcd0ee9845a3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0816/2793] python: django-silk: 0.5.6 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index ad8d0bee7f4..aa4e9fb778f 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "django-silk";
-  version = "0.5.6";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947";
+    sha256 = "bce0e35d2a6ec3688a0c062c6964695beef4a452be48085f2c1e25f685652d9d";
   };
 
   doCheck = false;

From aa56652a1aa48fa19d499741b77fff64f8e13d99 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0817/2793] python: django-taggit: 0.17.0 -> 0.23.0

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

diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
index 276097802e7..e1e9506635a 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "django-taggit";
-  version = "0.17.0";
+  version = "0.23.0";
   disabled = pythonOlder "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b";
+    sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce";
   };
 
   doCheck = false;

From e6f65422ffa38153dee0d25dd8aaa7ab01a7704f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:57 +0100
Subject: [PATCH 0818/2793] python: docker: 3.5.0 -> 3.5.1

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 85c2a4b0230..961b0125c1a 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.5.0";
+  version = "3.5.1";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bc693be5a84b3b9e5aaf156068c5c0a445ee5138c638c3fbc857133bf67ebe07";
+    sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e";
   };
 
   propagatedBuildInputs = [

From 9fdda8b8b1f66353309971fdecb4b1c6e2f56034 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0819/2793] python: docrep: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix
index e2bde245a67..fb2f84cbfe4 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/pkgs/development/python-modules/docrep/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "docrep";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d195b6dfcf4efe5cb65402b6c6f6d7e6db77ce255887fae32c9a8288a022659";
+    sha256 = "ec7598fc2497a50f2c6882803d78e3c3cc4f1a554645d2c43c58d53653a1be01";
   };
 
   checkInputs = [ pytest ];

From 3f53303715309c2ad11c72c0d9dc701857879bae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0820/2793] python: easydict: 1.8 -> 1.9

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

diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index aed91033e97..4179306b8d9 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "easydict";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1ec91110737a62fe28d14970ffa7a7c7b441a32e35a6f3da6a6082ffb7f9432";
+    sha256 = "3f3f0dab07c299f0f4df032db1f388d985bb57fa4c5be30acd25c5f9a516883b";
   };
 
   docheck = false; # No tests in archive

From bcb84a5df5a1758dfde6b7ad8cc832bb2bbd3fa1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0821/2793] python: ECPy: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index df843ed7c32..62111721ad1 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ECPy";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f0df66be67f3de0152dfb3c453f4247bdfa2b4e37aa75b98617a637376032229";
+    sha256 = "8889122d3a8bc1a08b4bda42c073dd22305d770b7876356de806ff91748983bd";
   };
 
   propagatedBuildInputs = lib.optional (!isPy3k) future;

From bc03862824cc606e6f3c3e76a72ac566b5c0955d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0822/2793] python: epc: 0.0.3 -> 0.0.5

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

diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix
index 621f450f2eb..fe3cc4420c4 100644
--- a/pkgs/development/python-modules/epc/default.nix
+++ b/pkgs/development/python-modules/epc/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "epc";
-  version = "0.0.3";
+  version = "0.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "30b594bd4a4acbd5bda0d3fa3d25b4e8117f2ff8f24d2d1e3e36c90374f3c55e";
+    sha256 = "a14d2ea74817955a20eb00812e3a4630a132897eb4d976420240f1152c0d7d25";
   };
 
   propagatedBuildInputs = [ sexpdata ];

From 5a634453e6598a01a139a0525c1d4cdc720c5ce1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0823/2793] python: eventlet: 0.20.0 -> 0.24.1

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

diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index afc880b2ba2..9766613b060 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.20.0";
+  version = "0.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf";
+    sha256 = "d9d31a3c8dbcedbcce5859a919956d934685b17323fc80e1077cb344a2ffa68d";
   };
 
   buildInputs = [ nose httplib2 pyopenssl ];

From 484b081796c71628a990e888e2edff41939896fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0824/2793] python: evernote: 1.25.0 -> 1.25.3

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

diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix
index 717ab77018e..189f282b02d 100644
--- a/pkgs/development/python-modules/evernote/default.nix
+++ b/pkgs/development/python-modules/evernote/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "evernote";
-  version = "1.25.0";
+  version = "1.25.3";
   disabled = ! isPy27; #some dependencies do not work with py3
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d";
+    sha256 = "796847e0b7517e729041c5187fa1665c3f6fc0491cb4d71fb95a62c4f22e64eb";
   };
 
    propagatedBuildInputs = [ oauth2 ];

From e2490a833f0ac5d8e9cf603fb39bd9b32662b2f5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0825/2793] python: execnet: 1.4.1 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 8c2ff6d82f4..f38fbf25c59 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "execnet";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
+    sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
   };
 
   buildInputs = [ pytest setuptools_scm ];

From 5b15b3499cec2d3423e9ee0428d1fa2176d57266 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0826/2793] python: factory_boy: 2.6.1 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
index 1e5da699894..1a491f2c8f0 100644
--- a/pkgs/development/python-modules/factory_boy/default.nix
+++ b/pkgs/development/python-modules/factory_boy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "factory_boy";
-  version = "2.6.1";
+  version = "2.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a21f8kq917fj8xgmyp6gy8vcrlzzgwn80qas0d76h3vjbdy0bdq";
+    sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca";
   };
 
   propagatedBuildInputs = [ fake_factory ];

From a34503b53b556384183ab3112b09d1d9bfa67075 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0827/2793] python: fake-factory: 0.6.0 -> 9999.9.9

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

diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix
index 26dd14b73ad..a3555c134fc 100644
--- a/pkgs/development/python-modules/fake_factory/default.nix
+++ b/pkgs/development/python-modules/fake_factory/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "fake-factory";
-  version = "0.6.0";
+  version = "9999.9.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09sgk0kylsshs64a1xsz3qr187sbnqrbf4z8k3dgsy32lsgyffv2";
+    sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260";
   };
 
   propagatedBuildInputs = [ six dateutil ipaddress mock ];

From 319c555b44e42762f8d1bdebe5c10988f39d2c01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0828/2793] python: Faker: 0.8.18 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 93337aa8d18..48d28dfc669 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -2,24 +2,25 @@
   # Build inputs
   dateutil, six, text-unidecode, ipaddress ? null,
   # Test inputs
-  email_validator, nose, mock, ukpostcodeparser }:
+  email_validator, mock, ukpostcodeparser, pytestrunner, pytest}:
 
 assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.8.18";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0184fa252f86214308bb6bed344f96294f2e3528fbffafc727890cf2a86d6027";
+    sha256 = "2621643b80a10b91999925cfd20f64d2b36f20bf22136bbdc749bb57d6ffe124";
   };
 
   checkInputs = [
     email_validator
-    nose
     mock
     ukpostcodeparser
+    pytestrunner
+    pytest
   ];
 
   propagatedBuildInputs = [

From 5ce9591248afd162c93dad502371eb7dbff58c12 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:58 +0100
Subject: [PATCH 0829/2793] python: falcon: 1.0.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index 1bca7eddde0..0d69a85a1e2 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "falcon";
-  version = "1.0.0";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63";
+    sha256 = "3981f609c0358a9fcdb25b0e7fab3d9e23019356fb429c635ce4133135ae1bc4";
   };
 
   checkInputs = [coverage ddt nose pyyaml requests testtools];

From 68457fff35f8a9a7c7e658d9e13f3a731521949c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0830/2793] python: Fiona: 1.7.13 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 0e6ab256d0d..f14909fcd3a 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.13";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2";
+    sha256 = "20141a9ece06daa7bb4333fba640c2fe39a49f8aca5492d1da8595d41e91844a";
   };
 
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

From 06de5e782b8ce44663545212f0072ec613574250 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0831/2793] python: flaky: 3.1.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index 192b4829a41..00f4fe8488c 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "flaky";
-  version = "3.1.0";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41";
+    sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2";
   };
 
   buildInputs = [ mock pytest ];

From 6f83e6d0b244a563a49552c1ef3484a2910ca9ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0832/2793] python: flask-restplus: 0.10.1 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index d5028bca56c..7246183bd8a 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "flask-restplus";
-  version = "0.10.1";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qs9c3fzidd0m3r8rhw0zqrlsaqr2561z45xs6kg19l7c2x6g5qj";
+    sha256 = "3fad697e1d91dfc13c078abcb86003f438a751c5a4ff41b84c9050199d2eab62";
   };
 
   checkInputs = [ nose blinker tzlocal mock rednose ];

From 16cefc09aa10cd27de18afdb02b5c67ee9d7c66f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0833/2793] python: Flask-Babel: 0.11.1 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix
index e04bae7f1c0..d3a46143e6e 100644
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/pkgs/development/python-modules/flaskbabel/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-Babel";
-  version = "0.11.1";
+  version = "0.12.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj";
+    sha256 = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86";
   };
 
   propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];

From 027a0ef2eb4e8faea26f1ea2e9dc34602b67d794 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0834/2793] python: flit: 1.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index d9a0682a02e..f0f7ee84bce 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "flit";
-  version = "1.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95b8577b2232da39ee14ae237575b7a85afeeabc1e87f4a19485fac34f85aa89";
+    sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1";
   };
 
   disabled = !isPy3k;

From 05cfc1cc1c08639f13db88d2730aa93d5064005b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0835/2793] python: flowlogs_reader: 1.0.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
index 1f2984990bb..96073556ea4 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "flowlogs_reader";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0158aki6m3pkf98hpd60088qyhrfxkmybdf8hv3qfl8nb61vaiwf";
+    sha256 = "cd6344fdad097c38756772624922ee37452ef1e131213c7d0b5702bcf52a5b02";
   };
 
   propagatedBuildInputs = [ botocore boto3 docutils ];

From 8f190bb93b57afb94e8f127c6e18b5967f4ff7ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0836/2793] python: forbiddenfruit: 0.1.0 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
index 4d2f656b36a..5686cb69921 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.0";
+  version = "0.1.2";
   pname = "forbiddenfruit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
+    sha256 = "09ee1959fa34936c15417defa28bfd09cf88ad54c15454bc863d465ed42b8922";
   };
 
   meta = with stdenv.lib; {

From 285f3363e6670d3d75fa42bdc4c5759f96752511 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0837/2793] python: freezegun: 0.3.8 -> 0.3.11

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

diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index 3be87da2f82..926ad05156a 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "freezegun";
-  version = "0.3.8";
+  version = "0.3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151";
+    sha256 = "e839b43bfbe8158b4d62bb97e6313d39f3586daf48e1314fb1083d2ef17700da";
   };
 
   propagatedBuildInputs = [ dateutil six ];

From b20e1a6741214744bc7974320b9c1abfcdecff8a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0838/2793] python: ftfy: 5.3.0 -> 5.5.0

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

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index ce847b81de6..3d9ecd6d879 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -9,7 +9,7 @@
 buildPythonPackage rec {
   pname = "ftfy";
 
-  version = "5.3.0";
+  version = "5.5.0";
   # ftfy v5 only supports python3. Since at the moment the only
   # packages that use ftfy are spacy and textacy which both support
   # python 2 and 3, they have pinned ftfy to the v4 branch.
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb";
+    sha256 = "525ea45a871f52ddb170e66b01f35f1b3022995016c81efa305e628937b85443";
   };
 
   propagatedBuildInputs = [ html5lib wcwidth ];

From 479f33b531918d596dc4d2c4dc050a2ccf1613ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0839/2793] python: funcy: 1.6 -> 1.11

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

diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix
index ab7500466e0..e01df2e8dc8 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "funcy";
-  version = "1.6";
+  version = "1.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01";
+    sha256 = "b5e399eb739afcb5a3ad38302b7817f6e7fee6f5fc79b213a5d82ea8bce0d9e6";
   };
 
   # No tests

From 6854f07834b4f59d6639a21d6c9949ec99418d9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:34:59 +0100
Subject: [PATCH 0840/2793] python: future: 0.16.0 -> 0.17.1

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

diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
index 535fe05b438..ecaa1c08b2c 100644
--- a/pkgs/development/python-modules/future/default.nix
+++ b/pkgs/development/python-modules/future/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "future";
-  version = "0.16.0";
+  version = "0.17.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
+    sha256 = "67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8";
   };
 
   doCheck = false;

From a337799ac4d97476d339b38e82233c6a2635d9c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0841/2793] python: gcovr: 2.4 -> 4.1

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

diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix
index 4812744bfa8..4788112ebef 100644
--- a/pkgs/development/python-modules/gcovr/default.nix
+++ b/pkgs/development/python-modules/gcovr/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gcovr";
-  version = "2.4";
+  version = "4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c878e03c2eff2282e64035bec0a30532b2b1173aadf08486401883b79e4dab1";
+    sha256 = "ca94c337f2d9a70db177ec4330534fad7b2b772beda625c1ec071fbcf1361e22";
   };
 
   meta = with stdenv.lib; {

From 1ca92e3ccdcfdfd95fdad6713f93b0aa15e614c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0842/2793] python: gensim: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 9a1a870dd00..5cd6ad8bf87 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -10,10 +10,10 @@
 
 buildPythonPackage rec {
   pname = "gensim";
-  version = "3.5.0";
+  version = "3.6.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "78ed9b6ac35f104542f3bee0386d71ddf9432d74c153065d2ea9f6baf10e5b49";
+    sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy ];

From a4854c52767ba64642fa3e9cbf2ddf57ee42bded Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0843/2793] python: genzshcomp: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix
index 87ca3aaeff4..6c81dc8a776 100644
--- a/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/pkgs/development/python-modules/genzshcomp/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "genzshcomp";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";
+    sha256 = "d28ae62b1b2727f32dc7606bc58201b8c12894ad3d1d4fdb40e1f951e3ae8f85";
   };
 
   buildInputs = [ setuptools ];

From 0cbf75f3e8e486172f36cae2b73bf8aa7891395a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0844/2793] python: GeoAlchemy2: 0.3.0 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index ca99f73c021..fbbcaa82dd2 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "GeoAlchemy2";
-  version = "0.3.0";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf";
+    sha256 = "7d66d01af82d22bc37d3ebb1e73713b87ac5e116b3bc82ea4ec0584bbaa89f89";
   };
 
   propagatedBuildInputs = [ sqlalchemy shapely ];

From ce0638936a73952f929016efd0a63dd4028a84f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0845/2793] python: geopy: 1.11.0 -> 1.17.0

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

diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 160a519ee10..b3767fd2dbd 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "geopy";
-  version = "1.11.0";
+  version = "1.17.0";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04j1lxcsfyv03h0n0q7p2ig7a4n13x4x20fzxn8bkazpx6lyal22";
+    sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374";
   };
 
   doCheck = false;  # too much

From 3d307881d90ab99cb866ccdecd9c0f09e29fd3b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0846/2793] python: gevent: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 50953fd7d3f..09cc5d573db 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7b413c391e8ad6607b7f7540d698a94349abd64e4935184c595f7cdcc69904c6";
+    sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c";
   };
 
   buildInputs = [ libev ];

From 8df3473b5ff80d21f3f03b9a49bf8683c7141a1b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0847/2793] python: gidgethub: 2.5.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
index 2a06ae1cb6d..721f8cb800e 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "gidgethub";
-  version = "2.5.0";
+  version = "3.0.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d37fdfd149bc0efa21d3899c737d9b5c7ff6348a9b3f03bf3aa0e9f8ca345483";
+    sha256 = "1ebe79cf80ad64cb78c880efc7f30ac664e18b80dfd18ee201bf8685cf029628";
   };
 
   buildInputs = [ setuptools pytestrunner ];

From 0ae06990fe8a3132204ce74f3273e1a2a3efe2d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0848/2793] python: gitdb2: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
index f5812c62e13..2b6a118885c 100644
--- a/pkgs/development/python-modules/gitdb2/default.nix
+++ b/pkgs/development/python-modules/gitdb2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "gitdb2";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044";
+    sha256 = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2";
   };
 
   propagatedBuildInputs = [ smmap2 ];

From 8d4176d1448df8e3b8beccf8ffdbf7cd61137317 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0849/2793] python: github3.py: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
index 8968585d9cd..23bcb2833b8 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "github3.py";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf";
+    sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af";
   };
 
   buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];

From dac054df6dafa6914b9e9b9652f92f7d1422dc98 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0850/2793] python: globus-sdk: 1.5.0 -> 1.6.1

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 789cfaaea7a..02ad8f0f6fb 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f3ee8294c11f0d1a4430ae7534236c6a6837312f1b4056adbb183a3af663d2be";
+    sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a";
   };
 
   checkPhase = ''

From c6a27827e20c822759be12ea23fbe701cc408d36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0851/2793] python: gmusicapi: 10.1.0 -> 11.0.3

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

diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix
index f96e94a34a0..8f184922cef 100644
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "gmusicapi";
-  version = "10.1.0";
+  version = "11.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0smlrafh1bjzrcjzl7im8pf8f04gcnx92lf3g5qr7yzgq8k20xa2";
+    sha256 = "6ffa3892ee39a110e48a383b2e571a72a12109bf978985020fe56e334e45c72c";
   };
 
   propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];

From 93108537a45cc40d1bdbf1dcdf0077ed048f674d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0852/2793] python: python-gnutls: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix
index 035545e0de2..61c799589a9 100644
--- a/pkgs/development/python-modules/gnutls/default.nix
+++ b/pkgs/development/python-modules/gnutls/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "python-gnutls";
-  version = "3.1.1";
+  version = "3.1.2";
 
   # https://github.com/AGProjects/python-gnutls/issues/2
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ncsz72i6vrhvxpd90y9k74qdfw3pfcj39pvn5dxp6m834ani4l8";
+    sha256 = "28748e02a8035c31826152944e41217ebcc58ab7793ae5a22850cd23d3cfbbbe";
   };
 
   propagatedBuildInputs = [ pkgs.gnutls ];

From e42495282650010acabaad76e5b7f27de4315665 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:00 +0100
Subject: [PATCH 0853/2793] python: goobook: 1.9 -> 3.1

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

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
index 91a99103af5..599132f0f2c 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "goobook";
-  version = "1.9";
+  version = "3.1";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02xmq8sjavza17av44ks510934wrshxnsm6lvhvazs45s92b671i";
+    sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
   };
 
   propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];

From 9d90279162ff1f87897aeb9c97d623f43e866c86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0854/2793] python: google-apputils: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google_apputils/default.nix
index 66bad999dfb..22d309acbcd 100644
--- a/pkgs/development/python-modules/google_apputils/default.nix
+++ b/pkgs/development/python-modules/google_apputils/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "google-apputils";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sxsm5q9vr44qzynj8l7p3l7ffb0zl1jdqhmmzmalkx941nbnj1b";
+    sha256 = "47959d0651c32102c10ad919b8a0ffe0ae85f44b8457ddcf2bdc0358fb03dc29";
   };
 
   preConfigure = ''

From f510d522bfcd60d8c57195207a03602cf85c208c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0855/2793] python: googleapis-common-protos: 1.5.3 -> 1.5.5

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

diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 28e84f4846e..51e3810cc7f 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
-  version = "1.5.3";
+  version = "1.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0";
+    sha256 = "0946967c4c29b1339bb211949e1e17dbe0ae9ff8265fafa7bf4cf2164ef5a3b1";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 7c836897dea4e69913a0b9bee82468e32e1be220 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0856/2793] python: gpsoauth: 0.2.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix
index 68dce423390..a759b5fa4d4 100644
--- a/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/pkgs/development/python-modules/gpsoauth/default.nix
@@ -16,12 +16,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.2.0";
+  version = "0.4.1";
   pname = "gpsoauth";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01zxw8rhml8xfwda7ba8983890bzwkfa55ijd6qf8qrdy6ja1ncn";
+    sha256 = "1c3f45824d45ac3d06b9d9a0c0eccafe1052505d31ac9a698aef8b00fb0dfc37";
   };
 
   propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodome requests six ];

From f9aa439aa8a0c1562c15c97b991404154df9d4af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0857/2793] python: GPy: 1.9.5 -> 1.9.6

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

diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 0b9717b3fee..cb4cdca1e47 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "GPy";
-  version = "1.9.5";
+  version = "1.9.6";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97519bea69e7d7a703d9575c31d68a7c6f974ae125ee9d4a3e1fb510eadfb97e";
+    sha256 = "f11d649b3320d4cb836d283706754953277c8696977726803ccd3ee1355a94a7";
   };
 
   # running tests produces "ImportError: cannot import name 'linalg_cython'"

From fa8e2509a2caf65f08eb70be253d296a18912636 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0858/2793] python: graphviz: 0.9 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 42a69890681..3e9ee8b17f7 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.9";
+  version = "0.10.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
+    sha256 = "d311be4fddfe832a56986ac5e1d6e8715d7fcb0208560da79d1bb0f72abef41f";
   };
 
   propagatedBuildInputs = [ pkgs.graphviz ];

From bf4cc0f6bdda49b398da1a4d74fadb1d96657dcf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0859/2793] python: green: 2.12.1 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index 81d2a7e204c..94332616b1e 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "green";
-  version = "2.12.1";
+  version = "2.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c0c163bd2ce2da1f201eb69fd92fc24aaeab884f9e5c5a8c23d507a53336fa8";
+    sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b";
   };
 
   propagatedBuildInputs = [

From 7aea1019bdaf6ddbdc34a144321bba77118af7d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0860/2793] python: gspread: 0.2.3 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 1a07e7ecfc0..c197c265230 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.2.3";
+  version = "3.0.1";
   pname = "gspread";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dba45ef9e652dcd8cf561ae65569bd6ecd18fcc77b991521490698fb2d847106";
+    sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552";
   };
 
   meta = with stdenv.lib; {

From 3adfa8725161b6c15839148e542addf987a78ba5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:01 +0100
Subject: [PATCH 0861/2793] python: histbook: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix
index 8c44bd3ebda..43a1cb2fbc2 100644
--- a/pkgs/development/python-modules/histbook/default.nix
+++ b/pkgs/development/python-modules/histbook/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "histbook";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12d5l4c5pxwac5hzcfif51j87qjljm0w9nd0c8pnhj7q2snap4x4";
+    sha256 = "864b2943005d6be0c889504c6e1090fea2036c9557837e06ca83d06590037c49";
   };
 
   propagatedBuildInputs = [ numpy pandas ];

From b791fbdcbefcab17268a979bb34597b9fd982e85 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0862/2793] python: hmmlearn: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index e0294c2afca..90111935e68 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "hmmlearn";
-  version = "0.2.0";
+  version = "0.2.1";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
-    sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+    sha256 = "d43f5b25f9019ef5d01914d0972a5fa0594e82ab75d2c6aec26d682e47bd553c";
   };
 
   propagatedBuildInputs = [ numpy ];

From 243c7fa8dd61ec0367484ceef9587968282b383e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0863/2793] python: howdoi: 1.1.13 -> 1.1.14

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

diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index dc9c79781f1..3c67bccaa7f 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "howdoi";
-  version = "1.1.13";
+  version = "1.1.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "96f5e057fd45a84379d77e46233165d95211e6b3ea869cb5c0df172aa322b566";
+    sha256 = "b85b8e551bf47ff157392660f0fc5b9eb3eacb78516a5823f7b774ec61955db5";
   };
 
   propagatedBuildInputs = [ six requests-cache pygments pyquery ];

From 1cb645e99ec3651f293d41a4ee12deef5e5e400b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0864/2793] python: hpack: 2.3.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index 5e85dd51e76..a10882417fc 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "hpack";
-  version = "2.3.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
+    sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2";
   };
 
   meta = with stdenv.lib; {

From e2947ade0c978de0e2cbc435744e01b43bdd82cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0865/2793] python: html2text: 2016.9.19 -> 2018.1.9

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

diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix
index 6840f461cc9..cac88c55794 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/pkgs/development/python-modules/html2text/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "html2text";
-  version = "2016.9.19";
+  version = "2018.1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55";
+    sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4";
   };
 
   meta = with stdenv.lib; {

From ab0dc4d10eddda664f836411e3d2368a16005e76 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0866/2793] python: httpretty: 0.8.10 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 1f135255bc0..a44b8817483 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "httpretty";
-  version = "0.8.10";
+  version = "0.9.5";
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7";
+    sha256 = "543fa2bd9c319bfa1e1de9e37d7c9c08fa926a692b65b0be5df4b2f069fd0ad7";
   };
 
   buildInputs = [ tornado requests httplib2 sure nose coverage certifi ];

From d9a598251d98a6f386d55c7b491a47d66aae8a2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0867/2793] python: hug: 2.1.2 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
index 4aeffc75823..33ef7de1b42 100644
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/pkgs/development/python-modules/hug/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "hug";
-  version = "2.1.2";
+  version = "2.4.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c";
+    sha256 = "7b633ebbed95f4c264a745cf91450007fe7004e1eaa5b02bf9b3ad28fdd62d08";
   };
 
   propagatedBuildInputs = [ falcon requests ];

From 3fcbcd897a12c8a7630981d3ce61d62ef5ad5d1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0868/2793] python: hupper: 1.3.1 -> 1.4

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

diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 5f6a4a35ce1..948c36d03c9 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "hupper";
-  version = "1.3.1";
+  version = "1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "899a1da85b71b62d903b5732703cad7454425b4ba9a6453930ad9168ec08ae0e";
+    sha256 = "f9d9ab2457fdd01ee20278d3d7dfc91c49cae329863f47571a4a2e78d90fa738";
   };
 
   checkPhase = ''

From d501bb28743375c6ff6002ac1a7e450c38c9f8d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0869/2793] python: hvac: 0.6.4 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 7bc0d9d2107..340ba83567c 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hvac";
-  version = "0.6.4";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7f23883c44458078359142608d0bc6373c4bcec107bdb609c827ee1dda61431";
+    sha256 = "4fc3ca6b463200da5186a520ba7f6ce6d2873f9df0139e326665e9ea22514db3";
   };
 
   propagatedBuildInputs = [ requests ];

From 2fcfc9b96208d22bc000adb9ca712d6a0887cd06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0870/2793] python: imagesize: 0.7.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix
index 32a8310334a..6be9f76d380 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/pkgs/development/python-modules/imagesize/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "imagesize";
-  version = "0.7.0";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv";
+    sha256 = "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5";
   };
 
   meta = with stdenv.lib; {

From d70775f338f5a51ef83deb0d698965adc6df38a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0871/2793] python: imbalanced-learn: 0.3.3 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 65afe116510..51aabdc8911 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "imbalanced-learn";
-  version = "0.3.3";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r5js9kw6rvmfvxxkfjlcxv5xn5h19qvg7d41byilxwq9kd515g4";
+    sha256 = "f830ebc2042b642648bfe48a9253b45019ab15a5d0ac0bbdd7261e304e71609d";
   };
 
   propagatedBuildInputs = [ scikitlearn ];

From 92c435918bf021a7bf2a0f13574e6d7fe13b624b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0872/2793] python: importmagic: 0.1.3 -> 0.1.7

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

diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix
index c708343818f..0aa4a295f5d 100644
--- a/pkgs/development/python-modules/importmagic/default.nix
+++ b/pkgs/development/python-modules/importmagic/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "importmagic";
-  version = "0.1.3";
+  version = "0.1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj";
+    sha256 = "3f7757a5b74c9a291e20e12023bb3bf71bc2fa3adfb15a08570648ab83eaf8d8";
   };
 
   propagatedBuildInputs = [ six ];

From ef65b5c36dc9015ee19bf0994114e38b1055d26b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:02 +0100
Subject: [PATCH 0873/2793] python: ipaddress: 1.0.18 -> 1.0.22

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

diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix
index 5052c3dc2f4..0ce2abff596 100644
--- a/pkgs/development/python-modules/ipaddress/default.nix
+++ b/pkgs/development/python-modules/ipaddress/default.nix
@@ -7,11 +7,11 @@
 
 if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
   pname = "ipaddress";
-  version = "1.0.18";
+  version = "1.0.22";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax";
+    sha256 = "b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c";
   };
 
   checkPhase = ''

From c88e33651debe20ab501d8e7a4b80501e8f418c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0874/2793] python: ipdbplugin: 1.4 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix
index 1f5435461ab..402361a6c74 100644
--- a/pkgs/development/python-modules/ipdbplugin/default.nix
+++ b/pkgs/development/python-modules/ipdbplugin/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "ipdbplugin";
-  version = "1.4";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c";
+    sha256 = "cdcd6bc1e995c3c2c4971ed95f207e680aa44980b716fa43fb675ff2dcc7894f";
   };
 
   propagatedBuildInputs = [ nose ipython ];

From bb387525892fbfd2e80a9da2d824c8e2a1b86648 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0875/2793] python: irc: 16.4 -> 17.0

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

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 2df571dde8e..99f8d19b350 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "irc";
-  version = "16.4";
+  version = "17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0l2fh2aqs54w4xihckgyz575qkd6mgzbp3zll4g0z9j6h88ghqf1";
+    sha256 = "f9c5fcb72dd230e1387fd4a0114a1935605e0f59ac09dec962313baed74e1365";
   };
 
   doCheck = false;

From bfcae90d2bbcb15ca14a773a6de3419d1c8ff9a1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0876/2793] python: isodate: 0.5.4 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix
index cc4594e9770..4422e1614fb 100644
--- a/pkgs/development/python-modules/isodate/default.nix
+++ b/pkgs/development/python-modules/isodate/default.nix
@@ -3,19 +3,19 @@
 , fetchPypi
 , isPy3k
 , python
+, six
 }:
 
 buildPythonPackage rec {
   pname = "isodate";
-  version = "0.5.4";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31";
+    sha256 = "2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8";
   };
 
-  # Judging from SyntaxError
-  doCheck = !(isPy3k);
+  propagatedBuildInputs = [ six ];
 
   checkPhase = ''
     ${python.interpreter} -m unittest discover -s src/isodate/tests

From 0230caab085353fcfd841bdf60f8ee1b993db14a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0877/2793] python: itsdangerous: 0.24 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix
index 385708f436e..4761a98dc30 100644
--- a/pkgs/development/python-modules/itsdangerous/default.nix
+++ b/pkgs/development/python-modules/itsdangerous/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "itsdangerous";
-  version = "0.24";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
+    sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
   };
 
   meta = with stdenv.lib; {

From 2449448056aa9a869b2d00a59e63f95ad5e3c711 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0878/2793] python: jaraco.collections: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index 0f2e53715cc..62f2c259140 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -3,10 +3,10 @@
 
 buildPythonPackage rec {
   pname = "jaraco.collections";
-  version = "1.5.3";
+  version = "1.6.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05cmcq5k39bx73kjr00xfm2yr0npyrv89cxdh41ni6x8pkki1jyr";
+    sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3";
   };
 
   doCheck = false;

From 9eb1931bde071b885e258e86874b59869b37cf19 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0879/2793] python: jaraco.itertools: 2.4 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index c7a66c89040..22376b7e0cf 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -3,10 +3,10 @@
 
 buildPythonPackage rec {
   pname = "jaraco.itertools";
-  version = "2.4";
+  version = "3.0.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18cwjbnnnbwld70s3r24sys3blcss84d9ha9hhxsg2d35f9vywd5";
+    sha256 = "19d8557a25c08f7a7b8f1cfa456ebfd615bafa0f045f89bbda55f99661b0626d";
   };
   doCheck = false;
   buildInputs = [ setuptools_scm ];

From 6ef2526b2b0801a1ceb043dc98a119353031f52e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0880/2793] python: jedi: 0.12.1 -> 0.13.1

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 0664a6cc294..1518bd1d902 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jedi";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b409ed0f6913a701ed474a614a3bb46e6953639033e31f769ca7581da5bd1ec1";
+    sha256 = "b7493f73a2febe0dc33d51c99b474547f7f6c0b2c8fb2b21f453eef204c12148";
   };
 
   postPatch = ''

From b101a14c0cb2b19425e92375e53d3bdb5fbfc169 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0881/2793] python: jenkins-job-builder: 2.0.0.0b2 -> 2.6.0

---
 .../python-modules/jenkins-job-builder/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index ac654498ac4..67f115a9cc7 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "2.0.0.0b2";
+  version = "2.6.0";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x";
+    sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938";
   };
 
   patchPhase = ''

From f71122374f2562caeac6aede7a5f798e2ed311fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0882/2793] python: jenkinsapi: 0.2.32 -> 0.3.6

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

diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix
index a8032070708..c45612adc0e 100644
--- a/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/pkgs/development/python-modules/jenkinsapi/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "jenkinsapi";
-  version = "0.2.32";
+  version = "0.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22";
+    sha256 = "c46d231111fd661b733d417976e30a69f4e7fe6a8499bd59b4b3ea2a2504898c";
   };
 
   propagatedBuildInputs = [ pytz requests ];

From 1c228a096954d8dbb4a1f5601798a5fdcaa9322d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0883/2793] python: jmespath: 0.9.0 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix
index c4755b45eec..85a9d19db2a 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/pkgs/development/python-modules/jmespath/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jmespath";
-  version = "0.9.0";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8";
+    sha256 = "6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64";
   };
 
   buildInputs = [ nose ];

From 2790267ce13de416826554d682e0e7ace49eb800 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0884/2793] python: jsbeautifier: 1.7.5 -> 1.8.8

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

diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index bb3e8cf17f6..fb9e859e0e8 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "jsbeautifier";
-  version = "1.7.5";
+  version = "1.8.8";
 
   propagatedBuildInputs = [ six ];
 
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473";
+    sha256 = "98a29abef991f9f8f8fa67c32ccc07bee3d95ef7c8323e3560f6a5e83db7412a";
   };
 
   meta = with lib; {

From 8b7cadbc5b33e713f3fd2cbef4cf3a7e1a4d7985 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:03 +0100
Subject: [PATCH 0885/2793] python: jsonpickle: 0.9.6 -> 1.0

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

diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index 3a0f7237730..e5956d31b61 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "0.9.6";
+  version = "1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "545b3bee0d65e1abb4baa1818edcc9ec239aa9f2ffbfde8084d71c056180054f";
+    sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397";
   };
 
   doCheck = false;

From 27f1bc9a843af5e2f95a1df8eb37bf31e586d7b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0886/2793] python: jsonrpc-async: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 5b7ce3c12bf..d4bc1dd523d 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpc-async";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "adda3ff6e122b1932b6e20cf583666ea65db4248bc19b04811a4ccc0f0b03d95";
+    sha256 = "488ab3b63a96c246f7ded14b3458eb13a36e3e16eb4319aa56806476517c7433";
   };
 
   propagatedBuildInputs = [ aiohttp jsonrpc-base ];

From 3f7f8f294e835b9afe97462be074944d9082b774 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0887/2793] python: jsonrpclib-pelix: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index bd3b6b6f769..2e3ef054598 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpclib-pelix";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl";
+    sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
   };
 
   meta = with lib; {

From 877c7236b631e6603b50352eeb1e45e0387febce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0888/2793] python: junos-eznc: 2.1.9 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index fb34f4696ee..a365f600140 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "junos-eznc";
-  version = "2.1.9";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6729c35efd764e1f22457b72898bba554986466306ad29ad2d0bb071e997093";
+    sha256 = "d97d8babf650abca25a096825aa6d88573d340481a0b0793afcdac4a7bee09d3";
   };
 
 

From 901cd9376975c6712e5dce3414945370ded2e39a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0889/2793] python: Kajiki: 0.5.5 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index 2391b334d61..e9164d8bcf6 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Kajiki";
-  version = "0.5.5";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "effcae388e25c3358eb0bbd733448509d11a1ec500e46c69241fc673021f0517";
+    sha256 = "4e7aaf838f298958cf171f220e1d0dc4220338c76c97746a46d0cc389f90b10a";
   };
 
   propagatedBuildInputs = [ Babel pytz nine ];

From 662bdfdf12b63133beb24f92cc549b7c00166132 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0890/2793] python: kaptan: 0.5.8 -> 0.5.10

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

diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix
index af24471d68d..425a3b29f13 100644
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/pkgs/development/python-modules/kaptan/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "kaptan";
-  version = "0.5.8";
+  version = "0.5.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b8r86yyvdvyxd6f10mhkl6cr2jhxm80jjqr4zch96w9hs9rh5vq";
+    sha256 = "44df200d030975650a3a832c13b48cafdeb1a237b23de181d6a2346107e39da3";
   };
 
   propagatedBuildInputs = [ pyyaml ];

From 223fda3fbdfa5cc77580127a33e327be1cc754cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0891/2793] python: keyring: 13.2.1 -> 16.0.0

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 24d1178da37..f60def7ad76 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "13.2.1";
+  version = "16.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6364bb8c233f28538df4928576f4e051229e0451651073ab20b315488da16a58";
+    sha256 = "8a9b0c2c2abc3e7326559f840e1f05e6d010ccaf397d09f450485920ba08e443";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From e91b24e64daf71fba0895218faa32dc4d5ed5f91 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0892/2793] python: kubernetes: 7.0.0 -> 8.0.0

---
 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 55d29729db8..680ff29710e 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "7.0.0";
+  version = "8.0.0";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "84dfb4319afac189e8327b71b9332b5329d2a78074f58958c5f06a870edf32ba";
+    sha256 = "54f8e7bb1dd9a55cf416dff76a63c4ae441764280942d9913f2243676f29d02c";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

From 63c82043bc619802a99e8f2bf1b6b186465495c5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0893/2793] python: lazy-object-proxy: 1.2.1 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index f72e71fd4bd..430e43a129b 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "lazy-object-proxy";
-  version = "1.2.1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3";
+    sha256 = "eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a";
   };
 
   buildInputs = [ pytest ];

From 18f158aaeb7c6651c33824a362520133f9d39082 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0894/2793] python: ldappool: 2.2.0 -> 2.3.1

---
 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 02d10b832ff..1fb69e816bb 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.2.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     pname = "ldappool";
     inherit version;
-    sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
+    sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6";
   };
 
   nativeBuildInputs = [ pbr ];

From 050c352a4846909cd773ef825f69322b611e448e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0895/2793] python: ledgerblue: 0.1.20 -> 0.1.21

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

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 52d7cba3f95..b0daaa0d110 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.20";
+  version = "0.1.21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fb7ac6389ad13d3c9baa149b527e2cb5798e749e2b6729e5fe8437092ece6164";
+    sha256 = "f4fa7d062dcc124f032238030223363c7d85812272cd30afd09d49bb6a3256dc";
   };
 
   propagatedBuildInputs = [

From 05a94cd62287a6122d3cf96c35ae9ded6c53ada4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0896/2793] python: libarchive-c: 2.7 -> 2.8

---
 .../python-modules/libarchive-c/default.nix          | 12 +++++++-----
 pkgs/top-level/python-packages.nix                   |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix
index e1beafaf10a..52cca5d36fb 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@@ -2,25 +2,27 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, pkgs
+, glibcLocales
+, libarchive
+, mock
 }:
 
 buildPythonPackage rec {
   pname = "libarchive-c";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn";
+    sha256 = "06d44d5b9520bdac93048c72b7ed66d11a6626da16d2086f9aad079674d8e061";
   };
 
-  buildInputs = [ pytest pkgs.glibcLocales ];
+  checkInputs = [ mock pytest glibcLocales ];
 
   LC_ALL="en_US.UTF-8";
 
   postPatch = ''
     substituteInPlace libarchive/ffi.py --replace \
-      "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
+      "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 
   checkPhase = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef1d1d40ad6..1f5323baa30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4446,7 +4446,9 @@ in {
 
   python-libarchive = callPackage ../development/python-modules/python-libarchive { };
 
-  libarchive-c = callPackage ../development/python-modules/libarchive-c { };
+  libarchive-c = callPackage ../development/python-modules/libarchive-c {
+    inherit (pkgs) libarchive;
+  };
 
   libasyncns = callPackage ../development/python-modules/libasyncns {
     inherit (pkgs) libasyncns pkgconfig;

From 7154595e6ccd13663e8ad784d20aa52d6c4025b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH 0897/2793] python: apache-libcloud: 1.2.1 -> 2.3.0

---
 .../python-modules/libcloud/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix
index 90688d8e4ea..52cac717780 100644
--- a/pkgs/development/python-modules/libcloud/default.nix
+++ b/pkgs/development/python-modules/libcloud/default.nix
@@ -3,23 +3,27 @@
 , fetchPypi
 , mock
 , pycrypto
+, requests
+, pytestrunner
+, pytest
+, requests-mock
 }:
 
 buildPythonPackage rec {
   pname = "apache-libcloud";
-  version = "1.2.1";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz";
+    sha256 = "0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97";
   };
 
-  buildInputs = [ mock ];
-  propagatedBuildInputs = [ pycrypto ];
+  checkInputs = [ mock pytest pytestrunner requests-mock ];
+  propagatedBuildInputs = [ pycrypto requests ];
 
   preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
 
-  # failing tests for 26 and 27
+  # requires a certificates file
   doCheck = false;
 
   meta = with stdenv.lib; {

From fbd521495a66f258f5c33c4c9dc3edd5577d906a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0898/2793] python: librosa: 0.4.3 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix
index adc740fbcf0..aca69066592 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "librosa";
-  version = "0.4.3";
+  version = "0.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247";
+    sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d";
   };
 
   propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ];

From 7a5ff990e5e75876b68c4568345f5d3f4bc5b3b9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0899/2793] python: llvmlite: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 224cea4eebd..b79527b8736 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.24.0";
+  version = "0.25.0";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "320de4c4a1c105b91629305be069d217f3a9d7fbe32cb22bcfb016361895fc07";
+    sha256 = "fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

From fde30861d95f01d1df4af5fa738f4586dedf88e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0900/2793] python: logutils: 0.3.3 -> 0.3.5

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

diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix
index d6595b19db6..ce48978d677 100644
--- a/pkgs/development/python-modules/logutils/default.nix
+++ b/pkgs/development/python-modules/logutils/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "logutils";
-  version = "0.3.3";
+  version = "0.3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173w55fg3hp5dhx7xvssmgqkcv5fjlaik11w5dah2fxygkjvhhj0";
+    sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82";
   };
 
   meta = with stdenv.lib; {

From 2776e9d0c617419c2e9c00385f53f8f9d0344cea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0901/2793] python: lsi: 0.2.2 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix
index ebf98d9e7b2..2277a2be92f 100644
--- a/pkgs/development/python-modules/lsi/default.nix
+++ b/pkgs/development/python-modules/lsi/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "lsi";
-  version = "0.2.2";
+  version = "0.4.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0429iilb06yhsmvj3xp6wyhfh1rp4ndxlhwrm80r97z0w7plrk94";
+    sha256 = "b2c4a9a276a32f914a6193509503c28b3cc84bf42d58e191214811cfe78f4736";
   };
 
   propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ];

From 5f9871236e485a38d1baeb4217298212047622b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0902/2793] python: luftdaten: 0.2.0 -> 0.3.4

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

diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index f2fb4d3614a..59abefb0538 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "luftdaten";
-  version = "0.2.0";
+  version = "0.3.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "75fb177f61904dd1a7f93c1fa6c7cd468fd4a2e04ca45a87d37c802d290d17ad";
+    sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442";
   };
 
   propagatedBuildInputs = [ aiohttp async-timeout ];

From 57aa856d25fa63239a55e4523cdb89f8f76ad012 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0903/2793] python: lz4: 0.8.2 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index adc0042a52e..9380fbe9077 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "lz4";
-  version = "0.8.2";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1irad4sq4hdr30fr53smvv3zzk4rddcf9b4jx19w8s9xsxhr1x3b";
+    sha256 = "af46e2e5c002b3fbffa2ad69289aa61e46cab1a87c1d85bda44e822a1634defa";
   };
 
   buildInputs = [ nose ];

From 9f11ee30b8bcf9b4a48c8c01674ad93c5f369b75 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0904/2793] python: M2Crypto: 0.24.0 -> 0.30.1

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

diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 87a74c79f55..02df30e99ce 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -6,12 +6,12 @@
 
 
 buildPythonPackage rec {
-  version = "0.24.0";
+  version = "0.30.1";
   pname = "M2Crypto";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s2y0pf2zg7xf4nfwrw7zhwbk615r5a7bgi5wwkwzh6jl50n99c0";
+    sha256 = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6";
   };
 
   buildInputs = [ pkgs.swig2 pkgs.openssl ];

From b974069bb39445a7a938ebde25c8a98c7e646e61 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0905/2793] python: maildir-deduplicate: 1.0.2 -> 2.1.0

---
 .../python-modules/maildir-deduplicate/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix
index a0a4e52ea27..1a16e253f29 100644
--- a/pkgs/development/python-modules/maildir-deduplicate/default.nix
+++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "maildir-deduplicate";
-  version = "1.0.2";
+  version = "2.1.0";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
+    sha256 = "263c7f2c85dafe06eaa15e8d7ab83817204f70a5f08cc25a607f3f01ed130b42";
   };
 
   propagatedBuildInputs = [ click ];

From e7b57b8e0a5f68585f0ebcacbbc15b7aed3e06de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0906/2793] python: mapsplotlib: 1.0.6 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix
index 861f3069bb0..a046cfd9610 100644
--- a/pkgs/development/python-modules/mapsplotlib/default.nix
+++ b/pkgs/development/python-modules/mapsplotlib/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "mapsplotlib";
-  version = "1.0.6";
+  version = "1.1.2";
 
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp";
+    sha256 = "99ff773a298bdf0f3185a4c7ac20677a843df818583b368925dcf766cd99f09a";
   };
 
   propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ];

From 7e5e287efbbe245327258ab24c093816bb4599e2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0907/2793] python: MarkdownSuperscript: 2.0.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix
index 9f0ce1b2153..62bf7a93098 100644
--- a/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "MarkdownSuperscript";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dsx21h9hkx098d5azpw81dcz23rrgzrwlymwv7jri348q26p748";
+    sha256 = "2c255b5959c1f5dd364ae80762bd0a568a0fcc9fd4e4a3d7e7b192e88adf8900";
   };
 
   propagatedBuildInputs = [ markdown ];

From b183c386bad6e210d1ca74aab02f03bab659f93c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:05 +0100
Subject: [PATCH 0908/2793] python: marshmallow: 2.15.6 -> 2.16.3

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

diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index cd4e86d4687..9b8f1c0e530 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  version = "2.15.6";
+  version = "2.16.3";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "485ac6ed0dff5e1af6ea1e3a54425a448968f581b065424c89a5375e4d4866fd";
+    sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2";
   };
 
   propagatedBuildInputs = [ dateutil simplejson ];

From ee55be303cffcbc74bf3bf2221d67dffa696fbb5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0909/2793] python: mistune: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index 04a0f99314b..75011a8219f 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "mistune";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619";
+    sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
   };
 
   buildInputs = [ nose ];

From 5bdd765d73df502269e8743fdd1e7e7ecb4fe00d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0910/2793] python: ModestMaps: 1.4.6 -> 1.4.7

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

diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
index f0918e4bdb6..b25e6f5644e 100644
--- a/pkgs/development/python-modules/modestmaps/default.nix
+++ b/pkgs/development/python-modules/modestmaps/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ModestMaps";
-  version = "1.4.6";
+  version = "1.4.7";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
+    sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457";
   };
 
   propagatedBuildInputs = [ pillow ];

From f1c58efdcdeb1a9dd39876005fdb18b6a5b7feac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0911/2793] python: monotonic: 1.3 -> 1.5

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

diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix
index b736301e5ef..c784730da6e 100644
--- a/pkgs/development/python-modules/monotonic/default.nix
+++ b/pkgs/development/python-modules/monotonic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "monotonic";
-  version = "1.3";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib";
+    sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0";
   };
 
   __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";

From 03887e9f2a984aacffea9ae5c865d31edb2cb754 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0912/2793] python: mox3: 0.23.0 -> 0.26.0

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

diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix
index 8701ea177b0..be6a4c7c8a5 100644
--- a/pkgs/development/python-modules/mox3/default.nix
+++ b/pkgs/development/python-modules/mox3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "mox3";
-  version = "0.23.0";
+  version = "0.26.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88";
+    sha256 = "b13c0b8459d6fb0688f9a4e70feeec43fa2cca05b727fc01156789596e083bb1";
   };
 
   patchPhase = ''

From 7eb0287cb5264cdc4d712b322dda4468788cbbd5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0913/2793] python: mpmath: 0.19 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index 50e68352e78..8280ecec4a4 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "mpmath";
-  version = "0.19";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
+    sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c";
   };
 
   # error: invalid command 'test'

From d9d09af1be1637abd0e5bf2c5d6d8ea888acfbcb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0914/2793] python: multidict: 4.3.1 -> 4.4.2

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

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index f850e58570e..fc16fa5aec3 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "4.3.1";
+  version = "4.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ba766433c30d703f6b2c17eb0b6826c6f898e5f58d89373e235f07764952314";
+    sha256 = "3c11e92c3dfc321014e22fb442bc9eb70e01af30d6ce442026b0c35723448c66";
   };
 
   checkInputs = [ pytest pytestrunner ];

From b71767195c5c44ac5012ab184f47f1e2bd99f4c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0915/2793] python: munch: 2.0.4 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix
index 490ff9033ed..f4ecc2ff306 100644
--- a/pkgs/development/python-modules/munch/default.nix
+++ b/pkgs/development/python-modules/munch/default.nix
@@ -1,17 +1,23 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, six
 }:
 
 buildPythonPackage rec {
   pname = "munch";
-  version = "2.0.4";
+  version = "2.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
+    sha256 = "6ae3d26b837feacf732fb8aa5b842130da1daf221f5af9f9d4b2a0a6414b0d51";
   };
 
+  propagatedBuildInputs = [ six ];
+
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "A dot-accessible dictionary (a la JavaScript objects)";
     license = licenses.mit;

From 0f6ebfb2873f46d4684ed35cc4f3729f5564075a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0916/2793] python: mypy-protobuf: 1.6 -> 1.7

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

diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index 37e1b88a248..1194280ef4b 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "mypy-protobuf";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bmpd82qm7rjnzc4i275lm18mmz8anhrjhwq2ci179l64hrfr0nb";
+    sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 31b27444fa4876d2a6ffd252014dcc8d70a98e5c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:06 +0100
Subject: [PATCH 0917/2793] python: natsort: 5.3.3 -> 5.4.1

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

diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 561135dda57..5c652744fa1 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "natsort";
-  version = "5.3.3";
+  version = "5.4.1";
 
   checkInputs = [
     hypothesis
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da930bfddce941526955dea8d35a44243c96adf919ceb758ba7bbd1ba5b0a39a";
+    sha256 = "ae73b005135dc152e7b282b2d4cf19380d8cab4c4026461ee9f37bf3aa12e344";
   };
 
   # testing based on project's tox.ini

From 96a2fa9eec6d1896236661e0d04ea055587af1b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0918/2793] python: nest_asyncio: 0.9.1 -> 0.9.7

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

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 7cfc42e352b..ad586d20fd6 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.1";
+  version = "0.9.7";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0844af67deda3243389d47cd8754b6775c5c828345e0277beca7bd008d273392";
+    sha256 = "309160419228c0291268164e33be2d15514c9364b95fac3c04e14fad2a1c008b";
   };
 
   meta = with stdenv.lib; {

From 74e7d410bffb40cb502d51b6411e2a490af32a85 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0919/2793] python: netifaces: 0.10.6 -> 0.10.7

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

diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix
index 8f762fb0c3d..3a33987c490 100644
--- a/pkgs/development/python-modules/netifaces/default.nix
+++ b/pkgs/development/python-modules/netifaces/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.10.6";
+  version = "0.10.7";
   pname = "netifaces";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c";
+    sha256 = "bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd";
   };
 
   meta = with stdenv.lib; {

From d51adc59ca3a88166335bf7f3cf853aaae731c72 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0920/2793] python: nine: 0.3.4 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix
index a6b163ed456..8882b6ae745 100644
--- a/pkgs/development/python-modules/nine/default.nix
+++ b/pkgs/development/python-modules/nine/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "nine";
-  version = "0.3.4";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zrsbm0hajfvklkhgysp81hy632a3bdakp31m0lcpd9xbp5265zy";
+    sha256 = "3064fbeb512e756a415606a1399f49c22de867d5ac7e2b6c91c35e757d3af42d";
   };
 
   meta = with stdenv.lib; {

From a11b94e7e486edd35268f00f96462fb6d2095da6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0921/2793] python: nipype: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 3d8258aeb7b..fba8d4d648e 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -36,11 +36,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c14856f3d4823aa5d63d0c19e8f04d70c74e156361ce607d86694046bab06806";
+    sha256 = "bfed0d6d905e5fc73d5b9513b4381b9025977e3c8544dd012d2775735456298c";
   };
 
   # see https://github.com/nipy/nipype/issues/2240

From ad7181b2712b8cf03fe0925211624b0577b771e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0922/2793] python: nose-cprof: 0.1.4 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix
index efafd6333db..c8bc7dbaf68 100644
--- a/pkgs/development/python-modules/nose-cprof/default.nix
+++ b/pkgs/development/python-modules/nose-cprof/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "nose-cprof";
-  version = "0.1.4";
+  version = "0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ayy5mbjly9aa9dkgpz0l06flspnxmnj6wxdl6zr59byrrr8fqhw";
+    sha256 = "0178834759b63dc50388444d4ff8d1ae84e1ba110bb167419afee6bf4699b119";
   };
 
   buildInputs = [ nose ];

From 967ac2df549b634eacc35bfdcbb3cef544c6ea1d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0923/2793] python: nosexcover: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix
index aa238bce79a..2fb69838879 100644
--- a/pkgs/development/python-modules/nosexcover/default.nix
+++ b/pkgs/development/python-modules/nosexcover/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "nosexcover";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8";
+    sha256 = "298c3c655da587f6cab8a666e9f4b150320032431062dea91353988d45c8b883";
   };
 
   propagatedBuildInputs = [ coverage nose ];

From 842bd6328eebb1899f2097e7c35f672cb03c5e55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0924/2793] python: numba: 0.39.0 -> 0.40.1

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 48ca5a80add..c183442e0e9 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.39.0";
+  version = "0.40.1";
   pname = "numba";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07749d1ddac8c4c0ce8b22bf3dec52ef2fd4922174c71447126807f5f8dc2bae";
+    sha256 = "52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 3469c2c658a49b571bd794e159813face9cf8a7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0925/2793] python: objgraph: 2.0.1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index 6d26d71141d..c7e924569ba 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "objgraph";
-  version = "2.0.1";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
+    sha256 = "4a0c2c6268e10a9e8176ae054ff3faac9a432087801e1f95c3ebbe52550295a0";
   };
 
   # Tests fail with PyPy.

From 0fde2cf4e140d6ca93303bb4622195176ffa94b2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0926/2793] python: ofxparse: 0.14 -> 0.19

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

diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
index 6308921aeab..fbbd3899420 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/pkgs/development/python-modules/ofxparse/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "ofxparse";
-  version = "0.14";
+  version = "0.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a";
+    sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
   };
 
   propagatedBuildInputs = [ six beautifulsoup4 ];

From 7281189ca9bed3aa1def0f824b04e945ef558b5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:07 +0100
Subject: [PATCH 0927/2793] python: ofxtools: 0.3.8 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix
index 8490aae4f5c..450391ffeeb 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/pkgs/development/python-modules/ofxtools/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "ofxtools";
-  version = "0.3.8";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35";
+    sha256 = "16a6bdacadf1fcb3265fcfbe7e36002730fc8613b9490839fc0fa2e9e97a1ed7";
   };
 
   checkPhase = ''

From 5d186a727c8b46be0468a7e6b8549612d1cc1b0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0928/2793] python: olefile: 0.45.1 -> 0.46

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

diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix
index e85ac88d0d5..ff4aba83bc8 100644
--- a/pkgs/development/python-modules/olefile/default.nix
+++ b/pkgs/development/python-modules/olefile/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "olefile";
-  version = "0.45.1";
+  version = "0.46";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2b6575f5290de8ab1086f8c5490591f7e0885af682c7c1793bdaf6e64078d385";
+    sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964";
   };
 
   meta = with stdenv.lib; {

From 4d49ec939dfddcdaabe5d2ea1100b0f452383c06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0929/2793] python: openpyxl: 2.5.8 -> 2.5.9

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

diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 034fa8e6791..9cee051cbcf 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "2.5.8";
+  version = "2.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22904d7bdfaaab33d65d50a0915a65eeb2f29c85d9ec53081563850678a29927";
+    sha256 = "022c0f3fa1e873cc0ba20651c54dd5e6276fc4ff150b4060723add4fc448645e";
   };
 
   checkInputs = [ pytest ];

From 9c4ebe7850ab72d166c330c4bbde1d6f1c7e0042 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0930/2793] python: packaging: 17.1 -> 18.0

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

diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 6c72947fff6..a5b7218d886 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "packaging";
-  version = "17.1";
+  version = "18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b";
+    sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807";
   };
 
   propagatedBuildInputs = [ pyparsing six ];

From bf81691526c18ce87846527fcfab0b80801c010f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0931/2793] python: pamqp: 1.6.1 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 89e88476e37..a6ef3b22e41 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -9,12 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.6.1";
+  version = "2.0.0";
   pname = "pamqp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
+    sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d";
   };
 
   buildInputs = [ mock nose pep8 pylint mccabe ];

From 6bbc9bc539491546c8f56227dc5b04e069bbc3b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0932/2793] python: pandocfilters: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix
index b3a815e997c..a6edb89dcab 100644
--- a/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/pkgs/development/python-modules/pandocfilters/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec{
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "pandocfilters";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd";
+    sha256 = "b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9";
   };
 
   # No tests available

From cc6bd0a722f23c6926e40734f20baf8b62cc1be3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0933/2793] python: parse: 1.8.4 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 4092f5e1c4f..8a4881b730f 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -3,11 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "parse";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939";
+    sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437";
   };
 
   checkPhase = ''

From ef2a4585d567b8e71903f9d006dd12e9fc9597f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0934/2793] python: parsedatetime: 2.3 -> 2.4

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

diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix
index 6548e39078e..32247fcc388 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/pkgs/development/python-modules/parsedatetime/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "parsedatetime";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll";
+    sha256 = "3d817c58fb9570d1eec1dd46fa9448cd644eeed4fb612684b02dfda3a79cb84b";
   };
 
   buildInputs = [ pytest pytestrunner ];

From 538e56e1186f8abe24b11aab1495804147b1ea89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0935/2793] python: parsel: 1.1.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix
index ef6c795773c..0135b98cbda 100644
--- a/pkgs/development/python-modules/parsel/default.nix
+++ b/pkgs/development/python-modules/parsel/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "parsel";
-  version = "1.1.0";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97";
+    sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8";
   };
 
   buildInputs = [ pytest pytestrunner ];

From 508424126ae0d6a1ed6baafb3a0442c8ae23228c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0936/2793] python: partd: 0.3.8 -> 0.3.9

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

diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index 1098c550839..1db458a0d0f 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "partd";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f";
+    sha256 = "1fd6d9c12f14ea180e659a9e4a686ff2816dd930e8fb0b84c0d8116a29cfe66b";
   };
 
   checkInputs = [ pytest ];

From 5c28bc43aab36d7c3061df58b79b6cdaec2cd2cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0937/2793] python: paste: 2.0.3 -> 3.0.3

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

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index e8aceae062f..b0d1492fa3d 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "paste";
-  version = "2.0.3";
+  version = "3.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
+    sha256 = "96b06ff055c4f22a4e5c164551179ed1fa8263bc3ce69b4347c617cd0fcf51f4";
   };
 
   checkInputs = [ nose ];

From cb49a8900509d9d2291f8a41f6e5ab7810d6644d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0938/2793] python: PasteScript: 1.7.5 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix
index 06e71cf790b..3507729ee94 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/pkgs/development/python-modules/pastescript/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.7.5";
+  version = "2.0.2";
   pname = "PasteScript";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2b685be69d6ac8bc0fe6f558f119660259db26a15e16a4943c515fbee8093539";
+    sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0";
   };
 
   buildInputs = [ nose ];

From 590f983ecd8570304829a510502ea807a3f477e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0939/2793] python: path.py: 11.0.1 -> 11.5.0

---
 pkgs/development/python-modules/path.py/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index ea780f964f4..f9f74858149 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -6,22 +6,29 @@
 , pytest
 , glibcLocales
 , packaging
+, isPy27
+, backports_os
+, importlib-metadata
 }:
 
 buildPythonPackage rec {
   pname = "path.py";
-  version = "11.0.1";
+  version = "11.5.0";
   name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7eb9d0ca4110d9b4d7c9baa0696d8c94f837d622409cefc5ec9e7c3d02ea11f";
+    sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb";
   };
 
   checkInputs = [ pytest pytestrunner glibcLocales packaging ];
   buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [
+    importlib-metadata
+  ] ++ lib.optional isPy27 backports_os
+  ;
 
-  LC_ALL="en_US.UTF-8";
+  LC_ALL = "en_US.UTF-8";
 
   meta = {
     description = "A module wrapper for os.path";

From 9f59c4e67d8590325ba323ee006667edceb8575c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0940/2793] python: pathos: 0.2.0 -> 0.2.2.1

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

diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 081e5bb3aa4..0756174fec6 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pathos";
-  version = "0.2.0";
+  version = "0.2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e35418af733bf434da83746d46acca94375d6e306b3df330b2a1808db026a188";
+    sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892";
   };
 
   propagatedBuildInputs = [ dill pox ppft multiprocess ];

From 2a488c44b056626ddd78f6257a20f988e5b20995 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0941/2793] python: Paver: 1.2.2 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix
index acdb68c0281..17ae2428b87 100644
--- a/pkgs/development/python-modules/paver/default.nix
+++ b/pkgs/development/python-modules/paver/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.2";
+  version = "1.3.4";
   pname   = "Paver";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy";
+    sha256 = "d3e6498881485ab750efe40c5278982a9343bc627e137b11adced627719308c7";
   };
 
   buildInputs = [ cogapp mock virtualenv ];

From 616efa4343f679bdaaa5c618a78fada55b907375 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:08 +0100
Subject: [PATCH 0942/2793] python: pbr: 4.2.0 -> 5.1.0

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

diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index e1843e4a75d..ef6a87ab736 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "4.2.0";
+  version = "5.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45";
+    sha256 = "f20ec0abbf132471b68963bb34d9c78e603a5cf9e24473f14358e66551d47475";
   };
 
   # circular dependencies with fixtures

From 1801357c34ab2b7c113eb7094c8f72ba905d9afa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0943/2793] python: pdf2image: 0.1.14 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index 07e477b11d7..1af93531daa 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pdf2image";
-  version = "0.1.14";
+  version = "1.0.0";
 
   buildInputs = [ pillow poppler_utils ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2926ebbf327e909d594619e520a1986c18d0cf60ae62acc7ebc503ccdef21f0f";
+    sha256 = "74607efb48a9e95289148d70af05a53dbef192010a44ac868437fb044842697d";
   };
 
   meta = with stdenv.lib; {

From 1c4022e183071ac8a436161da104f28f4b04eb78 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0944/2793] python: pendulum: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index e9d482e42ac..c3090f95900 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pendulum";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d07962450e808556b3e6209a5830e2bbf8c7747129580c3b5b09e641f72617ab";
+    sha256 = "cf535d36c063575d4752af36df928882b2e0e31541b4482c97d63752785f9fcb";
   };
 
   propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing;

From 263820db87c10e46a8bb5bf488cdd480005bf07d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0945/2793] python: pep8: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix
index 9e31063b461..ed885c61724 100644
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/pkgs/development/python-modules/pep8/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pep8";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
+    sha256 = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374";
   };
 
   # FAIL: test_checkers_testsuite (testsuite.test_all.Pep8TestCase)

From 29d415073b87104cd7ca863c3b7ecf1cd95709b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0946/2793] python: percol: 0.0.8 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix
index 2ecb6de2d23..9523a3e28fa 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "percol";
-  version = "0.0.8";
+  version = "0.2.1";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "169s5mhw1s60qbsd6pkf9bb2x6wfgx8hn8nw9d4qgc68qnnpp2cj";
+    sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
   };
 
   meta = with stdenv.lib; {

From 914a3c03ab76b87053f8cbf67dce02744575f74e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0947/2793] python: pex: 1.2.7 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index f7efec5c70e..00e1513c049 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "1.2.7";
+  version = "1.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q";
+    sha256 = "6143465a09ca84dc0000ffc74c6eaf8f3210e590150e115832974994479b662b";
   };
 
   prePatch = ''

From 899bcb1095f7b2a05df2920e17d7848ead8ba4a3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0948/2793] python: pg8000: 1.10.1 -> 1.12.3

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 65301a8c406..175e64b8d72 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.10.1";
+  version = "1.12.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "188658db63c2ca931ae1bf0167b34efaac0ecc743b707f0118cc4b87e90ce488";
+    sha256 = "18192d90409a3037619ef17f1924e3fd9c7169c9c1b3277cec1982116ec2b6de";
   };
 
   propagatedBuildInputs = [ pytz ];

From 1e4a6c0c0e9c3d9c9de893241c04c39ca4960ccc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0949/2793] python: pickleshare: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix
index 4ca42184765..b46207ae33d 100644
--- a/pkgs/development/python-modules/pickleshare/default.nix
+++ b/pkgs/development/python-modules/pickleshare/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.7.4";
+  version = "0.7.5";
   pname = "pickleshare";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b";
+    sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca";
   };
 
   propagatedBuildInputs = [ pathpy ]

From dab2cf2c7b455a3f33bcb8b12ac3d72a0a3ff18b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0950/2793] python: pid: 2.0.1 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index 64f4ee882ab..5998ca6bd00 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pid";
-  version = "2.0.1";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05";
+    sha256 = "d8bb2ceec21a4ae84be6e9d320db1f56934b30e676e31c6f098ca7218b3d67d4";
   };
 
   buildInputs = [ nose ];

From 9e09cf232b7de01ce9f0f32b8f5fbc04e23ba96f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0951/2793] python: pika: 0.10.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index 3cc1ba3b00f..4cd86b56c20 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "pika";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nb4h08di432lv7dy2v9kpwgk0w92f24sqc2hw2s9vwr5b8v8xvj";
+    sha256 = "306145b8683e016d81aea996bcaefee648483fc5a9eb4694bb488f54df54a751";
   };
 
   # Tests require twisted which is only availalble for python-2.x

From 2120a401c3f24538c40b720120a3209b0e40434f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0952/2793] python: pilkit: 1.1.4 -> 2.0

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

diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix
index eab44b3724a..2f4f4b264ce 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/pkgs/development/python-modules/pilkit/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pilkit";
-  version = "1.1.4";
+  version = "2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7";
+    sha256 = "ddb30c2f0198a147e56b151476c3bb9fe045fbfd5b0a0fa2a3148dba62d1559f";
   };
 
   preConfigure = ''

From f71144e5baa1309881d508adc9c3eb5274c64026 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0953/2793] python: Pillow: 5.2.0 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 22bd2fd8246..5651884928c 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "Pillow";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab";
+    sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93";
   };
 
   doCheck = !stdenv.isDarwin && !isPyPy;

From b257e96710e2de7ee8b5033137ae9618db8de4ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0954/2793] python: pillowfight: 0.2 -> 0.3

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

diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix
index e32051bc26f..879ebe252d7 100644
--- a/pkgs/development/python-modules/pillowfight/default.nix
+++ b/pkgs/development/python-modules/pillowfight/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pillowfight";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m";
+    sha256 = "913869b0563c5982bcf08cb1ea56fb0f87e3573d738e3e3692301bf45dba6252";
   };
 
   propagatedBuildInputs = [ pillow ];

From f324430cd7d9ed23bd6c0bed9b5e773b11f77f55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:09 +0100
Subject: [PATCH 0955/2793] python: pint: 0.7.2 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index 74b6dd78bb3..d6806308e55 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pint";
-  version = "0.7.2";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q";
+    sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4";
   };
 
   meta = with stdenv.lib; {

From 603b52a374be80cc928109fb3d43bf7cdb59a1a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0956/2793] python: plaid-python: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index afbb5e2b567..87c594e473d 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, requests, pytest }:
 
 buildPythonPackage rec {
-  version = "2.3.3";
+  version = "2.3.4";
   pname = "plaid-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jblc0bvzcns1dmsax6n0cvdg8867hm7snvdxa2l7v305h6gssjw";
+    sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db";
   };
 
   checkInputs = [ pytest ];

From bc8ffd769258eec3ed6ac3e6719e6a89240d2637 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0957/2793] python: plone.testing: 6.0.0 -> 7.0.0

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

diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix
index 6f18a74f073..81482414d57 100644
--- a/pkgs/development/python-modules/plone-testing/default.nix
+++ b/pkgs/development/python-modules/plone-testing/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "plone.testing";
-  version = "6.0.0";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8aa7c45237b883ea1d1c28fb465322f69310b084b9f9b6a79af64401b649dc4c";
+    sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7";
   };
 
   propagatedBuildInputs = [ setuptools zope_testing ];

From 7500e88a5055c8331ee3c4cae985ef054978bb8a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0958/2793] python: pluggy: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index 236c0213392..dd8a7fa6acb 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pluggy";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1";
+    sha256 = "447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095";
   };
 
   checkPhase = ''

From 4081147daf473b23f04f4147c3d4b824e02d2310 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0959/2793] python: posix_ipc: 1.0.0 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix
index 0114c9b66eb..c152b1537ec 100644
--- a/pkgs/development/python-modules/posix_ipc/default.nix
+++ b/pkgs/development/python-modules/posix_ipc/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "posix_ipc";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jzg66708pi5n9w07fbz6rlxx30cjds9hp2yawjjfryafh1hg4ww";
+    sha256 = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14";
   };
 
   meta = with stdenv.lib; {

From 0d40b5788ad96a50d7dcc783e86d0073d1af04b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0960/2793] python: pox: 0.2.2 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix
index 29a24343f25..ef1a18e7ab1 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/pkgs/development/python-modules/pox/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pox";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22e97ac6d2918c754e65a9581dbe02e9d00ae4a54ca48d05118f87c1ea92aa19";
+    sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea";
   };
 
   meta = with stdenv.lib; {

From 398c48c513a7dc93553b05f5076139ddfdf36841 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0961/2793] python: ppft: 1.6.4.6 -> 1.6.4.8

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

diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index 2a1dd73f96c..69c4da786fe 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "ppft";
-  version = "1.6.4.6";
+  version = "1.6.4.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f99c861822884cb00badbd5f364ee32b90a157084a6768040793988c6b92bff";
+    sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2";
   };
 
   propagatedBuildInputs = [ six ];

From 5ab476f186028493f1b4922b26d46408599eb616 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0962/2793] python: process-tests: 1.2.1 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix
index 8f8bbc59d4f..dd93ac40071 100644
--- a/pkgs/development/python-modules/process-tests/default.nix
+++ b/pkgs/development/python-modules/process-tests/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "process-tests";
-  version = "1.2.1";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "65c9d7a0260f31c15b4a22a851757e61f7072d0557db5f8a976112fbe81ff7e9";
+    sha256 = "dd731906f8fc0b803ffe2dd5c5e4b103ec24b1f962a7b835d9533d7e9b2ca36c";
   };
 
   # No tests

From 2583ea61ef1cb064eb3316ef25b046ca124c4204 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0963/2793] python: prometheus_client: 0.3.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
index 4529ad95175..d358bbec1da 100644
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "prometheus_client";
-  version = "0.3.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17bc24c09431644f7c65d7bce9f4237252308070b6395d6d8e87767afe867e24";
+    sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9";
   };
 
   doCheck = false;

From d820918b6fcda79f828cccc74cab8352cadfdb3f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0964/2793] python: psutil: 5.4.7 -> 5.4.8

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

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 6e048467313..53c534e8a4d 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.4.7";
+  version = "5.4.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b6322b167a5ba0c5463b4d30dfd379cd4ce245a1162ebf8fc7ab5c5ffae4f3b";
+    sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3";
   };
 
   # No tests in archive

From 4d7764b1a475da3fa476ec36eb1afa226c0494d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:10 +0100
Subject: [PATCH 0965/2793] python: Pweave: 0.25 -> 0.30.3

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

diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix
index 980a1df6d05..2208ec52266 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/pkgs/development/python-modules/pweave/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Pweave";
-  version = "0.25";
+  version = "0.30.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1isqjz66c7vxdaqfwpkspki9p4054dsfx7pznwz28ik634hnj3qw";
+    sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357";
   };
 
   buildInputs = [ mock pkgs.glibcLocales ];

From 37d260cb873acabcb090563023e8e7618c4bda43 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0966/2793] python: py3dns: 3.1.1a -> 3.2.0

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

diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 1e5b84aa262..7ac093cbc57 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "py3dns";
-  version = "3.1.1a";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz";
+    sha256 = "8e88c0648c4d38a880f08aeb05a6e5cb48b8ce2602d381caafc6c71698ee3c21";
   };
 
   preConfigure = ''

From 37a04c80a43f52bb8f65b478681f9096a0eb2056 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0967/2793] python: pyacoustid: 1.1.0 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix
index ba7879554a8..2b23ef7b8c7 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/pkgs/development/python-modules/pyacoustid/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyacoustid";
-  version = "1.1.0";
+  version = "1.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0117039cb116af245e6866e8e8bf3c9c8b2853ad087142bd0c2dfc0acc09d452";
+    sha256 = "efb6337a470c9301a108a539af7b775678ff67aa63944e9e04ce4216676cc777";
   };
 
   propagatedBuildInputs = [ requests audioread ];

From 62d14e3ec0508355dc31551abe70b2f48aa5a503 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0968/2793] python: pyalgotrade: 0.16 -> 0.20

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

diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix
index b9752a71f51..1d4564e9f17 100644
--- a/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/pkgs/development/python-modules/pyalgotrade/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pyalgotrade";
-  version = "0.16";
+  version = "0.20";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a253617254194b91cfebae7bfd184cb109d4e48a8c70051b9560000a2c0f94b3";
+    sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd";
   };
 
   propagatedBuildInputs = [ numpy scipy pytz ];

From b2f506fb63fb00750899ea64abb293f1d56c4b8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0969/2793] python: PyChromecast: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index d818df88822..44f6bae58cb 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "2.2.0";
+  version = "2.3.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
-    sha256 = "7c3773c0e134e762fd65a3407e680ab4c5c656fe7c5665b2f8f5ef445c7605a4";
+    sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38";
   };
 
   propagatedBuildInputs = [ requests six zeroconf protobuf ];

From 232b61331b78f1e780eb46b647149b2af28f6e41 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0970/2793] python: pycparser: 2.18 -> 2.19

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

diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index 4a0dbe878f6..4845c625652 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pycparser";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226";
+    sha256 = "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3";
   };
 
   checkPhase = ''

From 7c5aa0d9e823549d7c0c306c935373e1a6979227 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0971/2793] python: pycryptodome: 3.6.6 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 5b729182ca8..59446a4dc48 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "3.6.6";
+  version = "3.7.0";
   pname = "pycryptodome";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3cb4af317d9b84f6df50f0cfa6840ba69556af637a83fd971537823e13d601a";
+    sha256 = "4444a26fc3830c0d438bca6975ff10d1eb9c0b88f747fdc25b5ab81fb46713d7";
   };
 
   meta = {

From ee2d534639a5fc5ebcd07c0486b781bb6fd879be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0972/2793] python: pycryptodomex: 3.6.6 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
index f3f439bc4a5..27dfd64648c 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycryptodomex";
-  version = "3.6.6";
+  version = "3.7.0";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0d448484e161786922b41e112b5d7cf76ef5f0c725ea5107ef866bb14a38b12";
+    sha256 = "9f11823636128acbe4e17c35ff668f4d0a9f3133450753a0675525b6413aa1b0";
   };
 }

From 7f504d4c4b4efdccc691cfcdd79449a1a81a746f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0973/2793] python: pycryptopp:
 0.6.0.1206569328141510525648634803928199668821045408958 ->
 0.7.1.869544967005693312591928092448767568728501330214

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

diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix
index 785da4f6dc8..06045a58393 100644
--- a/pkgs/development/python-modules/pycryptopp/default.nix
+++ b/pkgs/development/python-modules/pycryptopp/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "pycryptopp";
-  version = "0.6.0.1206569328141510525648634803928199668821045408958";
+  version = "0.7.1.869544967005693312591928092448767568728501330214";
   disabled = isPy3k || isPyPy;  # see https://bitbucket.org/pypy/pypy/issue/1190/
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n90h1yg7bfvlbhnc54xb6dbqm286ykaksyg04kxlhyjgf8mhq8i";
+    sha256 = "08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f";
   };
 
   # Prefer crypto++ library from the Nix store over the one that's included

From eabb336bab95f52493329d8b0c5c2122957fee62 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0974/2793] python: pydenticon: 0.2 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix
index f217b68808c..9b650181e8c 100644
--- a/pkgs/development/python-modules/pydenticon/default.nix
+++ b/pkgs/development/python-modules/pydenticon/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pydenticon";
-  version = "0.2";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp";
+    sha256 = "2ef363cdd6f4f0193ce62257486027e36884570f6140bbde51de72df321b77f1";
   };
 
   propagatedBuildInputs = [ pillow mock ];

From 503e8dd194df0c022b3662176bf35dea8b398be5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0975/2793] python: pydot_ng: 1.0.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/pydot_ng/default.nix b/pkgs/development/python-modules/pydot_ng/default.nix
index a96c03bed4f..ba754e9959b 100644
--- a/pkgs/development/python-modules/pydot_ng/default.nix
+++ b/pkgs/development/python-modules/pydot_ng/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pydot_ng";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h8k8wlzvnb40v4js7afgfyhp3wasmb1kg4gr6z7ck63iv8fq864";
+    sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5";
   };
 
   buildInputs = [ pytest unittest2 ];

From 2d61000470cc45a7f17cbe6decd5bcd4d022b238 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0976/2793] python: pyelftools: 0.24 -> 0.25

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

diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix
index cb3e77f0e8d..1715749fa2d 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/pkgs/development/python-modules/pyelftools/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyelftools";
-  version = "0.24";
+  version = "0.25";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17259kf6hwwsmizr5myp9jv3k9g5i3dvmnl8m646pfd5hpb9gpg9";
+    sha256 = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24";
   };
 
   checkPhase = ''

From 40ad0ac36da3e4448ac93c128c9903a3683a5b2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0977/2793] python: pyenchant: 1.6.6 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix
index f775612d90f..6b49c65faae 100644
--- a/pkgs/development/python-modules/pyenchant/default.nix
+++ b/pkgs/development/python-modules/pyenchant/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyenchant";
-  version = "1.6.6";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25c9d2667d512f8fc4410465fdd2e868377ca07eb3d56e2b6e534a86281d64d3";
+    sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0";
   };
 
   propagatedBuildInputs = [ pkgs.enchant ];

From 9fdca502b3bd2eeaf082040bf1187c48bd9961c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:11 +0100
Subject: [PATCH 0978/2793] python: pygal: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index d1a25caabbe..8336640443b 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "pygal";
-  version = "2.3.1";
+  version = "2.4.0";
 
   doCheck = !isPyPy;  # one check fails with pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667";
+    sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83";
   };
 
   buildInputs = [ flask pyquery pytest ];

From 03fb64255618e1c5f85731b36d86a93ff2718185 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0979/2793] python: pyhepmc: 0.5.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
index e776749dd7e..e466f800107 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pyhepmc";
-  version = "0.5.0";
+  version = "1.0.1";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rbi8gqgclfvaibv9kzhfis11gw101x8amc93qf9y08ny4jfyr1d";
+    sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834";
   };
 
   patches = [

From 6c85ba67a244d8e46a6440516129e19f9eda26cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0980/2793] python: pyinsane2: 2.0.10 -> 2.0.13

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

diff --git a/pkgs/development/python-modules/pyinsane2/default.nix b/pkgs/development/python-modules/pyinsane2/default.nix
index cf44538b746..8f96ebe915a 100644
--- a/pkgs/development/python-modules/pyinsane2/default.nix
+++ b/pkgs/development/python-modules/pyinsane2/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyinsane2";
-  version = "2.0.10";
+  version = "2.0.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00d1wqb3w9bn1rxb2dwmdqbar2lr96izq855l5vzprc17dkgip3j";
+    sha256 = "0d519531d552e4512776225eb400a6a4a9bfc83a08918ec7fea19cb2fa7ec4ee";
   };
 
   # This is needed by setup.py regardless of whether tests are enabled.

From 33c6746006165a190df8e39c82706f50e729424c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0981/2793] python: pylama: 7.6.5 -> 7.6.6

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

diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 474728835e2..f424a89ae33 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pylama";
-  version = "7.6.5";
+  version = "7.6.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0277pr066vg1w8ip6kdava7d5daiv7csixpysb37ss140k222iiv";
+    sha256 = "f81bf3bbd15db802b620903df491e5cd6469dcd542424ce6718425037dcc4d10";
   };
 
   propagatedBuildInputs = [

From a561f2b6451bff23a6ca46d574a0a0d45281c1b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0982/2793] python: pymatgen: 2018.9.30 -> 2018.10.18

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

diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 1365cc4aeb6..8e64d5cb11d 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymatgen";
-  version = "2018.9.30";
+  version = "2018.10.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08c8da84beec153c0ad7acc47e67245e2d6598169e9803b82bd53131a67293be";
+    sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9";
   };
 
   nativeBuildInputs = [ glibcLocales ];

From 6ac9c5b125a1a0acf6fe481212b5d7a864fdc527 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0983/2793] python: pymongo: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 9c8bf84e7c5..392a0ec580f 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "3.7.1";
+  version = "3.7.2";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f14fb6c4058772a0d74d82874d3b89d7264d89b4ed7fa0413ea0ef8112b268b9";
+    sha256 = "8c74e2a9b594f7962c62cef7680a4cb92a96b4e6e3c2f970790da67cc0213a7e";
   };
 
   doCheck = false;

From 5dbc1d75bf7dcf6e269537f32e5580237997139f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0984/2793] python: pync: 1.4 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix
index ad02b3f2f2f..24d285423f1 100644
--- a/pkgs/development/python-modules/pync/default.nix
+++ b/pkgs/development/python-modules/pync/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version  = "1.4";
+  version  = "2.0.3";
   pname = "pync";
   disabled = ! isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lc1x0pai85avm1r452xnvxc12wijnhz87xv20yp3is9fs6rnkrh";
+    sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f";
   };
 
   buildInputs = [ pkgs.coreutils ];

From 36d9b6d2de71a5fdc95e6a339e0a1c9bedf9fdce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0985/2793] python: pynisher: 0.4.2 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix
index f389bee2158..5f877fd90d2 100644
--- a/pkgs/development/python-modules/pynisher/default.nix
+++ b/pkgs/development/python-modules/pynisher/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pynisher";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sqa3zzqcr4vl5yhnafw1y187z62m4alajggc7dm2riw2ihd9kxl";
+    sha256 = "1b1079315ad1009de108c9ad701f6ae5274264e64503fc22c2de366d99953f34";
   };
 
   propagatedBuildInputs = [ psutil docutils ];

From bd582bf66feb033166d46ef9e059ac4ea9e4ad02 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0986/2793] python: pyobjc: 4.2.2 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix
index ad1f656eb14..96a546e694c 100644
--- a/pkgs/development/python-modules/pyobjc/default.nix
+++ b/pkgs/development/python-modules/pyobjc/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pyobjc";
-  version = "4.2.2";
+  version = "5.1.1";
 
   # Gives "No matching distribution found for
   # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "24be63e394e8e66c1131e2b8e67e44f6c28ceb4329af01e9c10824044be8adbc";
+    sha256 = "2b094596e8bd36be1f63c8c0501dc4ac7899299224111a5877648774a92eec45";
   };
 
   meta = {

From 4caa94ca072b53ef5447d76e69ca6d2c2cca7aee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0987/2793] python: pyopencl: 2018.1.1 -> 2018.2.1

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

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index d90ff458107..5416e379562 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2018.1.1";
+  version = "2018.2.1";
 
   checkInputs = [ pytest ];
   buildInputs = [ opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "29683b47ec729c77a1be4d6fae2bd3718ca4cfcbe14655261a3a14d5bf55530a";
+    sha256 = "5ed40baccb493e8e9ac394f15c64871954d234fd6d9250c50bee1466d8bd8e48";
   };
 
   # py.test is not needed during runtime, so remove it from `install_requires`

From 21cc8938d44dea26f9a6a64db2d276672e64d270 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0988/2793] python: pyparsing: 2.2.2 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 5861288926f..df94117bfe5 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
     pname = "pyparsing";
-    version = "2.2.2";
+    version = "2.3.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "bc6c7146b91af3f567cf6daeaec360bc07d45ffec4cf5353f4d7a208ce7ca30a";
+      sha256 = "f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592";
     };
 
     # Not everything necessary to run the tests is included in the distribution

From b7fe55f77af81cae5e0a58deabf1af42f8f76ffe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0989/2793] python: pyperclip: 1.6.5 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 76260331521..9709aea1d18 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "1.6.5";
+  version = "1.7.0";
   pname = "pyperclip";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "406bc020d4b8e60d8673876271b815befc4c02fd8d919e4aacc667d69fab99ea";
+    sha256 = "979325468ccf682104d5dcaf753f869868100631301d3e72f47babdea5700d1c";
   };
 
   doCheck = false;

From caa9018846045cfacc5682216e0d2c374e1505c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0990/2793] python: pyqtgraph: 0.9.10 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 5eb24f830c7..a2c4a9491b6 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyqtgraph";
-  version = "0.9.10";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "188pcxf3sxxjf0aipjn820lx2rf9f42zzp0sibmcl90955a3ipf1";
+    sha256 = "4c08ab34881fae5ecf9ddfe6c1220b9e41e6d3eb1579a7d8ef501abb8e509251";
   };
 
   propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ];

From f23c770864dc4222c0639da6ef848615e88c0960 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0991/2793] python: pyramid: 1.9.1 -> 1.10

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

diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index 060b6b77f87..8826ae02ba9 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -21,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid";
-  version = "1.9.1";
+  version = "1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4";
+    sha256 = "3f91bcb8ee8ad3168eaf836d701b7b8c59481cec9ca085ab0251d1b953ffc46a";
   };
 
   checkInputs = [ docutils virtualenv webtest zope_component ];

From 5d726b9cabc08a40239400662015d00f2f532567 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:12 +0100
Subject: [PATCH 0992/2793] python: pyramid_exclog: 0.7 -> 1.0

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

diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix
index dfdea42b02c..ac85da4af75 100644
--- a/pkgs/development/python-modules/pyramid_exclog/default.nix
+++ b/pkgs/development/python-modules/pyramid_exclog/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid_exclog";
-  version = "0.7";
+  version = "1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a58c82866c3e1a350684e6b83b440d5dc5e92ca5d23794b56d53aac06fb65a2c";
+    sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b";
   };
 
   propagatedBuildInputs = [ pyramid ];

From 33347b3a1b03c3fcac9e1d7c2340d9f19d5fb92c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0993/2793] python: pyramid_jinja2: 2.5 -> 2.7

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

diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix
index d211b9daf33..626142ee2f2 100644
--- a/pkgs/development/python-modules/pyramid_jinja2/default.nix
+++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid_jinja2";
-  version = "2.5";
+  version = "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93c86e3103b454301f4d66640191aba047f2ab85ba75647aa18667b7448396bd";
+    sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb";
   };
 
   buildInputs = [ webtest ];

From f684d1b54d21d6a6857344ddf124c4ffc6b90ac3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0994/2793] python: pyramid_mako: 0.3.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix
index 2752ba7641e..b4064e9f0f7 100644
--- a/pkgs/development/python-modules/pyramid_mako/default.nix
+++ b/pkgs/development/python-modules/pyramid_mako/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid_mako";
-  version = "0.3.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00811djmsc4rz20kpy2paam05fbx6dmrv2i5jf90f6xp6zw4isy6";
+    sha256 = "6da0987b9874cf53e72139624665a73965bbd7fbde504d1753e4231ce916f3a1";
   };
 
   buildInputs = [ webtest ];

From 4235eb71818aa6b0fe0635bfcde5b3f3269fc0cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0995/2793] python: pyrsistent: 0.11.12 -> 0.14.5

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 376b306cbb2..787d2a13f7a 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.11.12";
+  version = "0.14.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5";
+    sha256 = "f64dd1b706c31f7aa24495a7da58c0407c072981289b675331e2a16364355102";
   };
 
   propagatedBuildInputs = [ six ];

From 971bc19bd0fd532072e9493a7fc968f8fad367ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0996/2793] python: pysmi: 0.0.7 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix
index 0471e948f2f..329daf693b0 100644
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/pkgs/development/python-modules/pysmi/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.0.7";
+  version = "0.3.2";
   pname = "pysmi";
 
  src = fetchPypi {
     inherit pname version;
-    sha256 = "05h1lv2a687b9qjc399w6728ildx7majbn338a0c4k3gw6wnv7wr";
+    sha256 = "309039ab9bd458cc721692ffff10b4ad2c4a8e731e6507c34866ca2727323353";
   };
 
   propagatedBuildInputs = [ ply ];

From b73ea04d276e6f9587a99af9b5c2dab7e75e6301 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0997/2793] python: pysnmp: 4.3.2 -> 4.4.6

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

diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index 22fdf17b3b6..d2a47cfbca4 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.3.2";
+  version = "4.4.6";
   pname = "pysnmp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xw925f3p02vdpb3f0ls60qj59w44aiyfs3s0nhdr9vsy4fxhavw";
+    sha256 = "e34ffa0dce5f69adabd478ff76c3e1b08e32ebb0767df8b178d0704f4a1ac406";
   };
 
   # NameError: name 'mibBuilder' is not defined

From 287a2f9aa22c7ac2fb058f0bfa8784da93e144f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0998/2793] python: pysocks: 1.6.6 -> 1.6.8

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

diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix
index 83437cd1201..f6705f8a1c6 100644
--- a/pkgs/development/python-modules/pysocks/default.nix
+++ b/pkgs/development/python-modules/pysocks/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pysocks";
-  version = "1.6.6";
+  version = "1.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h9zwr8z9j6l313ns335irjrkk6qnk4qzvwmjqygrp7mbwi9lh82";
+    sha256 = "3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672";
   };
 
   doCheck = false;

From 7ca716440f5bc930420385c279a9d6e8cd126c29 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 0999/2793] python: pysolr: 3.7.0 -> 3.8.1

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

diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix
index 9e5097bafad..65d25f298dd 100644
--- a/pkgs/development/python-modules/pysolr/default.nix
+++ b/pkgs/development/python-modules/pysolr/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pysolr";
-  version = "3.7.0";
+  version = "3.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2c5f920d1cabaff8b465447ee152c6985f120b5895f091cf7bf15ff71ade1dc";
+    sha256 = "88ecb176627db6bcf9aeb94a3570bfa0363cb68be4b2a6d89a957d4a87c0a81b";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 74ebe1c221b342aa2f20896852306457e743d108 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 1000/2793] python: pytaglib: 1.4.3 -> 1.4.4

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

diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index 6674a89180a..4b88a651210 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname   = "pytaglib";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44ab26dc4b33962b8db0bb8856e7b166539c0c555bc933a6bbbc96f4ec51c7a2";
+    sha256 = "c3458e64cea61a7d4189f26c601e7bfd82053f3c02c2247cb8c430847927ef18";
   };
 
   buildInputs = [ taglib cython ];

From 2a6eb497e613cb81cea798a7a10d713c69b0e3af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 1001/2793] python: pytest-ansible: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 09d8aa40e19..acdd0e36cdb 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.1";
+  version = "2.0.2";
   pname = "pytest-ansible";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "553f2bc9e64f8c871ad29b7d5c100f6e549fe85db26bd1ff5dda8b769bb38a3e";
+    sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f";
   };
 
   patchPhase = ''

From 45dd6264bb6a7c3ec7100887a683e41993a41201 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 1002/2793] python: pytest-cov: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index 915884b5dd4..9e7ffc3644d 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-cov";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d";
+    sha256 = "e360f048b7dae3f2f2a9a4d067b2dd6b6a015d384d1577c994a43f3f7cbad762";
   };
 
   buildInputs = [ pytest pytest_xdist virtualenv process-tests ];

From 1f52266d1da5327ecfe4497c039a460b6c58c919 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 1003/2793] python: pytest-rerunfailures: 4.1 -> 4.2

---
 .../python-modules/pytest-rerunfailures/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index d71cc420d59..756bd19933d 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be6bf93ed618c8899aeb6721c24f8009c769879a3b4931e05650f3c173ec17c5";
+    sha256 = "97216f8a549f74da3cc786236d9093fbd43150a6fbe533ba622cb311f7431774";
   };
 
   checkInputs = [ mock ];

From 11f503740815ddea2fd4209d9c0e5fbe312c3815 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:13 +0100
Subject: [PATCH 1004/2793] python: pytest-xdist: 1.23.2 -> 1.24.0

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 71d4df4a0c5..d592411aa78 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.23.2";
+  version = "1.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ef0d05c905cfa0c5442c90e9e350e65c6ada120e33a00a066ca51c89f5f869a";
+    sha256 = "8e188d13ce6614c7a678179a76f46231199ffdfe6163de031c17e62ffa256917";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 13fde449bc2f614bd8090c1d139e56c5a0407361 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1005/2793] python: python-etcd: 0.4.3 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix
index d1780fc782b..1369479ac4f 100644
--- a/pkgs/development/python-modules/python-etcd/default.nix
+++ b/pkgs/development/python-modules/python-etcd/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "python-etcd";
-  version = "0.4.3";
+  version = "0.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf53262b3890d185fe637eed15fe39c8d7a8261864ddcd7037b22c961456d7fc";
+    sha256 = "f1b5ebb825a3e8190494f5ce1509fde9069f2754838ed90402a8c11e1f52b8cb";
   };
 
   buildInputs = [ nose mock pyopenssl ];

From b4588c6a0f2aba6da8cf52c2aef52a4fda6bdb89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1006/2793] python: python-jenkins: 0.4.14 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix
index 8509caa2794..cdce1b33718 100644
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "python-jenkins";
-  version = "0.4.14";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n8ikvd9jf4dlki7nqlwjlsn8wpsx4x7wg4h3d6bkvyvhwwf8yqf";
+    sha256 = "b44b3c8e0dabed371a1a8a301cc8833c635625faf003fd68c176800c71a6597c";
   };
 
   patchPhase = ''

From a5c9dc5115cc5fda07f9da75a55bfbb1f49a4cb2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1007/2793] python: python2-pythondialog: 3.3.0 -> 3.4.0

---
 .../python-modules/python2-pythondialog/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix
index 33e63460d87..144887c75b3 100644
--- a/pkgs/development/python-modules/python2-pythondialog/default.nix
+++ b/pkgs/development/python-modules/python2-pythondialog/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "python2-pythondialog";
-  version = "3.3.0";
+  version = "3.4.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry";
+    sha256 = "a96d9cea9a371b5002b5575d1ec351233112519268d382ba6f3582323b3d1335";
   };
 
   patchPhase = ''

From 70f30cfceb4c2e483428ed95a95fd2a3f50cdb8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1008/2793] python: python-keyczar: 0.71c -> 0.716

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

diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix
index b2cbe101f3d..da4f3ed529e 100644
--- a/pkgs/development/python-modules/python_keyczar/default.nix
+++ b/pkgs/development/python-modules/python_keyczar/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "python-keyczar";
-  version = "0.71c";
+  version = "0.716";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p";
+    sha256 = "f9b614112dc8248af3d03b989da4aeca70e747d32fe7e6fce9512945365e3f83";
   };
 
   buildInputs = [ pyasn1 pycrypto ];

From 823a1e1b1e73dd1d19db8b92ae02c63b42627e55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1009/2793] python: python-mimeparse: 0.1.4 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix
index 755a73d2909..90da2f256d4 100644
--- a/pkgs/development/python-modules/python_mimeparse/default.nix
+++ b/pkgs/development/python-modules/python_mimeparse/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "python-mimeparse";
-  version = "0.1.4";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w";
+    sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78";
   };
 
   # error: invalid command 'test'

From 695dea3679fe0089f9fb6e9f927d50833547f88b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1010/2793] python: python_openzwave: 0.4.10 -> 0.4.11

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

diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
index a7973501bf7..04348ed2ecb 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python_openzwave";
-  version = "0.4.10";
+  version = "0.4.11";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4bde7afd6c97637b59ee37a1c432c285daf179e535eb9a0d5dd95a65600b0cc8";
+    sha256 = "2464c364929acaee5da39eda60976a3efa40bb1f7a5d9362531d53cfa5c3bd09";
     extension = "zip";
   };
 

From a6a7aefdf98dbc7792209734f61c379a3f91a32c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1011/2793] python: python-statsd: 1.6.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix
index 744894212c7..d6b262d9aa3 100644
--- a/pkgs/development/python-modules/python_statsd/default.nix
+++ b/pkgs/development/python-modules/python_statsd/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "python-statsd";
-  version = "1.6.0";
+  version = "2.1.0";
   disabled = isPy3k;  # next release will be py3k compatible
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3d2fc153e0d894aa9983531ef47d20d75bd4ee9fd0e46a9d82f452dde58a0a71";
+    sha256 = "d2c573d325d0f015b4d79f0d0f8c88dd8413d7b9ef890c09076a9b6089ab301c";
   };
 
   buildInputs = [ mock nose coverage ];

From 8808746b2096c19a1b534904488123f701b9884d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1012/2793] python: pytz: 2018.5 -> 2018.7

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

diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index 7eb9ada5cae..408c64190bb 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytz";
-  version = "2018.5";
+  version = "2018.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277";
+    sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca";
   };
 
   checkPhase = ''

From fe8040b5d7426cd15b006ebda7fba447093e5768 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1013/2793] python: pytzdata: 2018.5 -> 2018.7

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

diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix
index 091b42115bf..d1328fca004 100644
--- a/pkgs/development/python-modules/pytzdata/default.nix
+++ b/pkgs/development/python-modules/pytzdata/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytzdata";
-  version = "2018.5";
+  version = "2018.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e4ef42e82b0b493c5849eed98b5ab49d6767caf982127e9a33167f1153b36cc5";
+    sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2";
   };
 
   # No tests

From b0a20270546fc97853ca51c35154cd3253e651df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1014/2793] python: pyunifi: 2.14 -> 2.15

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

diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix
index e0bc32746e3..4169c2a22f9 100644
--- a/pkgs/development/python-modules/pyunifi/default.nix
+++ b/pkgs/development/python-modules/pyunifi/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pyunifi";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9439ffc992ce381a39d64b5e3f4460e53872faa9cca60dcf5cee94fc0eba7fca";
+    sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf";
   };
 
   propagatedBuildInputs = [ requests ];

From fe7a179a583072b24444ce600a6b8d028929e4f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1015/2793] python: pyutil: 2.0.0 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index 8f875acac1b..6b458904e32 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "pyutil";
-  version = "2.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fsg9yz5mi2sb0h6c1vvcqchx56i89nbvdb5gfgv1ia3b2w5ra8c";
+    sha256 = "8e254aa0a3b59e90515f7bca7ebc467b20a8d3fd2e26b63d196655c075da8d38";
   };
 
   buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []);

From 7df88a4a29e7a05f9ad7028ac49540c818faae64 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1016/2793] python: PyWavelets: 0.5.2 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index c072b661cc4..b085a3db3b9 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "PyWavelets";
-  version = "0.5.2";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9";
+    sha256 = "3c5cece36d4e17d395be6e9ac6b80ce7b774a1f71c251756c6163e63b6d878dc";
   };
 
   checkInputs = [ nose pytest ];

From 73f47958ac09e71ebd68f603e524a3081931fa24 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1017/2793] python: pyxdg: 0.25 -> 0.26

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

diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix
index 31b2ff4e988..2f2b6e9b543 100644
--- a/pkgs/development/python-modules/pyxdg/default.nix
+++ b/pkgs/development/python-modules/pyxdg/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pyxdg";
-  version = "0.25";
+  version = "0.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d";
+    sha256 = "fe2928d3f532ed32b39c32a482b54136fe766d19936afc96c8f00645f9da1a06";
   };
 
   # error: invalid command 'test'

From dfb1d404c7484c041150e5fcf881d1a77b1e8a4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:14 +0100
Subject: [PATCH 1018/2793] python: qrcode: 5.3 -> 6.0

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

diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index 173f3f579b1..ca751e4ce78 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "qrcode";
-  version = "5.3";
+  version = "6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1";
+    sha256 = "037b0db4c93f44586e37f84c3da3f763874fcac85b2974a69a98e399ac78e1bf";
   };
 
   propagatedBuildInputs = [ six pillow pymaging_png ];

From f367e0c3455b022ccd4c231f87e11f7569a6ff02 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1019/2793] python: queuelib: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix
index e80235bcdad..dbcdd4c5924 100644
--- a/pkgs/development/python-modules/queuelib/default.nix
+++ b/pkgs/development/python-modules/queuelib/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "queuelib";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914";
+    sha256 = "42b413295551bdc24ed9376c1a2cd7d0b1b0fa4746b77b27ca2b797a276a1a17";
   };
 
   buildInputs = [ pytest ];

From c42c3079b6fb8960bea2eb8c6d9e2e8eedb26ed2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1020/2793] python: rabbitpy: 0.26.2 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix
index b9ec712759b..9e6b9dc0d67 100644
--- a/pkgs/development/python-modules/rabbitpy/default.nix
+++ b/pkgs/development/python-modules/rabbitpy/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.26.2";
+  version = "1.0.0";
   pname = "rabbitpy";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pgijv7mgxc4sm7p9s716dhl600l8isisxzyg4hz7ng1sk09p1w3";
+    sha256 = "54d33746d0c6a686417cd354346803945df0740b39fb92842d259387100db126";
   };
 
   buildInputs = [ mock nose ];

From cbd8bbc28ef38528bd9b81fb3f88686d761b4c07 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1021/2793] python: rainbowstream: 1.3.7 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix
index 53c0c148eea..ca6e4614f33 100644
--- a/pkgs/development/python-modules/rainbowstream/default.nix
+++ b/pkgs/development/python-modules/rainbowstream/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "rainbowstream";
-  version = "1.3.7";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zpi1x3b535pwx8rkq57nnrb5d5ma65vvlalar9vi6ilp124x1w2";
+    sha256 = "16881d8bb15416389eeaf4ceee7a588069060c216b55e7602dbcff5134feb7cc";
   };
 
   patches = [ ./image.patch ];

From 0117cfa727e4fc3dc0bb5f73eba32817c4c565d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1022/2793] python: readme: 0.6.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix
index 4bc7e1cc233..90522c34196 100644
--- a/pkgs/development/python-modules/readme/default.nix
+++ b/pkgs/development/python-modules/readme/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "readme";
-  version = "0.6.0";
+  version = "0.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08j2w67nilczn1i5r7h22vag9673i6vnfhyq2rv27r1bdmi5a30m";
+    sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231";
   };
 
   buildInputs = [ pytest ];

From 761eff933b7a40e671e28e20255dd7a078a93fa6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1023/2793] python: regex: 2018.08.29 -> 2018.11.03

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

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 57d8ca4a263..c54f310d0ca 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2018.08.29";
+  version = "2018.11.03";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b73cea07117dca888b0c3671770b501bef19aac9c45c8ffdb5bea2cca2377b0a";
+    sha256 = "4a8a645072ff7acc96b1a92c76863e324089cd3fd00bc3e41add4a7016c06761";
   };
 
   postCheck = ''

From 0080cac6e79446895ce81b8b996d27c7052bdc4d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1024/2793] python: repeated_test: 0.1a3 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix
index 5722a858fae..c5c2e43b657 100644
--- a/pkgs/development/python-modules/repeated_test/default.nix
+++ b/pkgs/development/python-modules/repeated_test/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "repeated_test";
-  version = "0.1a3";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg";
+    sha256 = "65107444a4945668ab7be6d1a3e1814cee9b2cfc577e7c70381700b11b809d27";
   };
 
   buildInputs = [ unittest2 ];

From 0f16020ba9705b6e87785c25609b87e8b0d26234 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1025/2793] python: repoze.lru: 0.6 -> 0.7

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

diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix
index c08120d2412..f0c3aefc394 100644
--- a/pkgs/development/python-modules/repoze_lru/default.nix
+++ b/pkgs/development/python-modules/repoze_lru/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "repoze.lru";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31";
+    sha256 = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77";
   };
 
   meta = with stdenv.lib; {

From fd2c7e200da0f5edb75a9e5e73de5232b865e9f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1026/2793] python: repoze.sphinx.autointerface: 0.7.1 -> 0.8

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

diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
index 96a893edd7c..9e144340fb3 100644
--- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
+++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "repoze.sphinx.autointerface";
-  version = "0.7.1";
+  version = "0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504";
+    sha256 = "8ef0383276ab722efb1e4a6523726262058dfd82615ccf7e5004aee3fe8ecc23";
   };
 
   propagatedBuildInputs = [ zope_interface sphinx ];

From 5a36e81620b4e09e7d87796f7f8f436778a4e35b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1027/2793] python: repoze.who: 2.2 -> 2.3

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

diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix
index 227fbdeca65..20001ff7ef8 100644
--- a/pkgs/development/python-modules/repoze_who/default.nix
+++ b/pkgs/development/python-modules/repoze_who/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "repoze.who";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12wsviar45nwn35w2y4i8b929dq2219vmwz8013wx7bpgkn2j9ij";
+    sha256 = "b95dadc1242acc55950115a629cfb1352669774b46d22def51400ca683efea28";
   };
 
   propagatedBuildInputs = [ zope_interface webob ];

From f43b64cf57eafb662648a724c8a7ec941240684a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1028/2793] python: requests: 2.19.1 -> 2.20.0

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

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 9894c4319c5..43cd7296d00 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.19.1";
+  version = "2.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
+    sha256 = "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c";
   };
 
   nativeBuildInputs = [ pytest ];

From cef45506dc0a91e2cc5c4645cf6c97a92fcf7ce8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1029/2793] python: resampy: 0.1.4 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index 8e69b423c9b..4f9c4410765 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "resampy";
-  version = "0.1.4";
+  version = "0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf4f149d8699af70a1b4b0769fa16fab21835d936ea7ff25e98446aa49e743d4";
+    sha256 = "7f6912ca2b746eb9bcdc05c52fcef088f0b7ba1ca6ee0b2d0a359d18fc57f8f8";
   };
 
   checkInputs = [ pytest pytestcov ];

From 6fdbd54d0d36c7e4d388e406b633c5d7a9ece5b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1030/2793] python: responses: 0.9.0 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 662045a9ce1..140ab8ac163 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "responses";
-  version = "0.9.0";
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6082710f4abfb60793899ca5f21e7ceb25aabf321560cc0726f8b59006811c9";
+    sha256 = "682fafb124e799eeee67ec15c9678d955a88affda5613b09788ef80c03987cf0";
   };
 
   propagatedBuildInputs = [ cookies mock requests six ];

From 33cd6dd7c48afaa6afa9fdc1370cb3a984e885c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:15 +0100
Subject: [PATCH 1031/2793] python: retry_decorator: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix
index 15ab826b0a6..496705acbc4 100644
--- a/pkgs/development/python-modules/retry_decorator/default.nix
+++ b/pkgs/development/python-modules/retry_decorator/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "retry_decorator";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "086zahyb6yn7ggpc58909c5r5h3jz321i1694l1c28bbpaxnlk88";
+    sha256 = "b7723b83730a09a5a884f2d1c422c9556d20324b7a0f5b129ad94fd07baba36d";
   };
 
   meta = with stdenv.lib; {

From 2c31d8a9bcda503ef12521085c13af94b3290b27 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1032/2793] python: robotframework-requests: 0.4.6 -> 0.5.0

---
 .../python-modules/robotframework-requests/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix
index eeaf74fb8f9..7233a82a395 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.6";
+  version = "0.5.0";
   pname = "robotframework-requests";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0416rxg7g0pfg77akljnkass0xz0id26v4saag2q2h1fgwrm7n4q";
+    sha256 = "1c253b8061c8a91251abf3ebadc33152b8621671621405dd343efd17bdc9e620";
   };
 
   buildInputs = [ unittest2 ];

From ac5eaa5d0a7b010bf0bc73610e782057dd1af0e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1033/2793] python: robotframework-selenium2library: 1.6.0 ->
 3.0.0

---
 .../robotframework-selenium2library/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 15fd977936b..5b91129d39c 100644
--- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.6.0";
+  version = "3.0.0";
   pname = "robotframework-selenium2library";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1asdwrpb4s7q08bx641yrh3yicgba14n3hxmsqs58mqf86ignwly";
+    sha256 = "2a8e942b0788b16ded253039008b34d2b46199283461b294f0f41a579c70fda7";
   };
 
   # error: invalid command 'test'

From d1f1ee0d13035920342903a442868dc0ae927fd7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1034/2793] python: ropper: 1.11.6 -> 1.11.8

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

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 82b809a1e91..95f948dde4b 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonApplication rec {
   pname = "ropper";
-  version = "1.11.6";
+  version = "1.11.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "33777d0c3ddd9ca7bc48f53dbe2c4a222a567f1125c43b1c34fb1b360d0b19dc";
+    sha256 = "f2ba5ff34ebc5faaa87d34b58178706a13a08e848126197c0fdb0af7822f93a2";
   };
   # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
   # workaround: sudo chmod 777 /dev/shm

From 3cd367f5390c069d3af76718087bffeef274e85f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1035/2793] python: rpdb: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix
index 182709b525a..8b22ef967d5 100644
--- a/pkgs/development/python-modules/rpdb/default.nix
+++ b/pkgs/development/python-modules/rpdb/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "rpdb";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rql1hq3lziwcql0h3dy05w074cn866p397ng9bv6qbz85ifw1bk";
+    sha256 = "5d1a1cee34378ab075879dc30fa6328d448a9f680a66c4e84cac7382ad92f15f";
   };
 
   meta = with stdenv.lib; {

From 3bee9b1aee56f0a21551d3f5830eae571d6da484 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1036/2793] python: rpyc: 3.3.0 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index 42176b134ec..ab7ac8ac923 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "rpyc";
-  version = "3.3.0";
+  version = "4.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b";
+    sha256 = "a0d87cbad152f25e3702a03cb7fd67f6b10c87680a60ec3aea8dca5a56307c10";
   };
 
   propagatedBuildInputs = [ nose plumbum ];

From fc05f8f955002060f08d46af2d7a116097d2e30c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1037/2793] python: rsa: 3.4.2 -> 4.0

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

diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix
index 82eedf70cb0..c062aad4c4b 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/pkgs/development/python-modules/rsa/default.nix
@@ -3,18 +3,19 @@
 , fetchPypi
 , unittest2
 , pyasn1
+, mock
 }:
 
 buildPythonPackage rec {
   pname = "rsa";
-  version = "3.4.2";
+  version = "4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5";
+    sha256 = "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487";
   };
 
-  nativeBuildInputs = [ unittest2 ];
+  checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
   meta = with stdenv.lib; {

From 1229be51c4fa6b519012134486da806ffd05e7ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1038/2793] python: ruamel.ordereddict: 0.4.9 -> 0.4.13

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

diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index fa7bd815b68..7dec5bb54ca 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ruamel.ordereddict";
-  version = "0.4.9";
+  version = "0.4.13";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h";
+    sha256 = "bf0a198c8ce5d973c24e5dba12d3abc254996788ca6ad8448eabc6aa710db149";
   };
 
   meta = with stdenv.lib; {

From 2da03a2ccfc01fe670a61c12aa83e2076ed7140a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1039/2793] python: setuptools: 40.4.3 -> 40.5.0

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

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index ac3d0e47395..50b39c78526 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "40.4.3";
+  version = "40.5.0";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "acbc5740dd63f243f46c2b4b8e2c7fd92259c2ddb55a4115b16418a2ed371b15";
+    sha256 = "2a2a200f4a760adbded23a091a00be2eca4e28efed65c6120ea275f7e89a1eab";
   };
 
   nativeBuildInputs = [ unzip wrapPython ];

From b4c7effa963a6da7e2c341536b0d89d4c0d4c789 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1040/2793] python: setuptools-git: 1.1 -> 1.2

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

diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix
index c68ba10a320..862a7bc2778 100644
--- a/pkgs/development/python-modules/setuptools-git/default.nix
+++ b/pkgs/development/python-modules/setuptools-git/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "setuptools-git";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831";
+    sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445";
   };
 
   propagatedBuildInputs = [ pkgs.git ];

From 40b46fb6d59a5e55043dbbbf2039308214c4cec4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1041/2793] python: sexpdata: 0.0.2 -> 0.0.3

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

diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix
index 97bb5b35b19..1e282f9660a 100644
--- a/pkgs/development/python-modules/sexpdata/default.nix
+++ b/pkgs/development/python-modules/sexpdata/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "sexpdata";
-  version = "0.0.2";
+  version = "0.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb696bc66b35def5fb356de09481447dff4e9a3ed926823134e1d0f35eade428";
+    sha256 = "1ac827a616c5e87ebb60fd6686fb86f8a166938c645f4089d92de3ffbdd494e0";
   };
 
   doCheck = false;

From 6b4e407c4ec902e872685978195bca84b59914de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1042/2793] python: shortuuid: 0.4.3 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix
index 43cf9806ba6..ac2fef9f2df 100644
--- a/pkgs/development/python-modules/shortuuid/default.nix
+++ b/pkgs/development/python-modules/shortuuid/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "shortuuid";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293";
+    sha256 = "d08fd398f40f8baf87e15eef8355e92fa541bca4eb8465fefab7ee22f92711b9";
   };
 
   buildInputs = [pep8];

From 37a6707332c9cd509aefda7e0ca6a223e196fc3c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:16 +0100
Subject: [PATCH 1043/2793] python: sigtools: 1.1a3 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix
index 88bddacbe05..92a39e26da0 100644
--- a/pkgs/development/python-modules/sigtools/default.nix
+++ b/pkgs/development/python-modules/sigtools/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "sigtools";
-  version = "1.1a3";
+  version = "2.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w";
+    sha256 = "1b890f22ece64bc47d3d4e84c950581e83917794a6cf1548698145590e221aff";
   };
 
   buildInputs = [ repeated_test sphinx mock coverage unittest2 ];

From 42a89ba18204c87fb90acd8d09c2f10c8479f4e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1044/2793] python: simpleai: 0.7.11 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix
index 3d4bdf3968f..230ac17fa0a 100644
--- a/pkgs/development/python-modules/simpleai/default.nix
+++ b/pkgs/development/python-modules/simpleai/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-   version = "0.7.11";
+   version = "0.8.2";
    pname = "simpleai";
    disabled = isPy3k;
 
    src = fetchPypi {
      inherit pname version;
-     sha256 = "03frjc5jxsz9xm24jz7qa4hcp0dicgazrxkdsa2rsnir672lwkwz";
+     sha256 = "2927d460b09ff6dd177999c2f48f3275c84c956efe5b41b567b5316e2259d21e";
    };
 
    propagatedBuildInputs = [ numpy ];

From 6ce9ff9fea7243cff498f3e7f8046901e07e4e9b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1045/2793] python: simpleparse: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix
index 025331a49e9..f1d6874dfbd 100644
--- a/pkgs/development/python-modules/simpleparse/default.nix
+++ b/pkgs/development/python-modules/simpleparse/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.1";
+  version = "2.2.0";
   pname = "simpleparse";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg";
+    sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d";
   };
 
   doCheck = false;  # weird error

From 9c6f5df84834094d6a00a154632e420842399360 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1046/2793] python: slixmpp: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index 88c43bce297..7d6d786e6d2 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "slixmpp";
-  version = "1.4.0";
+  version = "1.4.1";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2";
+    sha256 = "020acd4507fd00c38835b78b5f338db60d3df840187623e0d41ab2ca89d7ae57";
   };
 
   patchPhase = ''

From 1faf0127f39a5d3fadb38c9264eedcd1fab4a050 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1047/2793] python: smartdc: 0.1.12 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix
index e22c99651e6..50667ce9398 100644
--- a/pkgs/development/python-modules/smartdc/default.nix
+++ b/pkgs/development/python-modules/smartdc/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "smartdc";
-  version = "0.1.12";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36206f4fddecae080c66faf756712537e650936b879abb23a8c428731d2415fe";
+    sha256 = "6ffd866fb98386324e189e24d4f7532f66c1b20eece35ca1a6cb4b2a2639fc85";
   };
 
   propagatedBuildInputs = [ requests http_signature ];

From 449151374dd60ca26b9c6386e3d770d53fbc1b8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1048/2793] python: smmap2: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix
index 08264e92e5f..cf0b76d1a87 100644
--- a/pkgs/development/python-modules/smmap2/default.nix
+++ b/pkgs/development/python-modules/smmap2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "smmap2";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6";
+    sha256 = "29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a";
   };
 
   checkInputs = [ nosexcover ];

From 95fc0ae50adda5803da2036b39e24aa206a97075 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1049/2793] python: sockjs-tornado: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix
index 32ac94da761..10722e8af06 100644
--- a/pkgs/development/python-modules/sockjs-tornado/default.nix
+++ b/pkgs/development/python-modules/sockjs-tornado/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sockjs-tornado";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c4bcf33c8a238bbab37d01da769bcf89e74ef6019bfa76ddbcb4d682d47187e";
+    sha256 = "ec12b0c37723b0aac56610fb9b6aa68390720d0c9c2a10461df030c3a1d9af95";
   };
 
   propagatedBuildInputs = [ tornado ];

From f1cb91f59b5d3c2472458defb753759b5becd18d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1050/2793] python: sopel: 6.3.1 -> 6.5.3

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

diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 1103e0fa3d3..92ace6f2bb3 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "sopel";
-  version = "6.3.1";
+  version = "6.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1swvw7xw8n5anb8ah8jilk4vk1y30y62fkibfd9vm9fbk45d1q48";
+    sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99";
   };
 
   buildInputs = [ pytest ];

From e68d7e58d981e9b05e75ce2c4d5ed5e0d91e54e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1051/2793] python: sorl-thumbnail: 11.12 -> 12.5.0

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

diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix
index a580f80f281..bcbb43fd6c8 100644
--- a/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "sorl-thumbnail";
-  version = "11.12";
+  version = "12.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4";
+    sha256 = "8dfe5fda91a5047d1d35a0b9effe7b000764a01d648e15ca076f44e9c34b6dbd";
   };
 
   # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.

From dbd586c957983cff4fffa7c8d9c06ad0768fc8cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1052/2793] python: SPARQLWrapper: 1.7.6 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix
index 44f16fbdfc6..d61c51f26c7 100644
--- a/pkgs/development/python-modules/sparqlwrapper/default.nix
+++ b/pkgs/development/python-modules/sparqlwrapper/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "SPARQLWrapper";
-  version = "1.7.6";
+  version = "1.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1y12hpsfjd779yi29bhvl6g4vszadjvd8jw38z5rg77b034vxjnw";
+    sha256 = "7f4c8d38ea1bfcffbc358c9a05de35a3fd7152cc3e8ea57963ee7a0a242f7a5e";
   };
 
   # break circular dependency loop

From 254907fb27731fea4acf9c5eb73d1b5e4931fe86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1053/2793] python: sphinx_rtd_theme: 0.2.5b2 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index 69845d10c35..0a6040bc592 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "sphinx_rtd_theme";
-  version = "0.2.5b2";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0grf16fi4g0p3dfh11b1624ic34iqkjhf5i1g6hvsh4nlm0ll00q";
+    sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09";
   };
 
   meta = with stdenv.lib; {

From 55a5d15ddbd14f034dcd30c21ad2e10e67b73b40 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1054/2793] python: sphinxcontrib-openapi: 0.3.0 -> 0.3.2

---
 .../python-modules/sphinxcontrib-openapi/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index a800694ad94..4843a5bbe9d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-openapi";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6";
+    sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b";
   };
 
   propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];

From 1632c47c27fddb553433ef1d12a54dbb393a84cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1055/2793] python: sphinxcontrib-spelling: 2.2.0 -> 4.2.0

---
 .../python-modules/sphinxcontrib-spelling/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index 4d9a4b2ba94..a67787f6933 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-spelling";
-  version = "2.2.0";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z";
+    sha256 = "44a9445b237ade895ae1fccbe6f41422489b1ffb2a026c1b78b0c1c1c229f9bf";
   };
 
   propagatedBuildInputs = [ sphinx pyenchant pbr ];

From 00089a8d26395eec1c0056c97103d1419617d2ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1056/2793] python: sphinxcontrib-httpdomain: 1.5.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
index 8416e9b3d8d..5173c54be34 100644
--- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-httpdomain";
-  version = "1.5.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a";
+    sha256 = "ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335";
   };
 
   propagatedBuildInputs = [ sphinx ];

From fb119cd8698d11e0ac6a85a6db8d762b97716000 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:17 +0100
Subject: [PATCH 1057/2793] python: sphinxcontrib-plantuml: 0.7 -> 0.12

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

diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index 3b9119d6651..530bc53a280 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-plantuml";
-  version = "0.7";
+  version = "0.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv";
+    sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5";
   };
 
   # No tests included.

From 16e92a66740f96cbe26eb6bdc54dc4744c1677b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1058/2793] python: sqlmap: 1.2.10 -> 1.2.11

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

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 2aeaa068a43..086fce2aac8 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.2.10";
+  version = "1.2.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e64efce7f3b50cab02c8da968e00c1b456f59aff193d3dae2446d7c117723d53";
+    sha256 = "8715529e823c6f4ed701d71f1daf8525583ed04b44e8c89d6781475c856eb2ba";
   };
 
   # No tests in archive

From b78fc48d6de942cbc5c8b4ec3646519e32a78476 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1059/2793] python: SQLObject: 3.3.0 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 7a3551e88a0..2eccc5e013f 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "SQLObject";
-  version = "3.3.0";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0p2dxrxh7xrv5yys09v5z95d0z40w22aq3xc01ghdidd7hr79xy9";
+    sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93";
   };
 
   checkInputs = [ pytest ];

From 0a799a133614548e90935bf90e977301786ed9c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1060/2793] python: sqlparse: 0.2.2 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix
index 934bf79de5d..506e9b9340b 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/pkgs/development/python-modules/sqlparse/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlparse";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08dszglfhf1c4rwqinkbp4x55v0b90rgm1fxc1l4dy965imjjinl";
+    sha256 = "ce028444cfab83be538752a2ffdb56bc417b7784ff35bb9a3062413717807dec";
   };
 
   buildInputs = [ pytest ];

From ce51974ed82abdd10adee6aaaf60e9a15d88f9e8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1061/2793] python: subprocess32: 3.5.2 -> 3.5.3

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

diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix
index c6fe0975c3a..ccb73550a3f 100644
--- a/pkgs/development/python-modules/subprocess32/default.nix
+++ b/pkgs/development/python-modules/subprocess32/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "subprocess32";
-  version = "3.5.2";
+  version = "3.5.3";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb2b989cf03ffc7166339eb34f1aa26c5ace255243337b1e22dab7caa1166687";
+    sha256 = "6bc82992316eef3ccff319b5033809801c0c3372709c5f6985299c88ac7225c3";
   };
 
   buildInputs = [ bash ];

From 8600798172e6a4c526d593ec8da48ce28cf0d15c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1062/2793] python: taskw: 1.0.3 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix
index b2cc48b3079..328eb158eef 100644
--- a/pkgs/development/python-modules/taskw/default.nix
+++ b/pkgs/development/python-modules/taskw/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.3";
+  version = "1.2.0";
   pname = "taskw";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n";
+    sha256 = "fadd8afc12df026c3c2d39b633c55d3337f7dca95602fce2239455a048bc85fe";
   };
 
   patches = [ ./use-template-for-taskwarrior-install-path.patch ];

From 21361c6cc2dc7f667fa261ae5c27ef9f52129fa9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1063/2793] python: tempora: 1.13 -> 1.14

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

diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 1aabffc05d5..6ffe5a73eb4 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "tempora";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4848df474c9d7ad9515fbeaadc88e48843176b4b90393652156ccff613bcaeb1";
+    sha256 = "4951da790bd369f718dbe2287adbdc289dc2575a09278e77fad6131bcfe93097";
   };
 
   doCheck = false;

From 5c26185bd447832bb1d9da462ab979d8e60440d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1064/2793] python: testpath: 0.3 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix
index cda5abda529..8bdd50f52d2 100644
--- a/pkgs/development/python-modules/testpath/default.nix
+++ b/pkgs/development/python-modules/testpath/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "testpath";
-  version = "0.3";
+  version = "0.4.2";
   format = "wheel";
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e";
+    sha256 = "46c89ebb683f473ffe2aab0ed9f12581d4d078308a3cb3765d79c6b2317b0109";
   };
 
   meta = with stdenv.lib; {

From c8c57fe207f9618fa025a9f00418c2271f759fae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:18 +0100
Subject: [PATCH 1065/2793] python: testscenarios: 0.4 -> 0.5.0

---
 .../python-modules/testscenarios/default.nix           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix
index 61e2ce5a81e..6fddc17af32 100644
--- a/pkgs/development/python-modules/testscenarios/default.nix
+++ b/pkgs/development/python-modules/testscenarios/default.nix
@@ -6,13 +6,19 @@
 
 buildPythonPackage rec {
   pname = "testscenarios";
-  version = "0.4";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg";
+    sha256 = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "buffer = 1" "" \
+      --replace "catch = 1" ""
+  '';
+
   propagatedBuildInputs = [ testtools ];
 
   meta = with stdenv.lib; {

From 8312ef82f6595a86b7da799ba79dfbe69c03f5fe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1066/2793] python: thrift: 0.9.3 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix
index 932c642e9b1..6897a5bbba8 100644
--- a/pkgs/development/python-modules/thrift/default.nix
+++ b/pkgs/development/python-modules/thrift/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "thrift";
-  version = "0.9.3";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e";
+    sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b";
   };
 
   # No tests. Breaks when not disabling.

From 3dc225ffa4364c5d7c5999becf05569883b39abf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1067/2793] python: thumbor-pexif: 0.14 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix
index c3aa0136f33..2a1240526ab 100644
--- a/pkgs/development/python-modules/thumborpexif/default.nix
+++ b/pkgs/development/python-modules/thumborpexif/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "thumbor-pexif";
-  version = "0.14";
+  version = "0.14.1";
   disabled = ! isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "715cd24760c7c28d6270c79c9e29b55b8d952a24e0e56833d827c2c62451bc3c";
+    sha256 = "96dcc03ea6066d9546baf54f6841f4048b0b24a291eed65d098b3348c8872d99";
   };
 
   meta = with stdenv.lib; {

From c4cf045c5c1b2daa44dfb0958a166c3062d831d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1068/2793] python: tifffile: 0.15.1 -> 2018.10.18

---
 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 3910ddf0725..5ac2b038941 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "0.15.1";
+  version = "2018.10.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
+    sha256 = "9ca8ee9a54d10d2b38ec262cc65abb687f38c34aa9cda23bb22077cd48a9b1ff";
   };
 
   checkInputs = [ nose ];

From c91bc807150e3fe1c37342f1445ee81f3d13f50f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1069/2793] python: tilestache: 1.50.1 -> 1.51.13

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

diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
index 0b919cb9c6d..097a7368c83 100644
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ b/pkgs/development/python-modules/tilestache/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "tilestache";
-  version = "1.50.1";
+  version = "1.51.13";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj";
+    sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27";
   };
 
   propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];

From a14b488836b705dd671a09fed0873dfeee653708 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1070/2793] python: tlslite: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix
index 75d622ef34f..fb1cdd0a471 100644
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ b/pkgs/development/python-modules/tlslite/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "tlslite";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r";
+    sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d";
   };
 
   meta = with stdenv.lib; {

From bb38682fe596395afc93a2f33cc0fb88f14af7d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1071/2793] python: toposort: 1.1 -> 1.5

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

diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix
index 67b946b352f..3fcb118ac2a 100644
--- a/pkgs/development/python-modules/toposort/default.nix
+++ b/pkgs/development/python-modules/toposort/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "toposort";
-  version = "1.1";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1izmirbwmd9xrk7rq83p486cvnsslfa5ljvl7rijj1r64zkcnf3a";
+    sha256 = "dba5ae845296e3bf37b042c640870ffebcdeb8cd4df45adaa01d8c5476c557dd";
   };
 
   meta = with stdenv.lib; {

From abcac8ab0cb2aff81eeaad73c9618f303ab94564 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1072/2793] python: tox: 3.2.1 -> 3.5.3

---
 pkgs/development/python-modules/tox/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 1cb9770367a..3e67e73ac56 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -7,20 +7,22 @@
 , six
 , virtualenv
 , setuptools_scm
+, toml
+, filelock
 }:
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "3.2.1";
+  version = "3.5.3";
 
   buildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ packaging pluggy py six virtualenv ];
+  propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
 
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb61aa5bcce65325538686f09848f04ef679b5cd9b83cc491272099b28739600";
+    sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862";
   };
 
   meta = with lib; {

From 11314100fc1bc7b8d50d831dc0d08b5cd8028cfe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1073/2793] python: tqdm: 4.25.0 -> 4.28.1

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

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 5b65e156a42..a38dd3ed88e 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.25.0";
+  version = "4.28.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a3364bd83ce4777320b862e3c8a93d7da91e20a95f06ef79bed7dd71c654cafa";
+    sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

From 39ed5966d425341cb7319162efc5aa576d74b1d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1074/2793] python: transitions: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index e72f0084658..059289ec421 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "155de243bd935959ae66cdab5c4c1a92f2bbf48555c6f994365935a0a9fffc1b";
+    sha256 = "afe0f498cf1f3f3b0fc13562011b8895a172df8f891dbb5118923d46e78a96d7";
   };
 
   postPatch = ''

From d9b6c9a64eb416be4f94272dc2c2ad214e722d0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1075/2793] python: trezor_agent: 0.9.0 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix
index baca97be877..6d0835b431c 100644
--- a/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/pkgs/development/python-modules/trezor_agent/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec{
   pname = "trezor_agent";
-  version = "0.9.0";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz";
+    sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580";
   };
 
   propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ];

From 18af9f576e844df8c17c61a8a30b8bc905144d17 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1076/2793] python: tvdb_api: 1.10 -> 2.0

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

diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix
index 758c699d446..245556d91f6 100644
--- a/pkgs/development/python-modules/tvdb_api/default.nix
+++ b/pkgs/development/python-modules/tvdb_api/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "tvdb_api";
-  version = "1.10";
+  version = "2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih";
+    sha256 = "b1de28a5100121d91b1f6a8ec7e86f2c4bdf48fb22fab3c6fe21e7fb7346bf8f";
   };
 
   propagatedBuildInputs = [ requests-cache ];

From 6132557b26fd78c8ee0646d7f783070b6f498a06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:19 +0100
Subject: [PATCH 1077/2793] python: tvnamer: 2.4 -> 2.5

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

diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix
index 172c4423920..bc2f8807eaa 100644
--- a/pkgs/development/python-modules/tvnamer/default.nix
+++ b/pkgs/development/python-modules/tvnamer/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "tvnamer";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav";
+    sha256 = "75e38454757c77060ad3782bd071682d6d316de86f9aec1c2042d236f93aec7b";
   };
 
   buildInputs = [ pytest ];

From 113ca85683252c43937055936ed973f012ed9c40 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1078/2793] python: Twiggy: 0.4.5 -> 0.4.7

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

diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix
index 550ec327990..9a87c684f1b 100644
--- a/pkgs/development/python-modules/twiggy/default.nix
+++ b/pkgs/development/python-modules/twiggy/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Twiggy";
-  version = "0.4.5";
+  version = "0.4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23";
+    sha256 = "44d8aa51110efaab0712b5ec2b015149ad4f28e28f729004aac45d0ad8e19be0";
   };
 
   doCheck = false;

From 0c7eec26c6d70f48d0d918c86e51b71750bf952c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1079/2793] python: Twisted: 18.7.0 -> 18.9.0

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 49e936c1cc1..10b25460cef 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -15,12 +15,12 @@
 }:
 buildPythonPackage rec {
   pname = "Twisted";
-  version = "18.7.0";
+  version = "18.9.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "tar.bz2";
-    sha256 = "95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4";
+    sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395";
   };
 
   propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ];

From 1f24472fdde74e52838313e76d1f9bac396d66f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1080/2793] python: twitter: 1.15.0 -> 1.18.0

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

diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix
index d8f863cab8b..2e8481198a4 100644
--- a/pkgs/development/python-modules/twitter/default.nix
+++ b/pkgs/development/python-modules/twitter/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "twitter";
-  version = "1.15.0";
+  version = "1.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c";
+    sha256 = "acdc85e5beea752967bb64c63bde8b915c49a31a01db1b2fecccf9f2c1d5c44d";
   };
 
   doCheck = false;

From d6b4fb57ffd12d123e6a904f560e12540455db42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1081/2793] python: txrequests: 0.9.2 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix
index c1d98738b56..ee7d09d5165 100644
--- a/pkgs/development/python-modules/txrequests/default.nix
+++ b/pkgs/development/python-modules/txrequests/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "txrequests";
-  version = "0.9.2";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw";
+    sha256 = "b452a1cafa4d005678f6fa47922a330feb4907d5b4732d1841ca98e89f1362e1";
   };
 
   propagatedBuildInputs = [ twisted requests cryptography ];

From 9fe1bf15644cdfd802e8b4a944fd9cce3f817108 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1082/2793] python: uritemplate.py: 3.0.0 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/uritemplate_py/default.nix b/pkgs/development/python-modules/uritemplate_py/default.nix
index 2fd76926d2d..6aff82c5711 100644
--- a/pkgs/development/python-modules/uritemplate_py/default.nix
+++ b/pkgs/development/python-modules/uritemplate_py/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "uritemplate.py";
-  version = "3.0.0";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k5zvc5fyyrgv33mi3p86a9jn5n0pqffs9cviz92fw6q1kf7zvmr";
+    sha256 = "e0cdeb0f55ec18e1580974e8017cd188549aacc2aba664ae756adb390b9d45b4";
   };
 
   meta = with stdenv.lib; {

From 27c864f9c81be4fc36088f1ad8a4fbe1951453a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1083/2793] python: urllib3: 1.23 -> 1.24.1

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

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index a575a86d1f6..af0066ddc74 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "urllib3";
-  version = "1.23";
+  version = "1.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf";
+    sha256 = "de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22";
   };
 
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [

From d5f51c9bb57c4329c549d43b06bad06c14c82532 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1084/2793] python: vidstab: 0.1.5 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix
index 8697d5dc442..34e8a1bd1c3 100644
--- a/pkgs/development/python-modules/vidstab/default.nix
+++ b/pkgs/development/python-modules/vidstab/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.5";
+  version = "1.0.0";
   pname = "vidstab";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b775652cc4f41812de04bc443ad522c1bdaef456a00c74857e9ebc5d2066e362";
+    sha256 = "fa7aa196ae40074cc2887f26472d1526d670715ab2dbbc032ca1fb1c68688392";
   };
 
   checkInputs = [ pytest ];

From 53e4029d44f8762799028f52629d3ce516f63db9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1085/2793] python: virtualenv: 16.0.0 -> 16.1.0

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

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 75557cf895a..5a39407ed2f 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "16.0.0";
+  version = "16.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752";
+    sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208";
   };
 
   # Doubt this is needed - FRidh 2017-07-07

From af0f5a064027fab31a5979304318144af060e3a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1086/2793] python: virtualenvwrapper: 4.3 -> 4.8.2

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

diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 4bf1778b9d5..64c1912af7a 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenvwrapper";
-  version = "4.3";
+  version = "4.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f";
+    sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374";
   };
 
   # pip depend on $HOME setting

From bee3aacc61e6f0d86138e44da1f15de643ce9482 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1087/2793] python: vmprof: 0.3.3 -> 0.4.12

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

diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix
index 9a9693d770e..a889613140d 100644
--- a/pkgs/development/python-modules/vmprof/default.nix
+++ b/pkgs/development/python-modules/vmprof/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.3";
+  version = "0.4.12";
   pname = "vmprof";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "991bc2f1dc824c63e9b399f9e8606deded92a52378d0e449f258807d7556b039";
+    sha256 = "d6fa566512de1e17c9b585feae6e6997119e0d43c41c8461a9a2e8a8276618a4";
   };
 
   propagatedBuildInputs = [ requests six];

From ec098ba416f1b6b412b04cafcc490ab35e89a2ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:20 +0100
Subject: [PATCH 1088/2793] python: w3lib: 1.17.0 -> 1.19.0

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

diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 3b18b488719..839a4738f9f 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "w3lib";
-  version = "1.17.0";
+  version = "1.19.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq";
+    sha256 = "55994787e93b411c2d659068b51b9998d9d0c05e0df188e6daf8f45836e1ea38";
   };
 
   buildInputs = [ six pytest ];

From 6bc84be65aec1f4b79abb4fcde492fea0e9b2a05 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1089/2793] python: waitress: 1.0.2 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix
index 2c1536a7d8a..a377abc160e 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/pkgs/development/python-modules/waitress/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "waitress";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pw6yyxi348r2xpq3ykqnf7gwi881azv2422d2ixb0xi5jws2ky7";
+    sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9";
   };
 
   doCheck = false;

From 0455009d232ea143746c5aa89a773e8f1d8c483b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1090/2793] python: watchdog: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 1e5e5653b9d..e785f5efa79 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "watchdog";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby";
+    sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin

From 24fa4efc1d0c32281f52c2e97d93568dcde09e6d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1091/2793] python: web.py: 0.37 -> 0.39

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

diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index 86c9d435f1e..fb777ad4129 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.37";
+  version = "0.39";
   pname = "web.py";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550";
+    sha256 = "7e7224493a51f6fbf02f3ce7f2011bcd9e5ebdfce0ee25e5921fdf665ba07542";
   };
 
   meta = with stdenv.lib; {

From ededfdaec3fedcdb5137d47f8e628aa1fb3e297a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1092/2793] python: WebOb: 1.7.3 -> 1.8.3

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

diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 1271ac3483d..0c25c865b19 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "WebOb";
-  version = "1.7.3";
+  version = "1.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76";
+    sha256 = "b0853dad347ca3777755b6d0659bb45efbeea71f995d8a395291ef6ad5d4f8b2";
   };
 
   propagatedBuildInputs = [ nose pytest ];

From 40ae0e428791b010560c45309cc326dc1e550c74 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1093/2793] python: websocket_client: 0.51.0 -> 0.54.0

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

diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix
index 194f3f126a3..03464617425 100644
--- a/pkgs/development/python-modules/websockets_client/default.nix
+++ b/pkgs/development/python-modules/websockets_client/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, six }:
 buildPythonPackage rec {
   pname = "websocket_client";
-  version = "0.51.0";
+  version = "0.54.0";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "030bbfbf29ac9e315ffb207ed5ed42b6981b5038ea00d1e13b02b872cc95e8f6";
+    sha256 = "e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849";
   };
 
   prePatch = ''

From 61b94919efe7818f96d00a35e74a2f608e25cd33 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1094/2793] python: websockify: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index 326e8faa614..a9758580a44 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.7.0";
+  version = "0.8.0";
   pname = "websockify";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v6pmamjprv2x55fvbdaml26ppxdw8v6xz8p0sav3368ajwwgcqc";
+    sha256 = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2";
   };
 
   propagatedBuildInputs = [ numpy ];

From ddf71d2b103efe7685398b2c2bb06afc2bf29094 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1095/2793] python: webtest: 2.0.20 -> 2.0.32

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

diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index d3dd321cb03..a1a91d35568 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.20";
+  version = "2.0.32";
   pname = "webtest";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv";
+    sha256 = "4221020d502ff414c5fba83c1213985b83219cb1cc611fe58aa4feaf96b5e062";
   };
 
   preConfigure = ''

From c3451f5e49bfe60cc74eec4d1caa158913f1dd72 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1096/2793] python: whitenoise: 4.0 -> 4.1

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

diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index 007bb9c879b..7e543e0be04 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "whitenoise";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e206c5adfb849942ddd057e599ac472ec1a85d56ae78a5ba24f243ea46a89c5";
+    sha256 = "32b57d193478908a48acb66bf73e7a3c18679263e3e64bfebcfac1144a430039";
   };
 
   # No tests

From 3f9e848e2c07deca9b22a105946da30eca1b7e16 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1097/2793] python: willow: 0.2.2 -> 1.1

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

diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix
index 88e6838cf93..de7639695d7 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/pkgs/development/python-modules/willow/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "willow";
-  version = "0.2.2";
+  version = "1.1";
   disabled = pythonOlder "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "111c82fbfcda2710ce6201b0b7e0cfa1ff3c4f2f0dc788cc8dfc8db933c39c73";
+    sha256 = "818ee11803c90a0a6d49c94b0453d6266be1ef83ae00de72731c45fae4d3e78c";
   };
 
   propagatedBuildInputs = [ six pillow ];

From 01be1a1031860b58e235eed463ca3906e5c6174d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1098/2793] python: word2vec: 0.9.1 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix
index d3c294308c4..d61567f9224 100644
--- a/pkgs/development/python-modules/word2vec/default.nix
+++ b/pkgs/development/python-modules/word2vec/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "word2vec";
-  version = "0.9.1";
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a811e3e98a8e6dfe7bc851ebbbc2d6e5ab5142f2a134dd3c03daac997b546faa";
+    sha256 = "40f6f30a5f113ffbfc24c5ad5de23bfac897f4c1210fb93685b7fca5c4dee7db";
   };
 
   propagatedBuildInputs = [ cython numpy ];

From 8f2b57f5055eabbb73bd010e85ad9c07bc6f6565 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1099/2793] python: wptserve: 1.4.0 -> 2.0

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

diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index 32145623e4d..8ae617830f1 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "wptserve";
-  version = "1.4.0";
+  version = "2.0";
 
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rkq4dpl41hx64m3ad0bwn0r5i7sf8qpgazgkq905j3wgk5aaspg";
+    sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a";
   };
 
   propagatedBuildInputs = [ ];

From 54983c94c345124ea0eda56d235b82511add02d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1100/2793] python: wsproto: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index c3ac5b51cb0..8773ef30b3d 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "wsproto";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "092qk4pbyaxx8b81hv9p7pc3ww54bwfqybhya4madka3pgv19wh2";
+    sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009";
   };
 
   propagatedBuildInputs = [ h11 enum34 ];

From 3e220ac2bc8c1be616217eaafd0a2b0007ab1747 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1101/2793] python: xattr: 0.7.8 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix
index a3da58eb9f3..8591e7d01b2 100644
--- a/pkgs/development/python-modules/xattr/default.nix
+++ b/pkgs/development/python-modules/xattr/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "xattr";
-  version = "0.7.8";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nbqfghgy26jyp5q7wl3rj78wr8s39m5042df2jlldg3fx6j0417";
+    sha256 = "7cb1b28eeab4fe99cc4350e831434142fce658f7d03f173ff7722144e6a47458";
   };
 
   propagatedBuildInputs = [ cffi ];

From 91bbb5fe4c8241427d7b57197503cf5b43ee596c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:21 +0100
Subject: [PATCH 1102/2793] python: xkcdpass: 1.4.2 -> 1.16.5

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

diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix
index d191ab85928..21390d9c3f8 100644
--- a/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/pkgs/development/python-modules/xkcdpass/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "xkcdpass";
-  version = "1.4.2";
+  version = "1.16.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269";
+    sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4";
   };
 
   # No tests included

From e5b56dd0c7251f7676a618547bdc349ceac66468 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1103/2793] python: xlrd: 0.9.4 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix
index 4e94078b9bf..3379433b04d 100644
--- a/pkgs/development/python-modules/xlrd/default.nix
+++ b/pkgs/development/python-modules/xlrd/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "xlrd";
-  version = "0.9.4";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72";
+    sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2";
   };
 
   buildInputs = [ nose ];

From 4c1c0db174252eecc7a753dcbb1b66f8ad1b673a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1104/2793] python: xlsx2csv: 0.7.2 -> 0.7.4

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

diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix
index d38506f185f..8f57bd127fd 100644
--- a/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "xlsx2csv";
-  version = "0.7.2";
+  version = "0.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866";
+    sha256 = "6ce45a87b61af6d3c24fed4221642de9115dc9cb9ea65887b0926fd0fab0a597";
   };
 
   meta = with stdenv.lib; {

From 930b425c630ed83a6d6faa4bad0fbae63c9b12df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1105/2793] python: xml2rfc: 2.10.3 -> 2.12.3

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

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 1338de7e67c..ae8867b3ddd 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "2.10.3";
+  version = "2.12.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ace45039e9d71713b4bb09ea199644797a7d884fbdd940e4c02559b4bccb01a1";
+    sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c";
   };
 
   propagatedBuildInputs = [ intervaltree pyflakes requests lxml ];

From c7b4424d58a3d091fd62281829d740349a067851 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1106/2793] python: XStatic-Bootstrap: 3.3.7.1 -> 4.1.3.1

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

diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index a474bf84d0f..a1e2c1a4e7b 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.7.1";
+  version = "4.1.3.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131";
+    sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f";
   };
 
   # no tests implemented

From a320e67dfc6c9f06b70325ea9fe8438ad68a5730 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1107/2793] python: XStatic-jQuery-File-Upload: 9.22.0.1 ->
 9.23.0.1

---
 .../python-modules/xstatic-jquery-file-upload/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 3b9c7affe16..e4352e3b984 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.22.0.1";
+  version = "9.23.0.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0jy7xnww0177fv0asssxvv8l1032jcnbkvz39z16yd6k34v53fzf";
+    sha256 = "649a500870b5f5d9cc71d1c1dc4c4d2242f459b02d811a771336217e4e91bfda";
   };
 
   # no tests implemented

From 802ecd85c693c9bb0ee4687ea091d2ff5eaf5083 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1108/2793] python: Yapsy: 1.11.223 -> 1.12.0

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

diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix
index 1f4a28459be..e29ff0c0bd1 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/pkgs/development/python-modules/yapsy/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Yapsy";
-  version = "1.11.223";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19pjsnqizswnczhlav4lb7zlzs0n73ijrsgksy4374b14jkkkfs5";
+    sha256 = "f08cb229a96f14cc0b1d4b68cb7c111d1020ab8c3989b426d3aa39b82d6a3e3c";
   };
 
   doCheck = false;

From a8de2d66e9a4c4124a9dd7c70a9432a3aa024b67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1109/2793] python: zdaemon: 4.0.0 -> 4.3

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

diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix
index 1a7627bf5dd..c15e46e5d0d 100644
--- a/pkgs/development/python-modules/zbaemon/default.nix
+++ b/pkgs/development/python-modules/zbaemon/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zdaemon";
-  version = "4.0.0";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f";
+    sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72";
   };
 
   propagatedBuildInputs = [ zconfig ];

From 4d12e4f25b3fa2a406d3a6c4992a7d798a4c2f0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1110/2793] python: zbase32: 1.1.2 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix
index aa860056fb8..97af3c2aa93 100644
--- a/pkgs/development/python-modules/zbase32/default.nix
+++ b/pkgs/development/python-modules/zbase32/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zbase32";
-  version = "1.1.2";
+  version = "1.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56";
+    sha256 = "9b25c34ba586cbbad4517af516e723599a6f38fc560f4797855a5f3051e6422f";
   };
 
   # Tests require `pyutil' so disable them to avoid circular references.

From 76ee8fbbfcec8c0bdfc259cca8aa5b3a921a3ce8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1111/2793] python: ZConfig: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 79f6ddca543..94b890c79e3 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "ZConfig";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
+    sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585";
   };
 
   patches = [ ./skip-broken-test.patch ]

From 8d4d3b7a451f2b3ba3cba8e3077494f854261eac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1112/2793] python: zdaemon: 4.0.0 -> 4.3

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

diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix
index 1a7627bf5dd..c15e46e5d0d 100644
--- a/pkgs/development/python-modules/zdaemon/default.nix
+++ b/pkgs/development/python-modules/zdaemon/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zdaemon";
-  version = "4.0.0";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f";
+    sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72";
   };
 
   propagatedBuildInputs = [ zconfig ];

From 833290229358c78ecc052b72a83992ebcba517fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1113/2793] python: zfec: 1.4.24 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix
index b2e5b939f42..caca5be7b9f 100644
--- a/pkgs/development/python-modules/zfec/default.nix
+++ b/pkgs/development/python-modules/zfec/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "zfec";
-  version = "1.4.24";
+  version = "1.5.3";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3";
+    sha256 = "b41bd4b0af9c6b3a78bd6734e1e4511475944164375e6241b53df518a366922b";
   };
 
   buildInputs = [ setuptoolsDarcs ];

From 14ac4c189ace62c5cc52262ba0a5ecd0f585133a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1114/2793] python: ZODB: 5.4.0 -> 5.5.1

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

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 848da5b2171..3ec954f1235 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
     pname = "ZODB";
-    version = "5.4.0";
+    version = "5.5.1";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0b306042f4f0d558a477d65c34b0dd6e7604c6e583f55dfda52befa2fa13e076";
+      sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666";
     };
 
     patches = [

From d2c215788f2c0be833a5544e34ef47d52069e5f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1115/2793] python: zope.component: 4.2.1 -> 4.5

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

diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix
index 8b51253fe92..73d45ec7f65 100644
--- a/pkgs/development/python-modules/zope_component/default.nix
+++ b/pkgs/development/python-modules/zope_component/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "zope.component";
-  version = "4.2.1";
+  version = "4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6";
+    sha256 = "6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55";
   };
 
   propagatedBuildInputs = [ zope_configuration zope_event zope_i18nmessageid zope_interface zope_testing ];

From 9199fa741b8e6813cc8e8282c9080aca7493606c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:22 +0100
Subject: [PATCH 1116/2793] python: zope.configuration: 4.0.3 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix
index 46ad9bd0e68..3529af60e43 100644
--- a/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/pkgs/development/python-modules/zope_configuration/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "zope.configuration";
-  version = "4.0.3";
+  version = "4.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n";
+    sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3";
   };
 
   propagatedBuildInputs = [ zope_i18nmessageid zope_schema ];

From 3a7bdea60210260a65133c2fbd84fa7ae69daafb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1117/2793] python: zope.contenttype: 4.0.1 -> 4.4

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

diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix
index 67c5a986688..f310042976c 100644
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/pkgs/development/python-modules/zope_contenttype/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "zope.contenttype";
-  version = "4.0.1";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9decc7531ad6925057f1a667ac0ef9d658577a92b0b48dafa7daa97b78a02bbb";
+    sha256 = "08c0408f515668e6f0c4fd492b66fbe87a074c1aa21cfc6be8c6292482d8b2f4";
   };
 
   meta = with stdenv.lib; {

From a0005750d75d5af6192e00ce650bdad0c13fb1cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1118/2793] python: zope.copy: 4.1.0 -> 4.2

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

diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix
index 6bd7ae33fb9..4d6e740278e 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/pkgs/development/python-modules/zope_copy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "zope.copy";
-  version = "4.1.0";
+  version = "4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "702dbb52e2427a1cc2e2b4b3f5a40c64dcbf9ebed85888ae8fa67172263a6994";
+    sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From da3ab12023604b045d7ccd4c96c0224f3b9668b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1119/2793] python: zope.deprecation: 4.1.2 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix
index ddc486918fb..da0d442b9c6 100644
--- a/pkgs/development/python-modules/zope_deprecation/default.nix
+++ b/pkgs/development/python-modules/zope_deprecation/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.deprecation";
-  version = "4.1.2";
+  version = "4.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fed622b51ffc600c13cc5a5b6916b8514c115f34f7ea2730409f30c061eb0b78";
+    sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224";
   };
 
   buildInputs = [ zope_testing ];

From 09f45547db55fd907198f6365da5db37a2a38263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1120/2793] python: zope.dottedname: 3.4.6 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix
index 8d5ef91b983..d2a21fd03b0 100644
--- a/pkgs/development/python-modules/zope_dottedname/default.nix
+++ b/pkgs/development/python-modules/zope_dottedname/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "zope.dottedname";
-  version = "3.4.6";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "331d801d98e539fa6c5d50c3835ecc144c429667f483281505de53fc771e6bf5";
+    sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576";
   };
 
   meta = with stdenv.lib; {

From 58a2b8e74d8992e1a735299fa264119cc7aa7827 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1121/2793] python: zope.event: 4.0.3 -> 4.4

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

diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix
index 490d2e48c14..3dea7adcb00 100644
--- a/pkgs/development/python-modules/zope_event/default.nix
+++ b/pkgs/development/python-modules/zope_event/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "zope.event";
-  version = "4.0.3";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm";
+    sha256 = "69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf";
   };
 
   meta = with stdenv.lib; {

From dcec215a8a820f54d7062a328cde737223c49548 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1122/2793] python: zope.exceptions: 4.0.8 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix
index 3afb936d48f..dbbba691edb 100644
--- a/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/pkgs/development/python-modules/zope_exceptions/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.exceptions";
-  version = "4.0.8";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl";
+    sha256 = "5fa59c3c1044bb9448aeec8328db0bfceaae2a2174e88528d3fe04adf8d47211";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From a5a83ceb5da61e534ac89247fb5a92b36a9b8e43 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1123/2793] python: zope.filerepresentation: 3.6.1 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix
index f77a018c0e2..36d664efd1a 100644
--- a/pkgs/development/python-modules/zope_filerepresentation/default.nix
+++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.filerepresentation";
-  version = "3.6.1";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d775ebba4aff7687e0381f050ebda4e48ce50900c1438f3f7e901220634ed3e0";
+    sha256 = "c9bff2b2492b2fe716ee54538441a98d6145d1de87dd921eaa44ac834fbb63b6";
   };
 
   propagatedBuildInputs = [ zope_schema ];

From b63f06832b6e34e7560982db2060092e0eb640b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1124/2793] python: zope.i18n: 3.8.0 -> 4.6.1

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

diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix
index 6f61bd0f99a..f9a7264f02c 100644
--- a/pkgs/development/python-modules/zope_i18n/default.nix
+++ b/pkgs/development/python-modules/zope_i18n/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zope.i18n";
-  version = "3.8.0";
+  version = "4.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm";
+    sha256 = "14f7339f6d4fed5e94882a7f1b2e40fd90ad00b3c28a7f4353762101395e3304";
   };
 
   propagatedBuildInputs = [ pytz zope_component ];

From 9e96072ba198425093535ef2d24d535dc9e52e65 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1125/2793] python: zope.i18nmessageid: 4.0.3 -> 4.3.1

---
 .../python-modules/zope_i18nmessageid/default.nix          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index 70e3f3fb018..cddcad00774 100644
--- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
@@ -1,17 +1,20 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, six
 }:
 
 buildPythonPackage rec {
   pname = "zope.i18nmessageid";
-  version = "4.0.3";
+  version = "4.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml";
+    sha256 = "e511edff8e75d3a6f84d8256e1e468c85a4aa9d89c2ea264a919334fae7081e3";
   };
 
+  propagatedBuildInputs = [ six ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/zopefoundation/zope.i18nmessageid;
     description = "Message Identifiers for internationalization";

From 9401dc156a43e7e4a78a69fd0cbbce91739820ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1126/2793] python: zope.interface: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index 77075c36b22..a5855697ad6 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.interface";
-  version = "4.5.0";
+  version = "4.6.0";
   
   src = fetchPypi {
     inherit pname version;
-    sha256 = "57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c";
+    sha256 = "1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5";
   };
 
   propagatedBuildInputs = [ zope_event ];

From ce3fd17409bfee0dc8bc2735ad1c7781032394e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1127/2793] python: zope.lifecycleevent: 3.7.0 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 902e6c51adb..c72eeeb921d 100644
--- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zope.lifecycleevent";
-  version = "3.7.0";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95";
+    sha256 = "7ec39087cc1524e55557e7d9dc6295eb1b95b09b125e293c0e2dd068574f0aee";
   };
 
   propagatedBuildInputs = [ zope_event zope_component ];

From beb6f134ff72decc7d220b1d0226c0df1081c77e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1128/2793] python: zope.location: 4.0.3 -> 4.2

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

diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix
index be7d50025d0..70ba9a8e88a 100644
--- a/pkgs/development/python-modules/zope_location/default.nix
+++ b/pkgs/development/python-modules/zope_location/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.location";
-  version = "4.0.3";
+  version = "4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74";
+    sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac";
   };
 
   propagatedBuildInputs = [ zope_proxy ];

From 25a3bddc875e393ee9d79628783b16906809f7de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1129/2793] python: zope.proxy: 4.1.6 -> 4.3.1

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

diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix
index a0fdd70e2a9..7c4b5d89ea3 100644
--- a/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/pkgs/development/python-modules/zope_proxy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.proxy";
-  version = "4.1.6";
+  version = "4.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4";
+    sha256 = "563c2454b2d0f23bca54d2e0e4d781149b7b06cb5df67e253ca3620f37202dd2";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From b3a0c86b964a65a5d95a1db5baa7689e6cdcb692 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:23 +0100
Subject: [PATCH 1130/2793] python: zope.schema: 4.4.2 -> 4.9.3

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

diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix
index 71e571dba33..df5322acc87 100644
--- a/pkgs/development/python-modules/zope_schema/default.nix
+++ b/pkgs/development/python-modules/zope_schema/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "zope.schema";
-  version = "4.4.2";
+  version = "4.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank";
+    sha256 = "2d971da8707cab47b1916534b9929dcd9d7f23aed790e6b4cbe3103d5b18069d";
   };
 
   propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ];

From 937802e7b053c1b2085aa88e658ebead331d8362 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:24 +0100
Subject: [PATCH 1131/2793] python: zope.size: 3.5.0 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix
index 8be9a04ae3f..de1a34a3f79 100644
--- a/pkgs/development/python-modules/zope_size/default.nix
+++ b/pkgs/development/python-modules/zope_size/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zope.size";
-  version = "3.5.0";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f";
+    sha256 = "6f3eb687c9181e3b7400c5cd4d4209a2f676475b7b85c99ee11de2404b3493ec";
   };
 
   propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];

From ae7132991f0b18806961d40ba6bf2608530d0318 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:24 +0100
Subject: [PATCH 1132/2793] python: zope.testing: 4.6.1 -> 4.7

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

diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix
index 4e28113a8a1..037c5d87f9a 100644
--- a/pkgs/development/python-modules/zope_testing/default.nix
+++ b/pkgs/development/python-modules/zope_testing/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "zope.testing";
-  version = "4.6.1";
+  version = "4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56";
+    sha256 = "d66be8d1de37e8536ca58a1d9f4d89a68c9cc75cc0e788a175c8a20ae26003ea";
   };
 
   doCheck = !isPyPy;

From 30f91ee2bdb133e0282bd6c46db884c4a6f77b8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:24 +0100
Subject: [PATCH 1133/2793] python: zope.testrunner: 4.8.1 -> 4.9

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

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index a4988332b22..79309eb37ea 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "zope.testrunner";
-  version = "4.8.1";
+  version = "4.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "039z9q5i1r6fqzlm224nmaxn896k4a9sb1237dv406ncdldd7jaz";
+    sha256 = "f3856a79ab0e4ff74addc3e6c152b388dddee548345b440767b6361f635bd9b7";
   };
 
   patches = [ ./test-selection.patch ];

From 635283d1e997a80589dcd93895ca54d7786744cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 29 Oct 2018 14:37:57 +0100
Subject: [PATCH 1134/2793] python.pkgs.sip: 4.19.8 -> 4.19.13

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index bfca2a6f698..f8cc7e8dc45 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "4.19.8";
+  version = "4.19.13";
   format = "other";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy";
+    sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3";
   };
 
   configurePhase = ''

From d1540531f46eab6db7b4d90f3fc2f9ec122dcd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 29 Oct 2018 14:31:09 +0100
Subject: [PATCH 1135/2793] python.pkgs.pyqt5: 5.10.1 -> 5.11.3

---
 pkgs/development/python-modules/pyqt/5.x.nix | 29 +++-----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 6a3e3e66e2c..0e033a9e45d 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -6,9 +6,9 @@
 
 let
   pname = "PyQt";
-  version = "5.10.1";
+  version = "5.11.3";
 
-  inherit (pythonPackages) buildPythonPackage python dbus-python sip;
+  inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34;
 
 in buildPythonPackage {
   pname = pname;
@@ -25,7 +25,7 @@ in buildPythonPackage {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr";
+    sha256 = "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9";
   };
 
   outputs = [ "out" "dev" ];
@@ -36,7 +36,7 @@ in buildPythonPackage {
 
   propagatedBuildInputs = [
     sip qtbase qtsvg qtwebkit qtwebengine
-  ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
+  ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
 
   configurePhase = ''
     runHook preConfigure
@@ -64,27 +64,6 @@ in buildPythonPackage {
     runHook postConfigure
   '';
 
-  patches = [
-    # This patch from Arch Linux fixes Cura segfaulting on startup
-    # https://github.com/Ultimaker/Cura/issues/3438
-    # It can probably removed on 5.10.3
-    (fetchpatch {
-      name = "pyqt5-cura-crash.patch";
-      url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f;
-      sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck";
-    })
-    (fetchpatch {
-      name = "pyqt-qt5.11.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-qt5.11.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
-      sha256 = "0qa7w1agjg9da99lvnqwwxnm3pp7qd683h7zggq4c269y2km812h";
-    })
-    (fetchpatch {
-      name = "pyqt-support-new-qt.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-support-new-qt.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
-      sha256 = "1nkl96f4bki37zw6iwvd4vq8z8gg45q5m1cbkbaw72395i0m7p5j";
-    })
-  ];
-
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"

From 6fe217ad73225743858dbf7525b3963ce2a24043 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:38:52 +0100
Subject: [PATCH 1136/2793] pythonPackages.click: fix fetching

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

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 5733f43dbd4..561c47069cb 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -5,7 +5,8 @@ buildPythonPackage rec {
   version = "7.0";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "Click";
+    inherit version;
     sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7";
   };
 

From ad1d37f2111b50540384c8590d854a312a3731f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:39:01 +0100
Subject: [PATCH 1137/2793] pythonPackages.pysocks: fix fetching

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

diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix
index f6705f8a1c6..0f4b2b688cd 100644
--- a/pkgs/development/python-modules/pysocks/default.nix
+++ b/pkgs/development/python-modules/pysocks/default.nix
@@ -8,7 +8,8 @@ buildPythonPackage rec {
   version = "1.6.8";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "PySocks";
+    inherit version;
     sha256 = "3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672";
   };
 

From bc3346cbabb8fffd65f8b46c84225fcb97e9166a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 15:23:56 +0100
Subject: [PATCH 1138/2793] python.pkgs.simplejson: disable tests with python 3

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

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 2099b00ba96..4adf7083a0b 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , stdenv
+, isPy3k
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -14,6 +16,14 @@ buildPythonPackage rec {
     sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5";
   };
 
+  # Package does not need pytest, but its a bit easier debugging.
+  checkInputs = [ pytest ];
+  # Ignore warnings because test does not expect them in stderr
+  # See https://github.com/simplejson/simplejson/issues/241
+  checkPhase = ''
+    PYTHONWARNINGS="ignore" pytest simplejson/tests
+  '';
+
   meta = {
     description = "A simple, fast, extensible JSON encoder/decoder for Python";
     longDescription = ''

From fb66841e9a471c9c18bc7fcd8c07f887b8e64e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 16:29:28 +0100
Subject: [PATCH 1139/2793] python.pkgs.click: rebase fix-paths.patch

---
 .../python-modules/click/fix-paths.patch      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch
index 04719871b76..b44a08e591e 100644
--- a/pkgs/development/python-modules/click/fix-paths.patch
+++ b/pkgs/development/python-modules/click/fix-paths.patch
@@ -1,11 +1,13 @@
---- a/click/_unicodefun.py	2018-06-11 15:08:59.369358278 +0200
-+++ b/click/_unicodefun.py	2018-06-11 15:09:09.342325998 +0200
-@@ -60,7 +60,7 @@
-     extra = ''
+diff --git a/click/_unicodefun.py b/click/_unicodefun.py
+index 620edff..85a3c98 100644
+--- a/click/_unicodefun.py
++++ b/click/_unicodefun.py
+@@ -63,7 +63,7 @@ def _verify_python3_env():
      if os.name == 'posix':
          import subprocess
--        rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
-+        rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
-                               stderr=subprocess.PIPE).communicate()[0]
-         good_locales = set()
-         has_c_utf8 = False
+         try:
+-            rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
++            rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE).communicate()[0]
+         except OSError:
+             rv = b''

From 399425b9eeac76c743cc0d36138b2986507bac72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 16:48:43 +0100
Subject: [PATCH 1140/2793] python.pkgs.pytest_xdist: add filelock to
 checkInputs

---
 pkgs/development/python-modules/pytest-xdist/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index d592411aa78..fdfe0b3006e 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-  buildInputs = [ pytest pytest-forked ];
+  checkInputs = [ pytest pytest-forked filelock ];
   propagatedBuildInputs = [ execnet ];
 
   checkPhase = ''
@@ -26,5 +26,6 @@ buildPythonPackage rec {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = https://github.com/pytest-dev/pytest-xdist;
     license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
   };
 }

From 4f8d1006b81eb713392aa12a345c9792f96a86e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 17:15:39 +0100
Subject: [PATCH 1141/2793] python.pkgs.virtualenv: rebase
 virtualenv-change-prefix.patch

---
 .../virtualenv/virtualenv-change-prefix.patch | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
index 958187f982f..2c121c83d49 100644
--- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
+++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
@@ -13,39 +13,42 @@ it will only add the path to the python used when building
 available.
 
 
-diff --git a/virtualenv.py b/virtualenv.py
-index d3e76a7..cb307fa 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -1051,17 +1051,7 @@ def path_locations(home_dir):
+diff --git a/src/virtualenv.py b/src/virtualenv.py
+index 4b57cde..afda73f 100755
+--- a/src/virtualenv.py
++++ b/src/virtualenv.py
+@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False):
  
  
  def change_prefix(filename, dst_prefix):
 -    prefixes = [sys.prefix]
 -
 -    if is_darwin:
--        prefixes.extend((
--            os.path.join("/Library/Python", sys.version[:3], "site-packages"),
--            os.path.join(sys.prefix, "Extras", "lib", "python"),
--            os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"),
--            # Python 2.6 no-frameworks
--            os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"),
--            # System Python 2.7 on OSX Mountain Lion
--            os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages")))
+-        prefixes.extend(
+-            (
+-                os.path.join("/Library/Python", sys.version[:3], "site-packages"),
+-                os.path.join(sys.prefix, "Extras", "lib", "python"),
+-                os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"),
+-                # Python 2.6 no-frameworks
+-                os.path.join("~", ".local", "lib", "python", sys.version[:3], "site-packages"),
+-                # System Python 2.7 on OSX Mountain Lion
+-                os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages"),
+-            )
+-        )
 +    prefixes = ["/nix/store", sys.prefix]
  
-     if hasattr(sys, 'real_prefix'):
+     if hasattr(sys, "real_prefix"):
          prefixes.append(sys.real_prefix)
-@@ -1078,6 +1068,8 @@ def change_prefix(filename, dst_prefix):
-             if src_prefix != os.sep: # sys.prefix == "/"
+@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix):
+             if src_prefix != os.sep:  # sys.prefix == "/"
                  assert relpath[0] == os.sep
                  relpath = relpath[1:]
 +                if src_prefix == "/nix/store":
 +                    relpath = "/".join(relpath.split("/")[1:])
              return join(dst_prefix, relpath)
-     assert False, "Filename %s does not start with any of these prefixes: %s" % \
-         (filename, prefixes)
-@@ -1190,6 +1182,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
+     assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes)
+ 
+@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
      site_filename_dst = change_prefix(site_filename, home_dir)
      site_dir = os.path.dirname(site_filename_dst)
      writefile(site_filename_dst, SITE_PY)
@@ -54,6 +57,6 @@ index d3e76a7..cb307fa 100755
 +        join(site_dir, 'sitecustomize.py',),
 +        "import sys; sys.path.append('%s')" % wrapper_path
 +    )
-     writefile(join(site_dir, 'orig-prefix.txt'), prefix)
-     site_packages_filename = join(site_dir, 'no-global-site-packages.txt')
+     writefile(join(site_dir, "orig-prefix.txt"), prefix)
+     site_packages_filename = join(site_dir, "no-global-site-packages.txt")
      if not site_packages:

From b2a31e10d153a8156350bd6001a1d6e8fe6dc5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 17:17:40 +0100
Subject: [PATCH 1142/2793] python3.pkgs.multidict: add pytestcov to
 checkInputs

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

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index fc16fa5aec3..eb5ef396a4f 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest, pytestrunner
+, pytest, pytestrunner, pytestcov
 , isPy3k
 }:
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "3c11e92c3dfc321014e22fb442bc9eb70e01af30d6ce442026b0c35723448c66";
   };
 
-  checkInputs = [ pytest pytestrunner ];
+  checkInputs = [ pytest pytestrunner pytestcov ];
 
   disabled = !isPy3k;
 

From 494f969cd7e2cd28cbd09ab1af7b51126a462a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 17:44:46 +0100
Subject: [PATCH 1143/2793] python: hbmqtt: 0.9.2 -> 0.9.4

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

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index 3899be92b1e..c49936e2270 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -3,22 +3,15 @@
 
 buildPythonPackage rec {
   pname = "hbmqtt";
-  version = "0.9.2";
+  version = "0.9.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c";
+    sha256 = "48f2f3ef2beb9924a4c2c10263630e65cf8d11f72c812748a0b2c1b09499602b";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/beerfactory/hbmqtt/commit/75a85d1ea4cb41f2a15f2681d3114da7158942ae.patch";
-      sha256 = "0bl4v5zxp4kz2w7riwrx48f7yqmp7pxg79g9qavkda0i85lxswnp";
-    })
-  ];
-
   propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];
 
   checkInputs = [ nose ];

From f412af4e0406576a7adea1194cb2a0a97886162e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 18:04:55 +0100
Subject: [PATCH 1144/2793] python.pkgs.subunit: move testscenarios to
 checkInputs

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

diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index ac21ea41555..024fd136c40 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -8,7 +8,8 @@ buildPythonPackage rec {
   name = pkgs.subunit.name;
   src = pkgs.subunit.src;
 
-  propagatedBuildInputs = [ testtools testscenarios ];
+  propagatedBuildInputs = [ testtools ];
+  checkInputs = [ testscenarios ];
   nativeBuildInputs = [ pkgs.pkgconfig ];
   buildInputs = [ pkgs.check pkgs.cppunit ];
 

From ad2a03e74eb242a6290cfe1a5996880245467a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Nov 2018 18:07:59 +0100
Subject: [PATCH 1145/2793] python.pkgs.testrepository: correctly use
 buildInputs, checkInputs

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

diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix
index dbc342c1c4d..188c320e761 100644
--- a/pkgs/development/python-modules/testrepository/default.nix
+++ b/pkgs/development/python-modules/testrepository/default.nix
@@ -18,8 +18,9 @@ buildPythonPackage rec {
     sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m";
   };
 
-  buildInputs = [ testtools testresources ];
-  propagatedBuildInputs = [ pbr subunit fixtures ];
+  checkInputs = [ testresources ];
+  buildInputs = [ pbr ];
+  propagatedBuildInputs = [ fixtures subunit testtools ];
 
   checkPhase = ''
     ${python.interpreter} ./testr

From b2d56e7defbad4d000ec6e3702f2885c844628eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 5 Nov 2018 13:40:23 +0100
Subject: [PATCH 1146/2793] python.pkgs.cached-property: 1.4.2 -> 1.5.1

---
 .../development/python-modules/cached-property/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 924ce07c8e7..3a3e6d1e6dd 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -7,20 +7,21 @@
 
 buildPythonPackage rec {
   pname = "cached-property";
-  version = "1.4.2";
+  version = "1.5.1";
 
   # conftest.py is missing in PyPI tarball
   src = fetchFromGitHub {
     owner = "pydanny";
     repo = pname;
     rev = version;
-    sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw";
+    sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6";
   };
 
   checkInputs = [ pytest freezegun ];
 
+  # https://github.com/pydanny/cached-property/issues/131
   checkPhase = ''
-    py.test
+    py.test -k "not test_threads_ttl_expiry"
   '';
 
   meta = {

From 1b26d06e43f0a7e4873f545ae429a59e72d84ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 5 Nov 2018 14:33:13 +0100
Subject: [PATCH 1147/2793] python.pkgs.pyflakes: disable tests

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

diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index d833d9a0f68..3f799c1962a 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -11,7 +11,8 @@ buildPythonPackage rec {
 
   buildInputs = [ unittest2 ];
 
-  doCheck = !isPyPy;
+  # https://github.com/PyCQA/pyflakes/issues/386
+  doCheck = false;
 
   meta = with stdenv.lib; {
     homepage = https://launchpad.net/pyflakes;

From 93f2370021e484684b1af0207d299b66e8293ea9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:23 +0100
Subject: [PATCH 1148/2793] python: botocore: 1.12.37 -> 1.12.42

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index c684d9ad5fc..75ce31530cf 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.12.37";
+  version = "1.12.42";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eed1b39027ee882ebd0df10dcb7307db20fc4b468debae513dc183743e850d17";
+    sha256 = "0e495bcf2e474b82da7938b35ad2f71e28384c246b47ca131779f736621da504";
   };
 
   propagatedBuildInputs = [

From dbb2d7977cb556161989c63793e3b5196f8c3552 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1149/2793] python: branca: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index fc8dc784d02..e3107bd25b9 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "branca";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bea38396cf58fd7173ac942277fe4138127eb1546622684206cb34d344b03fb4";
+    sha256 = "3e762c9bdf40725f3d05ea1fda8fae9b470bfada6474e43a1242c8204a7bb15e";
   };
 
   checkInputs = [ pytest selenium ];

From 6aa12da26da59a0d745b4f66d1f583c1397ebc3b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1150/2793] python: cement: 3.0.0 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 16b74913b7b..d5dd3feb313 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cement";
-  version = "3.0.0";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e50e1033d61d18b36787a60d52cad0d3fe20780e7e2f78f0204bde32000645f9";
+    sha256 = "8c692493c9d97b07e4a2c0770223fa5ee12a3110cfcb246d7d26fffe22edd22e";
   };
 
   # Disable test tests since they depend on a memcached server running on

From 932f62334b2feef3ee323758a7abe69e48be4857 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1151/2793] python: cufflinks: 0.14.5 -> 0.14.6

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

diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 0f8a223cf00..95825b07b23 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "cufflinks";
-  version = "0.14.5";
+  version = "0.14.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "304f9a30b753e36a9d398133543c9b48214fcf0535d971871894fc3058799c5f";
+    sha256 = "4188324361cc584214150aadaeb28ed07e9d150adb714b53c5f09d5b3fcdd28a";
   };
 
   propagatedBuildInputs = [ pandas plotly colorlover ];

From ebd878becee78314da2c43c3cbc80592a606be37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1152/2793] python: cypari2: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 08209c96d4e..9a9be578ca8 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3512d8a78217dfd3ac431b470453342188f70b2053386678a1ec3c74aae7427a";
+    sha256 = "32fad615d773e9b5a9394c078ddc2c868e64e35f1ac9633ff90b456901b9d886";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

From 57a1aaab1c12f77fa3bfd33b23098a1c8f5aa890 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1153/2793] python: dask: 0.20.0 -> 0.20.1

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index a300a478366..3d9dd501081 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe48f364ec06b5a32f23358bd17e089e42abebdd341768a13c683d539e12107a";
+    sha256 = "1587202f46ffba3861a18f99195139789b5d810de42bfb940baf75eff0cf769d";
   };
 
   checkInputs = [ pytest ];

From 15b15f120328ae5d2f01dd10b79d8fc761c0d7aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1154/2793] python: DataModelDict: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix
index 9aac803ccae..cd7d6eb8ccc 100644
--- a/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/pkgs/development/python-modules/datamodeldict/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.4";
+  version = "0.9.5";
   pname = "DataModelDict";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97d8e999e000cf69c48e57b1a72eb45a27d83576a38c6cd8550c230b018be7af";
+    sha256 = "afa15c137c09e7d937e31c8956fd8092be0251c9869a6b7c1d0f81c0901bc47d";
   };
 
   propagatedBuildInputs = [ xmltodict ];

From 6a93b5bcf520d3c13a2cb7bb4c343d983f4eb029 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:24 +0100
Subject: [PATCH 1155/2793] python: dependency-injector: 3.14.0 -> 3.14.2

---
 .../python-modules/dependency-injector/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 7714d08fd95..b31194bf17c 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.14.0";
+  version = "3.14.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14b2e48c272b546c1a2e76943df0e8e28b5a791cdec5388bc526132b10b09d42";
+    sha256 = "f478a26e9bf3111ce98bbfb8502af274643947f87a7e12a6481a35eaa693062b";
   };
 
   propagatedBuildInputs = [ six ];

From b87d0ca8182000d774d895059328c6246ee7d650 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1156/2793] python: django-reversion: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 0f6c942b3ac..18fbbe2da31 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "98cb09c2227b14a0f88faaf4f747a716a5b1f183768959fe6035cbc12c3adbfe";
+    sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b";
   };
 
   propagatedBuildInputs = [ django ];

From 070a58bb2d1abcb2c654e7152c6e64048e804b7d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1157/2793] python: dulwich: 0.19.6 -> 0.19.8

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 4713ff0ab28..af9ddb6d40e 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.19.6";
+  version = "0.19.8";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9a7dc5c5759f3d3b7a9ac0a684aa2c47f099e1722d9caab5b043cef1d73ff4a2";
+    sha256 = "5743b4a7dddf105316c5bed75f4e97503d26f9b07e4c61044aa81b57322edf8e";
   };
 
   LC_ALL = "en_US.UTF-8";

From 5758e7304924118d87ed1a1bb0ebf06f920877f9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1158/2793] python: fs: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 9d5de0c73ea..5b120c6af37 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "fs";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b20a4aeac9079b194f0160957d4265bb6c99ce68f1b12e980b0fb96f74aafb70";
+    sha256 = "6f7e36b6381f353339957784a67bd9d440482b7eaeaff7b1f97249ceb7223f63";
   };
 
   buildInputs = [ pkgs.glibcLocales ];

From 52c026e00e8f35cf80c6e757f3c95b25b8d42596 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1159/2793] python: hbmqtt: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index c49936e2270..0ec55dae3e4 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "hbmqtt";
-  version = "0.9.4";
+  version = "0.9.5";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48f2f3ef2beb9924a4c2c10263630e65cf8d11f72c812748a0b2c1b09499602b";
+    sha256 = "9886b1c8321d16e971376dc609b902e0c84118846642b5e09f08a4ca876a7f2a";
   };
 
   propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];

From 384d78d22adf673a3f3ee1b64525394e03b1cf60 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1160/2793] python: hgsvn: 0.3.11 -> 0.3.15

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

diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix
index 29af19aaf99..056415df4f6 100644
--- a/pkgs/development/python-modules/hgsvn/default.nix
+++ b/pkgs/development/python-modules/hgsvn/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "hgsvn";
-  version = "0.3.11";
+  version = "0.3.15";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p";
+    sha256 = "036270cc2803f7a7de3842e8c593849631b2293e647aa3444f68f1b1834d1fa1";
   };
 
   buildInputs = [ nose ];

From 86045f21393b71871c39538fbbcbca650f463f08 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1161/2793] python: histbook: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix
index 43a1cb2fbc2..c9ea7010a6f 100644
--- a/pkgs/development/python-modules/histbook/default.nix
+++ b/pkgs/development/python-modules/histbook/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "histbook";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "864b2943005d6be0c889504c6e1090fea2036c9557837e06ca83d06590037c49";
+    sha256 = "76d1f143f8abccf5539029fbef8133db84f377fc7752ac9e7e6d19ac9a277967";
   };
 
   propagatedBuildInputs = [ numpy pandas ];

From f7fc606b62e7e1c6658a7742d20f3ad7f26d848e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1162/2793] python: httpretty: 0.9.5 -> 0.9.6

---
 .../python-modules/httpretty/default.nix      | 21 +++----------------
 .../python-modules/httpretty/setup.py.patch   | 11 ----------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/httpretty/setup.py.patch

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index a44b8817483..1dcb7c14d99 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -14,32 +14,17 @@
 
 buildPythonPackage rec {
   pname = "httpretty";
-  version = "0.9.5";
+  version = "0.9.6";
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "543fa2bd9c319bfa1e1de9e37d7c9c08fa926a692b65b0be5df4b2f069fd0ad7";
+    sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc";
   };
 
-  buildInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+  checkInputs = [ tornado requests httplib2 sure nose coverage certifi ];
   propagatedBuildInputs = [ urllib3 ];
 
-  postPatch = ''
-    sed -i -e 's/==.*$//' *requirements.txt
-    # XXX: Drop this after version 0.8.4 is released.
-    patch httpretty/core.py <<DIFF
-    ***************
-    *** 566 ****
-    !                 'content-length': len(self.body)
-    --- 566 ----
-    !                 'content-length': str(len(self.body))
-    DIFF
-
-    # Explicit encoding flag is required with python3, unless locale is set.
-    ${if !isPy3k then "" else
-      "patch -p0 -i ${./setup.py.patch}"}
-  '';
 
   meta = with stdenv.lib; {
     homepage = "https://falcao.it/HTTPretty/";
diff --git a/pkgs/development/python-modules/httpretty/setup.py.patch b/pkgs/development/python-modules/httpretty/setup.py.patch
deleted file mode 100644
index e07ba931705..00000000000
--- a/pkgs/development/python-modules/httpretty/setup.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py    2016-04-18 10:44:27.915536022 -0500
-+++ setup-new.py           2016-04-18 10:44:13.515537377 -0500
-@@ -75,7 +75,7 @@
-
-
- local_file = lambda *f: \
--    open(os.path.join(os.path.dirname(__file__), *f)).read()
-+    open(os.path.join(os.path.dirname(__file__), *f), encoding="utf-8").read()
-
-
- install_requires, dependency_links = \

From d16915f56d39c44bbdefe09a36c1c3a70d8f4ca3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1163/2793] python: imbalanced-learn: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 51aabdc8911..9020d2cc12c 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "imbalanced-learn";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f830ebc2042b642648bfe48a9253b45019ab15a5d0ac0bbdd7261e304e71609d";
+    sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083";
   };
 
   propagatedBuildInputs = [ scikitlearn ];

From 55215d50808434a6cc34afc4941a50f80a85d911 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1164/2793] python: keyring: 16.0.0 -> 16.0.2

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index f60def7ad76..5714c242af5 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "16.0.0";
+  version = "16.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8a9b0c2c2abc3e7326559f840e1f05e6d010ccaf397d09f450485920ba08e443";
+    sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 775fa99aa432892eebf5e24ccc3d5fa815adaa90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1165/2793] python: lz4: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 9380fbe9077..89eca9a8538 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "lz4";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af46e2e5c002b3fbffa2ad69289aa61e46cab1a87c1d85bda44e822a1634defa";
+    sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
   };
 
   buildInputs = [ nose ];

From c6992ef506aa9ffd071874fe5fdcb77fb59020b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH 1166/2793] python: mozrunner: 7.0.1 -> 7.0.2

---
 .../python-modules/marionette-harness/mozrunner.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index 324c7c6c2d2..ac8631362fb 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "mozrunner";
-  version = "7.0.1";
+  version = "7.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a4e3d532d1d7eb34b6332e0568612ebac3f56da849894005b3dbe68968e5d292";
+    sha256 = "8034898a36fece171b52e25792f64011e761e5aa694cd67fb6a19c12cb3fa978";
   };
 
   propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess

From ce658eb0a9282d88ab42642b0b43066bc3550263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1167/2793] python: moto: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 4a32c5e3e37..d0d6d66c8ca 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58fe0a0d55cbd9a001c02c146c15790cfcebf010c6648cb9990e6c3204709cbb";
+    sha256 = "129de2e04cb250d9f8b2c722ec152ed1b5426ef179b4ebb03e9ec36e6eb3fcc5";
   };
 
   postPatch = ''

From 641fc5fd951bc957dfb26f161ba2e1f126b88fd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1168/2793] python: msgpack-numpy: 0.4.4.1 -> 0.4.4.2

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index 06063fd8b99..17ae66a0fdd 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msgpack-numpy";
-  version = "0.4.4.1";
+  version = "0.4.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac15d3a7b9e29d3e10a2683dc00ea495891b9b4cbb502ab0b0d2e516bd0b2eab";
+    sha256 = "a1638108538aaba55bebaef9d847dfb3064bb1c829e68301716a6a956fa6a0d6";
   };
 
   buildInputs = [

From 33b6b7c93c974c2350ac5db0aee17376a0ce0f56 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1169/2793] python: nipype: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index fba8d4d648e..79f0002c35a 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -36,11 +36,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bfed0d6d905e5fc73d5b9513b4381b9025977e3c8544dd012d2775735456298c";
+    sha256 = "d49bbe531cdbf0a049f1581e4d3c63231ff5978445cb380aa6e7f8f1d256a29c";
   };
 
   # see https://github.com/nipy/nipype/issues/2240

From c61f9da147d583eee9df0f9c853f78cd629b3cef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1170/2793] python: nodeenv: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix
index ce4a2772d50..042ee1e3e61 100644
--- a/pkgs/development/python-modules/nodeenv/default.nix
+++ b/pkgs/development/python-modules/nodeenv/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "nodeenv";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vs9nyf9w3655j1vv3abxj4vbig61c0hjmhpfb91gblv32shl15a";
+    sha256 = "ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a";
   };
 
   # Tests not included in PyPI tarball

From a44c57ffd746db1d957a93e1967c42e93f95c302 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1171/2793] python: numpy: 1.15.3 -> 1.15.4

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

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 5710c9cc7a4..8a3879f1982 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -16,12 +16,12 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-  version = "1.15.3";
+  version = "1.15.4";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6";
+    sha256 = "3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7";
   };
 
   disabled = isPyPy;

From a81088887e23e1d890b8bd65bbcb7018f833b78f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1172/2793] python: paste: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index b0d1492fa3d..8b731624805 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "paste";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "96b06ff055c4f22a4e5c164551179ed1fa8263bc3ce69b4347c617cd0fcf51f4";
+    sha256 = "16500e43f710e93d94a540ee5f0f7743dee1791bdfc1e65d05703a2f13378207";
   };
 
   checkInputs = [ nose ];

From 31e148a31cb87919800eed23b8492dcaa4cd904e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1173/2793] python: pbr: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index ef6a87ab736..b3d13a0f648 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "5.1.0";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f20ec0abbf132471b68963bb34d9c78e603a5cf9e24473f14358e66551d47475";
+    sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68";
   };
 
   # circular dependencies with fixtures

From 91faf5877f7055819e70375624950f1d75733f74 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1174/2793] python: plotly: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 0b226aa8547..58ad690ce2d 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pq5k1b4gwdbdsb0alzgmr54zjvzf0csw5lq8s61zh5jnhfgn23y";
+    sha256 = "5dc85bde91bc80fa05f0d89e9f3a8eaee735b2b404047266874e0ff9c104407f";
   };
 
   propagatedBuildInputs = [

From 2fc1cc8e407916e83645b4f154a7e414f52170b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1175/2793] python: psycopg2: 2.7.5 -> 2.7.6

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

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 9d15ea694c7..8f42378b179 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.7.5";
+  version = "2.7.6";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
+    sha256 = "4a658550b0bcb259e97f77f2dc93ed6b108fe2eda963a9e6fc8b48040d542ec2";
   };
 
   buildInputs = lib.optional stdenv.isDarwin openssl;

From d6198515b40230f8d008aadb8a4bbb1c65a2ca46 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1176/2793] python: pylint: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
index ad3140cf157..778775ae786 100644
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ b/pkgs/development/python-modules/pylint/1.9.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cxr1j037hsm4spmvl64v2j2rdq72pc2z0gnn3iggd4np6y21wpz";
+    sha256 = "09bc539f85706f2cca720a7ddf28f5c6cf8185708d6cb5bbf7a90a32c3b3b0aa";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

From 3e563523a8dd3955a875a9c7237fcda94c08fe1a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1177/2793] python: pymongo: 2.9.1 -> 2.9.5

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

diff --git a/pkgs/development/python-modules/pymongo/2_9_1.nix b/pkgs/development/python-modules/pymongo/2_9_1.nix
index 181d99a93f6..8e0b0858754 100644
--- a/pkgs/development/python-modules/pymongo/2_9_1.nix
+++ b/pkgs/development/python-modules/pymongo/2_9_1.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "2.9.1";
+  version = "2.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nrr1fxyrlxd69bgxl7bvaj2j4z7v3zaciij5sbhxg0vqiz6ny50";
+    sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70";
   };
 
   # Tests call a running mongodb instance

From e7513eec6c8bc6f42338e1fe0024afbab0a2855d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1178/2793] python: pyramid: 1.10 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index 8826ae02ba9..3f8af5b82eb 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -21,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid";
-  version = "1.10";
+  version = "1.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3f91bcb8ee8ad3168eaf836d701b7b8c59481cec9ca085ab0251d1b953ffc46a";
+    sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0";
   };
 
   checkInputs = [ docutils virtualenv webtest zope_component ];

From 0930a6ceeeed326e8aafd6c3c10539caa3642500 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:26 +0100
Subject: [PATCH 1179/2793] python: pysrim: 0.5.9 -> 0.5.10

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

diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix
index dc6c09f7b70..8fb73455051 100644
--- a/pkgs/development/python-modules/pysrim/default.nix
+++ b/pkgs/development/python-modules/pysrim/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pysrim";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "071c5be48e58fa019f7848588f88ce0a09bfe6493c9ff5987829d162c0f4a497";
+    sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8";
   };
 
   buildInputs = [ pytestrunner ];

From 7de585e2b39d8128219e5ae33fc7905b63867b79 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1180/2793] python: pytest-sugar: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index 16cd9aa966a..e8b58acd670 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-sugar";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab8cc42faf121344a4e9b13f39a51257f26f410e416c52ea11078cdd00d98a2c";
+    sha256 = "fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab";
   };
 
   propagatedBuildInputs = [ termcolor pytest ];

From 023319dbad9af58fd85bf10979c62096916f6b81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1181/2793] python: pytest-xdist: 1.24.0 -> 1.24.1

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index fdfe0b3006e..9b1be86a7c8 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e188d13ce6614c7a678179a76f46231199ffdfe6163de031c17e62ffa256917";
+    sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 7c7f7ac96ad8afb466101a8d0b38c55c563d919a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1182/2793] python: python-hosts: 0.4.1 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index 08c617d750c..c2fcb5440ad 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-hosts";
-  version = "0.4.1";
+  version = "0.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a169a4669bddb720c032ef0132203ff8a7b6646266f7e6ab349177bab02b3ba";
+    sha256 = "1e5f04430fdaf09d6a7d9e82aa989669bc70fbba3e3e263f112a3e85193259b6";
   };
 
   # win_inet_pton is required for windows support

From b23235320faab5bbb7366d4f0b8530694f4c87f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1183/2793] python: python-json-logger: 0.1.9 -> 0.1.10

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

diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
index 312b6a106e6..381d54677d0 100644
--- a/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/pkgs/development/python-modules/python-json-logger/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.9";
+  version = "0.1.10";
   pname = "python-json-logger";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e3636824d35ba6a15fc39f573588cba63cf46322a5dc86fb2f280229077e9fbe";
+    sha256 = "cf2caaf34bd2eff394915b6242de4d0245de79971712439380ece6f149748cde";
   };
 
   checkInputs = [ nose ];

From c3e992df63b52fa5fc5621a0ab43a9e966515cf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1184/2793] python: regex: 2018.11.03 -> 2018.11.07

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

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index c54f310d0ca..9ec1675f69f 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2018.11.03";
+  version = "2018.11.07";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a8a645072ff7acc96b1a92c76863e324089cd3fd00bc3e41add4a7016c06761";
+    sha256 = "7bfb6e13ed8195513160550c3a82c49da8bbc6df5d149089cd37f51f36eddd39";
   };
 
   postCheck = ''

From 1fa6b1340ace73ac4d70d7fa7379a38580959dd1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1185/2793] python: requests: 2.20.0 -> 2.20.1

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

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 43cd7296d00..cf9660b0906 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.20.0";
+  version = "2.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c";
+    sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263";
   };
 
   nativeBuildInputs = [ pytest ];

From c705213448eee2d10c546397b3bc30198bc1531d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1186/2793] python: responses: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 140ab8ac163..5d110cf3bd4 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "responses";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "682fafb124e799eeee67ec15c9678d955a88affda5613b09788ef80c03987cf0";
+    sha256 = "5b99beef28dd177da180604be2e849a16c3a40605bfda7c8d792a9924dd3d60e";
   };
 
   propagatedBuildInputs = [ cookies mock requests six ];

From ed24b234e97a8c6cd32a64f9fadac7d2c075cec5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:27 +0100
Subject: [PATCH 1187/2793] python: SQLAlchemy: 1.2.13 -> 1.2.14

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index c0cca3562f7..c7ff2e56f02 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.2.13";
+  version = "1.2.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "84412de3794acee05630e7788f25e80e81f78eb4837e7b71d0499129f660486a";
+    sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04";
   };
 
   patches = [

From 1ed1ad27167fbc24d6e705cc7dbc55cc621682ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:28 +0100
Subject: [PATCH 1188/2793] python: virtualenv-clone: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 03a66b63165..a1b4cb82379 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv-clone";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7087ba4eb48acfd5209a3fd03e15d072f28742619127c98333057e32748d91c4";
+    sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405";
   };
 
   buildInputs = [ pytest ];

From 8c3aec6304c10d73f247f451625966d6d79daee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 12 Nov 2018 11:33:50 +0100
Subject: [PATCH 1189/2793] python.pkgs.pyjwt: disable tests

They are broken due to a pytest upgrade.
---
 pkgs/development/python-modules/pyjwt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index a3a770a0da5..835d1233f5f 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -22,6 +22,9 @@ buildPythonPackage rec {
     done
   '';
 
+  # https://github.com/jpadilla/pyjwt/issues/382
+  doCheck = false;
+
   meta = with lib; {
     description = "JSON Web Token implementation in Python";
     homepage = https://github.com/jpadilla/pyjwt;

From 846abe5eff7d03db52eec001abb0e8d1305dec09 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:34 +0100
Subject: [PATCH 1190/2793] python: Wand: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 0c4197f3b3d..8536a37bc36 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -15,11 +15,11 @@ let
   imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
 in buildPythonPackage rec {
   pname = "Wand";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704";
+    sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65";
   };
 
   checkInputs = [ pytest pytest_xdist memory_profiler psutil ];

From d19f46d68f036d20fdbf7c7e101589de7651a27a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:34 +0100
Subject: [PATCH 1191/2793] python: alembic: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 6402b1ea0b7..cc12243ab40 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04bcb970ca8659c3607ddd8ffd86cc9d6a99661c9bc590955e8813c66bfa582b";
+    sha256 = "4b6ff7433247fe80b6ef522ef3763acb959cbdef027d03f76f4cd3c7118c1872";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

From 8d0519e44fb677a359b34f5834578285aeba87d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:34 +0100
Subject: [PATCH 1192/2793] python: autopep8: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 03a084bf01a..0106deb7eb7 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "autopep8";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b8d42ebba751a91090d3adb5c06840b1151d71ed43e1c7a9ed6911bfe8ebe6c";
+    sha256 = "33d2b5325b7e1afb4240814fe982eea3a92ebea712869bfd08b3c0393404248c";
   };
 
   propagatedBuildInputs = [ pycodestyle ];

From 858b968fed6b0134ea8963e8a1b3e13034656a0a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1193/2793] python: awkward: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 47d3ae25fc0..c75b318ddc2 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.3";
+  version = "0.4.4";
   pname = "awkward";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "41cca910df0faaa30bb9a7682826f3d6f099cb1fd2af452f45a1dd99305db579";
+    sha256 = "08ce07d564e381e70dd38c6bf241fa303b09b408b02db648ff91f354f01e7439";
   };
 
   propagatedBuildInputs = [ numpy ];

From 6119a9a5bae30b2481841e3e6430cf71dc80918b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1194/2793] python: backports.shutil_which: 3.5.1 -> 3.5.2

---
 .../python-modules/backports-shutil-which/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
index 9900f86567e..95cbd7ca041 100644
--- a/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "backports.shutil_which";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx";
+    sha256 = "fe39f567cbe4fad89e8ac4dbeb23f87ef80f7fe8e829669d0221ecdb0437c133";
   };
 
   checkInputs = [ pytest ];

From ab12541888a75093bf1bc1f0f0c10fc383b9d9a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1195/2793] python: botocore: 1.12.42 -> 1.12.48

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 75ce31530cf..e67256b0853 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -7,15 +7,16 @@
 , simplejson
 , mock
 , nose
+, urllib3
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.12.42";
+  version = "1.12.48";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0e495bcf2e474b82da7938b35ad2f71e28384c246b47ca131779f736621da504";
+    sha256 = "7140e51ab0a7aa3b7fa9cf5fefa663e0cd097098fcbd51b12ff8884c8d967754";
   };
 
   propagatedBuildInputs = [
@@ -24,6 +25,7 @@ buildPythonPackage rec {
     docutils
     ordereddict
     simplejson
+    urllib3
   ];
 
   checkInputs = [ mock nose ];

From 7f6a1b251d5ea3a43fdd4b71dc2f7d46e8a9893b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1196/2793] python: coverage: 4.5.1 -> 4.5.2

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

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 0aa38aed296..1b0839fd488 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1";
+    sha256 = "ab235d9fe64833f12d1334d29b558aacedfbca2356dfb9691f2d0d38a8a7bfb4";
   };
 
   # No tests in archive

From 5b85111947194b1c6f607644800930118a5cf2ea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1197/2793] python: dask: 0.20.1 -> 0.20.2

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 3d9dd501081..86fc85f8d69 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1587202f46ffba3861a18f99195139789b5d810de42bfb940baf75eff0cf769d";
+    sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3";
   };
 
   checkInputs = [ pytest ];

From c07932cdacb1159c050aa90ef9d56dbb890db061 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1198/2793] python: deform: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index 3951558cf27..ecbc9fd21b6 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "deform";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bda0b809c8a668e105e30650a6766103207eafdd12c313acd59274ccd2c4d297";
+    sha256 = "2ff29c32ebe544c0f0a77087e268b2cd9cb4b11fa35af3635d5b42913f88d74a";
   };
 
   postPatch = ''

From 6aad72703708cc1232761309721bfcfe4d5ec471 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1199/2793] python: distributed: 1.24.1 -> 1.24.2

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 89b7677bf56..48bed16ad96 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -26,12 +26,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "1.24.1";
+  version = "1.24.2";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13qch8wgjzx9zadaxasym3bp3a74bg5snhnbznpggssv3hyshca7";
+    sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
   };
 
   checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

From 9db071258f798eafa291c93fc1b0d0794dbcf345 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1200/2793] python: django-redis: 4.9.0 -> 4.9.1

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

diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
index 3a362029c1a..e50b1e1cb65 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -2,11 +2,11 @@
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
-  version = "4.9.0";
+  version = "4.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155";
+    sha256 = "93fc0f73b0c1736546a979a4996826b2c430f56f7e4176df40ef53b9cb0e4f36";
   };
 
   doCheck = false;

From fe703fbb0e7645dfeb0e4bc8caea1edbeef74265 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1201/2793] python: dulwich: 0.19.8 -> 0.19.9

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index af9ddb6d40e..ca0c2b8e3d3 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.19.8";
+  version = "0.19.9";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5743b4a7dddf105316c5bed75f4e97503d26f9b07e4c61044aa81b57322edf8e";
+    sha256 = "5e1e39555f594939a8aff1ca08b3bdf6c7efd4b941c2850760983a0197240974";
   };
 
   LC_ALL = "en_US.UTF-8";

From d51b0f1472fe3195a9e67c5fe3fcfad35756e4c5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1202/2793] python: Faker: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 48d28dfc669..f11990a87b0 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2621643b80a10b91999925cfd20f64d2b36f20bf22136bbdc749bb57d6ffe124";
+    sha256 = "8c6df7903c7b4a51f4ac273bc5fec79a249e3220c47b35d1ac1175b41982d772";
   };
 
   checkInputs = [

From b857dc3fed2d900089515a96c665e0e5cfe17f2f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1203/2793] python: Fiona: 1.8.0 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index f14909fcd3a..d7586fd9955 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.8.0";
+  version = "1.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20141a9ece06daa7bb4333fba640c2fe39a49f8aca5492d1da8595d41e91844a";
+    sha256 = "4c6419b7ac29136708029f6a44b4ccd458735a4d241016c7b1bab41685c08d8f";
   };
 
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

From b788ee30f7abb0d6674016e80ef023e6f94886dd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1204/2793] python: gin-config: 0.1.1.2 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix
index 3a854646021..893f7bf5875 100644
--- a/pkgs/development/python-modules/gin-config/default.nix
+++ b/pkgs/development/python-modules/gin-config/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "gin-config";
-  version = "0.1.1.2";
+  version = "0.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zqzhg8nqdqjx0sjrsrs9bpyiaqqlyihqhhy2ijrpp62x9rjllga";
+    sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287";
 
   };
 

From 9b677037ffb3e9585cfd4d3bb98c8d72766da874 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:35 +0100
Subject: [PATCH 1205/2793] python: gmusicapi: 11.0.3 -> 11.0.4

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

diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix
index 8f184922cef..d2bf002cd5f 100644
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "gmusicapi";
-  version = "11.0.3";
+  version = "11.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ffa3892ee39a110e48a383b2e571a72a12109bf978985020fe56e334e45c72c";
+    sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8";
   };
 
   propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];

From 0731b517794e6d2afc84f2d1e87266bd93ea3a7b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1206/2793] python: homeassistant_pyozw: 0.1.0 -> 0.1.1

---
 .../python-modules/homeassistant-pyozw/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix
index c4410cfdbcf..a0861b0cffd 100644
--- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix
+++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix
@@ -2,12 +2,12 @@
 
 python_openzwave.overridePythonAttrs (oldAttrs: rec {
   pname = "homeassistant_pyozw";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "bca4062906f65db9b4668388e6755d6ea3ee9e1b02ad3ed81738bb4d32a79342";
+    sha256 = "136582d1b948168991af8ba1011304684834a4a61a6588e1c1f70b439b6f2483";
   };
 
   meta.homepage = https://github.com/home-assistant/python-openzwave;

From a0791f4147d22499ec71842270909724803ceb97 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1207/2793] python: hupper: 1.4 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 948c36d03c9..1715e6eeb45 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "hupper";
-  version = "1.4";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f9d9ab2457fdd01ee20278d3d7dfc91c49cae329863f47571a4a2e78d90fa738";
+    sha256 = "17dd6f59e7cd52166302b2a6a3112e03fb4612eaff9bb19cd0603cf67e03c5cf";
   };
 
   checkPhase = ''

From 6c0a5b66b0f1295af11da52e0fa441af1f86bf82 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1208/2793] python: inflect: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 8c58a4f9de7..9d3511e41d1 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "inflect";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ec42f5d5d2baa54ba6e3fa23698554c09362dd478cc66b3c28c5d0b76d7d0581";
+    sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5";
   };
 
   buildInputs = [ setuptools_scm ];

From 232d4443e5e5caf8d7a202601f1edb37fad8c230 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1209/2793] python: libagent: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index f9395886040..eb58cc0b2d5 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "libagent";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "55af1ad2a6c95aef1fc5588c2002c9e54edbb14e248776b64d00628235ceda3e";
+    sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5";
   };
 
   propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse

From 2db81fb827820560429f95540e3de9c88067ea2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1210/2793] python: neovim: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index 20479093a47..1a61e3c727d 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "neovim";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18x7gi1idsch11hijvy0mm2mk4f42rapz9niax4rnak14x2klqq2";
+    sha256 = "a6a0e7a5b4433bf4e6ddcbc5c5ff44170be7d84259d002b8e8d8fb4ee78af60f";
   };
 
   checkInputs = [ nose ];

From 90f5c97b6d945e11c83a361e811df5c9fe70a9de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1211/2793] python: node-semver: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index a5ba1421701..004ec42718e 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  version = "0.5.0";
+  version = "0.5.1";
   pname = "node-semver";
 
   checkInputs = [ pytest ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1717prxvnxhndjyxasr1lcbnfk9i1dy1cnchvw7zk67h7kmw3by7";
+    sha256 = "b87e335179d874a3dd58041198b2715ae70fd20eba81683acde3553c51b28f8e";
   };
 
   meta = with stdenv.lib; {

From 33a1bbed7d0148ccc394f1516329393183c4920b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1212/2793] python: notebook: 5.7.0 -> 5.7.2

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index abf4df68aa8..69bf334110d 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "5.7.0";
+  version = "5.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7";
+    sha256 = "91705b109fc785198faed892489cddb233265564d5e2dad5e4f7974af05ee8dd";
   };
 
   LC_ALL = "en_US.utf8";

From 403f1d98bd8711e0e1076acf9ab4e100548035fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1213/2793] python: openpyxl: 2.5.9 -> 2.5.10

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

diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 9cee051cbcf..32a0528fbc6 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,16 +9,22 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "2.5.9";
+  version = "2.5.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "022c0f3fa1e873cc0ba20651c54dd5e6276fc4ff150b4060723add4fc448645e";
+    sha256 = "41eb21a5620343d715b38081536c4ed3c37249afb72e569fd2af93852ed4ddde";
   };
 
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ jdcal et_xmlfile lxml ];
 
+  postPatch = ''
+    # LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway
+    # This should likely be removed in the next update
+    rm setup.cfg
+  '';
+
   # Tests are not included in archive.
   # https://bitbucket.org/openpyxl/openpyxl/issues/610
   doCheck = false;

From 2d1a919b681628691fbac227a0baf8a87219db5a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1214/2793] python: paperspace: 0.0.11 -> 0.0.12

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

diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index b6cec2150a9..46b16679350 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "paperspace";
-  version = "0.0.11";
+  version = "0.0.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z19arikcjpfvp3bgssnlhplm1qzgw95s3r5fnsyf7nwmc4pvvpa";
+    sha256 = "9e7192ee9270768c0dba44969d49730c17d2f955c201798706cdcbc407310d64";
   };
 
   propagatedBuildInputs = [ boto3 requests ];

From f243abc1e855cc2305bce2642cc2baf332f91cc1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1215/2793] python: pex: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 00e1513c049..90f6d5a85e0 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6143465a09ca84dc0000ffc74c6eaf8f3210e590150e115832974994479b662b";
+    sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd";
   };
 
   prePatch = ''

From 1d0913719db2cb947e9a8339c85a7a2992533cf5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1216/2793] python: pgspecial: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 84ccea15e98..513ae254217 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yq3cmpdcvwsz3nifc0db125433vxbgbpmbhxfj46b9s5k81xs30";
+    sha256 = "f183da55c37128f7a74fe5b28e997991156f19961e59a1ad0f400ffc9535faba";
   };
 
   buildInputs = [ pytest psycopg2 ];

From 82a67416c0f287555243edaef416cb7ea22442a9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:36 +0100
Subject: [PATCH 1217/2793] python: psycopg2: 2.7.6 -> 2.7.6.1

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

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 8f42378b179..82b3edfdc0f 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.7.6";
+  version = "2.7.6.1";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a658550b0bcb259e97f77f2dc93ed6b108fe2eda963a9e6fc8b48040d542ec2";
+    sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82";
   };
 
   buildInputs = lib.optional stdenv.isDarwin openssl;

From 6503842b8aade7e64b4ff81b1dbc509bfb37c5f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1218/2793] python: pyannotate: 1.0.6 -> 1.0.7

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

diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
index 5bcf07f1015..db48bb06bc0 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -9,12 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.6";
+  version = "1.0.7";
   pname = "pyannotate";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dbdc2a26cbf45490a650e976ba45f99abe9ddbf0af5746307914e5ef419e325e";
+    sha256 = "54e6035a8601248992e17734034e6555842c6ea9863f90c15d14fe76a184be07";
   };
 
   checkInputs = [ pytest ];

From 8c6bedb0895dca9c79d8a22b982b1fd6264a5bde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1219/2793] python: pyhomematic: 0.1.51 -> 0.1.52

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

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 15bb376a0b8..521d06cfdff 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.51";
+  version = "0.1.52";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cgzyb0bnzh7xy9nz28sncl941rk51ib1liypj27y7iq3g6pjhi7";
+    sha256 = "4947b75401245d3a69de698617bb81fcba1ed7fd56c15d339a5f3b2bbbc391f7";
   };
 
   # PyPI tarball does not include tests/ directory

From dc8546b7ae8e7f0d6dfece9b1b08163ac9c47473 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1220/2793] python: pyrsistent: 0.14.5 -> 0.14.6

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 787d2a13f7a..0c32c4ef386 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.14.5";
+  version = "0.14.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f64dd1b706c31f7aa24495a7da58c0407c072981289b675331e2a16364355102";
+    sha256 = "5a31f6b093da3401fefdeb53a0980e3145bb9d2bf852b579cc7b39c7f0016c87";
   };
 
   propagatedBuildInputs = [ six ];

From 4f28f0d0244a1e5214ec32713c619fb80d6da28c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1221/2793] python: pytest-localserver: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index 3db802e6e3d..7daffbfa69c 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-localserver";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a72af60a1ec8f73668a7884c86baf1fbe48394573cb4fa36709887217736c021";
+    sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07";
   };
 
   propagatedBuildInputs = [ werkzeug ];

From f85ca66258ecadea89c75a5b62cc884fd5ceffd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1222/2793] python: QtAwesome: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 1d5a6cdfda4..fbebabc890a 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtAwesome";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b5l9xmymyqlkm1phxyfw3s94ydkk3hykndjbkb24n5nfy46h5gl";
+    sha256 = "8dfd8bcac56caa6d81639fc43db673b62aeca6129f4c8e9b1da17a32c0d309fd";
   };
 
   propagatedBuildInputs = [ qtpy six pyside ];

From e89f5a9c7995423f9a2c42f3cc5f6a472036231b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1223/2793] python: reportlab: 3.5.9 -> 3.5.10

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 82d2889364f..ab0c3d4eacf 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.5.9";
+  version = "3.5.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f92f81314807cd860f29fe07a1a4100b03910ae6bbfca20a07e02c3b460f4f20";
+    sha256 = "9041d17556b9652cd9cf13b56a4efad7b51df6c567279ced26584cb4eb712b09";
   };
 
   checkInputs = [ glibcLocales ];

From 15671222ad0edb7622f59b299eab52cf16ef9963 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1224/2793] python: responses: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 5d110cf3bd4..37f72dde035 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "responses";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b99beef28dd177da180604be2e849a16c3a40605bfda7c8d792a9924dd3d60e";
+    sha256 = "16ad4a7a914f20792111157adf09c63a8dc37699c57d1ad20dbc281a4f5743fb";
   };
 
   propagatedBuildInputs = [ cookies mock requests six ];

From a562c0dba07892e8ecf29a5749b976ef3028435d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1225/2793] python: ropper: 1.11.8 -> 1.11.10

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

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 95f948dde4b..527063d02f9 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonApplication rec {
   pname = "ropper";
-  version = "1.11.8";
+  version = "1.11.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f2ba5ff34ebc5faaa87d34b58178706a13a08e848126197c0fdb0af7822f93a2";
+    sha256 = "b8d1439d8a6ef7b93718472b0288ee88a5953723046772f035fe989b1c1e5d6e";
   };
   # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
   # workaround: sudo chmod 777 /dev/shm

From e7af5121e6be6c7ced62d9ff0b5f7e63fa5ebf14 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1226/2793] python: sseclient: 0.0.20 -> 0.0.22

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

diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix
index 005d1fde738..484f4c7b17c 100644
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "sseclient";
-  version = "0.0.20";
+  version = "0.0.22";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h5d3lr1g1m03cz5n3bbzrg39ympjk88qd9gkrm7bic6yp73iwrd";
+    sha256 = "bf1eab60b09edbaa51e42f65a18b715367d55cfdf57c1f162886bac97bb5c6fb";
   };
 
   propagatedBuildInputs = [ requests six ];

From 80b71ad568874eb479cc848b570170281f24296a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1227/2793] python: Unidecode: 1.0.22 -> 1.0.23

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

diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index 1b98b8adf73..13f0053f143 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Unidecode";
-  version = "1.0.22";
+  version = "1.0.23";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5";
+    sha256 = "8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb";
   };
 
   LC_ALL="en_US.UTF-8";

From e7dd7f3c3dd0ac39f4b9e08aa10118256dd8eab3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1228/2793] python: WebOb: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 0c25c865b19..2d30fc74830 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "WebOb";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b0853dad347ca3777755b6d0659bb45efbeea71f995d8a395291ef6ad5d4f8b2";
+    sha256 = "a48315158db05df0c47fbdd061b57ba0ba85bdd0b6ea9dca87511b4b7c798e99";
   };
 
   propagatedBuildInputs = [ nose pytest ];

From 23b234d88e438052f0949d4f9a77d9ba32b32326 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1229/2793] python: wheel: 0.32.2 -> 0.32.3

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

diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index fee7f8f73cd..6135409328b 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "wheel";
-  version = "0.32.2";
+  version = "0.32.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "196c9842d79262bb66fcf59faa4bd0deb27da911dbc7c6cdca931080eb1f0783";
+    sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6";
   };
 
   checkInputs = [ pytest pytestcov coverage ];

From d43a8b7d86c32ade9fc2534b8d16c88e7eaf0cde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 20 Nov 2018 11:58:37 +0100
Subject: [PATCH 1230/2793] python: whitenoise: 4.1 -> 4.1.2

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

diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index 7e543e0be04..b7812b42e66 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "whitenoise";
-  version = "4.1";
+  version = "4.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32b57d193478908a48acb66bf73e7a3c18679263e3e64bfebcfac1144a430039";
+    sha256 = "42133ddd5229eeb6a0c9899496bdbe56c292394bf8666da77deeb27454c0456a";
   };
 
   # No tests

From 8bd9e91c72b4b90b5c1f977c951c5472a5cb108c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 12:19:56 +0100
Subject: [PATCH 1231/2793] python.pkgs.importlib-resources: init at 1.0.2

---
 .../importlib-resources/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/importlib-resources/default.nix

diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
new file mode 100644
index 00000000000..331c88a5e3a
--- /dev/null
+++ b/pkgs/development/python-modules/importlib-resources/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pathlib2
+, typing
+, isPy3k
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "importlib_resources";
+  version = "1.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078";
+  };
+
+  propagatedBuildInputs = [
+  ] ++ lib.optional (!isPy3k) pathlib2
+    ++ lib.optional (pythonOlder "3.5") typing
+  ;
+
+  # https://gitlab.com/python-devs/importlib_resources/issues/69
+  doCheck = !isPy3k;
+
+  meta = with lib; {
+    description = "Read resources from Python packages";
+    homepage = https://importlib-resources.readthedocs.io/;
+    license = licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f5323baa30..e2edd49c5c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5078,6 +5078,8 @@ in {
 
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };
 
+  importlib-resources = callPackage ../development/python-modules/importlib-resources {};
+
 });
 
 in fix' (extends overrides packages)

From 70948dc0fa3bff1f60e01290bd351b9dfbd23029 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 12:20:14 +0100
Subject: [PATCH 1232/2793] python.pkgs.importlib-metadata: init at 0.6

---
 .../importlib-metadata/default.nix            | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/importlib-metadata/default.nix

diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
new file mode 100644
index 00000000000..55c835e75cc
--- /dev/null
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pathlib2
+, contextlib2
+, isPy3k
+, importlib-resources
+}:
+
+buildPythonPackage rec {
+  pname = "importlib-metadata";
+  version = "0.6";
+
+  src = fetchPypi {
+    pname = "importlib_metadata";
+    inherit version;
+    sha256 = "36b02c84f9001adf65209fefdf951be8e9014a95eab9938c0779ad5670359b1c";
+  };
+
+  propagatedBuildInputs = [] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 ];
+
+  checkInputs = [ importlib-resources ];
+
+  meta = with lib; {
+    description = "Read metadata from Python packages";
+    homepage = https://importlib-metadata.readthedocs.io/;
+    license = licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2edd49c5c6..23e40d6c250 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5078,6 +5078,8 @@ in {
 
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };
 
+  importlib-metadata = callPackage ../development/python-modules/importlib-metadata {};
+
   importlib-resources = callPackage ../development/python-modules/importlib-resources {};
 
 });

From faf47b0c23c616dbeac56e332f89db37bcd930a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 16:17:34 +0100
Subject: [PATCH 1233/2793] python: setuptools: 40.5.0 -> 40.6.2

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

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 50b39c78526..09f848d456b 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "40.5.0";
+  version = "40.6.2";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2a2a200f4a760adbded23a091a00be2eca4e28efed65c6120ea275f7e89a1eab";
+    sha256 = "86bb4d8e1b0fabad1f4642b64c335b673e53e7a381de03c9a89fe678152c4c64";
   };
 
   nativeBuildInputs = [ unzip wrapPython ];

From c02b47b625ae36df8a1758ad64970359e30dc482 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Nov 2018 16:18:48 +0100
Subject: [PATCH 1234/2793] python.pkgs.bootstrapped-pip: setuptools: 40.4.3 ->
 40.6.2

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

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 869eaa1663f..acaa62a34ab 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,9 +9,9 @@ let
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "40.4.3";
+    version = "40.6.2";
     format = "wheel";
-    sha256 = "1zzryv1fqx4nk7hzv4afxpl8k7f60lc0qkhxlc8sqjs4igakfhff";
+    sha256 = "88ee6bcd5decec9bd902252e02e641851d785c6e5e75677d2744a9d13fed0b0a";
   };
 
 in stdenv.mkDerivation rec {

From da6a111be1deba44f895e14982d4032207a74af0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 10:51:36 +0100
Subject: [PATCH 1235/2793] fixup zope_testrunner

---
 pkgs/development/python-modules/zope_testrunner/default.nix  | 2 --
 .../python-modules/zope_testrunner/test-selection.patch      | 5 -----
 2 files changed, 7 deletions(-)
 delete mode 100644 pkgs/development/python-modules/zope_testrunner/test-selection.patch

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index 79309eb37ea..7cd78949168 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -17,8 +17,6 @@ buildPythonPackage rec {
     sha256 = "f3856a79ab0e4ff74addc3e6c152b388dddee548345b440767b6361f635bd9b7";
   };
 
-  patches = [ ./test-selection.patch ];
-
   propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/zope_testrunner/test-selection.patch b/pkgs/development/python-modules/zope_testrunner/test-selection.patch
deleted file mode 100644
index 89dd7773885..00000000000
--- a/pkgs/development/python-modules/zope_testrunner/test-selection.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/src/zope/testrunner/tests/testrunner-test-selection.txt
-+++ b/src/zope/testrunner/tests/testrunner-test-selection.txt
-@@ -235 +235 @@ and by test within the module using the --test (-t) option:
--    >>> sys.argv = 'test -u  -vv -ssample1 -m_one -mtest1 -tx0 -ty0'.split()
-+    >>> sys.argv = 'test -u  -vv -ssample1 -m_one -mtest1 -t_x0 -t_y0'.split()

From 9d30105575c8c3570a5a93b13e24cb30bfec1fd4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 10:54:43 +0100
Subject: [PATCH 1236/2793] fixup zope_configuration

---
 .../python-modules/zope_configuration/default.nix        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix
index 3529af60e43..42d3842c451 100644
--- a/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/pkgs/development/python-modules/zope_configuration/default.nix
@@ -3,6 +3,8 @@
 , fetchPypi
 , zope_i18nmessageid
 , zope_schema
+, zope_testrunner
+, manuel
 , isPy3k
 }:
 
@@ -15,11 +17,12 @@ buildPythonPackage rec {
     sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3";
   };
 
+  checkInputs = [ zope_testrunner manuel ];
+
   propagatedBuildInputs = [ zope_i18nmessageid zope_schema ];
 
-  # Trouble with implicit namespace packages on Python3
-  # see https://github.com/pypa/setuptools/issues/912
-  doCheck = !isPy3k;
+  # Need to investigate how to run the tests with zope-testrunner
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Zope Configuration Markup Language (ZCML)";

From bf3d63789b61aba3a3c7b13194f0846323c4319a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:16:22 +0100
Subject: [PATCH 1237/2793] fixup aws-xray-sdk

---
 pkgs/development/python-modules/aws-xray-sdk/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 838a0cf063b..10511c9f439 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -5,6 +5,7 @@
 , wrapt
 , requests
 , future
+, botocore
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    jsonpickle wrapt requests future
+    jsonpickle wrapt requests future botocore
   ];
 
   meta = {

From 07d70374d5d00344444ee4a0755f04578c5ddd2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:17:15 +0100
Subject: [PATCH 1238/2793] fixup hmmlearn

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

diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index 90111935e68..db8ff5726ab 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, numpy }:
+{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "hmmlearn";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "d43f5b25f9019ef5d01914d0972a5fa0594e82ab75d2c6aec26d682e47bd553c";
   };
 
-  propagatedBuildInputs = [ numpy ];
+  propagatedBuildInputs = [ numpy scikitlearn ];
 
   doCheck = false;
 
@@ -19,6 +19,5 @@ buildPythonPackage rec {
     homepage    = https://github.com/hmmlearn/hmmlearn;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ abbradar ];
-    platforms   = platforms.unix;
   };
 }

From 7cc74a720e4744c95235d528f271e09ce5a1e481 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:19:07 +0100
Subject: [PATCH 1239/2793] fixup google_apputils

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

diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google_apputils/default.nix
index 22d309acbcd..51b03bf5594 100644
--- a/pkgs/development/python-modules/google_apputils/default.nix
+++ b/pkgs/development/python-modules/google_apputils/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
     ${python.executable} setup.py google_test
   '';
 
-  doCheck = true;
+  # ERROR:root:Trying to access flag test_tmpdir before flags were parsed.
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Google Application Utilities for Python";

From 1656ae5c2bd2f55d2dd699a0b8fb29c4b8aa8001 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:23:38 +0100
Subject: [PATCH 1240/2793] fixup pyutil

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

diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index 6b458904e32..13ea7b75ae3 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []);
-  propagatedBuildInputs = [ zbase32 argparse twisted ];
+  propagatedBuildInputs = [ argparse twisted ];
 
   # Tests fail because they try to write new code into the twisted
   # package, apparently some kind of plugin.

From 0fdd47e5098fd053e16da961ae11a51d0adc604e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:23:47 +0100
Subject: [PATCH 1241/2793] fixup zbase32

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

diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix
index 97af3c2aa93..a5002e80f49 100644
--- a/pkgs/development/python-modules/zbase32/default.nix
+++ b/pkgs/development/python-modules/zbase32/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
+, pyutil
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
   # Tests require `pyutil' so disable them to avoid circular references.
   doCheck = false;
 
-  propagatedBuildInputs = [ setuptoolsDarcs ];
+  propagatedBuildInputs = [ setuptoolsDarcs pyutil ];
 
   meta = with stdenv.lib; {
     description = "zbase32, a base32 encoder/decoder";

From 8864410439b50ec4c8fff0635a4dbf7ce8607fc4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:32:43 +0100
Subject: [PATCH 1242/2793] python.pkgs.flexmock: init at 0.10.2

---
 .../python-modules/flexmock/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/flexmock/default.nix

diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix
new file mode 100644
index 00000000000..b80aafe3bf2
--- /dev/null
+++ b/pkgs/development/python-modules/flexmock/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "flexmock";
+  version = "0.10.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fe95c8727f4db73dc8f2f7b4548bffe7992440a965fefd60da291abda5352c2b";
+  };
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes.";
+    homepage = http://flexmock.readthedocs.org;
+    license = licenses.bsdOriginal;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23e40d6c250..888b2008501 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1663,6 +1663,8 @@ in {
 
   fedpkg = callPackage ../development/python-modules/fedpkg { };
 
+  flexmock = callPackage ../development/python-modules/flexmock { };
+
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };

From 3d0f73ca12b318bf10dec443ca3ba3ff8515cfa3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:32:54 +0100
Subject: [PATCH 1243/2793] python.pkgs.iocapture: init at 0.1.2

---
 .../python-modules/iocapture/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/iocapture/default.nix

diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
new file mode 100644
index 00000000000..dd9ca9f6476
--- /dev/null
+++ b/pkgs/development/python-modules/iocapture/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flexmock
+, pytest
+, pytest-cov
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "iocapture";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8";
+  };
+
+  checkInputs = [
+    flexmock
+    pytest
+    pytest-cov
+    six
+  ];
+
+  meta = with lib; {
+    description = "Capture stdout, stderr easily.";
+    homepage = https://github.com/oinume/iocapture;
+    license = licenses.MIT;
+    # maintainers = [ maintainers. ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 888b2008501..1a3398fb83a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2664,6 +2664,8 @@ in {
 
   interruptingcow = callPackage ../development/python-modules/interruptingcow {};
 
+  iocapture = callPackage ../development/python-modules/iocapture { };
+
   iptools = callPackage ../development/python-modules/iptools { };
 
   ipy = callPackage ../development/python-modules/IPy { };

From b241e766bce038bf21ccd9718900c35cb4b9162e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:35:58 +0100
Subject: [PATCH 1244/2793] fixup iocapture

---
 pkgs/development/python-modules/iocapture/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
index dd9ca9f6476..d1c01b4f653 100644
--- a/pkgs/development/python-modules/iocapture/default.nix
+++ b/pkgs/development/python-modules/iocapture/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , flexmock
 , pytest
-, pytest-cov
+, pytestcov
 , six
 }:
 
@@ -19,14 +19,16 @@ buildPythonPackage rec {
   checkInputs = [
     flexmock
     pytest
-    pytest-cov
+    pytestcov
     six
   ];
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with lib; {
     description = "Capture stdout, stderr easily.";
     homepage = https://github.com/oinume/iocapture;
     license = licenses.MIT;
-    # maintainers = [ maintainers. ];
   };
 }
\ No newline at end of file

From 8d283ab58a2921b76eee39e088d1ad1452c408ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:36:04 +0100
Subject: [PATCH 1245/2793] fixup argh

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

diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix
index 3de0815d7b2..ef21a3f871d 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/pkgs/development/python-modules/argh/default.nix
@@ -4,7 +4,8 @@
 , pytest
 , py
 , mock
-, pkgs
+, glibcLocales
+, iocapture
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
   };
 
-  buildInputs = [ pytest py mock pkgs.glibcLocales ];
+  checkInputs = [ pytest py mock glibcLocales iocapture ];
 
   checkPhase = ''
     export LANG="en_US.UTF-8"

From b5136138bd4f873d9d7094980fec587ce242ea70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:40:37 +0100
Subject: [PATCH 1246/2793] fixup flask-restplus

---
 pkgs/development/python-modules/flask-restplus/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index 7246183bd8a..f7f8360fa48 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -12,6 +12,8 @@
 , pytz
 , aniso8601
 , flask-restful
+, isPy27
+, enum34
 }:
 
 buildPythonPackage rec {
@@ -24,7 +26,8 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose blinker tzlocal mock rednose ];
-  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ];
+  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]
+   ++ lib.optional isPy27 enum34;
 
   # RuntimeError: Working outside of application context.
   doCheck = false;

From b5cb0f0deefccf9eb62f3933822fa7c17779fc92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:49:48 +0100
Subject: [PATCH 1247/2793] python.pkgs.cytoolz: disable a test

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

diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index aefe250effe..902741231f4 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -22,9 +22,9 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
   propagatedBuildInputs = [ toolz ];
 
-  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
+  # Failing test https://github.com/pytoolz/cytoolz/issues/122
   checkPhase = ''
-    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
+    NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages}
   '';
 
   meta = {

From 86cd63efd38ac5a9aec5308b6b822001d77d9440 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:51:51 +0100
Subject: [PATCH 1248/2793] python.pkgs.m2crypto: fix build

---
 pkgs/development/python-modules/m2crypto/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 02df30e99ce..b034d5d090c 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -1,7 +1,9 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgs
+, swig2
+, openssl
+, typing
 }:
 
 
@@ -14,10 +16,12 @@ buildPythonPackage rec {
     sha256 = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6";
   };
 
-  buildInputs = [ pkgs.swig2 pkgs.openssl ];
+  buildInputs = [ swig2 openssl ];
+
+  propagatedBuildInputs = [ typing ];
 
   preConfigure = ''
-    substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl.dev}'"
+    substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'"
   '';
 
   doCheck = false; # another test that depends on the network.

From 6e62e485210428523e3969342ef1c69aa77db106 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 14:57:36 +0100
Subject: [PATCH 1249/2793] awscli: fix build

---
 pkgs/tools/admin/awscli/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index ccd9f05a335..052f4abb8af 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -7,11 +7,11 @@
 let
   py = python.override {
     packageOverrides = self: super: {
-      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
-        version = "0.3.7";
+      rsa = super.rsa.overridePythonAttrs (oldAttrs: rec {
+        version = "3.4.2";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+          sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
         };
       });
     };
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.15.66";
+  version = "1.16.60";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
+    sha256 = "25bcc6cf2304356a78429671999857ff33f88761d81bcee63463a86a6780dcdc";
   };
 
   # No tests included
@@ -44,7 +44,7 @@ in py.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     for i in {py,cfg}; do
-      substituteInPlace setup.$i --replace "botocore==1.10.65" "botocore>=1.10.9,<=1.11"
+      substituteInPlace setup.$i --replace "botocore==1.12.50" "botocore>=1.11,<1.13"
     done
   '';
 

From f5d60b80b8cfff52ba0ca7144ded4a3689b25dfd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Nov 2018 13:39:43 -0600
Subject: [PATCH 1250/2793] pythonPackages.cython: 0.29 -> 0.29.1

https://cython.readthedocs.io/en/latest/src/changes.html#id2
(link not stable/permanent as new versions release)
---
 pkgs/development/python-modules/Cython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 7f252fb58cb..223a519ec89 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -26,11 +26,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.29";
+  version = "0.29.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15zama7fgp7yyi3z39xp3z2lvwcgch8fn3ycscw2cs37vqg6v4cl";
+    sha256 = "15zv9c4ami9hzya28wz1shqljbbk5sxdvqbjxqnf15ssk137daqq";
   };
 
   nativeBuildInputs = [

From 3db122cd9f2f7b27451d2a92ec7e6d2f005b75e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 25 Nov 2018 12:57:31 +0100
Subject: [PATCH 1251/2793] python.pkgs.ddt: fix tests

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

diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix
index 0399f93bab0..f09bf96229f 100644
--- a/pkgs/development/python-modules/ddt/default.nix
+++ b/pkgs/development/python-modules/ddt/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, nose, six, pyyaml, mock
 }:
 
 buildPythonPackage rec {
@@ -12,6 +13,12 @@ buildPythonPackage rec {
     sha256 = "898364fc34b27981b925171a0011c174c94633cb678eb1fac05fe7a234c7912c";
   };
 
+  checkInputs = [ nose six pyyaml mock ];
+
+  checkPhase = ''
+    nosetests -s
+  '';
+
   meta = with stdenv.lib; {
     description = "Data-Driven/Decorated Tests, a library to multiply test cases";
     homepage = https://github.com/txels/ddt;

From 36858068082790d2adba9cb2b202ed1f571cc84d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 29 Nov 2018 09:28:12 +0100
Subject: [PATCH 1252/2793] python: boto3: 1.7.84 -> 1.9.36

---
 pkgs/development/python-modules/boto3/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 31f050007a6..db505d84eea 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , botocore
 , jmespath
 , s3transfer
@@ -13,13 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.7.84";
+  version = "1.9.36";
 
-  src = fetchFromGitHub {
-    owner = "boto";
-    repo  = "boto3";
-    rev   = version;
-    sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2a9f3809b480803c1b1f28a19c554f1e1ceafd8db994a4236a0843b999ee6c56";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
@@ -47,4 +45,4 @@ buildPythonPackage rec {
       services like Amazon S3 and Amazon EC2.
     '';
   };
-}
\ No newline at end of file
+}

From 9dba3231cd6c515c5a204c773a00873846e0ae5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 29 Nov 2018 10:18:19 +0100
Subject: [PATCH 1253/2793] python.pkgs.acoustics: broken

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

diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index 114414e9c34..2b145810f1b 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -21,5 +21,6 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ fridh ];
     license = with licenses; [ bsd3 ];
     homepage = https://github.com/python-acoustics/python-acoustics;
+    broken = true;
   };
 }

From 8a5d9dd37951b7702d90c346acaef33a97ef98ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 29 Nov 2018 12:45:50 +0100
Subject: [PATCH 1254/2793] python.pkgs.datadog: 0.23.0 -> 0.25.0

---
 pkgs/development/python-modules/datadog/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 7b15d412610..51809aeccac 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,22 +4,21 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.23.0";
+  version = "0.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ed9aec2b3a26722b74465c2ed36d2efdb9c9fac1a07a84d81fa2fc0cfa66ae4";
+    sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1";
   };
 
+  postPatch = ''
+    find . -name '*.pyc' -exec rm {} \;
+  '';
+
   propagatedBuildInputs = [ decorator requests simplejson ];
 
   checkInputs = [ nose mock ];
 
-  # v0.20.0 tests are nondeterministic:
-  # test_send_batch_metrics: https://hydra.nixos.org/build/74920933
-  # test_timed_decorator_threaded: https://hydra.nixos.org/build/74328993
-  doCheck = false;
-
   meta = with lib; {
     description = "The Datadog Python library";
     license = licenses.bsd3;

From 4149c51ed1bf5b9af9e41880d799146769d48d4c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 06:52:21 -0500
Subject: [PATCH 1255/2793] pythonPackages.livereload: 2.5.1 -> 2.6.0

---
 .../python-modules/livereload/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix
index 5c7c7e970c3..a3c084cc8c6 100644
--- a/pkgs/development/python-modules/livereload/default.nix
+++ b/pkgs/development/python-modules/livereload/default.nix
@@ -10,19 +10,27 @@
 
 buildPythonPackage rec {
   pname = "livereload";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "python-livereload";
     rev = "v${version}";
-    sha256 = "1irs59wqmffp8q4l9fh7givs05mamlgm5n7ga49gwxp5imwrdzba";
+    sha256 = "0p3yvvr1iv3fv3pwc2qfzl3mi3b5zv6dh7kmfm1k7krxvganj87n";
   };
 
   buildInputs = [ nose django ];
 
   propagatedBuildInputs = [ tornado six ];
 
+  # Remove this patch when PR merged
+  # https://github.com/lepture/python-livereload/pull/173
+  postPatch = ''
+   substituteInPlace tests/test_watcher.py \
+     --replace 'watcher.watch(filepath, add_count)' \
+               'add_count.repr_str = "add_count test task"; watcher.watch(filepath, add_count)'
+  '';
+
   checkInputs = [ pytest ];
   checkPhase = "pytest tests";
 

From 147473511e59d8a2e320d7b62b7abdeb094ca2b8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 07:20:46 -0500
Subject: [PATCH 1256/2793] pythonPackages.chalice: init at 1.6.1

---
 .../python-modules/chalice/default.nix        | 65 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/python-modules/chalice/default.nix

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
new file mode 100644
index 00000000000..70e9744058c
--- /dev/null
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, attrs
+, botocore
+, click
+, enum-compat
+, jmespath
+, pip
+, setuptools
+, six
+, typing
+, wheel
+, pythonOlder
+, watchdog
+, pytest
+, hypothesis
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "chalice";
+  version = "1.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "783ba3c603b944ba32f0ee39f272dc192f2097cfc520692f4dcb718bebdf940e";
+  };
+
+  checkInputs = [ watchdog pytest hypothesis mock ];
+  propagatedBuildInputs = [
+    attrs
+    botocore
+    click
+    enum-compat
+    jmespath
+    pip
+    setuptools
+    six
+    wheel
+    typing
+  ];
+
+  # conftest.py not included with pypi release
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'pip>=9,<=18' 'pip' \
+      --replace 'typing==3.6.4' 'typing' \
+      --replace 'attrs==17.4.0' 'attrs' \
+      --replace 'click>=6.6,<7.0' 'click'
+  '';
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with lib; {
+    description = "Python Serverless Microframework for AWS";
+    homepage = https://github.com/aws/chalice;
+    license = licenses.asl20;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a3398fb83a..146b68a64e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -288,6 +288,8 @@ in {
 
   cdecimal = callPackage ../development/python-modules/cdecimal { };
 
+  chalice = callPackage ../development/python-modules/chalice { };
+
   clustershell = callPackage ../development/python-modules/clustershell { };
 
   cozy = callPackage ../development/python-modules/cozy { };

From 7fe2539e1918adcb9e28f7ba36386902d29629fd Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 07:21:00 -0500
Subject: [PATCH 1257/2793] pythonPackages.PyLTI: refactor add chalice as
 dependency fix build

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

diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 32cef1e5da8..40b639925a0 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -17,6 +17,7 @@
 , pytestpep8
 , sphinx
 , mock
+, chalice
 , isPy27
 }:
 
@@ -34,7 +35,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
   checkInputs = [
     flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
-    pytestflakes pytestpep8 sphinx mock
+    pytestflakes pytestpep8 sphinx mock chalice
   ];
 
   src = fetchPypi {
@@ -48,4 +49,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ layus ];
   };
-}
\ No newline at end of file
+}

From d5399b074a683778be36d69075cc3d60c2bd3d85 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 08:08:28 -0500
Subject: [PATCH 1258/2793] pythonPackages.nose-randomly: init at 1.2.5

---
 .../python-modules/nose-randomly/default.nix  | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/nose-randomly/default.nix

diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix
new file mode 100644
index 00000000000..2bfa5cb0f05
--- /dev/null
+++ b/pkgs/development/python-modules/nose-randomly/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "nose-randomly";
+  version = "1.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3";
+  };
+
+  checkInputs = [ numpy ];
+  propagatedBuildInputs = [
+    nose
+  ];
+
+  meta = with lib; {
+    description = "Nose plugin to randomly order tests and control random.seed";
+    homepage = https://github.com/adamchainz/nose-randomly;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 146b68a64e6..6ae03faa0b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3111,6 +3111,8 @@ in {
 
   nose-focus = callPackage ../development/python-modules/nose-focus { };
 
+  nose-randomly = callPackage ../development/python-modules/nose-randomly { };
+
   nose2 = callPackage ../development/python-modules/nose2 { };
 
   nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };

From 3e694739743ff7fd5e7b3c2e5f851c75bf863761 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 08:09:00 -0500
Subject: [PATCH 1259/2793] pythonPackages.httpretty: 0.8.10 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 1dcb7c14d99..56898b3bf87 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -9,23 +9,22 @@
 , coverage
 , certifi
 , urllib3
-, isPy3k
+, rednose
+, nose-randomly
 }:
 
 buildPythonPackage rec {
   pname = "httpretty";
   version = "0.9.6";
-  doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc";
   };
 
-  checkInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+  checkInputs = [ tornado requests httplib2 sure nose nose-randomly rednose coverage certifi ];
   propagatedBuildInputs = [ urllib3 ];
 
-
   meta = with stdenv.lib; {
     homepage = "https://falcao.it/HTTPretty/";
     description = "HTTP client request mocking tool";

From d5111b119ce15f62cd0dc58d70378bdc45e44ef4 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 08:33:54 -0500
Subject: [PATCH 1260/2793] pythonPackages.factory_boy: 2.6.1 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
index 1a491f2c8f0..5029870f9ac 100644
--- a/pkgs/development/python-modules/factory_boy/default.nix
+++ b/pkgs/development/python-modules/factory_boy/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , fake_factory
+, faker
+, python
 }:
 
 buildPythonPackage rec {
@@ -13,8 +15,13 @@ buildPythonPackage rec {
     sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca";
   };
 
+  checkInputs = [ faker ];
   propagatedBuildInputs = [ fake_factory ];
 
+  checkPhase = ''
+    ${python.interpreter} -m unittest
+  '';
+
   meta = with stdenv.lib; {
     description = "A Python package to create factories for complex objects";
     homepage    = https://github.com/rbarrois/factory_boy;

From 56fbdbca151fe0983b181fae9976e24177c7b82b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 08:56:40 -0500
Subject: [PATCH 1261/2793] pythonPackages.Quandl: 3.2.1 -> 3.4.5

---
 .../python-modules/quandl/default.nix         | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index e85e9c4e0f8..598767e6ca9 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -1,27 +1,21 @@
 {
-  lib, fetchFromGitHub, buildPythonPackage, isPy3k,
+  lib, fetchPypi, buildPythonPackage, isPy3k,
   # runtime dependencies
   pandas, numpy, requests, inflection, python-dateutil, six, more-itertools,
   # test suite dependencies
-  nose, unittest2, flake8, httpretty, mock, factory_boy, jsondate,
+  nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy,
   # additional runtime dependencies are required on Python 2.x
   pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null
 }:
 
 buildPythonPackage rec {
   pname = "quandl";
-  version = "3.2.1";
-  sha256 = "0vc0pzs2px9yaqkqcmd2m1b2bq1iils8fs0xbl0989hjq791a4jr";
+  version = "3.4.5";
 
-  patches = [ ./allow-requests-v2.18.patch ];
-
-  # Tests do not work with fetchPypi
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = "quandl-python";
-    rev = "refs/tags/v${version}";
-    inherit sha256;
-    fetchSubmodules = true; # Fetching by tag does not work otherwise
+  src = fetchPypi {
+    inherit version;
+    pname = "Quandl";
+    sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys";
   };
 
   doCheck = true;
@@ -32,8 +26,10 @@ buildPythonPackage rec {
     flake8
     httpretty
     mock
-    factory_boy
     jsondate
+    parameterized
+    faker
+    factory_boy
   ];
 
   propagatedBuildInputs = [

From 6ae42339d692284d08ae547c8b743caa2b6f7980 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 10:26:52 -0500
Subject: [PATCH 1262/2793] pythonPackages.iocapture: refactor meta attribute
 license

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

diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
index d1c01b4f653..1e333d923a0 100644
--- a/pkgs/development/python-modules/iocapture/default.nix
+++ b/pkgs/development/python-modules/iocapture/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Capture stdout, stderr easily.";
     homepage = https://github.com/oinume/iocapture;
-    license = licenses.MIT;
+    license = licenses.mit;
   };
-}
\ No newline at end of file
+}

From 99b5abef81df50cbb0ef4c77db3ca1a89fa3288d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 13:21:12 -0500
Subject: [PATCH 1263/2793] pythonPackages.factory_boy: refactor remove
 fake_factory dependency

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

diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
index 5029870f9ac..0bb1e00778a 100644
--- a/pkgs/development/python-modules/factory_boy/default.nix
+++ b/pkgs/development/python-modules/factory_boy/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, fake_factory
 , faker
 , python
 }:
@@ -15,8 +14,10 @@ buildPythonPackage rec {
     sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca";
   };
 
-  checkInputs = [ faker ];
-  propagatedBuildInputs = [ fake_factory ];
+  propagatedBuildInputs = [ faker ];
+
+  # tests not included with pypi release
+  doCheck = false;
 
   checkPhase = ''
     ${python.interpreter} -m unittest

From 0ae8b4868c7e3386e19e20b8b9289a3d50ebaa1d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 13:24:43 -0500
Subject: [PATCH 1264/2793] pythonPackages.fake_factory: refactor disable tests
 (for good reason)

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

diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix
index a3555c134fc..f17af02ee0f 100644
--- a/pkgs/development/python-modules/fake_factory/default.nix
+++ b/pkgs/development/python-modules/fake_factory/default.nix
@@ -18,6 +18,10 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ six dateutil ipaddress mock ];
+
+  # fake-factory is depreciated and single test will always fail
+  doCheck = false;
+
   checkPhase = ''
     ${python.interpreter} -m unittest faker.tests
   '';

From d39d85c0b22fabc7a71ed181312ce2cf8a1c026f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 29 Nov 2018 13:25:48 -0500
Subject: [PATCH 1265/2793] pythonPackages.faker: refactor remove pytest
 requirements

---
 pkgs/development/python-modules/faker/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index f11990a87b0..515bd9e99bb 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -15,11 +15,11 @@ buildPythonPackage rec {
     sha256 = "8c6df7903c7b4a51f4ac273bc5fec79a249e3220c47b35d1ac1175b41982d772";
   };
 
+  buildInputs = [ pytestrunner ];
   checkInputs = [
     email_validator
     mock
     ukpostcodeparser
-    pytestrunner
     pytest
   ];
 
@@ -29,6 +29,10 @@ buildPythonPackage rec {
     text-unidecode
   ] ++ lib.optional (pythonOlder "3.3") ipaddress;
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest"
+  '';
+
   meta = with lib; {
     description = "A Python library for generating fake user data";
     homepage    = http://faker.rtfd.org;

From f5ce8afacea55922e9ab0e1f639b384e45177cfe Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 30 Nov 2018 08:00:40 -0500
Subject: [PATCH 1266/2793] pythonPackages.tifffile: 2018.10.18 -> 0.15.1

Downgrade package. 2018.XX.XX are not official releases? Fixes
dask-image build as well.
---
 pkgs/development/python-modules/tifffile/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 5ac2b038941..0e888d4ac27 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,14 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "2018.10.18";
+  # 2018.10.18 and 2018.11.6 are not releases...?
+  # https://github.com/blink1073/tifffile/issues/54
+  # anaconda uses 0.15.1
+  version = "0.15.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9ca8ee9a54d10d2b38ec262cc65abb687f38c34aa9cda23bb22077cd48a9b1ff";
+    sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
   };
 
   checkInputs = [ nose ];

From 9ab6554d3d1f66244abaaf049745c8d7398ebbdc Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 30 Nov 2018 08:06:26 -0500
Subject: [PATCH 1267/2793] python3Packages.gidgethub: refactor fix broken
 package

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

diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
index 721f8cb800e..4be26fe0e12 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -16,6 +16,7 @@
 buildPythonPackage rec {
   pname = "gidgethub";
   version = "3.0.0";
+  format = "flit";
 
   disabled = pythonOlder "3.6";
 

From cafc4786f1fe84c3572329bc2de062e7a4af423f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 30 Nov 2018 08:13:41 -0500
Subject: [PATCH 1268/2793] pythonPackages.jwcrypto: init at 0.6.0 dependency
 for broken github3_py

---
 .../python-modules/jwcrypto/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/jwcrypto/default.nix

diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix
new file mode 100644
index 00000000000..9b219127069
--- /dev/null
+++ b/pkgs/development/python-modules/jwcrypto/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "jwcrypto";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a87ac0922d09d9a65011f76d99849f1fbad3d95439c7452cebf4ab0871c2b665";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
+  meta = with lib; {
+    description = "Implementation of JOSE Web standards";
+    homepage = https://github.com/latchset/jwcrypto;
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ae03faa0b2..b22aa11c45c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -412,6 +412,8 @@ in {
 
   jira = callPackage ../development/python-modules/jira { };
 
+  jwcrypto = callPackage ../development/python-modules/jwcrypto { };
+
   lammps-cython = callPackage ../development/python-modules/lammps-cython {
     mpi = pkgs.openmpi;
   };

From c631b307a025cd3300703a1088f0bd13ef2e2c73 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 30 Nov 2018 08:14:26 -0500
Subject: [PATCH 1269/2793] pythonPackages.github3_py: refactor fix broken
 package

---
 pkgs/development/python-modules/github3_py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
index 23bcb2833b8..7b378660cff 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -9,10 +9,10 @@
 , dateutil
 , requests
 , pyopenssl
-, uritemplate_py
+, uritemplate
 , ndg-httpsclient
-, requests_toolbelt
 , pyasn1
+, jwcrypto
 }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];
-  propagatedBuildInputs = [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ];
+  propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ];
 
   postPatch = ''
     sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py

From 380b7086bc93da9abd3484ccf94f70b000e1ac63 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 30 Nov 2018 08:25:54 -0500
Subject: [PATCH 1270/2793] pythonPackages.lz4 refactor fix broken build

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

diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 89eca9a8538..a9a7783fe77 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -1,7 +1,11 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, nose
+, pytestrunner
+, pytest
+, psutil
+, pkgconfig
+, setuptools_scm
 }:
 
 buildPythonPackage rec {
@@ -13,7 +17,8 @@ buildPythonPackage rec {
     sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
   };
 
-  buildInputs = [ nose ];
+  buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
+  checkInputs = [ pytest psutil ];
 
   meta = with stdenv.lib; {
     description = "Compression library";

From 5af94096ac589e7550506767d36fddb32d0ec2b4 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 07:52:42 -0500
Subject: [PATCH 1271/2793] pythonPackages.Wand: refactor fix broken package

---
 .../python-modules/Wand/default.nix           |  12 +-
 .../python-modules/Wand/libraries.patch       | 149 ------------------
 2 files changed, 4 insertions(+), 157 deletions(-)
 delete mode 100644 pkgs/development/python-modules/Wand/libraries.patch

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 8536a37bc36..8108914814a 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , buildPythonPackage
 , fetchPypi
 , imagemagick
@@ -26,22 +25,19 @@ in buildPythonPackage rec {
 
   buildInputs = [ imagemagick ];
 
-  patches = [
-    ./libraries.patch
-  ];
-
   inherit magick_wand_library imagemagick_library;
 
   postPatch = ''
     substituteAllInPlace wand/api.py
   '';
 
-  # No tests
+  # tests not included with pypi release
   doCheck = false;
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "Ctypes-based simple MagickWand API binding for Python";
     homepage = http://wand-py.org/;
-    license = with lib.licenses; [ mit ];
+    license = [ licenses.mit ];
   };
 
   passthru = {
diff --git a/pkgs/development/python-modules/Wand/libraries.patch b/pkgs/development/python-modules/Wand/libraries.patch
deleted file mode 100644
index 15b19f5168b..00000000000
--- a/pkgs/development/python-modules/Wand/libraries.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff --git a/wand/api.py b/wand/api.py
-index 2c18513..1a1b511 100644
---- a/wand/api.py
-+++ b/wand/api.py
-@@ -43,98 +43,6 @@ class c_magick_char_p(ctypes.c_char_p):
-         """
-         library.MagickRelinquishMemory(self)
- 
--
--def library_paths():
--    """Iterates for library paths to try loading.  The result paths are not
--    guaranteed that they exist.
--
--    :returns: a pair of libwand and libmagick paths.  they can be the same.
--              path can be ``None`` as well
--    :rtype: :class:`tuple`
--
--    """
--    libwand = None
--    libmagick = None
--    versions = '', '-6', '-Q16', '-Q8', '-6.Q16'
--    options = '', 'HDRI', 'HDRI-2'
--    system = platform.system()
--    magick_home = os.environ.get('MAGICK_HOME')
--
--    if system == 'Windows':
--        # ImageMagick installers normally install coder and filter DLLs in
--        # subfolders, we need to add those folders to PATH, otherwise loading
--        # the DLL later will fail.
--        try:
--            with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
--                                r"SOFTWARE\ImageMagick\Current") as reg_key:
--                libPath = winreg.QueryValueEx(reg_key, "LibPath")
--                coderPath = winreg.QueryValueEx(reg_key, "CoderModulesPath")
--                filterPath = winreg.QueryValueEx(reg_key, "FilterModulesPath")
--                magick_home = libPath[0]
--                os.environ['PATH'] += (';' + libPath[0] + ";" +
--                                       coderPath[0] + ";" + filterPath[0])
--        except OSError:
--            # otherwise use MAGICK_HOME, and we assume the coder and
--            # filter DLLs are in the same directory
--            pass
--
--    def magick_path(path):
--        return os.path.join(magick_home, *path)
--    combinations = itertools.product(versions, options)
--    for suffix in (version + option for version, option in combinations):
--        # On Windows, the API is split between two libs. On other platforms,
--        # it's all contained in one.
--        if magick_home:
--            if system == 'Windows':
--                libwand = 'CORE_RL_wand_{0}.dll'.format(suffix),
--                libmagick = 'CORE_RL_magick_{0}.dll'.format(suffix),
--                yield magick_path(libwand), magick_path(libmagick)
--                libwand = 'libMagickWand{0}.dll'.format(suffix),
--                libmagick = 'libMagickCore{0}.dll'.format(suffix),
--                yield magick_path(libwand), magick_path(libmagick)
--            elif system == 'Darwin':
--                libwand = 'lib', 'libMagickWand{0}.dylib'.format(suffix),
--                yield magick_path(libwand), magick_path(libwand)
--            else:
--                libwand = 'lib', 'libMagickWand{0}.so'.format(suffix),
--                yield magick_path(libwand), magick_path(libwand)
--        if system == 'Windows':
--            libwand = ctypes.util.find_library('CORE_RL_wand_' + suffix)
--            libmagick = ctypes.util.find_library('CORE_RL_magick_' + suffix)
--            yield libwand, libmagick
--            libwand = ctypes.util.find_library('libMagickWand' + suffix)
--            libmagick = ctypes.util.find_library('libMagickCore' + suffix)
--            yield libwand, libmagick
--        else:
--            libwand = ctypes.util.find_library('MagickWand' + suffix)
--            yield libwand, libwand
--
--
--def load_library():
--    """Loads the MagickWand library.
--
--    :returns: the MagickWand library and the ImageMagick library
--    :rtype: :class:`ctypes.CDLL`
--
--    """
--    tried_paths = []
--    for libwand_path, libmagick_path in library_paths():
--        if libwand_path is None or libmagick_path is None:
--            continue
--        try:
--            tried_paths.append(libwand_path)
--            libwand = ctypes.CDLL(libwand_path)
--            if libwand_path == libmagick_path:
--                libmagick = libwand
--            else:
--                tried_paths.append(libmagick_path)
--                libmagick = ctypes.CDLL(libmagick_path)
--        except (IOError, OSError):
--            continue
--        return libwand, libmagick
--    raise IOError('cannot find library; tried paths: ' + repr(tried_paths))
--
--
- if not hasattr(ctypes, 'c_ssize_t'):
-     if ctypes.sizeof(ctypes.c_uint) == ctypes.sizeof(ctypes.c_void_p):
-         ctypes.c_ssize_t = ctypes.c_int
-@@ -176,43 +84,14 @@ class AffineMatrix(ctypes.Structure):
- # Preserve the module itself even if it fails to import
- sys.modules['wand._api'] = sys.modules['wand.api']
- 
--try:
--    libraries = load_library()
--except (OSError, IOError):
--    msg = 'http://docs.wand-py.org/en/latest/guide/install.html'
--    if sys.platform.startswith(('dragonfly', 'freebsd')):
--        msg = 'pkg install'
--    elif sys.platform == 'win32':
--        msg += '#install-imagemagick-on-windows'
--    elif sys.platform == 'darwin':
--        mac_pkgmgrs = {'brew': 'brew install freetype imagemagick',
--                       'port': 'port install imagemagick'}
--        for pkgmgr in mac_pkgmgrs:
--            with os.popen('which ' + pkgmgr) as f:
--                if f.read().strip():
--                    msg = mac_pkgmgrs[pkgmgr]
--                    break
--        else:
--            msg += '#install-imagemagick-on-mac'
--    else:
--        distname, _, __ = platform.linux_distribution()
--        distname = (distname or '').lower()
--        if distname in ('debian', 'ubuntu'):
--            msg = 'apt-get install libmagickwand-dev'
--        elif distname in ('fedora', 'centos', 'redhat'):
--            msg = 'yum install ImageMagick-devel'
--    raise ImportError('MagickWand shared library not found.\n'
--                      'You probably had not installed ImageMagick library.\n'
--                      'Try to install:\n  ' + msg)
--
- #: (:class:`ctypes.CDLL`) The MagickWand library.
--library = libraries[0]
-+library = ctypes.CDLL("@magick_wand_library@")
- 
- #: (:class:`ctypes.CDLL`) The ImageMagick library.  It is the same with
- #: :data:`library` on platforms other than Windows.
- #:
- #: .. versionadded:: 0.1.10
--libmagick = libraries[1]
-+libmagick = ctypes.CDLL("@imagemagick_library@")
- 
- try:
-     library.MagickWandGenesis.argtypes = []

From c38fb3f89c6c188c1e26f707bcebcb339701b8ba Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 08:04:24 -0500
Subject: [PATCH 1272/2793] pythonPackages.altair: refactor fix broken python
 package

---
 .../python-modules/altair/default.nix         | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 8e75f1f3d8d..5f21f4662cb 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,30 +1,33 @@
 { stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales
-, entrypoints, jsonschema, numpy, pandas, six, toolz, typing }:
+, entrypoints, jsonschema, numpy, pandas, six, toolz, typing
+, pythonOlder, recommonmark }:
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "2.1.0";
+  version = "2.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0";
+    sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a";
   };
 
-  patches = fetchpatch {
-    url = https://github.com/altair-viz/altair/commit/bfca8aecce9593c48aa5834e3f8f841deb58391c.patch;
-    sha256 = "01izc5d8c6ry3mh0k0hfasb6jc4720g75yw2qdlp9ja8mnjsp4k3";
-  };
+  checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
 
-  checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales ];
+  propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+
+  # hack to prevent typing from being required for python > 3.5
+  postPatch = ''
+    substituteInPlace requirements.txt \
+       --replace "typing" ""
+  '';
 
   checkPhase = ''
     export LANG=en_US.UTF-8
     py.test altair --doctest-modules
   '';
 
-  propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz typing ];
-
   meta = with stdenv.lib; {
     description = "A declarative statistical visualization library for Python.";
     homepage = https://github.com/altair-viz/altair;

From ef66dfe40c7cd110c136fdb38d5bd066ea9e28a2 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 08:10:58 -0500
Subject: [PATCH 1273/2793] pythonPackages.asyncio: refactor disable for
 anything but 34

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

diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix
index 489a31b3242..5a6dbe79814 100644
--- a/pkgs/development/python-modules/asyncio/default.nix
+++ b/pkgs/development/python-modules/asyncio/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy34 }:
 
 buildPythonPackage rec {
   pname = "asyncio";
   version = "3.4.3";
-  disabled = pythonOlder "3.3";
+  disabled = !isPy34;
 
   src = fetchPypi {
     inherit pname version;

From 9051a48dd2fc61d053dafcb3315e2cd7b09ef62a Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 08:15:02 -0500
Subject: [PATCH 1274/2793] pythonPackages.awkward: 0.4.4 -> 0.5.2 fix broken
 package

---
 .../python-modules/awkward/default.nix            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index c75b318ddc2..24d74f1d44f 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -1,23 +1,28 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
+, pytestrunner
+, pytest
+, h5py
 }:
 
 buildPythonPackage rec {
-  version = "0.4.4";
   pname = "awkward";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08ce07d564e381e70dd38c6bf241fa303b09b408b02db648ff91f354f01e7439";
+    sha256 = "bc824882f80ae07d442a011eb6d14a6fce581e022d4ff6c73d89d93c832ee3cc";
   };
 
+  buildInputs = [ pytestrunner h5py ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ numpy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
+    description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy.";
     homepage = https://github.com/scikit-hep/awkward-array;
-    description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };

From 0107125d3241688907e1b805068ed9ffd0734432 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 08:21:13 -0500
Subject: [PATCH 1275/2793] pythonPackages.branca: refactor fix broken python
 package

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

diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index e3107bd25b9..c81233045c0 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -4,6 +4,7 @@
 , pytest
 , jinja2
 , selenium
+, six
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest selenium ];
-  propagatedBuildInputs = [ jinja2 ];
+  propagatedBuildInputs = [ jinja2 six ];
 
   # Seems to require a browser
   doCheck = false;

From 5a778bcac7dda74f3c91c2ac591760374c6e2705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 21:57:23 +0100
Subject: [PATCH 1276/2793] python.pkgs.zope-deferredimport: init at 4.3

---
 .../zope-deferredimport/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/zope-deferredimport/default.nix

diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix
new file mode 100644
index 00000000000..65ca0cc1ea9
--- /dev/null
+++ b/pkgs/development/python-modules/zope-deferredimport/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, zope_proxy
+, zope_testrunner
+}:
+
+buildPythonPackage rec {
+  pname = "zope-deferredimport";
+  version = "4.3";
+
+  src = fetchPypi {
+    pname = "zope.deferredimport";
+    inherit version;
+    sha256 = "2ddef5a7ecfff132a2dd796253366ecf9748a446e30f1a0b3a636aec9d9c05c5";
+  };
+
+  propagatedBuildInputs = [ zope_proxy ];
+
+  checkInputs = [ zope_testrunner ];
+
+  checkPhase = ''
+    zope-testrunner --test-path=src []
+  '';
+
+  meta = with lib; {
+    description = "Allows you to perform imports names that will only be resolved when used in the code";
+    homepage = http://github.com/zopefoundation/zope.deferredimport;
+    license = licenses.zpl21;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b22aa11c45c..28c839309f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4409,6 +4409,8 @@ in {
 
   zope_contenttype = callPackage ../development/python-modules/zope_contenttype { };
 
+  zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { };
+
   zope_dottedname = callPackage ../development/python-modules/zope_dottedname { };
 
   zope_event = callPackage ../development/python-modules/zope_event { };

From 5c1367a43954d2cd95e001a13851dd7784dbdd3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:05:32 +0100
Subject: [PATCH 1277/2793] python.pkgs.zope-hookable: init at 4.2.0

---
 .../python-modules/zope-hookable/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/zope-hookable/default.nix

diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix
new file mode 100644
index 00000000000..de99386560b
--- /dev/null
+++ b/pkgs/development/python-modules/zope-hookable/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, zope_testing
+}:
+
+buildPythonPackage rec {
+  pname = "zope-hookable";
+  version = "4.2.0";
+
+  src = fetchPypi {
+    pname = "zope.hookable";
+    inherit version;
+    sha256 = "c1df3929a3666fc5a0c80d60a0c1e6f6ef97c7f6ed2f1b7cf49f3e6f3d4dde15";
+  };
+
+  checkInputs = [ zope_testing ];
+
+  meta = with lib; {
+    description = "Supports the efficient creation of “hookable” objects";
+    homepage = http://github.com/zopefoundation/zope.hookable;
+    license = licenses.zpl21;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28c839309f8..4922196fdc7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4419,6 +4419,8 @@ in {
 
   zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { };
 
+  zope-hookable = callPackage ../development/python-modules/zope-hookable { };
+
   zope_i18n = callPackage ../development/python-modules/zope_i18n { };
 
   zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { };

From 6d021d4923d3141ed2c5d63002283a6d3b2a9c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:07:59 +0100
Subject: [PATCH 1278/2793] python.pkgs.zope_component: update
 propagatedBuildInputs

---
 .../python-modules/zope_component/default.nix       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix
index 73d45ec7f65..bbe635b712f 100644
--- a/pkgs/development/python-modules/zope_component/default.nix
+++ b/pkgs/development/python-modules/zope_component/default.nix
@@ -1,11 +1,13 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, zope_configuration
+, zope-deferredimport
+, zope_deprecation
 , zope_event
-, zope_i18nmessageid
+, zope-hookable
 , zope_interface
-, zope_testing
+, zope_configuration
+, zope_i18nmessageid
 }:
 
 buildPythonPackage rec {
@@ -17,7 +19,10 @@ buildPythonPackage rec {
     sha256 = "6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55";
   };
 
-  propagatedBuildInputs = [ zope_configuration zope_event zope_i18nmessageid zope_interface zope_testing ];
+  propagatedBuildInputs = [
+    zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface
+    zope_configuration zope_i18nmessageid
+  ];
 
   # ignore tests because of a circular dependency on zope_security
   doCheck = false;

From 1d25f001bdf40e0dc4abf3c078f9787414766338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:17:23 +0100
Subject: [PATCH 1279/2793] python.pkgs.h11: 0.7.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index 097495128db..ecfb37eeda5 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -2,15 +2,18 @@
 
 buildPythonPackage rec {
   pname = "h11";
-  version = "0.7.0";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "1n9hsm1n2qq32j3hh9wj93w738bwa5nqyzxjwvirz03gp8fbn3qw";
+    sha256 = "acca6a44cb52a32ab442b1779adf0875c443c689e9e028f8d831a3769f9c5208";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with lib; {
     description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";

From a568a9e79b2c4087ef854342cf14afe12335d1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:27:30 +0100
Subject: [PATCH 1280/2793] python.pkgs.eventlet: update propagatedBuildInputs

---
 .../python-modules/eventlet/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 9766613b060..a72184f2c1e 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -1,12 +1,13 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
-, nose
-, httplib2
-, pyopenssl
+, pythonOlder
+, dnspython
+, enum34
 , greenlet
-, enum-compat
-, isPyPy
+, monotonic
+, six
+, nose
 }:
 
 buildPythonPackage rec {
@@ -18,14 +19,13 @@ buildPythonPackage rec {
     sha256 = "d9d31a3c8dbcedbcce5859a919956d934685b17323fc80e1077cb344a2ffa68d";
   };
 
-  buildInputs = [ nose httplib2 pyopenssl ];
+  checkInputs = [ nose ];
 
   doCheck = false;  # too much transient errors to bother
 
-  propagatedBuildInputs = [ enum-compat ]
-    ++ stdenv.lib.optionals (!isPyPy) [ greenlet ];
+  propagatedBuildInputs = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://pypi.python.org/pypi/eventlet/;
     description = "A concurrent networking library for Python";
   };

From 5e013d2429ff46f9305a5e6d51cd93ac666f9839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:34:27 +0100
Subject: [PATCH 1281/2793] python.pkgs.forbiddenfruit: disable tests because
 they are missing in tarball

---
 .../python-modules/forbiddenfruit/default.nix          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
index 5686cb69921..fe7518dc29e 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, nose
 }:
 
 buildPythonPackage rec {
@@ -12,6 +13,15 @@ buildPythonPackage rec {
     sha256 = "09ee1959fa34936c15417defa28bfd09cf88ad54c15454bc863d465ed42b8922";
   };
 
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  # tests directory missing in PyPI tarball
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Patch python built-in objects";
     homepage = https://pypi.python.org/pypi/forbiddenfruit;

From d43a5804c38507623de74c581874a0bac72880aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 22:45:42 +0100
Subject: [PATCH 1282/2793] python.pkgs.paste: 3.0.4 -> 3.0.5

---
 pkgs/development/python-modules/paste/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index 8b731624805..d235bda40e4 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -1,25 +1,28 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, nose
 , six
+, pytestrunner
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "paste";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "16500e43f710e93d94a540ee5f0f7743dee1791bdfc1e65d05703a2f13378207";
+    pname = "Paste";
+    inherit version;
+    sha256 = "1bb2068807ce3592d313ce9b1a25a7ac842a504e7e3b005027193d17a043d1a8";
   };
 
-  checkInputs = [ nose ];
   propagatedBuildInputs = [ six ];
 
+  checkInputs = [ pytestrunner pytest ];
+
   # Certain tests require network
   checkPhase = ''
-    NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests
+    py.test -k "not test_cgiapp and not test_proxy"
   '';
 
   meta = with stdenv.lib; {

From 8310ad14a4ebdd5bc18143b0ae80be6bb7f117e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 23:20:28 +0100
Subject: [PATCH 1283/2793] python: pylint: 2.1.1 -> 2.2.2

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 4f4eb3cfc73..1ced9bdaa25 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.1.1";
+  version = "2.2.2";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
+    sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

From b0c44debac71e10b9e2cfd073ded42306ca20397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 23:35:07 +0100
Subject: [PATCH 1284/2793] python.pkgs.pylint: disable broken tests

fixes https://github.com/NixOS/nixpkgs/issues/51394
---
 pkgs/development/python-modules/pylint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 1ced9bdaa25..67066c85f05 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,8 +23,8 @@ buildPythonPackage rec {
 
   checkPhase = ''
     pytest pylint/test -k "not ${lib.concatStringsSep " and not " (
-      # Broken test
-      [ "test_good_comprehension_checks" ] ++
+      # Broken tests
+      [ "member_checks_py37" "iterable_context_py36" ] ++
       # Disable broken darwin tests
       lib.optionals stdenv.isDarwin [
         "test_parallel_execution"

From 023580878ca9fa2357b7e45b526ae66b10e38d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 2 Dec 2018 23:40:50 +0100
Subject: [PATCH 1285/2793] python.pkgs.gpsoauth: 0.2.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix
index a759b5fa4d4..57130a7aa52 100644
--- a/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/pkgs/development/python-modules/gpsoauth/default.nix
@@ -10,7 +10,7 @@
 , pyopenssl
 , pyasn1
 , pycparser
-, pycryptodome
+, pycryptodomex
 , requests
 , six
 }:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "1c3f45824d45ac3d06b9d9a0c0eccafe1052505d31ac9a698aef8b00fb0dfc37";
   };
 
-  propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodome requests six ];
+  propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
 
   meta = with stdenv.lib; {
     description = "A python client library for Google Play Services OAuth";

From 0f2570554c70f25a616115b2c11d6284245db011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 10:35:08 +0100
Subject: [PATCH 1286/2793] python.pkgs.natsort: 5.4.1 -> 5.5.0

---
 .../python-modules/natsort/default.nix        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 5c652744fa1..92f885d7bbd 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -2,32 +2,31 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
-, hypothesis
-, pytestcache
 , pytest
+, pytestcov
+, pytest-mock
+, hypothesis
 , glibcLocales
-, mock ? null
 , pathlib ? null
 }:
 
 buildPythonPackage rec {
   pname = "natsort";
-  version = "5.4.1";
+  version = "5.5.0";
 
   checkInputs = [
-    hypothesis
-    pytestcache
     pytest
+    pytestcov
+    pytest-mock
+    hypothesis
     glibcLocales
   ]
   # pathlib was made part of standard library in 3.5:
-  ++ (lib.optionals (pythonOlder "3.4") [ pathlib ])
-  # based on testing-requirements.txt:
-  ++ (lib.optionals (pythonOlder "3.3") [ mock ]);
+  ++ (lib.optionals (pythonOlder "3.4") [ pathlib ]);
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ae73b005135dc152e7b282b2d4cf19380d8cab4c4026461ee9f37bf3aa12e344";
+    sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09";
   };
 
   # testing based on project's tox.ini

From 0f241338c3a5918884f3a2ef338fca80489faf10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 10:56:42 +0100
Subject: [PATCH 1287/2793] python.pkgs.Nikola: apply patch for broken test

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

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index bf4171dd3f9..329fa696acf 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , isPy3k
 , fetchPypi
+, fetchpatch
 , doit
 , glibcLocales
 , pytest
@@ -54,6 +55,11 @@ buildPythonPackage rec {
     sha256 = "18bq68f9v7xk9ahjl6x4k77yysq5g6g07ng2ndbg35kcsdnw4nk6";
   };
 
+  patches = fetchpatch {
+    url = https://github.com/getnikola/nikola/commit/d40be74a86af71b5206dc22beb82fcd0d08ea2f6.patch;
+    sha256 = "0disr8bxbfjymwlbm82mxkal3ynnv8zfiqsgfh9fkqhb35bn4l8j";
+  };
+
   checkPhase = ''
     LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test .
   '';

From 1122f9a855c9adab528fdebbff0b7d56ca0abbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 11:30:07 +0100
Subject: [PATCH 1288/2793] python.pkgs.webtest: fix build

---
 pkgs/development/python-modules/webtest/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index a1a91d35568..759b2a75554 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -10,7 +10,6 @@
 , pyquery
 , wsgiproxy2
 , PasteDeploy
-, coverage
 }:
 
 buildPythonPackage rec {
@@ -18,7 +17,8 @@ buildPythonPackage rec {
   pname = "webtest";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "WebTest";
+    inherit version;
     sha256 = "4221020d502ff414c5fba83c1213985b83219cb1cc611fe58aa4feaf96b5e062";
   };
 
@@ -26,7 +26,9 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "nose<1.3.0" "nose"
   '';
 
-  propagatedBuildInputs = [ nose webob six beautifulsoup4 waitress mock pyquery wsgiproxy2 PasteDeploy coverage ];
+  propagatedBuildInputs = [ webob six beautifulsoup4 waitress ];
+
+  checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ];
 
   meta = with stdenv.lib; {
     description = "Helper to test WSGI applications";

From 0156fbef31c0c1bf1b01bb3bbd13d351231d7c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 11:54:08 +0100
Subject: [PATCH 1289/2793] python.pkgs.pyacoustid: remove obsolete patch

---
 .../python-modules/pyacoustid/default.nix     |  2 --
 .../pyacoustid/pyacoustid-py3.patch           | 32 -------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch

diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix
index 2b23ef7b8c7..7dfd00db25f 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/pkgs/development/python-modules/pyacoustid/default.nix
@@ -17,8 +17,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests audioread ];
 
-  patches = [ ./pyacoustid-py3.patch ];
-
   postPatch = ''
     sed -i \
         -e '/^FPCALC_COMMAND *=/s|=.*|= "${pkgs.chromaprint}/bin/fpcalc"|' \
diff --git a/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch b/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch
deleted file mode 100644
index f79b35fd345..00000000000
--- a/pkgs/development/python-modules/pyacoustid/pyacoustid-py3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 19209469a709ec0914f82c9de23137e360e5e804 Mon Sep 17 00:00:00 2001
-From: Simon Chopin <chopin.simon@gmail.com>
-Date: Mon, 29 Sep 2014 10:38:20 +0200
-Subject: [PATCH] Explicit the UTF-8 encoding also when installing using Python
- 3
-
-If the locale isn't UTF-8, or for some reason Python doesn't pick up on
-it, it will try to decode using ASCII, which will of course cause
-mayhem, crash and despair.
-
-This patch will be shipped with the Debian package 1.1.0-1
----
- setup.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index eafe5ea..0732fe3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,9 +18,10 @@
- 
- def _read(fn):
-     path = os.path.join(os.path.dirname(__file__), fn)
--    data = open(path).read()
-     if sys.version_info[0] < 3:
--        data = data.decode('utf8')
-+        data = open(path).read().decode('utf8')
-+    else:
-+        data = open(path, encoding='utf8').read()
-     # Special case some Unicode characters; PyPI seems to only like ASCII.
-     data = data.replace(u'\xe1', u'a')
-     data = data.replace(u'\u0161', u's')

From 9614364dec7aec386d733583ead02c44bf2ae37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 11:59:12 +0100
Subject: [PATCH 1290/2793] python.pkgs.sphinx_rtd_theme: add sphinx to
 propagatedBuildInputs

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

diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index 0a6040bc592..6ce714c9a31 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, sphinx
 }:
 
 buildPythonPackage rec {
@@ -12,6 +13,8 @@ buildPythonPackage rec {
     sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09";
   };
 
+  propagatedBuildInputs = [ sphinx ];
+
   meta = with stdenv.lib; {
     description = "ReadTheDocs.org theme for Sphinx";
     homepage = https://github.com/snide/sphinx_rtd_theme/;

From f6cb659fbd4036776dbee29a74728f84eda002aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 12:00:03 +0100
Subject: [PATCH 1291/2793] python.pkgs.whisper: fix tests

---
 pkgs/development/python-modules/whisper/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index 1fb9dd6da16..d78d39d9d7a 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
 
 buildPythonPackage rec {
   pname = "whisper";
@@ -11,6 +11,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
     homepage = http://graphite.wikidot.com/;
     description = "Fixed size round-robin style database";

From 73eb15fe6a4530398d67ef199af08fafe6837b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 12:05:05 +0100
Subject: [PATCH 1292/2793] python.pkgs.zconfig: remove obsolete patch

---
 pkgs/development/python-modules/zconfig/default.nix  |  3 +--
 .../python-modules/zconfig/skip-broken-test.patch    | 12 ------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 pkgs/development/python-modules/zconfig/skip-broken-test.patch

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 94b890c79e3..3b6237638dc 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -15,8 +15,7 @@ buildPythonPackage rec {
     sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585";
   };
 
-  patches = [ ./skip-broken-test.patch ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch
deleted file mode 100644
index ee3fcff4903..00000000000
--- a/pkgs/development/python-modules/zconfig/skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py
-index 838cf7c..52daf4e 100644
---- a/ZConfig/tests/test_schema2html.py
-+++ b/ZConfig/tests/test_schema2html.py
-@@ -74,6 +74,7 @@ else:
- 
- class TestSchema2HTML(unittest.TestCase):
- 
-+    @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)')
-     def test_no_schema(self):
-         self.assertRaises(SystemExit,
-                           run_transform)

From 79ced8c6da745133e0bed858565e34158fb788e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 12:16:13 +0100
Subject: [PATCH 1293/2793] python.pkgs.zodb: remove obsolete patches and fix
 tests

---
 .../zodb/ZODB-5.3.0-fix-tests.patch           | 29 -------------------
 .../python-modules/zodb/default.nix           | 16 +++++-----
 .../zodb/fix-tests-with-persistent-4.4.patch  | 26 -----------------
 3 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch
 delete mode 100644 pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch

diff --git a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch
deleted file mode 100644
index b6bcedea91a..00000000000
--- a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one
-especially problematic test.
-
-diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py
---- ZODB-5.3.0/setup.py	2017-08-30 14:55:10.000000000 +0200
-+++ ZODB-5.3.0/setup.py	2017-10-29 11:34:17.277953730 +0100
-@@ -85,7 +85,10 @@
-                     mod = __import__(
-                         _modname(dirpath, base, os.path.splitext(filename)[0]),
-                         {}, {}, ['*'])
--                    _unittests_only(suite, mod.test_suite())
-+                    try:
-+                        _unittests_only(suite, mod.test_suite())
-+                    except AttributeError:
-+                        pass
-         elif 'tests.py' in filenames:
-             mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*'])
-             _unittests_only(suite, mod.test_suite())
-diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py
---- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py	2017-08-30 14:55:10.000000000 +0200
-+++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py	2017-10-29 11:35:10.348240386 +0100
-@@ -1184,7 +1184,4 @@
-         #unittest.makeSuite(Test_do_backup),  #TODO
-         unittest.makeSuite(Test_do_recover),
-         unittest.makeSuite(Test_do_verify),
--        # N.B.:  this test take forever to run (~40sec on a fast laptop),
--        # *and* it is non-deterministic.
--        unittest.makeSuite(MonteCarloTests),
-     ])
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 3ec954f1235..c7935208536 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchPypi
 , buildPythonPackage
+, python
 , zope_testrunner
 , transaction
 , six
@@ -22,13 +23,10 @@ buildPythonPackage rec {
       sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666";
     };
 
-    patches = [
-      ./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
-    ];
+    # remove broken test
+    postPatch = ''
+      rm -vf src/ZODB/tests/testdocumentation.py
+    '';
 
     propagatedBuildInputs = [
       transaction
@@ -46,6 +44,10 @@ buildPythonPackage rec {
       zope_testrunner
     ];
 
+    checkPhase = ''
+      ${python.interpreter} -m zope.testrunner --test-path=src []
+    '';
+
     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
deleted file mode 100644
index 57946dd2986..00000000000
--- a/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 55a8ea38da8f08c64c33cb27d00c2dd8303c3daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 15:01:09 +0100
Subject: [PATCH 1294/2793] python.pkgs.python-jose: 2.0.2 -> 3.0.1

---
 .../python-modules/python-jose/default.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 68b46743d35..4eb2daaf26d 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -1,30 +1,31 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, future, six, ecdsa, pycryptodome, pytest, cryptography
+, future, six, ecdsa, rsa
+, pycrypto, pytest, pytestcov, pytestrunner, cryptography
 }:
 
 buildPythonPackage rec {
   pname = "python-jose";
-  version = "2.0.2";
+  version = "3.0.1";
 
-  # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "mpdavis";
     repo = "python-jose";
-    # 2.0.2 not tagged on GitHub
-    # see https://github.com/mpdavis/python-jose/issues/86
-    rev = "28cc6719eceb89129eed59c25f7bdac015665bdd";
-    sha256 = "03wkq2rszy0rzy5gygsh4s7i6ls8zflgbcvxnflvmh7nis7002fp";
+    rev = version;
+    sha256 = "1ahq4m86z504bnlk9z473r7r3dprg5m39900rld797hbczdhqa4f";
   };
 
   checkInputs = [
+    pycrypto
     pytest
+    pytestcov
+    pytestrunner
     cryptography # optional dependency, but needed in tests
   ];
   checkPhase = ''
     py.test
   '';
 
-  propagatedBuildInputs = [ future six ecdsa pycryptodome ];
+  propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mpdavis/python-jose;

From 75a90b5a9bcee57b98ab9b62e4c110a10fe59dff Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 3 Dec 2018 00:37:26 -0500
Subject: [PATCH 1295/2793] pythonPackages.testfixtures: 6.2.0 -> 6.3.0

---
 .../python-modules/testfixtures/default.nix   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 1e35d95c5e1..f9d35297306 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,23 +1,33 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, mock, manuel, pytest, sybil, zope_component }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
+, mock, pytest, sybil, zope_component }:
 
 buildPythonPackage rec {
   pname = "testfixtures";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7e4df89a8bf8b8905464160f08aff131a36f0b33654fe4f9e4387afe546eae25";
+    sha256 = "1x16xkw483nb1ngv74s7lgaj514pb1ldklal7kb7iwqbxcgnrh2k";
   };
 
-  checkInputs = [ mock manuel pytest sybil zope_component ];
+  checkInputs = [ pytest mock sybil zope_component ];
+
+  patches = [
+    # Fix tests for Python 3.7. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/Simplistix/testfixtures/commit/6e8807543b804946aba58e2c9e92f5bdc3656a57.patch;
+      sha256 = "1584jz2qz04arx8z8f6d1l1vab7gi38k3akzm223rmp7j4m7yrii";
+    })
+  ];
 
   checkPhase = ''
     # django is too much hasle to setup at the moment
-    pytest --ignore=testfixtures/tests/test_django testfixtures/tests
+    pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/Simplistix/testfixtures";
+    homepage = https://github.com/Simplistix/testfixtures;
+    description = "A collection of helpers and mock objects for unit tests and doc tests";
+    license = licenses.mit;
   };
 }

From a933c53b61f258152600c5a3b0e120a7264bbfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 3 Dec 2018 16:10:05 +0100
Subject: [PATCH 1296/2793] python.pkgs.moto: allow newer versions of
 python-jose

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index d0d6d66c8ca..024a4a4c896 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -12,13 +12,12 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    # dateutil upper bound was just to keep compatibility with Python 2.6
-    # see https://github.com/spulec/moto/pull/1519 and https://github.com/boto/botocore/pull/1402
     # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16
+    # regarding python-jose: https://github.com/spulec/moto/pull/1927
     substituteInPlace setup.py \
-      --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \
       --replace "aws-xray-sdk<0.96," "aws-xray-sdk" \
-      --replace "jsondiff==1.1.1" "jsondiff>=1.1.1"
+      --replace "jsondiff==1.1.1" "jsondiff>=1.1.1" \
+      --replace "python-jose<3.0.0" "python-jose<4.0.0"
   '';
 
   propagatedBuildInputs = [

From 84a2463499d7e67350277e0f02cdb4412d0262cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Dec 2018 07:40:29 +0100
Subject: [PATCH 1297/2793] jpeginfo: init at 1.6.1

jpeginfo prints information and tests integrity of JPEG/JFIF files.
---
 .../graphics/jpeginfo/default.nix             | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/graphics/jpeginfo/default.nix

diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix
new file mode 100644
index 00000000000..f438bf6f7ed
--- /dev/null
+++ b/pkgs/applications/graphics/jpeginfo/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "jpeginfo-${version}";
+  version = "1.6.1";
+
+  src = fetchurl {
+    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
+  };
+
+  buildInputs = [ libjpeg ];
+
+  meta = with stdenv.lib; {
+    description = "Prints information and tests integrity of JPEG/JFIF files";
+    homepage = "https://www.kokkonen.net/tjko/projects.html";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f83f1fd9e9..2ba9ac670cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3558,6 +3558,8 @@ with pkgs;
 
   jp2a = callPackage ../applications/misc/jp2a { };
 
+  jpeginfo = callPackage ../applications/graphics/jpeginfo { };
+
   jpegoptim = callPackage ../applications/graphics/jpegoptim { };
 
   jpegrescan = callPackage ../applications/graphics/jpegrescan { };

From 8ebfd5c45cd25e5bce147467c5946eb76ee1d154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Nov 2018 07:03:19 +0100
Subject: [PATCH 1298/2793] nixos/jenkins-job-builder: stop reloadScript on
 error

Currently there are two calls to curl in the reloadScript, neither which
check for errors. If something is misconfigured (like wrong authToken),
the only trace that something wrong happened is this log message:

  Asking Jenkins to reload config
  <h1>Bad Message 400</h1><pre>reason: Illegal character VCHAR='<'</pre>

The service isn't marked as failed, so it's easy to miss.

Fix it by passing --fail to curl.

While at it:
* Add $curl_opts and $jenkins_url variables to keep the curl command
  lines DRY.
* Add --show-error to curl to show short error message explanation when
  things go wrong (like HTTP 401 error).
* Lower-case the $CRUMB variable as upper case is for exported environment
  variables.

The new behaviour, when having wrong accessToken:

  Asking Jenkins to reload config
  curl: (22) The requested URL returned error: 401

And the service is clearly marked as failed in `systemctl --failed`.
---
 .../services/continuous-integration/jenkins/job-builder.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 861b46a2d64..682586b83e3 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -128,8 +128,10 @@ in {
           ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
           reloadScript = ''
             echo "Asking Jenkins to reload config"
-            CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
-            curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
+            curl_opts="--silent --fail --show-error"
+            jenkins_url="http://${cfg.accessUser}:${accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
+            crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
+            curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
           '';
         in
           ''

From bb94d419fb2ae6f03d66fd590cdf2632d9097b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Nov 2018 07:04:10 +0100
Subject: [PATCH 1299/2793] nixos/jenkins-job-builder: add accessTokenFile
 option

The new option allows storing the secret access token outside the world
readable Nix store.
---
 .../jenkins/job-builder.nix                   | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 682586b83e3..5d1bfe4ec40 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -42,6 +42,18 @@ in {
         type = types.str;
         description = ''
           User token in Jenkins used to reload config.
+          WARNING: This token will be world readable in the Nix store. To keep
+          it secret, use the <option>accessTokenFile</option> option instead.
+        '';
+      };
+
+      accessTokenFile = mkOption {
+        default = "";
+        type = types.str;
+        example = "/run/keys/jenkins-job-builder-access-token";
+        description = ''
+          File containing the API token for the <option>accessUser</option>
+          user.
         '';
       };
 
@@ -103,6 +115,21 @@ in {
   };
 
   config = mkIf (jenkinsCfg.enable && cfg.enable) {
+    assertions = [
+      { assertion =
+          if cfg.accessUser != ""
+          then (cfg.accessToken != "" && cfg.accessTokenFile == "") ||
+               (cfg.accessToken == "" && cfg.accessTokenFile != "")
+          else true;
+        message = ''
+          One of accessToken and accessTokenFile options must be non-empty
+          strings, but not both. Current values:
+            services.jenkins.jobBuilder.accessToken = "${cfg.accessToken}"
+            services.jenkins.jobBuilder.accessTokenFile = "${cfg.accessTokenFile}"
+        '';
+      }
+    ];
+
     systemd.services.jenkins-job-builder = {
       description = "Jenkins Job Builder Service";
       # JJB can run either before or after jenkins. We chose after, so we can
@@ -129,7 +156,10 @@ in {
           reloadScript = ''
             echo "Asking Jenkins to reload config"
             curl_opts="--silent --fail --show-error"
-            jenkins_url="http://${cfg.accessUser}:${accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
+            access_token=${if cfg.accessTokenFile != ""
+                           then "$(cat '${cfg.accessTokenFile}')"
+                           else cfg.accessToken}
+            jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
             crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
             curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
           '';

From 0c029635cd27ed861f3a126758f6c09720be08ac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 3 Dec 2018 11:01:22 +0100
Subject: [PATCH 1300/2793] qlcplus: fix udev rules path

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

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 2fa4887a0f0..eae3216c964 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
     patchShebangs .
     sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
             -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
-            -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \
+            -e "s@/etc/udev/rules.d@''${out}/lib/udev/rules.d@" \
       variables.pri
   '';
 

From 4cf1d88d12ff894968a6a406d6ee62f26f998625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Dec 2018 17:18:07 +0000
Subject: [PATCH 1301/2793] chrome-token-signing: fix path to opensc-pkcs11

---
 pkgs/tools/security/chrome-token-signing/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index b9e42bb6fa7..2dc9336bb32 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig }:
+{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
 
 stdenv.mkDerivation rec {
   name = "chrome-token-signing-${version}";
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace host-linux/ee.ria.esteid.json --replace /usr $out
+    # TODO: macos
+    substituteInPlace host-shared/PKCS11Path.cpp \
+      --replace opensc-pkcs11.so ${opensc}/lib/pkcs11/opensc-pkcs11.so
   '';
 
   installPhase = ''

From e42d10957d87a5837085cd3273f97e50b67e987d Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Mon, 3 Dec 2018 13:46:22 -0500
Subject: [PATCH 1302/2793] Add disable core optimizations (#51464)

haskell.lib.disableOptimization: new function

Adds a utility function for disabling GHC core optimizations.
Significantly reduces build times.
---
 pkgs/development/haskell-modules/lib.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 3d67ac21399..e3b73641989 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -259,6 +259,9 @@ rec {
    */
   buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg);
 
+  /* Disable core optimizations, significantly speeds up build time */
+  disableOptimization = pkg: appendConfigureFlag pkg "--disable-optimization";
+
   /* Turn on most of the compiler warnings and fail the build if any
      of them occur. */
   failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror";

From 7357949e3ce5966480d758800c164582ae1990a5 Mon Sep 17 00:00:00 2001
From: "Andy Chun @noneucat" <andy@lolc.at>
Date: Mon, 3 Dec 2018 12:14:56 -0800
Subject: [PATCH 1303/2793] polar-bookshelf: 1.0.13 -> 1.1.0

---
 pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 157c1158ac6..f1325a6c6ac 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "polar-bookshelf-${version}";
-  version = "1.0.13";
+  version = "1.1.0";
 
   # fetching a .deb because there's no easy way to package this Electron app
   src = fetchurl {
     url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
-    sha256 = "0dh7pw8ncm8kr9anb6jqw7rr4lxgmq8a40c9zlrhzyswdpvnp1g7";
+    sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw";
   };
 
   buildInputs = [

From 51c9a39299427b265dbd42236abe7aa5962707a8 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Mon, 3 Dec 2018 12:30:57 -0800
Subject: [PATCH 1304/2793] renderdoc: 1.1 -> 1.2

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

diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 99e250e9e4d..3990d098906 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -7,19 +7,19 @@ let
   custom_swig = fetchFromGitHub {
     owner = "baldurk";
     repo = "swig";
-    rev = "renderdoc-modified-5";
-    sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw";
+    rev = "renderdoc-modified-6";
+    sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0";
   };
 in
 stdenv.mkDerivation rec {
-  version = "1.1";
+  version = "1.2";
   name = "renderdoc-${version}";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${version}";
-    sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd";
+    sha256 = "0s1q5d58x18yz3nf94pv5i1qd2hc0a4gdj4qkpcn8s6ms2x05pz4";
   };
 
   buildInputs = [

From 846aeabdc43f11f1ec39b4530b3d3b6615310309 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 3 Dec 2018 14:53:23 +0100
Subject: [PATCH 1305/2793] dmrconfig: 2018-11-07 -> 1.0

---
 pkgs/applications/misc/dmrconfig/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
index 5d02eb937ff..7e20b87eb98 100644
--- a/pkgs/applications/misc/dmrconfig/default.nix
+++ b/pkgs/applications/misc/dmrconfig/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "dmrconfig-${version}";
-  version = "2018-11-07";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
-    rev = "b58985d3c848b927e91699d97f96d9de014c3fc7";
-    sha256 = "083f21hz6vqjpndkn27nsjnhnc5a4bw0cr26ryfqcvz275rj4k18";
+    rev = version;
+    sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9";
   };
 
   buildInputs = [
@@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
+    substituteInPlace Makefile \
+      --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \
+      --replace "\$(shell git describe --tags --abbrev=0)" ${version} \
+      --replace "\$(shell git rev-list HEAD --count)" 0
   '';
 
   installPhase = ''

From 4173b845cae89fb527d85eb5a60145fc5085055c Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Mon, 3 Dec 2018 21:04:08 +0000
Subject: [PATCH 1306/2793] mediawiki: 1.29.1 -> 1.31.1

1.29.1 is out of support and has security vulnerabilities. 1.31.1 is current LTS.
---
 .../services/web-servers/apache-httpd/mediawiki.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 4269f6cfb08..e871ae6ff15 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.29.1";
+    name= "mediawiki-1.31.1";
 
     src = pkgs.fetchurl {
-      url = "https://releases.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
-      sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
+      url = "https://releases.wikimedia.org/mediawiki/1.31/${name}.tar.gz";
+      sha256 = "13x48clij21cmysjkpnx68vggchrdasqp7b290j87xlfgjhdhnnf";
     };
 
     skins = config.skins;
@@ -111,7 +111,7 @@ let
         sed -i \
         -e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \
         -e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \
-          $out/includes/limit.sh \
+          $out/includes/shell/limit.sh \
           $out/includes/GlobalFunctions.php
       '';
   };

From 08c75aaedc45ee15fc7e8f9f5967606d6d0f997f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 3 Dec 2018 22:10:29 +0000
Subject: [PATCH 1307/2793] libffi: swap src URL from FTP to HTTPS

HTTPS is never worse and often better than FTP, since it's faster, more secure,
and more likely to be accessible through firewalls.

This does not change the tarball sha, as confirmed by `nix-prefetch-url`.
---
 pkgs/development/libraries/libffi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 215f587bb6b..384e3370ec9 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "libffi-3.2.1";
 
   src = fetchurl {
-    url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
+    url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
     sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 

From 23de7958bff140f68d19f5282eeea3ce7c7ced66 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Dec 2018 22:35:07 +0100
Subject: [PATCH 1308/2793] =?UTF-8?q?sublime3-dev:=203176=20=E2=86=92=2031?=
 =?UTF-8?q?83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sublime finally switched to GTK 3!
---
 .../applications/editors/sublime/3/common.nix | 29 +++++++++++++++----
 .../editors/sublime/3/packages.nix            |  6 ++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index eb282b1be3a..cf6802eb9a9 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -1,14 +1,14 @@
 {buildVersion, x32sha256, x64sha256}:
 
-{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2,
   pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
   gksuSupport ? false, gksu, unzip, zip, bash}:
 
 assert gksuSupport -> gksu != null;
 
 let
-
-  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
+  legacy = stdenv.lib.versionOlder buildVersion "3181";
+  libPath = stdenv.lib.makeLibraryPath [ glib xorg.libX11 (if legacy then gtk2 else gtk3) cairo pango ];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
     ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
 in let
@@ -36,11 +36,14 @@ in let
 
     dontStrip = true;
     dontPatchELF = true;
-    buildInputs = [ makeWrapper zip unzip ];
+    buildInputs = stdenv.lib.optionals (!legacy) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
+    nativeBuildInputs = [ makeWrapper zip unzip ] ++ stdenv.lib.optional (!legacy) wrapGAppsHook;
 
     # make exec.py in Default.sublime-package use own bash with
     # an LD_PRELOAD instead of "/bin/bash"
     patchPhase = ''
+      runHook prePatch
+
       mkdir Default.sublime-package-fix
       ( cd Default.sublime-package-fix
         unzip -q ../Packages/Default.sublime-package
@@ -50,9 +53,13 @@ in let
         zip -q ../Packages/Default.sublime-package **/*
       )
       rm -r Default.sublime-package-fix
+
+      runHook postPatch
     '';
 
     buildPhase = ''
+      runHook preBuild
+
       for i in sublime_text plugin_host crash_reporter; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -62,9 +69,13 @@ in let
 
       # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
       sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text
+
+      runHook postBuild
     '';
 
     installPhase = ''
+      runHook preInstall
+
       # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
       sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop
 
@@ -74,12 +85,20 @@ in let
       # We can't just call /usr/bin/env bash because a relocation error occurs
       # when trying to run a build from within Sublime Text
       ln -s ${bash}/bin/bash $out/sublime_bash
+
+      runHook postInstall
+    '';
+
+    dontWrapGApps = true; # non-standard location, need to wrap the executables manually
+
+    postFixup = ''
       wrapProgram $out/sublime_bash \
         --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
 
       wrapProgram $out/sublime_text \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-        --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
+        --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
+        ${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''}
 
       # Without this, plugin_host crashes, even though it has the rpath
       wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 8ab7c814407..f9a6f1cb6dc 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,9 +5,9 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3176";
-      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
-      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
+      buildVersion = "3183";
+      x32sha256 = "0rgah7iq9y3afbawcb723d2b7m56lz0ji5l8klxvkp59c9rphqxh";
+      x64sha256 = "1n3zarkhs22p2vi32fswb0fvcn9fzivmziw6zcvjy02c0rmxmdkz";
     } {};
 
     sublime3 = common {

From 83f782f1754c511d647056ea426dd82e9d51633f Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Mon, 3 Dec 2018 12:40:27 -0800
Subject: [PATCH 1309/2793] Add mock to the list of whisper's test inputs.

This was required as the versiof whisper was upgraded from
1.1.3 to 1.1.4 and mock was added as a test dependency in
that release:
https://github.com/graphite-project/whisper/commit/703dd9d3a60a0f79383c03a541ee66bd50966a01#diff-62849af500c571aa4532da7be8833e73R14
---
 pkgs/development/python-modules/whisper/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index 1fb9dd6da16..0f8178e17f2 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage, fetchPypi, mock, six }:
 
 buildPythonPackage rec {
   pname = "whisper";
@@ -10,6 +10,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ six ];
+  checkInputs           = [ mock ];
 
   meta = with stdenv.lib; {
     homepage = http://graphite.wikidot.com/;

From 330fbbeb7399bb6d18d0fd317b68d5a56cd03ae8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 2 Dec 2018 13:16:36 +0100
Subject: [PATCH 1310/2793] pyflame: init at 1.6.7

---
 .../tools/profiling/pyflame/default.nix       | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/profiling/pyflame/default.nix

diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix
new file mode 100644
index 00000000000..31ecbcaacbf
--- /dev/null
+++ b/pkgs/development/tools/profiling/pyflame/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig
+# pyflame needs one python version per ABI
+# are currently supported 
+# * 2.6 or 2.7 for 2.x ABI
+# * 3.4 or 3.5 for 3.{4,5} ABI
+# * 3.6        for 3.6+ ABI
+# if you want to disable support for some ABI, make the corresponding argument null
+, python2, python35, python36
+}:
+stdenv.mkDerivation rec {
+  pname = "pyflame";
+  version = "1.6.7"; 
+  src = fetchFromGitHub {
+    owner = "uber";
+    repo = "pyflame";
+    rev = "v${version}";
+    sha256 = "0hz1ryimh0w8zyxx4y8chcn54d6b02spflj5k9rcg26an2chkg2w";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ python36 python2 python35 ];
+
+  postPatch = ''
+    patchShebangs .
+    # some tests will fail in the sandbox
+    substituteInPlace tests/test_end_to_end.py \
+      --replace 'skipif(IS_DOCKER' 'skipif(True'
+  '';
+
+  doCheck = true;
+  # reproduces the logic of their test script, but without downloading pytest
+  # from the internet with pip
+  checkPhase = with stdenv.lib; concatMapStringsSep "\n" (python: ''
+    set -x
+    PYMAJORVERSION=${head (strings.stringToCharacters python.version)} \
+      PATH=${makeBinPath [ coreutils ]}\
+      PYTHONPATH= \
+      ${python.pkgs.pytest}/bin/pytest tests/
+    set +x
+  '') (filter (x: x!=null) buildInputs);
+
+  meta = with stdenv.lib; {
+    description = "A ptracing profiler for Python ";
+    longDescription = ''
+      Pyflame is a high performance profiling tool that generates flame graphs for
+      Python. Pyflame uses the Linux ptrace(2) system call to collect profiling
+      information. It can take snapshots of the Python call stack without
+      explicit instrumentation, meaning you can profile a program without
+      modifying its source code.
+    '';
+    homepage = https://github.com/uber/pyflame;
+    license = licenses.asl20;
+    maintainers = [ maintainers.symphorien ];
+    # arm: https://github.com/uber/pyflame/issues/136
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a0611..fedc9282b17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8850,6 +8850,8 @@ with pkgs;
 
   puppet-lint = callPackage ../development/tools/puppet/puppet-lint { };
 
+  pyflame = callPackage ../development/tools/profiling/pyflame { };
+
   pyrseas = callPackage ../development/tools/database/pyrseas { };
 
   qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };

From 58700be336390ae7001d3c224f986e05e8deaa52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 22:29:22 +0000
Subject: [PATCH 1311/2793] radare2: 3.1.1 -> 3.1.2

---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index aa8741989f4..e8bec4184b8 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20285";
-    gittap = "3.1.1";
-    gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
-    rev = "3.1.1";
-    version = "3.1.1";
-    sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
+    version_commit = "20299";
+    gittap = "3.1.2";
+    gittip = "b453df6acc6742d709bd238cd9cd63ede2534b1b";
+    rev = "3.1.2";
+    version = "3.1.2";
+    sha256 = "1cvfkxp8vj8f6ghhin71lynvq3zpc311y5b9c2sg9g7h4j3647nq";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20285";
+    version_commit = "20299";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From dc9bb48a736709dba46a9be54cdd826376214cd6 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 4 Dec 2018 01:20:02 +0200
Subject: [PATCH 1312/2793] loop: cleanup

---
 pkgs/tools/misc/loop/default.nix          | 11 +++++++----
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 ------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index f86f3041aba..acb88d9773c 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,19 +1,22 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   name = "loop-unstable-2018-10-02";
-  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
     repo  = "Loop";
-    rev   = version;
+    rev   = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
     sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
   };
 
   cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
 
-  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+  cargoPatches = [
+    # Upstream includes mismatched Cargo.lock file.
+    # See https://github.com/Miserlou/Loop/pull/40
+    ./fix_cargo_lock.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "UNIX's missing `loop` command";
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
deleted file mode 100644
index b95afac470f..00000000000
--- a/pkgs/tools/misc/loop/fix_cargo_toml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,9 +15,9 @@ license = "MIT"
--structopt = "0.2" 
-+structopt = "0.2.10" 
- humantime = "1.1.1"
--atty = "0.2"
-+atty = "0.2.11"
--regex = "1.0.0"
-+regex = "1.0.5"
--subprocess = "0.1.12"
-+subprocess = "0.1.14"
--tempfile = "3.0.3"
-+tempfile = "3.0.4"
- 
- [[bin]]
- name = "loop"

From fae81f322e045a996c2108aa61996e31b2af64d1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 00:19:37 +0100
Subject: [PATCH 1313/2793] cowsay: fix cross

The install.sh script looks for all perls in $PATH, tries to execute
these to test whether that perl is "good", if it is, takes it and
puts it into the shebang.

This obviously can't work for cross. As installation seems to be pretty
trivial, do it in a custom install phase.
---
 pkgs/tools/misc/cowsay/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 4d55b70d007..6b5c9c51394 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -11,8 +11,18 @@ stdenv.mkDerivation rec{
 
   buildInputs = [ perl ];
 
+  postBuild = ''
+    substituteInPlace cowsay --replace "%BANGPERL%" "!${perl}/bin/perl" \
+      --replace "%PREFIX%" "$out"
+  '';
+
   installPhase = ''
-    bash ./install.sh $out
+    mkdir -p $out/{bin,man/man1,share/cows}
+    install -m755 cowsay $out/bin/cowsay
+    ln -s cowsay $out/bin/cowthink
+    install -m644 cowsay.1 $out/man/man1/cowsay.1
+    ln -s cowsay.1 $out/man/man1/cowthink.1
+    install -m644 cows/* -t $out/share/cows/
   '';
 
   meta = with stdenv.lib; {

From 1f5c851967fe3365804b6e61f72f1738e00baf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 22:26:36 +0000
Subject: [PATCH 1314/2793] radare: remove

This project has been deprecated in 2016.
Radare2 should been used intead: https://github.com/radare/radare
---
 .../tools/analysis/radare/default.nix         | 38 -------------------
 .../tools/analysis/radare/ired.nix            | 22 -----------
 pkgs/top-level/all-packages.nix               | 11 ------
 3 files changed, 71 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/radare/default.nix
 delete mode 100644 pkgs/development/tools/analysis/radare/ired.nix

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
deleted file mode 100644
index b9b9b8abfb9..00000000000
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
-gtk2 ? null, vte ? null, gtkdialog ? null,
-python ? null,
-ruby ? null,
-useX11, rubyBindings, pythonBindings, luaBindings}:
-
-assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
-assert rubyBindings -> ruby != null;
-assert pythonBindings -> python != null;
-
-let
-  inherit (stdenv.lib) optional;
-in
-stdenv.mkDerivation rec {
-  name = "radare-1.5.2";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ readline libusb perl]
-    ++ optional useX11 [gtkdialog vte gtk2]
-    ++ optional rubyBindings [ruby]
-    ++ optional pythonBindings [python]
-    ++ optional luaBindings [lua];
-
-  meta = {
-    description = "Free advanced command line hexadecimal editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix
deleted file mode 100644
index aec13296bda..00000000000
--- a/pkgs/development/tools/analysis/radare/ired.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "ired-0.4";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm";
-  };
-  
-  installPhase = ''
-    make install PREFIX=$out
-  '';
-
-  meta = {
-    description = "Interactive Raw Editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c43db49ad8b..5ef3d430b13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8657,8 +8657,6 @@ in
 
   iozone = callPackage ../development/tools/misc/iozone { };
 
-  ired = callPackage ../development/tools/analysis/radare/ired.nix { };
-
   itstool = callPackage ../development/tools/misc/itstool { };
 
   jam = callPackage ../development/tools/build-managers/jam { };
@@ -8874,15 +8872,6 @@ in
 
   r10k = callPackage ../tools/system/r10k { };
 
-  radare = callPackage ../development/tools/analysis/radare {
-    inherit (gnome2) vte;
-    lua = lua5;
-    useX11 = config.radare.useX11 or false;
-    pythonBindings = config.radare.pythonBindings or false;
-    rubyBindings = config.radare.rubyBindings or false;
-    luaBindings = config.radare.luaBindings or false;
-  };
-
   inherit (callPackages ../development/tools/analysis/radare2 {
     inherit (gnome2) vte;
     lua = lua5;

From b057ac71eaffb98784cf9cfbf76e6dac83644e64 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 3 Dec 2018 16:11:45 +0200
Subject: [PATCH 1315/2793] mythes: fix link error on missed `tinfo` library
 (ncurses)

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

diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index 28888e551ef..01bf863bbbb 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hunspell, pkgconfig, perl }:
+{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
   name = "mythes-1.2.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ hunspell ];
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ ncurses pkgconfig perl ];
 
   meta = {
     homepage = http://hunspell.sourceforge.net/;

From c846e8dd7fb20c24a609a822bad1d9af7dba8a1d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 4 Dec 2018 01:25:19 +0100
Subject: [PATCH 1316/2793] cyrus-sasl: remove obsolete patch

seems to have been merged incorrectly
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 0cf52238fe3..4344923f694 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
     ./cyrus-sasl-ac-try-run-fix.patch
-    (fetchpatch {
-      name = "CVE-2013-4122.patch";
-      url = "mirror://sourceforge/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
-      sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
-    })
   ] ++ lib.optional stdenv.isFreeBSD (
       fetchurl {
         url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";

From e9ecd7f87256d6c669413da3a02f1873663cdcf6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 4 Dec 2018 01:54:37 +0100
Subject: [PATCH 1317/2793] nix-index: Wrap with nix-env in PATH (#51165)

This fixes an impurity in nix-index: Previously it would take the nix-env
binary from the users PATH. I discovered this while trying to run nix-index in a
systemd service, which by default doesn't have nix-env in its path. The
errors it threw were not informative at all and it took me hours to
finally figure out the reason.
---
 pkgs/tools/package-management/nix-index/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index c20e3142104..a7cebe8d1c8 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
-, Security
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl
+, nix, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
   };
   cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl curl ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
 
@@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec {
     cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
     substituteInPlace $out/etc/profile.d/command-not-found.sh \
       --replace "@out@" "$out"
+    wrapProgram $out/bin/nix-index \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}"
   '';
 
   meta = with stdenv.lib; {

From c4177f4e5ba5e1b29c3b51ff02697dc1437cfb91 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 02:09:22 +0100
Subject: [PATCH 1318/2793] zoom-us: 2.4.129780.0915 -> 2.5.146186.1130

fixes [CVE-2018-15715](https://nvd.nist.gov/vuln/detail/CVE-2018-15715)
---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index d271d5d4849..069d37a4c7f 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.4.129780.0915";
+  version = "2.5.146186.1130";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0s4014ymc92rwpagcwjhmwwfz0vq35wiq2nhh6nlxcrr6jl4wd78";
+      sha256 = "1644xs7xg8a27xg7bgb7856hvlvfh2lin749alds782i52p9rsjr";
     };
   };
 

From da511852c153c8ca2395867dc60ac262bd603586 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 4 Dec 2018 02:57:28 +0100
Subject: [PATCH 1319/2793] leiningen: move leiningen-x.x-standalone.jar out of
 share/java

fixes #51448
---
 .../tools/build-managers/leiningen/default.nix           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 30531c980b0..4faf524af11 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -24,11 +24,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = [ jdk ];
 
+  # the jar is not in share/java, because it's a standalone jar and should
+  # never be picked up by set-java-classpath.sh
+
   installPhase = ''
-    mkdir -p $out/bin $out/share/java
+    mkdir -p $out/bin $out/share
 
     cp -v $src $out/bin/lein
-    cp -v $jarsrc $out/share/java/$JARNAME
+    cp -v $jarsrc $out/share/$JARNAME
   '';
 
   fixupPhase = ''
@@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
     patchShebangs $out/bin/lein
 
     substituteInPlace $out/bin/lein \
-      --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME"
+      --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
 
     wrapProgram $out/bin/lein \
       --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \

From f1dd6faaaa163160697376484f29f8d25da8effb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 3 Dec 2018 21:16:10 -0500
Subject: [PATCH 1320/2793] docs: Remove nix-repl references

nix-repl has been deprecated
---
 doc/languages-frameworks/texlive.xml          | 12 ++++++------
 nixos/doc/manual/configuration/modularity.xml |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index e42d0a81111..5792a16963a 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -49,12 +49,12 @@ texlive.combine {
    </listitem>
    <listitem>
     <para>
-     You can list packages e.g. by <command>nix-repl</command>.
-<programlisting>
-$ nix-repl
-nix-repl> :l &lt;nixpkgs>
-nix-repl> texlive.collection-&lt;TAB>
-      </programlisting>
+     You can list packages e.g. by <command>nix repl</command>.
+<programlisting><![CDATA[
+$ nix repl
+nix-repl> :l <nixpkgs>
+nix-repl> texlive.collection-<TAB>
+]]></programlisting>
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index cda36eba25c..5ff5bc22c85 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -113,12 +113,10 @@ $ nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
   Interactive exploration of the configuration is possible using
-  <command
-xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
-  a read-eval-print loop for Nix expressions. It’s not installed by default;
-  run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
+  <command>nix repl</command>, a read-eval-print loop for Nix expressions.
+  A typical use:
 <screen>
-$ nix-repl '&lt;nixpkgs/nixos>'
+$ nix repl '&lt;nixpkgs/nixos>'
 
 nix-repl> config.<xref linkend="opt-networking.hostName"/>
 "mandark"

From 5bc0270211570cf46936e4c95900bdd0a19119a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 08:32:29 +0100
Subject: [PATCH 1321/2793] nix-zsh-completions: 0.4.1 -> 0.4.2

---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 861a6d05df6..122a44dcd17 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.4.1";
+  version = "0.4.2";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "1p2y1sg6jghixv2j3fwxnkyl3idj44gcm71bbn25mnqfhm0z25hr";
+    sha256 = "1pfyn8kd9fc9fyy77imzg6xj00nzddkjagwjs2594db8ynp6cfil";
   };
 
   installPhase = ''

From ad8f5ca2bbb898098c87c44109dde9f214602327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 08:34:23 +0100
Subject: [PATCH 1322/2793] nix-bash-completions: 0.6.6 -> 0.6.7

---
 pkgs/shells/bash/nix-bash-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index b76e65ca871..5ac117cf1e5 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.6";
+  version = "0.6.7";
   name = "nix-bash-completions-${version}";
 
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
     rev = "v${version}";
-    sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw";
+    sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
   };
 
   # To enable lazy loading via. bash-completion we need a symlink to the script

From 50069a0eeafbd815e7296c15ad25f50c6d9d8505 Mon Sep 17 00:00:00 2001
From: Kyle Lacy <kylelacy+git@pm.me>
Date: Tue, 4 Dec 2018 00:11:48 -0800
Subject: [PATCH 1323/2793] plex-media-player: 2.14.1 -> 2.23.0

---
 .../video/plex-media-player/default.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 7386d95d0c2..ceba62b6f60 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -9,41 +9,41 @@ let
   # plex-media-player is updated, the versions for these files are changed,
   # so the build IDs (and SHAs) below will need to be updated!
   depSrcs = rec {
-    webClientBuildId = "56-23317d81e49651";
-    webClientDesktopBuildId = "3.57.1-1e49651";
-    webClientTvBuildId = "3.60.1-23317d8";
+    webClientBuildId = "85-88b3ac67015f76";
+    webClientDesktopBuildId = "3.77.2-7015f76";
+    webClientTvBuildId = "3.78.0-88b3ac6";
 
     webClient = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
-      sha256 = "1a48a65zzdx347kfnxriwkb0yjlhvn2g8jkda5pz10r3lwja0gbi";
+      sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
     };
     webClientDesktopHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
-      sha256 = "04wdgpsh33y8hyjhjrfw6ymf9g002jny7hvhld4xp33lwxhd2j5w";
+      sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
     };
     webClientDesktop = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
-      sha256 = "1asw9f84z9sm3w7ifnc7j631j84rgx23c6msmn2dnw48ckv3bj2z";
+      sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
     };
     webClientTvHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
-      sha256 = "0d1hsvmpwczwx442f8qdvfr8c3w84630j9qwpg2y4qm423sgdvja";
+      sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
     };
     webClientTv = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
-      sha256 = "1ih3l5paf1jl68b1xq3iqqmvs3m07fybz57hcz4f78v0gwq2kryq";
+      sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
     };
   };
 in stdenv.mkDerivation rec {
   name = "plex-media-player-${version}";
-  version = "2.14.1.880";
-  vsnHash = "301a4b6c";
+  version = "2.23.0.920";
+  vsnHash = "5bc1a2e5";
 
   src = fetchFromGitHub {
     owner = "plexinc";
     repo = "plex-media-player";
     rev = "v${version}-${vsnHash}";
-    sha256 = "0xz41r697vl6s3qvy6jwriv3pb9cfy61j6sydvdq121x5a0jnh9a";
+    sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3 ];

From 21de751e742685b86a78ff2251bb1fc1692aee4a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 4 Dec 2018 11:41:23 +0100
Subject: [PATCH 1324/2793] python.pkgs.pygraphviz: add graphviz path

---
 .../python-modules/pygraphviz/default.nix          | 14 ++++++++++++--
 .../python-modules/pygraphviz/graphviz-path.patch  | 13 +++++++++++++
 pkgs/top-level/python-packages.nix                 |  4 +++-
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygraphviz/graphviz-path.patch

diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 7ba62c4f2eb..8ca84e9b7c0 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -13,8 +13,18 @@ buildPythonPackage rec {
   buildInputs = [ doctest-ignore-unicode mock nose ];
   propagatedBuildInputs = [ graphviz pkgconfig ];
 
-  # the tests are currently failing:
-  # check status of pygraphviz/pygraphviz#129
+  patches = [
+    # pygraphviz depends on graphviz being in PATH. This patch always prepends
+    # graphviz to PATH.
+    ./graphviz-path.patch
+  ];
+  postPatch = ''
+    substituteInPlace pygraphviz/agraph.py --subst-var-by graphvizPath '${graphviz}/bin'
+  '';
+
+  # The tests are currently failing because of a bug in graphviz 2.40.1.
+  # Upstream does not want to skip the relevant tests:
+  # https://github.com/pygraphviz/pygraphviz/pull/129
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
new file mode 100644
index 00000000000..dde6df967f0
--- /dev/null
+++ b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
@@ -0,0 +1,13 @@
+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
+index 8f72024..2d8358e 100644
+--- a/pygraphviz/agraph.py
++++ b/pygraphviz/agraph.py
+@@ -1557,7 +1557,7 @@ class AGraph(object):
+         import os
+         import glob
+ 
+-        paths = os.environ["PATH"]
++        paths = '@graphvizPath@:' + os.environ["PATH"]
+         if os.name == "nt":
+             exe = ".exe"
+         else:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be0cfdb6ce3..0e9becdde37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3033,7 +3033,9 @@ in {
 
   graphviz = callPackage ../development/python-modules/graphviz { };
 
-  pygraphviz = callPackage ../development/python-modules/pygraphviz { };
+  pygraphviz = callPackage ../development/python-modules/pygraphviz {
+    graphviz = pkgs.graphviz; # not the python package
+  };
 
   pymc3 = callPackage ../development/python-modules/pymc3 { };
 

From f9a35507778b4bf1bf5aa48703b03a293a2dc1f5 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 4 Dec 2018 11:45:51 +0100
Subject: [PATCH 1325/2793] geoclue: fix gobject-introspection naming

gobjectIntrospection is now named gobject-introspection
---
 pkgs/development/libraries/geoclue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 173aac0c52e..f2eeb9ae40b 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
-, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
+, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
 , withDemoAgent ? false
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobjectIntrospection
+    pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
     # devdoc
     gtk-doc docbook_xsl docbook_xml_dtd_412
   ];

From d9eb8c760ea776a5d175e02f92abbca02f7aea9b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 4 Dec 2018 12:04:03 +0000
Subject: [PATCH 1326/2793] doc: reminder to upgrade linux-libre with linux

https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444061264
---
 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 c4354acf0ca..40bfffe8b4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14602,7 +14602,9 @@ in
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
-  # Don't forget to update linuxPackages_latest!
+  # When adding to this list:
+  # - Update linuxPackages_latest to the latest version
+  # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
   linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;

From d13f9de5ef7479cd727d343b212f3731f8ec3054 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 4 Dec 2018 00:49:31 -0800
Subject: [PATCH 1327/2793] noto-fonts: update 2017-10-24 -> 2018-11-30

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>
---
 pkgs/data/fonts/noto-fonts/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index ae8d358164f..5043e031c08 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -2,11 +2,14 @@
 
 let
   mkNoto = { name, weights, sha256, }:
-    let version = "2017-10-24-phase3-second-cleanup"; in
+    let
+      version = "2018-11-30";
+      ref = "85e78f831469323c85847e23f95026c894159135";
+    in
     fetchzip {
       name = "${name}-${version}";
       inherit sha256;
-      url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
+      url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip";
       postFetch = ''
         unzip $downloadedFile
         mkdir -p $out/share/fonts/noto
@@ -47,12 +50,12 @@ rec {
   noto-fonts = mkNoto {
     name = "noto-fonts";
     weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
-    sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb";
+    sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d";
   };
   noto-fonts-extra = mkNoto {
     name = "noto-fonts-extra";
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
-    sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc";
+    sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
   };
   noto-fonts-cjk = let version = "1.004"; in fetchzip {
     name = "noto-fonts-cjk-${version}";

From fa749ac8589eb95732f989ad5debf1a6e0ec4ebc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 4 Dec 2018 12:08:30 +0000
Subject: [PATCH 1328/2793] linux_latest-libre: document finding latest rev

https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444064006
---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index c240bdc364d..104dc457d6c 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,6 +1,9 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
+    
+    # Update this if linux_latest-libre fails to build.
+    # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
     rev = "15715";
     sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
   }

From d539b0976845c3754a41a8706ae6188a87f6a20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 13:17:49 +0100
Subject: [PATCH 1329/2793] valgrind: run autoconf to pick up Makefile.am patch

https://github.com/NixOS/nixpkgs/pull/51107 added a patch to Makefile.am to fix
a race condition in the build. It was unfortunately never picked up as we we're
using the generated makefile from the tarball.
---
 pkgs/development/tools/analysis/valgrind/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index df99ecb13bb..ca8d64f9132 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
+{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.14.0";
@@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03";
   };
 
+  # autoreconfHook is needed to pick up patching of Makefile.am
+  # Remove when the patch no longer applies.
   patches = [ ./coregrind-makefile-race.patch ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   outputs = [ "out" "dev" "man" "doc" ];
 

From 2f98b1c112f7db28b487e53e0a66e44a61d60cfa Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 4 Dec 2018 13:33:34 +0100
Subject: [PATCH 1330/2793] spotify: 1.0.93.242.gc2341a27-15 ->
 1.0.94.262.g3d5c231c-9

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 15aaab40a67..c5c3724df2a 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.93.242.gc2341a27-15";
+  version = "1.0.94.262.g3d5c231c-9";
   # 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 examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "24";
+  rev = "28";
 
 
   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 = "920d55b3dcad4ac6acd9bc73c8ad8eb1668327a175da465ce3d8bba2430da47aaefa5218659315fab43b5182611eb03047d4e2679c1345c57380b7def7a1212d";
+    sha512 = "ca8e2eb45ea7ef6396382298822969994aca86cca8ba122ec1521c593e621161267943fe5515bb8747037ecbbfbd05cffbbca017f8f4b1c9fbd216e1d6a9e8cb";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];

From 5fc63b32f7ba2da95b332136ab55d1de05d64f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 00:44:07 -0200
Subject: [PATCH 1331/2793] nordic-polar: init at 1.3.0

---
 pkgs/data/themes/nordic-polar/default.nix | 35 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/data/themes/nordic-polar/default.nix

diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
new file mode 100644
index 00000000000..305f5952947
--- /dev/null
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "nordic-polar-${version}";
+  version = "1.3.0";
+
+  srcs = [
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
+      sha256 = "1c5zgymkwd89fr680c49siwbkhfbay56iq9vlyqkj1dp0xnc528s";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
+      sha256 = "0nxzcgqzc42qvnhafranz6rwanqb4wzf9ychm5m4yrlp3ngw38p4";
+    })
+  ];
+
+  sourceRoot = ".";
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Nordic-Polar* $out/share/themes
+    rm $out/share/themes/*/{LICENSE,README.md}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gtk theme created using the awesome Nord color pallete";
+    homepage = https://github.com/EliverLara/Nordic-Polar;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca..40f36a4b351 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15478,6 +15478,8 @@ in
 
   nafees = callPackage ../data/fonts/nafees { };
 
+  nordic-polar = callPackage ../data/themes/nordic-polar { };
+
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra;
 

From eff0cf020fa5fe93b7ee8ac968537cbbd34d85a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 00:30:12 -0200
Subject: [PATCH 1332/2793] materia-theme: 20181115 -> 20181125

---
 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 e96e3ce895f..f081078d3af 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 = "20181115";
+  version = "20181125";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "1vfwzvzbs4336vjg6y4asm21p64xc5f7cfsld5l159174ikcz5fp";
+    sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];

From c46915c9c1604c057026547a64014f430bbc15ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 10:56:57 -0200
Subject: [PATCH 1333/2793] materia-theme: move to pkgs/data/themes

---
 pkgs/{misc => data}/themes/materia-theme/default.nix | 0
 pkgs/top-level/all-packages.nix                      | 5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{misc => data}/themes/materia-theme/default.nix (100%)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
similarity index 100%
rename from pkgs/misc/themes/materia-theme/default.nix
rename to pkgs/data/themes/materia-theme/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca..e2e08ee676d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15438,6 +15438,8 @@ in
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
+  materia-theme = callPackage ../data/themes/materia-theme { };
+
   material-icons = callPackage ../data/fonts/material-icons { };
 
   meslo-lg = callPackage ../data/fonts/meslo-lg {};
@@ -22197,9 +22199,6 @@ in
 
   matcha = callPackage ../misc/themes/matcha { };
 
-  # previously known as flat-plat
-  materia-theme = callPackage ../misc/themes/materia-theme { };
-
   mess = callPackage ../misc/emulators/mess {
     inherit (pkgs.gnome2) GConf;
   };

From da297ef8aa7753930e7524a8137c47c495a55b2e Mon Sep 17 00:00:00 2001
From: locallycompact <locallycompact@gmail.com>
Date: Tue, 4 Dec 2018 13:54:13 +0000
Subject: [PATCH 1334/2793] libpcap: 1.8.1 -> 1.9.0

* libpcap to 1.8.1 -> 1.9.0 (#51216)
Changelog: http://www.tcpdump.org/libpcap-changes.txt

* libpcap: refresh meta.homepage
and fix SHA hash
---
 .../development/libraries/libpcap/default.nix | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 267859cb217..62b8126dbc7 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, flex, bison }:
+{ stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.8.1";
+  name = "libpcap-1.9.0";
 
   src = fetchurl {
     url = "https://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7";
+    sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf";
   };
 
   nativeBuildInputs = [ flex bison ];
@@ -27,26 +27,10 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace " -arch i386" ""
   '';
 
-  patches = [
-    (fetchpatch {
-      url    = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
-      sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
-    })
-    # See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9
-    (fetchpatch {
-      url    = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch";
-      sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5";
-    })
-    (fetchpatch {
-      url    = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch";
-      sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr";
-    })
-  ];
-
   preInstall = ''mkdir -p $out/bin'';
 
   meta = with stdenv.lib; {
-    homepage = http://www.tcpdump.org;
+    homepage = https://www.tcpdump.org;
     description = "Packet Capture Library";
     platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];

From 995defbb9bd488a5d540f8420d3277644fed9aef Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 2 Dec 2018 00:56:16 +0100
Subject: [PATCH 1335/2793] build-support writers: content can be string or
 file

---
 pkgs/build-support/writers/default.nix | 147 ++++++++++++++-----------
 pkgs/build-support/writers/test.nix    |  21 +++-
 2 files changed, 105 insertions(+), 63 deletions(-)

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 8aa3e52f5e8..ef520f68320 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -8,19 +8,54 @@ rec {
   # Examples:
   #   writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; }
   #   makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
-  makeScriptWriter = { interpreter, check ? "" }: name: text:
-    assert lib.or (types.path.check name) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" name != null);
+  makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
+    assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
+    assert lib.or (types.path.check content) (types.string.check content);
+    let
+      name = last (builtins.split "/" nameOrPath);
+    in
 
-    pkgs.writeTextFile {
-      name = last (builtins.split "/" name);
-      executable = true;
-      destination = if types.path.check name then name else "";
-      text = ''
-        #! ${interpreter}
-        ${text}
-        '';
-      checkPhase = check;
-    };
+    pkgs.runCommand name (if (types.string.check content) then {
+      inherit content interpreter;
+      passAsFile = [ "content" ];
+    } else {
+      inherit interpreter;
+      contentPath = content;
+    }) ''
+      echo "#! $interpreter" > $out
+      cat "$contentPath" >> $out
+      chmod +x $out
+      ${optionalString (types.path.check nameOrPath) ''
+        mv $out tmp
+        mkdir -p $out/$(dirname "${nameOrPath}")
+        mv tmp $out/${nameOrPath}
+      ''}
+    '';
+
+  # Base implementation for compiled executables.
+  # Takes a compile script, which in turn takes the name as an argument.
+  #
+  # Examples:
+  #   writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
+  makeBinWriter = { compileScript }: nameOrPath: content:
+    assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
+    assert lib.or (types.path.check content) (types.string.check content);
+    let
+      name = last (builtins.split "/" nameOrPath);
+    in
+    pkgs.runCommand name (if (types.string.check content) then {
+      inherit content;
+      passAsFile = [ "content" ];
+    } else {
+      contentPath = content;
+    }) ''
+      ${compileScript}
+      ${optionalString (types.path.check nameOrPath) ''
+        mv $out tmp
+        mkdir -p $out/$(dirname "${nameOrPath}")
+        mv tmp $out/${nameOrPath}
+      ''}
+    '';
 
   # Like writeScript but the first line is a shebang to bash
   #
@@ -48,41 +83,33 @@ rec {
   #        return 0;
   #      }
   #    ''
-  writeC = name: {
-    libraries ? [],
-  }: text: pkgs.runCommand name {
-    inherit text;
-    buildInputs = [ pkgs.pkgconfig ] ++ libraries;
-    passAsFile = [ "text" ];
-  } ''
-    PATH=${makeBinPath [
-      pkgs.binutils-unwrapped
-      pkgs.coreutils
-      pkgs.gcc
-      pkgs.pkgconfig
-    ]}
-    mkdir -p "$(dirname "$out")"
-    gcc \
-        ${optionalString (libraries != [])
-          "$(pkg-config --cflags --libs ${
-            concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
-          })"
-        } \
-        -O \
-        -o "$out" \
-        -Wall \
-        -x c \
-        "$textPath"
-    strip --strip-unneeded "$out"
-  '';
+  writeC = name: { libraries ? [] }:
+    makeBinWriter {
+      compileScript = ''
+        PATH=${makeBinPath [
+          pkgs.binutils-unwrapped
+          pkgs.coreutils
+          pkgs.gcc
+          pkgs.pkgconfig
+        ]}
+        gcc \
+            ${optionalString (libraries != [])
+              "$(pkgs.pkgconfig}/bin/pkg-config --cflags --libs ${
+                concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
+              })"
+            } \
+            -O \
+            -o "$out" \
+            -Wall \
+            -x c \
+            "$contentPath"
+        strip --strip-unneeded "$out"
+      '';
+    } name;
 
   # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin)
-  writeCBin = name: spec: text:
-    pkgs.runCommand name {
-    } ''
-      mkdir -p $out/bin
-      ln -s ${writeC name spec text} $out/bin/${name}
-    '';
+  writeCBin = name:
+    writeC "/bin/${name}";
 
   # Like writeScript but the first line is a shebang to dash
   #
@@ -103,29 +130,25 @@ rec {
   #
   # Example:
   #   writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
-  #     Import Acme.Missiles
+  #     import Acme.Missiles
   #
   #     main = launchMissiles
   #   '';
   writeHaskell = name: {
     libraries ? [],
     ghc ? pkgs.ghc
-  }: text: pkgs.runCommand name {
-    inherit text;
-    passAsFile = [ "text" ];
-  } ''
-    cp $textPath ${name}.hs
-    ${ghc.withPackages (_: libraries )}/bin/ghc ${name}.hs
-    cp ${name} $out
-  '';
+  }:
+    makeBinWriter {
+      compileScript = ''
+        cp $contentPath tmp.hs
+        ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs
+        mv tmp $out
+      '';
+    } name;
 
   # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin)
-  writeHaskellBin = name: spec: text:
-    pkgs.runCommand name {
-    } ''
-      mkdir -p $out/bin
-      ln -s ${writeHaskell name spec text} $out/bin/${name}
-    '';
+  writeHaskellBin = name:
+    writeHaskell "/bin/${name}";
 
   # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and
   # returns an executable
@@ -137,7 +160,7 @@ rec {
   #     var result = UglifyJS.minify(code);
   #     console.log(result.code);
   #   ''
-  writeJS = name: { libraries ? [] }: text:
+  writeJS = name: { libraries ? [] }: content:
   let
     node-env = pkgs.buildEnv {
       name = "node";
@@ -148,7 +171,7 @@ rec {
     };
   in writeDash name ''
     export NODE_PATH=${node-env}/lib/node_modules
-    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" text}
+    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content}
   '';
 
   # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 68b7b27e613..80e9543f9c8 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers}:
+{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }:
 with writers;
 let
 
@@ -128,6 +128,24 @@ let
     '';
   };
 
+
+  path = {
+    bash = writeBash "test_bash" (writeText "test" ''
+      if [[ "test" == "test" ]]; then echo "success"; fi
+    '');
+    haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" ''
+      import Data.Default
+
+      int :: Int
+      int = def
+
+      main :: IO ()
+      main = case int of
+        18871 -> putStrLn $ id "success"
+        _ -> print "fail"
+    '');
+  };
+
   writeTest = expectedValue: test:
     writeDash "test-writers" ''
       if test "$(${test})" != "${expectedValue}"; then
@@ -142,6 +160,7 @@ in runCommand "test-writers" {
 } ''
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)}
+  ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)}
 
   echo 'nix-writers successfully tested' >&2
   touch $out

From 4361e506153375c7dd89757796443b8da42d49e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 16:43:01 +0100
Subject: [PATCH 1336/2793] Revert "python: pyjwt: fix build"

This reverts commit bcf736b325cbc577ed083995366396656e93e96c.

28cdb6e841b9098517c2a7957454437387ca887d fixed the issue with pytest-3.9.0.
---
 pkgs/development/python-modules/pyjwt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index a3a770a0da5..94a1a4e6b0e 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , cryptography, ecdsa
-, pytestrunner, pytestcov, pytest_37 }:
+, pytestrunner, pytestcov, pytest }:
 
 buildPythonPackage rec {
   pname = "PyJWT";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cryptography ecdsa ];
 
-  checkInputs = [ pytestrunner pytestcov pytest_37 ];
+  checkInputs = [ pytestrunner pytestcov pytest ];
 
   # pytest 3.9.0 changed behavior of deprecated_call, see release notes
   postPatch = ''

From fca4fbeba957ec6bc72c98c019bbc5f01712d15b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Dec 2018 17:50:45 +0100
Subject: [PATCH 1337/2793] Revert "libgit2: 0.26.6 -> 0.26.8"

This reverts commit 28b4b4b1e49309e465e0c35adb655007a08c2f23.

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

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 925e253b606..48d595137b3 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation (rec {
   name = "libgit2-${version}";
-  version = "0.26.8";
+  version = "0.26.6";
   # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "0wmjgvz8nrpk2dsn5bcc87nl0j5hb6pah2hzrj0b6jkk9mnin9fl";
+    sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
   };
 
   cmakeFlags = [ "-DTHREADSAFE=ON" ];

From 7f06f36ffb00e7d9206692649356f9f8c7acb2a7 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jot@internetgruppen.dk>
Date: Tue, 4 Dec 2018 18:02:34 +0100
Subject: [PATCH 1338/2793] kubernetes: 1.12.2 -> 1.12.3 (#51482)

---
 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 c3ed2d16df1..bf42fb7da16 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.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "14w77yw8pd2y5d764byh31vv9203y38zlvcr1a9wylrs00kgzwfw";
+    sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];

From a995836356dfb7518d7d262a56350294c9cecf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Dec 2018 17:17:14 +0000
Subject: [PATCH 1339/2793] dino: enable parallel building

---
 .../applications/networking/instant-messengers/dino/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 2c5d7005ef8..d2cbf7bbdfc 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
     gettext
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Modern Jabber/XMPP Client using GTK+/Vala";
     homepage = https://github.com/dino/dino;

From 445f79af1cde9af86aaea092006e5aff2c69d998 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 4 Dec 2018 20:22:26 +0300
Subject: [PATCH 1340/2793] pythonPackages.python-fontconfig: regenerate
 sources using cython

---
 .../python-modules/python-fontconfig/default.nix           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix
index 872fffb7576..dbfde18a874 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/pkgs/development/python-modules/python-fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }:
+{ lib, buildPythonPackage, fetchPypi, fontconfig, python, cython, freefont_ttf, makeFontsConf }:
 
 let
   fontsConf = makeFontsConf {
@@ -14,6 +14,11 @@ in buildPythonPackage rec {
   };
 
   buildInputs = [ fontconfig ];
+  nativeBuildInputs = [ cython ];
+
+  preBuild = ''
+    ${python.interpreter} setup.py build_ext -i
+  '';
 
   checkPhase = ''
     export FONTCONFIG_FILE=${fontsConf};

From e728ff5ade7e79333f35dd1319c2acb3f492e8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 17:45:41 -0200
Subject: [PATCH 1341/2793] zafiro-icons: 0.7.2 -> 0.7.3

---
 pkgs/data/icons/zafiro-icons/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index ac52d70bbc8..dd869523267 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -3,21 +3,21 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zafiro-icons";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rs3wazmvidlkig5q7x1n9nz7jhfq18wps3wsplax9zcdy0hv248";
+    sha256 = "02q3wcklmqdy4ycyly7477q98y3mkgnpr7c78jqxvy2yr486wwyx";
   };
 
   nativeBuildInputs = [ gtk3 ];
 
   installPhase = ''
-    mkdir -p $out/share/icons/Zafiro
-    cp -a * $out/share/icons/Zafiro
-    gtk-update-icon-cache "$out"/share/icons/Zafiro
+    mkdir -p $out/share/icons/Zafiro-icons
+    cp -a * $out/share/icons/Zafiro-icons
+    gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
   '';
 
   meta = with stdenv.lib; {

From eaef9bc7d6f35d0b9464a29676b4fef2dee99af7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 13 Nov 2018 14:12:09 +0100
Subject: [PATCH 1342/2793] pythonPackages.arelle: 2017-08-24 -> 18.3

---
 .../python-modules/arelle/default.nix         | 35 ++++++++++++-------
 .../python-modules/arelle/tests.patch         | 20 +----------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 862564dbcd1..78cd2fca837 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -1,13 +1,12 @@
 { gui ? true,
   buildPythonPackage, fetchFromGitHub, lib,
-  sphinx_1_2, lxml, isodate, numpy, pytest,
-  tkinter ? null, py3to2, isPy3k,
+  sphinx, lxml, isodate, numpy, pytest, openpyxl,
+  tkinter ? null, py3to2, isPy3k, python,
   ... }:
 
 buildPythonPackage rec {
-  pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
-  version = "2017-08-24";
-  name = pname + "-" + version;
+  pname = "arelle${lib.optionalString (!gui) "-headless"}";
+  version = "18.3";
 
   disabled = !isPy3k;
 
@@ -16,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Arelle";
     repo = "Arelle";
-    rev = "cb24e35d57b562a864ae3dd4542c4d9fcf3865fe";
-    sha256 = "1sbvhb3xlfnyvf1xj9dxwpcrfiaf7ikkdwvvap7aaxfxgiz85ip2";
+    rev = "edgr${version}";
+    sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
   };
   outputs = ["out" "doc"];
   patches = [
@@ -25,7 +24,7 @@ buildPythonPackage rec {
   ];
   postPatch = "rm testParser2.py";
   buildInputs = [
-    sphinx_1_2
+    sphinx
     pytest
     py3to2
   ];
@@ -33,6 +32,7 @@ buildPythonPackage rec {
     lxml
     isodate
     numpy
+    openpyxl
   ] ++ lib.optional gui [
     tkinter
   ];
@@ -40,6 +40,12 @@ buildPythonPackage rec {
   # arelle-gui is useless without gui dependencies, so delete it when !gui.
   postInstall = lib.optionalString (!gui) ''
     find $out/bin -name "*arelle-gui*" -delete
+  '' +
+  # By default, not the entirety of the src dir is copied. This means we don't
+  # copy the `images` dir, which is needed for the gui version.
+  lib.optionalString (gui) ''
+    targetDir=$out/${python.sitePackages}
+    cp -vr $src/arelle $targetDir
   '';
 
   # Documentation
@@ -49,11 +55,14 @@ buildPythonPackage rec {
 
   doCheck = if gui then true else false;
 
-  meta = {
-    description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface";
+  meta = with lib; {
+    description = ''
+      An open source facility for XBRL, the eXtensible Business Reporting
+      Language supporting various standards, exposed through a Python or
+      REST API'' + lib.optionalString gui " and a graphical user interface";
     homepage = http://arelle.org/;
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ roberth ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ roberth ];
   };
 }
diff --git a/pkgs/development/python-modules/arelle/tests.patch b/pkgs/development/python-modules/arelle/tests.patch
index 3e4aa0cd94a..e34cda99b25 100644
--- a/pkgs/development/python-modules/arelle/tests.patch
+++ b/pkgs/development/python-modules/arelle/tests.patch
@@ -3,7 +3,7 @@ index a64bb1b..dc0299d 100644
 --- c/arelle/CntlrProfiler.py
 +++ i/arelle/CntlrProfiler.py
 @@ -1,5 +1,6 @@
- 
+
 -import Cntlr, ModelManager, FileSource, time
 +from arelle import Cntlr, ModelManager, FileSource
 +import time
@@ -12,21 +12,3 @@ index a64bb1b..dc0299d 100644
  import gettext
 diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
 index 12dbbbb..c0e98c3 100644
---- c/arelle/ValidateFilingText.py
-+++ i/arelle/ValidateFilingText.py
-@@ -16,7 +16,7 @@ XMLdeclaration = re.compile(r"<\?xml.*\?>", re.DOTALL)
- XMLpattern = re.compile(r".*(<|&lt;|&#x3C;|&#60;)[A-Za-z_]+[A-Za-z0-9_:]*[^>]*(/>|>|&gt;|/&gt;).*", re.DOTALL)
- CDATApattern = re.compile(r"<!\[CDATA\[(.+)\]\]")
- #EFM table 5-1 and all &xxx; patterns
--docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\m\f]") # won't match &#nnn;
-+docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\f]") # won't match &#nnn;
- namedEntityPattern = re.compile("&[_A-Za-z\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]"
-                                 r"[_\-\.:" 
-                                 "\xB7A-Za-z0-9\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u0300-\u036F\u203F-\u2040]*;")
-@@ -904,4 +904,4 @@ def referencedFiles(modelXbrl, localFilesOnly=True):
-     # footnote or other elements
-     for elt in modelXbrl.modelDocument.xmlRootElement.iter("{http://www.w3.org/1999/xhtml}a", "{http://www.w3.org/1999/xhtml}img"):
-         addReferencedFile(elt, elt)
--    return referencedFiles
-\ No newline at end of file
-+    return referencedFiles

From 315b4c4543e7084cec3db1ec775dfd7f0cc7fec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 4 Dec 2018 21:12:10 +0100
Subject: [PATCH 1343/2793] pythonPackages.sphinx_1_2: remove

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ff6217ad34..eb54778936a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3904,18 +3904,6 @@ in {
 
   sphinx = callPackage ../development/python-modules/sphinx { };
 
-  sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
-    name = "sphinx-1.2.3";
-    version = "1.2.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
-      sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
-    };
-    postPatch = '''';
-    # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
-    doCheck = false;
-  };
-
   sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
 
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };

From 656b74f021c204b4ef1ecdfedd180e3336f8cdc5 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Tue, 4 Dec 2018 19:33:05 +0000
Subject: [PATCH 1344/2793] nixos: add AppStream module

---
 nixos/modules/config/appstream.nix | 25 +++++++++++++++++++++++++
 nixos/modules/module-list.nix      |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 nixos/modules/config/appstream.nix

diff --git a/nixos/modules/config/appstream.nix b/nixos/modules/config/appstream.nix
new file mode 100644
index 00000000000..483ac9c3cd7
--- /dev/null
+++ b/nixos/modules/config/appstream.nix
@@ -0,0 +1,25 @@
+{ config, lib, ... }:
+
+with lib;
+{
+  options = {
+    appstream.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to install files to support the 
+        <link xlink:href="https://www.freedesktop.org/software/appstream/docs/index.html">AppStream metadata specification</link>.
+      '';
+    };
+  };
+
+  config = mkIf config.appstream.enable {
+    environment.pathsToLink = [ 
+      # per component metadata
+      "/share/metainfo" 
+      # legacy path for above
+      "/share/appdata" 
+    ];
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e2b2666888c..3ec55e46875 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -11,6 +11,7 @@
   ./config/xdg/icons.nix
   ./config/xdg/menus.nix
   ./config/xdg/mime.nix
+  ./config/appstream.nix
   ./config/gtk/gtk-icon-cache.nix
   ./config/gnu.nix
   ./config/i18n.nix

From 88b63b2505f787ba223ad39f3f35d7cc736a38fa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 4 Dec 2018 20:06:09 +0100
Subject: [PATCH 1345/2793] gitlab: 11.5.0 -> 11.5.1

---
 .../version-management/gitlab/data.json       |  28 ++--
 .../gitlab/gitlab-workhorse/default.nix       |   4 +-
 .../gitlab/rubyEnv-ce/Gemfile                 |  28 ++--
 .../gitlab/rubyEnv-ce/Gemfile.lock            |  82 +++-------
 .../gitlab/rubyEnv-ce/gemset.nix              | 154 +++++-------------
 .../gitlab/rubyEnv-ee/Gemfile                 |  28 ++--
 .../gitlab/rubyEnv-ee/Gemfile.lock            |  82 +++-------
 .../gitlab/rubyEnv-ee/gemset.nix              | 154 +++++-------------
 8 files changed, 158 insertions(+), 402 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index e2be6fb2a90..b748e7c49bd 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
 {
   "ce": {
-    "version": "11.5.0",
-    "repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb",
-    "deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb",
+    "version": "11.5.1",
+    "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5",
+    "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ce",
-    "rev": "v11.5.0",
+    "rev": "v11.5.1",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
-      "GITLAB_PAGES_VERSION": "1.3.0",
+      "GITLAB_PAGES_VERSION": "1.3.1",
       "GITLAB_SHELL_VERSION": "8.4.1",
-      "GITLAB_WORKHORSE_VERSION": "7.1.0"
+      "GITLAB_WORKHORSE_VERSION": "7.1.3"
     }
   },
   "ee": {
-    "version": "11.5.0",
-    "repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z",
-    "deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb",
+    "version": "11.5.1",
+    "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp",
+    "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ee",
-    "rev": "v11.5.0-ee",
+    "rev": "v11.5.1-ee",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
-      "GITLAB_PAGES_VERSION": "1.3.0",
+      "GITLAB_PAGES_VERSION": "1.3.1",
       "GITLAB_SHELL_VERSION": "8.4.1",
-      "GITLAB_WORKHORSE_VERSION": "7.1.0"
+      "GITLAB_WORKHORSE_VERSION": "7.1.3"
     }
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index e77dbc323a3..b0d282e8799 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "gitlab-workhorse-${version}";
 
-  version = "7.1.0";
+  version = "7.1.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1jq28z2kf58wnbv8jkwfx2bm8ki22hpm9ssdy2ymza22gq0zx00g";
+    sha256 = "1r75jj0xb4jv5fq2ihxk0vlv43gsk523zx86076mwph1g75gi1nz";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index ecbfba0827d..c7efa790cfd 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -79,13 +79,6 @@ gem 'gpgme'
 gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
-# Git Wiki
-# Only used to compute wiki page slugs
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-
-# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-
 # API
 gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
@@ -146,6 +139,7 @@ gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
+gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
 gem 'icalendar'
@@ -159,6 +153,11 @@ group :unicorn do
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
+group :puma do
+  gem 'puma', '~> 3.12', require: false
+  gem 'puma_worker_killer', require: false
+end
+
 # State machine
 gem 'state_machines-activerecord', '~> 0.5.1'
 
@@ -212,7 +211,7 @@ gem 'hipchat', '~> 1.5.0'
 gem 'jira-ruby', '~> 1.4'
 
 # Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'flowdock', '~> 0.7'
 
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
@@ -245,9 +244,6 @@ 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'
 
@@ -420,11 +416,10 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
+gem 'grpc', '~> 1.15.0'
 
-# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.6'
 
 gem 'toml-rb', '~> 1.0.0', require: false
 
@@ -436,6 +431,3 @@ 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-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index e215f12bbe6..db8cc34060e 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -58,11 +58,6 @@ GEM
     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)
@@ -274,32 +269,9 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.118.1)
-      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)
+    gitaly-proto (0.123.0)
+      grpc (~> 1.0)
     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-grit (2.8.2)
-      charlock_holmes (~> 0.6)
-      diff-lcs (~> 1.1)
-      mime-types (>= 1.16)
-      posix-spawn (~> 0.3)
     gitlab-markup (1.6.4)
     gitlab-sidekiq-fetcher (0.3.0)
       sidekiq (~> 5)
@@ -314,8 +286,6 @@ GEM
       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
@@ -327,16 +297,15 @@ GEM
       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.6.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    googleauth (0.6.2)
+    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)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
@@ -360,10 +329,9 @@ GEM
       railties
       sprockets-rails
     graphql (1.8.1)
-    grpc (1.11.0)
+    grpc (1.15.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
@@ -465,11 +433,7 @@ GEM
       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)
@@ -493,7 +457,6 @@ GEM
     mini_mime (1.0.1)
     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)
@@ -575,9 +538,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
@@ -605,7 +568,6 @@ GEM
     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
@@ -629,6 +591,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    puma (3.12.0)
+    puma_worker_killer (0.1.0)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.11)
     rack-accept (0.4.5)
@@ -797,7 +763,7 @@ GEM
     rubyzip (1.2.2)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.4)
+    rugged (0.27.5)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -843,7 +809,7 @@ GEM
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    signet (0.8.1)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -876,7 +842,6 @@ GEM
     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)
@@ -968,7 +933,6 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print
   babosa (~> 1.0.2)
@@ -1006,6 +970,7 @@ DEPENDENCIES
   ed25519 (~> 1.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   fast_blank
@@ -1013,6 +978,7 @@ DEPENDENCIES
   flipper (~> 0.13.0)
   flipper-active_record (~> 0.13.0)
   flipper-active_support_cache_store (~> 0.13.0)
+  flowdock (~> 0.7)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
@@ -1027,18 +993,15 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
+  gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
-  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-gollum-lib (~> 4.2)
   gitlab-markup (~> 1.6.4)
   gitlab-sidekiq-fetcher
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (= 3.5.1)
+  google-protobuf (~> 3.6)
   gpgme
   grape (~> 1.1)
   grape-entity (~> 0.7.1)
@@ -1046,7 +1009,7 @@ DEPENDENCIES
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.8.0)
-  grpc (~> 1.11.0)
+  grpc (~> 1.15.0)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.8.8)
   hangouts-chat (~> 0.0.5)
@@ -1075,7 +1038,6 @@ DEPENDENCIES
   method_source (~> 0.8)
   mini_magick
   minitest (~> 5.7.0)
-  mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
   net-ssh (~> 5.0)
@@ -1109,6 +1071,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
@@ -1187,4 +1151,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index dfbd535aaa8..64fbac6d437 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -164,15 +164,6 @@
     };
     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"];
@@ -1066,22 +1057,13 @@
     version = "1.3.0";
   };
   gitaly-proto = {
-    dependencies = ["google-protobuf" "grpc"];
+    dependencies = ["grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
+      sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
       type = "gem";
     };
-    version = "0.118.1";
-  };
-  github-linguist = {
-    dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
-      type = "gem";
-    };
-    version = "5.3.3";
+    version = "0.123.0";
   };
   github-markup = {
     source = {
@@ -1091,33 +1073,6 @@
     };
     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-grit = {
-    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
-      type = "gem";
-    };
-    version = "2.8.2";
-  };
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1162,15 +1117,6 @@
     };
     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 = {
@@ -1192,28 +1138,28 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
+      sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.6.1";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   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";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1278,13 +1224,13 @@
     version = "1.8.1";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
+      sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.15.0";
   };
   haml = {
     dependencies = ["temple" "tilt"];
@@ -1649,14 +1595,6 @@
     };
     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"];
@@ -1665,15 +1603,6 @@
     };
     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 = {
@@ -1791,14 +1720,6 @@
     };
     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"];
@@ -2114,10 +2035,10 @@
   os = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
       type = "gem";
     };
-    version = "0.9.6";
+    version = "1.0.0";
   };
   parallel = {
     source = {
@@ -2131,10 +2052,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.3.0";
   };
   parslet = {
     source = {
@@ -2215,14 +2136,6 @@
     };
     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"];
@@ -2309,6 +2222,23 @@
     };
     version = "3.0.3";
   };
+  puma = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  puma_worker_killer = {
+    dependencies = ["get_process_mem" "puma"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   pyu-ruby-sasl = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2916,10 +2846,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
+      sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
       type = "gem";
     };
-    version = "0.27.4";
+    version = "0.27.5";
   };
   safe_yaml = {
     source = {
@@ -3075,10 +3005,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.11.0";
   };
   simple_po_parser = {
     source = {
@@ -3199,14 +3129,6 @@
     };
     version = "0.5.1";
   };
-  stringex = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
-      type = "gem";
-    };
-    version = "2.8.4";
-  };
   sys-filesystem = {
     dependencies = ["ffi"];
     source = {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index ef14aace277..fc31db6278d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -82,13 +82,6 @@ gem 'gpgme'
 gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
-# Git Wiki
-# Only used to compute wiki page slugs
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-
-# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-
 # API
 gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
@@ -156,6 +149,7 @@ gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
+gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
 gem 'icalendar'
@@ -169,6 +163,11 @@ group :unicorn do
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
+group :puma do
+  gem 'puma', '~> 3.12', require: false
+  gem 'puma_worker_killer', require: false
+end
+
 # State machine
 gem 'state_machines-activerecord', '~> 0.5.1'
 
@@ -222,7 +221,7 @@ gem 'hipchat', '~> 1.5.0'
 gem 'jira-ruby', '~> 1.4'
 
 # Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'flowdock', '~> 0.7'
 
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
@@ -255,9 +254,6 @@ 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'
 
@@ -435,11 +431,10 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
+gem 'grpc', '~> 1.15.0'
 
-# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.6'
 
 gem 'toml-rb', '~> 1.0.0', require: false
 
@@ -451,6 +446,3 @@ 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
index 28018c6c5c2..7c52bc32632 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -58,11 +58,6 @@ GEM
     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)
@@ -298,32 +293,9 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.118.1)
-      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)
+    gitaly-proto (0.123.0)
+      grpc (~> 1.0)
     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-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-sidekiq-fetcher (0.3.0)
@@ -339,8 +311,6 @@ GEM
       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
@@ -352,16 +322,15 @@ GEM
       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.6.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    googleauth (0.6.2)
+    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)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
@@ -385,10 +354,9 @@ GEM
       railties
       sprockets-rails
     graphql (1.8.1)
-    grpc (1.11.0)
+    grpc (1.15.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)
@@ -493,11 +461,7 @@ GEM
       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)
@@ -521,7 +485,6 @@ GEM
     mini_mime (1.0.1)
     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)
@@ -604,9 +567,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
@@ -634,7 +597,6 @@ GEM
     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
@@ -658,6 +620,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    puma (3.12.0)
+    puma_worker_killer (0.1.0)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.11)
     rack-accept (0.4.5)
@@ -826,7 +792,7 @@ GEM
     rubyzip (1.2.2)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.4)
+    rugged (0.27.5)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -872,7 +838,7 @@ GEM
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    signet (0.8.1)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -905,7 +871,6 @@ GEM
     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)
@@ -997,7 +962,6 @@ DEPENDENCIES
   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
@@ -1039,6 +1003,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   faraday_middleware-aws-signers-v4
@@ -1047,6 +1012,7 @@ DEPENDENCIES
   flipper (~> 0.13.0)
   flipper-active_record (~> 0.13.0)
   flipper-active_support_cache_store (~> 0.13.0)
+  flowdock (~> 0.7)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
@@ -1061,11 +1027,8 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
+  gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
-  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-gollum-lib (~> 4.2)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.6.4)
   gitlab-sidekiq-fetcher
@@ -1073,7 +1036,7 @@ DEPENDENCIES
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (= 3.5.1)
+  google-protobuf (~> 3.6)
   gpgme
   grape (~> 1.1)
   grape-entity (~> 0.7.1)
@@ -1081,7 +1044,7 @@ DEPENDENCIES
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.8.0)
-  grpc (~> 1.11.0)
+  grpc (~> 1.15.0)
   gssapi
   haml_lint (~> 0.26.0)
   hamlit (~> 2.8.8)
@@ -1111,7 +1074,6 @@ DEPENDENCIES
   method_source (~> 0.8)
   mini_magick
   minitest (~> 5.7.0)
-  mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
   net-ntp
@@ -1146,6 +1108,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
@@ -1224,4 +1188,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 32fc41235f4..a15dae06fc0 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -164,15 +164,6 @@
     };
     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"];
@@ -1154,22 +1145,13 @@
     version = "1.3.0";
   };
   gitaly-proto = {
-    dependencies = ["google-protobuf" "grpc"];
+    dependencies = ["grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
+      sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
       type = "gem";
     };
-    version = "0.118.1";
-  };
-  github-linguist = {
-    dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
-      type = "gem";
-    };
-    version = "5.3.3";
+    version = "0.123.0";
   };
   github-markup = {
     source = {
@@ -1179,33 +1161,6 @@
     };
     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-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"];
@@ -1258,15 +1213,6 @@
     };
     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 = {
@@ -1288,28 +1234,28 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
+      sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.6.1";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   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";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1374,13 +1320,13 @@
     version = "1.8.1";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
+      sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.15.0";
   };
   gssapi = {
     dependencies = ["ffi"];
@@ -1762,14 +1708,6 @@
     };
     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"];
@@ -1778,15 +1716,6 @@
     };
     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 = {
@@ -1904,14 +1833,6 @@
     };
     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"];
@@ -2235,10 +2156,10 @@
   os = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
       type = "gem";
     };
-    version = "0.9.6";
+    version = "1.0.0";
   };
   parallel = {
     source = {
@@ -2252,10 +2173,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.3.0";
   };
   parslet = {
     source = {
@@ -2336,14 +2257,6 @@
     };
     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"];
@@ -2430,6 +2343,23 @@
     };
     version = "3.0.3";
   };
+  puma = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  puma_worker_killer = {
+    dependencies = ["get_process_mem" "puma"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   pyu-ruby-sasl = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -3037,10 +2967,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
+      sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
       type = "gem";
     };
-    version = "0.27.4";
+    version = "0.27.5";
   };
   safe_yaml = {
     source = {
@@ -3196,10 +3126,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.11.0";
   };
   simple_po_parser = {
     source = {
@@ -3320,14 +3250,6 @@
     };
     version = "0.5.1";
   };
-  stringex = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
-      type = "gem";
-    };
-    version = "2.8.4";
-  };
   sys-filesystem = {
     dependencies = ["ffi"];
     source = {

From c2b54dcee585480811a10b8e1dd0dd0b46139caa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 4 Dec 2018 21:26:24 +0100
Subject: [PATCH 1346/2793] gitlab-shell: fix hard-coded path

---
 .../gitlab/gitlab-shell/remove-hardcoded-locations.patch        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 3d381404c63..7819c863a35 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -25,7 +25,7 @@ index 435cb29..078c1df 100644
  
  func NewFromDir(dir string) (*Config, error) {
 -	return newFromFile(path.Join(dir, configFile))
-+	return newFromFile(path.Join(dir, "shell-config.yml"))
++	return newFromFile("/run/gitlab/shell-config.yml")
  }
  
  func newFromFile(filename string) (*Config, error) {

From 187e892a61d1855f1df9a99dd947a2b13c0f066e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 19:34:50 +0100
Subject: [PATCH 1347/2793] LTS Haskell 12.21

---
 .../configuration-hackage2nix.yaml            | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82ecd05b266..979e105c1bc 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.20
+  # LTS Haskell 12.21
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -337,8 +337,8 @@ default-package-overrides:
   - cabal-doctest ==1.0.6
   - cabal-rpm ==0.12.6
   - cache ==0.1.1.1
-  - cachix ==0.1.2
-  - cachix-api ==0.1.0.2
+  - cachix ==0.1.3
+  - cachix-api ==0.1.0.3
   - cairo ==0.13.5.0
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.1.0
@@ -361,7 +361,7 @@ default-package-overrides:
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
-  - chan ==0.0.3
+  - chan ==0.0.4
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
@@ -433,7 +433,7 @@ default-package-overrides:
   - composition-prelude ==1.5.3.1
   - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.6.1.0
+  - concurrency ==1.6.2.0
   - concurrent-extra ==0.7.0.12
   - concurrent-output ==1.10.9
   - concurrent-split ==0.0.1.1
@@ -535,7 +535,7 @@ default-package-overrides:
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==4.6.0.0
   - data-diverse-lens ==4.3.0.0
-  - datadog ==0.2.2.0
+  - datadog ==0.2.3.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -732,8 +732,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
@@ -982,7 +982,7 @@ default-package-overrides:
   - histogram-fill ==0.9.1.0
   - hjsmin ==0.2.0.2
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.7.0
+  - hlibsass ==0.1.8.0
   - hmatrix ==0.19.0.0
   - hmatrix-backprop ==0.1.2.3
   - hmatrix-gsl ==0.19.0.1
@@ -1097,7 +1097,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.20
+  - hw-prim ==0.6.2.22
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1198,7 +1198,7 @@ default-package-overrides:
   - json-rpc-server ==0.2.6.0
   - json-schema ==0.7.4.2
   - JuicyPixels ==3.2.9.5
-  - JuicyPixels-blp ==0.1.0.1
+  - JuicyPixels-blp ==0.1.1.0
   - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.2
   - justified-containers ==0.3.0.0
@@ -1294,7 +1294,7 @@ default-package-overrides:
   - log-postgres ==0.7.0.2
   - long-double ==0.1
   - loop ==0.3.0
-  - lrucache ==1.2.0.0
+  - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
   - lucid ==2.9.11
   - lucid-extras ==0.1.0.1
@@ -1785,7 +1785,7 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.5.0.0
   - safe ==0.3.17
-  - safecopy ==0.9.4.1
+  - safecopy ==0.9.4.2
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
@@ -2130,7 +2130,7 @@ default-package-overrides:
   - transformers-fix ==1.0
   - transformers-lift ==0.2.0.1
   - traverse-with-class ==1.0.0.0
-  - tree-diff ==0.0.1
+  - tree-diff ==0.0.2
   - tree-fun ==0.8.1.0
   - trifecta ==2
   - triplesec ==0.1.2.0
@@ -2323,7 +2323,7 @@ default-package-overrides:
   - x509-validation ==1.6.11
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.4
+  - xeno ==0.3.5.1
   - xenstore ==0.1.1
   - xhtml ==3000.2.2.1
   - xls ==0.1.1

From 752b1484e477aba680aa4267a9ed9a1e90b06816 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Nov 2018 02:30:56 +0100
Subject: [PATCH 1348/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-4-g121c563 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b55c0469b413c329f721a29d85ae55e706fe8672.
---
 .../haskell-modules/hackage-packages.nix      | 1633 +++++++++++------
 1 file changed, 1079 insertions(+), 554 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c6e9204372b..c85cc3a422c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4624,6 +4624,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_13_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.13.0.0";
+       sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -7214,11 +7236,12 @@ self: {
      }) {};
 
   "HCL" = callPackage
-    ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
+    ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck, random
+     }:
      mkDerivation {
        pname = "HCL";
-       version = "1.5.1";
-       sha256 = "1l9ychhml91zvr6zdrzyd8pvlbycyrdjvn95vgdyal0p5r7b3plf";
+       version = "1.7";
+       sha256 = "0f61kj9c58s06w882zxmv0s5yc0zxh3f5nx7gnx2dx8p7d3f4y34";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -7226,6 +7249,9 @@ self: {
        executableHaskellDepends = [
          base containers mtl QuickCheck random
        ];
+       testHaskellDepends = [
+         base containers HUnit mtl QuickCheck random
+       ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10706,29 +10732,6 @@ self: {
      }) {};
 
   "JuicyPixels-blp" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, directory
-     , filepath, hashable, JuicyPixels, optparse-simple, text-show
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "JuicyPixels-blp";
-       version = "0.1.0.1";
-       sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base binary bytestring hashable JuicyPixels text-show
-         vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath JuicyPixels optparse-simple
-         text-show unordered-containers
-       ];
-       description = "BLP format decoder/encoder over JuicyPixels library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-blp_0_1_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, directory
      , filepath, hashable, JuicyPixels, optparse-simple, text-show
      , unordered-containers, vector
@@ -10749,7 +10752,6 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -15283,6 +15285,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "RLP" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec }:
+     mkDerivation {
+       pname = "RLP";
+       version = "1.0.0";
+       sha256 = "15m872ys5jzn21psqccgz24f5zchvj5hcz1kll18v0pivh2c4hd0";
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [ base binary bytestring hspec ];
+       description = "RLP serialization as defined in Ethereum Yellow Paper";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "RMP" = callPackage
     ({ mkDerivation, allocated-processor, base, canlib, cv-combinators
      , ftd2xx, HOpenCV, vector-space
@@ -16481,6 +16495,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SecureHash-SHA3" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "SecureHash-SHA3";
+       version = "0.1.0.2";
+       sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
+       libraryHaskellDepends = [ base bytestring ];
+       description = "simple static linked SHA3 using private symbols and the ref impl";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "SegmentTree" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -16584,8 +16609,8 @@ self: {
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.5.0";
-       sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b";
+       version = "0.6.0";
+       sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process ];
@@ -23333,6 +23358,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "algebraic-graphs_0_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, containers
+     , deepseq, extra, inspection-testing, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "algebraic-graphs";
+       version = "0.3";
+       sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl";
+       libraryHaskellDepends = [
+         array base base-compat containers deepseq mtl
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans containers extra
+         inspection-testing QuickCheck
+       ];
+       description = "A library for algebraic graph construction and transformation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "algebraic-prelude" = callPackage
     ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
      mkDerivation {
@@ -27507,8 +27552,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.6.0.0";
-       sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9";
+       version = "0.7.0";
+       sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
        libraryHaskellDepends = [
          base containers mtl template-haskell vector
        ];
@@ -27520,14 +27565,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs-gloss" = callPackage
+    ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
+     , linear
+     }:
+     mkDerivation {
+       pname = "apecs-gloss";
+       version = "0.1.1";
+       sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
+       libraryHaskellDepends = [
+         apecs apecs-physics base containers gloss linear
+       ];
+       description = "Simple gloss renderer for apecs";
+       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";
+       version = "0.3.1";
+       sha256 = "0ij8wv9vrard7nfh8hhzrs9j7w5jlw3353w396alwnbb40hvk7gj";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          apecs base containers inline-c linear template-haskell vector
@@ -28466,6 +28526,47 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arbor-monad-metric" = callPackage
+    ({ mkDerivation, arbor-datadog, base, bytestring, containers
+     , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens, mtl
+     , network, resourcet, stm, transformers
+     }:
+     mkDerivation {
+       pname = "arbor-monad-metric";
+       version = "0.0.2";
+       sha256 = "0c8734nf8zgkwqgjphdqb0fa6p3qvc6cj0n16k22v8ri5ziyha76";
+       libraryHaskellDepends = [
+         base containers generic-lens lens mtl resourcet stm transformers
+       ];
+       testHaskellDepends = [
+         arbor-datadog base bytestring containers generic-lens hedgehog
+         hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "arbor-monad-metric-datadog" = callPackage
+    ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
+     , bytestring, containers, generic-lens, hedgehog, hspec
+     , hw-hspec-hedgehog, lens, mtl, network, resourcet, stm, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "arbor-monad-metric-datadog";
+       version = "0.0.1";
+       sha256 = "0padn66j6hxpndnakkd1hvf2jkhab1djr20c2hvp1m9kim5c3cz9";
+       libraryHaskellDepends = [
+         arbor-datadog arbor-monad-metric base bytestring containers
+         generic-lens lens mtl network resourcet stm text transformers
+       ];
+       testHaskellDepends = [
+         arbor-datadog arbor-monad-metric base bytestring containers
+         generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network
+         resourcet stm text transformers
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arbor-postgres" = callPackage
     ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
      , optparse-applicative, postgresql-simple, text
@@ -28925,8 +29026,8 @@ self: {
        pname = "arithmoi";
        version = "0.8.0.0";
        sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
-       revision = "1";
-       editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
+       revision = "2";
+       editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers deepseq exact-pi ghc-prim integer-gmp
@@ -30519,8 +30620,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.4.2";
-       sha256 = "168mgwx0m2kriz494r9isd27rflfh4np7pjm1hxzwc8pnyd3mdx9";
+       version = "3.2.4.4";
+       sha256 = "0qnhxx4xfh40g1gh108rqcxam3zdm6qwz4h3mh8kw9lq9bnman46";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32158,6 +32259,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-lambda-runtime" = callPackage
+    ({ mkDerivation, aeson, async, base, base-compat, bytestring
+     , containers, deepseq, filepath, http-client, http-media
+     , http-types, lens, lens-aeson, parsec, process, text, time
+     , zip-archive
+     }:
+     mkDerivation {
+       pname = "aws-lambda-runtime";
+       version = "0";
+       sha256 = "1wnpck1cy7bc3g7g3z210n9sgiplsxqbli0xgpxi2wxmhcf5dpjq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base base-compat bytestring containers deepseq filepath
+         http-client http-media http-types parsec process text time
+         zip-archive
+       ];
+       executableHaskellDepends = [ aeson base lens lens-aeson text ];
+       description = "Haskell on AWS Lambda Runtime API";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aws-mfa-credentials" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base
      , exceptions, filelock, filepath, freer-effects, ini, lens
@@ -39439,22 +39562,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_41_5" = callPackage
+  "brick_0_42" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, QuickCheck, stm, template-haskell, text
-     , text-zipper, transformers, vector, vty, word-wrap
+     , data-clist, deepseq, directory, dlist, filepath, microlens
+     , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
+     , text, text-zipper, transformers, unix, vector, vty, word-wrap
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.41.5";
-       sha256 = "0r7r44h81jpv2h9wqwkh9i5hmdkr296cvmvyha6qr89298npz1cb";
+       version = "0.42";
+       sha256 = "1hrfw10zy1450slj79d432zi6wiy11jr1ciz3xh0fx27zns4yqyy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq dlist
-         microlens microlens-mtl microlens-th stm template-haskell text
-         text-zipper transformers vector vty word-wrap
+         base config-ini containers contravariant data-clist deepseq
+         directory dlist filepath microlens microlens-mtl microlens-th stm
+         template-haskell text text-zipper transformers unix vector vty
+         word-wrap
        ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A declarative terminal user interface library";
@@ -40218,8 +40342,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.2.2";
-       sha256 = "1fx9f0ddx8il141rhqxb81vms0nxkyckwx72cmjq2j0nwjhhh89l";
+       version = "0.0.3.0";
+       sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40998,6 +41122,8 @@ self: {
        pname = "bytestring-handle";
        version = "0.1.0.6";
        sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
+       revision = "1";
+       editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -41882,6 +42008,8 @@ self: {
        pname = "cabal-install";
        version = "2.4.1.0";
        sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
+       revision = "1";
+       editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath process ];
@@ -42669,59 +42797,6 @@ self: {
      }) {};
 
   "cachix" = 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_0_1_3" = callPackage
     ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
      , bifunctors, bytestring, cachix-api, conduit, conduit-extra
      , cookie, cryptonite, data-default, dhall, directory, ed25519
@@ -42759,46 +42834,6 @@ self: {
      }) {};
 
   "cachix-api" = 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;
-     }) {};
-
-  "cachix-api_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, amazonka, base, base16-bytestring
      , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
      , http-api-data, http-media, lens, memory, protolude, servant
@@ -42830,7 +42865,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
@@ -44275,6 +44309,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava-conduit_0_5_1" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+     , conduit, containers, criterion, mtl, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cassava-conduit";
+       version = "0.5.1";
+       sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm";
+       libraryHaskellDepends = [
+         array base bifunctors bytestring cassava conduit containers mtl
+         text
+       ];
+       testHaskellDepends = [
+         base bytestring cassava conduit QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Conduit interface for cassava package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-embed" = callPackage
     ({ mkDerivation, base, bytestring, cassava, template-haskell
      , vector
@@ -44836,8 +44891,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.2.2";
-       sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd";
+       version = "0.1.2.3";
+       sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45507,8 +45562,8 @@ self: {
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
        pname = "chan";
-       version = "0.0.3";
-       sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr";
+       version = "0.0.4";
+       sha256 = "07kykcgv4xdzby2s50wlqjjvcbgvda6prcz4jhg8qzfazngpn4g3";
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base stm ];
        description = "Some extra kit for Chans";
@@ -46041,6 +46096,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "chimera" = callPackage
+    ({ mkDerivation, base, gauge, ghc-prim, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "chimera";
+       version = "0.2.0.0";
+       sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim vector ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "Lazy, infinite streams with O(1) indexing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chiphunk" = callPackage
     ({ mkDerivation, base, c2hs, safe-exceptions, StateVar
      , vector-space
@@ -51401,8 +51476,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.6.1.0";
-       sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
+       version = "1.6.2.0";
+       sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -51840,8 +51915,8 @@ self: {
        pname = "conduit-audio";
        version = "0.2.0.3";
        sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1";
-       revision = "1";
-       editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
+       revision = "2";
+       editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
        libraryHaskellDepends = [ base conduit vector ];
        description = "Combinators to efficiently slice and dice audio streams";
        license = stdenv.lib.licenses.bsd3;
@@ -51855,8 +51930,8 @@ self: {
        pname = "conduit-audio-lame";
        version = "0.1.2.1";
        sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za";
-       revision = "1";
-       editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr";
+       revision = "2";
+       editedCabalFile = "09cly6yly3vdlp8qbv6iyrk84aca7v6d160hwg9ai0dmjxk0jkl4";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -51875,8 +51950,8 @@ self: {
        pname = "conduit-audio-samplerate";
        version = "0.1.0.3";
        sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi";
-       revision = "1";
-       editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw";
+       revision = "2";
+       editedCabalFile = "1xp5mqd8svgdz9lwz2vw5mwkm98n834i2k83axwfwvpqr2jlkqa9";
        libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
@@ -51895,8 +51970,8 @@ self: {
        pname = "conduit-audio-sndfile";
        version = "0.1.2.1";
        sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
-       revision = "1";
-       editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg";
+       revision = "2";
+       editedCabalFile = "00c628bx1j8p342pc03p884illajqsgi47yplfxvdywxcijnwbn3";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -55816,14 +55891,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "crypto-enigma_0_1_1_1" = callPackage
+  "crypto-enigma_0_1_1_4" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, HUnit
      , optparse-applicative, QuickCheck, split, text
      }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.1.1.1";
-       sha256 = "0cfkzmgszvlwi4cylzxi2fpniw9a4ral4c6nyrdzjjdij55prafj";
+       version = "0.1.1.4";
+       sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers split text ];
@@ -59849,25 +59924,26 @@ self: {
 
   "datadog" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, Cabal, dlist, exceptions, hspec, http-client
-     , http-client-tls, http-types, lens, lifted-base, monad-control
-     , network, old-locale, random, text, time, transformers-base
-     , unordered-containers, vector
+     , bytestring, Cabal, containers, dlist, exceptions, hspec
+     , http-client, http-client-tls, http-types, lens, lifted-base
+     , monad-control, network, old-locale, random, text, time
+     , transformers-base, unliftio, unordered-containers, vector
      }:
      mkDerivation {
        pname = "datadog";
-       version = "0.2.2.0";
-       sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
+       version = "0.2.3.0";
+       sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv";
        libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring dlist http-client
-         http-client-tls http-types lens lifted-base monad-control network
-         old-locale text time transformers-base unordered-containers vector
+         aeson auto-update base buffer-builder bytestring containers dlist
+         http-client http-client-tls http-types lens lifted-base
+         monad-control network old-locale text time transformers-base
+         unliftio unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring Cabal dlist
-         exceptions hspec http-client http-client-tls http-types lens
+         aeson auto-update base buffer-builder bytestring Cabal containers
+         dlist exceptions hspec http-client http-client-tls http-types lens
          lifted-base monad-control network old-locale random text time
-         transformers-base unordered-containers vector
+         transformers-base unliftio unordered-containers vector
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
@@ -61582,6 +61658,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_1_11_0_4" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "1.11.0.4";
+       sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg";
+       libraryHaskellDepends = [
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
+       ];
+       description = "A library for unit-testing concurrent programs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -62035,13 +62128,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "deque_0_2_4" = callPackage
-    ({ mkDerivation, base, semigroups }:
+  "deque_0_2_6" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "deque";
-       version = "0.2.4";
-       sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9";
-       libraryHaskellDepends = [ base semigroups ];
+       version = "0.2.6";
+       sha256 = "1jpapfa5lza9vpdj64a55imr9gjm19b7bwx773hb9fky77wrxn52";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62715,6 +62814,8 @@ self: {
        pname = "dhall";
        version = "1.19.1";
        sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq";
+       revision = "1";
+       editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62835,6 +62936,8 @@ self: {
        pname = "dhall-json";
        version = "1.2.5";
        sha256 = "0zdxv43kj8dp2w9hy4px9xf785ybs9jy5pzhzybiagq428k4kcbf";
+       revision = "1";
+       editedCabalFile = "0zgg3wlsvsshgcibn7xchqfw5z2qh3yxkf2lb4bkx220f4m0dvfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64856,6 +64959,8 @@ self: {
        pname = "discrimination";
        version = "0.3";
        sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
+       revision = "1";
+       editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          primitive profunctors promises semigroups transformers
@@ -65366,8 +65471,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-p2p";
-       version = "0.1.4.0";
-       sha256 = "0wl5cnh2swymj3h4hrvkkfl7d5hrmxl1ayiyv9yjbr6gm72i11vj";
+       version = "0.1.5.0";
+       sha256 = "0izlk0m0n0s8rdr31lfc05nbsqdwr2zfl2ai3j60r7hzq62i7rby";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68432,8 +68537,8 @@ self: {
      }:
      mkDerivation {
        pname = "each";
-       version = "1.1.0.0";
-       sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl";
+       version = "1.1.1.0";
+       sha256 = "078qlgdk256rcjh8k9lv7i14rqky952b2zzbnymswciqiiha5bvb";
        libraryHaskellDepends = [ base dlist template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Template Haskell library for writing monadic expressions more easily";
@@ -69629,8 +69734,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-prometheus-adapter";
-       version = "0.1.0.3";
-       sha256 = "0jkjbzb5ygd8q4641wdzw3v3cxvdqy2r6qhrrfi09iqn3ii9gjad";
+       version = "0.1.0.4";
+       sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2";
        libraryHaskellDepends = [
          base containers ekg-core microlens-th prometheus text transformers
          unordered-containers
@@ -70825,19 +70930,20 @@ self: {
      }) {};
 
   "entwine" = callPackage
-    ({ mkDerivation, async, base, containers, criterion, directory
-     , exceptions, monad-loops, process, QuickCheck
+    ({ mkDerivation, async, base, clock, containers, criterion
+     , directory, exceptions, monad-loops, process, QuickCheck
      , quickcheck-instances, quickcheck-properties, quickcheck-text
-     , random, SafeSemaphore, stm, text, time, transformers
-     , transformers-either
+     , random, retry, SafeSemaphore, semigroups, stm, text, time
+     , transformers, transformers-either
      }:
      mkDerivation {
        pname = "entwine";
-       version = "0.0.2";
-       sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
+       version = "0.0.3";
+       sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij";
        libraryHaskellDepends = [
-         async base containers exceptions monad-loops SafeSemaphore stm text
-         time transformers transformers-either
+         async base clock containers exceptions monad-loops retry
+         SafeSemaphore semigroups stm text time transformers
+         transformers-either
        ];
        testHaskellDepends = [
          async base directory exceptions process QuickCheck
@@ -73961,12 +74067,13 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "3.1.0.2";
-       sha256 = "0g568pp3sxzzzcpbcrvx76msn58nn41g1r4wq8sfvvg1hb28xpf5";
+       version = "4.0.0.0";
+       sha256 = "0h83cn0767sk8di6ja5928v65mkcp90pjqhgijrvynssxxsvfsji";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
-         base doctest HUnit monad-control QuickCheck silently test-framework
-         test-framework-hunit test-framework-quickcheck2 test-framework-th
+         base doctest HUnit monad-control mtl QuickCheck silently
+         test-framework test-framework-hunit test-framework-quickcheck2
+         test-framework-th
        ];
        benchmarkHaskellDepends = [
          base criterion HUnit mtl test-framework test-framework-hunit
@@ -75045,6 +75152,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fay-websockets" = callPackage
+    ({ mkDerivation, fay-base }:
+     mkDerivation {
+       pname = "fay-websockets";
+       version = "0.0.1.1";
+       sha256 = "1pax12d1rjmh3gdg1ylavk04f8rlldc6jnmm5sgghdq28z1mp6pb";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ fay-base ];
+       description = "Websockets FFI library for Fay";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fb" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
@@ -78380,6 +78499,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "focuslist_0_1_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+     , genvalidity-containers, genvalidity-hspec, hedgehog, lens
+     , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "focuslist";
+       version = "0.1.0.1";
+       sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx";
+       revision = "2";
+       editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base containers lens mono-traversable QuickCheck
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity-containers genvalidity-hspec hedgehog lens
+         QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
+       ];
+       description = "Lists with a focused element";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
@@ -80741,8 +80887,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.5.1.0";
-       sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v";
+       version = "0.5.1.1";
+       sha256 = "01f8d32f2nkqrf21p38zgzwmvl2pkpl9rx0c8a8ch6h56flzhck4";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers exceptions network
          transformers
@@ -80758,8 +80904,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.5.0.3";
-       sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv";
+       version = "0.5.0.4";
+       sha256 = "0w4sfa4qyclcfixxlam5djhv9hx0hzhfsvf2cabs6m8mgks8zidi";
        libraryHaskellDepends = [
          base bytestring conduit connection exceptions ftp-client resourcet
        ];
@@ -81381,14 +81527,15 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
+    ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom
+     , QuickCheck, random
      }:
      mkDerivation {
        pname = "fused-effects";
-       version = "0.1.1.0";
-       sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
+       version = "0.1.2.1";
+       sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn";
        libraryHaskellDepends = [ base deepseq MonadRandom random ];
-       testHaskellDepends = [ base doctest hspec ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "A fast, flexible, fused effect system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84078,28 +84225,25 @@ self: {
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
      , containers, directory, exceptions, filepath, happy, haskeline
-     , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
-     , old-locale, parallel, pretty, process, random, terminfo, time
-     , time-compat, unix, utf8-string
+     , httpd-shed, json, mtl, network, network-uri, parallel, pretty
+     , process, random, terminfo, time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
-       version = "3.9";
-       sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i";
+       version = "3.10";
+       sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
-         haskeline httpd-shed json mtl network network-uri old-locale
-         parallel pretty process random terminfo time time-compat unix
-         utf8-string
+         haskeline httpd-shed json mtl network network-uri parallel pretty
+         process random terminfo time time-compat unix utf8-string
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base Cabal directory filepath HTF HUnit process
-       ];
+       testHaskellDepends = [ base Cabal directory filepath process ];
        doCheck = false;
        postPatch = ''
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -86511,19 +86655,23 @@ self: {
      }) {};
 
   "gingersnap" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
-     , postgresql-simple, resource-pool, snap-core, text, transformers
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , http-types, microspec, postgresql-simple, resource-pool
+     , snap-core, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "gingersnap";
-       version = "0.2.2.3";
-       sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
+       version = "0.3.1.0";
+       sha256 = "10lcs2p14rk1l280h3xkywbagy82cp2yy4zgs8l531hyqfzrsl01";
        libraryHaskellDepends = [
          aeson base bytestring deepseq http-types postgresql-simple
          resource-pool snap-core text transformers unordered-containers
        ];
-       description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
+       testHaskellDepends = [
+         base bytestring containers microspec postgresql-simple snap-core
+         transformers
+       ];
+       description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -86680,31 +86828,33 @@ self: {
      }) {};
 
   "git-annex" = callPackage
-    ({ 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, exceptions, fdo-notify, feed, filepath, free, git
-     , gnupg, hinotify, hslogger, http-client, http-client-tls
-     , http-conduit, http-types, IfElse, lsof, magic, memory, microlens
-     , monad-control, monad-logger, mountpoints, mtl, network
-     , network-info, network-multicast, network-uri, old-locale, openssh
-     , optparse-applicative, perl, persistent, persistent-sqlite
-     , persistent-template, process, QuickCheck, random, regex-tdfa
-     , resourcet, rsync, 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, wget, which
+    ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
+     , clientsession, concurrent-output, conduit, connection, containers
+     , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
+     , disk-free-space, dlist, edit-distance, exceptions, fdo-notify
+     , feed, filepath, free, git, gnupg, hinotify, hslogger, http-client
+     , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
+     , memory, microlens, monad-control, monad-logger, mountpoints, mtl
+     , network, network-info, network-multicast, network-uri, old-locale
+     , openssh, optparse-applicative, path-pieces, perl, persistent
+     , persistent-sqlite, persistent-template, process, QuickCheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
+     , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
        version = "7.20181121";
        sha256 = "07fbnz3rr9dq76zx6cpxdxppkgb7wwhbrm9y89jdcpn8giaz0i6h";
        configureFlags = [
-         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
-         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
-         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
-         "-f-webapp-secure" "-fwebdav" "-fxmpp"
+         "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
+         "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
+         "-fwebdav"
        ];
        isLibrary = false;
        isExecutable = true;
@@ -86713,19 +86863,21 @@ self: {
          hslogger IfElse process split transformers unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         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 exceptions fdo-notify feed
-         filepath free hinotify hslogger http-client http-client-tls
+         aeson async attoparsec aws base blaze-builder bloomfilter byteable
+         bytestring case-insensitive clientsession concurrent-output conduit
+         connection containers crypto-api cryptonite data-default DAV dbus
+         directory disk-free-space dlist edit-distance exceptions fdo-notify
+         feed filepath free hinotify hslogger http-client http-client-tls
          http-conduit http-types IfElse magic memory microlens monad-control
          monad-logger mountpoints mtl network network-info network-multicast
-         network-uri old-locale optparse-applicative persistent
+         network-uri old-locale optparse-applicative path-pieces 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
+         regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
+         socks split stm stm-chans tagsoup tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat unordered-containers utf8-string uuid
+         vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
+         yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -101170,8 +101322,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.6.9";
-       sha256 = "1353cr6bd814xa1d2jqqnh2h5jmlkdsfg1a4cmxwyl1wvprjx54i";
+       version = "0.9.0";
+       sha256 = "0351kjfykh94lpf6kpdw18vzpdn13k0zak99n72hl2ybpy8d1yk6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104260,8 +104412,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedn";
-       version = "0.1.9.0";
-       sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l";
+       version = "0.1.9.1";
+       sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq mtl
          scientific stringsearch text time time-locale-compat utf8-string
@@ -107707,54 +107859,53 @@ self: {
     ({ mkDerivation, ansi-terminal, base, base-compat-batteries
      , 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, statistics, tabular, temporary
+     , haskeline, here, hledger-lib, html, lucid, math-functions
+     , 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
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.11.1";
-       sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9";
-       revision = "1";
-       editedCabalFile = "1g8jfjsfddpiifgv39gi985lsz8fsysf6qni34b0kb44wpd67pfn";
+       version = "1.12.1";
+       sha256 = "1b9zvlrhrzg0rvk90ac1z8n8sfhdx070l8hy3sg25nbcsqxzd51w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          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
+         filepath hashable haskeline here hledger-lib lucid math-functions
+         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
        ];
        executableHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          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
+         filepath haskeline here hledger-lib math-functions 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
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          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
+         filepath haskeline here hledger-lib math-functions 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
        ];
        benchmarkHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          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 statistics tabular temporary terminfo text time
-         timeit transformers unordered-containers utf8-string utility-ht
-         wizards
+         file-embed filepath haskeline here hledger-lib html math-functions
+         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
        ];
        description = "Command-line interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -107769,8 +107920,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.11.1";
-       sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc";
+       version = "1.12";
+       sha256 = "0vl4ag5r58zag8djihmdlj9apqrvczjn51qfizs366wprdppdxax";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107817,17 +107968,15 @@ self: {
 
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
-     , hledger-lib, hspec, megaparsec, microlens, microlens-th
-     , optparse-applicative, QuickCheck, semigroups, text, text-zipper
-     , time, transformers, unordered-containers, vector, vty
-     , xdg-basedir
+     , hledger-lib, hspec, hspec-discover, megaparsec, microlens
+     , microlens-th, optparse-applicative, QuickCheck, semigroups, text
+     , text-zipper, time, transformers, unordered-containers, vector
+     , vty, xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.6";
-       sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
-       revision = "3";
-       editedCabalFile = "0knyxgscbhddizdnljjs2ih73kf2s8acyzhrvhwdmw4c14560x45";
+       version = "1.3.7";
+       sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107845,6 +107994,7 @@ self: {
          base free hledger-lib hspec megaparsec QuickCheck text text-zipper
          time transformers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107896,8 +108046,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.11.1";
-       sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f";
+       version = "1.12";
+       sha256 = "1m38r9z6ccdxhl54k8x9drbfmj1l9hy8mnb7cj4bwprpz4xx15bh";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -107927,8 +108077,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.11.1";
-       sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj";
+       version = "1.12";
+       sha256 = "0cidm3kjlfnzfpsbzkbmfx36gm5msipkavw5267s67crzdcg8qwg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107971,8 +108121,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.11.1";
-       sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs";
+       version = "1.12";
+       sha256 = "14n3qhdr95nfgczw05dki2wy26k86z1h0li8md1bglch4j9fjs36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108045,21 +108195,6 @@ self: {
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
-     mkDerivation {
-       pname = "hlibsass";
-       version = "0.1.7.0";
-       sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
-       configureFlags = [ "-fexternalLibsass" ];
-       setupHaskellDepends = [ base Cabal directory ];
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ libsass ];
-       testHaskellDepends = [ base hspec ];
-       description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) libsass;};
-
-  "hlibsass_0_1_8_0" = callPackage
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
@@ -108072,7 +108207,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -108084,8 +108218,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.10";
-       sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
+       version = "2.1.11";
+       sha256 = "0nv6627dacfsfjd3irmkff06hj1hr194zpm9xq6ng93dxhkhsnab";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -110070,11 +110204,11 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, openssl }:
      mkDerivation {
        pname = "hopenssl";
-       version = "2.2.2";
-       sha256 = "0k589mi4sny88jaqxcqd0jgy6kmbzslxk6y1bk8xkvq73nvjxnjl";
+       version = "2.2.3";
+       sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base bytestring HUnit ];
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -111592,6 +111726,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "hs-bibutils_6_7_0_0" = callPackage
+    ({ mkDerivation, base, syb }:
+     mkDerivation {
+       pname = "hs-bibutils";
+       version = "6.7.0.0";
+       sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5";
+       libraryHaskellDepends = [ base syb ];
+       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-blake2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -118457,6 +118603,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-bits_0_7_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
+     , safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.0.5";
+       sha256 = "1p3bqkzsmmz66chrwykj8pawgg7m5dvzsqmr9lrsdxldgqq62i8s";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit
      , conduit-combinators, criterion, hspec, mmap, time, transformers
@@ -118825,8 +118993,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "2.1.0";
-       sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
+       version = "4.0.0";
+       sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118951,29 +119119,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.20";
-       sha256 = "05azmns8nvdpfhd0fi71slsgn8irghyx25rynipc44ff407c1maa";
-       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_22" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
      , transformers, vector
@@ -118994,7 +119139,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -119293,8 +119437,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwhile";
-       version = "0.1.1.2";
-       sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb";
+       version = "0.1.1.3";
+       sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120357,8 +120501,8 @@ self: {
        pname = "hyraxAbif";
        version = "0.2.3.10";
        sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
-       revision = "1";
-       editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
+       revision = "2";
+       editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121639,8 +121783,8 @@ self: {
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.3.0.8";
-       sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b";
+       version = "0.3.0.9";
+       sha256 = "1lskisk4aacqiv1v6fr95zcc5mrn9l4ikxf7xpj568k2i3aqcnwk";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers either exceptions
          hslogger list-t network pipes random rolling-queue stm stm-delay
@@ -122285,6 +122429,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "incremental-parser_0_3_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.3.2.1";
+       sha256 = "07banm2lnrhjvihs0iaij0kqgff198qcbah02s3cjyyl70cmllfr";
+       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 {
@@ -123551,8 +123715,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.4.0.0";
-       sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
+       version = "0.5.0.0";
+       sha256 = "1p3qv356lqw5m88wilj7mb2hyqhbcd67rcg9kdaqg3pibmyiq3bx";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -124440,6 +124604,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ip2proxy" = callPackage
+    ({ mkDerivation, base, binary, bytestring, iproute }:
+     mkDerivation {
+       pname = "ip2proxy";
+       version = "1.0.0";
+       sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx";
+       libraryHaskellDepends = [ base binary bytestring iproute ];
+       description = "IP2Proxy Haskell package for proxy detection";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ip6addr" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
@@ -126039,10 +126214,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5.5";
-       sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz";
-       revision = "1";
-       editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi";
+       version = "0.5.5.1";
+       sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127064,6 +127237,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-alt" = callPackage
+    ({ mkDerivation, aeson, base }:
+     mkDerivation {
+       pname = "json-alt";
+       version = "1.0.0";
+       sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
+       libraryHaskellDepends = [ aeson base ];
+       description = "Union 'alternative' or Either that has untagged JSON encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-api" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -127150,31 +127334,32 @@ self: {
 
   "json-autotype" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, GenericPretty, hashable, lens, mtl
+     , filepath, GenericPretty, hashable, json-alt, lens, mtl
      , optparse-applicative, pretty, process, QuickCheck, scientific
-     , smallcheck, text, uniplate, unordered-containers, vector, yaml
+     , smallcheck, template-haskell, text, uniplate
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "2.0.0";
-       sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
-       revision = "1";
-       editedCabalFile = "00wbcq9bx6sq6i5756ja6pf016xbpk2kflq20ncdv76zycxdkqnm";
+       version = "3.0.0";
+       sha256 = "1ryk896kg2bs0w430zsg235h861nf43qn9hl1r285dh53jgj6mnw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers filepath GenericPretty hashable lens mtl
-         pretty process scientific text uniplate unordered-containers vector
+         aeson base containers filepath GenericPretty hashable json-alt lens
+         mtl pretty process QuickCheck scientific smallcheck
+         template-haskell text uniplate unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
-         lens mtl optparse-applicative pretty process scientific text
-         uniplate unordered-containers vector yaml
+         json-alt lens mtl optparse-applicative pretty process scientific
+         template-haskell text uniplate unordered-containers vector yaml
        ];
        testHaskellDepends = [
          aeson base bytestring containers directory filepath GenericPretty
-         hashable lens mtl optparse-applicative pretty process QuickCheck
-         scientific smallcheck text uniplate unordered-containers vector
+         hashable json-alt lens mtl optparse-applicative pretty process
+         QuickCheck scientific smallcheck template-haskell text uniplate
+         unordered-containers vector
        ];
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -129811,8 +129996,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "kind-apply";
-       version = "0.1.0.0";
-       sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
+       version = "0.2.0.0";
+       sha256 = "1c98537cinsv0pdp8alcvqmbijxz7ac0cn7xxyla3mnnv5awk7zf";
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
        license = stdenv.lib.licenses.bsd3;
@@ -129823,8 +130008,8 @@ self: {
     ({ mkDerivation, base, kind-apply }:
      mkDerivation {
        pname = "kind-generics";
-       version = "0.2.0";
-       sha256 = "07bvdys7xlxds1q6hlqn299709k1fha81hap7jfn8snyjv3fdfal";
+       version = "0.2.1.0";
+       sha256 = "0j6r70gafcx3wg3rxhcm28gqlr7zpghl105imcqm2jgm5kb2189l";
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -130102,8 +130287,8 @@ self: {
        pname = "kqueue";
        version = "0.2";
        sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
-       revision = "2";
-       editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
+       revision = "3";
+       editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7";
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
@@ -133265,6 +133450,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck-instances" = callPackage
+    ({ mkDerivation, base, bytestring, leancheck, nats, text }:
+     mkDerivation {
+       pname = "leancheck-instances";
+       version = "0.0.1";
+       sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq";
+       libraryHaskellDepends = [ base bytestring leancheck nats text ];
+       testHaskellDepends = [ base bytestring leancheck nats text ];
+       description = "Common LeanCheck instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -134811,6 +135008,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "libraft" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency
+     , containers, dejafu, directory, exceptions, haskeline
+     , hunit-dejafu, mtl, network, network-simple, parsec, protolude
+     , QuickCheck, random, repline, stm, tasty, tasty-dejafu
+     , tasty-discover, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, word8
+     }:
+     mkDerivation {
+       pname = "libraft";
+       version = "0.1.1.0";
+       sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c";
+       revision = "1";
+       editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers directory
+         exceptions haskeline mtl network network-simple parsec protolude
+         random repline text time transformers word8
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers directory
+         exceptions haskeline mtl network network-simple parsec protolude
+         random repline stm text time transformers word8
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers dejafu
+         directory exceptions haskeline hunit-dejafu mtl network
+         network-simple parsec protolude QuickCheck random repline tasty
+         tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit
+         tasty-quickcheck text time transformers word8
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Raft consensus algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
      mkDerivation {
@@ -138896,8 +139131,8 @@ self: {
     ({ mkDerivation, base, containers, contravariant }:
      mkDerivation {
        pname = "lrucache";
-       version = "1.2.0.0";
-       sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
+       version = "1.2.0.1";
+       sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
@@ -141592,6 +141827,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_2_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, data-default-class
+     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+     , vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.2.4.1";
+       sha256 = "198xik64fw3n4wk3gy1rrxl2l3jwzn8b8h1yskg71mlvpv598lwk";
+       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
@@ -144288,6 +144545,8 @@ self: {
        pname = "midi-util";
        version = "0.2.0.1";
        sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
+       revision = "1";
+       editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5";
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
@@ -145100,8 +145359,8 @@ self: {
      }:
      mkDerivation {
        pname = "mixpanel-client";
-       version = "0.1.0.0";
-       sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7";
+       version = "0.1.1";
+       sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          servant servant-client string-conv text time
@@ -151297,10 +151556,8 @@ self: {
      }:
      mkDerivation {
        pname = "natural";
-       version = "0.3.0.2";
-       sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
-       revision = "1";
-       editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
+       version = "0.3.0.3";
+       sha256 = "18ycqn164kl203wmvrdyfbwfgbbyzyl38i86sllmkwpqq2ciarwi";
        libraryHaskellDepends = [ base lens semigroupoids ];
        testHaskellDepends = [
          base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -151368,8 +151625,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "6";
-       editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl";
+       revision = "7";
+       editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -152493,6 +152750,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-bsd" = callPackage
+    ({ mkDerivation, base, network }:
+     mkDerivation {
+       pname = "network-bsd";
+       version = "2.8.0.0";
+       sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
+       libraryHaskellDepends = [ base network ];
+       doHaddock = false;
+       description = "Network.BSD";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-builder" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec
      , hspec-server, optparse-applicative, process, shelly, text, yaml
@@ -153644,8 +153913,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.3.1.0";
-       sha256 = "1rdlyznj61a392n6m8p7g2g96alxcmcrw9n6izrdb0lkw21cls89";
+       version = "0.3.2.0";
+       sha256 = "12c1g6712v8m6mnysiq9pm5g4178vmrxq3j4v50fm02njj4rdpnb";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -154522,6 +154791,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonempty-containers" = callPackage
+    ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+     , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
+     }:
+     mkDerivation {
+       pname = "nonempty-containers";
+       version = "0.1.0.0";
+       sha256 = "15800rd4hix5iab0n5k484za494zs110gyga8wn5xaag1axr4alp";
+       libraryHaskellDepends = [
+         base comonad containers deepseq semigroupoids these
+       ];
+       testHaskellDepends = [
+         base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+         tasty-hedgehog text these
+       ];
+       description = "Non-empty variants of containers data types, with full API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nonemptymap" = callPackage
     ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
@@ -155909,6 +156197,8 @@ self: {
        pname = "oblivious-transfer";
        version = "0.1.0";
        sha256 = "1kq5ppm151q1im14j6zm2w0pn60baj6gzxmfqfx8p0m7a7wwl7sz";
+       revision = "1";
+       editedCabalFile = "1v9js45kc94zirg530d0f3r9wwsx60xnz7diqzvfxlbvw01649yk";
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude random
        ];
@@ -156167,6 +156457,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "oeis2" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens
+     , lens-aeson, QuickCheck, text, vector
+     }:
+     mkDerivation {
+       pname = "oeis2";
+       version = "0.1.0";
+       sha256 = "17wzcf4zq8jg6kqd0mfkhcf37mkhjys1vzwpylhzkfgxwvhi4fjj";
+       libraryHaskellDepends = [
+         aeson base containers http-conduit lens lens-aeson text vector
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec http-conduit lens lens-aeson QuickCheck
+         text vector
+       ];
+       description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "off-simple" = callPackage
     ({ mkDerivation, base, parsec3, vector }:
      mkDerivation {
@@ -156537,17 +156846,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "once_0_3" = callPackage
-    ({ mkDerivation, base, containers, hashable, template-haskell
-     , unordered-containers
+  "once_0_4" = callPackage
+    ({ mkDerivation, async, base, containers, hashable, hspec
+     , hspec-discover, HUnit, template-haskell, unordered-containers
      }:
      mkDerivation {
        pname = "once";
-       version = "0.3";
-       sha256 = "1i5yf5d6c33arbrvvyk2bcp9cz8aj62zhd6sgxqz684baidn5rbc";
+       version = "0.4";
+       sha256 = "0az973cg4mf1azvh3x1gvp395ism7300mlajj9pvqmawvfar3g9h";
        libraryHaskellDepends = [
          base containers hashable template-haskell unordered-containers
        ];
+       testHaskellDepends = [
+         async base containers hashable hspec HUnit template-haskell
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
        description = "memoization for IO actions and functions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159098,8 +159412,8 @@ self: {
      }:
      mkDerivation {
        pname = "pairing";
-       version = "0.1.1";
-       sha256 = "15230s384z6hg29fc9l06qsk0657c1z00x0pijgxr9w8lbis56qg";
+       version = "0.1.4";
+       sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c";
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude QuickCheck random
          wl-pprint-text
@@ -159411,8 +159725,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.5";
-       sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
+       version = "1.0.6";
+       sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -169795,6 +170109,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pretty-show-ansi-wl" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy
+     , haskell-lexer
+     }:
+     mkDerivation {
+       pname = "pretty-show-ansi-wl";
+       version = "1.9.2.1";
+       sha256 = "00g6crhwshscvchf4321sig1p7dr82is5vfa2x8vmxm7kr6ciki6";
+       libraryHaskellDepends = [
+         ansi-wl-pprint array base ghc-prim haskell-lexer
+       ];
+       libraryToolDepends = [ happy ];
+       description = "Like pretty-show, but only for ansi-wl-pprint";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pretty-simple" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , doctest, Glob, mtl, parsec, text, transformers
@@ -171692,8 +172022,8 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.7.0.1";
-       sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
+       version = "0.7.1.0";
+       sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -173145,24 +173475,24 @@ self: {
      , 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
-     , zeromq4-simple
+     , tasty-quickcheck, text, time, utf8-string, uuid, vector
+     , zeromq4-haskell, zeromq4-simple
      }:
      mkDerivation {
        pname = "purescript-iso";
-       version = "0.0.5";
-       sha256 = "06dw9fqc2h8asc3gwr3m5xqxsfcc24qw2pjz4wi2f2pgb32sicls";
+       version = "0.0.6";
+       sha256 = "0zz71c8mv86ihqwcqsp0cjw9dlyd0xw394dz14mwg16frajn986k";
        libraryHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
          base bytestring containers deepseq emailaddress monad-control mtl
          QuickCheck quickcheck-instances scientific stm strict text time
-         utf8-string uuid zeromq4-haskell zeromq4-simple
+         utf8-string uuid vector zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async 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
+         tasty-quickcheck text time utf8-string uuid vector zeromq4-haskell
          zeromq4-simple
        ];
        description = "Isomorphic trivial data type definitions over JSON";
@@ -174022,6 +174352,8 @@ self: {
        pname = "quadratic-irrational";
        version = "0.0.6";
        sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
+       revision = "1";
+       editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm";
        libraryHaskellDepends = [
          arithmoi base containers mtl transformers
        ];
@@ -180128,6 +180460,8 @@ self: {
        pname = "repa";
        version = "3.4.1.4";
        sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
+       revision = "1";
+       editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -180226,6 +180560,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.2";
        sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
+       revision = "1";
+       editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -182543,8 +182879,8 @@ self: {
      }:
      mkDerivation {
        pname = "rncryptor";
-       version = "0.3.0.0";
-       sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp";
+       version = "0.3.0.1";
+       sha256 = "0j8y2iqxsin4gcgl85si7gl4bjrmdw9psvc7j3maa91fyh40dx49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184491,28 +184827,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.4.1";
-       sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4_2" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -184532,7 +184846,6 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -189514,8 +189827,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
-       revision = "2";
-       editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
+       revision = "3";
+       editedCabalFile = "0bcab5xk354glypz15lnlzvr157pbvh4mjfd5ln59hr3ip84bzi9";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -189600,8 +189913,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.4";
-       sha256 = "09myrp3g8k60i3w7da8sdi6asrdz8nri8cwh7qszhmpyf0xa6vhk";
+       version = "0.1.1.5";
+       sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -189985,21 +190298,20 @@ self: {
 
   "servant-py" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, charset
-     , hspec, hspec-expectations, lens, QuickCheck, servant
-     , servant-foreign, text
+     , hspec, lens, QuickCheck, servant, servant-foreign, text
      }:
      mkDerivation {
        pname = "servant-py";
-       version = "0.1.0.4";
-       sha256 = "0cc4cwny1y0iwchasxl8ncg2ladndpxcdh7ydfr2z91y97m15yx6";
+       version = "0.1.1.0";
+       sha256 = "1s708lcib9956x0ww14kcrhn5chg0sz9jnzk456kyjmwar8qssmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring charset lens servant servant-foreign text
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring hspec hspec-expectations lens
-         QuickCheck servant servant-foreign text
+         aeson base base-compat bytestring hspec lens QuickCheck servant
+         servant-foreign text
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -190324,8 +190636,8 @@ self: {
        pname = "servant-streaming";
        version = "0.3.0.0";
        sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq";
-       revision = "2";
-       editedCabalFile = "0v435r9kzhn9jcws3kibxgr46ii6kbdniqk56qmx6hzfmkwvgwgk";
+       revision = "3";
+       editedCabalFile = "04mc3k97sk0r90m8ca34gqpb2bz8yljp3j613xx7xz90sffqc1hq";
        libraryHaskellDepends = [ base http-types servant ];
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
@@ -191735,8 +192047,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.17.1";
-       sha256 = "1vm7wcyh0lxaq4qnmbywchkrm61rvf8iy43a44hwk48p3y7jdpz4";
+       version = "0.17.2";
+       sha256 = "1wl837d89b0zl0fzhh51y718p9dv99qid0gr3rkqyvbvhayj5dcm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -194869,6 +195181,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "skylighting_0_7_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, directory, filepath, hxt
+     , mtl, regex-pcre-builtin, safe, skylighting-core, text
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.7.5";
+       sha256 = "080kmpqaqh76qqjml34rfm7m6pchdmd2519g6y3kdb3x5vj01qbx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe skylighting-core text
+         utf8-string
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skylighting-core" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
@@ -194901,6 +195237,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skylighting-core_0_7_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting-core";
+       version = "0.7.5";
+       sha256 = "129q860xk59n8dxsxl7prk0jk3ddl96r9i6r4lsk5l9pbpms41pp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe text transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+         tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skype4hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, lifted-base
      , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -197734,8 +198103,8 @@ self: {
     ({ mkDerivation, base, containers, filepath, QuickCheck }:
      mkDerivation {
        pname = "solve";
-       version = "1.2";
-       sha256 = "03byni7iqv9wh35bc2g94ycsm1nl0ngfs4n1nkpprd1vw0d5g9h4";
+       version = "1.3";
+       sha256 = "1hd7vbbxcn9x3xzxnfscmbg8bjaqm7bkhjkrkdq2b0ys04sahxs8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers filepath ];
@@ -200016,10 +200385,10 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.9.1.1";
-       sha256 = "103jq3jxhp26f8si72dmwb3vvdhsl1dw3d9j2an4yjkz9l9yjfx5";
+       version = "1.9.3";
+       sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf";
        revision = "1";
-       editedCabalFile = "0ldwb5xvm1j2cdhafmrvkd2l64zq04wx3kwavkavvgpg1mln0ijl";
+       editedCabalFile = "1d6hf71l2i94xhx23jxl3qapidw7v73kig8m2as5kxdymnpfh48r";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -202592,8 +202961,8 @@ self: {
        pname = "streaming-attoparsec";
        version = "1.0.0";
        sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
-       revision = "1";
-       editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
+       revision = "2";
+       editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx";
        libraryHaskellDepends = [
          attoparsec base bytestring streaming streaming-bytestring
        ];
@@ -204414,17 +204783,15 @@ self: {
      }) {};
 
   "summoner" = 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, aeson, ansi-terminal, base, base-noprelude
+     , bytestring, directory, filepath, generic-deriving, gitrev
+     , hedgehog, hspec, neat-interpolation, optparse-applicative
+     , process, relude, text, time, tomland
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.1.0.1";
-       sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
-       revision = "1";
-       editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
+       version = "1.2.0";
+       sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -204432,12 +204799,12 @@ self: {
          generic-deriving gitrev neat-interpolation optparse-applicative
          process relude text time tomland
        ];
-       executableHaskellDepends = [ base-noprelude relude ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base-noprelude hedgehog relude tasty tasty-hedgehog tomland
+         base-noprelude filepath hedgehog hspec neat-interpolation relude
+         tomland
        ];
-       testToolDepends = [ tasty-discover ];
-       description = "Tool for creating completely configured production Haskell projects";
+       description = "Tool for scaffolding completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -204848,8 +205215,8 @@ self: {
        pname = "sv";
        version = "1.2";
        sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
-       revision = "2";
-       editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4";
+       revision = "3";
+       editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -204899,6 +205266,8 @@ self: {
        pname = "sv-core";
        version = "0.3";
        sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
+       revision = "1";
+       editedCabalFile = "06wj1r1f06a594y3h9dl11wb7ra9993s2kdfzlf74w4r14bp7j4a";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
          deepseq lens mtl parsec profunctors readable semigroupoids
@@ -205631,6 +206000,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "symbols" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "symbols";
+       version = "0.2.0.1";
+       sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393";
+       libraryHaskellDepends = [ base ];
+       description = "Symbol manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "symengine" = callPackage
     ({ mkDerivation, base, gmp, gmpxx, symengine, tasty, tasty-hunit
      , tasty-quickcheck
@@ -207820,6 +208200,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_1_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
+     , wcwidth
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "1.2";
+       sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix wcwidth
+       ];
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -207869,6 +208267,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_2_0_8" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.2.0.8";
+       sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -207972,8 +208382,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "5";
-       editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr";
+       revision = "6";
+       editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -208012,6 +208422,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.5.1";
        sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
+       revision = "1";
+       editedCabalFile = "18k4p273qnvfmk5cbm89rjqr0v03v0q22q7bbl7z3bxpwnnkmhqf";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -208317,6 +208729,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-wai" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, tasty, wai
+     , wai-extra
+     }:
+     mkDerivation {
+       pname = "tasty-wai";
+       version = "0.1.0.1";
+       sha256 = "0h2zqwj19vamn2rcqpq17wjcx3v8xfixgzh0b30k37vbqcgz62va";
+       libraryHaskellDepends = [
+         base bytestring http-types tasty wai wai-extra
+       ];
+       testHaskellDepends = [ base http-types tasty wai ];
+       description = "Test 'wai' endpoints via Test.Tasty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tateti-tateti" = callPackage
     ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
      mkDerivation {
@@ -208906,17 +209334,19 @@ self: {
      }) {};
 
   "template-toolkit" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text
-     , unordered-containers, uri-encode
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, hashtables, mtl, parsec, pcre-utils
+     , regex-pcre-builtin, scientific, text, time, unordered-containers
+     , uri-encode
      }:
      mkDerivation {
        pname = "template-toolkit";
-       version = "0.1.0.1";
-       sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg";
+       version = "0.1.1.0";
+       sha256 = "0nqsgfqj28d6qqc4639d8paqb8d9fw5kpijggbmxdnaqd64xc4p1";
        libraryHaskellDepends = [
-         aeson base bytestring containers directory mtl parsec pcre-utils
-         regex-pcre-builtin scientific text unordered-containers uri-encode
+         aeson base binary bytestring containers directory hashtables mtl
+         parsec pcre-utils regex-pcre-builtin scientific text time
+         unordered-containers uri-encode
        ];
        description = "Template Toolkit implementation for Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -214613,16 +215043,16 @@ self: {
 
   "tomlcheck" = callPackage
     ({ mkDerivation, base, htoml-megaparsec, megaparsec
-     , optparse-generic, text
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.36";
-       sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
+       version = "0.1.0.39";
+       sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base htoml-megaparsec megaparsec optparse-generic text
+         base htoml-megaparsec megaparsec optparse-applicative text
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
@@ -214636,8 +215066,8 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.0.0";
-       sha256 = "1ycmf0id5vp0ax4rmvcma4yhdis9p51qkvd43afz84hf0r26gzr6";
+       version = "1.0.1";
+       sha256 = "0k94a6am7cmqhia543rmaw06xl0xq5lx22q1sb01x3l96sxh1aa8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -215849,33 +216279,6 @@ self: {
      }) {};
 
   "tree-diff" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
-     , base-compat, bytestring, containers, generics-sop, hashable
-     , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
-     , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta
-     , unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "tree-diff";
-       version = "0.0.1";
-       sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "6";
-       editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
-       libraryHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
-         containers generics-sop hashable MemoTrie parsec parsers pretty
-         QuickCheck scientific tagged text time unordered-containers
-         uuid-types vector
-       ];
-       testHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
-         tasty tasty-golden tasty-quickcheck trifecta
-       ];
-       description = "Diffing of (expression) trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tree-diff_0_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , base-compat, bytestring, containers, generics-sop, hashable
      , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
@@ -215898,7 +216301,6 @@ self: {
        ];
        description = "Diffing of (expression) trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tree-fun" = callPackage
@@ -216099,6 +216501,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "trie-simple" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, hspec, mtl
+     , mwc-random, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "trie-simple";
+       version = "0.4.1.1";
+       sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7";
+       libraryHaskellDepends = [ base containers deepseq mtl ];
+       testHaskellDepends = [ base containers hspec QuickCheck vector ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mwc-random vector
+       ];
+       description = "Simple Map-based Trie";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tries" = callPackage
     ({ mkDerivation, base, bytestring, composition, containers
      , criterion, deepseq, hashable, keys, mtl, QuickCheck
@@ -217309,8 +217728,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.2.0.1";
-       sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
+       version = "0.3.0.0";
+       sha256 = "1qxbv6w482hjya6bypz8d6mizy9w03b1j43m0v1h4jwi7v71br9r";
        libraryHaskellDepends = [
          aeson base binary bytestring containers deepseq errors exceptions
          free hashable http-client http-client-tls http-types mtl
@@ -218016,10 +218435,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "type-level-sets";
-       version = "0.8.7.0";
-       sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
-       revision = "1";
-       editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr";
+       version = "0.8.9.0";
+       sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
@@ -218104,6 +218521,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_5_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
+     , hspec, QuickCheck, random, temporary, text, weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.5.0.0";
+       sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq ghc ghc-paths random
+         temporary text weigh
+       ];
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-of-html-static" = callPackage
     ({ mkDerivation, base, template-haskell, type-of-html }:
      mkDerivation {
@@ -218778,8 +219217,8 @@ self: {
      }:
      mkDerivation {
        pname = "u2f";
-       version = "0.1.0.1";
-       sha256 = "1gjpxdx4m74mwl7hili74asicvl8rm90k8q9bakx8mjki8akv15m";
+       version = "0.1.0.2";
+       sha256 = "0yn4r5pp84aqvkm1md722mkh7qqy7rnaw3fr99a2inwplqx6pzfr";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-types base base64-bytestring binary
          bytestring cryptohash cryptonite text
@@ -221955,8 +222394,10 @@ self: {
        pname = "uu-tc";
        version = "2015.1.1";
        sha256 = "03x7s7imcrqz1qdlwbgyw2gnrjhl7y5v8bz209kxswyldxz270lg";
+       revision = "1";
+       editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
        libraryHaskellDepends = [ base ];
-       description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
+       description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -223974,6 +224415,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_25" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.25";
+       sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws";
+       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 {
@@ -224631,6 +225091,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) vrpn;};
 
+  "vt-utils" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, HUnit, parsec
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "vt-utils";
+       version = "1.0.0.0";
+       sha256 = "0mvf5y2mpcxccjsi0h3p0ljwlrhw080wm4j2n1rw2zxh5yvvhlxc";
+       libraryHaskellDepends = [
+         aeson base bytestring directory HUnit parsec text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory HUnit parsec text time
+         unordered-containers vector
+       ];
+       description = "Vector and Text utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vte" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango
      , vte
@@ -224841,8 +225321,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.4.1.0";
-       sha256 = "018x0rb86ndshaqm0ns2cjwrqs2d2sq5sqypy1nbd8rh1g943cdn";
+       version = "0.4.2.0";
+       sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant digit
@@ -230688,8 +231168,8 @@ self: {
      }:
      mkDerivation {
        pname = "xeno";
-       version = "0.3.4";
-       sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
+       version = "0.3.5.1";
+       sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60";
        libraryHaskellDepends = [
          array base bytestring deepseq hspec mtl mutable-containers vector
        ];
@@ -230701,27 +231181,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xeno_0_3_5" = callPackage
-    ({ mkDerivation, array, base, bytestring, criterion, deepseq
-     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
-     , weigh, xml
-     }:
-     mkDerivation {
-       pname = "xeno";
-       version = "0.3.5";
-       sha256 = "0352xn6jlcbh1z4qlz679kybcvwz756xz21fzhv36vklzxclvgxn";
-       libraryHaskellDepends = [
-         array base bytestring deepseq hspec mtl mutable-containers vector
-       ];
-       testHaskellDepends = [ base bytestring hexml hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
-       ];
-       description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -231894,39 +232353,43 @@ self: {
      }) {};
 
   "xmobar" = callPackage
-    ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
-     , containers, dbus, directory, filepath, hinotify, hspec, HTTP
-     , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
-     , libXrender, mtl, old-locale, parsec, parsec-numbers, process
-     , regex-compat, stm, time, timezone-olson, timezone-series
-     , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
+    ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring
+     , containers, dbus, directory, extensible-exceptions, filepath
+     , hinotify, hspec, HTTP, http-conduit, http-types, iwlib, libmpd
+     , libXpm, libXrandr, libXrender, mtl, old-locale, parsec
+     , parsec-numbers, process, regex-compat, stm, temporary, time
+     , timezone-olson, timezone-series, transformers, unix, utf8-string
+     , wirelesstools, X11, X11-xft
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.28.1";
-       sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5";
+       version = "0.29";
+       sha256 = "136sqbfcwp1l7ynmmayihar25qa5kn04axy4mwzf7a6nc5b3zzxf";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
          "-fwith_rtsopts" "-fwith_threaded" "-fwith_utf8" "-fwith_uvmeter"
          "-fwith_weather" "-fwith_xft" "-fwith_xpm"
        ];
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         alsa-core alsa-mixer base bytestring containers dbus directory
-         filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
-         old-locale parsec parsec-numbers process regex-compat stm time
-         timezone-olson timezone-series transformers unix utf8-string X11
-         X11-xft
+       libraryHaskellDepends = [
+         alsa-core alsa-mixer async base bytestring containers dbus
+         directory extensible-exceptions filepath hinotify HTTP http-conduit
+         http-types iwlib libmpd mtl old-locale parsec parsec-numbers
+         process regex-compat stm time timezone-olson timezone-series
+         transformers unix utf8-string X11 X11-xft
        ];
-       executableSystemDepends = [
+       librarySystemDepends = [
          libXpm libXrandr libXrender wirelesstools
        ];
+       executableHaskellDepends = [
+         async base containers directory filepath parsec unix X11
+       ];
        testHaskellDepends = [
-         base bytestring containers directory filepath hspec mtl old-locale
-         parsec parsec-numbers process regex-compat stm time transformers
-         unix X11
+         alsa-core alsa-mixer async base bytestring containers directory
+         filepath hspec mtl old-locale parsec parsec-numbers process
+         regex-compat stm temporary time transformers unix X11
        ];
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
@@ -234261,6 +234724,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_9" = 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.9";
+       sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types monad-logger mtl
+         parsec path-pieces primitive random resourcet rio shakespeare
+         template-haskell text time transformers unix-compat unliftio
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -234772,8 +235272,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.12.5";
-       sha256 = "12h3z7k83qfx2nyqciqg9z3mpbl14z5rpfl8q2768m5rp8gg9j84";
+       version = "0.12.6.0";
+       sha256 = "005brhqz52q6r03fx7ka2i1r2b1s2j7nis5a2ycdmr0mw5mb2scm";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare text xss-sanitize yesod-core yesod-form
@@ -237205,6 +237705,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unzip;};
 
+  "zip-archive_0_4" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, pretty, process
+     , temporary, text, time, unix, unzip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.4";
+       sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath HUnit process temporary time
+         unix
+       ];
+       testToolDepends = [ unzip ];
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unzip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl

From 72b7f7f65b149dd6995ffc1b2c99b071476336b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 20:03:37 +0100
Subject: [PATCH 1349/2793] hledger: update overrides for version 1.12

---
 .../haskell-modules/configuration-common.nix       | 14 +++++++++++++-
 .../haskell-modules/configuration-ghc-8.6.x.nix    |  3 ---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50901b7d1da..0c6621c9659 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -951,6 +951,13 @@ self: super: {
   # https://github.com/yesodweb/Shelly.hs/issues/162
   shelly = dontCheck super.shelly;
 
+  # hledger needs a newer megaparsec version than we have in LTS 12.x.
+  hledger-lib = super.hledger-lib.overrideScope (self: super: {
+    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    megaparsec = self.megaparsec_7_0_4;
+  });
+
   # 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: {
@@ -976,7 +983,12 @@ self: super: {
       mkdir -p $out/share/info
       cp -v *.info* $out/share/info/
     '';
-  }));
+  })).overrideScope (self: super: {
+    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    config-ini = self.config-ini_0_2_4_0;
+    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    megaparsec = self.megaparsec_7_0_4;
+  });
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
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 d61915c5abd..4d91daa89a1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -54,9 +54,6 @@ self: super: {
   free = self.free_5_1;
   haddock-library = dontCheck super.haddock-library_1_7_0;
   HaTeX = doJailbreak super.HaTeX;
-  hledger = doJailbreak super.hledger;
-  hledger-lib = doJailbreak super.hledger-lib;
-  hledger-ui = doJailbreak super.hledger-ui;
   hpack = self.hpack_0_31_1;
   hslua = self.hslua_1_0_1;
   hslua-module-text = self.hslua-module-text_0_2_0;

From 697a421fdcae6e41585f1613ec479b4467977ce6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 20:04:22 +0100
Subject: [PATCH 1350/2793] haskell-shelly: enable the test suite again

---
 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 0c6621c9659..55e74a0f7e7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -948,9 +948,6 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # https://github.com/yesodweb/Shelly.hs/issues/162
-  shelly = dontCheck super.shelly;
-
   # hledger needs a newer megaparsec version than we have in LTS 12.x.
   hledger-lib = super.hledger-lib.overrideScope (self: super: {
     cassava-megaparsec = self.cassava-megaparsec_2_0_0;

From d5726e6ad984ea4a3a8e1fd7b10c5f5a048eac69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 11:57:25 +0100
Subject: [PATCH 1351/2793] haskell-brick: update ghc-8.6.x override for the
 new version

---
 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 4d91daa89a1..c8d47c552ac 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_41_5;
+  brick = self.brick_0_42;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From 63f5ed9f967276a5088aca9642eb7a63bd932915 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:17:13 +0100
Subject: [PATCH 1352/2793] xmobar: disable the failing test suite to fix the
 build

The test suite tries to access the ALSA system and fails.
---
 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 55e74a0f7e7..c13bfad22e7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1197,4 +1197,7 @@ self: super: {
   # https://github.com/jmillikin/chell/issues/1
   chell = super.chell.override { patience = self.patience_0_1_1; };
 
+  # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
+  xmobar = dontCheck super.xmobar;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 82bb8cb934032bf1e63084bc4d6dfa5114cebe21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:25:16 +0100
Subject: [PATCH 1353/2793] haskell-hspec-core: use latest version when
 compiling 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 c8d47c552ac..53776037f2b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -58,6 +58,7 @@ self: super: {
   hslua = self.hslua_1_0_1;
   hslua-module-text = self.hslua-module-text_0_2_0;
   hspec = self.hspec_2_6_0;
+  hspec-contrib = self.hspec-contrib_0_5_1;
   hspec-core = self.hspec-core_2_6_0;
   hspec-discover = self.hspec-discover_2_6_0;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x

From 059c61d001fd32b4a1f5d3190e9c0d798570b4b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:33:48 +0100
Subject: [PATCH 1354/2793] haskell-esqueleto: mark the build as broken

---
 .../haskell-modules/configuration-common.nix          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c13bfad22e7..82542e6ac02 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -93,14 +93,9 @@ self: super: {
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
-  esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
-    src = pkgs.fetchFromGitHub {
-      owner = "bitemyapp";
-      repo = "esqueleto";
-      rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
-      sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
-    };
-  };
+
+  # https://github.com/bitemyapp/esqueleto/issues/105
+  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {

From b38dd07eaa224ba55a0ba25c1545077e41e2c985 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:47:48 +0100
Subject: [PATCH 1355/2793] nsjail: fix path to new{u|g}idmap (#51523)

---
 pkgs/tools/security/nsjail/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index ae8a06e7b5c..f88156285ca 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which
-, libnl, protobuf, protobufc }:
+, libnl, protobuf, protobufc, shadow
+}:
 
 stdenv.mkDerivation rec {
   name = "nsjail-${version}";
@@ -13,6 +14,12 @@ stdenv.mkDerivation rec {
     sha256          = "0cgycj0cz74plmz4asxryqprg6mkzpmnxzqbfsp1wwackinxq5fq";
   };
 
+  postPatch = ''
+    substituteInPlace user.cc \
+      --replace "/usr/bin/newgidmap" "${shadow}/bin/newgidmap" \
+      --replace "/usr/bin/newuidmap" "${shadow}/bin/newuidmap"
+  '';
+
   nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ];
   buildInputs = [ libnl protobuf protobufc ];
   enableParallelBuilding = true;

From d41e868e02b10ab4e9693f06a7c7f202edadd3b1 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 3 Nov 2018 21:29:00 -0400
Subject: [PATCH 1356/2793] vscode,vscode-extensions: fix insiders build

---
 pkgs/applications/editors/vscode/default.nix  | 32 +++++++++++--------
 .../editors/vscode/with-extensions.nix        | 27 ++++------------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index b5cb6f6e3e1..2a6926a8708 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
-  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
+  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret,
+  isInsiders ? false }:
 
 let
-  version = "1.29.1";
-  channel = "stable";
+  executableName = "code" + lib.optionalString isInsiders "-insiders";
 
   plat = {
     "i686-linux" = "linux-ia32";
@@ -31,19 +31,24 @@ let
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
+    version = "1.29.1";
 
     src = fetchurl {
       name = "VSCode_${version}_${plat}.${archive_fmt}";
-      url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}";
+      url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
       inherit sha256;
     };
 
+    passthru = {
+      inherit executableName;
+    };
+
     desktopItem = makeDesktopItem {
-      name = "code";
-      exec = "code";
-      icon = "code";
+      name = executableName;
+      exec = executableName;
+      icon = "@out@/share/pixmaps/code.png";
       comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications";
-      desktopName = "Visual Studio Code";
+      desktopName = "Visual Studio Code" + lib.optionalString isInsiders " Insiders";
       genericName = "Text Editor";
       categories = "GNOME;GTK;Utility;TextEditor;Development;";
     };
@@ -56,17 +61,18 @@ in
       if stdenv.hostPlatform.system == "x86_64-darwin" then ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
-        ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin
+        ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
       '' else ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
 
-        substituteInPlace $out/lib/vscode/bin/code --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
+        substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
 
-        ln -s $out/lib/vscode/bin/code $out/bin
+        ln -s $out/lib/vscode/bin/${executableName} $out/bin
 
         mkdir -p $out/share/applications
-        cp $desktopItem/share/applications/* $out/share/applications
+        substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \
+          --subst-var out
 
         mkdir -p $out/share/pixmaps
         cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
@@ -76,7 +82,7 @@ in
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${rpath}" \
-        $out/lib/vscode/code
+        $out/lib/vscode/${executableName}
 
       patchelf \
         --set-rpath "${rpath}" \
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 5535d9ab112..0af96e8bea8 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript
+{ stdenv, lib, runCommand, buildEnv, vscode, makeWrapper
 , vscodeExtensions ? [] }:
 
 /*
@@ -43,6 +43,7 @@
 
 let
 
+  inherit (vscode) executableName;
   wrappedPkgVersion = lib.getVersion vscode;
   wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
 
@@ -51,22 +52,12 @@ let
     paths = vscodeExtensions;
   };
 
-  wrappedExeName = "code";
-  exeName = wrappedExeName;
-
-  wrapperExeFile = writeScript "${exeName}" ''
-    #!${stdenv.shell}
-    exec ${vscode}/bin/${wrappedExeName} \
-      --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \
-      "$@"
-  '';
-
 in
 
 # When no extensions are requested, we simply redirect to the original
 # non-wrapped vscode executable.
 runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
-  buildInputs = [ vscode which ];
+  buildInputs = [ vscode makeWrapper ];
   dontPatchELF = true;
   dontStrip = true;
   meta = vscode.meta;
@@ -75,13 +66,9 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
   mkdir -p "$out/share/applications"
   mkdir -p "$out/share/pixmaps"
 
-  ln -sT "${vscode}/share/applications/code.desktop" "$out/share/applications/code.desktop"
   ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
-  ${if [] == vscodeExtensions
-    then ''
-      ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
-    ''
-    else ''
-      ln -sT "${wrapperExeFile}" "$out/bin/${exeName}"
-    ''}
+  ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
+  makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \
+    --add-flags \
+      "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
 ''

From 688c765f7cb529940ae58538064d5f99b24cc831 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Tue, 4 Dec 2018 22:45:13 +0000
Subject: [PATCH 1357/2793] bitlbee-discord: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index 4dd26103cbe..bed5b17a5ce 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "bitlbee-discord-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     rev = version;
     owner = "sm00th";
     repo = "bitlbee-discord";
-    sha256 = "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c";
+    sha256 = "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 01a7fa88139b5da9d6ad8920486f756176d2b34a Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Wed, 5 Dec 2018 00:19:33 +0100
Subject: [PATCH 1358/2793] loop: unstable-2018-10-02 -> unstable-2018-12-04

---
 pkgs/tools/misc/loop/default.nix          | 12 +++---------
 pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index acb88d9773c..501ab664f83 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage {
-  name = "loop-unstable-2018-10-02";
+  name = "loop-unstable-2018-12-04";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
     repo  = "Loop";
-    rev   = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
-    sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
+    rev   = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf";
+    sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
   };
 
   cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
 
-  cargoPatches = [
-    # Upstream includes mismatched Cargo.lock file.
-    # See https://github.com/Miserlou/Loop/pull/40
-    ./fix_cargo_lock.patch
-  ];
-
   meta = with stdenv.lib; {
     description = "UNIX's missing `loop` command";
     homepage = https://github.com/Miserlou/Loop;
diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch
deleted file mode 100644
index f991a604f33..00000000000
--- a/pkgs/tools/misc/loop/fix_cargo_lock.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "loop-rs"
--version = "0.3.5"
-+version = "0.4.0"
- dependencies = [
-  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-  "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

From b682e03e125f73985d6aa9c6c8ee9da1abc29935 Mon Sep 17 00:00:00 2001
From: Travis Athougies <iammisc@gmail.com>
Date: Tue, 4 Dec 2018 15:25:54 -0800
Subject: [PATCH 1359/2793] libgpg-error: enable Aarch32 support for musl

* Add ARM32 musl support for libgpg-error (#51013)
* libgpg-error: link headers instead of copying
---
 pkgs/development/libraries/libgpg-error/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 52d0f6f05cc..e713eb7f891 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -28,8 +28,11 @@ in stdenv.mkDerivation (rec {
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
   '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
     ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
-  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) ''
     ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
+  '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
+    ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
+    ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
   '';
 
   outputs = [ "out" "dev" "info" ];

From 169e2797119cd90b631ccfce9307645890da11a1 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+github@xndr.de>
Date: Tue, 4 Dec 2018 23:27:26 +0000
Subject: [PATCH 1360/2793] kodi-cli: init at 1.1.1

* kodi-cli: init at 1.1.1 (#50892)

* kodi-cli: nitpicks

nitpicks applied are:

  - The pname thing
    staging-next has been merged.

  - Moved to tools/misc
    applications/video is more appropriate for video applications.
    This is a script used to interact with one.

  - Changed platforms to unix
    This script can only be used where kodi is present.
---
 pkgs/tools/misc/kodi-cli/default.nix | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/kodi-cli/default.nix

diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix
new file mode 100644
index 00000000000..d2fb32319bf
--- /dev/null
+++ b/pkgs/tools/misc/kodi-cli/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "kodi-cli";
+  version = "1.1.1";
+  
+  src = fetchFromGitHub {
+    owner = "nawar";
+    repo = pname;
+    rev = version;
+    sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a kodi-cli $out/bin
+    wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]}
+    cp -a playlist_to_kodi $out/bin
+    wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
+  '';
+  
+  meta = with stdenv.lib; {
+    homepage = https://github.com/nawar/kodi-cli;
+    description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.pstn ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c5852e2217..4cfe183f13e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19937,6 +19937,8 @@ in
     kodi = kodiPlain;
   };
 
+  kodi-cli = callPackage ../tools/misc/kodi-cli { };
+
   kodi-retroarch-advanced-launchers =
     callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
       cores = retroArchCores;

From 8c5251e3c0a62c8f96f80331cdaabc332f7582c3 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 5 Dec 2018 10:48:56 +1100
Subject: [PATCH 1361/2793] bowtie2: fix missing dependencies

---
 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 73f70efc14d..e97b5d1a3f4 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, tbb }:
+{ stdenv, fetchFromGitHub, zlib, tbb, python, perl }:
 
 stdenv.mkDerivation rec {
   pname = "bowtie2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp";
   };
 
-  buildInputs = [ zlib tbb ];
+  buildInputs = [ zlib tbb python perl ];
 
   installFlags = [ "prefix=$(out)" ];
 

From 17a7e0d89ec059ea66beb602297259b26e8508d6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:43:23 -0500
Subject: [PATCH 1362/2793] kafka: 2.0.0 -> 2.0.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 52bb166f401..42493d75815 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -29,9 +29,9 @@ let
       sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2";
     };
     "2.0" = {
-      kafkaVersion = "2.0.0";
+      kafkaVersion = "2.0.1";
       scalaVersion = "2.12";
-      sha256 = "0mbrp8rafv1bra9nrdicpxy6w59ixanaj50c9pkgdrih82f57wdm";
+      sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
     };
   };
 in

From 7c5d43f4f5f2e77599302a907d7b382e6cc4eed4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:43:34 -0500
Subject: [PATCH 1363/2793] kafka: Add test for 2.0

---
 nixos/tests/kafka.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index a833e01f9f5..f97472785f7 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -40,7 +40,7 @@ let
 
         networking.firewall.allowedTCPPorts = [ 9092 ];
         # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
-        virtualisation.memorySize = 2047; 
+        virtualisation.memorySize = 2047;
       };
     };
 
@@ -70,4 +70,5 @@ in with pkgs; {
   kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
   kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
+  kafka_2_0  = makeKafkaTest "kafka_2_0"  apacheKafka_2_0;
 }

From 16f42b369474333091cf9a48955d08e5d4aa8233 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:44:39 -0500
Subject: [PATCH 1364/2793] kafka: Add 2.1

---
 nixos/tests/kafka.nix                 | 1 +
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index f97472785f7..72f91f6428a 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -71,4 +71,5 @@ in with pkgs; {
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
   kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
   kafka_2_0  = makeKafkaTest "kafka_2_0"  apacheKafka_2_0;
+  kafka_2_1  = makeKafkaTest "kafka_2_1"  apacheKafka_2_1;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 42493d75815..348a9a88566 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -33,6 +33,11 @@ let
       scalaVersion = "2.12";
       sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
     };
+    "2.1" = {
+      kafkaVersion = "2.1.0";
+      scalaVersion = "2.12";
+      sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cfe183f13e..7e2c42abd80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8170,13 +8170,14 @@ in
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_2_0;
+  apacheKafka = apacheKafka_2_1;
   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"; };
+  apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
 
   kt = callPackage ../tools/misc/kt {};
 

From 232f76ad2db986fbe3914abfbe9b35fb9a5f7624 Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Sun, 2 Dec 2018 23:37:32 -0500
Subject: [PATCH 1365/2793] rig: init at 1.11

---
 pkgs/tools/misc/rig/default.nix     | 31 +++++++++++++++++++++++
 pkgs/tools/misc/rig/rig_1.11-1.diff | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/tools/misc/rig/default.nix
 create mode 100644 pkgs/tools/misc/rig/rig_1.11-1.diff

diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix
new file mode 100644
index 00000000000..ee7b2623b1d
--- /dev/null
+++ b/pkgs/tools/misc/rig/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl } :
+
+stdenv.mkDerivation rec {
+  version = "1.11";
+  name = "rig-${version}";
+
+  src = fetchurl {
+    url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
+    sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0";
+  };
+
+  # Note: diff modified from Debian: Norbert Veber <nveber@debian.org>
+  # http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz
+  patches = [ ./rig_1.11-1.diff ];
+
+  meta = {
+    homepage = http://rig.sourceforge.net/; 
+    description = "Random identity generator";
+    longDescription = ''
+      RIG (Random Identity Generator) is a free replacement for a shareware
+      program out there called 'fake'. It generates random, yet real-looking,
+      personal data. It is useful if you need to feed a name to a Web site,
+      BBS, or real person, and are too lazy to think of one yourself. Also,
+      if the Web site/BBS/person you are giving the information to tries to
+      cross-check the city, state, zip, or area code, it will check out.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tomberek ];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/tools/misc/rig/rig_1.11-1.diff
new file mode 100644
index 00000000000..301cf78b5a9
--- /dev/null
+++ b/pkgs/tools/misc/rig/rig_1.11-1.diff
@@ -0,0 +1,39 @@
+--- rig-1.11.orig/Makefile
++++ rig-1.11/Makefile
+@@ -1,20 +1,21 @@
+-PREFIX=/usr/local
++PREFIX=${out}
+ BINDIR=${PREFIX}/bin
+ MANDIR=${PREFIX}/man
+ DATADIR=${PREFIX}/share/rig
++CXX=g++
+ 
+ all: rig rig.6
+ rig: rig.cc
+-	g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
++	${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
+ 
+ rig.6: rig.6.in
+ 	sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
+ 
+ install: rig rig.6
+-	install -g 0 -m 755 -o 0 -s rig $(BINDIR)
+-	install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
+-	install -g 0 -m 755 -o 0 -d $(DATADIR)
+-	install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
++	install -m 755 -d $(DESTDIR)$(DATADIR)
++	install -m 755 -d $(DESTDIR)$(BINDIR)
++	install -m 755 rig $(DESTDIR)$(BINDIR)/rig
++	install -m 644 data/*.idx $(DESTDIR)$(DATADIR)
+ 
+ clean:
+ 	rm -rf *~ *.rej *.orig *.o rig rig.6
+--- rig-1.11.orig/rig.cc
++++ rig-1.11/rig.cc
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ using namespace std;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..86167b7cf0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5004,6 +5004,8 @@ with pkgs;
 
   remarshal = callPackage ../development/tools/remarshal { };
 
+  rig = callPackage ../tools/misc/rig { };
+
   rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
 
   rtaudio = callPackage ../development/libraries/audio/rtaudio { };

From 2a2255409265c070d8a3d9a00172452a468aa1ff Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 17:35:16 -0600
Subject: [PATCH 1366/2793] nixos/cockroachdb: simplify dataDir management,
 tweaks

This cleans up the CockroachDB expression, with a few suggestions from
@aszlig.

However, it brought up the note of using systemd's StateDirectory=
directive, which is a nice feature for managing long-term data files,
especially for UID/GID assigned services. However, it can only manage
directories under /var/lib (for global services), so it has to introduce
a special path to make use of it at all in the case someone wants a path
at a different root.

While the dataDir directive at the NixOS level is _occasionally_ useful,
I've gone ahead and removed it for now, as this expression is so new,
and it makes the expression cleaner, while other kinks can be worked out
and people can test drive it.

CockroachDB's dataDir directive, instead, has been replaced with
systemd's StateDirectory management to place the data under
/var/lib/cockroachdb for all uses.

There's an included RequiresMountsFor= clause like usual though, so if
people want dependencies for any kind of mounted device at boot
time/before database startup, it's easy to specify using their own
mount/filesystems clause.

This can also be reverted if necessary, but, we can see if anyone ever
actually wants that later on before doing it -- it's a backwards
compatible change, anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../services/databases/cockroachdb.nix        | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix
index 8de1e78633d..e977751b21e 100644
--- a/nixos/modules/services/databases/cockroachdb.nix
+++ b/nixos/modules/services/databases/cockroachdb.nix
@@ -13,7 +13,7 @@ let
     [ # Basic startup
       "${crdb}/bin/cockroach start"
       "--logtostderr"
-      "--store=${cfg.dataDir}"
+      "--store=/var/lib/cockroachdb"
       (ifNotNull cfg.locality "--locality='${cfg.locality}'")
 
       # WebUI settings
@@ -41,7 +41,7 @@ let
       };
 
       port = mkOption {
-        type = types.int;
+        type = types.port;
         default = defaultPort;
         description = "Port to bind to for ${descr}";
       };
@@ -70,10 +70,12 @@ in
           like datacenter.  The tiers and order must be the same on all nodes.
           Including more tiers is better than including fewer. For example:
 
+          <literal>
               country=us,region=us-west,datacenter=us-west-1b,rack=12
               country=ca,region=ca-east,datacenter=ca-east-2,rack=4
 
               planet=earth,province=manitoba,colo=secondary,power=3
+          </literal>
         '';
       };
 
@@ -83,12 +85,6 @@ in
         description = "The addresses for connecting the node to a cluster.";
       };
 
-      dataDir = mkOption {
-        type = types.path;
-        default = "/var/lib/cockroachdb";
-        description = "Location where CockroachDB stores its table files";
-      };
-
       insecure = mkOption {
         type = types.bool;
         default = false;
@@ -126,9 +122,12 @@ in
           The total size for caches.
 
           This can be a percentage, expressed with a fraction sign or as a
-          decimal-point number, or any bytes-based unit. For example, "25%",
-          "0.25" both represent 25% of the available system memory. The values
-          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+          decimal-point number, or any bytes-based unit. For example,
+          <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
+          25% of the available system memory. The values
+          <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
+          represent 1 gigabyte of memory.
+
         '';
       };
 
@@ -140,9 +139,11 @@ in
           data for SQL queries.
 
           This can be a percentage, expressed with a fraction sign or as a
-          decimal-point number, or any bytes-based unit. For example, "25%",
-          "0.25" both represent 25% of the available system memory. The values
-          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+          decimal-point number, or any bytes-based unit. For example,
+          <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
+          25% of the available system memory. The values
+          <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
+          represent 1 gigabyte of memory.
         '';
       };
 
@@ -193,27 +194,21 @@ in
         requires = [ "time-sync.target" ];
         wantedBy = [ "multi-user.target" ];
 
-        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
-
-        preStart = ''
-          if ! test -e ${cfg.dataDir}; then
-            mkdir -m 0700 -p ${cfg.dataDir}
-            chown -R ${cfg.user} ${cfg.dataDir}
-          fi
-        '';
+        unitConfig.RequiresMountsFor = "/var/lib/cockroachdb";
 
         serviceConfig =
           { ExecStart = startupCommand;
             Type = "notify";
             User = cfg.user;
-            PermissionsStartOnly = true;
+            StateDirectory = "cockroachdb";
+            StateDirectoryMode = "0700";
 
             Restart = "always";
-            TimeoutStopSec="60";
-            RestartSec="10";
-            StandardOutput="syslog";
-            StandardError="syslog";
-            SyslogIdentifier="cockroach";
+
+            # A conservative-ish timeout is alright here, because for Type=notify
+            # cockroach will send systemd pings during startup to keep it alive
+            TimeoutStopSec = 60;
+            RestartSec = 10;
           };
       };
   };

From f4414da64a18836138f0e6dad0d0227de6a2cefe Mon Sep 17 00:00:00 2001
From: Ding Xiang Fei <dingxiangfei2009@gmail.com>
Date: Tue, 4 Dec 2018 12:38:54 +0800
Subject: [PATCH 1367/2793] use interactive bash for gce

---
 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 919c14d86ec..73a8f518477 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , buildPythonApplication
 , bash
+, bashInteractive
 , systemd
 , utillinux
 , boto
@@ -25,7 +26,7 @@ buildPythonApplication rec {
     for file in $(find google_compute_engine -type f); do
       substituteInPlace "$file" \
         --replace /bin/systemctl "${systemd}/bin/systemctl" \
-        --replace /bin/bash "${bash}/bin/bash" \
+        --replace /bin/bash "${bashInteractive}/bin/bash" \
         --replace /sbin/hwclock "${utillinux}/bin/hwclock"
 
       # SELinux tool ???  /sbin/restorecon

From 3aa9091162b48d82a58453a6bda0af98791f5f38 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:21:36 -0600
Subject: [PATCH 1368/2793] buildRustCreate: export RUSTDOC during cargo config

See https://github.com/NixOS/nixpkgs/pull/50452#issuecomment-443455411

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index ff04ba6a817..7630c6471dc 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -73,6 +73,7 @@ in ''
   export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
   export NUM_JOBS=1
   export RUSTC="rustc"
+  export RUSTDOC="rustdoc"
   if [[ -n "${versionPre}" ]]; then
     export CARGO_PKG_VERSION_PRE="${versionPre}"
   fi

From e8bfc317fdbb2e45d4ad66f7361d0a7dc8d132cb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:41:08 -0500
Subject: [PATCH 1369/2793] pythonPackages.svgwrite: 1.1.6 -> 1.2.1

---
 .../development/python-modules/svgwrite/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix
index 79e03acd359..1772e8794ff 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/pkgs/development/python-modules/svgwrite/default.nix
@@ -3,23 +3,30 @@
 , fetchPypi
 , setuptools
 , pyparsing
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "svgwrite";
-  version = "1.1.6";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
+    extension = "zip";
+    sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
   };
 
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ pyparsing ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python library to create SVG drawings";
-    homepage = https://bitbucket.org/mozman/svgwrite;
+    homepage = https://github.com/mozman/svgwrite;
     license = licenses.mit;
   };
 

From 9d8de9ffaa1bcdd4dc54b0e40666f0c42026a43c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 8 Nov 2018 14:15:07 -0600
Subject: [PATCH 1370/2793] =?UTF-8?q?c-ares:=20don=E2=80=99t=20set=20confi?=
 =?UTF-8?q?gure=20flags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These aren’t needed with dontDisableStatic
---
 pkgs/development/libraries/c-ares/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index efe7a5820b5..9e38398dfad 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
   };
 
-  configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
-
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
     homepage = https://c-ares.haxx.se;

From a3a6ad7a01e943a4097c87cb144d331910693d82 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:06:46 -0600
Subject: [PATCH 1371/2793] stdenv: implement crossOverlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.
---
 pkgs/stdenv/cross/default.nix   | 13 +++++++++----
 pkgs/stdenv/custom/default.nix  |  2 +-
 pkgs/stdenv/darwin/default.nix  |  4 ++--
 pkgs/stdenv/default.nix         |  4 ++--
 pkgs/stdenv/freebsd/default.nix |  2 +-
 pkgs/stdenv/linux/default.nix   |  4 ++--
 pkgs/stdenv/native/default.nix  |  2 +-
 pkgs/stdenv/nix/default.nix     |  4 ++--
 pkgs/top-level/default.nix      | 13 ++++++++-----
 9 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index daa9f66615c..a6063049a3a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,11 +1,14 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 }:
 
 let
   bootStages = import ../. {
     inherit lib localSystem overlays;
-    crossSystem = null;
+
+    crossSystem = localSystem;
+    crossOverlays = [];
+
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
@@ -33,7 +36,8 @@ in lib.init bootStages ++ [
 
   # Run Packages
   (buildPackages: {
-    inherit config overlays;
+    inherit config;
+    overlays = overlays ++ crossOverlays;
     selfBuild = false;
     stdenv = buildPackages.stdenv.override (old: rec {
       buildPlatform = localSystem;
@@ -48,7 +52,7 @@ in lib.init bootStages ++ [
 
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if crossSystem.useAndroidPrebuilt or false
              then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
 
@@ -56,6 +60,7 @@ in lib.init bootStages ++ [
         ++ lib.optionals
              (hostPlatform.isLinux && !buildPlatform.isLinux)
              [ buildPackages.patchelf buildPackages.paxctl ]
+        ++ lib.optional hostPlatform.isDarwin buildPackages.clang
         ++ lib.optional
              (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
              buildPackages.updateAutotoolsGnuConfigScriptsHook
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index b6ea8685f8e..e86face9519 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   bootStages = import ../. {
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5fb410b64eb..b7d8e3ba523 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,5 +1,5 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
@@ -16,7 +16,7 @@
   }
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 210e0439c0b..c0bbe24e521 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -7,7 +7,7 @@
 { # Args just for stdenvs' usage
   lib
   # Args to pass on to the pkgset builder, too
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 } @ args:
 
 let
@@ -36,7 +36,7 @@ let
 
   # Select the appropriate stages for the platform `system'.
 in
-  if crossSystem != null then stagesCross
+  if crossSystem != localSystem || crossOverlays != [] then stagesCross
   else if config ? replaceStdenv then stagesCustom
   else { # switch
     "i686-linux" = stagesLinux;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index b3a6cedad84..dbb4a056455 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 let inherit (localSystem) system; in
 
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 978beea692c..6d793999d90 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -4,7 +4,7 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 , bootstrapFiles ?
   let table = {
@@ -32,7 +32,7 @@
   in files
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 37795b11f6d..810cf16301f 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index ffff8bdf51d..a8311f49609 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,10 +1,10 @@
 { lib
-, crossSystem, config, overlays
+, crossSystem, localSystem, config, overlays
 , bootStages
 , ...
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 bootStages ++ [
   (prevStage: {
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index da7fc1bed34..dcd443a1c29 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,8 @@
   # `*Platform`s.
   localSystem
 
-, # The system packages will ultimately be run on. Null if the two should be the
-  # same.
-  crossSystem ? null
+, # The system packages will ultimately be run on.
+  crossSystem ? localSystem
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
@@ -32,6 +31,9 @@
 , # List of overlays layers used to extend Nixpkgs.
   overlays ? []
 
+, # List of overlays to apply to target packages only.
+  crossOverlays ? []
+
 , # A function booting the final package set for a specific standard
   # environment. See below for the arguments given to that function, the type of
   # list it returns.
@@ -61,7 +63,8 @@ in let
     builtins.intersectAttrs { platform = null; } config
     // args.localSystem);
 
-  crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0;
+  crossSystem = if crossSystem0 == null then localSystem
+                else lib.systems.elaborate crossSystem0;
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
@@ -91,7 +94,7 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    inherit lib localSystem crossSystem config overlays;
+    inherit lib localSystem crossSystem config overlays crossOverlays;
   };
 
   pkgs = boot stages;

From b966d3c5835fdbaa153a9eacd08cdbf789ee1b40 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:10:45 -0600
Subject: [PATCH 1372/2793] treewide: remove static packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nixpkgs is meant to link everything dynamically. We don’t want to
expose static packages at the top level. If some package needs
statically built binaries, it should use a custom override.
---
 pkgs/tools/system/proot/default.nix |  9 ++------
 pkgs/top-level/all-packages.nix     | 34 ++++++++++++++---------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index d75be0ff5bc..63e135075b9 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, talloc, docutils
-, enableStatic ? true }:
+, talloc, docutils }:
 
 ({ version, rev, sha256, patches }: stdenv.mkDerivation {
   name = "proot-${version}";
@@ -12,17 +11,13 @@
     owner = "cedric-vincent";
   };
 
-  buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static;
+  buildInputs = [ talloc ];
   nativeBuildInputs = [ docutils ];
 
   enableParallelBuilding = true;
 
   inherit patches;
 
-  preBuild = stdenv.lib.optionalString enableStatic ''
-    export LDFLAGS="-static"
-  '';
-
   makeFlags = [ "-C src" ];
 
   postBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59c37c8293c..ac0cd7c194b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3488,9 +3488,7 @@ in
     buildGoPackage = buildGo110Package;
   };
 
-  ipmitool = callPackage ../tools/system/ipmitool {
-    static = false;
-  };
+  ipmitool = callPackage ../tools/system/ipmitool { };
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
@@ -3983,8 +3981,6 @@ in
 
   libiberty = callPackage ../development/libraries/libiberty { };
 
-  libiberty_static = libiberty.override { staticBuild = true; };
-
   libxc = callPackage ../development/libraries/libxc { };
 
   libxcomp = callPackage ../development/libraries/libxcomp { };
@@ -4902,7 +4898,9 @@ in
   plowshare = callPackage ../tools/misc/plowshare { };
 
   pngcheck = callPackage ../tools/graphics/pngcheck {
-    zlib = zlibStatic;
+    zlib = zlib.override {
+      static = true;
+    };
   };
 
   pngcrush = callPackage ../tools/graphics/pngcrush { };
@@ -5210,7 +5208,7 @@ in
   routino = callPackage ../tools/misc/routino { };
 
   rq = callPackage ../development/tools/rq {
-    v8 = v8_static;
+    v8 = v8.override { static = true; };
   };
 
   rsnapshot = callPackage ../tools/backup/rsnapshot { };
@@ -8028,7 +8026,9 @@ in
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
-  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
+  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm {
+    v8_static = v8.override { static = true; };
+  };
 
   wasm-gc = callPackage ../development/interpreters/wasm-gc { };
 
@@ -8450,7 +8450,9 @@ in
 
   lattice-diamond = callPackage ../development/tools/lattice-diamond { };
 
-  distcc = callPackage ../development/tools/misc/distcc { };
+  distcc = callPackage ../development/tools/misc/distcc {
+    libiberty_static = libiberty.override { staticBuild = true; };
+  };
 
   # distccWrapper: wrapper that works as gcc or g++
   # It can be used by setting in nixpkgs config like this, for example:
@@ -8811,7 +8813,9 @@ in
 
   openocd = callPackage ../development/tools/misc/openocd { };
 
-  oprofile = callPackage ../development/tools/profiling/oprofile { };
+  oprofile = callPackage ../development/tools/profiling/oprofile {
+    libiberty_static = libiberty.override { staticBuild = true; };
+  };
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
@@ -12712,8 +12716,6 @@ in
     stdenv = overrideCC stdenv gcc6;
   });
 
-  v8_static = lowPrio (res.v8.override { static = true; });
-
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
 
   vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
@@ -12948,10 +12950,6 @@ in
 
   zlog = callPackage ../development/libraries/zlog { };
 
-  zlibStatic = lowPrio (appendToName "static" (zlib.override {
-    static = true;
-  }));
-
   zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
   zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
   zeromq = zeromq4;
@@ -20610,7 +20608,9 @@ in
   openspades = callPackage ../games/openspades { };
 
   openttd = callPackage ../games/openttd {
-    zlib = zlibStatic;
+    zlib = zlib.override {
+      static = true;
+    };
   };
 
   opentyrian = callPackage ../games/opentyrian { };

From 8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:12:17 -0600
Subject: [PATCH 1373/2793] stdenv/adapters.nix: fixup makeStaticBinaries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore
---
 pkgs/stdenv/adapters.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 671306f6e6f..850785cd881 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -32,13 +32,15 @@ rec {
   # Return a modified stdenv that tries to build statically linked
   # binaries.
   makeStaticBinaries = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = "-static";
+    { mkDerivation = args:
+      if stdenv.hostPlatform.isDarwin
+      then throw "Cannot build fully static binaries on Darwin/macOS"
+      else stdenv.mkDerivation (args // {
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
         configureFlags = (args.configureFlags or []) ++ [
             "--disable-shared" # brrr...
           ];
       });
-      isStatic = true;
     };
 
 

From 5e06294276754ef063c618a1ecb12b629cde8ac3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:13:24 -0600
Subject: [PATCH 1374/2793] darwin/libiconv: fix static/shared logic

The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.
---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index ea5a5953606..0532c88b66b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -15,7 +15,7 @@ appleDerivation {
     (lib.enableFeature enableShared "shared")
   ];
 
-  postInstall = lib.optionalString (!enableStatic) ''
+  postInstall = lib.optionalString enableShared ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
     ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 

From e999def1597de9d03a35cfa6b62277adb0e9a7ad Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:14:41 -0600
Subject: [PATCH 1375/2793] zlib: clean up static/shared distincion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.
---
 pkgs/development/libraries/zlib/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index fe1c275aeda..3a5638b2281 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
-, static ? false
+, static ? true
+, shared ? true
 }:
 
 stdenv.mkDerivation (rec {
@@ -24,13 +25,15 @@ stdenv.mkDerivation (rec {
       --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
   '';
 
-  outputs = [ "out" "dev" "static" ];
+  outputs = [ "out" "dev" ]
+    ++ stdenv.lib.optional (shared && static) "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-  configureFlags = stdenv.lib.optional (!static) "--shared";
+  configureFlags = stdenv.lib.optional shared "--shared"
+                   ++ stdenv.lib.optional (static && !shared) "--static";
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString (shared && static) ''
     moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
@@ -64,7 +67,7 @@ stdenv.mkDerivation (rec {
     "PREFIX=${stdenv.cc.targetPrefix}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "-f" "win32/Makefile.gcc"
-  ] ++ stdenv.lib.optionals (!static) [
+  ] ++ stdenv.lib.optionals shared [
     "SHARED_MODE=1"
   ];
 

From e212b9975172a43f329aefa4afaa41525323d87f Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 20 Nov 2018 12:51:26 -0800
Subject: [PATCH 1376/2793] amass: 2.8.3 -> 2.8.5

---
 pkgs/tools/networking/amass/default.nix | 20 +++++++++++++-------
 pkgs/tools/networking/amass/deps.nix    |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index adb43c4aa08..16e87d2a5c9 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -1,11 +1,12 @@
 { buildGoPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 }:
 
 buildGoPackage rec {
   name = "amass-${version}";
-  version = "2.8.3";
+  version = "2.8.5";
 
   goPackagePath = "github.com/OWASP/Amass";
 
@@ -13,17 +14,19 @@ buildGoPackage rec {
     owner = "OWASP";
     repo = "Amass";
     rev = version;
-    sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc";
+    sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy";
   };
 
-  # NOTE: this must be removed once amass > 2.8.3 is released. This version has
-  # a broken import caused by the project migrating to a new home.
-  preBuild = ''
-    sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go"
-  '';
+  outputs = [ "bin" "out" "wordlists" ];
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    mkdir -p $wordlists
+    cp -R $src/wordlists/*.txt $wordlists
+    gzip $wordlists/*.txt
+  '';
+
   meta = with lib; {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
@@ -33,6 +36,9 @@ buildGoPackage rec {
       uses the IP addresses obtained during resolution to discover associated
       netblocks and ASNs. All the information is then used to build maps of the
       target networks.
+
+      Amass ships with a set of wordlist (to be used with the amass -w flag)
+      that are found under the wordlists output.
       '';
     homepage = https://www.owasp.org/index.php/OWASP_Amass_Project;
     license = licenses.asl20;
diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix
index 711d64fd313..e9b5acf618e 100644
--- a/pkgs/tools/networking/amass/deps.nix
+++ b/pkgs/tools/networking/amass/deps.nix
@@ -94,8 +94,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "93218def8b18e66adbdab3eca8ec334700329f1f";
-      sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz";
+      rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
+      sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
     };
   }
 ]

From d1e477509c79124be16eff6981358d7927865aba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:54:42 -0500
Subject: [PATCH 1377/2793] termtosvg: 0.3.0 -> 0.6.0

---
 pkgs/tools/misc/termtosvg/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 65b1f71194a..33af6a9d67b 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -2,21 +2,17 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "termtosvg";
-  version = "0.3.0";
+  version = "0.6.0";
 
   # tests are not available when fetching from pypi
   src = fetchFromGitHub {
     owner = "nbedos";
     repo = pname;
     rev = version;
-    sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw";
+    sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ];
-
-  checkInputs = [ python3.pkgs.mock ];
-  preCheck = "export HOME=$(mktemp -d)";
-  postCheck = "unset HOME";
+  propagatedBuildInputs = with python3.pkgs; [ lxml pyte ];
 
   meta = with lib; {
     homepage = https://github.com/nbedos/termtosvg;

From 53a67891ab1fefd3aceed07f173cdd33f549fc70 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:16:43 -0600
Subject: [PATCH 1378/2793] ncurses: make shared linking optinoal

when enableShared = false, we set --without-shared flag.
---
 pkgs/development/libraries/ncurses/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 7db78af340c..815db76d5ac 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -4,6 +4,7 @@
 , mouseSupport ? false
 , unicode ? true
 , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
+, enableShared ? !enableStatic
 , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 
 , gpm
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # some aren't supported
 
   configureFlags = [
-    "--with-shared"
+    (lib.withFeature enableShared "shared")
     "--without-debug"
     "--enable-pc-files"
     "--enable-symlinks"

From c564ca83ee52855b93308a63d0da4228a5d2f212 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:21:43 -0500
Subject: [PATCH 1379/2793] pythonPackages.CairoSVG: 2.1.3 -> 2.2.1

---
 .../python-modules/cairosvg/default.nix          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 68b1924e5a8..abaabb24b4d 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
 , pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.1.3";
+  version = "2.2.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
+    sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
   };
 
+  patches = [
+    # Fix tests. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
+      sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
+    })
+  ];
+
+  LC_ALL="en_US.UTF-8";
+
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
 
   checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];

From e728f2dab57375548ab52188c5801221a8251c87 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:23:34 -0500
Subject: [PATCH 1380/2793] pythonPackages.qasm2image: fix build

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

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 429159d05d7..39c7b2055c1 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     ${python.interpreter} tests/launch_tests.py
   '';
 
+  LC_ALL="en_US.UTF-8";
+
   meta = {
     description = "A Python module to visualise quantum circuit";
     homepage    = https://github.com/nelimeee/qasm2image;

From 6d90a8b8948185a3118faf183f29f4b8de294675 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:17:22 -0600
Subject: [PATCH 1381/2793] top-level/stage.nix: add static overlay

Adds the static overlay that can be used to build Nixpkgs statically.
Can be used like:

  nix build pkgsStatic.hello

Not all packages build, as some rely on dynamic linking.
---
 pkgs/stdenv/darwin/portable-libsystem.sh |  10 ++
 pkgs/top-level/stage.nix                 |  16 +++
 pkgs/top-level/static.nix                | 150 +++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 pkgs/stdenv/darwin/portable-libsystem.sh
 create mode 100644 pkgs/top-level/static.nix

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
new file mode 100644
index 00000000000..27ae790fb5a
--- /dev/null
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -0,0 +1,10 @@
+# Make /nix/store/...-libSystem “portable” for static built binaries.
+# This just rewrites everything in $1/bin to use the
+# /usr/lib/libSystem.B.dylib that is provided on every macOS system.
+
+fixupOutputHooks+=('fixLibsystemRefs $prefix')
+
+fixLibsystemRefs() {
+  find "$1/bin" \
+    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+}
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 276350e56e6..6ca370e0b9b 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -174,6 +174,22 @@ let
     # Prefer appendOverlays if used repeatedly.
     extend = f: self.appendOverlays [f];
 
+    # Fully static packages.
+    # Currently uses Musl on Linux (couldn’t get static glibc to work).
+    pkgsStatic = nixpkgsFun ({
+      crossOverlays = [ (import ./static.nix) ];
+    } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      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;
+        };
+      };
+    });
   };
 
   # The complete chain of package set builders, applied from top to bottom.
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
new file mode 100644
index 00000000000..687e38dcc3a
--- /dev/null
+++ b/pkgs/top-level/static.nix
@@ -0,0 +1,150 @@
+# Overlay that builds static packages.
+
+# Not all packages will build but support is done on a
+# best effort basic.
+#
+# Note on Darwin/macOS: Apple does not provide a static libc
+# so any attempts at static binaries are going to be very
+# unsupported.
+#
+# Basic things like pkgsStatic.hello should work out of the box. More
+# complicated things will need to be fixed with overrides.
+
+self: super: let
+  inherit (super.stdenvAdapters) makeStaticBinaries
+                                 overrideInStdenv
+                                 makeStaticLibraries;
+  inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions;
+  inherit (super) makeSetupHook;
+
+  # Best effort static binaries. Will still be linked to libSystem,
+  # but more portable than Nix store binaries.
+  makeStaticDarwin = stdenv: stdenv // {
+    mkDerivation = args: stdenv.mkDerivation (args // {
+      NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
+                      + " -static-libgcc";
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
+        substitutions = {
+          libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
+        };
+      } ../stdenv/darwin/portable-libsystem.sh) ];
+    });
+  };
+
+  staticAdapters = [ makeStaticLibraries ]
+
+    # Apple does not provide a static version of libSystem or crt0.o
+    # So we can’t build static binaries without extensive hacks.
+    ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
+
+    ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
+
+    # Glibc doesn’t come with static runtimes by default.
+    # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
+  ;
+
+  # Force everything to link statically.
+  haskellStaticAdapter = self: super: {
+    mkDerivation = attrs: super.mkDerivation (attrs // {
+      enableSharedLibraries = false;
+      enableSharedExecutables = false;
+      enableStaticLibraries = true;
+    });
+  };
+
+in {
+  stdenv = foldl (flip id) super.stdenv staticAdapters;
+
+  haskell = super.haskell // {
+    packageOverrides = composeExtensions
+      (super.haskell.packageOverrides or (_: _: {}))
+      haskellStaticAdapter;
+  };
+
+  ncurses = super.ncurses.override {
+    enableStatic = true;
+  };
+  libxml2 = super.libxml2.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  zlib = super.zlib.override {
+    static = true;
+    shared = false;
+
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
+  xz = super.xz.override {
+    enableStatic = true;
+  };
+  busybox = super.busybox.override {
+    enableStatic = true;
+  };
+  v8 = super.v8.override {
+    static = true;
+  };
+  libiberty = super.libiberty.override {
+    staticBuild = true;
+  };
+  ipmitool = super.ipmitool.override {
+    static = true;
+  };
+  neon = super.neon.override {
+    static = true;
+    shared = false;
+  };
+  libjpeg = super.libjpeg.override {
+    static = true;
+  };
+  gifsicle = super.gifsicle.override {
+    static = true;
+  };
+  bzip2 = super.bzip2.override {
+    linkStatic = true;
+  };
+  optipng = super.optipng.override {
+    static = true;
+  };
+  openssl = super.openssl.override {
+    static = true;
+
+    # Don’t use new stdenv for openssl because it doesn’t like the
+    # --disable-shared flag
+    stdenv = super.stdenv;
+  };
+  boost = super.boost.override {
+    enableStatic = true;
+    enableShared = false;
+  };
+  gmp = super.gmp.override {
+    withStatic = true;
+  };
+  cdo = super.cdo.override {
+    enable_all_static = true;
+  };
+  gsm = super.gsm.override {
+    staticSupport = true;
+  };
+  parted = super.parted.override {
+    enableStatic = true;
+  };
+  libiconvReal = super.libiconvReal.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  perl = super.perl.override {
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
+
+  darwin = super.darwin // {
+    libiconv = super.darwin.libiconv.override {
+      enableShared = false;
+      enableStatic = true;
+    };
+  };
+
+}

From d9f90bae6d3d43c3b9c7f3f8fe58afb142430d5e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 23:01:45 -0500
Subject: [PATCH 1382/2793] pythonPackages.curtsies: fix build

---
 .../python-modules/curtsies/default.nix           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index d29ad1d6474..b0e9fee93d4 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
 
 buildPythonPackage rec {
   pname = "curtsies";
@@ -8,7 +8,16 @@ buildPythonPackage rec {
     sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";
   };
 
-  propagatedBuildInputs = [ blessings wcwidth typing ];
+  patches = [
+    # Fix dependency on typing. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch;
+      sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs";
+    })
+  ];
+
+  propagatedBuildInputs = [ blessings wcwidth ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [ mock pyte nose ];
 
@@ -18,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Curses-like terminal wrapper, with colored strings!";
-    homepage = https://pypi.python.org/pypi/curtsies;
+    homepage = https://github.com/bpython/curtsies;
     license = licenses.mit;
     maintainers = with maintainers; [ flokli ];
   };

From aad111f5678d4cf7359bae4e6e9868ef35b61ec9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Tue, 4 Dec 2018 22:15:51 -0600
Subject: [PATCH 1383/2793] skhd: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index b3bf590bf26..713847313c2 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8";
+    sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl";
   };
 
   buildInputs = [ Carbon ];

From 4121e9314973791ca7b2d37c565c9143ec211e6f Mon Sep 17 00:00:00 2001
From: fuwa <echowss@gmail.com>
Date: Sun, 2 Dec 2018 13:49:22 +0800
Subject: [PATCH 1384/2793] altcoins.aeon: 0.12.6.0 -> 0.12.8.0

---
 pkgs/applications/altcoins/aeon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
index 4bff3aa2329..42717d3a266 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.12.6.0";
+  version = "0.12.8.0";
 in
 stdenv.mkDerivation {
   name = "aeon-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     repo = "aeon";
     rev = "v${version}-aeon";
     fetchSubmodules = true;
-    sha256 = "19r1snqwixccl27jwv6i0s86qck036pdlhyhl891bbiyvi55h14n";
+    sha256 = "1qmlz820mjs0b60d7i90lxcwwxmsdy6swq67v6n8mbb79zmcx8ii";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];

From c9fd7dc0eed5cf1972d3491540c9df5e96071973 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:41:50 -0600
Subject: [PATCH 1385/2793] foundationdb60: 6.0.15 -> 6.0.17

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 8af94d4f2d9..173d2beb769 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -187,8 +187,8 @@ in with builtins; {
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.15";
+    version = "6.0.17";
     branch  = "release-6.0";
-    sha256  = "1z8104nj1qn738bs1zjiq1mdn8dnj4vksb3fh503mf3ygl54mjbw";
+    sha256  = "00m6dkv2nm51zhiq049fiivnz8hpc8w21y024lykhn16kyjdnfhs";
   };
 }

From 3ebdd65ad7b2a4d810f271b20b7e69e0fb0e7151 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:57:18 -0600
Subject: [PATCH 1386/2793] foundationdb: x86_64-linux only

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 173d2beb769..7e4babbb979 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -167,7 +167,7 @@ let
           description = "Open source, distributed, transactional key-value store";
           homepage    = https://www.foundationdb.org;
           license     = licenses.asl20;
-          platforms   = platforms.linux;
+          platforms   = [ "x86_64-linux" ];
           maintainers = with maintainers; [ thoughtpolice ];
        };
     };

From 3c22d57743d3eab7b18a38afe68b975f53d20dfd Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 4 Dec 2018 23:18:09 -0500
Subject: [PATCH 1387/2793] reptyr: 0.6.2 -> 0.7.0

---
 pkgs/os-specific/linux/reptyr/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 37f1362e14e..bd25dc65ec8 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,31 +1,32 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub, python2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.2";
+  version = "0.7.0";
   name = "reptyr-${version}";
+
   src = fetchFromGitHub {
     owner = "nelhage";
     repo = "reptyr";
     rev = "reptyr-${version}";
-    sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8";
+    sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj";
   };
 
-  # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-  postPatch = ''
-    sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c
-  '';
+  makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
 
-  # Needed with GCC 7
-  NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+  checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ];
+  doCheck = true;
 
-  makeFlags = ["PREFIX=$(out)"];
   meta = {
     platforms = [
       "i686-linux"
       "x86_64-linux"
       "i686-freebsd"
       "x86_64-freebsd"
-    ] ++ lib.platforms.arm;
+      "armv5tel-linux"
+      "armv6l-linux"
+      "armv7l-linux"
+      "aarch64-linux"
+    ];
     maintainers = with lib.maintainers; [raskin];
     license = lib.licenses.mit;
     description = "Reparent a running program to a new terminal";

From 4b843a8106b0c5bc826e4330beae6f329cf60d1e Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Wed, 5 Dec 2018 13:40:07 +0800
Subject: [PATCH 1388/2793] go-ethereum: 1.8.17 -> 1.8.19

---
 maintainers/maintainer-list.nix            | 5 +++++
 pkgs/applications/altcoins/go-ethereum.nix | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5d77f75c65c..8058927a9c4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2464,6 +2464,11 @@
     github = "listx";
     name = "Linus Arver";
   };
+  lionello = {
+    email = "lio@lunesu.com";
+    github = "lionello";
+    name = "Lionello Lunesu";
+  };
   lluchs = {
     email = "lukas.werling@gmail.com";
     github = "lluchs";
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 156cbc01a29..2d6312364fd 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.17";
+  version = "1.8.19";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -16,13 +16,13 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd";
+    sha256 = "0shp8ak44v52ynlyawfh53wczd3zch7ydf6bmbrhm5rpbribirwr";
   };
 
   meta = with stdenv.lib; {
     homepage = https://ethereum.github.io/go-ethereum/;
     description = "Official golang implementation of the Ethereum protocol";
     license = with licenses; [ lgpl3 gpl3 ];
-    maintainers = [ maintainers.adisbladis ];
+    maintainers = [ maintainers.adisbladis maintainers.lionello ];
   };
 }

From f03c9c25ac7a856d4073f6051939052bfb5ac2e6 Mon Sep 17 00:00:00 2001
From: Philippe <pcfeb0009@gmx.com>
Date: Wed, 5 Dec 2018 07:01:40 +0100
Subject: [PATCH 1389/2793] Add cl-jpeg, cl-pdf & cl-typesetting, no extra
 external deps

---
 .../quicklisp-to-nix-output/cl-jpeg.nix       | 25 ++++++++++
 .../quicklisp-to-nix-output/cl-pdf.nix        | 27 +++++++++++
 .../cl-typesetting.nix                        | 28 +++++++++++
 .../lisp-modules/quicklisp-to-nix-systems.txt |  3 ++
 .../lisp-modules/quicklisp-to-nix.nix         | 46 +++++++++++++++----
 5 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
new file mode 100644
index 00000000000..713aff0ea40
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-jpeg'';
+  version = ''20170630-git'';
+
+  description = ''A self-contained baseline JPEG codec implementation'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
+    sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
+  };
+
+  packageName = "cl-jpeg";
+
+  asdFilesToKeep = ["cl-jpeg.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-jpeg DESCRIPTION
+    A self-contained baseline JPEG codec implementation SHA256
+    1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL
+    http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz
+    MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
new file mode 100644
index 00000000000..babdf04e3ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -0,0 +1,27 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-pdf'';
+  version = ''20170830-git'';
+
+  description = ''Common Lisp PDF Generation Library'';
+
+  deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz'';
+    sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s'';
+  };
+
+  packageName = "cl-pdf";
+
+  asdFilesToKeep = ["cl-pdf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
+    1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL
+    http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz
+    MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS
+    ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
+     (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS
+    (cl-pdf-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
new file mode 100644
index 00000000000..358666877a6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-typesetting'';
+  version = ''20170830-git'';
+
+  description = ''Common Lisp Typesetting system'';
+
+  deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
+    sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
+  };
+
+  packageName = "cl-typesetting";
+
+  asdFilesToKeep = ["cl-typesetting.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
+    1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL
+    http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz
+    MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME
+    cl-typesetting DEPS
+    ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
+     (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS
+    (xml-render cl-pdf-doc) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3b10d610d27..e78ec34a0a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -28,12 +28,14 @@ cl-fuse
 cl-fuse-meta-fs
 cl-html-parse
 cl-html5-parser
+cl-jpeg
 cl-json
 cl-l10n
 cl-libuv
 cl-mysql
 closer-mop
 closure-html
+cl-pdf
 cl-ppcre
 cl-ppcre-template
 cl-ppcre-unicode
@@ -50,6 +52,7 @@ cl-syntax-annot
 cl-syntax-anonfun
 cl-syntax-markup
 cl-test-more
+cl-typesetting
 cl-unicode
 cl-unification
 cl-utilities
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 8a126d4fd98..e904f0041d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -278,14 +278,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "zpb-ttf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."zpb-ttf" or (x: {}))
-       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
-         inherit fetchurl;
-       }));
-
-
   "cl-store" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-store" or (x: {}))
@@ -359,6 +351,14 @@ let quicklisp-to-nix-packages = rec {
   "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
 
 
+  "zpb-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."zpb-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+         inherit fetchurl;
+       }));
+
+
   "puri" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."puri" or (x: {}))
@@ -1907,6 +1907,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-typesetting" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-typesetting" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-typesetting.nix {
+         inherit fetchurl;
+           "cl-pdf" = quicklisp-to-nix-packages."cl-pdf";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "cl-test-more" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-test-more" or (x: {}))
@@ -2103,6 +2114,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-pdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-pdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-pdf.nix {
+         inherit fetchurl;
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "closure-html" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."closure-html" or (x: {}))
@@ -2190,6 +2212,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-jpeg" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-jpeg" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-jpeg.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-html5-parser" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-html5-parser" or (x: {}))

From 09a59a9fa361c8e2eb6720c1f3240b38330347c5 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Wed, 5 Dec 2018 16:31:08 +0800
Subject: [PATCH 1390/2793] hivemind: init at 1.0.4

---
 pkgs/applications/misc/hivemind/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/hivemind/default.nix

diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
new file mode 100644
index 00000000000..0431f35057b
--- /dev/null
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "hivemind-${version}";
+  version = "1.0.4";
+  goPackagePath = "github.com/DarthSim/hivemind";
+
+  src = fetchFromGitHub {
+    owner = "DarthSim";
+    repo = "hivemind";
+    rev = "v${version}";
+    sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/DarthSim/;
+    description = "Process manager for Procfile-based applications";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.sveitser ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac0cd7c194b..0d74c18ff9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3312,6 +3312,8 @@ in
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
+  hivemind = callPackage ../applications/misc/hivemind { };
+
   hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
 
   highlight = callPackage ../tools/text/highlight ({

From b3411342a41518fc80f37067e26f9da30400a397 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 8 Nov 2018 17:17:43 +0000
Subject: [PATCH 1391/2793] ocamlPackages.zmq: fix build with non-default OCaml

---
 .../development/ocaml-modules/zmq/default.nix | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix
index fe6a17e876b..bb16ac46f99 100644
--- a/pkgs/development/ocaml-modules/zmq/default.nix
+++ b/pkgs/development/ocaml-modules/zmq/default.nix
@@ -1,9 +1,16 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, czmq, stdint }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }:
 
-buildDunePackage rec {
-  pname = "zmq";
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "zmq is not available for OCaml ${ocaml.version}"
+else
+
+let __dune = dune; in
+let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; };
+in
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-zmq-${version}";
   version = "20180726";
-
   src = fetchFromGitHub {
     owner = "issuu";
     repo = "ocaml-zmq";
@@ -15,13 +22,19 @@ buildDunePackage rec {
     ./ocaml-zmq-issue43.patch
   ];
 
-  buildInputs = [ czmq ];
+  buildInputs = [ ocaml findlib dune czmq ];
+
   propagatedBuildInputs = [ stdint ];
 
+  buildPhase = "dune build -p zmq";
+
+  inherit (dune) installPhase;
+
   meta = with stdenv.lib; {
     description = "ZeroMQ bindings for OCaml";
     license     = licenses.mit;
     maintainers = with maintainers; [ akavel ];
     inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
   };
 }

From f698c0c4184d3dc2ba30a64becd8583bef6d0525 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Nov 2018 17:25:33 +0000
Subject: [PATCH 1392/2793] ocamlPackages.frontc: 3.4 -> 3.4.1

---
 .../ocaml-modules/frontc/default.nix          | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix
index e5330789e26..39ec4c011f8 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/pkgs/development/ocaml-modules/frontc/default.nix
@@ -1,37 +1,38 @@
-{ lib, buildOcaml, fetchurl, ocaml }:
+{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, ocaml, findlib }:
 
-if lib.versionAtLeast ocaml.version "4.06"
-then throw "FrontC is not available for OCaml ${ocaml.version}"
-else
+let
+  meta_file = fetchurl {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META;
+    sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d";
+  };
+in
 
-buildOcaml rec {
-  name = "FrontC";
-  version = "3.4";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-FrontC-${version}";
+  version = "3.4.1";
 
-  src = fetchurl {
-    url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz";
-    sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g";
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "FrontC";
+    rev = "V_3_4_1";
+    sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak";
   };
 
+  buildInputs = [ ocaml findlib ];
+
   meta = with lib; {
-    homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61;
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
     description = "C Parsing Library";
     license = licenses.lgpl21;
     maintainers = [ maintainers.maurer ];
   };
 
-  meta_file = fetchurl {
-    url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META;
-    sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx";
-  };
-
-  opam_patch = fetchurl {
-    url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch;
-    sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5";
-  };
-
-  patches = [ opam_patch ];
-  patchFlags = "-p4";
+  patches = [ (fetchpatch {
+      url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch;
+      sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs";
+    })
+  ];
 
   makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)";
 

From 5c82aa885404e36b026cd2084e7432c6e5194139 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 23:52:55 +0100
Subject: [PATCH 1393/2793] pkgsi686Linux.nixosTests.gitlab: fix 32 bit tests

GitLab 11.5.1 dropped the dependency to posix_spawn, which is broken on
32bit. (See https://gitlab.com/gitlab-org/gitlab-ce/issues/53525)

The only part missing is decreasing virtualisation.memorySize to
something that a 32 bit qemu still executes.

The maximum seems to be 2047, and tests passed with that value for me.
---
 nixos/tests/gitlab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 269da8aa215..f401fe098dc 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
 
   nodes = {
     gitlab = { ... }: {
-      virtualisation.memorySize = 4096;
+      virtualisation.memorySize = 2047;
       systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
       systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
       systemd.services.gitaly.serviceConfig.Restart = mkForce "no";

From 199b4c47434aecea7aa56edb82879327df228b23 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 5 Dec 2018 04:24:20 +0100
Subject: [PATCH 1394/2793] prometheus/exporters/tor: make CPython happy by
 defining $HOME

---
 .../modules/services/monitoring/prometheus/exporters/tor.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
index 0e2a13c44ab..e0ae8380242 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
@@ -36,5 +36,10 @@ in
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
+
+    # CPython requires a process to either have $HOME defined or run as a UID
+    # defined in /etc/passwd. The latter is false with DynamicUser, so define a
+    # dummy $HOME. https://bugs.python.org/issue10496
+    environment = { HOME = "/var/empty"; };
   };
 }

From 3873f43fc39d6662ffedc3e0413a8741558e5952 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 5 Dec 2018 04:24:37 +0100
Subject: [PATCH 1395/2793] prometheus/exporters: fix regression in DynamicUser
 behavior

Instead of setting User/Group only when DynamicUser is disabled, the
previous version of the code set it only when it was enabled. This
caused services with DynamicUser enabled to actually run as nobody, and
services without DynamicUser enabled to run as root.

Regression from fbb7e0c82f297815950e9153c21e561a704bfcd5.
---
 nixos/modules/services/monitoring/prometheus/exporters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 950af848c0f..5308c9c4ee0 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -127,7 +127,7 @@ let
         serviceConfig.Restart = mkDefault "always";
         serviceConfig.PrivateTmp = mkDefault true;
         serviceConfig.WorkingDirectory = mkDefault /tmp;
-      } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
+      } serviceOpts ] ++ optional (!(serviceOpts.serviceConfig.DynamicUser or false)) {
         serviceConfig.User = conf.user;
         serviceConfig.Group = conf.group;
       });

From df2e4428538d36485a2ea7383110869c64be850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Dec 2018 09:59:47 +0000
Subject: [PATCH 1396/2793] radare2: 3.1.2 -> 3.1.3

---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index e8bec4184b8..55bae2740cc 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20299";
-    gittap = "3.1.2";
-    gittip = "b453df6acc6742d709bd238cd9cd63ede2534b1b";
-    rev = "3.1.2";
-    version = "3.1.2";
-    sha256 = "1cvfkxp8vj8f6ghhin71lynvq3zpc311y5b9c2sg9g7h4j3647nq";
+    version_commit = "20315";
+    gittap = "3.1.3";
+    gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7";
+    rev = "3.1.3";
+    version = "3.1.3";
+    sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20299";
+    version_commit = "20315";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From 99231a36bbb40e5886cdece219a4cb26da185bfc Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <schmittlauch@users.noreply.github.com>
Date: Wed, 5 Dec 2018 12:12:12 +0100
Subject: [PATCH 1397/2793] dino: 2018-11-27 -> 2018-11-29 (#51557)

---
 .../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 d2cbf7bbdfc..429429bc411 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -14,13 +14,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-11-27";
+  name = "dino-unstable-2018-11-29";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "141db9e40a3a81cfa3ad3587dc47f69c541d0fde";
-    sha256 = "006r1x7drlz39jjxlfdnxgrnambw9amhl9jcgf6p1dx71h1x8221";
+    rev = "680d28360c781ff29e810821801cfaba0493c526";
+    sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln";
     fetchSubmodules = true;
   };
 

From 33e7330440b5e0c50d482a5d283fe09f42b43830 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 1 Dec 2018 00:24:39 +0800
Subject: [PATCH 1398/2793] libgpiod: init at 2018-10-07

Co-Authored-By: expipiplus1 <github@sub.monoid.al>
---
 .../libraries/libgpiod/default.nix            | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/libgpiod/default.nix

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
new file mode 100644
index 00000000000..c498ef3460a
--- /dev/null
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
+
+stdenv.mkDerivation rec {
+  name = "libgpiod-unstable-${version}";
+  version = "2018-10-07";
+
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
+    rev = "4bf402d3a49336eacd33654441d575bd267780b8";
+    sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d";
+  };
+
+  buildInputs = [ kmod ];
+  nativeBuildInputs = [
+    autoconf-archive
+    pkgconfig
+    autoreconfHook
+  ];
+
+  configureFlags = [
+    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-bindings-cxx"
+    "--prefix=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "C library and tools for interacting with the linux GPIO character device";
+    longDescription = ''
+      Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
+      the character device instead. This library encapsulates the ioctl calls and
+      data structures behind a straightforward API.
+    '';
+    homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.expipiplus1 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d74c18ff9e..8d524a73ac8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10796,6 +10796,8 @@ in
 
   libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
 
+  libgpiod = callPackage ../development/libraries/libgpiod { };
+
   libgpod = callPackage ../development/libraries/libgpod {
     inherit (pkgs.pythonPackages) mutagen;
     monoSupport = false;

From 33e6c84753088652f77d16b372ca9fbfb4fb523a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 12:46:21 +0000
Subject: [PATCH 1399/2793] jenkins: 2.138.3 -> 2.150.1

Fixes several security issues.

See https://jenkins.io/blog/2018/12/05/security-updates/.
---
 .../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 7a401f88be3..ecfdc1b027c 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.3";
+  version = "2.150.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm";
+    sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s";
   };
 
   buildCommand = ''

From 296b33370984c3ddb8a40d7d02f6f8718f5d8459 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 4 Dec 2018 21:52:47 +0100
Subject: [PATCH 1400/2793] all-packages.nix: Fix reference to self warning

This reference was added to master while the deprecation PR #51401 was open.
---
 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 ec30ddd8ae7..28990809190 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17369,7 +17369,7 @@ in
   jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
-  slack-dark = self.slack.override { darkMode = true; };
+  slack-dark = pkgs.slack.override { darkMode = true; };
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 

From b5360ce722fe2b4d2a2613406a58867a78776518 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 5 Dec 2018 14:50:35 +0100
Subject: [PATCH 1401/2793] govers: 20150109 -> 20160623

---
 pkgs/development/tools/govers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 440b5e2eb0b..152b619966c 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "govers-${version}";
-  version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
+  version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
   goPackagePath = "github.com/rogpeppe/govers";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/rogpeppe/govers";
-    sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
+    sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn";
   };
 
   dontRenameImports = true;

From 3064dd19063b1dbc41b779660296509042f4823f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 5 Dec 2018 14:50:54 +0100
Subject: [PATCH 1402/2793] gox: 0.4.0 -> 20181025

We need the latest gox to support the latest go releases better.
Unfortunately the author doesn't seem interesting in making new releases
(1y already since the last release).
---
 pkgs/development/tools/gox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 69b20dd3a17..b28bf24892c 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "gox-${version}";
-  version = "0.4.0";
+  version = "20181025";
 
   goPackagePath = "github.com/mitchellh/gox";
 
   src = fetchFromGitHub {
     owner = "mitchellh";
     repo = "gox";
-    rev = "v${version}";
-    sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
+    rev = "9cc487598128d0963ff9dcc51176e722788ec645";
+    sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6";
   };
 
   goDeps = ./deps.nix;

From c8091a8995f7817037bc8844929a890e09c4b435 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 4 Dec 2018 21:55:53 +0100
Subject: [PATCH 1403/2793] vault: 0.11.5 -> 1.0.0

---
 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 84c35bd36a6..ac79fc8d464 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.11.5";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
+    sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From b47d83f793c3662764bc990da2d58ec59101188f Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 5 Dec 2018 12:22:41 +0100
Subject: [PATCH 1404/2793] leela-zero: init at 0.16

---
 pkgs/games/leela-zero/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/games/leela-zero/default.nix

diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
new file mode 100644
index 00000000000..c1238b7b3bb
--- /dev/null
+++ b/pkgs/games/leela-zero/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, boost, eigen
+, opencl-headers, ocl-icd, qtbase , zlib }:
+
+stdenv.mkDerivation rec {
+  name = "leela-zero-${version}";
+  version = "0.16";
+
+  src = fetchFromGitHub {
+    owner = "gcp";
+    repo = "leela-zero";
+    rev = "v${version}";
+    sha256 = "1px7wqvlv414gklzgrmppp8wzc2mkskinm1p75j4snbqr8qpbn5s";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ boost opencl-headers ocl-icd qtbase zlib ];
+
+  nativeBuildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Go engine modeled after AlphaGo Zero";
+    homepage    = https://github.com/gcp/leela-zero;
+    license     = licenses.gpl3;
+    maintainers = [ maintainers.averelld ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec30ddd8ae7..f6fb7d2f2e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20523,6 +20523,8 @@ in
 
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
+  leela-zero = libsForQt5.callPackage ../games/leela-zero { };
+
   lgogdownloader = callPackage ../games/lgogdownloader { };
 
   liberal-crime-squad = callPackage ../games/liberal-crime-squad { };

From e814fba3168703eed6e2b67200299ea40beca418 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 09:27:34 -0500
Subject: [PATCH 1405/2793] scala: 2.12.7 -> 2.12.8

---
 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 2d6c060e89e..ce863ef9c91 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.7";
+  name = "scala-2.12.8";
 
   src = fetchurl {
     url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn";
+    sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 6dc9347712ca32c5c11b0b19ed43bea8d362ddf6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 15:18:27 +0000
Subject: [PATCH 1406/2793] weechat: fix bad merge

Identified in https://github.com/NixOS/nixpkgs/pull/44102/commits/8887e1f697d9e13ad277ca7d7054bc42c2459548#r239097413.

9504292b1e9948fb286b1b1cdbe83f66b367b64d accidentally reverted all the
changes that had been made to the weechat wrapper since
8887e1f697d9e13ad277ca7d7054bc42c2459548.

I removed the wrapper, then wrote it again, but this time taking the
code from the latest version of weechat before the bad merge.
---
 .../networking/irc/weechat/wrapper.nix        | 83 ++++++++++++-------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index 5c557a8fd24..1e371bb8e22 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,4 +1,5 @@
-{ pythonPackages, perl, runCommand, lib, writeScriptBin, stdenv
+{ stdenv, lib, runCommand, writeScriptBin, buildEnv
+, pythonPackages, perl, perlPackages
 }:
 
 weechat:
@@ -10,31 +11,37 @@ let
 
   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"
+          '';
+          withPackages = pkgsFun: (perl // {
+            extraEnv = ''
+              ${perl.extraEnv}
+              export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
+            '';
+          });
+        };
+        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
@@ -43,14 +50,30 @@ let
       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;
+    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};${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 ${lib.escapeShellArg init}
+    '') // {
+      inherit (weechat) name meta;
+      unwrapped = weechat;
+    };
+  in buildEnv {
+    name = "weechat-bin-env-${weechat.version}";
+    paths = [
+      (mkWeechat "weechat")
+      (mkWeechat "weechat-headless")
+    ];
     meta = weechat.meta;
   };
 

From 5205aaa65540346cbdd1c49acc9a477db7818e13 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Wed, 5 Dec 2018 15:15:45 +0000
Subject: [PATCH 1407/2793] qmltermwidget: add missing utmp lib on darwin

---
 pkgs/development/libraries/qmltermwidget/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 79ed37dd2a9..26386e0c42c 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
   };
 
-  buildInputs = [ qtbase qtquick1 qtmultimedia ];
+  buildInputs = [ qtbase qtquick1 qtmultimedia ]
+                ++ stdenv.lib.optional stdenv.isDarwin utmp;
   nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A QML port of qtermwidget";
     homepage = https://github.com/Swordfish90/qmltermwidget;
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd360..02fbe56a8d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11852,7 +11852,9 @@ with pkgs;
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
-    qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
+    qmltermwidget = callPackage ../development/libraries/qmltermwidget {
+      inherit (darwin.apple_sdk.libs) utmp;
+    };
     qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };
 
     qscintilla = callPackage ../development/libraries/qscintilla {

From 703827f36cc65b137eed4d759b31827d29733072 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 13:34:58 +0000
Subject: [PATCH 1408/2793] nginx: 1.14.1 -> 1.14.2

---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index e69d9e61eb9..f4cb22a38f6 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.14.1";
-  sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz";
+  version = "1.14.2";
+  sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80";
 })

From a9d153633e15a38a661be91f81cfbd22d0c49be6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 5 Dec 2018 03:43:29 +0000
Subject: [PATCH 1409/2793] cyrus_sasl: remove old patch

it was removed with "cyrus_sasl: 2.1.26 -> 2.1.27" https://github.com/NixOS/nixpkgs/commit/b13af1e87b26a3ee7d81c4b237710a93e1f243e8
but reappeared in broken "Merge staging-next into staging" https://github.com/NixOS/nixpkgs/commit/9b81c7e455c278a45db0f6c21d7e16bb0ff9bf37
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 0cf52238fe3..4344923f694 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
     ./cyrus-sasl-ac-try-run-fix.patch
-    (fetchpatch {
-      name = "CVE-2013-4122.patch";
-      url = "mirror://sourceforge/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
-      sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
-    })
   ] ++ lib.optional stdenv.isFreeBSD (
       fetchurl {
         url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";

From 47f54a48bdbbbff6f3c4e20f4fb1b8e764d132b8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 5 Dec 2018 12:05:17 -0500
Subject: [PATCH 1410/2793] pythonPackages.parsimonious: 0.7.0 -> 0.8.1

---
 .../python-modules/parsimonious/default.nix       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix
index 13fabd4cbf9..69e6d1d2bb2 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@@ -1,22 +1,21 @@
 { stdenv
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , nose
 , six
 }:
 
 buildPythonPackage rec {
-  version = "0.7.0";
+  version = "0.8.1";
   pname = "parsimonious";
 
-  src = fetchFromGitHub {
-    repo = "parsimonious";
-    owner = "erikrose";
-    rev = version;
-    sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b";
   };
 
-  propagatedBuildInputs = [ nose six ];
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ six ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/erikrose/parsimonious";

From ee1613aea656119a872c3e75334e8469c27fff44 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 5 Dec 2018 18:13:08 +0100
Subject: [PATCH 1411/2793] nextcloud: 14.0.3 -> 14.0.4

---
 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 3f6fed1e0a0..ecd3a5e5c9b 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.3";
+  version = "14.0.4";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p";
+    sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag";
   };
 
   patches = [ (fetchpatch {

From 963b113a3531f892e68de0064620039d48c90b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 5 Dec 2018 19:01:15 +0100
Subject: [PATCH 1412/2793] soapyrtlsdr: init at 0.2.5

---
 .../applications/misc/soapyrtlsdr/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/soapyrtlsdr/default.nix

diff --git a/pkgs/applications/misc/soapyrtlsdr/default.nix b/pkgs/applications/misc/soapyrtlsdr/default.nix
new file mode 100644
index 00000000000..c62cb88e495
--- /dev/null
+++ b/pkgs/applications/misc/soapyrtlsdr/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, rtl-sdr, soapysdr
+} :
+
+let
+  version = "0.2.5";
+
+in stdenv.mkDerivation {
+  name = "soapyrtlsdr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyRTLSDR";
+    rev = "soapy-rtlsdr-${version}";
+    sha256 = "1wyghfqq3vcbjn5w06h5ik62m6555inrlkyrsnk2r78865xilkv3";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ rtl-sdr soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyRTLSDR;
+    description = "SoapySDR plugin for RTL-SDR devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ragge ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca..ea789d0c1b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12388,10 +12388,13 @@ in
       soapybladerf
       soapyhackrf
       soapyremote
+      soapyrtlsdr
       soapyuhd
     ];
   };
 
+  soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { };
+
   soapyuhd = callPackage ../applications/misc/soapyuhd { };
 
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };

From 93ba7aa8c560905638b9425599204e9f94bef387 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 13:48:18 -0500
Subject: [PATCH 1413/2793] tradcpp: improved aarch64 support

---
 pkgs/development/tools/tradcpp/aarch64.patch | 12 ++++++++++++
 pkgs/development/tools/tradcpp/default.nix   |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/tradcpp/aarch64.patch

diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/development/tools/tradcpp/aarch64.patch
new file mode 100644
index 00000000000..ef7ad9828ac
--- /dev/null
+++ b/pkgs/development/tools/tradcpp/aarch64.patch
@@ -0,0 +1,12 @@
+diff a/config.h b/config.h
+--- a/config.h
++++ b/config.h
+@@ -124,6 +124,8 @@
+ #define CONFIG_CPU "__ppc64__"
+ #elif defined(__ARM__)
+ #define CONFIG_CPU "__ARM__"
++#elif defined(__aarch64__)
++#define CONFIG_CPU "__aarch64__"
+ #else
+ /* let it go */
+ #endif
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix
index 64a97ad0087..7f395174bb4 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/pkgs/development/tools/tradcpp/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation {
   # tradcpp only comes with BSD-make Makefile; the patch adds configure support
   buildInputs = [ autoconf ];
   preConfigure = "autoconf";
-  patches = [ ./tradcpp-configure.patch ];
+  patches = [
+    ./tradcpp-configure.patch
+    ./aarch64.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "A traditional (K&R-style) C macro preprocessor";

From 0b8574540b8691924a8dac6dc4d03004d8b25efa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 5 Dec 2018 12:51:44 -0600
Subject: [PATCH 1414/2793] stdenv/darwin: fix portable libsystem hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.
---
 pkgs/stdenv/darwin/portable-libsystem.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
index 27ae790fb5a..f50ccc8d32e 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -5,6 +5,8 @@
 fixupOutputHooks+=('fixLibsystemRefs $prefix')
 
 fixLibsystemRefs() {
-  find "$1/bin" \
-    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  if [ -d "$1/bin" ]; then
+      find "$1/bin" -exec \
+        install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  fi
 }

From 7a00e80329b5ff9673f6a2282f98db7903af7d3f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 2 Dec 2018 14:26:53 -0600
Subject: [PATCH 1415/2793] =?UTF-8?q?ghc:=20don=E2=80=99t=20add=20libiconv?=
 =?UTF-8?q?=20automatically?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ghc needs it to fail to correctly detect it for later.
---
 doc/stdenv.xml                                  | 17 +++++++++++++++++
 pkgs/development/compilers/ghc/8.2.2.nix        |  3 +++
 pkgs/development/compilers/ghc/8.4.4.nix        |  3 +++
 pkgs/development/compilers/ghc/8.6.1.nix        |  3 +++
 pkgs/development/compilers/ghc/8.6.2.nix        |  3 +++
 pkgs/development/compilers/ghc/head.nix         |  3 +++
 .../libraries/gettext/gettext-setup-hook.sh     |  2 +-
 .../libraries/libiconv/setup-hook.sh            |  6 ++++--
 8 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 26190debc29..4ef89991d2f 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2525,6 +2525,23 @@ addEnvHooks "$hostOffset" myBashFunction
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term>
+      libiconv, libintl
+     </term>
+     <listitem>
+       <para>
+	 A few libraries automatically add to
+	 <literal>NIX_LDFLAGS</literal> their library, making their
+	 symbols automatically available to the linker. This includes
+	 libiconv and libintl (gettext). This is done to provide
+	 compatibility between GNU Linux, where libiconv and libintl
+	 are bundled in, and other systems where that might not be the
+	 case. Sometimes, this behavior is not desired. To disable
+	 this behavior, set <literal>dontAddExtraLibs</literal>.
+       </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term>
       cmake
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 3ecea2b54ed..3b9fecd55e1 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -206,6 +206,9 @@ stdenv.mkDerivation (rec {
     "--disable-large-address-space"
   ];
 
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 1ea18149d1e..4db5c07b460 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -186,6 +186,9 @@ stdenv.mkDerivation (rec {
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 434570fe988..5710c60338a 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix
index 85853e15832..914d6ae08fa 100644
--- a/pkgs/development/compilers/ghc/8.6.2.nix
+++ b/pkgs/development/compilers/ghc/8.6.2.nix
@@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 29de668767b..42119682892 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -149,6 +149,9 @@ stdenv.mkDerivation (rec {
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+  dontAddExtraLibs = true;
+
   nativeBuildInputs = [
     perl autoconf automake m4 python3
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
index 0a6bc0dd253..ad3763c29b6 100644
--- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh
+++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
@@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
 
 # libintl must be listed in load flags on non-Glibc
 # it doesn't hurt to have it in Glibc either though
-if [ ! -z "@gettextNeedsLdflags@" ]; then
+if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
     # See pkgs/build-support/setup-hooks/role.bash
     getHostRole
     export NIX_${role_pre}LDFLAGS+=" -lintl"
diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh
index d20e94513e2..f89361a6299 100644
--- a/pkgs/development/libraries/libiconv/setup-hook.sh
+++ b/pkgs/development/libraries/libiconv/setup-hook.sh
@@ -2,5 +2,7 @@
 # it doesn't hurt to have it in Glibc either though
 
 # See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-export NIX_${role_pre}LDFLAGS+=" -liconv"
+if [ -z "$dontAddExtraLibs" ]; then
+    getHostRole
+    export NIX_${role_pre}LDFLAGS+=" -liconv"
+fi

From 73a87b57a620fb7408e32da18a3983b794e63cfc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 3 Dec 2018 09:35:21 -0600
Subject: [PATCH 1416/2793] gimp: fix on darwin

Fixes #41071
---
 pkgs/applications/graphics/gimp/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 201ebf7b298..4d835e6590e 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -3,7 +3,7 @@
 , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
 , harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr
-, AppKit, Cocoa, gtk-mac-integration }:
+, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }:
 
 let
   inherit (python2Packages) pygtk wrapPython python;
@@ -23,8 +23,11 @@ in stdenv.mkDerivation rec {
     freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
     libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
     python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    # cf-private is needed to get some things not in swift-corefoundation.
+    # For instance _OBJC_CLASS_$_NSArray is missing.
+    AppKit Cocoa gtk-mac-integration-gtk2 cf-private
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
 
   pythonPath = [ pygtk ];
 
@@ -69,7 +72,9 @@ in stdenv.mkDerivation rec {
     "--with-icc-directory=/var/run/current-system/sw/share/color/icc"
   ];
 
-  doCheck = true;
+  # on Darwin,
+  # test-eevl.c:64:36: error: initializer element is not a compile-time constant
+  doCheck = !stdenv.isDarwin;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..698812c52d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17050,6 +17050,7 @@ with pkgs;
     lcms = lcms2;
     inherit (gnome3) gexiv2;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
+    inherit (darwin) cf-private;
   };
 
   gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {

From c88337c9aca9d91804da7d1d05960c88e17455c9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 4 Dec 2018 12:18:06 -0500
Subject: [PATCH 1417/2793] dockerTools.buildImage: support using a layered
 image in fromImage

Docker images used to be, essentially, a linked list of layers. Each
layer would have a tarball and a json document pointing to its parent,
and the image pointed to the top layer:

    imageA  ----> layerA
                    |
                    v
                  layerB
                    |
                    v
                  layerC

The current image spec changed this format to where the Image defined
the order and set of layers:

    imageA  ---> layerA
            |--> layerB
            `--> layerC

For backwards compatibility, docker produces images which follow both
specs: layers point to parents, and images also point to the entire
list:

    imageA  ---> layerA
            |      |
            |      v
            |--> layerB
            |      |
            |      v
            `--> layerC

This is nice for tooling which supported the older version and never
updated to support the newer format.

Our `buildImage` code only supported the old version, so in order for
`buildImage` to properly generate an image based on another image
with `fromImage`, the parent image's layers must fully support the old
mechanism.

This is not a problem in general, but is a problem with
`buildLayeredImage`.

`buildLayeredImage` creates images with newer image spec, because
individual store paths don't have a guaranteed parent layer. Including
a specific parent ID in the layer's json makes the output less likely
to cache hit when published or pulled.

This means until now, `buildLayeredImage` could not be the input to
`buildImage`.

The changes in this PR change `buildImage` to only use the layer's
manifest when locating parent IDs. This does break buildImage on
extremely old Docker images, though I do wonder how many of these
exist.

This work has been sponsored by Target.
---
 nixos/tests/docker-tools.nix           |  4 +++
 pkgs/build-support/docker/default.nix  | 46 +++++++++++++++++---------
 pkgs/build-support/docker/examples.nix | 19 +++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 360b32faae7..ecd14b274eb 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -62,5 +62,9 @@ import ./make-test.nix ({ pkgs, ... }: {
       # 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}");
+
+      # Ensure building an image on top of a layered Docker images work
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
+      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
     '';
 })
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 890f64a9d3b..f16cb7cec13 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -188,22 +188,27 @@ rec {
         # Use the name and tag to get the parent ID field.
         parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
                    < image/repositories)
+
+        cat ./image/manifest.json  | jq -r '.[0].Layers | .[]' > layer-list
+      else
+        touch layer-list
       fi
 
       # Unpack all of the parent layers into the image.
       lowerdir=""
-      while [[ -n "$parentID" ]]; do
-        echo "Unpacking layer $parentID"
-        mkdir -p image/$parentID/layer
-        tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
-        rm image/$parentID/layer.tar
+      extractionID=0
+      for layerTar in $(cat layer-list); do
+        echo "Unpacking layer $layerTar"
+        extractionID=$((extractionID + 1))
 
-        find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
+        mkdir -p image/$extractionID/layer
+        tar -C image/$extractionID/layer -xpf $layerTar
+        rm $layerTar
+
+        find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
 
         # Get the next lower directory and continue the loop.
-        lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
-        parentID=$(cat image/$parentID/json \
-                  | (jshon -e parent -u 2>/dev/null || true))
+        lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
       done
 
       mkdir work
@@ -673,6 +678,9 @@ rec {
         if [[ -n "$fromImage" ]]; then
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
+
+          cat ./image/manifest.json  | jq -r '.[0].Layers | .[]' > layer-list
+
           # Do not import the base image configuration and manifest
           chmod a+w image image/*.json
           rm -f image/*.json
@@ -690,6 +698,8 @@ rec {
           for l in image/*/layer.tar; do
             ls_tar $l >> baseFiles
           done
+        else
+          touch layer-list
         fi
 
         chmod -R ug+rw image
@@ -742,17 +752,23 @@ rec {
         # Use the temp folder we've been working on to create a new image.
         mv temp image/$layerID
 
+        # Add the new layer ID to the beginning of the layer list
+        (
+          # originally this used `sed -i "1i$layerID" layer-list`, but
+          # would fail if layer-list was completely empty.
+          echo "$layerID/layer.tar"
+          cat layer-list
+        ) | ${pkgs.moreutils}/bin/sponge layer-list
+
         # Create image json and image manifest
         imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
         manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
-        currentID=$layerID
-        while [[ -n "$currentID" ]]; do
-          layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
+
+        for layerTar in $(cat ./layer-list); do
+          layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
           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\"] + .")
-
-          currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
+          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
         done
 
         imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 003e7429a81..090bfafa085 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -156,5 +156,24 @@ rec {
     name = "layered-image";
     tag = "latest";
     config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+    contents = [ pkgs.hello pkgs.bash pkgs.coreutils ];
+  };
+
+  # 11. Create an image on top of a layered image
+  layered-on-top = pkgs.dockerTools.buildImage {
+    name = "layered-on-top";
+    tag = "latest";
+    fromImage = layered-image;
+    extraCommands = ''
+      mkdir ./example-output
+      chmod 777 ./example-output
+    '';
+    config = {
+      Env = [ "PATH=${pkgs.coreutils}/bin/" ];
+      WorkingDir = "/example-output";
+      Cmd = [
+        "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo"
+      ];
+    };
   };
 }

From d014e767be9960faad5deb2353542d6174d09ff1 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 5 Dec 2018 15:52:14 +0100
Subject: [PATCH 1418/2793] grafana: 5.3.4 -> 5.4.0

---
 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 eaa21fcd0a5..45bb96cd4c7 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.3.4";
+  version = "5.4.0";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1fhzdkd1hr7l9cy7c9r03pgaxklfgj09q21ljrahqr006gcn1wgn";
+    sha256 = "090p8j0ddgpc6pz7ax2nz5d196xfhdmgxirszcpkgx2rkidndxlv";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "06andnnnsh68lmra9gc85rsmyx88cwlq2kwzks1d5axpy2mq5arv";
+    sha256 = "06ysq5njlnb9d5x4jchxlk6zmy2ahb9njnj6n3fblpjzdbkjlcgp";
   };
 
   postPatch = ''

From 60eff0eecb308e4a38c4db76e20f0f49fd7f2715 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 5 Dec 2018 19:21:36 +0100
Subject: [PATCH 1419/2793] nixos/grafana: use new default for connMaxLifetime

---
 nixos/modules/services/monitoring/grafana.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index c0c16a429d8..5fb3e377122 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -169,8 +169,9 @@ in {
           Sets the maximum amount of time (in seconds) a connection may be reused.
           For MySQL this setting should be shorter than the `wait_timeout' variable.
         '';
-        default = 14400;
-        type = types.int;
+        default = "unlimited";
+        example = 14400;
+        type = types.either types.int (types.enum [ "unlimited" ]);
       };
     };
 

From d2b467a2de7212b078fb970c70675c55da5038e3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 5 Dec 2018 18:40:06 +0100
Subject: [PATCH 1420/2793] rWrapper: use runCommand, local build only

This seems more appropriate for a wrapper generator.
---
 pkgs/development/r-modules/wrapper.nix | 36 ++++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index d77c24e913d..76e819501a5 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -1,25 +1,21 @@
-{ stdenv, R, makeWrapper, recommendedPackages, packages }:
+{ runCommand, R, makeWrapper, recommendedPackages, packages }:
 
-stdenv.mkDerivation {
-  name = R.name + "-wrapper";
+runCommand (R.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
+  buildInputs = [R] ++ recommendedPackages ++ packages;
+
+  nativeBuildInputs = [makeWrapper];
 
   # Make the list of recommended R packages accessible to other packages such as rpy2
-  passthru.recommendedPackages = recommendedPackages;
-
-  unpackPhase = ":";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cd ${R}/bin
-    for exe in *; do
-      makeWrapper ${R}/bin/$exe $out/bin/$exe \
-        --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
-    done
-  '';
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
+  passthru = { inherit recommendedPackages; };
 }
+''
+mkdir -p $out/bin
+cd ${R}/bin
+for exe in *; do
+  makeWrapper ${R}/bin/$exe $out/bin/$exe \
+    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
+done
+''

From 21d83e5b1164d1ddac5989168b1501354420b560 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 5 Dec 2018 19:04:04 +0100
Subject: [PATCH 1421/2793] rstudioWrapper: use runCommand, local build only

This seems more appropriate for a wrapper generator.
---
 .../development/r-modules/wrapper-rstudio.nix | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 8ad3a103c93..5cbedf403d2 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -1,15 +1,15 @@
-{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
+{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
 
 let
-  qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}";
+  qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";
 in
-stdenv.mkDerivation rec {
+runCommand (rstudio.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  name = rstudio.name + "-wrapper";
+  nativeBuildInputs = [makeWrapper];
 
-  buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages;
-
-  unpackPhase = ":";
+  buildInputs = [R rstudio] ++ recommendedPackages ++ packages;
 
   # rWrapper points R to a specific set of packages by using a wrapper
   # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets
@@ -20,18 +20,14 @@ stdenv.mkDerivation rec {
   # into an R file (fixLibsR) which achieves the same effect, then
   # uses R_PROFILE_USER to load this code at startup in RStudio.
   fixLibsR = "fix_libs.R";
-  installPhase = ''
-    mkdir $out
-    echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR}
-    echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR}
-    echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
-    echo -n "\"))" >> $out/${fixLibsR}
-    echo >> $out/${fixLibsR}
-    makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \
-      --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins    
-  '';
-  
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
 }
+''
+mkdir $out
+echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
+echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
+echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR
+echo -n "\"))" >> $out/$fixLibsR
+echo >> $out/$fixLibsR
+makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/$fixLibsR \
+  --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+''

From 0325f01d31a973d2fce530917b06dfc132a68f87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 02:31:16 +0100
Subject: [PATCH 1422/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-5-g7b287a8 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/47cd70c536559082de97f5343bd4d412fcaf4c3f.
---
 .../haskell-modules/hackage-packages.nix      | 279 +++++++++++++-----
 1 file changed, 199 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c85cc3a422c..4c2673589ae 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7240,8 +7240,8 @@ self: {
      }:
      mkDerivation {
        pname = "HCL";
-       version = "1.7";
-       sha256 = "0f61kj9c58s06w882zxmv0s5yc0zxh3f5nx7gnx2dx8p7d3f4y34";
+       version = "1.7.1";
+       sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -15289,8 +15289,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, hspec }:
      mkDerivation {
        pname = "RLP";
-       version = "1.0.0";
-       sha256 = "15m872ys5jzn21psqccgz24f5zchvj5hcz1kll18v0pivh2c4hd0";
+       version = "1.0.1";
+       sha256 = "0xxhd2whz8q3zxrk37pwbhjayfhq9dv89068q0qlfwwg6aby0k6s";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
@@ -21619,6 +21619,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "advent-of-code-api" = callPackage
+    ({ mkDerivation, base, containers, curl, deepseq, directory
+     , filepath, finite-typelits, mtl, taggy, text, time, uri-encode
+     }:
+     mkDerivation {
+       pname = "advent-of-code-api";
+       version = "0.1.0.0";
+       sha256 = "15dn78scm0hj1dqcd4xm4gmdvbmjd7afkrh64pnwfbldy74smfxy";
+       libraryHaskellDepends = [
+         base containers curl deepseq directory filepath finite-typelits mtl
+         taggy text time uri-encode
+       ];
+       description = "Advent of Code REST API bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aern2-mp" = callPackage
     ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
      , mixed-types-num, QuickCheck, regex-tdfa, rounded
@@ -28533,8 +28549,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbor-monad-metric";
-       version = "0.0.2";
-       sha256 = "0c8734nf8zgkwqgjphdqb0fa6p3qvc6cj0n16k22v8ri5ziyha76";
+       version = "0.0.4";
+       sha256 = "1g5d5a0lcx255002a02i0zc987pyimhm34h0vrbqaibapbp98yi0";
        libraryHaskellDepends = [
          base containers generic-lens lens mtl resourcet stm transformers
        ];
@@ -28542,28 +28558,31 @@ self: {
          arbor-datadog base bytestring containers generic-lens hedgehog
          hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
        ];
+       description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
     ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
-     , bytestring, containers, generic-lens, hedgehog, hspec
-     , hw-hspec-hedgehog, lens, mtl, network, resourcet, stm, text
-     , transformers
+     , bytestring, containers, exceptions, fast-logger, generic-lens
+     , hedgehog, hspec, hw-hspec-hedgehog, lens, monad-logger, mtl
+     , network, resourcet, stm, text, transformers
      }:
      mkDerivation {
        pname = "arbor-monad-metric-datadog";
-       version = "0.0.1";
-       sha256 = "0padn66j6hxpndnakkd1hvf2jkhab1djr20c2hvp1m9kim5c3cz9";
+       version = "0.0.3";
+       sha256 = "0dqidvn3nblnnnsiq0zqhg3d9b09bv1ksnrfyyibyi75mhvx3d3r";
        libraryHaskellDepends = [
          arbor-datadog arbor-monad-metric base bytestring containers
          generic-lens lens mtl network resourcet stm text transformers
        ];
        testHaskellDepends = [
          arbor-datadog arbor-monad-metric base bytestring containers
-         generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network
-         resourcet stm text transformers
+         exceptions fast-logger generic-lens hedgehog hspec
+         hw-hspec-hedgehog lens monad-logger mtl network resourcet stm text
+         transformers
        ];
+       description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -32730,8 +32749,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.50";
-       sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr";
+       version = "0.5.51";
+       sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33589,6 +33608,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base64-bytestring_1_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , HUnit, QuickCheck, split, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "base64-bytestring";
+       version = "1.0.0.2";
+       sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring containers HUnit QuickCheck split test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq
+       ];
+       description = "Fast base64 encoding and decoding for ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base64-bytestring-type" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty
@@ -39562,7 +39603,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_42" = callPackage
+  "brick_0_42_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
      , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
@@ -39570,8 +39611,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.42";
-       sha256 = "1hrfw10zy1450slj79d432zi6wiy11jr1ciz3xh0fx27zns4yqyy";
+       version = "0.42.1";
+       sha256 = "1ckisdvq0n5j35abz8as36jhp872yp3vjyxq1wbpf4lc1bnplw8k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45570,6 +45611,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "chan_0_0_4_1" = callPackage
+    ({ mkDerivation, async, base, stm }:
+     mkDerivation {
+       pname = "chan";
+       version = "0.0.4.1";
+       sha256 = "1ks74njh8fj9dh8qhydwjyqdx8lrdj5fif455cxfshvdbwhcnvwj";
+       libraryHaskellDepends = [ async base stm ];
+       testHaskellDepends = [ async base stm ];
+       description = "Some extra kit for Chans";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chan-split" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -67501,14 +67555,15 @@ self: {
      }) {};
 
   "drmaa" = callPackage
-    ({ mkDerivation, base, directory, drmaa, inline-c }:
+    ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }:
      mkDerivation {
        pname = "drmaa";
-       version = "0.2.0";
-       sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6";
-       libraryHaskellDepends = [ base directory inline-c ];
+       version = "0.3.0";
+       sha256 = "1x1r3m1gqikm6n5m006zy3c9z106qa4ykl7qa90pa29wg03475z5";
+       libraryHaskellDepends = [ base directory exceptions ];
        librarySystemDepends = [ drmaa ];
-       description = "A minimal Haskell bindings to DRMAA C library";
+       libraryToolDepends = [ c2hs ];
+       description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {drmaa = null;};
@@ -85653,8 +85708,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ghcjs-perch";
-       version = "0.3.3.2";
-       sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7";
+       version = "0.3.3.3";
+       sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
@@ -101200,8 +101255,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.8.2";
-       sha256 = "1scd87ivzmrf8ar44wkijcgpr40c996dvq5rx1py2bxw0zdd1ibq";
+       version = "0.8.4";
+       sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite entropy hashable memory mtl murmur3 network
@@ -101210,7 +101265,7 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
-         safe split string-conversions text vector
+         safe split string-conversions text unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
@@ -101322,8 +101377,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.9.0";
-       sha256 = "0351kjfykh94lpf6kpdw18vzpdn13k0zak99n72hl2ybpy8d1yk6";
+       version = "0.9.1";
+       sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102039,6 +102094,8 @@ self: {
        pname = "hasmin";
        version = "1.0.2.1";
        sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
+       revision = "1";
+       editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104305,6 +104362,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_10_9" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
+     , resource-pool, scanner, stm, test-framework, test-framework-hunit
+     , text, time, tls, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.10.9";
+       sha256 = "0y64h61w78pn3yn2hi3q41bbp5zwjlycjz2w23x6sh2w5b2xphw3";
+       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 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -127341,8 +127423,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "3.0.0";
-       sha256 = "1ryk896kg2bs0w430zsg235h861nf43qn9hl1r285dh53jgj6mnw";
+       version = "3.0.1";
+       sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132344,7 +132426,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-puppet_1_4_1" = callPackage
+  "language-puppet_1_4_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -132358,8 +132440,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.4.1";
-       sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66";
+       version = "1.4.2";
+       sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -139204,8 +139286,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.0.1";
-       sha256 = "0rswd308ngrl2ii13j2pl09cddh6pycm7skiyilsk54j395wy2ky";
+       version = "0.5.0.2";
+       sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -141827,15 +141909,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_2_4_1" = callPackage
+  "massiv_0_2_5_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.4.1";
-       sha256 = "198xik64fw3n4wk3gy1rrxl2l3jwzn8b8h1yskg71mlvpv598lwk";
+       version = "0.2.5.0";
+       sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq ghc-prim primitive
          vector
@@ -141903,6 +141985,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matchable" = callPackage
+    ({ mkDerivation, base, containers, doctest, doctest-discover, Glob
+     , hashable, hspec, tagged, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "matchable";
+       version = "0.1.1.1";
+       sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53";
+       libraryHaskellDepends = [
+         base containers hashable tagged unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers doctest doctest-discover Glob hashable hspec tagged
+         unordered-containers vector
+       ];
+       description = "A type class for Matchable Functors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matcher" = callPackage
     ({ mkDerivation, base, base-prelude, profunctors, success, text
      , transformers
@@ -142262,30 +142363,31 @@ self: {
   "matterhorn" = callPackage
     ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat
      , brick, brick-skylighting, bytestring, cheapskate, checkers
-     , config-ini, connection, containers, directory, filepath, gitrev
-     , hashable, Hclip, mattermost-api, mattermost-api-qc
-     , microlens-platform, mtl, process, quickcheck-text, random
-     , semigroups, skylighting-core, stm, stm-delay, strict
-     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, text-zipper, time, timezone-olson
-     , timezone-series, transformers, Unique, unix, unordered-containers
-     , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
+     , config-ini, connection, containers, data-clist, directory
+     , filepath, gitrev, hashable, Hclip, mattermost-api
+     , mattermost-api-qc, microlens-platform, mtl, process
+     , quickcheck-text, random, semigroups, skylighting-core, stm
+     , stm-delay, strict, string-conversions, tasty, tasty-hunit
+     , tasty-quickcheck, temporary, text, text-zipper, time
+     , timezone-olson, timezone-series, transformers, Unique, unix
+     , unordered-containers, utf8-string, uuid, vector, vty, word-wrap
+     , xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.0.0";
-       sha256 = "07zbkkbn5cn8rcbc0xznlldcflhfp4szx6phlh7xpgf2hrcyc3g6";
+       version = "50200.1.0";
+       sha256 = "02rwxq42my7347p1wb0jh50z1m6fqkifgxg2hd2vrxiwzblyz0qc";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aspell-pipe async base base-compat brick brick-skylighting
-         bytestring cheapskate config-ini connection containers directory
-         filepath gitrev hashable Hclip mattermost-api microlens-platform
-         mtl process random semigroups skylighting-core stm stm-delay strict
-         temporary text text-zipper time timezone-olson timezone-series
-         transformers unix unordered-containers utf8-string uuid vector vty
-         word-wrap xdg-basedir
+         bytestring cheapskate config-ini connection containers data-clist
+         directory filepath gitrev hashable Hclip mattermost-api
+         microlens-platform mtl process random semigroups skylighting-core
+         stm stm-delay strict temporary text text-zipper time timezone-olson
+         timezone-series transformers unix unordered-containers utf8-string
+         uuid vector vty word-wrap xdg-basedir
        ];
        testHaskellDepends = [
          base base-compat brick bytestring cheapskate checkers config-ini
@@ -142310,8 +142412,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "50200.0.1";
-       sha256 = "1snb51nw71cqjxanaf443dixz8b8vk99a8a4b1yya1xvikvdxf7c";
+       version = "50200.1.0";
+       sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142335,8 +142437,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "50200.0.1";
-       sha256 = "02ashys70857a5s7zx26zx6vdlybsdk9bil2bqawfkf6xcjhwq13";
+       version = "50200.1.0";
+       sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -153897,8 +153999,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.6.1";
-       sha256 = "1nzhfarz42b6arqndynp4zp4sq87g8ya9xh3zpyhsw8a3wz5idr0";
+       version = "1.6.2";
+       sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -153913,8 +154015,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.3.2.0";
-       sha256 = "12c1g6712v8m6mnysiq9pm5g4178vmrxq3j4v50fm02njj4rdpnb";
+       version = "0.3.3.0";
+       sha256 = "06bi9vzq8alb4wylmq9npisnnpsc0r96srbmq68hmy6pjrva6rlg";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -159564,6 +159666,8 @@ self: {
        pname = "pandoc";
        version = "2.5";
        sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm";
+       revision = "1";
+       editedCabalFile = "15jzrlf1qnn3qkzy1zk5f300y7748qdz8yk0zg0zy7ygi36b403v";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -183267,19 +183371,19 @@ self: {
   "ron" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , containers, criterion, data-default, deepseq, Diff, directory
-     , errors, extra, filepath, hashable, mtl, network-info, safe
-     , stringsearch, template-haskell, text, time, unordered-containers
+     , errors, extra, filepath, hashable, hedn, mtl, network-info, safe
+     , template-haskell, text, time, transformers, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "ron";
-       version = "0.2";
-       sha256 = "1dv1lfz9v31k817cby0252jy08sd9c01l1jrlhqf243w25a6zp41";
+       version = "0.3";
+       sha256 = "09mpv535rahaclj5yppzkg4n083d0rpqkr3r2zrmj1ywg5nw5h0i";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring containers data-default
-         deepseq Diff directory errors extra filepath hashable mtl
-         network-info safe stringsearch template-haskell text time
-         unordered-containers vector
+         Diff directory errors extra filepath hashable hedn mtl network-info
+         safe template-haskell text time transformers unordered-containers
+         vector
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "RON, RON-RDT, and RON-Schema";
@@ -184039,8 +184143,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.2.17";
-       sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm";
+       version = "0.2.36";
+       sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190423,6 +190527,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ruby_0_9_0_0" = callPackage
+    ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
+     , text
+     }:
+     mkDerivation {
+       pname = "servant-ruby";
+       version = "0.9.0.0";
+       sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-scotty" = callPackage
     ({ mkDerivation, aeson, base, http-types, scotty, servant
      , servant-response, text, transformers
@@ -192047,8 +192166,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.17.2";
-       sha256 = "1wl837d89b0zl0fzhh51y718p9dv99qid0gr3rkqyvbvhayj5dcm";
+       version = "0.17.3";
+       sha256 = "0k0r44csgrlw9y80m88npvanw5ddqm634799qjiab39gvbd3p6kw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -202729,15 +202848,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_28_0" = callPackage
+  "stratosphere_0_28_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.28.0";
-       sha256 = "1rb138h9w34qvdjc3zddz4gm169ddiv690cwq0mpbfwv28v6j1fg";
+       version = "0.28.1";
+       sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -232363,8 +232482,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.29";
-       sha256 = "136sqbfcwp1l7ynmmayihar25qa5kn04axy4mwzf7a6nc5b3zzxf";
+       version = "0.29.1";
+       sha256 = "0q8ssd51r1bdm6rr5frlq0v00c4af8xgc3zgs4sa23yy3yf9gzrm";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"

From 8e11a25d5f58bc40d90578f767140ae3bff3beaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 20:38:08 +0100
Subject: [PATCH 1423/2793] haskell-brick: update override for the new version

---
 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 53776037f2b..94ac1244ffa 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_42;
+  brick = self.brick_0_42_1;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From db6aeeae56e11fbe899e6d329203422cad77c51b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 20:45:32 +0100
Subject: [PATCH 1424/2793] haskell-json-autotype: disable the test suite to
 fix the build

---
 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 82542e6ac02..0d0eee11d5c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1195,4 +1195,7 @@ self: super: {
   # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
   xmobar = dontCheck super.xmobar;
 
+  # https://github.com/mgajda/json-autotype/issues/25
+  json-autotype = dontCheck super.json-autotype;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 8fbbee18d3a4c52ef6796e6a45be14fd81c3bbc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 21:39:27 +0100
Subject: [PATCH 1425/2793] all-cabal-hashes: update to Hackage at
 2018-12-05T19:25: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 6024bdc1ad7..893ad997c11 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/95366a34cd5c9b47444ac819562fff2f23d7d753.tar.gz";
-  sha256 = "184qrgb7jl1s79v4z1jz9ywihilf60jh93xhwf0n75vnxb4ibnfd";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz";
+  sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax";
 }

From 70bd091f1610d9e405df9749c3aa69a7b93be8b0 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Wed, 5 Dec 2018 22:00:40 +0100
Subject: [PATCH 1426/2793] tigervnc: 1.8.0pre2017041 -> 1.9.0

---
 pkgs/tools/admin/tigervnc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 69f6e056b73..317646501ca 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -11,14 +11,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.8.0pre20170419";
+  version = "1.9.0";
   name = "tigervnc-${version}";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    sha256 = "1y3fn7dwlkm7ilqn8bwyqj3bw7s7clnv7d4jml4wyvfihzz9j90b";
-    rev = "v1.7.90";
+    rev = "v1.9.0";
+    sha256 = "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x";
   };
 
   inherit fontDirectories;
@@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
         --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
         --with-xkb-bin-directory=${xorg.xkbcomp}/bin \
         --with-xkb-output=$out/share/X11/xkb/compiled
-    make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
+    make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
     popd
   '';
 
   postInstall = ''
     pushd unix/xserver/hw/vnc
-    make TIGERVNC_SRCDIR=`pwd`/../.. install
+    make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install
     popd
     rm -f $out/lib/xorg/protocol.txt
 

From f5e664f805b143cd2a85bedfd28177089c062d1f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 5 Dec 2018 16:12:48 -0500
Subject: [PATCH 1427/2793] opensans-ttf: change source to salsa, rename to
 open-sans

---
 pkgs/data/fonts/open-sans/default.nix    | 33 ++++++++++++++++++++++++
 pkgs/data/fonts/opensans-ttf/default.nix | 27 -------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 +-
 4 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/data/fonts/open-sans/default.nix
 delete mode 100644 pkgs/data/fonts/opensans-ttf/default.nix

diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix
new file mode 100644
index 00000000000..d8918a6567b
--- /dev/null
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitLab }:
+
+stdenv.mkDerivation rec {
+  pname = "open-sans";
+  version = "1.11";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "fonts-team";
+    repo = "fonts-open-sans";
+    rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
+    sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open Sans fonts";
+    longDescription = ''
+      Open Sans is a humanist sans serif typeface designed by Steve Matteson,
+      Type Director of Ascender Corp.
+    '';
+    homepage = https://www.opensans.com;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.worldofpeace ];
+  };
+}
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
deleted file mode 100644
index 6f3762c971c..00000000000
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchzip}:
-
-fetchzip {
-  name = "opensans-ttf-20140617";
-
-  url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
-
-  postFetch = ''
-    tar -xzf $downloadedFile
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
-  '';
-
-  sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf";
-
-  meta = {
-    description = "Open Sans fonts";
-    longDescription = ''
-      Open Sans is a humanist sans serif typeface designed by Steve Matteson,
-      Type Director of Ascender Corp.
-    '';
-    homepage = https://en.wikipedia.org/wiki/Open_Sans;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 02971c5dcff..e33d9bccafb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -209,6 +209,7 @@ mapAliases ({
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
   openjpeg_2_1 = openjpeg_2; # added 2018-10-25
+  opensans-ttf = open-sans; # added 2018-12-04
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed542982..28861078fb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15487,7 +15487,7 @@ with pkgs;
 
   open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
 
-  opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
+  open-sans = callPackage ../data/fonts/open-sans { };
 
   orbitron = callPackage ../data/fonts/orbitron { };
 

From 7c251741548c23ca7f8765a267faefecb0f2ce13 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 2 Nov 2018 02:39:00 +0100
Subject: [PATCH 1428/2793] tzdata: 2018e -> 2018g

Notable changes:
  - Morocco switched to permanent +01 on 2018-10-27
  - Volgograd moved from +03 to +04 on 2018-10-28
  - Fiji ends DST 2019-01-13, not 2019-01-20
  - Most of Chile changes DST dates, effective 2019-04-06

tzdata: fetch over https
---
 pkgs/data/misc/tzdata/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0f790f78f19..59079b28efc 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2018e";
+  version = "2018g";
 
   srcs =
     [ (fetchurl {
-        url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b";
+        url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
+        sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2";
       })
       (fetchurl {
-        url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a";
+        url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
+        sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa";
       })
     ];
 

From 851a52983b6a44a868604879f291c2da367c1e59 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 6 Dec 2018 01:02:52 +0300
Subject: [PATCH 1429/2793] yed: 3.18.1.1 -> 3.18.2

---
 pkgs/applications/graphics/yed/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 9100efc8639..7267e9bc485 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, requireFile, makeWrapper, unzip, jre }:
+{ stdenv, fetchzip, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.18.1.1";
+  version = "3.18.2";
 
-  src = requireFile {
-    name = "${name}.zip";
-    url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y";
+  src = fetchzip {
+    url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
+    sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy";
   };
 
-  nativeBuildInputs = [ unzip makeWrapper ];
+  nativeBuildInputs = [ makeWrapper unzip ];
 
   installPhase = ''
     mkdir -p $out/yed

From db8002cdf1856173182f9418588157bd7cb3d3cf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 5 Dec 2018 21:06:04 +0000
Subject: [PATCH 1430/2793] firefox-devedition-bin: 64.0b10 -> 65.0b1

---
 .../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 345082392a8..20da9410999 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 = "64.0b10";
+  version = "65.0b1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ach/firefox-65.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3c3cef4660704180ee6a64266f476624db76887eec8b76fe38ee35d18305a19a3f73b4800fb02bf769f766edf28e86813a49a5190fac035dd20f996de39469e2";
+      sha512 = "cda7c4c170db4b718493259e67b266851211754de4edda61957b1fd8d5491e3a0e2c17728d101e13ca03a999d2794f65b62798840103675a7e1e1ca76885f6e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/af/firefox-65.0b1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "afe36e12ad85d036d98051d9a978770ca9a31e362c85a269a2e6ff9f69d0700084aa316200f15755811d0f80bc2182a7e56cbb208575805622ba9e3e4f775c69";
+      sha512 = "695a5ccfb932bbd6a2d2257969076ad458e21b62ca3222b6614d63543bd71459bb133e53b88366915e2f874ae7490b80efec7682ff174a3e19d4827e3b73de3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/an/firefox-65.0b1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "13fe8f2f15502429177e5f214ef80a4b7d696d3b5e67e1e0c4fe86d42ea99e462513a3058086533ceda0df6aa2a8e291021e3b1f669bf091e7a7fda1bf00d176";
+      sha512 = "457ed14f27a2a502baea9d46a7b4b7e0fbdae13d90a84549d238a4fce62486f120ca61ebb137b33fa5df72d1b86d38bc27882a2055f6fd7c2d6d48976f476153";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ar/firefox-65.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9a8365b82a1d40333354774e562d7f67dd2992c6435f33c74a7aa4a119516bda257e70090805e17bdbb142901c213e50f6b964f3ee91473c480a9d1f89fbea4a";
+      sha512 = "b859161c50a0e038912c7428cd8a0996d85dad299149caa1f97d8f9380e93395358c71f900b9dbde3061dc30f5a5dc1071e34981ea9678eb53a84a9498c5e7c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/as/firefox-65.0b1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "1fcd7356cd69b408bab3c6aafb581b011ea4e0057571965df0d07e6a4a014c9c388f601fb071afe1247e8b2a060509a158a82fb3c454510fada1a0112e1f0c13";
+      sha512 = "576f0ade4da85f351937cc71bd87020a917b1d6eaf82a406a5b657872e08d4b3120e42941a40b8625e248860888a2c197b0bf0a0ac97f07ea2ec7b26c302f7a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ast/firefox-65.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e739b3fc62c05e87a9af900d2a62b12c591a382aa6029d70d09db3a2e9fa426ac424c3ce7a9e770a147fcb94e041484b334d4f1e9a912f329d2002bb8cca8fda";
+      sha512 = "75504d6c5c990db69e10ddc99f8b5d464eddf45adde7607d7957b3c85979cb8f30a5476eb7a5ce1cd6d13d71c77c4951dbcb047492af5c2774f303787a872006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/az/firefox-65.0b1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d7087037755b1dbdb347d397f0db9c4efb93c2ea858365dd5fc6598689890b62d5e8a969484d0d746be23598a5152d463893a49c89efc84ff4a870f41899bd0e";
+      sha512 = "d89073193e0a4ac3d34313acea7debd4a4fef6947c0f8aac2f6f27518465ea7700c9cfe4b2f8d5873e22cc8e474e3f14267863aaf005b42313ecb5e7e7bae306";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/be/firefox-65.0b1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9e50627425631d7c3f93cf176a157b45f23ce36c82f11139a4959f9d6b467d30ffe75b3aa62984be67d202fce9afe90685b76e2acf1a8300d82cc14654ad783c";
+      sha512 = "cec23816cb37ba0a61a82c2667bd78fc546268e1cce79a81c311676ef2c5afed56021775bb93980abbe3f2af7509320d24618dccc5fedeb6afe05966f2a5da31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bg/firefox-65.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "da8a76df26d0f4a252316e493f2fff8b3739b8c058628a9a9b0a618cb2e1d0b335df8a69fcc6a871d4ff570f9729359ee5172cbdffb21fb1c02d7ebca1846b14";
+      sha512 = "3e791bfe134304a1dd25fffa6c4fae90bf3e8132e9a09eb15560b5a98d490cb7338c2edff625a1710339df1899122a18ab9f5154c3b9b387acae22dd4c864b86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-BD/firefox-65.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "0f92c035bd9faa18f33abe421f4e2fc839a7e26b879bb1d9816f20551a186e2dfe362519049a52799908118c42c051a2a317a3aa38695e491df2a08562d58009";
+      sha512 = "6305b0774042bd1b5e06e2aa261fe9fad21d484c79ef157d9e95b655301f4f847247006e933c090602f1bc5a5228178998f8f59fec598b44f12ff64c1689f763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-IN/firefox-65.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6f7bc819220cff36b267c8c9a16565c732ff6507e08559d154657ff6ada926d6fcdbbc85bec11592bc039a9cc668ec6771427fd1d9dea49d88d630adc20c6f63";
+      sha512 = "ba3d09a95797ea28a13366ef743eff2fc55686d507ee9f8bc73f451efc4cae00e7d53c52b1d24e83b44a7d025a9c4222bd7935143f5b47d3f7ed909775fc719b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/br/firefox-65.0b1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "701b4086ef0162555c7837179d398367e782b51a414ca8895cfe3c652c7dd021b0258249883c0219dad7398d875974a6f3567df48ffe2b54b84416c6a7297cbf";
+      sha512 = "7e4f20e12e014a842eaa9f77e701466e00af93015c27be529e69673a87df2cd0f8b22dab0e006038ddf32f2cb4bcd2f7f6c64709c252580dba22ba538db1c744";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bs/firefox-65.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "f4669fdc026f7e348b086fff93d67be4c42dfc144d353c0673c9f72164db4857f61ff0a3eefd358f5459149378847dd761574f187861651261c76734d97145c0";
+      sha512 = "106e874f0127ec73a92fce3733b200bd052c4205c6698044b82d60e42a042b1c5e5b71e9352e8ce0b470cc8c9bc39c28b2166654bb0729c966e1f44b5daf7207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ca/firefox-65.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "17d6ef735aa464dc3fc77dda76d79fcc843f853be062824b431069609e4b0f86258533a14e995d5b98c77d09c4dc0d0627093df0f8cfd2f2f6f9de443bba1870";
+      sha512 = "4615f72786085295e131437972c39382bffa4584e3829253795d9bc961df97cf87edc8e9ea1218914f444d1041819f8235b36e116abb2aa5867fd65c3284d76e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cak/firefox-65.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f6c75d0e67fe581360d1e32eab18fc2f5beb51581a9fc70cb926d972744c58d6e2b49f23a05ba2b8beb03b89a5553d96ab4c1774ef7568c9819f8a8837949cd6";
+      sha512 = "acfbd95d08214f103dab546cf5087194d004e24a4163d41c82bb127d0c94375fbffc8c8ade0757f3e624fd2aac8fc9fa6519a6cf1b355c203afd5270847192f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cs/firefox-65.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "d51ac21807c945edd1e86b21bc06b0763687ba0573b0155e1c1f4c51767db36a17ed3f28223ed22b45ded1d1153bd8bb295e046598c7e1e54733e035d9630c72";
+      sha512 = "c60bbeb2fb880eae5115f317dc30573adb6917eff8d49364b2ed34ef821b90f17d275b77cfeb2c081a80f4cdbeb1ac0e02c920cee1aaa45ddba855861f0955d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cy/firefox-65.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "678951cdf8efffb874203fb72df7c935f43547233bb0dd6285e777bc682ef3c0dc1af11f55b01726a70fdabe906f70e4cb2b574ab01f848a02295b4e97e88b11";
+      sha512 = "5e5e90de26b784d81f5b68674714e8d14ff347b039e9664137ba8d94523d3f0c0fb0e0112b5961a56874aa6bbf30b4d3e7884bc46c9ab5818cd6aaac36047243";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/da/firefox-65.0b1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e3183b137019761a30a32bddcb4842f8e6eeb55d9a32e58b7ecb1ee9048fe3ac983180ba2aa61bb53edf8d60bb56003cc536699747a9d00f77328ecf100a4ea6";
+      sha512 = "66ae41f79975e00ad845b93f50fdd2d4eb8d11186ecc7dc786de856e47f44ab8fad6b5149a9ae8ca9ecc2b4020c92c07f7cae12ef0d9363184ac0e189c8650f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/de/firefox-65.0b1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "189177c81f2fb31dc89aaf195c8b0d8dba1b14361b447a77f8da94d1d9f57a086779cb54282f9f37a50f230eda26ef8c07690c75abce03468f80c786f7a24013";
+      sha512 = "37697c4868bd4b8e8becdc9ad8c6385a1b46bb9a09d35c2a56d99464de2def74ebb533a5914bf1689f778164e30be836ea0c88e1361f3f4028f02294f8248e28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/dsb/firefox-65.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9daf6db9091846f6c290d8dce3ac2f847e958305942d9c240bc81cff2c127e0d5be9c715fd13a30f7afb052f3c755705801eda8b3e0457cc2aeca3c687b257ad";
+      sha512 = "e40cafc2e024af7265b6ffa6a8be0f16862b1f1eb7a001f3710b501fdd92dabdff78f1f0abff3d537bf9ab266a988c7892e87dae074d00430522fb64bccdc31a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/el/firefox-65.0b1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "717de9d12655e306e8e494dca88901263d658556004b058948e008b66bac2cbf30f838ca26e90f0e65f7ede96d3d22931bbe36bcd33008236b3d9ca255d373d0";
+      sha512 = "0f678f8a5a34072e0530c2086e749a696a88e23c0981b2ea0664865b3b127954a1121e026dcf403aef03e3d00ad76a0f95c98677cd5a89c95216e0659fdcbbd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-CA/firefox-65.0b1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "a4f75e5501f63a7194e3d9a830d722baafe3fa1c0e592181e186cc810cc623ec1e7039e756d577fb7c82b7f6f8d0c8941a5ce36d07f291c8fa57c16e312d1b80";
+      sha512 = "3c60f3542444c61846d94d0116b8478269fb347b57c1cb000274988c6adab1a19c22d7e8050d005a35df16943ad3efbcdd99bd9a7bf7b767886472f110bea20f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-GB/firefox-65.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "a739f826dceeb48c248098e94617e72565a0603dfb02b6cd2efb104f1151a81dbb3021f3bf302a582f8e5257dee6246251f6c67c5539bcb4a6fc64d20f058d94";
+      sha512 = "e623be71b1c54f833d6dce20ad2ec8a5c51d5222f67550a8e4e5811d432d710f74bb8e7e3c3b6fd7e5bc6830ceb7392b28923885b232b1d642277c06e41a3fd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-US/firefox-65.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3caee27ebcfb58a62c27bc6625e260a0a3c8e9d8ee410ac44a91ef32e3c6da2c9df36f95775ea13e8e40a4b682934a6c1f0c93adabf4bfd7452bed66792a30b9";
+      sha512 = "da2205be3e9d672bf34e1055ee9a5eac461fd5172d2cb2dc9ba9eecab94e7559b6399eb904b2cc3483758cf3658f7b2554484e328491951632d81dcbfd84821a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-ZA/firefox-65.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ce0830bf8fd3d16e02eac457c5e9f4832e40595d663d12c7d3f91a92b33c81ce0546881cb01f11381a6b7b548cbd1a64b87d884885cd0e641922e91491ca4b62";
+      sha512 = "4aeccb63a94809737155f85a9e83c15b8df49b3c28dddd7db547079b46f15b7a5eedef75881ac32337097175193b38bd7de3e47f30dd18b56f1ff31bb6d33aa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eo/firefox-65.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "9db1efc26b2ece68803f9286ac6410541dd54bbcd94776f289d7af4d2f2ca31e1124344fecb4af6e22051f692f77e0ef9c39a8ff0aa39eec445fbd8365430ba6";
+      sha512 = "d7984116570d78194c6820342f591ec17eebe9ba6abc6e81f34d8810a24329b236cc37a705e3df8acda8eba4d1627d4a2970e794de6bd6ef76fbf9e57028230e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-AR/firefox-65.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b216931ebaf590b04cbac239b9613d6af24f33b60c75ee36f344eb93c34e9a2087e06cc249ea1315fcc0bfca1c1e465b788ef1a82a6c9cc17035cc70a94ef8b8";
+      sha512 = "b4e9d60707d70e94f2e4f1ed5d6a0994e431793c01c7d492afe72f5674a14bfe1524df6cc0d2a4e20897a5baf76b51e037fa96554f460a375eb281634001e518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-CL/firefox-65.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "d4ec8ac2d765d8267aeab062a21185fe6a31228c00f2bf35fe4ee653a4fceb0f96cdeeff83c4b122976f1487a9159ea40689130fa9a9467f2b4a926c6db52258";
+      sha512 = "2b8bc684e2f45f44f293a891b11d4d9bc0b43c55c12e6186d045ae0a6c618d1f96109680320506e913ad5425b19e22ad3004afb3b11dcadd7fe44133f4a40cec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-ES/firefox-65.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "06a5a80a67217efd9ddc3f78853ab6bacef69398fcba3a6fc354351f4d83287f026a5cef72955c9ecb7b55c61e6de2b5ae40136b422ec6549fe444a91b1745bb";
+      sha512 = "20294f5f5f88b000ddb8c9d9016c85ab49956fa34132b85417356985f14c2e5abeea7d96bb3dc6f636ab2baf68ce55507a6b6444e5b2bf6272344c0664ecf2db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-MX/firefox-65.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dc996ee1f21be35cb2dc7e18740c0657a126984d58a4bde84b67a3c28baaa22a0395124f71e06eb352e0218335ba2872bf5ffdf35588245bea55daf82ad6cdae";
+      sha512 = "c8b66a1198dd6975a372fc5667b2d9bf38313096dee2a5c34ccd2ce775cb09bb38f6ed6f28a9834d636745e23534f994380250ab594d6e1d366c75dc1cad1501";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/et/firefox-65.0b1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2c597a1802e45b3091396169c6f07404aeae7107d45188c8f3e8c214a316cd7e38c1b0cf06216b1882ca088222d1d00ecff84216ab3b545f644343049fd6868e";
+      sha512 = "51bf60f606e202e641b1bd49b34412df1c3a33139b16771748aa9a8fb1cf6a8ceb2d09f2be9abd485cfdbdb6b6aafb01c762d9a05aab442eb5f86df936a731c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eu/firefox-65.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "881d03053e21bf2024c8c0bc4737b5f9415c0cd5e07331c8aec0c958094d1b423f34c0abcf1a73ce794e0b5c3cbce343c7decbf4af812d90ec0dd7ea0f338a4a";
+      sha512 = "92ac8a65623dbce8730627a2eb83104ecb91114db18813630aecd22144f79a3cff7e1a44910259d40006115150ccf0a64e2f300b9d7b5093c54af43fb4403953";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fa/firefox-65.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "2c185e7622308de487fe2bbe20cf2ee4c923c00d7824d0d61050cf0cbf23d6fbaecb8ebab25fd978f6db89bc7c3f45eb91003088a4f827870d21303ba79d374d";
+      sha512 = "49201d2a1788e8a8916a8caa95bd350b6b157f410735f3ae33c6a2d3648b47590d72b6ea5a49e6080f6593687a1531d7ec2aa0dee820960be52ec56d3517aacd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ff/firefox-65.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b3f814dc04c57b15942ef08028111b19289ef77f48ff43a730c5840d3beca8ef1755185ffc54c8a0895ef7d734626162be73392899a2a08cec9cd6cbdebe78b3";
+      sha512 = "ad097eb38f73cb79451a753ddbd2cf68a2871ecd37b16d2e2d2b58463631d6bceb5bb301c4a0cea85cd207a87e5447c3b8029e0fc8a0b0114186a562b7f4ceca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fi/firefox-65.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1f728b5631fc2825f62f2af62c6dbd9e4bd5caf2079c476d6524c9033f2c397e734bd627e816cce25289565152221cb78ccd449650327c60ff9243096aee52f3";
+      sha512 = "151d9f2bcda0e74a9a12eb27e5f550ae082a98092db4c7fd3537993783cc623149a5abcde16a9221b1c91fc968d6b84a0d0bcde1f170705cd5054a4bbe3dfb92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fr/firefox-65.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "038fc084b4f5e6c8817706a32ffbf9025555e4c37f530e8601ef4d72bd55f3f48f57f8b7efa5e1c825a89382a4e9fb15db54e24c88bd569e96d297855e4c339f";
+      sha512 = "54ff2685bce6f1972b096c87e287ad3d612c0b7244e418344f0bedd72da2f69eceb0b913094e928668a3d750999213e2a5977a4362a6cbff7b78589cd5c9ca23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fy-NL/firefox-65.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "be74cbd160b366844e2fa955a4cd4beefb0d58ca4fd11fc40d8419df74653e29ee1e142f7e0d5bb970b90e0ef436b1bd4dc9e2b1d02db921bfc6f9f7d72242f8";
+      sha512 = "c6d1e3f27a96486c0797eb1f5bf6936f6543456e31d56d0019879513e1c06511bca297ccfe76936ba0a550daca15521238c468aefe38e93a8f56d4e8f0fa049f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ga-IE/firefox-65.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "2e84652e80ea69b90aec87abeb14aa9d0188fc598b536c74c31c7d3dd63909a73a9395e221c51088b489465fc97139693e55a1a9f926f676d50caed4e7818878";
+      sha512 = "22454e0f678e2905c55fd312e0d3a2be18e0ce9664bf6f6b3588bd63b9ca7452e532640a631f9721fb54aaa063975ac82b4b07caed139f44db9835c521ea38c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gd/firefox-65.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ed4799c7d68da7bfd663aa38c913f71bc3efcedd1f0363120d6fce1ceda0e3f0d9ffa8520681a563b6ded466c2fc80b695598be51316799752d528cbd0d6a174";
+      sha512 = "7b11d439f5b8fa1bf5709d147abb3d1bb98a00a6573f4784a95ecc900b9a1a8942c9a06a227b9a3c11ef086b597ffd41314d07b7b3392a574c5d6043d1548d0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gl/firefox-65.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9500394c6b8e65a6dcdbe8aaf76293b182a05b12f9d40b72f7c04e1c202665a15e80fbf306ab1e78cd0f8db0d308f2ced89bc7c4e5951416d23e662296b23cce";
+      sha512 = "dfba4673003970e16be3b9c3cd729969c780403955f4c16d73b3b7f1360f6b30d91e59e8f5ba5088cb557dabac3349a8a6d8dd67af50814b5968312a7b694946";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gn/firefox-65.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cd11501f541e0aef2e40b4162f388e283028b0a08cfb4a3eac4f4f6ba18093f857fb9df4258a4e6f3a687d9df7ac04981b863537c1ad8eae0a05c8aae99629fd";
+      sha512 = "adc62b0f457a981d8bec415c3812f904bce32086289a344d6f1f66fd4d9820b7a05358c10e039a16ce7a85dbf18a437aca880b53e83380c5159c5d4339399792";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gu-IN/firefox-65.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ad5f1954ab5a6a64023cafc47b7606d5692c062ea280832637f2d127c8e8ff04238abadfa40cbedd11c432aa7291b0aa5118ec63e6a0f3da5084b268989cf2cb";
+      sha512 = "92ef72ea19e9202d5712278ea4fcd24f1fa24fa8c9adbe7468e2205d9464fb39488c32c6ee90731cddde9fa581dbc79e31df734a05489abec0be5fc8b99f831e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/he/firefox-65.0b1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c8c29b03246cd65ebc621468d728682e7a901554073ce3969ae26f404cd6c6ddbf31a1e5848a24141f4e0b2163bf21f03ef0b5fd6450b8fb87e9a9312bad45f3";
+      sha512 = "1760e4810ee267ebb1105873b8a6b273cba7973537d59d82c1199a3a719c910e0b98e101bc4609dfd9b26856816ac7079d771403f51f01262672d534456e30d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hi-IN/firefox-65.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "8a9932f2fab24222955fb8d203d5deab727cd90cdaaff0e6081fa9f8501db5e9f3476a108bd4a277e0cf3527385dafee9463ddc72ea1dae34a44a5523a3d7507";
+      sha512 = "51c28e5c04fe4cecd9e9f8aee5debeccb3d85cee0dc0c495e5a114c677d7c9110cfdf601be947f25b127a33caba24094bdf80fa8bbc76c659ea56271f321ceb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hr/firefox-65.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "03877fac5e6eb31257bed35dfd041d29879077b0a316bc9a0343e3d8981a2153e7287ab1edc31273c60a0fa04fb7725477ee0bad19cdaeea8cf36c7fdf64b291";
+      sha512 = "0b270dfec2f9a7ef6a616f14929b230d8414239d00f690ab2e6966b6b8dd7aad2af9a70e2d764d70773dc7bc7591de7fef00bf07a44d9398ac65768c84269bf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hsb/firefox-65.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7fe05656c72ae73020e250c0b6f4a04987871d3711469efc592432d258fb12156d215b8a9837bbe3b34f82e0b8e514647e6da54d4c91af6400fe41515cf49512";
+      sha512 = "0b51c0e6ebc7beb81a4fc57966e91f02accd5abe6b8ca4ab67b2d51798efb51797b26b17bcc28cd9200430c0415d9f9c506c35d2035497e4038f4ff97af7de5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hu/firefox-65.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "20aadbaf391fa747261abf9f799bc466a99b0cd790cc79a31f4df901b1cc283d52389a5dbefb7c0f0cb46dac5536cb87ef1f510a11cd0ab40cc65998575457b9";
+      sha512 = "193a5e7eb8065ce4c17cf18ef3a268b00a7d1a0394761c8c22fc88ccb20abfac20dfed8cf32c9e128cb6a67af54c5519a48b789674ee0e24f05fec50a7428b8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hy-AM/firefox-65.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "25a50d09cb463a8d74753d0339bee2650d47730964a57e564ae658c2f2f393c05da368afffe2a1f9040d946b3aa57c973133c5c4e0de1d4685d0965e176a96bd";
+      sha512 = "78d87eb8c49b5e2df1d09ca8a31bf07f8e8e0bf0004ea0dd8d185f3412489fe66d2501e1feef51f788ae4c5c77e53255cc7adb15f0f5e20d0eb55fdf4a762fc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ia/firefox-65.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "b47ba7414bf0667beee177b7fb5de0bd950aba7ce567cfbec628279cf9ac208431869e2c517b0dae4ada1ee93ac78601588b82d66febf5ba27deede92f1cd478";
+      sha512 = "8653cafcb6b64abc2c6ed62487ad75331b236c6610bff79934d44882407fa1abd4b85fc53667ea14db4099626088cfd798aca495ec89c8a5bf14768e13ea7f81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/id/firefox-65.0b1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2450045d7289a0952a62092f2563ab7bc250d996b11e94c5f7df0abc4bc7bcf34817d504627f29e951282f065e94f468214c4fb691c263d9db6ec14280ac0131";
+      sha512 = "eb601d0e7aae1e322db14b9e769ee67331c2df0dba34d92693e50b6e0978e2a65c1fac06c1a28e2375d18618c0f582c45e5d9a82335e9e1d603d4dfcc7abb1e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/is/firefox-65.0b1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "320fdc1373cb4838471beed72cfb03dd0268d5d629ee0cf77ccfd1bc39572b32f572bfc82a3a4e3cf174577a307c13c334cb182ec311c5e33e9ec7db158f1650";
+      sha512 = "7a30389aa58df903d804916e0915179e3f19923c8e1fa153c168eacf7ea80a0321222dca15f7b65f329ee247da5d13c2f320397e4cfdc74f694ff9e2f851c9cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/it/firefox-65.0b1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d57c06ca6454cdfd637ccb1f08b2da5635ff6879f4eb6c7d1780b7bd11109f1bf8408208b0f36754eb7809a480567126a356c8fae2b18b1b9856011ef3097cbd";
+      sha512 = "07559c0d26c17a16a54dbd255e7c92ab4503baf618c101de66fc3b4dc98f6ac36910bec5bde6d875c2d7d11afb213a9e2a3952a612219ae7c2a2be2b81bae597";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ja/firefox-65.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ba93cfc2cad76d2c3c223c238b549ec9501c4e7387d756d3de5ecb35a6f03685cabb21ab31467270063c9ac74e905e5b08ea77f994451efde7590348de9fd959";
+      sha512 = "ec626a9457822197c8cf01f0376990f2e27f8beb23d25d5667234a7c891642b9a7fabb5eae6add31856a1cd52dd1d71056a05ef8991bb4ed8f84ab41aca5a308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ka/firefox-65.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f42243d7503c0d587638ff7008b81dd2fe4080be0b2aef6a9dbaceb3c49cbb13bcb6d5da1d5415371b38491dad81fa0ce48bdb624a2542927078284b9952d683";
+      sha512 = "f1a8149f87b741597bc626e81ee4cab7780ad61675c967680f1826ea1bbb55609afccb337f05291544fe2b330dfdb67c3a6bc20dfe6caa32272270a646eda6a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kab/firefox-65.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "92e0f22b3eb3c2e18f5f3a7eee6d9dc80da3851981b58db98a4fcee8693f7f4388159502e3a1497c2e8af4106284a09c7f074a1813219aac4c23a22520648300";
+      sha512 = "82ac700a061935fc14a705b859d6f7fc985141f61b79ee41860a47396197f59b96b78e15340b376eebf61f3c7d47ab4293334e05c920b72f6aa8db63dc0cca85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kk/firefox-65.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2ce861ba5c3cc7a6812cda64ecf6b6ce1c2108a5aeb640efb761f535bd2896826d87d93a39f10cddd088e53733f85d5302ac2e4694faffcd24bf9974b1f96a9d";
+      sha512 = "b26864a7f6734ed518709b4818ecd33318ce7bf2725e593f0dbd6fa5d8e70c70aa6828b8444fd7ab4b622540cab8296d9d10da1a8a14826201c7e878519f4514";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/km/firefox-65.0b1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "f56b968ce2e4cb6ce50f1caae0c2f9216585cd7ed1408cc87f477d76a3489938bc0875d3876f2eb67083db8e3d813a4f7601828a3d8ccd397c13e4f2bd21043c";
+      sha512 = "a3777467d2f8962b598001e62ef9044bd3a1017da6a979fc5d616b8a3da0311cceea4a5d148b32fcf05d01e3d6df4489356291c84c54a97866fc69f8daec79e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kn/firefox-65.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "151416a6d18d9270dd166746242a20c342aa999f3bb9886e171c529d5c1807aa9d11b73e1781ec23ab5c5ab2ba2e1ee5009d1c99f46a8d5a013d542d5f59d4b8";
+      sha512 = "fa92ff8ca90be448c5c8cbde5539561079a78be30826fd5b29c322dea73e94d96acdd1b3e6eb2b13f4571450dc7492f663cbc85d7334db6e2d416a8f0aacedd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ko/firefox-65.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b5218b4e241703cbe8dd153fe0668b0342091f557eefc49e47bf0b492b9adf68aae5f8416ad2f95f2c378315e4fbfa96ed759c22676629a2ef91f2722835619a";
+      sha512 = "6cd537b6f0eb3447bfb61a597e5e20756fb3477eeb21234262d933369e9bec15fa2198d23fe31479f62ab4ad0c458a50394b61da35c1c3d117925c7e449c733e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lij/firefox-65.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4a68a37cff1cbb5cae25f0bc2c153fc6ecec25e99fb5c33242708ca3ffb59f2e5ce8a6c332d1e61a57cb6f1059c5e3e0233d572615a3c1a3d8fa8a2246754e3b";
+      sha512 = "402eb28a107d8023ad2ce2c67e2481c246544d65f6f4a7fb83d19be35cb186e8cbd98d3a01045f74b9734488b72f8687bca5860d0f9b0d29958dcb51537a57ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lt/firefox-65.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2536ab847e7429e72924c0841447ce77ad46e597223c7f64805ded1398d0c9e780441cb29d7a27726af37da93fae98eb7f056e14da10e296239e2ed8f784a5c2";
+      sha512 = "f7c0c9fbc3ad6c8f372ccee8f07e5e38e5d13829db76b502b0c373e89cce932766f6ed6efd89482b94db6e9298d2b58d31a758e0038d29a786397f593175abe3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lv/firefox-65.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0e08f49334c0680e13fd0e654211b0cf314381b2cc20283210546f0415293d79e58f139ad2d68cd496598801c984b927a62dfef3da8d6763d122fbb0f7f24063";
+      sha512 = "0bb31dda168b10f78e72c9a0a93ef75df4fd0a1bcb6e541a61b196eefe794016ebd823c299d4612c6a22eff1d269dce4f5f52eda85519d7a649991ec9ef83b5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mai/firefox-65.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "a398f409bf271766e722f1ee08a114521c69a013c418bd9f66fc2c0f9cfa510d38aa9db3fd0451aa59cdeae77a88ff24a31b58d5e7da4f76148fae0670fc2450";
+      sha512 = "a18f3dbf5165bb62c43d6d11796829e4b503dc33188e6e7e765eb06eb6c66d648f4048f0a0561b0bc4e765b63736ee3ec37eb77bc90ad6c2adc73fc5013ceaa2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mk/firefox-65.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4108e9ac76734d5103bb280b290f15f33da8dff1236f94fb5eec56634f38c2db6316fd522a05b01e7cd4afc3472b6baf700e25bfee08c0cc220af98d2b4cad17";
+      sha512 = "c3ff6950da399b4dab29cdf95fd9337a011cbf3da59ae5c131714c88992957aff5c7b49bbe0939b7b4c3dab342ca47573287f998d10a2f69c5174b8ce28575e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ml/firefox-65.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "95e02f1e714eb3377b4c051e5f81add25b3850dec3c6b2f483ed3c5dbd95ca6e12096c3cdab466d988f29a132d6352a059866dfe1911ec5189fc157c9aa38a16";
+      sha512 = "80df4ae299523a64ddbc92ef5cb551884eb34b60b6650abb127aec01780c14aa34c8687fb5061d7415a70a322e3ac4b2898061c42d7b658b216e226e2ded36a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mr/firefox-65.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9166a1ce2a937cf36cb6f045de32eb9d4866fc52606f457fb94364eb538b1d9dbb010e91d7888568cd99c71d6eef9f293842e7a5ae86f9967a83960ccf420ec9";
+      sha512 = "194e9601e59652fb7150a6ed38abfe8aedd8255ce3c7619a8544ff0a8808955cb31353f2f07e5608364d5ff19ce02341dabfdf1e52ef5fdc13fecd7c47019faa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ms/firefox-65.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8b5298b78e0ff4e62101b5d7487dab830da78cb7029a71807cf75c68e50ca0f2f377b6b57cd4f7d47d08c615aee8e204e98dec0e5e7c73947004d971750d7962";
+      sha512 = "ec924c815278196fe447c92e149dfb6c7189da4eadae65396e5b7b7db05d0e097654383ae0d5e9e849796b828e677cf54419b1f40a65833bd2533c33cb0fb321";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/my/firefox-65.0b1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "9f58f606bddd65ef5d55d0bc051be063c152b3bbedd26677863f7d977e0d6e0e2b0f479f75be9181472d49aa07be504e60bd088306578133597546444cb44c44";
+      sha512 = "3449c107e15a518de1ba8effc31e5503ff9ba50099fc43c6d318119c4f98d8968a710dc8d66ad5e9627a52a45e2f0db24db1a1278eaecbd6bb2fed9c0e605a0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nb-NO/firefox-65.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "525d1f440cdf342e9efa301894257ec0a5e9d13360e7e07b95c9e8e1bbbfe8597892a301c90b8bb4f839bc8fc323baec7ec3f561f6ce90c578936cba01059068";
+      sha512 = "0d4b065236569a477a5d2fc18a910c0d6518adffa8c656a342eb1ef40a3c55dd9fed9fc42c21e955c457a9ad26592cc1795ad2bca055286d839e39de8a364912";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ne-NP/firefox-65.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "58aa6a429698aed87132195a0387360096cf1c6d67c3eccc3d27868337f28d06480232dc4814a48c8015a8186bd3123c00f777cd1af16d1d9463d5d6dce91a6a";
+      sha512 = "6f2f63519ce28e7046337d6d75ae6acefd2081834566d9f8f7c659e4dec3b5f83e61485d12deac40ca1057f4952c6d03a86eefa6be9ef7aaea6986407343757c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nl/firefox-65.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "7c9164d293660a19e85a4a830be97f0b4ee1bfc61103739bb222bde4842d50b5ea881b20e4f28182dc7f8212c370635360ad11c7d0345f2540e519a4e17ddfb3";
+      sha512 = "1a837eca4c23885a997183df9d71652b0401e283ef177b6982810443eabf9d91e2d50f5b51844f2409a028aab8091cfe79c10d45f884b15ba4f79aefe01e856f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nn-NO/firefox-65.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a2bc6f7396ff0aa813400ac2f3fc853857d1b5be02ab221d81ae8409360cad67b0b6bcd1b25a6e764e9557227ba93bff8cbca75334715713ad7c27acdaf82a22";
+      sha512 = "1066f0ee39628d9a1dd0112300f8ea4a76d832b1a3acb74fa19a2a022d0e064e7da316ba7b236b353edd2929003c287cfd229ca7921a3bcee77a890771157af9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/oc/firefox-65.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "dd52cb8db97e9b9f64b829b0cda319b572cfb98be8d317412e6f2cd2231402ff603517f9a9525dff5e5da7800d4d5380d8596987d9c46fbeed55b3a60625f33d";
+      sha512 = "9f79b9ea86dd77bc4cf9caaa6571fab2cbe3688a25588fbcc2eecbf3857728dd7b787b8c27ced7b0df6a5750baf390f5ce0fdec7d52dc6cc51352493e8608116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/or/firefox-65.0b1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "afabd283000910637aa1fac59c3f57c033a50fad422d60f3266615b88b5a1c27f526d258516aebf8847e2a461da2447924321258a157f444a6c730f5b34d212c";
+      sha512 = "a27ee9624c3c2997200d54e5ee51e156f654f71e802869f1063e47606d264773896b00890a882ac14481deb9558fe2f478f44cc54b333d820577b90d2a8c328c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pa-IN/firefox-65.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b92bde0e3125cff1474a219af74b8cc48e45835c2d3196f348ba352073e593c2e6ce4ac872a710e62921e9a234b333bbba1da9e0feffd1ad85fa5a78828ae89e";
+      sha512 = "156888812946409904a1b94d11c6cbf17a6a4d76b5b17ebdb70542008375c529d328e2db9a7e473ca724295717890bb88a6ceba00b717ac08d13ead53d37f58e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pl/firefox-65.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f371c37b6ccb97c7e9a6328423788c7de4fd75fb4a94dfb2097fb7246bd7368b3a55418fa6dbede6ca30454b13dcdd8d611f51183e5f319ceb0552a832216597";
+      sha512 = "d0143f6995b0f7500fa603724600777006ea32946b5a43eaea8264cb0cf6a98619cb1ace100ccaa202d600d0b42ad13e3fd698312d8fe2a53abd30b37462294a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-BR/firefox-65.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f7b7296719eaf28b617d7489da2e035ae90db4e3d652c1f001c22e75755cfd2c2b17c362ec2178c1bdc96623cdf7faa0662db3f63bb2cde758d622940e62e1ff";
+      sha512 = "c008136825a58b3af17567dc620454b95e432edace0e65bba11024eb3c6af1137dfd525cc9503aa798472d981d303c2c725c24471cd4b780c8d7db66e6917c4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-PT/firefox-65.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "9833fb8596fab02aca7b884092f3e3834be1e1c3eba78abd51855fe532cb48d61238158286d3ee4fecffbb072b02964605d448a0b63c1cd8801978a7f2a23f79";
+      sha512 = "37009c77c56dbf63ecb86cd96861494ec34a2c30aa4c73638699ee0484c55e9ecf5bcaed7559eb0e39424abaaa178d69932b9a25a50996389105f8defe6833c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/rm/firefox-65.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "cbef477873b088e084d550e11396682945d484247e9802aca2dc5f998aff9091a2e0bda26d91a37cfd866089e06555ec26198b0bd2cbe04e16de8672c39f3109";
+      sha512 = "819ba5cd77f959769906d6a9e6af62db57607cb2f7ec8d1c51231e02f5ffceb82e2198b6c77f362f3a30eea15a5e3cfef6796263d3c997d4f84de1f817a230fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ro/firefox-65.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d32802332224688db99e42678fb777420fdb2f59bf676c40034e3ccbeb91967c4620acb03814835c5f538902d2aefc0d78f6152f62dfb574242511265baa196a";
+      sha512 = "7092b0110429323a9dc8ad6a3f373267f70733d8dfe33f8f6a9e67baf4a6384d52271e5cc410948e9fce12f346eb182907cde5108f28608d8185380e867ad4de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ru/firefox-65.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0c064afd0bb925eb49ea72287d50f979a90968bb43bd870740d01d9e3f9d7456a5043b07d6d850098f89eccea0985d79ef25f7e1d9b81cb33352c588f9dd03d8";
+      sha512 = "7772ed2a4496dcde8039eb2dfe950690995d66fd6beb00733df5f2043d0e399d6078268f04da6397ddd4435cbd25438ef472dbdbc51f8310b2437638fff5907a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/si/firefox-65.0b1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "48707f9682f02d7e9223f9a616b2946811015680b6d303180ae466b5465f1900ee7679cf0e45b9f9c1fec680259dacbc38775f01f294039a973de76415702196";
+      sha512 = "41b66c25bc405233e5f62749b2f2e41092735bed8776a4777a31363ee333d1ea6fae860c854648b775ac07385657bf712319368dbd00374dfcccbd612cd81485";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sk/firefox-65.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c3cf6de7e24fd2eda564a567f9eeb72eb913bf6d9bbcf2fac5ee5d22d550e75583f5ba530b40eb0474abd56799f0f97ce18f684d902bfb6cf906ab07094d81f2";
+      sha512 = "208a550d3bd4695d9e90786cadacc7a268be00eb7ad5827693c6d14a7e755db44de5b07c1e925340a7786553972448a56ddd5f395778f86ad5784d62f9c7e48c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sl/firefox-65.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1e7d596bd8afe38002b9d481ccc21a36e9b48b4b742ce7421097f56881502da5cd8f8a51a92a2d143aee196d6a495e01a782f624151b02878f8c6f9f081ebc52";
+      sha512 = "d2834ffbd907372ab3d91d19a1377a3951501817c859a0cc4c7170ec0f9e51dc819f02f68a1e80c14cae70356957c36670df836bc9552aba15f6c3197b53067e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/son/firefox-65.0b1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "86ccf241981b218569bc6b8df5d9283d3a1f92e690265a4af0580994ec0d415aaa4ae804f4443d3956578ba3dd94a7c7797acdac0d47d805f6b839766a48f233";
+      sha512 = "5b7f646f5a1028636326f0057be5b73a7a9eef69fbf442abc8c786f43e3b531e0d03a7abfb3939d963cd5a5e6f9c04eea763e390143796f45b9a365aed7ef62a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sq/firefox-65.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "81bcc1d4f35d9fd920e7eb1b50ad1f2f2403ddb78b8df1ba553fd02e1c515d78b6dece16c44fd23e95104820c32a841e26e98db53d6f34d03b4775e66832ac03";
+      sha512 = "6ff106a402b0369a2142a71a89b32b9e8d61b8bd1a9b6f07ece984bdff413e5122a5aa013da1af2be450c2aa94ba37cb6b547dcfedc298822ec1c302e14faccf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sr/firefox-65.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1f1f15ed62db5958cdd1c93b3eac914318ec57264351e288ba903bfbc6bd9aeebb2eed9dc1f34418b7ffdbc70b823f8ec75de28e06ae3c3ff43523571847238b";
+      sha512 = "dbc1bb7ae7b82bfefbdf524339500f24afd79910374502cae586d020fec07dcfafe52859a7d117847fd05fe48d353f56eb415227708cd7b2be8ee19840a161ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sv-SE/firefox-65.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "eafe982f5b0d624472b4aae2a64677d3bc6475e815c4ae7e89328381e2869214b14aa11a8cfe2786386bea0dc63f9621346cbdb4b740b90e61490e453ec19803";
+      sha512 = "3092c863530d31119b3ef15f12aa978d7c5ef38b1d1f363a87297fc29368ac2c2cd87a5c19d08c7dc053338f96b69cc741e1fd30324734772c190382ae2a3a12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ta/firefox-65.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "eed9814300fa97d2e7953220af3cb630f46097fe2df65455d5a18341a3c19f316fe1de5fa8da7637a88978eaab2ae87b929f377d97e787e5da6c7daa548085f5";
+      sha512 = "e62b1863e42c3eec15b50355d54cbb7d656f15652e3560406badc61204406fcccc4f965cd6def14730eb9d16695d1e1b58d0618ca1a2693021f6e84b51f221d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/te/firefox-65.0b1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "c6806cb7031fabe3d481964d89fc148375e6572e009737735f08a71887f035b8c77e49ee0b0a28cc6f2e49720db74244fc67198fa3dae5448a1f0c2f6863aba0";
+      sha512 = "9b420f2f422b172730b167ed88d29c91b91f551cddda72de538c7682d15c36742122ae2e995b489688b95deebb7f8d8ba64662c7f4529c845ba454b79097f97e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/th/firefox-65.0b1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "bcf9af67d3f95a99d921142edc3359968b2793e3cb8f6e55d2f8f446005e9cb7fa75789daa9570d2db8252064bf55a48f9714d54bb115c5bec9d0ba107670508";
+      sha512 = "02349edaf181a2453832118d12764925f38db3837a06c212494a6da9d37f05efe5865a8d96f7a30ad1319a67f612ae0ee1113fd281380cab11c21be01218f13c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/tr/firefox-65.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "f40677e2e43401cf5114986768dbff121774e040fb1d4f2db02139a59e9386c15cfef440aa9d7d9b104652e574adae228e738b31cd2d40d78987d78454ef1aff";
+      sha512 = "fc041e81769acd28f4004cc767fcca4f917b529f802d83b93da6a5565dc6f4257deda049883e22534fd29981271521e998f79ab70a6fe88b7ecce4a0dd660708";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uk/firefox-65.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "90f1746c50e6067de269326055c7d65c227ead04b1cff3168536c7071d9933f976d8b9c96e0319d6bfe790f80bc6506b6e554307d51285bc056fc80abcefd93d";
+      sha512 = "fefb644cd87be568ccc161c99e974083241e31f42f6891f8db58a042115253c990070dd2bd12086beb2009bbd27805837126c09b72e7ad4ad2d2f1326bc70e52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ur/firefox-65.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "cd91b30e5f3ecbd7cb42637b1f0fa84013db48cb69449b386abec15d49f240b44a613b73f5ab816da781607f208a43355d1ecab3b0ea43d2b19b50925ccb1738";
+      sha512 = "f426cf7dcb4a62b17d862f9929431bc37cf6de1eeda90547ecac1b989414d1b54f86c96a3a563d123af3d5a6d8647714a28b46398e1523c30fc590822d608e23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uz/firefox-65.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "fc6cc15b1989cee3fbf47acb0c3e81f9e5dc5bc5eadf81ab73fa91adc9729c80dfb82136d0c3caf31188d7f4ae437c837469a960adf18b5edeb918242895631d";
+      sha512 = "2ca8011284ff7e46273ca7943213b4cd5687d7c949159e19ca373bd88b82a46cbb1681bd7834abe5b9dbe54f1b2ac13095109e4050a33e119795a6426af608fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/vi/firefox-65.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "9bf08bb17c5af72edc89cdda215bb22f891bb4014d29b06e40dcc4b18a1b91b03206c138d3259b23edef8a5e31e321b3bb20d440b67c2b536ff97768fdfdad9e";
+      sha512 = "707d3a6872accfe300b067044a3972b56f8bf9fe71910b7e62ec51bddb19b1b6dc8f443fceb6209a09a605202a6dd170790cc3edc8f170ebbdad31e2ec193826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/xh/firefox-65.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a5328e25807a9046268c1f682ef606f5bdd3452014f7f1b037c874c270234b62144cb695f6f381d72e2658f9ff6c50bfad2d501d6d07e4113a3f3c8323bc7498";
+      sha512 = "6fe5e7302094c87a1a3191a1fcff7c6a33c04371104e7f1bf9a2415ce4523865d70c4d134c649ef68e56e3f1a2bd6e2acecf5cc972e01068eddb01c74344b374";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-CN/firefox-65.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "6d08fc1d2712ae44481648e7021aab1b8b56bf6b80915b98c0a577dbe537ec329c819e9fb83c8ece5a76b1cb33787fe8d93cf06229074f7c68c429a836bcfea0";
+      sha512 = "388120ea1215c20166e54b5dc9c56f2ec5aaa5a00181381c66e9849f8bc750c6d201c46d2f5aafdcff3135cac67298ac092e06f2c2c245befefdd5a679d592ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-TW/firefox-65.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "985017e2ed930e45fe7fb6db7df7c36d2f1deefb96f37ce8decdd04d031da9fc1484527ab3fbdd3eec3d47cc828c875223845b0a45552b1a8a12dec7a427b15f";
+      sha512 = "566d1569ab0ba4d209be89b19f40fbdb589d465274d7187156344115f3eba279eee694df5f69ee2c04fcf2446e008d189dc9a0affe36e4e1ed990343d2ace5b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ach/firefox-65.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a7b359f01de7603af3c560b3bfaaf45d754865e0c5e792a5deb861a041dc555d5fe8285b5c50e4d2ac6e124f1922c684d49df00f2a97b622f97f4e50bb3cdccd";
+      sha512 = "3cc0cbb120517187f2780b4845d43748c453804305b4c6e8b62fa0155c2c2d4ff158ad0758d21347ff031173e1830c08d948c0c9d41c14f9eee2985e0c59e881";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/af/firefox-65.0b1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "116531c8814b03a23a524aa7612eaa7061453fc9beb7abc30f85b86dfed4150aa2bbb8bff25fbd759d9b869261619c0c002f2126a0f1cbf237a0c71b46d721b9";
+      sha512 = "eac0829a50117d7c90af59939890ffbbe7cd11f2d67f5cc30787f911598bd83b56cf667c736ec8be69fcfdd5a8c7c282f17ca57c22e1a2b9be17fae25693696b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/an/firefox-65.0b1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b89fed73ebd86a240a8078c402e738e099e4f7ddc6430455dc5035687ae601fe533a0eb3235266dcd3f36fb299456c24fd649321e1a63e417fd492b44b9bd7a5";
+      sha512 = "8b6b20ba62e12b2ce6ab5beb70c01c381fe01711a27658a27ce925e759f308d4a43d1f1744fe8a5f21477d248e4d6e393c56f33e57d808456192693efe79dbb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ar/firefox-65.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c52098d0947f60d8ac47d8b2794ca7eba03d41fb4fc66a31688818d796521367520f0ff57ae567bd3937ceb66420b484a84b25a88a346fc775ffd26f372c88ba";
+      sha512 = "92ea6e4e5e36e22ebed46e52827624de8ffb0bfe48f64509abb0ed7c0439c5e1b809cca97cde758d6e6d30eade6c42ba2c4c272858f816f9332ce2e05a2284d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/as/firefox-65.0b1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "98e5cb7a5122a4c2f4b687dcfba88e130b43e827d5ddefaf7161dfa7e0f9a86e52654d35bba1c729424562d8a5c0c0c1635b30da5f3c88d0e8f15667a7bdca06";
+      sha512 = "7c39f29e805aaeed4901170bd1df52eb3db51200f152a877f7b9e50f37c0b2135b643c61c467702abdb456491be38bd209c7e8f263fe1587101c0d0b2731a493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ast/firefox-65.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "91d6f617fc56b801dc4ddfeccd044bf1b4a89c9ad5d0f13ef185f9996b6fa41d08c092a4a9720f52f7f121aea1b6d5bd9ea99d15a9cd672b0f8534cb6f22c6da";
+      sha512 = "9408c28407c7fb2946b43703dda3bf638f14bae6adf4cb215752e76497e8e01246095ac9989ef263152f366a9fa0c4cf7d79f7a4d86b6848331333f0e89e7ef8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/az/firefox-65.0b1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "63bdad659ff4ec803b1e0f3367e17b21e2bcf7589fa3b96901e6c3453bf7a8770f0345b212f8c90a326702ac9ca6d16d87a60436ddef863022b70eea92e83a5b";
+      sha512 = "4409eac53e43fe2e2233f1e7eec8f5cb50b74e15c4057b0816d0c26d8f2dbc01c3d3a578a0bc4351d0858280038bd20dbdf9943b5e9f429ff77755d8e69b67ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/be/firefox-65.0b1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ae2b8a34157a541245288e13b551c765ef583684921cb290b76d96c2ed62e07bf016af1e11db344464a46242c4ecc6871b88a585634ada53ab6d315f5dd79d9f";
+      sha512 = "53739c8bcedcad5e04cc53d66efc81b8446232a60e2a4d0a3020099ad29a5a6f4ce41ed478a7b18bd8f4dc6c321d75f55f6333dde467eba97cc812be977c5bcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bg/firefox-65.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b0cec246ef1268bf7feefb966b92c971da8df711acdf7f12342af75f4da09ca982db4f3e71ddee362b05ccb61dbff043cd41f2f0147637d589f0e380c55e71dc";
+      sha512 = "c94ddd32cf349c3a8ca858ce2c44fcbb1edce97449956ff7a88cf696f0acde7b9b8ece49e2f5d97d9e0096d1cb320915d72188cb08a96947938ac92773d4dea5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-BD/firefox-65.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "ec449f40b88ca7479276c7f13eb42d5365c4358d39aa78d8c91185d516595a03b22839e143341236a712edbd35cc308fabc587bdfe2481a08abcb45d907ac1c7";
+      sha512 = "afc2af989f5e645ccc021b450bf59c85e5a43797d149393c5e3405660ff2c788eac74376c6046e2eb5bdb4f95762743cb904c969c3ae8c96bea3887ad457c3ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-IN/firefox-65.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4dc25dbfde5dcb4bd178f8574e273ec1081f1c12f59c0167aaaac1d4aae859bbdcc512ed50c9f6a6b6d4de94a559a8f223c4acdc124d84b647d6d96d5569cbad";
+      sha512 = "2c8632e3f4a4fe3ef067c2634467091b62bfb6273aa04c54bee8c390463b22403141f578bc6418249fcedcae0fe990b37afb24b04b3c453cbaed4687bb8f9266";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/br/firefox-65.0b1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "4d0eada67a745a2dddfd6c961ea2afc45b8dd99247f04172b21e008111d698d3bed29ee078b2f38ef03518b712c9b7d91183ce543ace27e428d64588d3a97c4b";
+      sha512 = "d0fc413bea97d4e012619be2cbefd4ad3fc357abefa365864301d2ba81a68e9bb940c55cd03127dc0ce50b4ee9556b570e96f40063ffaa8b53055d7b2be4b6a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bs/firefox-65.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "b7b18935016966913504530c9dccda00ec1db5bcd21157308ff4312f9cc222b9622dc165335dbfeab1ac1ea60a6cc7d846414232394c9a398791a9c7ca2f9ee2";
+      sha512 = "cd21a93cb26880c06d98c1ba5f4191825b45d63e4f432a99bcf956b1c144361889497d68d9e3102ede95f046926ea21e6649ab14906c183c147988914a64a705";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ca/firefox-65.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "00da4706239c7d7014a68518a643b2c130e83fb0915c12008babc920a30c87db1a9b55e1245e39b63ddc366ed017f91c843d96ca4842c91083a32b629d3b0236";
+      sha512 = "83fbc4f4880140c63c2f73900926083e97737d991e617d37335f4636eb9478547127a0a6e28d6f499cc5263a33f266a1608d2026630b66f59fd472e9c1f5b85c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cak/firefox-65.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "76ea69421e52b3d622d5f5b5d4d34df5defb4cc0c3f3c7c11f856e55287b591fbad642d3d30c255d655c4bc7db7869e2f639775c02fa1892e6ee4eb5f0a3cb6e";
+      sha512 = "a2272d2f275b2481a12cc905e17f8602e2d2e8d2c11561fddc620dc35623f99687481e9d9ad7539644ff7de03a311a436234dcdbdd9f4c0dbc6cef4d466b9cdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cs/firefox-65.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e69f0867f57fa8992276f4f49a2ae73159d3697d075bcdd30688905dd35d19ac5c7b2edf8670bdffa66fabe191ec7e736a6cfbd9731054166663ad954f2c285f";
+      sha512 = "3835a2d1f041ea50ce8fb3437589be968842496b2b1c13631a8cf697e7d5a01da3d97a7b45fd76d29c84c1affaec72555cf66f366c260df491cfd453d273995f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cy/firefox-65.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "933b7c24011fdce95934b2bffe5f83dc2e914bb34d00a429bc63018bc54fd86d50f24f7e96f897bfabce1be76ab5772e260c5c8c5ef9599c43e2598fd817f956";
+      sha512 = "a280eb112fb65d5979c6a9f8ad04ab5c2ae7fa03edd29e9363009f42776f38da2f82523c71b680bb988a40e089c6f2d58a24552a73d01311e00020d9cb87e518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/da/firefox-65.0b1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "c1077013270973de929e6f5329701b44669fd0927f1b252c1858cdd20b8cee90e6d9986ce5ab2fa10a25eba19ddbb002fb205ec12c12dc91fc056675db2b057d";
+      sha512 = "71e51583d018efcdf09f0472631ac2449fdfd748dd7d4467928fccd0d6e4bad6a2853b58a456ebd8e28997aa75c58bd22cf040bcab01e66d1635bc7948a93eef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/de/firefox-65.0b1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1810d988548e4f1ab3949fdd22b0e83be08f187d937e03c89a8854657770a3ed598890c2143e2b6cf1c4ad19b22e365446d6a96df0aed3b424d2474694521e38";
+      sha512 = "2b3204787d0423e7c967ea1c87e914719e1bf2106e8589119d9a50d447e6f0c8b1aa86e75b1ab92bc928fd4c90ea24600b4c8d2d44e5097296dcc5a494c369c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/dsb/firefox-65.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "61994d9c03695295cfee0f3e4749f58133651f14c77c61e14fb34b65055dca56ce598ff2a5b58e60e380423be6bd8d1c76a72ad6dfc2872e974de57dbe2fe120";
+      sha512 = "36e0c839d63c974bd2659c3015c5608bb4781526a983519fb3920ec125476d07acd852ac674d8306a67afd194e100a10099191283e3a948ec58b08df20107c2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/el/firefox-65.0b1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "176ca16c1982dacfbf0553dee54c4ba4f6d94b288469ed8426147786a63497837d02d5de3bd82e19e3d00362fae8c1eb7db75cd2f81c233bf8fc948afad93277";
+      sha512 = "fe6277f05e013e8861bd9fa9b5e9d02f1224f0cca881159e1a5d0ac00bfa42887bcb3beda291845f716860ed9486e6ee58665895a160574772b76befb3177073";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-CA/firefox-65.0b1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "f56cffce793283f25c617cd5ca59c17f33e63048a185c449340f4662a07f0c4194c334d149d3a3c5e0330441111a2127dd578d28cd0253ca06c901c295cf0e40";
+      sha512 = "a10b55c655894d783b508f6b86c787e481e673f7b6c3df739f08ee815b89359c4101026cd2f7c063050a09e7f354cdfbaa7a450935ff0b03b7b629abeb074a98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-GB/firefox-65.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "10cfa09292210c52b3a644245a2857958e629ebe98f7bcd3ca8d5b6a8770febd371f70a9395d192de969ff0aeef4f6592d247a860ec2325cbd50bfde1a927673";
+      sha512 = "f148b9dbaf378f6a8fe5a2225128828fdc5a6a695a324cab83841665d5f93cb8d8dfd1289aed93f66ad9bad45803641102ba8ad4e9fddb063cdd36be92957f65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-US/firefox-65.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d8cdd41a807afc1fbeb9b200b6e5a94d9c5dd86eac99cce725173d349a392c12481d334289f86be4e0be4183d14a8bc13cd746c12931cd7d46a779e6260f5fae";
+      sha512 = "b99326d15fcb6450f6af9d867959d71c68bda04a75d7d1fe1a7a0fb02593a2c418c27b8797c0eb50c56d482248b308834d0fa8bc136c7086edb9081708b9dfef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-ZA/firefox-65.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "cf3ca56846794f25586537ca70be0bfad4a5b8c29beb3c919308f8b6db0e8dd1311a1e2c0fb1c012f5bddeb738426a89a0daabe69ad578c4b9c8a9f0ddfae3c1";
+      sha512 = "bb42a0c7b782bff3195d6fc128231180611ec5ac8d9e4a402c9e796b9780f0f0d16454e457761a91f1b3bd11b554b3c61e5cf586d369809981309f1d49921078";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eo/firefox-65.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "63fff38d293a7e2264f4dd5f4b7bd48dc8738deb9725dfabbd0b99af739b93ddef1559e977d64e8c480746e50fa3c070de6e10192405c6c1aff2fb7a28303c72";
+      sha512 = "2d3e5babdcfd3b3b4f25e0a239103f6bbfe3da29d418eb8fa37e054cd9afd0425acf9239e05f8d1846461997fd20f56109f2f1f39b59a18f9be6cd494eba3a0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-AR/firefox-65.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "22d03829b66b5901b118745360040164fd1d34bd854154be96f2b4973498f3cb8a1c444c6fcdead536e60f266f7b047afaa27c37f00872e7ee9ccbd3a3e6d8b6";
+      sha512 = "33d0aed1738cc8aa1768177cf6453afd8cba013024fad7b776a737ea1976d1319ad8b0cc76db7517230faea2367773446987fe7d1af0cde468f9ab35d37a2303";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-CL/firefox-65.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "52344a032ddc72413ecdcfffd5f9597b199acbb1d07b96f4850891a364a4ea34d28d250747eb85318a6a39aba670f57da8c4d328530def46ec1990baded90bd2";
+      sha512 = "fe2b3e41e0da6e71a219eaec0024d19801f77113a10be2fd01c4b686395753cb31363b112fd1f8fbaaff756f2a5fefada53ff99fec4b8c09fcfba2a94ea2123d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-ES/firefox-65.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e1a10fc09ff5930777234777a2e2fa84011a9e734d271f425126d129d2b2fea5cd5cd6ab39c2527f175485be6d618db2c2ee21d3e2409bae806a986fe1bc0f82";
+      sha512 = "7cabe427b241f383352bcb3cf723df921e8a7d955ccbe61f16a7b6fbff592623d8af08b00f2242fd96e58a8905159254a2252657ca0fceeb8f4619f027d4b461";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-MX/firefox-65.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "2527ee035fb02778f048793a613765105bf4bb196fd2fce33a544c3af26a9b8d4bd02a090313bf93849f95d48949a0bed97766e5101bfacce87517844c529895";
+      sha512 = "eb27a3bfb6e38d2e03d0c51e511a7b95cb178ff41854692c561fd864db7ebdba2e6067cc3fdd9317df880b32691c0ac71377c5aa36a1b82322267e00db432b83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/et/firefox-65.0b1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "fc809cfe614006fa5a3b81ec9a662cd42359bef5d88a3575d13a1ea36c5a3d23d6a5893ccccd9442071ed7d144e48eb6ada694107bb3b76bf9e8ea88f1dfd679";
+      sha512 = "119eac2350a278075586a12ecaa1438001625a65955a0746c9e789eedf6165c6697b3085dc47f346d7b992e675ebe5d7341ad7729d6ad396af6c4a7473b227d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eu/firefox-65.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b8a46549965de608549d7fcdc69062491fab0de097ce23ac9f7bea9ac0c38a25391f3dd0d4eafbbecea37d55e72d5808338cd09358e4568ce0284b799fbca3ef";
+      sha512 = "cca07a6932810e7c19445cc3e7a30a0fdf1b68669a82f732ee608a6542f24776c6a9ec2f2cda74c047264649b3a533c038f7ab908873a0f379fff829b92d827f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fa/firefox-65.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "77ad08efa48264ba99395a4f3b1c4db58029a8397877a85ea885d18d2c36c259e5b2af4d5ac7934fefbf0a7c0d6ef33fd98a75a16fb0f72f13aa7615640c2b0a";
+      sha512 = "36d515f7bfc73eb2c90c16546e3c0bd596ddfde56bef6d3962f0ab178f2f7c2b34ebe07e9e7fee79fc626ba10eab9d94275e6df8564446292f7eda6be713529a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ff/firefox-65.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "16d91d5617d0166ea091a0f42445d87484b304d9b4e4a8ceefe7bf0131b8cd59ef53fdbe68c0e6603ecdd06b07ac4cd2bf662e836d8fbfec119e455ccd462f1d";
+      sha512 = "bc5f41da9ffbf41e5f9c377916572b5ece5bde37cd4416cb18c147779a9a03cbeb600961db2f3c4c43999ad3e1a12e5d7d4a54ade4f45d5c92ac1c9f1a410bac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fi/firefox-65.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "5612cedeb45cb3dca94c9234ed378bc3debf52028bdf73258ad8c16688a5ce7cc39a0a4215079361aa95ea85615d911ae863be9eb760e630d790ac8efc8be326";
+      sha512 = "1e9a19f0bede01bf06e38fc58ede4c8c011a4548b62a131a203e0269c295cda32a4f7b225bbf95f51c43a8a78cef6497412d94e29a2a75a5fc7a5abc865d29f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fr/firefox-65.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2bd0ff7bdd0fbca3d8115c1682f68eed2db08c42918bf533d4bbe7a2f5a745caf6bc162249117feff75653142fb54a9d70b9d382277781e20e13c8fa3029398e";
+      sha512 = "88fa160ff11e5b1e4910ec3c6d9534d5f48758820ef2f6944a4161670f7951b0a3219e292c47044c1192ae5d1955dda5886ad3031661c4cc810e72385529f33a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fy-NL/firefox-65.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "757bfb2edaa0a595d7fe5079ac411a8ac03533bf824979debb48e81385d123b34dfe56aaeb2fabd7217daa7ae80015d9b0c8c533a5115653dfc992f14b8a5d5d";
+      sha512 = "40f208ec0ed722a097ac4e7d4abb185386ee92707e34473679bf9dbee4d7b582eeb2a46aaeaee37b0be85439a664d8f8dedd41e22aba76035d3f79695a4a092c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ga-IE/firefox-65.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f42ae917024b7d477a216935f50da34d4743fc7a6172a1a83ef0d8a68ee7009d5a4a29168f8a19371df8486dfa33d6251397ad55ddfa98cc5974680ec2eec100";
+      sha512 = "da9a2ddb27d3207be7efdd4090adc871cd7f406dd15f6762c0026d14ecc4a9cfc1a5c9b4b85b265ed9422ff6444c13639ba3b7f8fe5585c3b475eea9e6c955a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gd/firefox-65.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "eef9f488b18bac4ba1f397d3b536dad457e7451c4e11d260889c91bc5de8ccf21293b95fd2c6a72c9b06a979af6f28aab4ad494f9c922a39ff9251a8f73b6e6e";
+      sha512 = "205e331b4a037404311b8b1152ba2e8e0981d80a4b0bd3e82b725b6ddd5ce5672285959f550b3b116b34354c8fe770bf32d4dcf9e98c29764116160bbe140937";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gl/firefox-65.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "36def20afd4f55be6aeeec85d60a8b222f238c5654a7e7be2d1a2bbcbd92512a1819234a167afca3c8b01c48df9e32de1c36658f9ae64992ff418934eb7e27f1";
+      sha512 = "b1904cf32581b444e37a10a8dae6aa4f39834b47e97b5b6e62b3bbaefe561e20f06ee69b66ba3afbc03996056fc6f3bdc62d4cd38d37e0c8cb49a52c1405a59c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gn/firefox-65.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "dbefa20dc4438fc3168f67498502c98d362c4e9771e6abe6f3e8185f5eb765d9fcffe40282979c3acddf91cc56cd5b950f444a824e40d88c3ebe145372496483";
+      sha512 = "17b6eb77a7e204a7e4c345004832ad1377331e7f744ec7ce463e2ef1f44dc576da8a8de20761612d51110c975779fb9fee0b87709a2b7541f124fb03cc4df060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gu-IN/firefox-65.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "24ff7f3c8a9d59d2e75d2fb68bf02ee3826807b5274dc0311e5dd1bfd747bee5ed0c38d7cd7de49fdc74ff2712b4bdbb431e4a3021ae5ecdf342c18aa2c43637";
+      sha512 = "14fa5291fd952d03d4beda2e71184458ecd1737996133831aa6f8f15ea5e6feefcee3db753817b02e89f4747b2c879f818fd4a7781f277491d9977e1e519bfb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/he/firefox-65.0b1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "9c7bdcfa99e36f1d89e2a93e4bfe9878d0baef82a8983cb3ebd12a12e411b0b0eb733c94cae9844e023ce2024fc4f792640db4f81fa3e7d29aaa8c80c1973336";
+      sha512 = "1079037838057e9d85bc3cb54d29958a4e2d21767c7c93afc70433363ac7aed314f520a502d3542abd231a59b503de3b768a2ef87d3f3ca2d17ad7deb1611c74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hi-IN/firefox-65.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "e3398c0b14348dd90583e83c85918d260f110f40a0cb871bca90ed36722f8e5868fe99a1f2bc0ce5e3ed26c014c89f4cf07e16b9545c014869c9909167af0950";
+      sha512 = "dd19fdf8f61fd2c4d804cb56158aca080c2faf4361585cbb93979401f024d9c1b23816c744eac3f6f788c39effe8a68f76e8d0891b97a14481bf1c68201e7a08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hr/firefox-65.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e0c20e717c6ac8127c3ccff295c81d9dfaa61e863fe4510bd9fa3aa9e05d6ed42b7a5a765c40a85181a15629ec6df2586728fd56152c2330c4a159e5316d1a79";
+      sha512 = "f1280b55ce78be18e79a7ae504b2004c7b29eeec627f36e57891c6d1b73415ff3b5645805c5b126cc005aba1d206da76e56ca09f6649dc0f95f514a294fbad1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hsb/firefox-65.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8057d0ac64a1515ec642359a781fc97b0cdc591aa406cb7b4f7b5e5b39d4870e3516e9d89796d15cd4295da892d96bf1b0e19132912c99e077498be92a2c7906";
+      sha512 = "85923f4036af41b64e3af27035fb988c8dcffa122560d10a21b78430f7f6e6fe5e05d4ec3fafab816f42957a998418d71a7514d88f738823a33fd79a238bc935";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hu/firefox-65.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "710a143c2c9f2e8ed9f36145c96cb014943149595e37619993de55a37b5a3df684221c6456dce57e73ee6747a2592656c5bb8ce00a77731f4b8d8e309d55e948";
+      sha512 = "1016ef974fe2f5cedf56dd630fc495823d224e74d2de074beaa41648843a9627e572de5313d041d5df8175099b94c1936fb1b315c8c0f99bf2ce8059b452ef1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hy-AM/firefox-65.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "02c9358ae18ee03433ac67a9b4222c0f26c9a99b71ba7d6f2ed5df3f035d81d6da38199c24cf9493b8942586e2d310bfa647d3d4d56c264fe8dc1075657f26b3";
+      sha512 = "3dd288e5876ded4a57c1e95eb0967737734f65f713157a0dd56191b12e7223e2bd214547ef009400ea58aede455e01822a9e0c4ea9ad55601e04bc6712f71e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ia/firefox-65.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "f82848adf8105b788ba4005a3fbb9495a3c37fe188e250e4eb72dbd18cc34179a82eab2ca2c5974a19d60170f47ad7a3641d2114036954344cd184496a420d3d";
+      sha512 = "bc3d4c93ba501e63004478ab924fe8ac6e069a231bfe5f5234bb3ec7b5eb288d1a214bd7180802927f3a3cce08c2bd5711fc6f6c053fdbbd1daca637d5d32f1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/id/firefox-65.0b1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "cb8b3cb9ca112c741b65c0ab54265dfb86a4b940a72d1646affbad5767bced811c0bc0088a1eeb09a453a555b437660c9b519527671ce704758b8e9b607b1e70";
+      sha512 = "e0f9ca54a40e01f9a7e1092e567503579b215a691907c10c7f96d2ace1524512af0abf4ff7362fa6c49dc1868dd4115a4514759707e04e5780b00dd16cbd3684";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/is/firefox-65.0b1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "09b22d51f074ef2c821ebda310b59e60b02295583d737b7887b24d3b6d0617bb1efd9af835dfa75db8c2625020ac256504e7a1b446cdfad6fe4b59edafcf892c";
+      sha512 = "6253ffd4a35abb04ecf1752e695278258e3450e7dd3dc335d43ae930fcc78b8ea9ff32927ff8dd8589eb491570ae050d5e36a366e95763a0421efc4703f9f2ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/it/firefox-65.0b1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "2df43ee959f65c9ed8870afbfd81ed6810d6fd9d9693e20b05629891848843b4211022899cf80fc94df9af65118bfe0d33723b93dcb4c2fcd41bbbe90dccda8d";
+      sha512 = "5ff3a302273929b7052c6c26f7007fb389867e375f104bafd0b808540b771befd3b1328bc577767ae7efd1aa58237ad86a841e07af04f298e0debb461b0fc12d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ja/firefox-65.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1a8a79e7f08489674f8f2893a4c8c9356baadb0782576063c722458d8bda467b26afe3bae0d83a0bfbd7fda5355a6aad8873cc1d76471b3322671d65b73d4ea1";
+      sha512 = "f66962e71798e4df4d222a384a2ec5051c6cc30e65c90e28296412f1908f6c5ba17057ea97875e871a984d27e6f2678f011afe5e5c067340f673d45b0ab37023";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ka/firefox-65.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "4a2b8bb0afd02fcf033f298fbfaa3ac6c7ad9e34a402e0f526dc54a2387197df9a88b057a787ecc7cad99f69bc87611a704439bbf433406fe1d22d748e7cd308";
+      sha512 = "78f1873a745fd6627a7e6435833f687abd587421b4b711103e504fe1179406920c6bdf847d6fce5fbcd47b485baa77555d3ad25f2ff7fa4837f48308f8144d57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kab/firefox-65.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "566062e5190676626a3d9e063740ce2a372e30bb8836d96b31434f2dd60595fe61ae20a3e51dbc24aa99fc136d9ed918f8ecbbdbac3a459ee0ab995cc555a97e";
+      sha512 = "cee493500d868909d36744b53562a455ebc4542730f97e0011ab7fc52a320478201fa41a462f28ec1ebbd8b63a77784084f52b5439e48cea5935fe71b961bc47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kk/firefox-65.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "dd931453d5970d36f5b281c2aa61ce04aaa107a92309c9c276b5120d83dd900bf7e67875fab4d91230a6242872df59c2aa725ebb018253876a01b712b4731105";
+      sha512 = "92d2a814bdd16f883ac46ae76a31d68fdf73bf8df409b6a54db9efa2b309d8c402be16593f314787a705d36d8a5b289d9fd4f2b950569bab4b5140711a1b6a90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/km/firefox-65.0b1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "839381f90c49fc4b392e8f503576a950051d113024df2b237d2cf34948164db741a9b1db9e13e9a7e79cbb3c5994ecf5801fa36fac5f2e541ef574c7c8c8496f";
+      sha512 = "7ec953af4f564097c6586813db66c9a9d4adff946a3def098bd9ace1bb2ec5d765cbe34c5f2d4bb309283a3ea83c9a61b013257411dab2d1e6f0978761058ce7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kn/firefox-65.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "fc2ee47bcc2c6c8872d62327543ed4b54639aecb29d76ea211cc86933646bb8828c46d04ad71b639f7dc9dcb7d3ee30afd4025fae78d9bc4a865cfb2baaa8466";
+      sha512 = "68d0ef81b194b16db975cc88af819a1021cb715a3ab9a24cb482e46e83219422f8db546be19667bd533835cc25caf0c8d13f7bf4cbed40cbff919bffc8b72066";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ko/firefox-65.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "de6d2ffb87d86da19c23fd276679babc56056a3e253ba468f2d8561aaa5450e2b0cdae0115325158577508649cb58d0417cb16ce89e6beb9f3ceb229270c43dc";
+      sha512 = "36f857ff7808f6a5023afd6ab8e1679c93e77dcf6a239d3ce4bd66548d22c2fdccdbefa648438a73a833d5f2683e334a6c4ae641a009330ddcdb651e2327ef2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lij/firefox-65.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c269db1b59e36cca2d61ddc1ec43efb4c41223680c035d69d76290a26cb18f0ff72b514fcb34895ed336ab576cd2a61d5fa953e0e2d615870a60546fec5de6b8";
+      sha512 = "2a2bc5d3d1c5f74468b8109995838c9a40c738727cb3e9d69236eb741f68de1862bcac12c4607aa65b6cac423deccf07b9d5e3f0b97ff38cb6ce90111ebe4c6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lt/firefox-65.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "b75be33bf611d53eee0cf2d6112e52d40149ed052a10c32f8f958c025726751066dd48893622de33c400ab642394f5c68db4319178bb0d8547830db46f90dd09";
+      sha512 = "0f3a3788acf2289732485097531817680d292662a70a3d7f5c3def8526e9bff444d0a3a7d8f7263048659f6df8a80a24744296b2f306e8b44cdbeb23e2b0f92b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lv/firefox-65.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "6a10fde8d72f01ad6b2e1aad56f229f57694ec2cca110d12a77a68f2eb30b4e92fe7529a9ee4589160443393cc3af61d86086058e4accc9e1f9bbf581a280e25";
+      sha512 = "856aefb6989bb97f5525e0b0e2acf14a448ae8d316c9dea98513f74098d36d254057c23421a40ade7bb42a522540232920d7bd0e648857a93a58cebbbcb5ac69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mai/firefox-65.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7340d5b9f93c7b06a09164d003b5c1fe7489e8a2e18aa1c89d093bc35e921acdf4f0dfc3b247b9c8de640153e98c8f7c271aa16c3a2e25b3730ddf2d9eea7ab9";
+      sha512 = "e427c73b0774026d8346476b581dc84f087e7989ee1ae7c28e0155b8debf4e55f7169caae7d2cab13b6d8b46d747734ca50a6fca39f256a381349634a9d4fd13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mk/firefox-65.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "c118ec46cd4da1af94a6e706c08f7c8d570b81b49545da8f255cdf922719c2a1158984293b18a2ea411615eef72e694dccf6474e7ec736a25cde5bd57e089f56";
+      sha512 = "f715fbdc2619fa35391aab97245a96b8d60dc4f8db90fbde1336cdfe22f5dcd4e68b6e9d3c4e8a07e5aff4a8bbf92daab3ae1df454a5111a436831120b390cd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ml/firefox-65.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "4ed6f9a71e515ed9eb2c9cfa71a10d9b3a3d827f635543d1638b81e9a67c38340dc9e4c910cc87d58bcd5ab551ce1b22ae8e7b7a1a82d8c68375a57234726df2";
+      sha512 = "28e98cbdbb69eae96b78586e00ad8379d0140bd02a2e9ae64bcdd2648978c63393b0139cdbebff87d703e5211709dd500b5341ad25fa3a1d3f840b6dd8358029";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mr/firefox-65.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "64300093406fa443bf8aec9c1125f2acb3a00843892ddc110c23bba4d78bac28d732848cce23c9bee7ad1ef03586fa02567bab7c9e423b09863256359e656698";
+      sha512 = "64c008751c310ad50624563214f14a310accc9f3d68fdc740864b5df50891beb76e580e60789a0219e862ad66248d75268a981ba25f78d6218d3107c1c911186";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ms/firefox-65.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "ea6641f148b7fc00e0b934181ce86735573978e7d13368673de25a88709c5b930aecebd3f4e5cd83ad40b9b0a11f3bc27b4e24d68d3dbe476344b23e1dcfe087";
+      sha512 = "d5eb1472e90ac506cb518f8cd18d9142673ee4f1289db35e7cb23df895c71a48671d17a468289c21938329a89c1dab5e23a8c1292f0a5de41c51b57091a5ea01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/my/firefox-65.0b1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "c302c3c95303e6e9e8b2b13e997a99b6acf52364e2cd30f20ba27a48aeaa395268698b2aee043deb5464e4cdf123aefa8528833b5f3d5a52beda11a39f9a3e5a";
+      sha512 = "79944df3288c8df2a105e53e36e253aec6990a48bda3169de579cd1b29176cf1b52b1ab8756a19ad06e1a028421f59a835fb69dde18394da0e10906a9c9d592d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nb-NO/firefox-65.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d09a982c4301228178161d1c7a0b00b9bd8ff71125571f54b214a0de2ad10f5efe331baaee3d849f3b06a59e52aae4c52437216476808046087800c5014a9322";
+      sha512 = "bae4bbe321b54ebf36d1c0e978c9d18ebd8ce1b4dc82711c2504fa638eb29ee03e84935dc6a458cbda0a6ca0cb5b07f08e696b9cc2f5c035665f8636ceade660";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ne-NP/firefox-65.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "0a00a6078024fdd4c03d1044d9f72df00eb8da3de3746fa78a86ed568f72d8c83719179951ce18f7c0d1dd109773c487d5159d7b6a913bc1cc8c6b2c00603fac";
+      sha512 = "cdf8bec99e46d07915d5c5082390f168617910f9b43f7b983741acdd7f09d9b1798a2b122e3e7fb9ba1beea7e43592d488264ef428461a4b90ba4dda42b0cd11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nl/firefox-65.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f87a55f30c1b9fa14a8c0d4c7187a5e36faef688ac8a3082bcaa576db11457886f97405bd2ab1c5a02b4ac1c94643f143c332a68f90ec36f3acbf42c73876dc9";
+      sha512 = "61c5d39dff518e923c5a81b4af1a1129c41bcf71d76fc8e4a4326adf8c8c486aacc6a7144e234c48b67adea7a03405848a19a65a086d12050ae1ff611a0200fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nn-NO/firefox-65.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "aada464208cfa7c18b126114e323b1e047148891a568a8088661ec313e8c04eaff4c9f0121d9b9df95584e502e1dc5311680a209b67667f8c1f7706381208a0d";
+      sha512 = "ed4f2598b3ee286671a7dcbcafb3ac4c1babfd58221ac1d6e17ae88346124e41353a73be1eb61c458cfcf20ac4a3ee26f16dc55b05a999ec9d83a28aea4cf87b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/oc/firefox-65.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "fe9a5e94cbd328fe988e263b2036d3e3477ee792d01f5bf13df67d0d352489323ae4cdf76e2e559af7008fe36804461533efe96245870244ff653e2609d973cf";
+      sha512 = "9bd6ad8359e8c7a4999e8f931b220e10dfdf3cf147cb683c5b3d2a8de775323df47117142d75612ca73c015f6b97cea271d0728225069da0f4c8359c5f5ebb82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/or/firefox-65.0b1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0992659dcd653f29b7dff511a0742352b9c47d4db5fbeb1b3fd123ceeb3dc7fdd0326f7fb9dfdb52cef128b16af21fa457f4c732f6ef421845d6de17ad8ca446";
+      sha512 = "926f128bd5b7fd6d6c74883517d3c54ce5f7d917785f45ee062610c3d0389371a48f971c247984ada2dd62a0e7249350b9b32349225b6cef80f2d2c10e1b35df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pa-IN/firefox-65.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "81ca4d42d4bb2674fc3e8e3d9c699b0d0106ba99831f7d06d747e254e8a61a6e9c197586293e83f7ea34564964b4d2a1da587caffa1dd1e7915ee5ff7ae4617d";
+      sha512 = "91757cde47223590be15cd74e3ce8f0466eae141ccca68f38000bd59c711298222d9951df1765f68ca03d2b8d15730a8ed73d142c1086ab2cf579213429ee581";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pl/firefox-65.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d344dc5929671b193077429ce08a51f420a996b8fe84d2f85a27ef71da407ad063e8a5c07ff476b9c5a687bbce5c8882d8281ffaaa4f023ea8550a607fce504e";
+      sha512 = "77cec103f6c2810f7cd3cdb036a590fb88007a86b1775178c64f81ed05ad92a8033bae5bcb753f3f9fbc39d10b32bf1d262599da0fd4a23f3a692c5941d23728";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-BR/firefox-65.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "8073330318cadf83558b30914042b1ac2da6911f00e4aba3bda573a65f27c53301e1b926eda36465c6f5e484f2f6f5208a863f8b134442e29a5cc908885917c8";
+      sha512 = "0078e18b65681ba521217f589bddd7b6c507a529e30fa524e83087e4d4837b8e771cd6db1e1cfb77e107ca28ba05c052b3b5b8c96c92b2eba63636b6a23c3999";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-PT/firefox-65.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0ec5b66761b10a6f9e33c9c4fb8551fb7fb8d33df560062c38e71e9e5f06c6d58a4ac954db650f0e9c3d12e39fe98d3bc3c9af2e67529892ac14a1b8e6187398";
+      sha512 = "aa0b1f53bb6da5b64dc8ed0da0a46e4a28c0064c1ff03dc40afdf4e2daaaf9c7cf203bf6f66d3c5fcf0fdbf0c3aec3e71819d49ca901738be6e6d343bf44179f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/rm/firefox-65.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2fa38cc4b068358faccf1e6637864556158f1cc704111f0ceab3384ad6f80df6e04731e3147f952d592a44e05e2c39794d9b6fc8da2fa0497f60c3d0329f4c07";
+      sha512 = "aa1ead0607661103ff8d58e84cc7b6b2fb80422cd25ed670b9403236d5a702255f56033cc9ffaf5746153f70973f9d8c711783fa2a16ae1ebb55e8ab9a669b01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ro/firefox-65.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "5ebc28061eede2b7e8fa82d7785af1d7ed573fa241f3bcd992973219827fe41d05fbf7e878e7fc4be0ca112389ece5088ce2da76b4ed81af25cbf77613ef1ae4";
+      sha512 = "0bd2887af7ccb38d6ef931882c33c629443dbfc1204460bd41c4321bb36497083794fe7e7761484a400844194f39247b30f68c3d2d015141f472136dff3d2a53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ru/firefox-65.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d48ce34160d0cc06931478822ed668b56c0dbabcc36533ed89325606c7114beed2275fa65be627320913cf899d18a0c91af60420b0028e19ae7baed31ca528e4";
+      sha512 = "3603a4998739e7a561f8e642ab1c41346abf5a05eb27b67fdb79f6025fca1a9868570bc1f68db6e04eaa12ff81aee6522fb2aa1bbd74aeb33e08c69b9f67fd8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/si/firefox-65.0b1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b40f699b3832dd3fa31bcc70f237eed994f3ec2e7f405896595c7bf0a2bdfd935d483ea342f42c041f942613df5483aee93f47f154b999a032541a2a13e751cf";
+      sha512 = "1664426cdadf570e4b1282f38015eff3436fe6c37f3aa0b9445f5099d3e4ea58d176364cf615c28f82cf37fe07134611ee405dd5dfe1df7d41f10b5aaf97251d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sk/firefox-65.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ebad485939f64ef32016c7c410b09c80b55c40ff21f59caa3d5e73aa2c65581cf82cbadc2421be9e7f743ff7176f454908b2399b0c2d78ff1c81c4003bac84f3";
+      sha512 = "d2144172be9383c32d2f66328f27ee5d9585959687efaa5bce1e7a9ed1726af58714a535aadf6dc42e31684f44f065775126e4ebd177c12610e40587c1094566";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sl/firefox-65.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "dd7812bb6b579db9961bca9056add99e5aa10b3309c9562ac1a30a3613fa2afdf5a3fbf0943783660671b38b35016efb8ed3b1caaa0d67edaa07dca05b3a30b8";
+      sha512 = "624becd246d58a11b1353a4838e78ed5ec8362f356279581ae1f4376da40712b6aa388d5cf02eae6040139e34995254e1ee0c08971d3666e8a867cef1be38354";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/son/firefox-65.0b1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e78c803672aae2f6a26f7e9173adf7d8151d9d54866114e805d8143e46b20f5a08d4b2b944fe3e2b87f8cf342777c925ceda94592b746e101b62234141512756";
+      sha512 = "0d2842e6dc3187608265c70d1b0648d8b31e5b790b734d1e09c9621f8910f015ec7c245d4be1ece26f5df171bb134afabff8af1de373185d6186cc4bead293ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sq/firefox-65.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "0bc01415b9701bc80f371fb4541bbad387caf74b25edb0b2d0ce91a840cf7a8bd012fc206486b724b5cdc694dde3d229ce8c074c5d4b8d6b2e9166354b5939b3";
+      sha512 = "1539962902491f03cc0e5f5c730137a6c7649b02e3816042862a37f06982760d1119fd7721e5199b94f45a4c21f76797ffba6f84981f4ddf89f1791a06e55e3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sr/firefox-65.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "f59a095a8ee815f48e5bead71af079453df702e56874c8017df4fdfde51c4db81a83a6ddd2feb2c8385f0c2bba5f0f985bb9abb38cd9777f7234796eb014e621";
+      sha512 = "0cf6b4c2db8c5fcbafdc207f38de436a25c4bf467589c69d2ef1c82cd91b8ecd19a562af8bcfdf9e867b9da2c54d1bf492a395a0e6c00712f7143cbef4b598ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sv-SE/firefox-65.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e9884e0ae32d721b4d67069c63b573dde120ebc4de91b886644d07d00def8e341ff1a224c8645c2c2cb5539af2eaee74ee8c835bfe7a36e96ac7a4383b9344eb";
+      sha512 = "ddc9bc5a3b260570c5df6995857cfae69e426b745d5577b88dd6b1cb56794e3176ade22ea78437afc5a0d2e493c8d9281266ec5691cd9cd10743e6650df48478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ta/firefox-65.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "36d3424027236c38f271a9eb12db55f978ee4e59d58b7addcd40f92f41aff015616a1b1b43183ad550b62f347b0d1ae85c4df91227ad65b1710176be8152c5b2";
+      sha512 = "ab60ae9f72751526b26b7bcd062293cecc30ec02464797788efe9610a57baa0c1deb3ecf7af6d5f2d1059e971e04e119b497e4223853047f73a924304b16ad68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/te/firefox-65.0b1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "d49d0896e38f22de374e4b7b2a28cf63619f7c8980dbe17efaa2078333f84e0df20cc636aece5c58fad4a792095dc11ad08e75912e77a6d00c55c63fd2085800";
+      sha512 = "c1c31923c57ff1484dd7992a380cb812a5954dca248bc2af69ebb104cfe9f543a16b8447694a748d427f727a87dd07474cbd17d9a1eacdf0c51af0ff48e79137";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/th/firefox-65.0b1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "e74e806bcbaf3206c4a95846110ce13659fca80a63126496a9b2d7f26d00e1b8e781288144cd22e278938a37f316463f2179cc0642ab6e852875d85b16eb4aab";
+      sha512 = "060058a99916d0b851ab41e0a1c38a3ab8f15241a8f46d4fafe50d6a9dcc436e697a1e6f7ced819bfaaabff8335555afe236807877400aca1eff9749210d8d9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/tr/firefox-65.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3cb2de0f5a305de3ee8c4ba7b70db4dd882437e3030a1837b3e3cb1478d609616fc7e8c61c247bab0a03e6061fe8755191db0a2126b2d5b95576396e557a4457";
+      sha512 = "a8e6d67cb49fee893600fda43ae4abe9ea3d49edea372db2ccf51589edc1cc4762eabf641ec51d1d5117ae0424122da08c0ca3cd339f7ea6e46ffb8f33fa254d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uk/firefox-65.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c2cffd17e5704eb6dfc6e757f6e4f45440b9ce10baa410be779f02815b60017d5647df8d48cc183e6cae70e64de893f467e7edce8facc189bd50868e0824b56a";
+      sha512 = "7000cb70414f2c7b0b3f4de5175584732acb5978aeaa77721f91016d31ec561986124a28cd8705abc57a562b1dee1b6ff0c270105ee0d1c6a3cf485b54c8184d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ur/firefox-65.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "55a3ba48586665ecc77223d44982ebc276f15f7ed2538a7917ea982968a888de8c4fded1a2239969f95b751f71a9e9c3d20a1d655ec80b8bc9f63de3b2f418b2";
+      sha512 = "445ea8709ac7962cc9c2e5316453918d890fb3c6b453f97fba4a67dde6707bf509eeb3e8cff2d7789a4acbc9d138d1f7e8d4d493db55dd122c48deebb401e113";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uz/firefox-65.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9f94a8cf73af3f96c06a8aab1f31183d940fdf55ba864661513e9facc5c40adf6cc1fb42170a49d702f305906711df9e13bcf97bfdb22e31f8f177a8468f3bef";
+      sha512 = "acb46a2d398da472fd85f8a8d8e6498570b395445e21d4bac250146e7b68f9ae01c98747a67faceedbef3cddfdf3f12a7ba10ffbd9c5a20ba9fb8542bc310944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/vi/firefox-65.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "bdeca49540475316fb93326651f7c2ec54bda4d27ff16395f8ae8488855813bbe0b68f98d278d1e87724be4ee8c7c1ae5560900e9b1fd75ac861ecbc8c4e46bd";
+      sha512 = "e3541f17bc38a48453e4a3b76e7b721b56dc8a3d41f16d23d7ce9698edbcac860c5956a1ba2db5050dd490eb8faef3c8d75ace0d878b77d0d54321712e9a2c80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/xh/firefox-65.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0dff6128be2a8493f8f93e91dcd9a74c1861739babe57bdf7c7505ccf657cd7b6d25461dbb8c478afdb1811ba4b5a1abe8ca7fb7947393b30923d47af37ecadc";
+      sha512 = "958064d163f58f306f66de17f0b255cae1e315c707b70a1b19e0bd37c0ce8bf61c2b5cfa23cc605c76dc77061d17647f13a93577baff167bc9acd044d26f1232";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-CN/firefox-65.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4589a428a78b532f888a7bd82167af84d85d7557a099e6a38cddcbf01db546241f12420f6a926540c55ad7092e00aa1ac8b622b3638a74ee97ec58f0cb0e85ab";
+      sha512 = "b74a598177fcab1dc721e854135cbca2769a478a908adbfffb18d5ed7dd4d1e984a8413d11fe5b11235423962bc0adfe00fc4e3c48512909dda0c12663d01564";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-TW/firefox-65.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f9b8bfe7609b7dc511b52ea937fbdd3f40b32c5aebaa2d9a68766efef0aaad6d9e33c0d0fcdef55a4953973df2b2695d4179f9ada33893ae13ebc8fcc05e8442";
+      sha512 = "c7bee751ce40b7110f0f32263dc6e928d52e5b065ce1e0ad2770a43c44dbc6f1bf372df7aaad909eeedb8e4e48f045365f181b25aa8baa5ad738025a293b7c8e";
     }
     ];
 }

From 2e44e002a2a267e50d227d6ccf50283a9d22ea46 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 5 Dec 2018 21:06:11 +0000
Subject: [PATCH 1431/2793] firefox-beta-bin: 64.0b10 -> 64.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 d18e8277195..e16567809d6 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 = "64.0b10";
+  version = "64.0b14";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ach/firefox-64.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "e63de6a872ec67b80cc488be329f4a89b56544de02da871904cdbef47cbf65b9aff2f83974ad3b8e661b2361c6cd836279dd006aef95e16c0f85af21dff7bd69";
+      sha512 = "a2a467acf4d76b09d7f04760dda0ed2e49f31e96166c26bee8efea0cde4dce914deec16a7b6bc3cc8e06b2acc70a250c7db980b180c5ad7b363e8e0334afbfab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/af/firefox-64.0b14.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7e745d102fbee703e4c065a597a26f225aa8259e5544465b6f131c5f6edc878f652c2f3529f74366d3aa7181c47f4b448287021696168e8c9873b8183300e937";
+      sha512 = "7a271ec7e0600299fd73101ca2148a5057149deefe5ac5747213791f5cf6a2fecd54e04ee7b3b0bd8d3a5cc3ff8ed852724b602b797d6a8e43128ff2ebc83af8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/an/firefox-64.0b14.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "8507a65610f8fa2c23c086094ca71936e0249adcde13105ce0ab9879b32434aae38534b90098e40e031dc406de49390824bbbecf17f3a6903dbc065fb5fbe0aa";
+      sha512 = "418f50d3b71d265d7669a7ab3d4027164dbac85a7970c6fe690fa592c08a33ffdf8feaa6a58e13b28566e8218f2988f134219608d4a1804fe7aef8a154c16f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ar/firefox-64.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "f5c49d943b0ccaed81389b161ec744dda771adf93c90c5ab09325b7de57744c1814bcb7caa88ea9269e8754ec44bdad5fc948a5a903a77dc0657dd6fc03510cb";
+      sha512 = "61439fc182462d27a03ad8d9472d96a50336a864915632f8e0c8ac3b0c5e2f7aa6a346ffedc1f0712fcfd6417063b0894e2d8b4f015f85ee1ec4d9ab0ed48c01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/as/firefox-64.0b14.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "cc5b14798da8a759be04518f97b7ee4995138893ad08c2e0d721212f69de63088e1a08237f9bf4e725d154806441d1a89b1514d4c789bd1381d6caa9737abb94";
+      sha512 = "64f83e85f4ef5c169f4683e92224134cc260e052f2e837e2e272d052cbddb106ab6a14a985dcad7e9928a7ac17e28b9f847a22df681fc4600183606330012e16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ast/firefox-64.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8256d617d336d08a6effcad9e445ab0a4a80a747bdd2a85c50eedf3dd2495d41280db0d52bb6563f96c2041320a411b519f0978efd2f7f059ecf40a3fb164ab8";
+      sha512 = "9a7cff9892fa4fd89bff4b4be462a949d70c6c07eaf4c2373946f8f991e1eb6656d2a7af6ba55a7a4fafeb54988add6a779c01b42861aad37a58b81adbb487fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/az/firefox-64.0b14.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d11f0e0c8967c1562ca9455a23905b4b3a057f7819d2093fe7e60e785aeda718215e636b42e9b60bdcbe1ac89a326d47da5d6559d01c3583865996df4b42fda0";
+      sha512 = "1b635a7599459e3f270bdec64cf6d9b984fb0b2470c49a3fd3566e1da3ebd4302ae0f0b575f739f9c175a4630f45f31ec39feefc8ce2decfcd84383582171b8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/be/firefox-64.0b14.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "335ad773e97afacedb62cb3a4dfbd583732e2bd8408b253143cd99922b116498cc5c55c39c9e2431dd3db39d7cd05f2aa2d769ba334d683bd975fcd4e6395f42";
+      sha512 = "f9935dd0f3a9ae11812acb03bfb0166e6030872b847cf3cfc29e9b56eea5050cc1e75a898a404deff6b01d8131c112c3dd2df754c197a69fc9f0e0093bf2c128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bg/firefox-64.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5d002e9993f0e1a63742e5a34f96161b43ef58146c28cde4563079bb073f7299551cdf0a9f35a6e961f2dbdbb87c29a7326676ef927ef4737eb9103157f2a7ab";
+      sha512 = "13b3618c401fd41f8f199444e84eb5bbdd3b50605b30fefbc15819ca54f92c8bb8e542396c2a32d856453e1a01df98d4755fe6c840360ab16a308af1cfe0eef6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-BD/firefox-64.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "c54af20089bd32eaeb17d8e574b674ffa193842e809eeccb4fe6694c4b3b674371b60ef06f1abde2012465c458a36a624fb9146470cadf2596c3369c3ab05ca0";
+      sha512 = "ed5492d0f16d45d5e22f9fc5691b1672fa46b7b71389ff80d35b16de9b02320acfd416d44e6186e7fc2ee54099fcfe8a356f302bc049092d9c955f2f0e2b29f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-IN/firefox-64.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "fac070b57346188b9aac15257fe1bc30a0b4feec05d80a93fa5f4f0104891ee4ffafd81f8ecd1e55939cce4a10b728b10db0fb1d0be5ba14533e515b798b2d45";
+      sha512 = "df84b6688aed1dcf4de5ff8eb8d8bf802d5062989259c2255684d329d172c1fc509c1fffbc6fbf7f045f8aeb0b4955a3c12da85140899e0a5d6e6193f2bc4170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/br/firefox-64.0b14.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "4549764420a4c7b6b6583e5770aa246ac1dd24e57f792c03e98d2311d5bfb47869e228c54d4a7fd296101e9a1881b1ac0cbc66dd60bdd63f7149f8d3b175289d";
+      sha512 = "f8b148f8a86774a0ab8b2f7590b6d76feb9d2cef99629e76b6fb86fd1195de86aa6693c03655ec4dcc9d062978c542d13d55c2ba7573242d2793f8f71bc9b34a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bs/firefox-64.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "fa8e664ecbef781ef5ecbee5ad692e37640c2537c35ece772fadddc2e4d79391f756f28891f0c22c16964f247aa787a096e28a662fc08c3f6b8a971a43dc1876";
+      sha512 = "150783ad5f748514f46743b7d1bfddd63175cd8b17eedc6b4f1049ac9fdd4d4b06288411fa894f09e18c0b66c2d03dfabe769bd77f909062a36ca78af9b1b60c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ca/firefox-64.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fd7072341f3451481f4e50e986bf02f45541730db7320bace3d3a343014e01a28595cf0ace6bad1a099504fd9943a5cece2833e4d156122db8bbbf88b7ff3193";
+      sha512 = "3d4b5ba4f9efb0960a2e7556cb08331f4ae78cd193f065c1c2d8c9d6fdacccc1de5418bc7e9a71ba19d9de7ea78f2ef154a4a95ac58489a8f9990a3ff27c1395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cak/firefox-64.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a9920a8d8ca455b85accc51e4337d6813de263b432decd5b2d275b0c272ede7351c187299cbd7c0745e6cfe356b793f37335bb2840b23b8ff4ddaeca4e8a9332";
+      sha512 = "a21f14531c8e77695f49cfd8ba035dee340cec05764dd009000614eb3b1e5ea73c6c677dda6d13bce7805e1a17669749a37fe4cca9e6c10db555b6dd0f057af7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cs/firefox-64.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "d622c8c1dd679bf90ba7150381a04f70ac0479b261584cd18e17b44261529a8dc023f7a4b2ad8d495cd1f292a0ddc053e4e4daf70cbcf7ab02d10c6aa072a502";
+      sha512 = "70421e5d7c0ae97a941b9b008afdacbc883b4d9c2672610bc08a1b9b31f90c9414aac791c4bf63443dcd8155f90777b1aa29ab8e9d56284b9da7a872d0055f0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cy/firefox-64.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2812212393f826387206adc0968b0efafb62176b11e55a126ddbccdedb13d8a8656ef1400d262d9120dc50b59a0028c43d97ca45a3da5b167485a9c5378bed9b";
+      sha512 = "d4b903a0e7391080be7c3dde5d714466550d55c82354d5ce87195ea40e1bc026dd43e5529ec2749761d0578ba76254bd12bcbd127b364202dbd6dac3ec474b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/da/firefox-64.0b14.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "52d690a5c4406ee9a0fe69a598a8d4d7b24ff3475676d79de67d45658058a139629ca0c1080fbd849d52dec119691e19a3c79e2a0994f5e96ed057da322b4578";
+      sha512 = "ac3b7b0957c48b34b2266e46144dc20e8d24e131f86c227ccecc07fb232e02dc4e11b7019df3f0319a90ed58c837bc1f4ab520e91a6279e4e37b7fe6a02f57f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/de/firefox-64.0b14.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e1cf5a56bca2d62e56b2cc9c32da15b3add35ce06dbcd648a241f1d36047c86c13ee5cc0619a2aee22d2652698bf83e5974e330b18b65e00391e913f9975e8b7";
+      sha512 = "4187a9813c2a948d135f1f8e70d31dc8ee1b8ecdd3a07905e7265533e6df77fa68b5ec09ca7525a9a642758c99e91d3118d02cab23468c9e383e2bdc9389d457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/dsb/firefox-64.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d0a07800b6a25683effe02c4222215e6af478b0582d0fa53e25e74f337966edc33add3dd907b9831038e4d1349a6828148f61e4e4413cece20bc5d160e0269ae";
+      sha512 = "8aee6ad9200054c3124bbc227fb3c64e4a2665ce68616c145c7ea7eb71d35aae3846068616ec39d8b80fc29adee954c4ea31fbe5491169e39a70988866e16133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/el/firefox-64.0b14.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "3c5b88c1bb6028735e7594d64dbc5fff9a9fb28ee02abe912c18c1d9e4f8266a78f0c0636e9dc058063fb79982a7b13666b2287e9bf89953df9511c2ea8ea855";
+      sha512 = "85e9efc9615d6b1cc12af25e8a4051ef885e2f1b535ce9d2f9aee16162aee91672e6230774343991896f993dc93ff10ccc2e24d7c3ff13ed1acc93c7537dad26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-CA/firefox-64.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "9fdd11055d0ee06f27b080f813d2eda68637c8028c20b2a7b4122e4b3b4398c22d5339f54d25ab4d221c76765e490b83ba30368a7641869d660060c60a18afe7";
+      sha512 = "8776b5d1286d90522b133ec1923b5f510981d9a9a59f502a421a2e12f0e6fc46af66cb887db37326802e18dfa99ffba823143ffa60ffb03a95f62772af132126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-GB/firefox-64.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "15a07fd9cee551320e808dbe538519c18caadfe50da7711b576feca337385b623eb958f0d97f04c23a266daf19355e1e2a69a2f24ec3482a2d2d8938e38afd27";
+      sha512 = "477d56e4f5b7c2c26ecde42388fac36ab1045cb52eb5d0ed5a316dcb148efa8be8eb5deaf37eccd8ea906ef702441af476c43cac795278e6a0071d46c5830861";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-US/firefox-64.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e113244031727118e50d5f44515e64e4c8b576e260877d5c9009397b36732095b98a701858a82ac421e56fbc40c2a7b3a2d39e391bddaf49f74f9818e0ab48dd";
+      sha512 = "e6de3cee9298362fe3a93ccc23ab3ec1a4e8597224c44e2c3f31e1cecacf05270563f988156107c4d4b009a5a8e7f50ba849a94e38518fc30f986f6a73bd06aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-ZA/firefox-64.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "583d871b48a41e2f21f468f6702484e5875c02f2df9c9eeab4b1faf99fa977d84e4878e673c915f907d131b655f6dcd1875ebc126093589baec2f5091d98e05f";
+      sha512 = "03944b015f1ed1521dd79c9f3948ba280d6b52cc9655f6e884310e4032a44e4fa38b4ee7ecf8cf50c48f4bb325986835a7002cd7e7e21ae6c1c8d63764478cec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eo/firefox-64.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "bdadfe17850e57163ebcd66a3c0ce3e20fc69453df09029d7f31d541d98bc6c3a0a5c98e6902a659e3b54e2669beb6133ef45373221a21eaa3f3f26bea0b892a";
+      sha512 = "fbc1bd9143f9450c0c42356c20696890a64b333e0506ed959d3531cc4fea7b50fe379178c7fb51ef5e8449838d2749ed7f3343a3a2617afdb994784192fa8c2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-AR/firefox-64.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "61453a1e4141e7a19fd7d31fb8872574b5e3750058675f1b00c6a78e2212f69210f00b15288b68af2de8a56b3d09a63be4650e280a5385a86e0003721126a35c";
+      sha512 = "3f64bb89d8311b82e93c121256232cf7420d1d8aecf2cbad62b823904f4d0cdcb6192a276e97a2004614294f7893885292736f7e3bbcef9217554f680c0fb509";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-CL/firefox-64.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "98e9e06267e7a6f700acbdb6c1f35a557d7a67e9ad294ff391b0464796f5eb16a41c1c755c3a890e7e82dd94e62af302fd3392b4d553e2490c28c5f15eda0b7c";
+      sha512 = "705b55e42f4a1982712c1c76f758293e6fa8785938c5270c95285b0e31a7caca1552adeb69ecbbf5e5b5d714ef2e282d00762b147c42a0ffd50c01d56cf9cf6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-ES/firefox-64.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cb37d107d742289f88f6e88afdbda3d18d41c3d37cb6209c5991d20c36a3ccf780376f3ec6cb3c0fddd08c33f35f98c22b71236987a537410abc72a6d46ea7bf";
+      sha512 = "583337f9a52132f2265337892071bb88557c4bb5a8e827ff2c37c99ad45a51b516ce16a145e7e32c98bba3deadbc79fda03f0dd0f2438b8573774ba60ff61e50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-MX/firefox-64.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2969ee93e447c8e9bfd5702f43f32c46bff39a073dec5137d72c5cdce64054c7067b385622a24375966ec13770173317bdb1037237e2de980ae755c9a072a6e8";
+      sha512 = "2178c0f13035d9050550101a090818b4c3fce5577a13389e93353db2d33b025ab8f5904660f2b1516c2356af4aabef9cd6f403fd5e70560e3f4392db7c873c22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/et/firefox-64.0b14.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "21a75474dd5ce519ecbd78fc803ee3a80041a0f1eb2daac15c8fc861856a15e365909b40eb250689d5aab4dac9121a9acba6f0805533c71c2a9ef034d566bae6";
+      sha512 = "405a1592c91e51fedcb68e526f75e9db7cc28e333fc75effa4963d4313216080d863a071b0f881e2d79c990d721503e6f2794d4a374f108aaa65a63ecd9c3346";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eu/firefox-64.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "5d332bff9b85956b1a1b0c83a27a1c5211d4700f53b1a38f34ec7072c3d000bc6af7cce48a51084ba3a295c9d025730313747ef8e759c5fbf662879bd14aac61";
+      sha512 = "ad8f627889b4c801dec0e73e4ace1e62f3d7a9e561629b2c7907554740bc74d67e9ea69bebc85d7f79e671c3bf95a3c3bad8585afe590a9d1da28acbe2bd71d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fa/firefox-64.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "1bb42cc21b65dab7b950a877e21a3ee9cff78ba4eae034da4e322930120d8cf5076598801ea609b77cdfa41d084fe62f8322d42da773336597c30102bb61eb10";
+      sha512 = "91dfbdf6caf769bb45e168630dc028dde338fdaeb25e72a5f1fc98787a877d4c95504f4a0152fc6c7f7b347a4629aa8250c3a328607ddc6340c61f867e7d274f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ff/firefox-64.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "9ced85f9ae63885b49953a733f2081fee55dfc14e12bccc3f3531ff605181c7c04156e272c100ccafe7d88169df1f128efbcf6bee0737afaa28c5ca22a77d286";
+      sha512 = "5271040348c6fb046e04df8e0181b045a1bdd8ec46979324f8ce98eec6ecde148dbbcd7eb84d7b3102dd10ddabc14360487cc8735c3c3fd84a25aea79b304492";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fi/firefox-64.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "3624699d5945964f16035a87fd666efa202de1b25a29f742131131f23dfa4b8e38a17c061e3ce95b40bbbd45026c60139b961062a7c5a9d6c01ea3399d56ebf2";
+      sha512 = "09386d83a26a8dfba3da620460026ce4bf92032dc8e35db28ad0bf9501b11b4c8108350e3823135567df03194573c69483de967d9632e4b22904fa7b2a1450b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fr/firefox-64.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "56c304d07c4f357170620e13c2f986b2c87f39c7dee3a8d0c0ec12bc54dab02ac12d0c9c281a011bace55e36327d64a0710d8fbdc345ea0bc4f9b6f19ff42514";
+      sha512 = "b14931c9146a5784dca231e9eafbee32845af405baffe2cbabd70fb2369294d797fea8a719a2679945c375f2355773cd4a54b287a823bc7e9896f41e56a2ceaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fy-NL/firefox-64.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "0b75d75abb56ba70b421ca819fc80aff409ccc98b373d91102ad84ca7967aec5e8f01f93f9019c6b223bf9063456d2891a1e04dc43ce34643d6bf9ef162f508f";
+      sha512 = "7d8f480a075692d93cd03fa9aa1b1359e41782925e91cf670100101edd8e4136e52e004a80cc3f8f36332b16885e97394871fd9b0c553a6868f91a30742fe599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ga-IE/firefox-64.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "0a6a39c1c93cdb67fb413719f32dfc583bfff1a8d98cd330de126f9f1189f594c9b85b51ea210bfe07439a9ebf5b5266edfe0621d6b544fdb25098107435a418";
+      sha512 = "787a5ec8470f0a06a0b16c1bc3bf11f46e26dc375d0fc0d413d6bd663baa014a313b9fcd511463eb587e39dee1657a534511033d0d92842911334ad9005abe55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gd/firefox-64.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "5406d839461cefa0741a89b4b5bf95b6bb09c4096694db7a58540a31ceb0ae63c83d9d23f983056ad7515d17d152777b0851f21149454f5ce67ffd4951e07070";
+      sha512 = "22ba14425e3a08660562e03a89a4f7edc7e8759378f549b284bc69275f0660fc52ed87f6ca028ed361b619d33446fa7c397843095d4ca4eebdfc4edadef4651e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gl/firefox-64.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f1a383801edd077b57bffcc3ed2ac2f2616be9cbb56d21b842490c40f9aa59796e6301b0b1c51ed4178a9ddb21ecd5daa4ef9155b633d0d1886373519222ce91";
+      sha512 = "d36f2bf1b3be13d64dfc36f853d67defc8a6d08d93afe41beb7f8b63854baff198fdfee13c65a4e6f9e907f91753844dd41a5503313a1e8c364c8dc3f2de97d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gn/firefox-64.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "37c4eef718dd9e76e87d4ac08f86cffb843aa0a90894e3da46bfaf2b6e89282fa7aedeaec061439f5e61ec57d299966df3185cd266fa1451b57f53788817c1b3";
+      sha512 = "cef46c079c13fa606a4c5b072ae14f6ab2b578c8b6a43532b38b65547b4fd0618237e84a89d4fe3ea8bfefd8a28984af783b9beaa7478cd42b5cc42784c2f70a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gu-IN/firefox-64.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8a6fc54b0a203b5b03c3cbcbed26f5908af361958cbfe0b2ecdccaa28f7db7b5488b3f9aa47b94da19be0f41bc2ddbef782bfeb6c3a3516f9c41090e45dcad0d";
+      sha512 = "2bbc4c4af3f927b51c57afdb780bb1ab55357f40f7934b43468933db4ffda115b19fc95a95bbb292ac68c083b6c7ea0ea2feb3a072779fd5416bb41f7938b89a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/he/firefox-64.0b14.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "00553c2131873c7c0353129e402193b8c285738d2553067233e8919eb617f6cea5344b2b1076629d33b036cff9bda4cb923a89e6a1a38841ea42c5bd3ac7a5a1";
+      sha512 = "897577cf30f2b6c31f779ffeb74b221513fcea262af77e2ff8beecc53e5c1140b478b530ca1c2b88f98f5b3070509c6e06a7cdf9a1b512c455e2676cd4345c25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hi-IN/firefox-64.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6ddab934e6e6157955d9e2eb8209e2107c6e451f3731ef141eb07757fc60e59b76251a61d8d6b3b918f300588add2413d119005a16d420cb879f279a134c11dd";
+      sha512 = "998cd2d0b00d372023c223541c4980ce22cff87724c57135de801aa89841db3f348f183e69d6743d3aa19a0ca0e3676a6443ec8263d7a00806f537895256623b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hr/firefox-64.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "94d13d40681176087279bbf0e2cf21d4cd1ae442270317174519375b9bf9f9731e98ead581e17a734bf992ce3f71183232b8af3156aea0abf8e07845de56d8bf";
+      sha512 = "18c4a3483b1561a71dee3408ad8a26a4f16207216af25b48abc892bd5298f8cc43b03005e4f06543985c5ff3fb3b3811176cbfe349ba59b5578675ee1c7ed698";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hsb/firefox-64.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "26cd09691d013306507e4f6166fdeea9f2978cfd12bd9fa40f5a5dfb8b09e6444ea5cd062c09271effed3c3319b197c71cc055fdc8b8fe556de195b0cec0e7ad";
+      sha512 = "ef1c6a4eb5afdaeb06a6bf98ff411a3b92f86fd0143df3a8473a71a434734c688c1145f150da1db6f9d2ec943f2f6cc906de43a68853a6b0dcdd126638855946";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hu/firefox-64.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05a3189384bd7a83b736b826a21241434d88e1e67699c9b3add789a3ae2ccbc715cdf4addfab32fba0c844c238d15f72cb8545a5ab0507054f69e5f8701ff98b";
+      sha512 = "8b8bf3d8d763135e766360847163541897c44d0039b7929b24bc4c4c70187866ab2a91dcc37e1755048611f15c957bc9801734b289dc0de98aaa712f9efb1170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hy-AM/firefox-64.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9bea0ec38b5a0178c573edb5ccb5d23290b6a04a79d182473dbf60bfa4c98ecf6cf097cb00488462b329bd828df15ad40a2029cd4d81850c0ed30124cd0ac192";
+      sha512 = "91691bdff5334bf1bf51fca19bf558045b6fda537f4d4094a572c015b486def65591ce2bd6f988a3b5daca357482df3a0ba90cacd3454886d4f747d4b8fc8e8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ia/firefox-64.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "4603670c8aa74cc722840b6329cd111f954e926359a6e9f483b8a40d73767a9d24760d2bf517e02bb180c462440b8fd871a46e15333f29103ecaf62aa28f3004";
+      sha512 = "a8b41cfb69f44bcf37c3ea84710a4df5cf183804afc8882e3929ebcd50de23d212f53051716445c42d9eb78d13930cbfdbc46cb1c1b9df20c57815a0433b38b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/id/firefox-64.0b14.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "edecd1dd815b93cefbf433c369f4cc02fb2c3c11993c8f66d155acbe90a7068e9208e46dee2324b5ce223b5c2e7593a13a773ab3ba3cffc89ccb312d15ddee5a";
+      sha512 = "a93348f890565262294d0e45c8189b80075519bc631184de4eb5258945fe5542a9412dfc2a1eb4eef97802efce995ed53a3c3b13c5d0784e74ebe5a4aa040695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/is/firefox-64.0b14.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d528fefe33aa41d36339441ff036d86dfb19405881011aa51731149414797c8206a112f824fe3f7a0578955e8a4d462d9c9e79f08dd478170fa3f5029cf12dda";
+      sha512 = "6d9a6561f898689e20105da5ddbc4740e6af53d7f0b3df9c7a91fae241c56e3babdf6c82733249ba4433ede312792643d9da5e291b8c9fb884f3178a2670ffb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/it/firefox-64.0b14.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a2226c02ee56897a5fb47222f03c7f72f6606321b7b82909eea206c37c9842931ecfd203088416bcf0e2b0d2bac7dae5fce2179408225f6ecd9d213635a5f0c6";
+      sha512 = "b1c404d585c245d0df17531587bccdecc8e6d548de149bfc9755539e66a8d74769e12b2af95ccbc0ac062923ee6abb259e9bac5a556c40341e2c64dcb710228d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ja/firefox-64.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3c22833f791b47422fbf6fe937ab4c557b60e1101582b05fd469a350b81cba9f56c0f88a4dc7aebd4a13aeadddcf7f69b001cd8c0c3c9845b2e9207ae118709f";
+      sha512 = "4fc1d401c0ac6e991d038107b73693407f91106ac79cf67926144efbd3921aceba2eaedbf5f7aea395cdefd46c8c275fde651d1f84ef2fec607d23823a1bb271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ka/firefox-64.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "fb6c44387c76cca30dc03c07a50612287cd24f812b8b864998323d8751e65c7db3bcb409c3b399b742980f0dc86311e4b7df88854e471dbda69120b582d60c95";
+      sha512 = "ae14719f16db6c8f247e47cb56ece7a099321566c192b1481f5ed24256bbb2e04c6e944e9754dc9251cc70e41766d88bb25d61ea484afa1dac8992ecfc766d6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kab/firefox-64.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "c8b0ff8ab93496627b2b6ea284699fd436d6afdd26d136e7ec9ad8c5e456d87aea78754ed767b07999e54829668cc47da43319ee37e36366944176dcb5ca8ea4";
+      sha512 = "78c533f5b0ee07b3e984367bb0703ecbdef5218e697ef8a1f03c37e30dd54ed4222479b450e760f0cf079da76cbe58d4784b5dd057e035d29bd56b554d442992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kk/firefox-64.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ce93679ce4886662481f556fa438bb4ae988f4c2179686753be2ed1c176a7066414d3cf034093ce5ba46ba2f2ec68a9ef7e5cdf585c4dcb40ec89a48cdce7b57";
+      sha512 = "b59c5d709944696aee587cd72ea4b38c79ad45ff89e0c0e0fbaa305adc5a47ef4a9556696ff74e833ec73d74b184efd775f21306af5313df3c0473b9a196f6a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/km/firefox-64.0b14.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4dc669e5795a9a426690397773b5146c9424fabfaaff9bc3bcb880c9e862c3eca7856ad7e6d642975cac476fb7645b4613df6a7a5b1431e669c89cc78a05a791";
+      sha512 = "238ef7dadf712f13037f478427fee757a28ab0b3d570d936f416a49b192ec8620275e5a5a5254e8330dea242de6e6ed2e13044f098a03d64706f4600db4a695b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kn/firefox-64.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f65033d3050e27b62db028f95476f8637d8c7ed7437c2da1bb383e32dffd2c4be9bd82e76a3a26572bcedc6379fb4a3c3bb2b977ca690142f7046ca7e95f906f";
+      sha512 = "3a965a435fd652cfb73b7b002561b2ec8e47159c7a239ffa9b316595907c54ca61fe978f57556f35775aab613f134078865b25546cea251708001f30b1d09bc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ko/firefox-64.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "e0bfa42023ef0562f5b4ca7116687f33f403bd2130e0e3deed402f3dd0772da0f8cc15b2f4dfed43fdb9adc0bafd776f920f4bebd9463dfa0ca477ddf5d0f234";
+      sha512 = "5fbb7f5611b2a335c194fa1790eb34cd56c4adfd82f298468853796b485a36c610562b7d883ad953910c80db6d771a21cc1c49c8c723de0f3109be1f0b2c66d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lij/firefox-64.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "36719e381e743eeb034c89cf8361a8bc89c567c726939a6ba0cac29f818e5d0565de1505133ac7a5822859d60a5be53c569bb861b2091c208bfd1602918b5cd2";
+      sha512 = "f957ecb83a0e47538264ec4960c120e6e71aa4d83276e6927605f224074825d4aeaa79fd5086a5f2c0d7cfc822eeed35aa177f565868f7e710a5eeea11f3d4d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lt/firefox-64.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "c40c524bab02c3220c703d3122c37f2748253b059d55427ff88a3a0548efe91af161efd220bbc20bae343ef577f8c97bc9b6257ca19e895bfe014c6cd0edd1d9";
+      sha512 = "2ae0eaf4ef059bda2ecee65327410aa1f0ddd1a825879ca34821c4738fb53b2a9cdccd619aa66ba535965ac10315deadebd8d70f08026138f367751179b328d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lv/firefox-64.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "da660dd435b4b821d3468d6bea3e0d514864e131e91dd5f7fe4a5723e2520c4014dbd52fe5d5f160cdebea2a5f4c6e3c99704fed7b606b929dbb5a6ebaecaa25";
+      sha512 = "ba0e7d68728ba12b435e87cf55b1435dee7a61df4ad114f1b609dfa7aa38b506725c8c492bb1e6b48069102bfc2a6211d996c76c122a7b90f58f67a738c66633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mai/firefox-64.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "f03ecb9a811ba3027d15d849de620668946d7309bbc5ea61df26688afb0a93319c03fc0b04eb91ba97536731f000c40ca2eb5e8aeca95acaee09749e8d61c51b";
+      sha512 = "9ddd2dd8b0d0b109bdd0d552e613a74b1e1716b8ce74951b66c74968c23a679679562f4f06fae90efeb36ac7066b1da7cec2f9937f4bba476b80d412ecf91b3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mk/firefox-64.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "f5addba550f781ed310b87ba8cba6ee2528f655f0c688ebb471e0a5cfa7341670d85df0c0e2885ac0c8d9d71b4ff21ae01cbd36db9c3538199e73a0cc3e697ff";
+      sha512 = "0b1d34e3f27d79f3d46db0698f025d0da5e6f961ab1933b211ba8e468df766339a47d9d8e4a6c643896987078fac5c6b3aad5a605db4c7faea2b3da1c0a84232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ml/firefox-64.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6114ef12f355d862b9f8530ee2b49d266ab07801be3d09846ab6c412465ad11d767490a867d8ce4ca66ff36f94d580375dd5b69ccfda6f68bb60dd85ce1986dd";
+      sha512 = "afa01233b121d94b3695c1fef488a70e55216ebb4c69238905bdf20d5fe594f98cf1a331afaac56514c1a75631fb75781aaece1a77570db9c384b8bcf7a08710";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mr/firefox-64.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "05d320b82a4eab53752d63b461d324882e392b8f2a95c2ef64e149b3ecc03f1f6e7b151f96ec2105f92c45fc92e7f329d5a750ce35f71c5660c78c21a9c03f47";
+      sha512 = "faa143b4a04f0c86d6281ca6ef7fffc99fa468c4a6e14ee39d552fca910c0133682d5ef79a13e82aa2829d5f1cb17afec16582618631c0ec57656d330e2a5596";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ms/firefox-64.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ec6d0251fdc0732f75911694eaafff1b57bd986caf83513b0dda9adc4409d583d2053a99d655daffb3ee8eed1cb6080c743d1ddabe49c133ed55f1a6c9ea58cf";
+      sha512 = "0be2311c606cc2031d63d2eacff2d6a30022e1d65206091dde08f4adcc7fd51cd8d82c2a532db3debe32aa0fcf8355d6ec8b16822b286b3fb81faff44a98d452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/my/firefox-64.0b14.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "e37d41dafc186fe94856542b6640364f48af9e22f04b21d81e0b36013a879049ddf69e3e43e31b7a44661c56afe5306ee93b215d9c93357bb4c13c86852d583e";
+      sha512 = "079fb4cc46e0e89f4b5cf645617f5ca1a6b6f8b5d6dfab305de07870593181cae996472dde9c92be66cd6be06f74ce1f1d2ce8e57cec2ea331de608e83ba33a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nb-NO/firefox-64.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "67c12df46d949b16a496267feba440960fa02305afe3b2b147c8715adec432b9e75c5b93df7e3605c1f9b5f0c24cd6f863445874f7d269a1cb20bfcf12028ee2";
+      sha512 = "f76089d3bf28e96b0c99eec8533119d43beffe697f85c8ce0d70779390ac24ffe1b5d190f58bfc6dcf7cda268e5c4feec825cdab8c72cdd1d8b93853eba23d89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ne-NP/firefox-64.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "c0d76f22b1aaeac6055a9b8954c6ac77b106b7086a67f763f95e036e973b4d2754d78fc1d4d0fbbb9659d881cce0c04d8de5e529c62d5c0b128f2aa696fed791";
+      sha512 = "3ea45dd8243eac66b08e892d2cccafa4e1e6b39f7cb11c04a2af6c77b150d0e0315d16dcc298376208df1526953e1490efae31460ca8a2f77edaef45b12a0dc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nl/firefox-64.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "09d303724b5adc4a7cd1760dbaafc55f32d81ad31ac1e9b91ec4818ff7199a3204f7962fa09c6d4350773610f06d337e201646c04847030592ffd9be2a55e265";
+      sha512 = "cb6c6b3539bcb8e78d2e9d6ced29513c7394c7dc9b66481cde01d54afacdf16f035b5eed3a247cd70104561a429f6dd76925b4a84ed74b8e23e27393631d2629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nn-NO/firefox-64.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "97126166aba2ec50a12f9e9f5383d8f72a90005ec038bc77150252cb8899bee0976e26f8b7a12d38d5a51518b7dd274880a39e8e98a054765bda98f33acb1096";
+      sha512 = "a8fdeab729b27235f11327e217c77568502805961b7999c239f93fa721557cdb61e5a97cd38b2d397cc248c8b93b6aa1fc547a86dba5bc7ed096391e0482ad8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/oc/firefox-64.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "042d63d26a19a6f0796aaf1c16ea14c65d75a99175def2f3fb89b659c358b1dee1250d1495a85d0a0b41d5fd6040e995a55bdc32d0abeeecabb6dc18a16127c8";
+      sha512 = "e1c6951b62508bc9533b485785edaa23dfd5c2dbeba6847ae12b7fab91a46ee49ad348a6aa6a79923f6689c149c203284ee210a97fdbac4c8aed4bf55c932140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/or/firefox-64.0b14.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "029e8313015d35833dcbb7c79937fedde78596fa8257e7bf411bc104692a3b659849cb974810d27d3abd88d674d3cde978bfddeca9cabc567f4a91207afa760b";
+      sha512 = "9bc58b76ff74e3e05ea9fd525670fb3126cd01d84217b2eccfde2c5e6f8e079c9466a1dc121ec39b4b849361b033d122c78ca7babae6ec968b939c2eab0ddbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pa-IN/firefox-64.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c805bca742259579fab0c04b3d692d809723acbaab83c092668212ef584254157ec9522ead6891fd2b69687c7ac95c39374194160e81a11872e3f76acb65b5b0";
+      sha512 = "7a4d6b8937d266463b81694e7e68c332fe443649c8c11ca24d329d95d1dc5b0c3bf4af1f430a953a274ba1e5b008096d7462e502949f8dd2238b3b2a0ec70a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pl/firefox-64.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "91bbb80fcb8f5b7537bc9353db38f54521948a13da4829e973837be29f0710db5f31a55fa075c58f7938ca0f78402e77eed67a96314b5ebb3e5d54a697ef2067";
+      sha512 = "3e20e6322afd239402bc8ed9adc9301f24d9fe58ddc7d5ce98c4a8909af4c0fd5d3af6de9d5a66006a75aff80e1107d016efdfd0a9765dbb32cb2a9dfaa5e8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-BR/firefox-64.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "fb14e2c177b7bba82e2fa5f9aa3039a60b8342c9ea2f74f24af5698b5a1d95c31342d8f3911d89995e9c606ebd4335e36736c470b4563c9c089ea38ef1636db4";
+      sha512 = "5c437f8473a6cd0f195c2c6bf9061fd1805b26f2f41af69b3bf3a49de3c78e4927966ae3a319dff2508b97681c388a44f2d7e07fca316debed978db678c79ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-PT/firefox-64.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "582e2e7c1f85cc827405f1207da4bb000b239d278a33c397af3f4fe5a17dc0d4201ebfb98738b1802aa8c02b6f44b2e6ddd82ca9ab5fe3c08eee99759ee8eae1";
+      sha512 = "fded195a4bec193e7cd0ddb3b75c40cad78bb518b87349d59f8efe548e1b22118bda1a078e2501a06996c981f2576604369d08a1a6457055670a7d3b44e97db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/rm/firefox-64.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8f4452458e39b8f9415541130b8e0ea739f7f60c4c6781d98b3ff2f937563ffb0511428990dcc1db2e70832c54b35394e4380bf8b13e5a4c653a920c46cc4e35";
+      sha512 = "694e50bd6007cb7a7f857e146e266217e94dc447f1ec72ff279e045f7133621dce77a67bbe126d805842bdf47021e43c1e3faa26af930690b7e2309e6449e758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ro/firefox-64.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "db746c0350ddd99c2c30094cb76675a06e648958144b08d31002fd9204541b6522ac06b6954410277c4191d06ea4f8595c8e33b151b25de52f805c16c12c5365";
+      sha512 = "23f4cb17987f66b0bcbd07bb75896c3bf29ace882294b30ad8b6ef61548ea271ed55f005c6ead3d6836e3ce4024d4f77ab1de0627afefcababef0bee94bd7fdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ru/firefox-64.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "772cba5c3beb070a579e765216693bf193eca4ed66a9ae6eabd452f6e8b3b3254a12642111bc2eacb7b65b15df81b61584e3c91220d35000d1c1985ce5e147b5";
+      sha512 = "36b68d824ac8fc64a207ac13801612dab3bd3e2efc364c6dc54381e359edd8e022c79e1b96cbe49937ed71cdf7beccf106942cf55ba311a943be9220914c2a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/si/firefox-64.0b14.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "31514d4c77608e88d1ce0a0505d8cf9774c834724a14feb17377c50c0eb517d4cadf101c25f1ed2a9edeac620d5fb6de1717b37e35322202eb3af2aa37c4672d";
+      sha512 = "e1f486def762c77868c6e2bfe38a3e83919f4a59e0b198f4d8ea04baaedfcfd8e3e87a70c593fd4cec587f15f57379a6ebf99fb80458a7e857c5ad19a58d5f8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sk/firefox-64.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "34c7f9dcb8de54621707f0da0b4e1e3d4fab2792d971fdde4b67e13ad05e458d5aa91249a58c87ae9d9772f8c83d9ebc8a6faa2cb94554c48ab8f4daeef222bc";
+      sha512 = "a8cd34e876cfb491259a7ca1419a51a7ff2929defc94d16d6d582c3938be83fa30b46ec482bdea6e4589143cd7889da3b85550c2872e5fa0ce09f909ae8c62d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sl/firefox-64.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "e8c4edeccd8fd9aa61e148b430d882aa30d560995b65500e03e5be64fa24f008fb8a0b65c271161326127f1ce748da155cba54a507692877ec4035036c183fe3";
+      sha512 = "558d671ab59316383760919ab673475e578e8a8a3ae0bc4c37282b3064371b8a048f5c631e64589f24f360eeca49a6a326274b45f55947ae2972e01f330efc30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/son/firefox-64.0b14.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "2f9ec511eaf8ab90de5ab2e945f0dc798c51297b9f8fd766c73860e74d7d18f1e6d6cefb2e01e060bbc103c59adb38c6af8d0ab34806fc5ceafd5907c09af322";
+      sha512 = "8983fcf775fb1d7c975a56eccc7f821c0c9e2f4d689c601b21a748e898baaeeb46166561e368676d966f9bf8d78d89a896040ed0d5914248fdfafd1c64bc09de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sq/firefox-64.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4b967cb914f450bd48349100e925248d39b7fc9f86b6ba339805e1707cee0d5b181ddfd40089f6ef64a8e3619bd47605b07b96178037bd12f0f43e447f979df4";
+      sha512 = "db12d81b9ec8f7f412496d1995acf28295d8d49069d2a7f982fc6a82de39550d9cdaaa005431a8ca5608df2c530d6596341567793435a0efb5854038b0532d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sr/firefox-64.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0aa75350e7b7356e0bfbf70547cb177175bdded6f56d8eb1313474f8e2888f5c16b29fcd74ccd03f14158f21f1f9d1acf48df4b9a206bba1ed511a0a872cfb05";
+      sha512 = "c6e2b768d08623232740fe8bfc77a2bba47e415450020e0367be83629308aeb85fe9235b5e32716721b91153ba527d03d3592df9da91d6b386ff808758631244";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sv-SE/firefox-64.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d1d6105972409f9dd3cc1ee126c592684dac0eaffe5ce15f34252608dd940aee37734717d25801df2c9b8c9fc979075619349c3399a5cf96618f6144928a154d";
+      sha512 = "202d503eeefc8e8026607fd2079c7231c4a7eaf097acac6bc1066262f05557c002a2e0da191e6bd92832baed6ae1095e04407395e9dcbb7c7b51fd204680d653";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ta/firefox-64.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "8e8487396ebd36ac42cf773544869379bf510eff530f893737cbffe248eebf132d7782904ec7ac02a1b65379c14f886d953a031f6f6e1b0728e4c5e37cdd9e84";
+      sha512 = "bc6d40ec162b760b527795aa3ed79937abecdae0cb9489b886c184a3fde732afe2ff743cf56db5d70d2d87fa7038065583811a2e6d7ff7e2de884b7d4adb463e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/te/firefox-64.0b14.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f33333903d4fe5d49ba26b67f06edfcd2faf533b833d68b3488cefefe6045304400f905e7167a153b072f624f8ff36cf4627a4fd8e76a5cebe6772f819081d1d";
+      sha512 = "f03e0e987effc10ca3fae20fa0be07ec21a8d3ad0feff77c4d2ff0a44cd048cde44e27f33fafc28fffe771c3a0582162bf7cb9704099ff3738922210e6066ade";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/th/firefox-64.0b14.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ab05599f0426eea4a86c8998f884073a835d81a85c4cb68847714c463ea5dfe68942e4a4086cdbc1140d02b3f3801784bce05f319721df1c79079e85eb7ab4e4";
+      sha512 = "8fe21c9e494dc1f5ae38ca950b178d005a8adbb0fce84b80d0d427d544513b15bc41cd901fd7cdbfd816a3b716c261d81f034516bb354402ab8fe03adc963aff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/tr/firefox-64.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "27adf56f2306125bf5d1fee5759066668f87766dbab9c64cf882427aeae2d7294aa42f72c456177f4c5fc5fdcce8854ea386d60014bf2e32c65a84150672318e";
+      sha512 = "3d1bf804ac3bd65d8ab36817a03e0d51f6a439e7ec37e18a6e4bbb8f690b44c3c3c6acc88d0a2bfea5586ccf78bbec89811d7d38bed381b272546b12f2442838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uk/firefox-64.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b224cc1c6edcf61ba52e3ee3cc87b8a069e7a2761ae0f0157b97db7db0486114ddf994f55e6548da81ff35533f66fd91ef117d1f2edd8460190274966178f886";
+      sha512 = "b0c14a7e9ab36a5428e842370ce04c3856c7845924e42e604bba4d426b5b8ec2bbbd8ccb88f96030cd1971eafa1c40666f424122250d05f88026f2336b8f8f04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ur/firefox-64.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "86df507c3ff62a3912c037ffc45729cf7836e6735e30568f55f0f7d00c1c1a0cdfd41536705a74bfd8cd06c9cf9f3d2fbd8cc2019f0204d1f7e04015392d4016";
+      sha512 = "cc7a5cc3ad79dd76a50a5373dad37209f8c574bd459eadbafadb327037c6335e1b6bf28fb9aed93d29a76a00f12e5d22747c45091eca5a9ebd451c8d24d6c16a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uz/firefox-64.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d8a1195868fe5ad8c73304b92b854ead1dd51621a618abb4c42391fd4ae0cf7205d5caa490279e7dd86f5c2f8802eefd79aa2373b47fd16ed06f797bb8e4fda4";
+      sha512 = "9f263397c4bd072935d4d484d238082f3779cc83a59bd01d2810c635d994749ff55722dafa718286456af2fd2b4b1f02622c9ded919b850aa6c6bf46913371cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/vi/firefox-64.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c5e4f110d96386edc7cdc2252c10f3f24826763fae7a35d0ff0d803033c7e2384ed6fd3b1c3dab722c22927f1869e7fb87d82cd60abe920a1e9212a43a64f2ae";
+      sha512 = "149422236d100f5ffe064070047cfb4a6716630d75d72d31a420970002194ba883581b9793d5b16699d0e2dee1105ea849d76f0dce5b086ac606068feeaed0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/xh/firefox-64.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "908741b67bfef70bcaec20b76cb393e8497ecd6bb82f8302919df99cadc189fb665bff31388f81aa876927161dc753c63abfb63613e79a10065913e6762f3e97";
+      sha512 = "cb96bf8137975343245e00662590b558d66f01aad33522932c18306ef339ddd4dc2334be9a57f14331fe6dadb9a5ae06473ac3875f515163bead1b69bd03b6ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-CN/firefox-64.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "7ce0fb5fd6622c1a03ae2faf3f84fd56abc65beda43cef0d8d5d4889cda831ec3dd54566f383705625637b7d93b1684b6e6b6fbf345467fa44e3d690d118299d";
+      sha512 = "33e4c94fefb32dde1b80740bb7304a4da916964466f23de19a32f447be02300f9c97b6dd5709bc469773bc7680c3a8e88f39553ccef838b439b6e5b25850e0d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-TW/firefox-64.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3308bd7a442a84392bad111c3c8903b110b901075991774a9593d5a6a37e4fd805406e27a3bd5e39686fe348bd079a17aa063894f55912033ed75bdd64316ab8";
+      sha512 = "6d8deca1cc1f542d5de5137bcd6c10f7d1e70adfc67be286744224bcce3f0c1f76a9e6310c94c23842d952568293746888945c0fa89552b0550a3527b1d4067c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ach/firefox-64.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "18ac2cd8ca4c630aa80fa3b4c473fd2c7d20e9002cb40bdabc29a73fce7e5da6c4b5c5c3912efa067780b46e264a23aa39da466296741a942c1cc74fc3758fe9";
+      sha512 = "217d749356819fb06ca2208af220e176b0cd9552e9c3b540939df7f39e429121e4b3f48617fda16b9ddd4f8bfd48d88f215fc9556ed95d5191bed0b681d1cf23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/af/firefox-64.0b14.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2befe913a134bad225ab7dad76cc6202ee8184b271434636176ab3ed057db17481ed7ac925e48aa24509ae57e7fcdd176c187d55e4949ab5bd038e502f32e9ab";
+      sha512 = "a2032bf0c3eed7d6525a0e3b3cda01797334b345732f69c4689a3e39261a53c83512d822fd55086e6df88f216e158603842f6cd7225485a993d8645d780bf10a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/an/firefox-64.0b14.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "31af4d6a84c601fbf31f0e52d9eb7f68ab666de129f3a8c1b2d3a54e7061b159cdae09e6da54942fcded87abd2f5c41ea003563d0d657761cb9078446e138c36";
+      sha512 = "c25b2d0ced9bb95453581027f478d928ec343561a4c16f49d0f95e8e3194034c4e220f4c418f23f1e107e3f271314753b92d133073310c5c95586aec61c81850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ar/firefox-64.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3a62ec619dd5a8e041a443665188edeade532a2ecb0b5d78cfead8c4a0a4609de241701cea184453fdb58d295a0460b55009e94b6e01eb0f4d538da15bde8ba5";
+      sha512 = "955146bea4ecde03b4b27290c54f5a633de09ec882bb2a2ffd8fb675a31b51b5a448be66d170f4f3795896f1eb3ec9e54ebdf6f5872aec7170f57c4210b58871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/as/firefox-64.0b14.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "801beb19f6df2528996bd399607ae86ea3b31e8b11584d33cc7437857b5f77caa442c4ef26834839d4b99a0ee2b7ad1f33d43561f71879cf501823e5f0f6a9fa";
+      sha512 = "85b77a481fc7a82bb1b192176928e4095db19e03c19bbe64da4e07f1498620a6e31db44074b39dfa4f77641f7a74fa98669421f82c2c6bec053878c17c8390f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ast/firefox-64.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "29f3dd7b31f647e9b4ea4ca32b8c2a263816f929675e71ff995c8fb979fd079b5b42e71bebfc66e6470e0f5d029b90aee0c78c7a86d8825f411330624acf87b5";
+      sha512 = "48f56f503a0b036c4575a166a4c181d61d70d88ba6c2bfd984b0f5e392df175bf95d9eac93fde657ef1157a0ae0e727dfefc446a38a577a395c7a685e1aa09b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/az/firefox-64.0b14.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "97228f40fb86942a9870ff1c705dd70921f847a9b72db2f8c44738221dda1cade35d5fadc5f826169eba35c062e78dd7fe1aef02c9ae620c60a1366f6948b990";
+      sha512 = "07bce90b9ae3bbb45a93aff4cf9b645d4a700eec311463aa84cb0b08cffd2ae7b293f94b57c8f098ace91a5a949b1fabdd048d68829db16ea69f6e23b027eeed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/be/firefox-64.0b14.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "84ce6814ed7286bc616d6a225f3818584dd6a021c741bf3ee93b319b1367389ff893ebfb9f19d06c59131403fc6ce33e546257f0023ae3265189d984b5774c17";
+      sha512 = "800de070b9e722ba07831d86aab41c9fb3ed9377e796770887b71cdfb9eda9165ac752525bfdc5b7af28cd6b316863268820773741662dbc6287e5a3727e2407";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bg/firefox-64.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "fd075c08eccf7847a1d9b00a3d721e13a75b5387c5be8582a222c72bc7eeafe3b5972534c0ce15f14f5fd5158dcb7c22835b310d8ba64a69954ecba64dca3802";
+      sha512 = "804b72fa923fcdb6dbd5c4ce819557d71469ee797bef48fb6d51df150fe79b6d4f20612b7c2d69277facbb4164592028cbd514fa9e63ba00bbf4be4a3fe733a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-BD/firefox-64.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fcdb381d2b6d175f250144db7a13a682bf3589825a5157693f929801414b6e0e932d94caff9492e34da029b8589703913ae3a6e65175d5e1f0bab143663c72ae";
+      sha512 = "8ad135f5b98d792b7250c2dbb9d8616a3e2454f6cffa5850ba8ab7f8b1f1d2041fcce39e45333e8e6d08371da39dde3a8221cad6217e3264e1d32bdb7a7ce73f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-IN/firefox-64.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "c7379dd8549a83ff3cf67c2493ee7386aa90858f2169ce58727c6276ea113e7df9c9cc499bdb56b381e193f8fadbd23eb35f786153db0ff89f9bbf8f4408fe29";
+      sha512 = "c9cf90d40dc319df43f681bd7583681548924aa04e963c1c4d6f6128db7c9402810d3747e223ec4f6e3589e2ea6cb913329b238d15d4d9771b8efec6635cefc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/br/firefox-64.0b14.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "66a04d15ef3a77fabe4ba0e51c601315057377517b1428dace9036f0f7e4691bdf7e9ff7784065bcd6f5508bccc03eaa9181069f5b8f726e3d4937d1812d3eb0";
+      sha512 = "9ad73b35d93aa81732f35478da526be05e6c9f66773010b718f88cfa80817f0f3ff8d537a864a9c01cb197c2c780d604d82458ed982e1089febd85042a11ebc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bs/firefox-64.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "d7f0d44131ef2dba579067ead466b43b50ec3ed627c4d6fcadca1d9de93f754ee1bfc838bc7eaec90b2e4a9d08a4a057257e676e9de3699b4b6b8999b1fa375c";
+      sha512 = "10cb7314d0a56fc4c2b0bc7197c71c99f1693adabea53da6a1d1bc7abd17ab6d91a983030017a8cc09c759eb5d678efa4ca0dc8388b2c4c8e84ea52a0b849c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ca/firefox-64.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "43e52f7581535f86df2730e1aa4c3489a0842addf1c40c8f168913c1f5e6fae7713d24aea0a1d8dc7aa5afa7eeb9e5ae8701744861d715ad002ffc76c26c07df";
+      sha512 = "efcd45c51970dc198e1019410601b8788f0071f0b98d5d341fd6e9bf2733c2ddd84e9f29cb3d3239acc691e0f7d549f0714ab9fcf4dbba8d0f5a288075d65bb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cak/firefox-64.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "efa9b4744c1a3507e528d8a960d807df7c14b7cf7ed79e6d237897d7bb2d72305c0f147bdb5690468ff7ddda1cf56ee25d0aaf07b5cc7432e0e6d079f18e164b";
+      sha512 = "d33062aab7ecd8975539c1188c796f23ff045a27e3f357ccd747dfc6bbec50e79bc94f5c9bd2660e86d083259f69268397b405262e106b16956f9eedd73db106";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cs/firefox-64.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "0539e29a711894942d2732e5ec667101ac66f4a847cbcdd0155de776614882a0e41ac94df73ee8b85bc9b57dc6aa98650537d57115fbce7f95ebd4a6965e990c";
+      sha512 = "e3e5ebeba62b199c667b99abc3c06073603addd7ab76e0dbe1822d8b9c55aae69bf1f6dd6971190b52073cfbbaf66bcf01dfe5b9dcd13feaf96e5d0681aa240c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cy/firefox-64.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "72b69630ff274ede07fe09ea6bf09b85fbb5cc93dc3dcaa891cf9436d665f98634036397a67f7448aedfa1053018536e706c74ccdd35c523fbac8d47c16edfcf";
+      sha512 = "b1f9d3b0e9c004d8612fb3c852151c3384631f439432a766c01c1ea595095b154429ee6bb7881d3fdad0faf99674d81127be57ebb17bae1922b2d4de9f0dc699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/da/firefox-64.0b14.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e70f4d9dbf404638a83e1e07aa5fd815b54577291bee161093cff772c6227e54afa76e031711aa1c36dd7b13052c976d3ee69785c84084d00e2f9f9558b3199b";
+      sha512 = "8f56d6653eb56d3f32f74c04d58014126899d3a5349f7a6c56d015aab71cac523f4f3261fc21ae0a7645a99a83e9b55198391d2606c7b8a70e2b0d3fe58d1e08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/de/firefox-64.0b14.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "9ea87bad16b995f3e262df85d5fa321cf5f00484eea66dd92e77b79c6872ed2d496fca277be5afb937e35f98d72e71452f43cd7c27f28b27fe427b48ba014cc4";
+      sha512 = "c0b472e2080a24c5c35efff86adbb91dc5bdc89fc2c93804ec9ba35846d3d18d85022c7c2a0a0e405a14561fb635063149a4195928d1486ed8880a29c05e9904";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/dsb/firefox-64.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e30ab23fcd411ebeb62a86de32055d24ff683a3c5f4977ae4d23e312ab9a2f1b7f339e0f23732688674dbacb49c498f6a75352a4bed74ce677c55c1e495ed0d5";
+      sha512 = "fe5a95eb0c311c3131126ee92c4fc8f4e547b87871b6cf736c986a366bca60a85e5b6f593931725761417fa13d9edc275430ae1e73add67eee23fe0ff2750933";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/el/firefox-64.0b14.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a06fcc2bc07fb904a4a18e393001b0f204fc1a6a254def69eedd96b68ddab0f2a51863c78468e69dc534ac4948620ea8d643d14b2ca88ad68f0f367113a5b447";
+      sha512 = "c2d34ca92cd36fe745ca66d803569a26752e4f834dea0d07b0fea24365286a2f215c25fff6833be4f0fbe6fd89313693080fece2a1490d99b08ac85f76407e53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-CA/firefox-64.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "e1b1abd09668bd0865b5c802f748867a8fb26e0789710a636167731b97fcdc9b5490ceff11ce1968672abbfe315da473f7bea187799fb6c4e627d4a39fd1b7e4";
+      sha512 = "85b3d450ba292c2cc669af1d9f27821b96f0d13ad9d59fec2bd685bfc5bbf02489970337b51653108f64aa164182fdc670624a36eb07e55e8a7eafa6f16e1071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-GB/firefox-64.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b5dbc47b11fe634a5a53610fa0d45b975bcf3f7fcf8d7d7a739a1fb432647ee3da7b3b2d31c6eb1129e95ba6f5c7a42043c269405002b8507a8ff21743224db4";
+      sha512 = "bcd36733e157ae4e5c8580fd9deeb4e5d37084db4e7a4539ff2cdc7532bce95dfd26b4810c098d22ba89ae107f62272625a9702399ac2678c461efd7825142ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-US/firefox-64.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "df29871a2b3d44680781c8fd1436f92fe983e57d63c3952aa2ef67946165ae2ec55862c16678fa80e3edffffd604a9aa56c318deb9ab758d5d396802b762ca76";
+      sha512 = "5bf5c1cdd79d6bffd7137bc19ed0fd4ed91d4c9263e1d50c128fc06def9021cf9df67fa2f3b591a512189d7a0af98e85078b69382928417dc17881edddb11985";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-ZA/firefox-64.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "a7e97961d8900024fc546329e328cb01187407362186ca7b0285aa45ed8c201ead6bafcd3eb4576f2afdb97ab8204786723823830b3d889a889a377fd89f0e4c";
+      sha512 = "b39a6b3b404997a2379cabe03ce8c62ad0ab85dc48bb6ef76541fe3b91b0e51996ef02ec0c84d0f418814bf216344283cdb0a5f5ff7a6b554a69fb36bff02b69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eo/firefox-64.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "4a9b84fdc1962dd7de8878d6fe69f7eb541e61ce19522735f7a9cfaa07682d9ce4e85d7afc21258164b6687b2f99b232a6c8aeb4eb801cd136d49702458fc263";
+      sha512 = "50a61fe7e83bd540233773f9ba2684f4a9da9dd5ebd8a34dd05f1f56df7b442494263d83ac8114dfcf0d169548c02dfad9c3df5e05082718eb9ecd645fcd5e2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-AR/firefox-64.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "0e5d63725b14fa54fdc3303d94e23ad22fa0b705bd76a625652aac62e51038b4e0e24374b619c85d9b22ebede4a21bb42ad8085641dbb2a0bffbe58f62891a86";
+      sha512 = "352493a6c32f7108239f56cb6ff49e21d06a2c9dabace1ac11032023822b6b6ef7b38c1d9b1c7cd4832d2b120b60020608b51c286ee8d12757153fcc134aea0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-CL/firefox-64.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7973b9defe83a8af0b34085edb76ca4fbfcf82c22180aacbecede0fc6c19ad78cf45ae85f2621204b95cc5040240a287812001f22d3d3d199abb5759baebf65f";
+      sha512 = "093e218a562c96b54eed599dbed1aa41c2c396f5bba58e87888dfffae5a11084eaa6d8fdcb58c8f128346234d1df78241c0f6ae741b93e3f91a4c27481227b8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-ES/firefox-64.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8be4155ee76c366b8505133117dd3fc6c1cd19441d336b2541d9e118adb555d75dc63192f03f24ece93e007239b4a367199af1fd239dffa092637971817b4533";
+      sha512 = "60f46eb602026ed148e3b9d7728c9ed750e1e650e7d048b8dd4b4310ea1dcdf5d5b9b497d0a6719cfbbc8e390107d10836919ddd09cf4ee1fa156a841cc17424";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-MX/firefox-64.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b24773ebf3a61ccd304936269bf5e0ff84a0e3730d72f30efc068709c5282b3eb5a5405b0e690ad08f113433a32dac45cd0a2867f818225c99d69270e9fd036c";
+      sha512 = "05880045040e12908f563fc7b6e0b093ebd0452ad780e166f897a36caf38438d45844d784291720d6cb341adb7c983d2077f9327b433e05f1bb737d200fdad32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/et/firefox-64.0b14.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3767557a7e7e7452ed9703a9916d568a01e6e540b85e698dce5c7c8bdd238f495ce3001f9b81bfa7587f1ea35e4631de238c9153687cc9f745a6676d72e7a6b8";
+      sha512 = "4013943318b6d50be6a2f0f77bc5843915ac2d45ebf230fd69d005df4360b3e6e15b99212d32b7f48f250f6294f48604c57b325107b9e39c4934af325c21c4cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eu/firefox-64.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "55ea423b5127d1217c5b006f9e2f1e4b0cccf133c10be88d8058ce30bac1fe6fca49792924a0a3e0c0b601ac1c9c42d7c7cc0d73eca9624380cd733421572e24";
+      sha512 = "05cb185b8de02664e16170686d59fe32c55415002c9c75631ea1d105cbe6e7a2d144aef5d185948a051ef1841f7dddb7ba093d559421a49e0b458659009d1495";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fa/firefox-64.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "acc15a2dc4569a3d185a53fa70aa617320ff799a1f2dc9117d6c683385aac4d38232b3a6764cfe7af358095acd2c3392cab841b6c4d9df3e40a591de78b4523a";
+      sha512 = "78dff03e7719da65e6b96deb2ef9890bca4d79f8937fd012805876dea8ff3f66d9613bd805587fb5057f0bc2bb310933748484a7bde28ff4d1fc7f8982f20867";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ff/firefox-64.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b4bd8fb4f6124a4d669044be697d54867e172f13f589fb93c3369f57827d1e3ac2c3e82ae943babccde27cac9781b3c7d17b2315f2485b269553aacb293c8b17";
+      sha512 = "28b3e96c1ea34f3fe07c60442d3808698f9950ff818fea8a05a4b0298caf8195b602d6860837e91ec0a1129d389184ab0e2b577811b9c4e5d9b0c734c7cbe14e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fi/firefox-64.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "b7718b4ffe415b9ad394920dfb1f5fd63369aa77b94eba8d3e30ec15c38cf968869a84628aaebde70b3645fff387476ebb0b3ca1f55d304329b26256f4dea50f";
+      sha512 = "98825f294ad8a3c1eb8488e5600c1fa2b6b471b7a305b434775c07b8fd267656c160fa7c8d5f73c847f48714d1d5ebf108fae57e14ecff10ed7cca5cb5825c8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fr/firefox-64.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2f8b421c7d8ad9d56bf95e433f7062ea8565f08c7eb573c8ffe55615a4de2ee405035c1eada3bb6d0ab104c80869bbddc74a9930d7a890d2942c8b6f792325e6";
+      sha512 = "889f5fc32f9e547c602011d9d5d0af411b8ed6e98830293003d28bd397aacbc1f5d61ac30e171b379c311371a6dac1dc9df3ae27c671f303d15cbd52e5363498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fy-NL/firefox-64.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b3afff8338fdc2a93b3c3a848ddcb8ae2daf69954c577014d90bdf59255cec51deded49337ec5f44dab7d727364b4b58a1dc6b42bc50b8105d19123702646abe";
+      sha512 = "5d038c764a8eb3f07be729dc1adb5f84dd7a94d8f84521f42ee4192f5f432eb1e181871ef7be3acdbb9f158bb605eb3d99f2f788c876c6441811064672ca82eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ga-IE/firefox-64.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "8a67d8e7fc0b1a5463f460858aae93b3837a8005f80c2bf63bc209e610d153dc4eaa849c1f41394a79334d38d9f028b4e1fc0b91780bab9b7552ea4a32bcbb36";
+      sha512 = "01ab65cf6c3976aa305ade2ce5e04f5ff159289d2d808142e8dbbe537659de1d25a4da9cbafc6be839a50a63cffa6e8f3d2fd2d29feac8bfe5173ff42ddc8e9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gd/firefox-64.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "dd5824ab3d5934c3dba7d9ac98e0b9142a13b11f78d6530250fa0556b6e2fa2c4cd8df8519b245c8b2e50e74b67c8e983864aca8510a665b331d352f2ac6e623";
+      sha512 = "23f4dca508152ba7fd6b13dc20409d6b14c714fd8860ddeb66ed94b88ccd48f0b64d839a6ce852c974bbd3f142758fed42aaa817abac23bd58854e7f2c07c8bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gl/firefox-64.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "765241eb0ae051adcfa6624c9a68f2546856c981125d6a3dd789b5fc391d55059af5b1e46b196cd7e536aee67878d63ed6a4afb86cdfa1d4d7352e901ba8f63c";
+      sha512 = "ec7372f3fdd0e26f93d2251be0ded3b821dcf5927b6fc5a7a4b433d26f6900c775980b379a67a4414ba537443ce93523c2b6dec699401efcae0ab9c5d8e8bf90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gn/firefox-64.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "3b006caecfcafe9bfeafc2012b89326e219bf95a123aaaa4f3daeda2090754d6d33c8c7ff0f975042ac1ccd11737274e1f0582d4183bcb2ddc974355017ae1f4";
+      sha512 = "4f3057757e35632ee9b108310df950b0279ca9f47562416e955112f484caf8314a80c8296c39dec71a6d7a10aac13160898b662b2528c08cee8e497803ca5bd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gu-IN/firefox-64.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "fddeadb90c65301992851150e778ac57fa2c2466acd88ca6fbdd13f92c31eade24d4298dd19e75f7a381a435d4af77ab994ab3455f755f95dfc9ce6dcdfb478c";
+      sha512 = "4e1cb8376b86e68ebcffc42bf8b30cd78803df0e041371820db59de7eaeff8f982ff1222db88dc6f8c70f0dd2ed3491a9879c10d89ee1e4b98e9a266da538ba1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/he/firefox-64.0b14.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "88fbf1913ff9691593802d957b8b4477d66054f5c6e946f1384e7938d4e278c08a10a8b276e414a97fc95884667407528603424ac216242f59d55b3192541060";
+      sha512 = "7b617bb361bc9eadb83ee7b86e256dc0168014dc59e425effb9a2bbb765690a7ba0a2e89341f1d80ab86cd167b9a6f983ea963f06002d138dc9789445abcd79d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hi-IN/firefox-64.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "c7468faebc10827e741427658b6bad7e362ce3db6870bf262c52e715b0bdd58f797dd4f7d445d4e6f01ded022e0b352de4d0c81393e561247e6e37c972e4b60e";
+      sha512 = "b42be8e9b1a9271cd445cb7c939450ac92e7ce298e819d848c19af36c0fb0188aa86ccbd63acdd5499485ff543eee8c125515105f3ac46523112710aefc245b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hr/firefox-64.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "58417ccdb0885b74be71734d4dfaafedb024f15d11533840b0a50222c31f0e3029be6e154ae652f12691e6e05784c7fcf423fd8c89bb2e43db8cfd17791c4f7e";
+      sha512 = "51952b6eae0cb140653bac6130ad04f56d9e4325b872f3ae3bbe95fd7f151f58b3c67db294a1fb4919b8b184043c474bffd686208b7095ccfb7fa1574ab769c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hsb/firefox-64.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b1103601e66b63ba0ab01daae4f97fe8f5e69557f01728d0071802074b8eb2f91afba848139c0f8268bfc7fef627d3ef819b01900d377d7a7f1ae85e7d754bb1";
+      sha512 = "a2d414c1a227b5958571857ccd63a1a4c4a9bdb7fe73416c5040af71add3d8241d6edaf4529789961d170803463ac24c10e80da75352f8a1df77a47cf538fa8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hu/firefox-64.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "c1b30805a91e046cb606c5c51551f9b074b01fb03a822386d80c9c2dd5ffa468f755ca57baccb540e17125ae3a1d99e66d7dced48b739fdcc3626043876bb9fd";
+      sha512 = "eea04e03d76172c840e1c41bef9a3052337e22e98077db17be869aa7f825acbff5851411ff83d38a16d2d44b445ed0ed708ee967cd1f33d2ebe45b4e50ba71a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hy-AM/firefox-64.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "af29a30a9ac60fd744971e5a659b1fe9595b40be0f2427660ce9bcf6b504c11449410ed11c33eb750fc2397c1207d0b083cd0e448b0e068ebe9f5484c13415cb";
+      sha512 = "de09a05251e51d66aed8855779977c9b1173bd69e43744af6e36c5a24042c063e0d9a46c80080e19c37027df9603767d21fed2da90363d029388f675f06a041b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ia/firefox-64.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "9fd96091f9eda42525842c324a8977ad7d5ad5c50e52503f50719db6e4120ac2054e316b700d3c4578ac2e86b5258e6c54c7ed97504dd481b8fe83595e78257c";
+      sha512 = "0dcb346cfd2cbfa7f56e787eec952ed24e4621d0f265324c445423638239d954b60a82f7581f2f0afa913d7932577f16817795235efc9f8aac929e7c289e7ef6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/id/firefox-64.0b14.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2ccf109f956c82485b5dc3d93cbf11bbce8b4444c9c3cf823daa5510979c8ff10928d530422fa5e94f82903d464385ad1aeda67ccb675bc0234767d4cc4807e9";
+      sha512 = "1ef2790d719d4ffd3bd9a7b8aa5202fdf3e380e7d040503890f74f29eda74405bd19c88e0440db399852330d168323ca94766b0409d33af25f6d42018531e072";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/is/firefox-64.0b14.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "2bf59ce3fc5cff4b4e8d20d8f7ae83f4f12b1fffe891a737a21c1cb705e4b29d6cfde667716b10d665f7cfe04c2dc579977098edce6a2f321ff1c083bf94148e";
+      sha512 = "0e32f06993b335588ed8a27869b6b12daeaf79c2606d329ad8df94fa54abe425c694d7c7c48168123bf1bd561648654a26b8c308e50e882de328ba281d764acb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/it/firefox-64.0b14.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "52ee298ac6fd29ee68b0aa809253b7f35a583b305ba0effd03e4eb0e8087aff9614ccaf050b664bb0c136c196b7373b8f9507317c70df412bf9324bfd3845e1d";
+      sha512 = "632a2de491d1d791498c0ff1282151d42259bfa808c6fb3c05fbb8454e8e256a6b42cc4bbc4d9999b8d2303880110168be2adb872cc9c4dffd95445288b98d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ja/firefox-64.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "84a343da647255f25dec77be6225a47e5b129875e108a9ec41ac14fe4a006c6e1653114454595c5327f3c088073f44abb761b27abbb744bfc4163fd3208c827f";
+      sha512 = "c23a99e8f1b8b895402100c00409f5ee0ea602f69c998d0d05a8358223303d9f20e33e7894b54de30ee9395ce1e484526cbbdc1e9ddc99e23902833abbe91a22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ka/firefox-64.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9d110814322e9fc20026af9c9954ce76c9a2d782d64874f63ea46034660cc86fc5ec0789e4c2508fb729704623043e0a0c05e755faa9c62f7bad2ae3501936fc";
+      sha512 = "e6d6b1b9e5e44b002ffa7cf55cccf47cfe79d3056305443e891dec87e471b6be8f2bc4cb5c13d739f40ec9284588e62347c4c4a2e5b49839a4547aca2faf8a56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kab/firefox-64.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ec9d23bf953f1f3c0bcec9fa1059aa7d08ed51a781c1983fe71811a4b56e4727248941675745e7b83eef6a84de36d93068f0c574ff1d3e42d39a02b3415b5699";
+      sha512 = "b84b2505624f5356a6544ddd8279b6a77483a8d0574406b1e0f17b136895674b311fb57fd7025a0e1b2ee53577d57bb45b0f02ffb94ec1cedd3c93298589e7d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kk/firefox-64.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "c284fd70d033383e77faeb03afa658c0bc1be03e56b5b5d29db1bac6ec95c48d5150b17124cfefcd7a5ec04c016e68571c7d5624b89a58b185cab5c8cab9c1bf";
+      sha512 = "82732dbfc100ffc987fba5a721d7ba2c04bde1a750e1966bf6579fb9e1e9d23f00ba5ec239b6af3198fa8f8f1dc8b7cd6fb80598b24e54ec2aee1ba488858077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/km/firefox-64.0b14.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "fb838bf6f694ed93bdaef8a55f905daeec4ebdd7bbb57c133641ec017ed155b53452b6045dce7961283022605345a26f76e5e48f3b75bd056c2a69cf3662d741";
+      sha512 = "8deddc2f4559506870bcf4e5c26b7de898b48cc2544469df92ca3f617f5d8ddf86e9f9e7a77fdb9727fe5e5e166ef2257dd70c7d10105bce59734a4289b927c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kn/firefox-64.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a14ddd39b083eff5530badfb709dc32c9b5690372ccf88f333ccf9e0f67c1e73fe5182d580423e4f6d8a10356221ca34888605b0445ab494e2933dc259a4580f";
+      sha512 = "4d0e809945c3b5a874b72343be82484b99a10aaba0d70b85dffb3e6d7e3ebf6b8304b6b4dab648bf48c5c11722138e2275744295b86e4e1c2af07fad05b6960a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ko/firefox-64.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "b87aa42c208a3c71f874a0ab9e67e5b65b75749246f474efd9e5ed0f44873055810dec07c7674c69d197c5cd98c01ccf9af1d20c79563abb7415fd0e62b86d04";
+      sha512 = "eea6b2534ed9a368abd8dad636ea3b0d4298a9262795d694bc20c27136b325653113d077b57d361213395e916c29522daa5c8e0e8c9d151ef2243215ef97fd88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lij/firefox-64.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "0ca6688930361db90025a32b197f1f243bfd9c5e2231ac899f2ffd24278d6254fa498af67d4fcd11caf3422af814f5cf71897ff7bca885722e74bf2ffbaedb88";
+      sha512 = "bd941e32b3517a599c7f5bac36f8a9feffbdbf93bcfcaf776d84ea9d5f0408a3973431e1b9b6feded677b48ac4af26e6b888800e5acface9da7c6cd37fd250bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lt/firefox-64.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ce71aa99ba12d9ed490e7241b4350cb7a4f0e6ae9275306f5362fab4ac51a2fb1d7cf42feff1a2c682f6ed8b1845fbcaee5194f487b4912720c27e43546e7c1f";
+      sha512 = "efc4cdc50cda00b35d1f69033f76f1a9c0d4c530a08675c041423a8d0b4d5d24f3185a9d63cad594a5df6b7bde750cfa2fc13b9f7847944aa5243cc7b55f6d11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lv/firefox-64.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "bb5988a33aff18e4e050be8113b143158390b28e4bb7cbabc4b9e806644bf42bc7a5f0f5174bb9aaa6c46756fe04ee0a2aa402f33e2403fcc3e6601cf31d0abb";
+      sha512 = "8ad8ac07fa756b649a334f06f9795c3577e3e9128ca66b00541bc440711027d4ec8572eda71a0eaad38696e59031d3f23714f6372fe22e8ad38fb4029b322b28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mai/firefox-64.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "0541f86fce20e6bf565b84acd5bed5d954d1de412f0f584cf40ac2ba84b827fef95f7f055b3cb1a7cce824f5eeac3a905368c3c1f1d33202e091e7edb3537b14";
+      sha512 = "8627f3afd45555cd254c571070bf5100a25770c306f63f091fe61501fa0eb6e37e7ccb5bd3b9378bc494ae6025d39c45ab6dbd20cf5f7d744eff8b3ac02e724d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mk/firefox-64.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6138dcf84a21235861750e0d615862581e205bbea71d61861dbb17fd74c0e61d6bd9f223acfcb8eb623864cbfa800062293cae68748a320db143e1f509f54b41";
+      sha512 = "800cef931052b49ffe875464ec8756e96785d9d122aaf3b2dcc9397fcf524ed0375cd9cdc67681b99439e23556b0150b14bb02a5e9d7cbb6f3a806674b904030";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ml/firefox-64.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "4befe6de671de14fbac4ebee28018cea0402a0931bc3140f89b2dfccfb23de0d106f6236670730df9460ced8056cdd234c401b7a8a37d6fe6e70c9c61eb4094c";
+      sha512 = "ce8f90f83923cdfd0ed7cfcb63f4a225c7b5505f73671acdfeffe4dfd5d96dfd4b8746a6e956df22623b57f0ca2ef873f6508cd09c3335f460f8f87e5d0e4a94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mr/firefox-64.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "24f85d8cfb190770b3feeb78f46779e303a8e3037db75515bf7b2c99e1c836591913ff0a0c4f882c0c17d077bfd29a9762b92692c99dd77727e1bea4439a1a49";
+      sha512 = "df86766636cdec2dbf094f9a48e6b613df4a18371bb85862623a99a5cf095281f926c5bec51bba089183db363b14abd82ba771522dd4367ccca7ddafd532ea21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ms/firefox-64.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "90b81a464db5b992eccaeb08f7acaa383872f7d8e037eb53016b2db337658fb97a8afcb7a9fed9e39a9d6bb44bac0766656ce065e38a4485f5723ca6cc242cf6";
+      sha512 = "9e20aa9964c2036beeb4b5598f57d8f066062fc514229bff088a36bbffb46a9b6131b4ab7af77d785b98e6544a5e102e84cafae581ce7a2ac0ae8e5223dc8aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/my/firefox-64.0b14.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "afe60863fd0443e3a9069e0ca28025df53eef9b822be6b0a35144cc8ed3af1982bfce1c6e40c4aa17159f02836efceda6dfedb1a7bd7aa96d3de0eb348a60c38";
+      sha512 = "65c94ffa537b72cc89c09342ddeb8915a7e3cc0164bc3191e3e289e8c5217b175190465e49afbf5adf0f21864c787ccbbfd8b5eb2975ce4917e8d5cd5aefbc08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nb-NO/firefox-64.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4007d3e7623488754b3f2f80c6590727d0595e240374c67a057da1fbd64f106553c1fc2f5a8a4cc6ffea753790e522de188dcf0ea4bb6eb40df05b4b822da86e";
+      sha512 = "1ea09c94a276f6ea18b4f759d46197af94bbfcf313ddc3d60bf9b0b6c406fe4bca248ce13f6c54f9f0d01f54804ce13792be998b2bdf35db1fa39d0a1a4ce688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ne-NP/firefox-64.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "3b0edf144a57e656a44e8d7ebf2c4967280557be024a844ec230dd4d2a184966463ba6b39828653df67c2a6715d6f02873f5c5349705446ad487c6640806cd43";
+      sha512 = "b35addebf27849b8c9b7d486d73d8273b58f706e8bb23599628b973f558aa486c793446e3a4c05389fef1664b6a261460a47b2abc482ae5c7d8cca26963fa6b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nl/firefox-64.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8527ea936e66a182720ffa439d2893318c7af343ae5acf758f44d2293a3857dbc28f13d7147cc43e9644f4b174f73e8e4426c43c58038a582dc379a1e5e0f5ec";
+      sha512 = "e5b514b4582ee116910875887f8cd47573c6b8d63b451ce0471bc02c2f93bae7f52ad8e03eff732005eb40f4807cd2d9e5dd088045f1c3c7a0644629b9fb6968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nn-NO/firefox-64.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4a15662aa9aa8ca6b7a3f46868d4b7e3114fc644da9c4f141af0ee50fe4502ea1f37b7b007551460efb26cac9d788491615103cf442078ca678d4407b53d199a";
+      sha512 = "caed8e08167575fd143679f72c4d48eac7238f168e335f56b813c2f6e55f31c781ba423cac018ccc6cb69b4b73ae5d3bf6a9af48e7e087af42286b436ec95b85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/oc/firefox-64.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "77436ff6c82f3356a0b092274fb26543da73ae7ecc4f4d8ec8dd1ba6d282114ad01c557f5be9b541b5d41059a40699d5da5f15178ac6f9cf65b110812925ddf0";
+      sha512 = "6635eaa118bbc7f8f7945456c2fb8470f2398d68ae7a00266194e23d5a56c3c28dc4accfe0cd354c0d468229669c38547bd8cf0219db61ab21083163db3688bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/or/firefox-64.0b14.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "efe9b2b6237d2fa7ee679a535295ba3143ab00d226b611cd09bcf96934f55632b7f5498c03be50034c925c69a4fc25632b40c9ec5302dcdf43648542fddf4b5a";
+      sha512 = "360b38e0c605a332cb0fbd66d6c61fd419dbedd2589655e019e62fc40bff6d6fbe8e40a59812f44b3cae1ca21dd5c69971b7e9501744d75392bc377e3d3e36a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pa-IN/firefox-64.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e6879a8ad1d379a0562d9c5ab5cf521fbc3d195d5aae54bc5713f3f4fe4dedb42bd2d0b3c434ca77cb357f8665f03a32d5772a466f9ce802d0c1f123287e2557";
+      sha512 = "5368aee673272ca741ce4589bb191f654df557d9a929091bd430d47179e8007590233cd671184efa7bdde57f4d9db20700b5828c7d39a562d421280047bf4a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pl/firefox-64.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ae362910b20f6c9dcc1ab56a9f14532d1bce343f009ecb1d71d1907e15c11e78d532e9a1dc477c3070f63e1d6d9b322b8b3c629b5d11d18207ddf61fecd257dd";
+      sha512 = "557199b4c193d1bc6dbd09b84aad4a7c7a863725790c05ac3978bb393fdefa6dbb088a0c7a41415ec2e16bd8e355142b9956075f60d049db7a713b4d138053b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-BR/firefox-64.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "c6224a6a582ec2ba09de0c4f570a63ea79f03d34fcbc37adddded768758a5936ea9ac9661d429a0e500381ad7a9879d5afe222a6981fb45f5e23d15d5680271a";
+      sha512 = "f5db4fe1ccb3ef02bbb32b180a59af92fcf124b6bfd2a8e9e95452a61fc5740ee6a1084b842383d38bd59620ee1a542df79344640e7ee5e776c58b83830f4be9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-PT/firefox-64.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "b275a56a93f5332b9ae1aab11c896c0b971d9fb4aa9f574668e0d43edf0fa19d013afca12cf2b82cb493dea47caf262b2a0c504d9d1906de203622334d55eb7f";
+      sha512 = "f38d13ec454db404f40b2dbbebfc38c56e30f57ab586739e346d5a69da7fffb942ec2e9e1b76bf483f64c40dbd6641323fea3da3714926ca95d00b87847a5564";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/rm/firefox-64.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "76443d9234bf38a04820a25997a46fffcef58c3ed2593d50c7ab28280fae5c518dc353611a9b8b3070c337ca3815cf63b41826547ef673e6fbbd4037951e3c4a";
+      sha512 = "668790acf5664b71df38ff060a6e830cf646b685a7dcb5452eb21fd545bebac5a9533d6b424fadae7f3cb875955e7213b034d5ad0ef078a8a9ebe3372a4130a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ro/firefox-64.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "bc7b68dc5d6a05c66cb7aa6d39ab56c3f28174539caf5e27dbd2b3fae500fe439b51084d0ecd16d7cd9ea52dad5bdadcd5ebaaaf7e03256d30bd2229e0c7f89c";
+      sha512 = "bbf67517b93a28f6b5cb6ade1d0df2b6e89930ed172e56d76fff0b5d1ac0a8d30a2be46b4a7dc9300e3acb1fd69d79c2b757c79bb8746d25281970812e6bf70f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ru/firefox-64.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6daf35184d294395de7f4b203b38b0ef4071956fde1839f75265cf45b1f887640067e2eb17d5e5bfdb4f7cc0d4874579ea691ca8d5301f76ec2052c824d8331d";
+      sha512 = "ecf73f6633b502c6b5fde6b8dcd22a1688edd881360f87c7f399d7594474c753c7b6df2d1fde652ae9ab9938c16dff44f01c47b33a5988c00ee636291cddcbbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/si/firefox-64.0b14.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "db7f827ed173044811b994a89b8625f37f0a92994e0bf748f18082e5ab842dc147184b6b552c5b7bdb888d9c3ef4e6ed8555074936263c49f0517686213dec21";
+      sha512 = "7f3ed166ba6e8a9d223b881a26753fe255c441034b61f8ec06b0b67d83c20c08aadd28b86befe362a475f77ccbe26e9828eb81e116831d1e1251662163eb0d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sk/firefox-64.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e7dfb26f8f8d763d66b7d9f924fa30f55e55728cd9178602646504759c8d83864107f759983b95c5706d0438bcc534ee3020875ba2b06e161d669b7be2e38f0e";
+      sha512 = "e1e08ca8a53395abbc26b428d82cdc763db39dbb45fda351f3815d770f696e6629969bbc2a15053d87a589ad3755ffea29fe897004aeedfeeb166cf206f75ac6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sl/firefox-64.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c6a36cdbc579cef430ef91064c8c1fa6c1b63831701f5f0a416e0d41742f0e827e90cac66ad5684fca32e7bd69c8c40703b5a22055e84f83fde51ae1af3d60e7";
+      sha512 = "5fb47da8d75472bcb36b958cdc604f8d9c5ee92ebad423c3adcfe362c7f0e2e9f2bdb08aa2bc5e8e93fc3c8a619e2ec1796fa40d0a6634fb2cc22b163d978758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/son/firefox-64.0b14.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "1cf6b1c9ffdb1862258e0e0f54543c36d90f1dee02507ac4cf6d8c8c4a1be18902403870642231a721398dc757267e41e411bdc221303b0fd081845b474b22fc";
+      sha512 = "1020c0d63535096fe0c90907f5fc24753fc32d20fe53123c43ea58b4666f20486e4e1383a96f499e4b8abfa941a18d69f74d7f6fbf52f7b77201f19317bd8f2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sq/firefox-64.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "4e628b5cf477fd18c4ce325ae356e35eab9b40a40a653428864b2e1e2ba80cbbfded05ce6e280aedee76eb92a113486a460f77b70cc52ede270c7d04bb7987b3";
+      sha512 = "cbc20da6a33130b02683b8f5e3ee128f162f15728cfb40655c92ea94291dd614129e409a08d2a9d0def9557b48e8c548288ddf2d2b529855064ea17af3757844";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sr/firefox-64.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1b659513229e2f37bf797a703041c249d187ddf7bb3e239b67a49ffc42ecdf9d3affee300e3e3885c5961d1e57eb7590450f5bdf822503c8889cb782bd070457";
+      sha512 = "7c27e12229cd86a74917f6eda2c6a43711e7e1a20610c169c0da65e4eb6b646236e5dd31be22d679d74391387aa3b375863c2f0d8875d8d9abd701fc14ed011a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sv-SE/firefox-64.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "96317452a323db8fe04c4c83a40bb5112074f82f6a074e3b3a901bdd7d0e67f6bc3efaf230440e20d0f39fe27a6d2d2b14e6c5a34384b0c1aab11836af44432e";
+      sha512 = "c564b2af8421990b0efb90f81f226aa63224275bc0b9ca614bcdbd0a95c3f85970b783d301b122d5198478ae8e7dc3ebe5f29fed417c0d5ea63e6a9e8b62a087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ta/firefox-64.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5c87b548553e34586a8f3bcec429735c4e7ac89027888b60be89e68710a79bdc2000787cc5000cbda771d0cb704c8e3edd404d4b4148f1aec87a9b5cf7e82754";
+      sha512 = "9f7a8321bf8333992bb3888005646cc0af4362ad447ed3024196426c43289669ae791f24c09553e275ad184625f910de8e09345ccf28d231741b5dd2ff1b280e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/te/firefox-64.0b14.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b75bd0e03305cff00d4ab904545b1d5b075abba9d1e27e4cbfb158c109506c72494242be9b3e5728c47d5f93a302efca3c8c9661c9e7fdec3dff3b6424009796";
+      sha512 = "d53f9bcde30f9c884a67abe5d1d83f6fa9a33757b73fb026cc32535563a3fb4f97ad98f924054016e7102962eab3a858dd9004b171396b10b01535bc62771d4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/th/firefox-64.0b14.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6df43a8e11ccef31995e7fc3ad47e8666c08a3663be3b3c055900896c9f0379e85066fc6387e35546a4ba73781cec631a73cc92a4e648cc0b31efec16c652ccf";
+      sha512 = "0d122ecbd5c22cb3c1d05156fc446ec4bceebf63675bd7d2789972bfa9acef83fb247080172f04f7341be0c59d478606bfae73a1c73f55139788b40b7851a58e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/tr/firefox-64.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "9cbf8d659be4a7e32da95bc9d76b435b22e1e83e10a93771f247540eb313e0d476f231c436d1e39bba4ebb7264a1be4e5f1a677bee5b0af3fd83c42887cf173d";
+      sha512 = "ff2165f42c5916cabe416804af8e0bf8c24f4da91ff5c30731e0c05c84aec3099e15abd02c9d4d37bb42b7d749b9bb50374c24d51b2fc83c3b22476dd2eff47c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uk/firefox-64.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bf79b845f6ac4eccbeca2de07bc0f9668541ecf62f109919c15b6348428dab7b748de330861f2c77de6bec4609608a9927ccf7743446c879d8c7cd99ec021ee9";
+      sha512 = "1dedde0a990ca3e32b2110d13a3c270bb615ce6609632ad6a2d014cc96a950690c795e8336b75b0c492f0577d0d4d43876d285ce1f2292fd8591d5d648a442a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ur/firefox-64.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "7609d8c93d71f20898d77d08066ff51a418d9cd7fe616c42669bb5879856dae2c1b40cf6a74ccd65d6360857369a96b5eb7e03ecc1babaef95d6baf9b52b85e6";
+      sha512 = "1d2d39cd8db329b7f717cee5cab6e56be05e93091752a1ae02e4a3fe36bbfe9391cd6117775b63821540f0de708ddaae4dd1a1b998d755269568c7810c07fe86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uz/firefox-64.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "342aac005ea6aaab04988133d27154c6a2c1d8404b9865413d07febc42325b3c63c2b85ab11cacb4120e74693c3a8e447b396b8fdff93ab913041b73ccb91372";
+      sha512 = "83b17251083ac9790ce57a7d6ed62e7df86c97770b6ed4b6b3eb4d583f1edbba9ce06c3c3b10596e237f79b4afc11483cf926225a5834f7e1c4ab7ab27abdffe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/vi/firefox-64.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5c44ce438816a7ebfee3e3eaac121845a53750439387b4d01c9a846bcc344a85cc95705d1bbe514de11297909be425f0d5134863be4f0901b963c7dfa552957e";
+      sha512 = "3ee2013dc094b0b77533d88548fb5906f1a7ca1440a50a1585e04f09d1aa62c853f0837a6b218e1818ae93f0e838cbda1915f40b2030e10386a2642820fa9729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/xh/firefox-64.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "21b9ac22d9167cf830f6594cce7b3b1deef155c6c7baf60ed74769bff792f57a58e3f2db351a1df41a479963cdc3dc81e120ff4d47d7aefeeb330994a98326cd";
+      sha512 = "2bc8af3262deb7c3ee5087921f721066ebaef6cc9c93a36b1dfe8fb2b43afcb276a78a32d959d52cafc33b0a869860c0963d6f1389cd0f3860bc0c95963a916e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-CN/firefox-64.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7b1a10588bb981006e0e28c8725e69c9acb9a029d8cc8e587fe47b59eb9021a3718bc4a2dee658b5cedf426051d23d55c4d6c4dfc0df0867fabc2a0fdd0fa874";
+      sha512 = "b51a683f3a8f52c41d9ef0e8aada1007fcd3db95cff4c36b353698de3f406f232e78134e4095f3fe3f8b8b2445d095141fa2ac3a5186943db5d35027e63319a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-TW/firefox-64.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8a30a6cf262adf1a65dd4964c5970ef2d3641561ec1f085f8606b5492570f43e7e5a0e2562f4e873056c3a9a3b4b8377b2e85f952c2d382ca800576b64a3d866";
+      sha512 = "811498331ce6e2c9b7297069f4b5990f092b7330ffd4ef296612bc542bbad0839180753d09cfbfefde965b6ccc6a8783ec1eee891817e665675f08bb4e8e3b0a";
     }
     ];
 }

From 1f7266cbbb1579238b7e5958accd9668dce87022 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:33:36 -0500
Subject: [PATCH 1432/2793] linux: 4.9.142 -> 4.9.143

---
 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 01328250186..d05eead7f7f 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.142";
+  version = "4.9.143";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil";
+    sha256 = "1grcmh85n6ya8h2v0qx2pxryjxx3501kjbknz3a5yrwnlrj69dqf";
   };
 } // (args.argsOverride or {}))

From e945771e4ca6780fd8df8520ad595bcdc529ed6f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:34:13 -0500
Subject: [PATCH 1433/2793] linux: 4.14.85 -> 4.14.86

---
 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 008c23ee9af..a493ae359f7 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.85";
+  version = "4.14.86";
 
   # 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 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4";
+    sha256 = "0a3f4rn9aixmx6ssqw0yqcr37js790qvb28v40rpg49b0aln14ns";
   };
 } // (args.argsOverride or {}))

From 808d52ee05d2672963e3da8d3ca25e4dc022840f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:34:29 -0500
Subject: [PATCH 1434/2793] linux: 4.19.6 -> 4.19.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index ccdb95b1411..d432680d445 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.6";
+  version = "4.19.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 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4";
+    sha256 = "1lm2s9yhzyqra1f16jrjwd66m3jl43n5k7av2r9hns8hdr1smmw4";
   };
 } // (args.argsOverride or {}))

From 8942a3e00c678102e1412170e44b49aa885cd955 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 5 Dec 2018 12:27:25 +0100
Subject: [PATCH 1435/2793] chromium: 70.0.3538.110 -> 71.0.3578.80

CVE-2018-17480 CVE-2018-17481 CVE-2018-18335 CVE-2018-18336
CVE-2018-18337 CVE-2018-18338 CVE-2018-18339 CVE-2018-18340
CVE-2018-18341 CVE-2018-18342 CVE-2018-18343 CVE-2018-18344
CVE-2018-18345 CVE-2018-18346 CVE-2018-18347 CVE-2018-18348
CVE-2018-18349 CVE-2018-18350 CVE-2018-18351 CVE-2018-18352
CVE-2018-18353 CVE-2018-18354 CVE-2018-18355 CVE-2018-18356
CVE-2018-18357 CVE-2018-18358 CVE-2018-18359
---
 .../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 c2a73480b98..a6dc397cbc5 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 = "0nxxqfncw9ci3rhg8fiqaxy6zvh9x3j10lw8yw7c0cg2yni10qsp";
-    sha256bin64 = "0frcaplyzhkxzzcfcf0vigqpzixar4jg9hhrh4i8z8vx2gnxkwwy";
-    version = "71.0.3578.53";
+    sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
+    sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay";
+    version = "71.0.3578.80";
   };
   dev = {
-    sha256 = "11bsn77kvjqdwpiwjf4gaindfj0sx932wp6g7cald0638wdz7pqv";
-    sha256bin64 = "1j5pd8imc35ch7l3jmnmjm2yda2xzdwha5im34240wm6rrdr2v2j";
-    version = "72.0.3610.2";
+    sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4";
+    sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87";
+    version = "72.0.3622.0";
   };
   stable = {
-    sha256 = "0bwlq5xii26b3yngwkwb7l2mx03c30ffpym4xg0hcci8ry7zhpj4";
-    sha256bin64 = "1gnhjbpkp2gn3y5pingwv153bakidq60pr4fj2iq1kniyllsmmpg";
-    version = "70.0.3538.110";
+    sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
+    sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4";
+    version = "71.0.3578.80";
   };
 }

From 72c059fad6c98b6200bb70489832686ec4361e7d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 5 Dec 2018 23:37:43 +0000
Subject: [PATCH 1436/2793] waf: 2.0.10 -> 2.0.13

---
 pkgs/development/tools/build-managers/waf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 5c6283b00a1..1b884307273 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "waf-${version}";
-  version = "2.0.10";
+  version = "2.0.13";
 
   src = fetchFromGitLab {
     owner = "ita1024";
     repo = "waf";
     rev = name;
-    sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7";
+    sha256 = "1r4nyxpf07w98bx9zx0xii97rwsc27s6898xi9ph25p0n6hsdxxg";
   };
 
   buildInputs = [ python ensureNewerSourcesForZipFilesHook ];

From 8af15af15cab4bc6bdda1d272e008a818616c1e2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 5 Dec 2018 19:37:06 -0500
Subject: [PATCH 1437/2793] pythonPackages.flake8-future-import: fix build on
 Python 3.7

---
 .../python-modules/flake8-future-import/default.nix    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index eaed804245f..c9cf3fe4ca8 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
+{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
@@ -12,6 +12,14 @@ buildPythonPackage rec {
     sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr";
   };
 
+  patches = [
+    # Add Python 3.7 support. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch;
+      sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r";
+    })
+  ];
+
   propagatedBuildInputs = [ flake8 six ];
 
   meta = {

From 508cbf4d25aeead1442a4c3ef1ee1336cc703645 Mon Sep 17 00:00:00 2001
From: eburimu <urusan80@gmail.com>
Date: Thu, 6 Dec 2018 03:58:19 +0300
Subject: [PATCH 1438/2793] fontconfig: fix cross make-fonts-cache &
 make-fonts-config

---
 pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 4 ++--
 pkgs/development/libraries/fontconfig/make-fonts-conf.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 1c88235b925..dcef4a4b205 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,8 +1,8 @@
-{ runCommand, lib, fontconfig, fontDirectories }:
+{ runCommand, lib, fontconfig, fontDirectories, buildPackages }:
 
 runCommand "fc-cache"
   rec {
-    buildInputs = [ fontconfig.bin ];
+    nativeBuildInputs = [ buildPackages.fontconfig.bin ];
     preferLocalBuild = true;
     passAsFile = [ "fontDirs" ];
     fontDirs = ''
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index 3cd4a894b37..4d353f5d7e2 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -2,7 +2,7 @@
 
 runCommand "fonts.conf"
   {
-    buildInputs = [ libxslt fontconfig ];
+    nativeBuildInputs = [ libxslt fontconfig ];
     # Add a default font for non-nixos systems, <1MB and in nixos defaults.
     fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
   }

From 561959bab88c589b6e3bd02c1ca1f8f7674864b7 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 5 Dec 2018 20:30:03 +0100
Subject: [PATCH 1439/2793] x2goclient: 4.1.2.1 -> unstable-2018-11-30, fix
 build

---
 .../networking/remote/x2goclient/default.nix  | 19 +++++++++----------
 .../networking/remote/x2goclient/qt511.patch  | 15 ---------------
 2 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/networking/remote/x2goclient/qt511.patch

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 01aaa2219bf..3d65b7a621b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
-makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
+{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh
+, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "x2goclient-${version}";
-  version = "4.1.2.1";
+  pname = "x2goclient";
+  version = "unstable-2018-11-30";
 
-  src = fetchurl {
-    url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w";
+  src = fetchgit {
+   url = "git://code.x2go.org/x2goclient.git";
+   rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8";
+   sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh
-                  qtbase qtsvg qtx11extras qttools phonon ];
+                  qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
   nativeBuildInputs = [ makeWrapper ];
 
-  patches = [ ./qt511.patch ];
-
   postPatch = ''
      substituteInPlace Makefile \
        --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch
deleted file mode 100644
index 8f02cd62277..00000000000
--- a/pkgs/applications/networking/remote/x2goclient/qt511.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/printwidget.cpp b/src/printwidget.cpp
-index 58a8af7..131d340 100644
---- a/src/printwidget.cpp
-+++ b/src/printwidget.cpp
-@@ -23,6 +23,7 @@
- #include "x2gosettings.h"
- #include "x2gologdebug.h"
- #include <QDir>
-+#include <QButtonGroup>
- #ifdef Q_OS_WIN
- #include "wapi.h"
- #endif
--- 
-2.17.1
-

From 71dbc5a77b7e36ecada78ed9eb061b35edb4a288 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 01:07:10 +0100
Subject: [PATCH 1440/2793] terraform-providers: update

---
 .../cluster/terraform-providers/data.nix      | 51 +++++++++++--------
 .../cluster/terraform-providers/providers.txt |  2 +-
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 8271346f25e..2e02b121afc 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.23.0";
-      sha256  = "14hs58lqlj9vkmr4bxbyga8yz4h6mrx6zla587sqwgj5bjrg5vld";
+      version = "1.25.0";
+      sha256  = "09f0vdzkifj2mk1qccacpnlqiihbhhb2sfd21rpxbqscmj6a7vj1";
     };
   archive =
     {
@@ -39,8 +39,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.46.0";
-      sha256  = "1xp02cwyl9sf8swl7x3wah3bg0ssm7y0svq8bkfki6632nfw9vzi";
+      version = "1.51.0";
+      sha256  = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg";
     };
   azurerm =
     {
@@ -137,8 +137,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      version = "1.5.0";
-      sha256  = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz";
+      version = "1.6.0";
+      sha256  = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh";
     };
   digitalocean =
     {
@@ -235,8 +235,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-hcloud";
-      version = "1.5.0";
-      sha256  = "135h811qh1l1kn66n371f00b422xi4zw15cgs3id866za5cavxf3";
+      version = "1.6.0";
+      sha256  = "19kax1l2l6vr8cwgy14ahhafnvlxgkw86xx2g9ajfg70d0q4zs3g";
     };
   helm =
     {
@@ -270,8 +270,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-icinga2";
-      version = "0.1.1";
-      sha256  = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
+      version = "0.2.0";
+      sha256  = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0";
     };
   ignition =
     {
@@ -291,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-kubernetes";
-      version = "1.3.0";
-      sha256  = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3";
+      version = "1.4.0";
+      sha256  = "14bhqrpx0z4qn51xwcklafva46ipx05q6myy7xh5wf6wpjz69j9p";
     };
   librato =
     {
@@ -305,8 +305,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-linode";
-      version = "1.2.0";
-      sha256  = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l";
+      version = "1.3.0";
+      sha256  = "1683nkpq7wnc67pphablcmaifq2l1pz3gc9y5y9jbslllphy92v5";
     };
   local =
     {
@@ -396,8 +396,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      version = "3.7.0";
-      sha256  = "10d8hvcr019cr8fh54klnr9xhi0y3l5w4nb2h9bny84nv2rznk38";
+      version = "3.9.0";
+      sha256  = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97";
     };
   oneandone =
     {
@@ -459,8 +459,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "1.2.0";
-      sha256  = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf";
+      version = "1.2.1";
+      sha256  = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n";
     };
   panos =
     {
@@ -536,8 +536,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.7.0";
-      sha256  = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk";
+      version = "1.8.0";
+      sha256  = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2";
+    };
+  selvpc =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-selvpc";
+      version = "0.3.0";
+      sha256  = "1s1p0qa9x007hq26i4h0gcqpyx54jnwvg8d6ya044gm7gghhviz4";
     };
   softlayer =
     {
@@ -592,8 +599,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tfe";
-      version = "0.3.0";
-      sha256  = "125k1hgpzwlsgslnz2nwz4mc5yl3hqyg48xdcn7bxvmvaf6kw9gd";
+      version = "0.4.0";
+      sha256  = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn";
     };
   tls =
     {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index 16305b4b90c..1161094df38 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -7,7 +7,7 @@
 #  <organisation>/<repo>                                         - include only the named repository.
 
 # include all terraform-providers
-terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
+terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\)
 
 # include terraform-provider-matchbox
 coreos/terraform-provider-matchbox

From ae49c73644c05f1eaf8fbd5e88d0971e3dd6a8c5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 01:07:22 +0100
Subject: [PATCH 1441/2793] terraform-providers: add terraform-provider-secret

---
 .../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 2e02b121afc..a69229735f8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -658,4 +658,11 @@
       version = "0.0.1";
       sha256  = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
     };
+  secret =
+    {
+      owner   = "tweag";
+      repo    = "terraform-provider-secret";
+      version = "0.0.1";
+      sha256  = "1mqs1il8y97hf9havcmxdfwjcpkrxa1hpkifzzy4rjc88m2m4q9r";
+    };
 }
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index 1161094df38..d5db0b91ae2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -14,3 +14,6 @@ coreos/terraform-provider-matchbox
 
 # include terraform-provider-nixos
 tweag/terraform-provider-nixos
+
+# include terraform-provider-secret
+tweag/terraform-provider-secret

From 129502ec3f9142d3eabd45afa9ca41b22328717c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 12:40:42 +0800
Subject: [PATCH 1442/2793] pythonPackages.flask_login: fetch from PyPi so we
 can override the version

---
 .../development/python-modules/flask-login/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index 1a01666d799..d466a78a681 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
+{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
 , flask, blinker, nose, mock, semantic-version }:
 
 buildPythonPackage rec {
   pname = "Flask-Login";
   version = "0.4.1";
 
-  src = fetchFromGitHub {
-    owner = "maxcountryman";
-    repo = "flask-login";
-    rev = version;
-    sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8";
   };
 
   checkInputs = [ nose mock semantic-version ];

From 547cd5bfd4fe47ce868394bdbf2e2020169d60dd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 12:43:36 +0800
Subject: [PATCH 1443/2793] octoprint: 1.3.8 -> 1.3.9

At the same time, clean up how we handle dependencies (shamelessly stolen from
home-assistant) and override version constraints.
---
 pkgs/applications/misc/octoprint/default.nix | 149 +++++++------------
 1 file changed, 51 insertions(+), 98 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 41bc94a5130..9622689199a 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,91 +1,62 @@
-{ stdenv, fetchFromGitHub, python2 }:
+{ stdenv, lib, fetchFromGitHub, python2 }:
 
 let
-
-  pythonPackages = python2.pkgs.override {
-    overrides = self: super: with self; {
-      backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec {
-        version = "3.4.0.2";
+  mkOverride = attrname: version: sha256:
+    self: super: {
+      ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
+        inherit version;
         src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
-        };
-      });
-
-      flask = super.flask.overridePythonAttrs (oldAttrs: rec {
-        version = "0.12.4";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
-        };
-      });
-
-      tornado = buildPythonPackage rec {
-        pname = "tornado";
-        version = "4.0.2";
-
-        propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
-        };
-      };
-
-      flask_login = buildPythonPackage rec {
-        pname = "Flask-Login";
-        version = "0.2.2";
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
-        };
-
-        propagatedBuildInputs = [ flask ];
-        checkInputs = [ nose ];
-
-        # No tests included
-        doCheck = false;
-      };
-
-      jinja2 = buildPythonPackage rec {
-        pname = "Jinja2";
-        version = "2.8.1";
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
-        };
-
-        propagatedBuildInputs = [ markupsafe ];
-
-        # No tests included
-        doCheck = false;
-      };
-
-      pylru = super.pylru.overridePythonAttrs (oldAttrs: rec {
-        version = "1.0.9";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c";
+          inherit version sha256;
         };
       });
     };
+
+  py = python2.override {
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
+      (mkOverride "flask"       "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")
+      (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3")
+      (mkOverride "jinja2"      "2.8.1"  "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m")
+      (mkOverride "pylru"       "1.0.9"  "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
+      (mkOverride "sarge"       "0.1.4"  "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
+      (mkOverride "tornado"     "4.5.3"  "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
+    ]);
   };
 
-in pythonPackages.buildPythonApplication rec {
+  ignoreVersionConstraints = [
+    "Click"
+    "Flask-Assets"
+    "Flask-Babel"
+    "Flask-Principal"
+    "PyYAML"
+    "emoji"
+    "flask"
+    "future"
+    "futures"
+    "pkginfo"
+    "psutil"
+    "pyserial"
+    "python-dateutil"
+    "requests"
+    "rsa"
+    "scandir"
+    "semantic_version"
+    "websocket-client"
+    "werkzeug"
+    "wrapt"
+  ];
+
+in py.pkgs.buildPythonApplication rec {
   pname = "OctoPrint";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
-    owner = "foosel";
-    repo = "OctoPrint";
-    rev = version;
-    sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3";
+    owner  = "foosel";
+    repo   = "OctoPrint";
+    rev    = version;
+    sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
   };
 
-  # We need old Tornado
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with py.pkgs; [
     awesome-slugify flask_assets rsa requests pkginfo watchdog
     semantic-version flask_principal werkzeug flaskbabel tornado
     psutil pyserial flask_login netaddr markdown sockjs-tornado
@@ -94,31 +65,13 @@ in pythonPackages.buildPythonApplication rec {
     frozendict
   ];
 
-  checkInputs = with pythonPackages; [ nose mock ddt ];
+  checkInputs = with py.pkgs; [ nose mock ddt ];
 
-  # Jailbreak dependencies.
   postPatch = ''
-    sed -i \
-      -e 's,pkginfo>=[^"]*,pkginfo,g' \
-      -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-      -e 's,websocket-client>=[^"]*,websocket-client,g' \
-      -e 's,Click>=[^"]*,Click,g' \
-      -e 's,rsa>=[^"]*,rsa,g' \
-      -e 's,flask>=[^"]*,flask,g' \
-      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
-      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,PyYAML>=[^"]*,PyYAML,g' \
-      -e 's,scandir>=[^"]*,scandir,g' \
-      -e 's,werkzeug>=[^"]*,werkzeug,g' \
-      -e 's,psutil==[^"]*,psutil,g' \
-      -e 's,requests>=[^"]*,requests,g' \
-      -e 's,future>=[^"]*,future,g' \
-      -e 's,pyserial>=[^"]*,pyserial,g' \
-      -e 's,semantic_version>=[^"]*,semantic_version,g' \
-      -e 's,wrapt>=[^"]*,wrapt,g' \
-      -e 's,python-dateutil>=[^"]*,python-dateutil,g' \
-      -e 's,emoji>=[^"]*,emoji,g' \
-      -e 's,futures>=[^"]*,futures,g' \
+    sed -r -i \
+      ${lib.concatStringsSep "\n" (map (e:
+        ''-e 's@${e}[<>=]+.*@${e}",@g' \''
+      ) ignoreVersionConstraints)}
       setup.py
   '';
 

From d354f7cbe638715fd3258934ba611b6fa236f2ba Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Thu, 6 Dec 2018 14:57:30 +1000
Subject: [PATCH 1444/2793] atom, atom-beta: Fixing Exec= line in app launcher

Prior to this commit the application launchers of Atom and Atom Beta executed `/usr/bin/${pname}` instead of what it is meant to `$out/bin/${pname}`. This is because upstream changed the `Exec=` line from `Exec=/usr/share/${pname}/${pname}` to `Exec=/usr/bin/${pname}` and the `substituteInPlace` line that was in the default.nix file was not appropriately adjusted.
---
 pkgs/applications/editors/atom/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 834c6bedf3c..73a9f26a122 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -44,8 +44,7 @@ let
     buildCommand = ''
       mkdir -p $out/usr/
       ar p $src data.tar.xz | tar -C $out -xJ ./usr
-      substituteInPlace $out/usr/share/applications/${pname}.desktop \
-        --replace /usr/share/${pname} $out/bin
+      sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop
       mv $out/usr/* $out/
       rm -r $out/share/lintian
       rm -r $out/usr/

From 7ff4f5be26ddb2f9f5014e265eb259901002c90e Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Thu, 6 Dec 2018 07:04:03 +0200
Subject: [PATCH 1445/2793] rambox: 0.6.2 -> 0.6.3

---
 .../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 8f0f06c07cc..29ed30dd27f 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.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "ramboxapp";
     repo = "community-edition";
     rev = version;
-    sha256 = "150vf62cp739l9dgpnksgpkffabs2wi15q217m3nai34irhwzk8m";
+    sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
+    sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6";
   };
 
   patches = [ ./isDev.patch ];

From f9fc51c5533a4c9e0d99d6abedff86ea702acca9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 13:05:27 +0800
Subject: [PATCH 1446/2793] octoprint-mqtt: init at 0.8.0

At the same time:

 - build plugins against python2 as that is what octoprint uses
 - do not run checks are there aren't any
 - use buildPythonPackage as these are not applications
---
 pkgs/applications/misc/octoprint/plugins.nix | 30 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index bd65acf5e5e..2e3bc058280 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, octoprint, python2Packages }:
 
 let
-  buildPlugin = args: pythonPackages.buildPythonApplication (args // {
-    buildInputs = (args.buildInputs or []) ++ [ octoprint ];
+  buildPlugin = args: python2Packages.buildPythonPackage (args // {
+    propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ];
+    # none of the following have tests
+    doCheck = false;
   });
 
   self = {
@@ -42,6 +44,28 @@ let
       };
     };
 
+    mqtt = buildPlugin rec {
+      name = "OctoPrint-MQTT-${version}";
+      version = "0.8.0";
+
+      src = fetchFromGitHub {
+        owner = "OctoPrint";
+        repo = "OctoPrint-MQTT";
+        rev = version;
+        sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7";
+      };
+
+      propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
+
+      meta = with stdenv.lib; {
+        homepage = https://github.com/OctoPrint/OctoPrint-MQTT;
+        description = "Publish printer status MQTT";
+        platforms = platforms.all;
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ peterhoeg ];
+      };
+    };
+
     titlestatus = buildPlugin rec {
       name = "OctoPrint-TitleStatus-${version}";
       version = "0.0.4";

From b269c6c4d8e2361510c48bfc7ebdfa0267e5cd62 Mon Sep 17 00:00:00 2001
From: Tyler Mauthe <me@tylermauthe.com>
Date: Wed, 5 Dec 2018 21:30:35 -0800
Subject: [PATCH 1447/2793] plex: 1.13.9.5456 -> 1.14.0.5470

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 4e783f3a507..9561af537e3 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.9.5456";
-    vsnHash = "ecd600442";
-    sha256 = "6d1125d4e6eaa94a84f8c600230b867c2d0764644adbc959a96433b8fc210b61";
+    version = "1.14.0.5470";
+    vsnHash = "9d51fdfaa";
+    sha256 = "cf547d286c731e98b19b70954f2777653fe77c30c329faab260c460374984010";
   };
 
 in stdenv.mkDerivation rec {

From 69baf44674ffe70c2c541256815113f2144216d6 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Thu, 6 Dec 2018 18:53:09 +0800
Subject: [PATCH 1448/2793] solc: 0.5.0 -> 0.5.1

---
 pkgs/development/compilers/solc/default.nix   | 15 ++++-------
 .../solc/patches/shared-libs-install.patch    | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 283d036d412..af9ddb872f9 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.5.0";
-  rev = "1d4f565a64988a3400847d2655ca24f73f234bc6";
-  sha256 = "0phzk2whvgrrf8xpl5pz886glhd5s40y1hbbvq9q3fxf6vc3lisy";
+  version = "0.5.1";
+  rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981";
+  sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -28,11 +28,6 @@ stdenv.mkDerivation {
     echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
-
-    # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
-    substituteInPlace cmake/jsoncpp.cmake \
-      --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
-      --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
   '';
 
   cmakeFlags = [
@@ -42,7 +37,7 @@ stdenv.mkDerivation {
   ];
 
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
-  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
+  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
                "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
 
   nativeBuildInputs = [ cmake ];
@@ -56,7 +51,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/ethereum/solidity;
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ dbrock akru ];
+    maintainers = with maintainers; [ dbrock akru lionello ];
     inherit version;
   };
 }
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 70162bfbcb6..fa30655e04e 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -2,11 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0c05208f..8893648e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
  add_subdirectory(libsolidity)
  add_subdirectory(libsolc)
  
-+
 +install(DIRECTORY libdevcore/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
 +        FILES_MATCHING PATTERN "*.h")
@@ -16,6 +15,12 @@ index 0c05208f..8893648e 100644
 +install(DIRECTORY libsolidity/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
 +        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY libyul/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul
++        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY liblangutil/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
++        FILES_MATCHING PATTERN "*.h")
 +install(DIRECTORY liblll/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
 +        FILES_MATCHING PATTERN "*.h")
@@ -57,8 +62,23 @@ index 0bdec4b4..e876177e 100644
 @@ -29,6 +29,7 @@ endif()
  
  add_library(solidity ${sources} ${headers})
- target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
  if (${Z3_FOUND})
    target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
+--- a/libyul/CMakeLists.txt
++++ b/libyul/CMakeLists.txt
+@@ -42,3 +42,4 @@ endif()
+ 	optimiser/VarDeclPropagator.cpp
+ )
+-target_link_libraries(yul PUBLIC devcore)
++target_link_libraries(yul PUBLIC evmasm devcore langutil)
++install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+--- a/liblangutil/CMakeLists.txt
++++ b/liblangutil/CMakeLists.txt
+@@ -11,3 +11,4 @@ endif()
+ 
+ add_library(langutil ${sources})
+ target_link_libraries(langutil PUBLIC devcore)
++install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

From da314a44ea47746c11ca6d9d50b961e91bf4eeda Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Thu, 6 Dec 2018 12:02:05 +0100
Subject: [PATCH 1449/2793] gildas: 20181101_a -> 20181201_a

---
 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 65e12125801..ef3a0ba40f2 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 = "nov18a";
-  version = "20181101_a";
+  srcVersion = "dec18a";
+  version = "20181201_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 = "1dl2v8y6vrwaxm3b7nf6dv3ipzybhlhy2kxwnwgc7gqz5704251v";
+    sha256 = "f295b5b7f999c0d746a52b307af7b7bdbed0d9b3d87100a6a102e0cc64f3a9bd";
   };
 
   enableParallelBuilding = true;

From e4d06cbab6e994c9b339eaaf7c84cf3f1b7b3858 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 12:10:36 +0100
Subject: [PATCH 1450/2793] terraform-docs: init at 0.5.0 (#51579)

---
 .../cluster/terraform-docs/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-docs/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
new file mode 100644
index 00000000000..708b59fce24
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  pname = "terraform-docs";
+  version = "0.5.0";
+
+  goPackagePath = "github.com/segmentio/${pname}";
+
+  src = fetchFromGitHub {
+    owner  = "segmentio";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg";
+  };
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.version=${version}")
+  '';
+
+  meta = with lib; {
+    description = "A utility to generate documentation from Terraform modules in various output formats";
+    homepage = "https://github.com/segmentio/terraform-docs/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e939afa1808..a0cd819e4c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22673,6 +22673,8 @@ in
     callPackage ../applications/networking/cluster/terraform-providers {}
   );
 
+  terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};
+
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};

From 73dc9b4832e634db969c6194d6b0f6f145463fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 6 Dec 2018 11:12:30 +0000
Subject: [PATCH 1451/2793] crashplan: mark as broken

the download link no longer works
---
 pkgs/applications/backup/crashplan/crashplan-small-business.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 529b0dbd42b..2016d21c592 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ xvapx ];
+    broken = true; # 2018-12-06
   };
-
 }

From b63bb15612bb94f279d70749c4cca0c7465a9771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 29 Nov 2018 12:10:43 +0100
Subject: [PATCH 1452/2793] home-assistant: 0.82.1 -> 0.83.3

---
 nixos/tests/home-assistant.nix                |  3 ++
 .../home-assistant/component-packages.nix     | 53 +++++++++++++++++--
 pkgs/servers/home-assistant/default.nix       | 12 ++---
 pkgs/servers/home-assistant/frontend.nix      |  4 +-
 4 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 0b3da0d59c6..7627bb07901 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -31,6 +31,9 @@ in {
               latitude = "0.0";
               longitude = "0.0";
               elevation = 0;
+              auth_providers = [
+                { type = "legacy_api_password"; }
+              ];
             };
             frontend = { };
             http.api_password = apiPassword;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8c0ba2a4924..30fe7354f65 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.82.1";
+  version = "0.83.3";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -21,6 +21,7 @@
     "alarm_control_panel.homematicip_cloud" = ps: with ps; [  ];
     "alarm_control_panel.ialarm" = ps: with ps; [  ];
     "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
+    "alarm_control_panel.lupusec" = ps: with ps; [  ];
     "alarm_control_panel.manual" = ps: with ps; [  ];
     "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ];
     "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -48,6 +49,7 @@
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
+    "asuswrt" = ps: with ps; [  ];
     "august" = ps: with ps; [  ];
     "auth" = ps: with ps; [ aiohttp-cors ];
     "auth.indieauth" = ps: with ps; [  ];
@@ -95,6 +97,7 @@
     "binary_sensor.envisalink" = ps: with ps; [  ];
     "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
     "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
+    "binary_sensor.fibaro" = ps: with ps; [  ];
     "binary_sensor.flic" = ps: with ps; [  ];
     "binary_sensor.fritzbox" = ps: with ps; [  ];
     "binary_sensor.gc100" = ps: with ps; [  ];
@@ -110,6 +113,7 @@
     "binary_sensor.knx" = ps: with ps; [  ];
     "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "binary_sensor.linode" = ps: with ps; [ linode-api ];
+    "binary_sensor.lupusec" = ps: with ps; [  ];
     "binary_sensor.maxcube" = ps: with ps; [  ];
     "binary_sensor.modbus" = ps: with ps; [  ];
     "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -124,6 +128,7 @@
     "binary_sensor.openuv" = ps: with ps; [  ];
     "binary_sensor.pilight" = ps: with ps; [  ];
     "binary_sensor.ping" = ps: with ps; [  ];
+    "binary_sensor.point" = ps: with ps; [  ];
     "binary_sensor.qwikswitch" = ps: with ps; [  ];
     "binary_sensor.rachio" = ps: with ps; [  ];
     "binary_sensor.raincloud" = ps: with ps; [  ];
@@ -156,6 +161,7 @@
     "binary_sensor.verisure" = ps: with ps; [  ];
     "binary_sensor.volvooncall" = ps: with ps; [  ];
     "binary_sensor.vultr" = ps: with ps; [ vultr ];
+    "binary_sensor.w800rf32" = ps: with ps; [  ];
     "binary_sensor.wemo" = ps: with ps; [  ];
     "binary_sensor.wink" = ps: with ps; [  ];
     "binary_sensor.wirelesstag" = ps: with ps; [  ];
@@ -250,6 +256,7 @@
     "climate.toon" = ps: with ps; [  ];
     "climate.touchline" = ps: with ps; [  ];
     "climate.tuya" = ps: with ps; [  ];
+    "climate.velbus" = ps: with ps; [  ];
     "climate.venstar" = ps: with ps; [  ];
     "climate.vera" = ps: with ps; [  ];
     "climate.wink" = ps: with ps; [  ];
@@ -260,6 +267,7 @@
     "cloud.const" = ps: with ps; [  ];
     "cloud.http_api" = ps: with ps; [  ];
     "cloud.iot" = ps: with ps; [  ];
+    "cloud.prefs" = ps: with ps; [  ];
     "cloudflare" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
@@ -286,6 +294,7 @@
     "cover.command_line" = ps: with ps; [  ];
     "cover.deconz" = ps: with ps; [  ];
     "cover.demo" = ps: with ps; [  ];
+    "cover.fibaro" = ps: with ps; [  ];
     "cover.garadget" = ps: with ps; [  ];
     "cover.gogogate2" = ps: with ps; [  ];
     "cover.group" = ps: with ps; [  ];
@@ -339,6 +348,7 @@
     "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
     "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.google_maps" = ps: with ps; [  ];
+    "device_tracker.googlehome" = ps: with ps; [  ];
     "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.hitron_coda" = ps: with ps; [  ];
     "device_tracker.huawei_lte" = ps: with ps; [  ];
@@ -356,8 +366,7 @@
     "device_tracker.mysensors" = ps: with ps; [  ];
     "device_tracker.netgear" = ps: with ps; [  ];
     "device_tracker.nmap_tracker" = ps: with ps; [  ];
-    "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
-    "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];
+    "device_tracker.owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
     "device_tracker.ping" = ps: with ps; [  ];
     "device_tracker.quantum_gateway" = ps: with ps; [  ];
     "device_tracker.ritassist" = ps: with ps; [  ];
@@ -370,6 +379,7 @@
     "device_tracker.tile" = ps: with ps; [  ];
     "device_tracker.tomato" = ps: with ps; [  ];
     "device_tracker.tplink" = ps: with ps; [  ];
+    "device_tracker.traccar" = ps: with ps; [  ];
     "device_tracker.trackr" = ps: with ps; [  ];
     "device_tracker.ubus" = ps: with ps; [  ];
     "device_tracker.unifi" = ps: with ps; [ pyunifi ];
@@ -417,6 +427,7 @@
     "fan.zwave" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
+    "fibaro" = ps: with ps; [  ];
     "folder_watcher" = ps: with ps; [ watchdog ];
     "foursquare" = ps: with ps; [ aiohttp-cors ];
     "freedns" = ps: with ps; [  ];
@@ -427,6 +438,7 @@
     "geo_location.demo" = ps: with ps; [  ];
     "geo_location.geo_json_events" = ps: with ps; [  ];
     "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [  ];
+    "geofency" = ps: with ps; [ aiohttp-cors ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
     "google_assistant" = ps: with ps; [ aiohttp-cors ];
@@ -534,6 +546,7 @@
     "light.elkm1" = ps: with ps; [  ];
     "light.enocean" = ps: with ps; [  ];
     "light.eufy" = ps: with ps; [  ];
+    "light.fibaro" = ps: with ps; [  ];
     "light.flux_led" = ps: with ps; [  ];
     "light.futurenow" = ps: with ps; [  ];
     "light.greenwave" = ps: with ps; [  ];
@@ -563,6 +576,7 @@
     "light.mysensors" = ps: with ps; [  ];
     "light.mystrom" = ps: with ps; [  ];
     "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
+    "light.niko_home_control" = ps: with ps; [  ];
     "light.opple" = ps: with ps; [  ];
     "light.osramlightify" = ps: with ps; [  ];
     "light.piglow" = ps: with ps; [  ];
@@ -574,6 +588,7 @@
     "light.sensehat" = ps: with ps; [  ];
     "light.sisyphus" = ps: with ps; [  ];
     "light.skybell" = ps: with ps; [  ];
+    "light.switch" = ps: with ps; [  ];
     "light.tellduslive" = ps: with ps; [  ];
     "light.tellstick" = ps: with ps; [  ];
     "light.template" = ps: with ps; [  ];
@@ -622,6 +637,10 @@
     "logger" = ps: with ps; [  ];
     "logi_circle" = ps: with ps; [  ];
     "lovelace" = ps: with ps; [  ];
+    "luftdaten" = ps: with ps; [ luftdaten ];
+    "luftdaten.config_flow" = ps: with ps; [  ];
+    "luftdaten.const" = ps: with ps; [  ];
+    "lupusec" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
     "mailbox" = ps: with ps; [ aiohttp-cors ];
@@ -671,6 +690,7 @@
     "media_player.nadtcp" = ps: with ps; [  ];
     "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
     "media_player.openhome" = ps: with ps; [  ];
+    "media_player.panasonic_bluray" = ps: with ps; [  ];
     "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ];
     "media_player.pandora" = ps: with ps; [ pexpect ];
     "media_player.philips_js" = ps: with ps; [  ];
@@ -707,6 +727,7 @@
     "mqtt.const" = ps: with ps; [  ];
     "mqtt.discovery" = ps: with ps; [  ];
     "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ];
+    "mqtt.subscription" = ps: with ps; [  ];
     "mqtt_eventstream" = ps: with ps; [ paho-mqtt ];
     "mqtt_statestream" = ps: with ps; [ paho-mqtt ];
     "mychevy" = ps: with ps; [  ];
@@ -715,6 +736,8 @@
     "mysensors.const" = ps: with ps; [  ];
     "mysensors.device" = ps: with ps; [  ];
     "mysensors.gateway" = ps: with ps; [  ];
+    "mysensors.handler" = ps: with ps; [  ];
+    "mysensors.helpers" = ps: with ps; [  ];
     "namecheapdns" = ps: with ps; [  ];
     "neato" = ps: with ps; [  ];
     "nest" = ps: with ps; [  ];
@@ -779,6 +802,7 @@
     "notify.syslog" = ps: with ps; [  ];
     "notify.telegram" = ps: with ps; [ python-telegram-bot ];
     "notify.tibber" = ps: with ps; [  ];
+    "notify.tplink_lte" = ps: with ps; [  ];
     "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twitter" = ps: with ps; [  ];
@@ -795,11 +819,16 @@
     "openuv" = ps: with ps; [  ];
     "openuv.config_flow" = ps: with ps; [  ];
     "openuv.const" = ps: with ps; [  ];
+    "owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
+    "owntracks.config_flow" = ps: with ps; [  ];
     "panel_custom" = ps: with ps; [ aiohttp-cors ];
     "panel_iframe" = ps: with ps; [ aiohttp-cors ];
     "persistent_notification" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
     "plant" = ps: with ps; [  ];
+    "point" = ps: with ps; [ aiohttp-cors ];
+    "point.config_flow" = ps: with ps; [  ];
+    "point.const" = ps: with ps; [  ];
     "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
     "proximity" = ps: with ps; [  ];
     "python_script" = ps: with ps; [  ];
@@ -808,6 +837,8 @@
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
     "rainmachine" = ps: with ps; [  ];
+    "rainmachine.config_flow" = ps: with ps; [  ];
+    "rainmachine.const" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
     "recorder" = ps: with ps; [ sqlalchemy ];
     "recorder.const" = ps: with ps; [  ];
@@ -864,6 +895,7 @@
     "sensor.arest" = ps: with ps; [  ];
     "sensor.arlo" = ps: with ps; [  ];
     "sensor.arwn" = ps: with ps; [ paho-mqtt ];
+    "sensor.asuswrt" = ps: with ps; [  ];
     "sensor.bbox" = ps: with ps; [  ];
     "sensor.bh1750" = ps: with ps; [  ];
     "sensor.bitcoin" = ps: with ps; [  ];
@@ -922,6 +954,7 @@
     "sensor.fail2ban" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
     "sensor.fedex" = ps: with ps; [  ];
+    "sensor.fibaro" = ps: with ps; [  ];
     "sensor.fido" = ps: with ps; [  ];
     "sensor.file" = ps: with ps; [  ];
     "sensor.filesize" = ps: with ps; [  ];
@@ -929,6 +962,7 @@
     "sensor.fints" = ps: with ps; [  ];
     "sensor.fitbit" = ps: with ps; [ aiohttp-cors ];
     "sensor.fixer" = ps: with ps; [  ];
+    "sensor.flunearyou" = ps: with ps; [  ];
     "sensor.folder" = ps: with ps; [  ];
     "sensor.foobot" = ps: with ps; [  ];
     "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
@@ -973,6 +1007,7 @@
     "sensor.kwb" = ps: with ps; [  ];
     "sensor.lacrosse" = ps: with ps; [  ];
     "sensor.lastfm" = ps: with ps; [ pylast ];
+    "sensor.launch_library" = ps: with ps; [  ];
     "sensor.linky" = ps: with ps; [  ];
     "sensor.linux_battery" = ps: with ps; [ batinfo ];
     "sensor.logi_circle" = ps: with ps; [  ];
@@ -982,7 +1017,6 @@
     "sensor.luftdaten" = ps: with ps; [ luftdaten ];
     "sensor.lyft" = ps: with ps; [  ];
     "sensor.magicseaweed" = ps: with ps; [  ];
-    "sensor.melissa" = ps: with ps; [  ];
     "sensor.meteo_france" = ps: with ps; [  ];
     "sensor.metoffice" = ps: with ps; [  ];
     "sensor.mfi" = ps: with ps; [  ];
@@ -1026,6 +1060,7 @@
     "sensor.pilight" = ps: with ps; [  ];
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
+    "sensor.point" = ps: with ps; [  ];
     "sensor.pollen" = ps: with ps; [ numpy ];
     "sensor.postnl" = ps: with ps; [  ];
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
@@ -1045,6 +1080,7 @@
     "sensor.ripple" = ps: with ps; [  ];
     "sensor.rmvtransport" = ps: with ps; [  ];
     "sensor.rtorrent" = ps: with ps; [  ];
+    "sensor.ruter" = ps: with ps; [  ];
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
@@ -1052,6 +1088,7 @@
     "sensor.sensehat" = ps: with ps; [  ];
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
+    "sensor.seventeentrack" = ps: with ps; [  ];
     "sensor.shodan" = ps: with ps; [  ];
     "sensor.sht31" = ps: with ps; [  ];
     "sensor.sigfox" = ps: with ps; [  ];
@@ -1068,12 +1105,13 @@
     "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.srp_energy" = ps: with ps; [  ];
     "sensor.starlingbank" = ps: with ps; [  ];
     "sensor.startca" = ps: with ps; [ xmltodict ];
     "sensor.statistics" = ps: with ps; [  ];
     "sensor.steam_online" = ps: with ps; [  ];
     "sensor.supervisord" = ps: with ps; [  ];
-    "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
+    "sensor.swiss_hydrological_data" = ps: with ps; [  ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
     "sensor.syncthru" = ps: with ps; [  ];
     "sensor.synologydsm" = ps: with ps; [  ];
@@ -1082,6 +1120,7 @@
     "sensor.tado" = ps: with ps; [  ];
     "sensor.tahoma" = ps: with ps; [  ];
     "sensor.tank_utility" = ps: with ps; [  ];
+    "sensor.tautulli" = ps: with ps; [  ];
     "sensor.tcp" = ps: with ps; [  ];
     "sensor.ted5000" = ps: with ps; [ xmltodict ];
     "sensor.teksavvy" = ps: with ps; [  ];
@@ -1188,6 +1227,7 @@
     "switch.elkm1" = ps: with ps; [  ];
     "switch.enocean" = ps: with ps; [  ];
     "switch.eufy" = ps: with ps; [  ];
+    "switch.fibaro" = ps: with ps; [  ];
     "switch.flux" = ps: with ps; [  ];
     "switch.fritzbox" = ps: with ps; [  ];
     "switch.fritzdect" = ps: with ps; [  ];
@@ -1208,6 +1248,7 @@
     "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "switch.linode" = ps: with ps; [ linode-api ];
     "switch.litejet" = ps: with ps; [  ];
+    "switch.lupusec" = ps: with ps; [  ];
     "switch.lutron_caseta" = ps: with ps; [  ];
     "switch.mfi" = ps: with ps; [  ];
     "switch.mochad" = ps: with ps; [  ];
@@ -1285,6 +1326,7 @@
     "tibber" = ps: with ps; [  ];
     "timer" = ps: with ps; [  ];
     "toon" = ps: with ps; [  ];
+    "tplink_lte" = ps: with ps; [  ];
     "tradfri" = ps: with ps; [  ];
     "tradfri.config_flow" = ps: with ps; [  ];
     "tradfri.const" = ps: with ps; [  ];
@@ -1325,6 +1367,7 @@
     "verisure" = ps: with ps; [  ];
     "volvooncall" = ps: with ps; [  ];
     "vultr" = ps: with ps; [ vultr ];
+    "w800rf32" = ps: with ps; [  ];
     "wake_on_lan" = ps: with ps; [ wakeonlan ];
     "water_heater" = ps: with ps; [  ];
     "water_heater.demo" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c09aeb0f33f..88b82453063 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -34,10 +34,10 @@ let
       "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
     (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
       "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
-    (mkOverride "requests" "2.20.0"
-      "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c")
-    (mkOverride "ruamel_yaml" "0.15.72"
-      "97652b9e3a76958cf6684d5d963674adf345d8cc192ddd95e2a21b22cda29f40")
+    (mkOverride "requests" "2.20.1"
+      "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263")
+    (mkOverride "ruamel_yaml" "0.15.78"
+      "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f")
     (mkOverride "voluptuous" "0.11.5"
       "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
     (mkOverride "voluptuous-serialize" "2.0.0"
@@ -85,7 +85,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.82.1";
+  hassVersion = "0.83.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0d53xp5miz1vm1b5qfznzx33qzxcxi65plp412dyk4r1ag7rh38v";
+    sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index c51a6f0472f..1695a6eb95d 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 = "20181103.3";
+  version = "20181121.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b1b598f637ffc4c37a3d35aa3b912216f0340cb43fa6c50f4617536669d19499";
+    sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433";
   };
 
   propagatedBuildInputs = [ user-agents ];

From 6b9bcfe6fd8bd09f1476f09bca6a2f74f90e9a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 6 Dec 2018 11:27:05 +0000
Subject: [PATCH 1453/2793] pyflame: also install flame-chart-json

This is useful to use chrome's flamechart viewer.
---
 .../tools/profiling/pyflame/default.nix            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix
index 31ecbcaacbf..ede8499694d 100644
--- a/pkgs/development/tools/profiling/pyflame/default.nix
+++ b/pkgs/development/tools/profiling/pyflame/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig
 # pyflame needs one python version per ABI
-# are currently supported 
+# are currently supported
 # * 2.6 or 2.7 for 2.x ABI
 # * 3.4 or 3.5 for 3.{4,5} ABI
 # * 3.6        for 3.6+ ABI
 # if you want to disable support for some ABI, make the corresponding argument null
-, python2, python35, python36
+, python2, python35, python36, python3
 }:
 stdenv.mkDerivation rec {
   pname = "pyflame";
-  version = "1.6.7"; 
+  version = "1.6.7";
   src = fetchFromGitHub {
     owner = "uber";
     repo = "pyflame";
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
     # some tests will fail in the sandbox
     substituteInPlace tests/test_end_to_end.py \
       --replace 'skipif(IS_DOCKER' 'skipif(True'
+
+    # don't use patchShebangs here to be explicit about the python version
+    substituteInPlace utils/flame-chart-json \
+      --replace '#!usr/bin/env python' '#!${python3.interpreter}'
+  '';
+
+  postInstall = ''
+    install	-D utils/flame-chart-json $out/bin/flame-chart-json
   '';
 
   doCheck = true;

From f7a266d44aa88c314d1f9469c0ab61156bdc700f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 5 Dec 2018 21:13:07 +0900
Subject: [PATCH 1454/2793] flashplayer: 31.0.0.153 -> 32.0.0.101

---
 .../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 1acbf4fa57b..54e7216544e 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -100,11 +100,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "31.0.0.153";
+    version = "32.0.0.101";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0c7vh1h9lzx09njf7w1acvj2v91girlzflqxzli8nxza7pd1zb2v";
+      sha256 = "1bmmjraqzdz03jzbgs1l932gka1zhiyiis06r4yi4f93mdy31w72";
       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 9aee9ef8c00..96db22ecaba 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,25 +74,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "31.0.0.153";
+  version = "32.0.0.101";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/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
-          "0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9"
+          "0383r5pl1jrspy06mpxq50kkip5q5v052kz9aymk4qylgy1dwpn2"
         else
-          "1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f"
+          "1vx2map0wlj6bj8dqyxxaymmz9awjjfhi6097knpmqp6j8dj7l5g"
       else
         if arch == "x86_64" then
-          "114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc"
+          "003mr9mqkg0agj3zlmci5a1m3lnhj27mnvqswjaffdg5rlihvxyi"
         else
-          "0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327";
+          "1smmdsnnlsssakzqas5268svyv3rk717zr7kwpkj4rd5d1pqwcps";
   };
 
   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 b1a22673d01..9713f7d6971 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,19 +50,19 @@
 
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "31.0.0.153";
+  version = "32.0.0.101";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k"
+        "1i59vfhxrlksxwmr3kj3dfbasfjgnx9aimmv400z07fw3zmdrbpw"
       else
-        "0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s";
+        "0fz9zhp0qn9xda5pg37dfnvx04n8d7156h1qayf2l3la94apsacq";
   };
 
   nativeBuildInputs = [ unzip ];

From 0d649c8423cc6ae0bb62b3e208131669cb1dae71 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 5 Dec 2018 18:04:45 +0100
Subject: [PATCH 1455/2793] qr-filetransfer: init at unstable-2018-10-22

---
 .../networking/qr-filetransfer/default.nix    | 30 +++++++++
 .../tools/networking/qr-filetransfer/deps.nix | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/tools/networking/qr-filetransfer/default.nix
 create mode 100644 pkgs/tools/networking/qr-filetransfer/deps.nix

diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
new file mode 100644
index 00000000000..581405f63c0
--- /dev/null
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "qr-filetransfer-unstable-${version}";
+  version = "2018-10-22";
+
+  goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
+
+  src = fetchFromGitHub {
+    rev = "b1e5b91aa2aa469f870c62074e879d46e353edae";
+    owner = "claudiodangelis";
+    repo = "qr-filetransfer";
+    sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/claudiodangelis/qr-filetransfer;
+    description = "Transfer files over wifi by scanning a QR code from your terminal";
+    longDescription = ''
+      qr-filetransfer binds a web server to the address of your Wi-Fi network
+      interface on a random port and creates a handler for it. The default
+      handler serves the content and exits the program when the transfer is
+      complete.
+    '';
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/pkgs/tools/networking/qr-filetransfer/deps.nix
new file mode 100644
index 00000000000..a15dd968943
--- /dev/null
+++ b/pkgs/tools/networking/qr-filetransfer/deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
+      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
+      sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
+      sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
+    };
+  }
+  {
+    goPackagePath = "github.com/mdp/qrterminal";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdp/qrterminal";
+      rev = "6967d3624af633162b77160078e12a4c14174470";
+      sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42";
+      sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/cheggaaa/pb.v1";
+      rev = "007b75a044e968336a69a6c0c617251ab62ac14c";
+      sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/qr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/qr";
+      rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
+      sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0cd819e4c8..c75e9db940f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5062,6 +5062,8 @@ in
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
+
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   quickserve = callPackage ../tools/networking/quickserve { };

From bb0214c991bd00b962767ed91deff40d85243ced Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Mon, 3 Dec 2018 02:28:04 +0100
Subject: [PATCH 1456/2793] assaultcube: correct version

---
 pkgs/games/assaultcube/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 6f742bb64f7..71e885a04d3 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
 
   # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix.
   pname = "assaultcube";
-  version = "01052017";
-  name = "${pname}-${version}";
+  version = "unstable-2017-05-01";
 
   meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";

From 015b2b1a3568a0d59a87d4a1a27201e57fb391cc Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 3 Dec 2018 12:31:30 +0100
Subject: [PATCH 1457/2793] kube-router: init at 0.2.3

---
 .../cluster/kube-router/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kube-router/default.nix

diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix
new file mode 100644
index 00000000000..8caa3cd7524
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kube-router-${version}";
+  version = "0.2.3";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/cloudnativelabs/kube-router";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "cloudnativelabs";
+    repo = "kube-router";
+    sha256 = "1dsr76dq6sycwgh75glrcb4scv52lrrd0aivskhc7mwq30plafcj";
+  };
+
+  buildFlagsArray = ''
+    -ldflags=
+    -X
+    ${goPackagePath}/pkg/cmd.version=${version}
+    -X
+    ${goPackagePath}/pkg/cmd.buildDate=Nix
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.kube-router.io/";
+    description = "All-in-one router, firewall and service proxy for Kubernetes";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ colemickens johanot ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75e9db940f..234faea624f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3675,6 +3675,8 @@ in
 
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
+  kube-router = callPackage ../applications/networking/cluster/kube-router { };
+
   kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
 
   peruse = libsForQt5.callPackage ../tools/misc/peruse { };

From 3b445042ac00fb28aa0a74568a2c30f65afde807 Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Thu, 6 Dec 2018 17:22:31 +0100
Subject: [PATCH 1458/2793] rPackages.littler: fix build (#51282)

littler gives a wrapped called `r` (or `lr` for non-case-preserving
systems like Darwin) which works as shebang or pipe target.

The build was completely broken before (missing deps).

Symlink executables and manpage into standard locations so that this
packages also works in `environment.systemPackages`.
---
 pkgs/development/r-modules/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 428d6c60546..27b38138f6d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -950,6 +950,18 @@ let
       preConfigure = "patchShebangs configure";
     });
 
+    littler = old.littler.overrideAttrs (attrs: with pkgs; {
+      buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs;
+      postInstall = ''
+        install -d $out/bin $out/share/man/man1
+        ln -s ../library/littler/bin/r $out/bin/r
+        ln -s ../library/littler/bin/r $out/bin/lr
+        ln -s ../../../library/littler/man-page/r.1 $out/share/man/man1
+        # these won't run without special provisions, so better remove them
+        rm -r $out/library/littler/script-tests
+      '';
+    });
+
   };
 in
   self

From 0c1a4e808aa0ea455c2fda943d286221192bda27 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 6 Dec 2018 16:34:10 +0000
Subject: [PATCH 1459/2793] libpqxx: fix license

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

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index fbee81ab677..4aa06c0cd70 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A C++ library to access PostgreSQL databases";
     homepage = http://pqxx.org/development/libpqxx/;
-    license = lib.licenses.postgresql;
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.eelco ];
   };

From 4a783b8eee373f06cf2782a989a2da736d0cfe4e Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 6 Dec 2018 17:44:27 +0100
Subject: [PATCH 1460/2793] skaffold: 0.18.0 -> 0.19.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/skaffold/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 9689ff33cd3..11de0bec425 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   name = "skaffold-${version}";
-  version = "0.18.0";
-  # rev is the 0.18.0 commit, mainly for skaffold version command output
-  rev = "34651689be78b2c6bcfbace5072b00b93661f895";
+  version = "0.19.0";
+  # rev is the 0.19.0 commit, mainly for skaffold version command output
+  rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "0an3g4jqch7a6ckh8yhia7lykpvb5lvz4kd5kqfmw9479kygv9sa";
+    sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h";
   };
 
   meta = {

From 2e53403aaeff827315b72b5106b025566b274d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Thu, 6 Dec 2018 11:40:58 -0600
Subject: [PATCH 1461/2793] quicktemplate: 2018-09-06 -> 2018-11-26

---
 pkgs/development/tools/quicktemplate/default.nix | 6 +++---
 pkgs/development/tools/quicktemplate/deps.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 147883afd42..e283c162092 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-09-06";
+  version = "2018-11-26";
   goPackagePath = "github.com/valyala/quicktemplate";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "valyala";
     repo = "quicktemplate";
-    rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be";
-    sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6";
+    rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
+    sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix
index 6064f764681..6c042966c23 100644
--- a/pkgs/development/tools/quicktemplate/deps.nix
+++ b/pkgs/development/tools/quicktemplate/deps.nix
@@ -1,4 +1,4 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/valyala/bytebufferpool";

From 0da3190cf8c8cc97d1c0c3ba487223f3d1559bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Thu, 6 Dec 2018 11:41:31 -0600
Subject: [PATCH 1462/2793] nodePackages: meguca: 1.0.9 -> 1.1.3

---
 .../node-packages/node-packages-v10.nix       | 4276 +++++++++--------
 .../node-packages/node-packages-v6.nix        |   36 +-
 .../node-packages/node-packages-v8.nix        |   68 +-
 3 files changed, 2255 insertions(+), 2125 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 7dd93915982..2a581faab3f 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,13 +13,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@apollographql/apollo-tools-0.2.7" = {
+    "@apollographql/apollo-tools-0.2.8" = {
       name = "_at_apollographql_slash_apollo-tools";
       packageName = "@apollographql/apollo-tools";
-      version = "0.2.7";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.7.tgz";
-        sha512 = "rsn4uN12gZWME+m9CLnUk+ImY+blKdWFFdS6TlQheXC7XA85twjQmOY0/n05qUtrxx1dM5QUXw1qLCZ4emWYbQ==";
+        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.8.tgz";
+        sha512 = "A7FTUigtpGCFBaLT1ILicdjM6pZ7LQNw7Vgos0t4aLYtvlKO/L1nMi/NO7bPypzZaJSToTgcxHJPRydP1Md+Kw==";
       };
     };
     "@apollographql/apollo-upload-server-5.0.3" = {
@@ -31,13 +31,13 @@ let
         sha512 = "tGAp3ULNyoA8b5o9LsU2Lq6SwgVPUOKAqKywu2liEtTvrFSGPrObwanhYwArq3GPeOqp2bi+JknSJCIU3oQN1Q==";
       };
     };
-    "@apollographql/graphql-playground-html-1.6.4" = {
+    "@apollographql/graphql-playground-html-1.6.6" = {
       name = "_at_apollographql_slash_graphql-playground-html";
       packageName = "@apollographql/graphql-playground-html";
-      version = "1.6.4";
+      version = "1.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.4.tgz";
-        sha512 = "gwvaQO6/Hv4DEwhDLmmu2tzCU9oPjC5Xl9Kk8Yd0IxyKhYLlLalmkMMjsZLzU5H3fGaalLD96OYfxHL0ClVUDQ==";
+        url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz";
+        sha512 = "lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ==";
       };
     };
     "@babel/code-frame-7.0.0" = {
@@ -49,13 +49,13 @@ let
         sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==";
       };
     };
-    "@babel/core-7.1.6" = {
+    "@babel/core-7.2.0" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz";
-        sha512 = "Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.2.0.tgz";
+        sha512 = "7pvAdC4B+iKjFFp9Ztj0QgBndJ++qaMeonT185wAqUnhipw8idm9Rv1UMyBuKtYjfl6ORNkgEgcsYLfHX/GpLw==";
       };
     };
     "@babel/generator-7.0.0-beta.38" = {
@@ -67,13 +67,13 @@ let
         sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA==";
       };
     };
-    "@babel/generator-7.1.6" = {
+    "@babel/generator-7.2.0" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz";
-        sha512 = "brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz";
+        sha512 = "BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==";
       };
     };
     "@babel/helper-annotate-as-pure-7.0.0" = {
@@ -112,6 +112,15 @@ let
         sha512 = "YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==";
       };
     };
+    "@babel/helper-create-class-features-plugin-7.2.1" = {
+      name = "_at_babel_slash_helper-create-class-features-plugin";
+      packageName = "@babel/helper-create-class-features-plugin";
+      version = "7.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.2.1.tgz";
+        sha512 = "EsEP7XLFmcJHjcuFYBxYD1FkP0irC8C9fsrt2tX/jrAi/eTnFI6DOPgVFb+WREeg1GboF+Ib+nCHbGBodyAXSg==";
+      };
+    };
     "@babel/helper-define-map-7.1.0" = {
       name = "_at_babel_slash_helper-define-map";
       packageName = "@babel/helper-define-map";
@@ -247,22 +256,22 @@ let
         sha512 = "MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==";
       };
     };
-    "@babel/helper-wrap-function-7.1.0" = {
+    "@babel/helper-wrap-function-7.2.0" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz";
-        sha512 = "R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==";
+        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz";
+        sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==";
       };
     };
-    "@babel/helpers-7.1.5" = {
+    "@babel/helpers-7.2.0" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.1.5";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz";
-        sha512 = "2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz";
+        sha512 = "Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==";
       };
     };
     "@babel/highlight-7.0.0" = {
@@ -274,13 +283,13 @@ let
         sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
       };
     };
-    "@babel/parser-7.1.6" = {
+    "@babel/parser-7.2.0" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz";
-        sha512 = "dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz";
+        sha512 = "M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==";
       };
     };
     "@babel/plugin-external-helpers-7.0.0" = {
@@ -292,283 +301,274 @@ let
         sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.1.0" = {
+    "@babel/plugin-proposal-async-generator-functions-7.2.0" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz";
-        sha512 = "Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz";
+        sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==";
       };
     };
-    "@babel/plugin-proposal-class-properties-7.1.0" = {
+    "@babel/plugin-proposal-class-properties-7.2.1" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
-      version = "7.1.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz";
-        sha512 = "/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.2.1.tgz";
+        sha512 = "/4FKFChkQ2Jgb8lBDsvFX496YTi7UWTetVgS8oJUpX1e/DlaoeEK57At27ug8Hu2zI2g8bzkJ+8k9qrHZRPGPA==";
       };
     };
-    "@babel/plugin-proposal-json-strings-7.0.0" = {
+    "@babel/plugin-proposal-json-strings-7.2.0" = {
       name = "_at_babel_slash_plugin-proposal-json-strings";
       packageName = "@babel/plugin-proposal-json-strings";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz";
-        sha512 = "kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz";
+        sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==";
       };
     };
-    "@babel/plugin-proposal-object-rest-spread-7.0.0" = {
+    "@babel/plugin-proposal-object-rest-spread-7.2.0" = {
       name = "_at_babel_slash_plugin-proposal-object-rest-spread";
       packageName = "@babel/plugin-proposal-object-rest-spread";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz";
-        sha512 = "14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz";
+        sha512 = "1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg==";
       };
     };
-    "@babel/plugin-proposal-optional-catch-binding-7.0.0" = {
+    "@babel/plugin-proposal-optional-catch-binding-7.2.0" = {
       name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
       packageName = "@babel/plugin-proposal-optional-catch-binding";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz";
-        sha512 = "JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz";
+        sha512 = "mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==";
       };
     };
-    "@babel/plugin-proposal-unicode-property-regex-7.0.0" = {
+    "@babel/plugin-proposal-unicode-property-regex-7.2.0" = {
       name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
       packageName = "@babel/plugin-proposal-unicode-property-regex";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz";
-        sha512 = "tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz";
+        sha512 = "LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==";
       };
     };
-    "@babel/plugin-syntax-async-generators-7.0.0" = {
+    "@babel/plugin-syntax-async-generators-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-async-generators";
       packageName = "@babel/plugin-syntax-async-generators";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz";
-        sha512 = "im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz";
+        sha512 = "1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==";
       };
     };
-    "@babel/plugin-syntax-class-properties-7.0.0" = {
-      name = "_at_babel_slash_plugin-syntax-class-properties";
-      packageName = "@babel/plugin-syntax-class-properties";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz";
-        sha512 = "cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==";
-      };
-    };
-    "@babel/plugin-syntax-flow-7.0.0" = {
+    "@babel/plugin-syntax-flow-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-flow";
       packageName = "@babel/plugin-syntax-flow";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0.tgz";
-        sha512 = "zGcuZWiWWDa5qTZ6iAnpG0fnX/GOu49pGR5PFvkQ9GmKNaSphXQnlNXh/LG20sqWtNrx/eB6krzfEzcwvUyeFA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
+        sha512 = "r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==";
       };
     };
-    "@babel/plugin-syntax-json-strings-7.0.0" = {
+    "@babel/plugin-syntax-json-strings-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-json-strings";
       packageName = "@babel/plugin-syntax-json-strings";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz";
-        sha512 = "UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz";
+        sha512 = "5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==";
       };
     };
-    "@babel/plugin-syntax-jsx-7.0.0" = {
+    "@babel/plugin-syntax-jsx-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-jsx";
       packageName = "@babel/plugin-syntax-jsx";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz";
-        sha512 = "PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
+        sha512 = "VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==";
       };
     };
-    "@babel/plugin-syntax-object-rest-spread-7.0.0" = {
+    "@babel/plugin-syntax-object-rest-spread-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-object-rest-spread";
       packageName = "@babel/plugin-syntax-object-rest-spread";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz";
-        sha512 = "5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
+        sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==";
       };
     };
-    "@babel/plugin-syntax-optional-catch-binding-7.0.0" = {
+    "@babel/plugin-syntax-optional-catch-binding-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-optional-catch-binding";
       packageName = "@babel/plugin-syntax-optional-catch-binding";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz";
-        sha512 = "Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz";
+        sha512 = "bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==";
       };
     };
-    "@babel/plugin-transform-arrow-functions-7.0.0" = {
+    "@babel/plugin-transform-arrow-functions-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-arrow-functions";
       packageName = "@babel/plugin-transform-arrow-functions";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz";
-        sha512 = "2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz";
+        sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==";
       };
     };
-    "@babel/plugin-transform-async-to-generator-7.1.0" = {
+    "@babel/plugin-transform-async-to-generator-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-async-to-generator";
       packageName = "@babel/plugin-transform-async-to-generator";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz";
-        sha512 = "rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz";
+        sha512 = "CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==";
       };
     };
-    "@babel/plugin-transform-block-scoped-functions-7.0.0" = {
+    "@babel/plugin-transform-block-scoped-functions-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-block-scoped-functions";
       packageName = "@babel/plugin-transform-block-scoped-functions";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz";
-        sha512 = "AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz";
+        sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.1.5" = {
+    "@babel/plugin-transform-block-scoping-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.1.5";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz";
-        sha512 = "jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz";
+        sha512 = "vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==";
       };
     };
-    "@babel/plugin-transform-classes-7.1.0" = {
+    "@babel/plugin-transform-classes-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz";
-        sha512 = "rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.0.tgz";
+        sha512 = "aPCEkrhJYebDXcGTAP+cdUENkH7zqOlgbKwLbghjjHpJRJBWM/FSlCjMoPGA8oUdiMfOrk3+8EFPLLb5r7zj2w==";
       };
     };
-    "@babel/plugin-transform-computed-properties-7.0.0" = {
+    "@babel/plugin-transform-computed-properties-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-computed-properties";
       packageName = "@babel/plugin-transform-computed-properties";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz";
-        sha512 = "ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz";
+        sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.1.3" = {
+    "@babel/plugin-transform-destructuring-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.1.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz";
-        sha512 = "Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz";
+        sha512 = "coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==";
       };
     };
-    "@babel/plugin-transform-dotall-regex-7.0.0" = {
+    "@babel/plugin-transform-dotall-regex-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-dotall-regex";
       packageName = "@babel/plugin-transform-dotall-regex";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz";
-        sha512 = "00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz";
+        sha512 = "sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==";
       };
     };
-    "@babel/plugin-transform-duplicate-keys-7.0.0" = {
+    "@babel/plugin-transform-duplicate-keys-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-duplicate-keys";
       packageName = "@babel/plugin-transform-duplicate-keys";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz";
-        sha512 = "w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz";
+        sha512 = "q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==";
       };
     };
-    "@babel/plugin-transform-exponentiation-operator-7.1.0" = {
+    "@babel/plugin-transform-exponentiation-operator-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-exponentiation-operator";
       packageName = "@babel/plugin-transform-exponentiation-operator";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz";
-        sha512 = "uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz";
+        sha512 = "umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==";
       };
     };
-    "@babel/plugin-transform-flow-strip-types-7.1.6" = {
+    "@babel/plugin-transform-flow-strip-types-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-flow-strip-types";
       packageName = "@babel/plugin-transform-flow-strip-types";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.1.6.tgz";
-        sha512 = "0tyFAAjJmnRlr8MVJV39ASn1hv+PbdVP71hf7aAseqLfQ0o9QXk9htbMbq7/ZYXnUIp6gDw0lUUP0+PQMbbtmg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.2.0.tgz";
+        sha512 = "xhQp0lyXA5vk8z1kJitdMozQYEWfo4MgC6neNXrb5euqHiTIGhj5ZWfFPkVESInQSk9WZz1bbNmIRz6zKfWGVA==";
       };
     };
-    "@babel/plugin-transform-for-of-7.0.0" = {
+    "@babel/plugin-transform-for-of-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz";
-        sha512 = "TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz";
+        sha512 = "Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==";
       };
     };
-    "@babel/plugin-transform-function-name-7.1.0" = {
+    "@babel/plugin-transform-function-name-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-function-name";
       packageName = "@babel/plugin-transform-function-name";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz";
-        sha512 = "VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz";
+        sha512 = "kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==";
       };
     };
-    "@babel/plugin-transform-literals-7.0.0" = {
+    "@babel/plugin-transform-literals-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-literals";
       packageName = "@babel/plugin-transform-literals";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz";
-        sha512 = "1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz";
+        sha512 = "2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.1.0" = {
+    "@babel/plugin-transform-modules-amd-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz";
-        sha512 = "wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz";
+        sha512 = "mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.1.0" = {
+    "@babel/plugin-transform-modules-commonjs-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz";
-        sha512 = "wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz";
+        sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.1.3" = {
+    "@babel/plugin-transform-modules-systemjs-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.1.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz";
-        sha512 = "PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz";
+        sha512 = "aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==";
       };
     };
-    "@babel/plugin-transform-modules-umd-7.1.0" = {
+    "@babel/plugin-transform-modules-umd-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-modules-umd";
       packageName = "@babel/plugin-transform-modules-umd";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz";
-        sha512 = "enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz";
+        sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==";
       };
     };
     "@babel/plugin-transform-new-target-7.0.0" = {
@@ -580,31 +580,31 @@ let
         sha512 = "yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==";
       };
     };
-    "@babel/plugin-transform-object-super-7.1.0" = {
+    "@babel/plugin-transform-object-super-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-object-super";
       packageName = "@babel/plugin-transform-object-super";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz";
-        sha512 = "/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz";
+        sha512 = "VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==";
       };
     };
-    "@babel/plugin-transform-parameters-7.1.0" = {
+    "@babel/plugin-transform-parameters-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz";
-        sha512 = "vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz";
+        sha512 = "kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.1.6" = {
+    "@babel/plugin-transform-react-jsx-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-react-jsx";
       packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.1.6.tgz";
-        sha512 = "iU/IUlPEYDRwuqLwqVobzPAZkBOQoZ9xRTBmj6ANuk5g/Egn/zdNGnXlSoKeNmKoYVeIRxx5GZhWmMhLik8dag==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.2.0.tgz";
+        sha512 = "h/fZRel5wAfCqcKgq3OhbmYaReo7KkoJBpt8XnvpS7wqaNMqtw5xhxutzcm35iMUWucfAdT/nvGTsWln0JTg2Q==";
       };
     };
     "@babel/plugin-transform-regenerator-7.0.0" = {
@@ -616,67 +616,67 @@ let
         sha512 = "sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==";
       };
     };
-    "@babel/plugin-transform-runtime-7.1.0" = {
+    "@babel/plugin-transform-runtime-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-runtime";
       packageName = "@babel/plugin-transform-runtime";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.1.0.tgz";
-        sha512 = "WFLMgzu5DLQEah0lKTJzYb14vd6UiES7PTnXcvrPZ1VrwFeJ+mTbvr65fFAsXYMt2bIoOoC0jk76zY1S7HZjUg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz";
+        sha512 = "jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw==";
       };
     };
-    "@babel/plugin-transform-shorthand-properties-7.0.0" = {
+    "@babel/plugin-transform-shorthand-properties-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-shorthand-properties";
       packageName = "@babel/plugin-transform-shorthand-properties";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz";
-        sha512 = "g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz";
+        sha512 = "QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==";
       };
     };
-    "@babel/plugin-transform-spread-7.0.0" = {
+    "@babel/plugin-transform-spread-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-spread";
       packageName = "@babel/plugin-transform-spread";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz";
-        sha512 = "L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.0.tgz";
+        sha512 = "7TtPIdwjS/i5ZBlNiQePQCovDh9pAhVbp/nGVRBZuUdBiVRThyyLend3OHobc0G+RLCPPAN70+z/MAMhsgJd/A==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.0.0" = {
+    "@babel/plugin-transform-sticky-regex-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz";
-        sha512 = "LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz";
+        sha512 = "KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==";
       };
     };
-    "@babel/plugin-transform-template-literals-7.0.0" = {
+    "@babel/plugin-transform-template-literals-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-template-literals";
       packageName = "@babel/plugin-transform-template-literals";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz";
-        sha512 = "vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz";
+        sha512 = "FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.0.0" = {
+    "@babel/plugin-transform-typeof-symbol-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz";
-        sha512 = "1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz";
+        sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==";
       };
     };
-    "@babel/plugin-transform-unicode-regex-7.0.0" = {
+    "@babel/plugin-transform-unicode-regex-7.2.0" = {
       name = "_at_babel_slash_plugin-transform-unicode-regex";
       packageName = "@babel/plugin-transform-unicode-regex";
-      version = "7.0.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz";
-        sha512 = "uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz";
+        sha512 = "m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==";
       };
     };
     "@babel/polyfill-7.0.0" = {
@@ -688,13 +688,13 @@ let
         sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==";
       };
     };
-    "@babel/preset-env-7.1.6" = {
+    "@babel/preset-env-7.2.0" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz";
-        sha512 = "YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.0.tgz";
+        sha512 = "haGR38j5vOGVeBatrQPr3l0xHbs14505DcM57cbJy48kgMFvvHHoYEhHuRV+7vi559yyAUAVbTWzbK/B/pzJng==";
       };
     };
     "@babel/preset-stage-2-7.0.0" = {
@@ -715,22 +715,22 @@ let
         sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g==";
       };
     };
-    "@babel/runtime-7.1.5" = {
+    "@babel/runtime-7.2.0" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.1.5";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz";
-        sha512 = "xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz";
+        sha512 = "oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==";
       };
     };
-    "@babel/runtime-corejs2-7.1.5" = {
+    "@babel/runtime-corejs2-7.2.0" = {
       name = "_at_babel_slash_runtime-corejs2";
       packageName = "@babel/runtime-corejs2";
-      version = "7.1.5";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.5.tgz";
-        sha512 = "WsYRwQsFhVmxkAqwypPTZyV9GpkqMEaAr2zOItOmqSX2GBFaI+eq98CN81e13o0zaUKJOQGYyjhNVqj56nnkYg==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.2.0.tgz";
+        sha512 = "kPfmKoRI8Hpo5ZJGACWyrc9Eq1j3ZIUpUAQT2yH045OuYpccFJ9kYA/eErwzOM2jeBG1sC8XX1nl1EArtuM8tg==";
       };
     };
     "@babel/template-7.1.2" = {
@@ -760,13 +760,13 @@ let
         sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q==";
       };
     };
-    "@babel/types-7.1.6" = {
+    "@babel/types-7.2.0" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.1.6";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz";
-        sha512 = "DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz";
+        sha512 = "b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==";
       };
     };
     "@calebboyd/semaphore-1.3.1" = {
@@ -1012,31 +1012,31 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@ionic/cli-framework-1.3.0" = {
+    "@ionic/cli-framework-1.5.0" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "1.3.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.3.0.tgz";
-        sha512 = "hJVWOqZVJXD0pa1amVFPlX7emXdEM6YpbllXkMQwYSubt9TXPRgUboC3JYxvwEfTscnvWO5OnKGZ29f0/zpTQg==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.5.0.tgz";
+        sha512 = "vWctiIcq/TrzLHNcyHp3/mPJ8JEpoSFvq+J8w+FdhZlErr9h5QVIl36RvBN+yWqh28DCz/8Vm+YT+nZbYFYE/g==";
       };
     };
-    "@ionic/discover-1.0.7" = {
+    "@ionic/discover-1.0.8" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.7.tgz";
-        sha512 = "HaG36P0dfxkBqkL9HJknd4bGXe+4QczhcCbpr0CzDBUzWbmoi0meyzRvqhVf9jd1WtnPYsfcJ6mAtaeu+NIRUw==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.8.tgz";
+        sha512 = "1TBoCgHC6tI4YA1xMGIfLXdemTFohtTGrD29MrVBBUe6KGJ4DEJ/4DUX/lRPedCf2KUhJvGrjHlhDfOuGfel9A==";
       };
     };
-    "@ionic/utils-fs-0.0.4" = {
+    "@ionic/utils-fs-0.0.5" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "0.0.4";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.4.tgz";
-        sha512 = "eipaSkrX3ODCQzGKxFgruq2J28RoEm+JC0jJv5S64OXATxsnbwuReTmA2EMJyevLJrORWM0yvsgqmiLHH5VYJg==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.5.tgz";
+        sha512 = "wdeh4pyKfKYXHjwiNN/WQoo/NG0MbPev+hSZGgiQLVCd7GLT984yCf0kX6Wb6NgU69n2xqeEcDM64uP1kFm0Ow==";
       };
     };
     "@ionic/utils-network-0.0.4" = {
@@ -1057,13 +1057,13 @@ let
         sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
       };
     };
-    "@lerna/add-3.4.1" = {
+    "@lerna/add-3.5.0" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-3.4.1.tgz";
-        sha512 = "Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-3.5.0.tgz";
+        sha512 = "hoOqtal/ChEEtt9rxR/6xmyvTN7581XF4kWHoWPV9NbfZN9e8uTR8z4mCcJq2DiZhRuY7aA5FEROEbl12soowQ==";
       };
     };
     "@lerna/batch-packages-3.1.2" = {
@@ -1075,31 +1075,31 @@ let
         sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
       };
     };
-    "@lerna/bootstrap-3.4.1" = {
+    "@lerna/bootstrap-3.5.0" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.4.1.tgz";
-        sha512 = "yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.5.0.tgz";
+        sha512 = "+z4kVVJFO5EGfC2ob/4C9LetqWwDtbhZgTRllr1+zOi/2clbD+WKcVI0ku+/ckzKjz783SOc83swX7RrmiLwMQ==";
       };
     };
-    "@lerna/changed-3.4.1" = {
+    "@lerna/changed-3.5.0" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.4.1.tgz";
-        sha512 = "gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.5.0.tgz";
+        sha512 = "p9o7/hXwFAoet7UPeHIzIPonYxLHZe9bcNcjxKztZYAne5/OgmZiF4X1UPL2S12wtkT77WQy4Oz8NjRTczcapg==";
       };
     };
-    "@lerna/check-working-tree-3.3.0" = {
+    "@lerna/check-working-tree-3.5.0" = {
       name = "_at_lerna_slash_check-working-tree";
       packageName = "@lerna/check-working-tree";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz";
-        sha512 = "oeEP1dNhiiKUaO0pmcIi73YXJpaD0n5JczNctvVNZ8fGZmrALZtEnmC28o6Z7JgQaqq5nd2kO7xbnjoitrC51g==";
+        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.5.0.tgz";
+        sha512 = "aWeIputHddeZgf7/wA1e5yuv6q9S5si2y7fzO2Ah7m3KyDyl8XHP1M0VSSDzZeiloYCryAYQAoRgcrdH65Vhow==";
       };
     };
     "@lerna/child-process-3.3.0" = {
@@ -1111,13 +1111,13 @@ let
         sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==";
       };
     };
-    "@lerna/clean-3.3.2" = {
+    "@lerna/clean-3.5.0" = {
       name = "_at_lerna_slash_clean";
       packageName = "@lerna/clean";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.3.2.tgz";
-        sha512 = "mvqusgSp2ou5SGqQgTEoTvGJpGfH4+L6XSeN+Ims+eNFGXuMazmKCf+rz2PZBMFufaHJ/Os+JF0vPCcWI1Fzqg==";
+        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.5.0.tgz";
+        sha512 = "bHUFF6Wv7ms81Tmwe56xk296oqU74Sg9NSkUCDG4kZLpYZx347Aw+89ZPTlaSmUwqCgEXKYLr65ZVVvKmflpcA==";
       };
     };
     "@lerna/cli-3.2.0" = {
@@ -1129,40 +1129,40 @@ let
         sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==";
       };
     };
-    "@lerna/collect-updates-3.3.2" = {
+    "@lerna/collect-updates-3.5.0" = {
       name = "_at_lerna_slash_collect-updates";
       packageName = "@lerna/collect-updates";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.3.2.tgz";
-        sha512 = "9WyBJI2S5sYgEZEScu525Lbi6nknNrdBKop35sCDIC9y6AIGvH6Dr5tkTd+Kg3n1dE+kHwW/xjERkx3+h7th3w==";
+        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.5.0.tgz";
+        sha512 = "rFCng14K8vHyrDJSAacj6ABKKT/TxZdpL9uPEtZN7DsoJKlKPzqFeRvRGA2+ed/I6mEm4ltauEjEpKG5O6xqtw==";
       };
     };
-    "@lerna/command-3.3.0" = {
+    "@lerna/command-3.5.0" = {
       name = "_at_lerna_slash_command";
       packageName = "@lerna/command";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/command/-/command-3.3.0.tgz";
-        sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg==";
+        url = "https://registry.npmjs.org/@lerna/command/-/command-3.5.0.tgz";
+        sha512 = "C/0e7qPbuKZ9vEqzRePksoKDJk4TOWzsU5qaPP/ikqc6vClJbKucsIehk3za6glSjlgLCJpzBTF2lFjHfb+JNw==";
       };
     };
-    "@lerna/conventional-commits-3.4.1" = {
+    "@lerna/conventional-commits-3.5.0" = {
       name = "_at_lerna_slash_conventional-commits";
       packageName = "@lerna/conventional-commits";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz";
-        sha512 = "3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w==";
+        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.5.0.tgz";
+        sha512 = "roKPILPYnDWiCDxOeBQ0cObJ2FbDgzJSToxr1ZwIqvJU5hGQ4RmooCf8GHcCW9maBJz7ETeestv8M2mBUgBPbg==";
       };
     };
-    "@lerna/create-3.4.1" = {
+    "@lerna/create-3.5.0" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-3.4.1.tgz";
-        sha512 = "l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-3.5.0.tgz";
+        sha512 = "ek4flHRmpMegZp9tP3RmuDhmMb9+/Hhy9B5eaZc5X5KWqDvFKJtn56sw+M9hNjiYehiimCwhaLWgE2WSikPvcQ==";
       };
     };
     "@lerna/create-symlink-3.3.0" = {
@@ -1174,40 +1174,40 @@ let
         sha512 = "0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w==";
       };
     };
-    "@lerna/describe-ref-3.3.0" = {
+    "@lerna/describe-ref-3.5.0" = {
       name = "_at_lerna_slash_describe-ref";
       packageName = "@lerna/describe-ref";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.3.0.tgz";
-        sha512 = "4t7M4OupnYMSPNLrLUau8qkS+dgLEi4w+DkRkV0+A+KNYga1W0jVgNLPIIsxta7OHfodPkCNAqZCzNCw/dmAwA==";
+        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.5.0.tgz";
+        sha512 = "XvecK2PSwUv4z+otib5moWJMI+h3mtAg8nFlfo4KbivVtD/sI11jfKsr3S75HuAwhVAa8tAijoAxmuBJSsTE1g==";
       };
     };
-    "@lerna/diff-3.3.0" = {
+    "@lerna/diff-3.5.0" = {
       name = "_at_lerna_slash_diff";
       packageName = "@lerna/diff";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.3.0.tgz";
-        sha512 = "sIoMjsm3NVxvmt6ofx8Uu/2fxgldQqLl0zmC9X1xW00j831o5hBffx1EoKj9CnmaEvoSP6j/KFjxy2RWjebCIg==";
+        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.5.0.tgz";
+        sha512 = "iyZ0ZRPqH5Y5XEhOYoKS8H/8UXC/gZ/idlToMFHhUn1oTSd8v9HVU1c2xq1ge0u36ZH/fx/YydUk0A/KSv+p3Q==";
       };
     };
-    "@lerna/exec-3.3.2" = {
+    "@lerna/exec-3.5.0" = {
       name = "_at_lerna_slash_exec";
       packageName = "@lerna/exec";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.3.2.tgz";
-        sha512 = "mN6vGxNir7JOGvWLwKr3DW3LNy1ecCo2ziZj5rO9Mw5Rew3carUu1XLmhF/4judtsvXViUY+rvGIcqHe0vvb+w==";
+        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.5.0.tgz";
+        sha512 = "H5jeIueDiuNsxeuGKaP7HqTcenvMsFfBFeWr0W6knHv9NrOF8il34dBqYgApZEDSQ7+2fA3ghwWbF+jUGTSh/A==";
       };
     };
-    "@lerna/filter-options-3.3.2" = {
+    "@lerna/filter-options-3.5.0" = {
       name = "_at_lerna_slash_filter-options";
       packageName = "@lerna/filter-options";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.3.2.tgz";
-        sha512 = "0WHqdDgAnt5WKoByi1q+lFw8HWt5tEKP2DnLlGqWv3YFwVF5DsPRlO7xbzjY9sJgvyJtZcnkMtccdBPFhGGyIQ==";
+        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.5.0.tgz";
+        sha512 = "7pEQy1i5ynYOYjcSeo+Qaps4+Ais55RRdnT6/SLLBgyyHAMziflFLX5TnoyEaaXoU90iKfQ5z/ioEp6dFAXSMg==";
       };
     };
     "@lerna/filter-packages-3.0.0" = {
@@ -1246,40 +1246,40 @@ let
         sha512 = "GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g==";
       };
     };
-    "@lerna/import-3.3.1" = {
+    "@lerna/import-3.5.0" = {
       name = "_at_lerna_slash_import";
       packageName = "@lerna/import";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/import/-/import-3.3.1.tgz";
-        sha512 = "2OzTQDkYKbBPpyP2iOI1sWfcvMjNLjjHjmREq/uOWJaSIk5J3Ukt71OPpcOHh4V2CBOlXidCcO+Hyb4FVIy8fw==";
+        url = "https://registry.npmjs.org/@lerna/import/-/import-3.5.0.tgz";
+        sha512 = "vgI6lMEzd1ODgi75cmAlfPYylaK37WY3E2fwKyO/lj6UKSGj46dVSK0KwTRHx33tu4PLvPzFi5C6nbY57o5ykQ==";
       };
     };
-    "@lerna/init-3.3.0" = {
+    "@lerna/init-3.5.0" = {
       name = "_at_lerna_slash_init";
       packageName = "@lerna/init";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/init/-/init-3.3.0.tgz";
-        sha512 = "HvgRLkIG6nDIeAO6ix5sUVIVV+W9UMk2rSSmFT66CDOefRi7S028amiyYnFUK1QkIAaUbVUyOnYaErtbJwICuw==";
+        url = "https://registry.npmjs.org/@lerna/init/-/init-3.5.0.tgz";
+        sha512 = "V21/UWj34Mph+9NxIGH1kYcuJAp+uFjfG8Ku2nMy62OGL3553+YQ+Izr+R6egY8y/99UMCDpi5gkQni5eGv3MA==";
       };
     };
-    "@lerna/link-3.3.0" = {
+    "@lerna/link-3.5.0" = {
       name = "_at_lerna_slash_link";
       packageName = "@lerna/link";
-      version = "3.3.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/link/-/link-3.3.0.tgz";
-        sha512 = "8CeXzGL7okrsVXsy2sHXI2KuBaczw3cblAnA2+FJPUqSKMPNbUTRzeU3bOlCjYtK0LbxC4ngENJTL3jJ8RaYQQ==";
+        url = "https://registry.npmjs.org/@lerna/link/-/link-3.5.0.tgz";
+        sha512 = "KSu1mhxwNRmguqMqUTJd4c7QIk9/xmxJxbmMkA71OaJd4fwondob6DyI/B17NIWutdLbvSWQ7pRlFOPxjQVoUw==";
       };
     };
-    "@lerna/list-3.3.2" = {
+    "@lerna/list-3.5.0" = {
       name = "_at_lerna_slash_list";
       packageName = "@lerna/list";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/list/-/list-3.3.2.tgz";
-        sha512 = "XXEVy7w+i/xx8NeJmGirw4upEoEF9OfD6XPLjISNQc24VgQV+frXdVJ02QcP7Y/PkY1rdIVrOjvo3ipKVLUxaQ==";
+        url = "https://registry.npmjs.org/@lerna/list/-/list-3.5.0.tgz";
+        sha512 = "T+NZBQ/l6FmZklgrtFuN7luMs3AC/BoS52APOPrM7ZmxW4nenvov0xMwQW1783w/t365YDkDlYd5gM0nX3D1Hg==";
       };
     };
     "@lerna/listable-3.0.0" = {
@@ -1372,13 +1372,13 @@ let
         sha512 = "9wIWb49I1IJmyjPdEVZQ13IAi9biGfH/OZHOC04U2zXGA0GLiY+B3CAx6FQvqkZ8xEGfqzmXnv3LvZ0bQfc1aQ==";
       };
     };
-    "@lerna/project-3.0.0" = {
+    "@lerna/project-3.5.0" = {
       name = "_at_lerna_slash_project";
       packageName = "@lerna/project";
-      version = "3.0.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/project/-/project-3.0.0.tgz";
-        sha512 = "XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw==";
+        url = "https://registry.npmjs.org/@lerna/project/-/project-3.5.0.tgz";
+        sha512 = "uFDzqwrD7a/tTohQoo0voTsRy2cgl9D1ZOU2pHZzHzow9S1M8E0x5q3hJI2HlwsZry9IUugmDUGO6UddTjwm3Q==";
       };
     };
     "@lerna/prompt-3.3.1" = {
@@ -1390,13 +1390,13 @@ let
         sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==";
       };
     };
-    "@lerna/publish-3.4.3" = {
+    "@lerna/publish-3.5.1" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.4.3";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.3.tgz";
-        sha512 = "baeRL8xmOR25p86cAaS9mL0jdRzdv4dUo04PlK2Wes+YlL705F55cSXeC9npNie+9rGwFyLzCTQe18WdbZyLuw==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.5.1.tgz";
+        sha512 = "ltw2YdWWzev9cZRAzons5ywZh9NJARPX67meeA95oMDVMrhD4Y9VHQNJ3T8ueec/W78/4sKlMSr3ecWyPNp5bg==";
       };
     };
     "@lerna/resolve-symlink-3.3.0" = {
@@ -1417,13 +1417,13 @@ let
         sha512 = "vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw==";
       };
     };
-    "@lerna/run-3.3.2" = {
+    "@lerna/run-3.5.0" = {
       name = "_at_lerna_slash_run";
       packageName = "@lerna/run";
-      version = "3.3.2";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run/-/run-3.3.2.tgz";
-        sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A==";
+        url = "https://registry.npmjs.org/@lerna/run/-/run-3.5.0.tgz";
+        sha512 = "BnPD52tj794xG2Xsc4FvgksyFX2CLmSR28TZw/xASEuy14NuQYMZkvbaj61SEhyOEsq7pLhHE5PpfbIv2AIFJw==";
       };
     };
     "@lerna/run-lifecycle-3.4.1" = {
@@ -1462,6 +1462,15 @@ let
         sha512 = "IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg==";
       };
     };
+    "@lerna/timer-3.5.0" = {
+      name = "_at_lerna_slash_timer";
+      packageName = "@lerna/timer";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@lerna/timer/-/timer-3.5.0.tgz";
+        sha512 = "TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA==";
+      };
+    };
     "@lerna/validation-error-3.0.0" = {
       name = "_at_lerna_slash_validation-error";
       packageName = "@lerna/validation-error";
@@ -1471,13 +1480,13 @@ let
         sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
       };
     };
-    "@lerna/version-3.4.1" = {
+    "@lerna/version-3.5.0" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-3.4.1.tgz";
-        sha512 = "oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-3.5.0.tgz";
+        sha512 = "vxuGkUSfjJuvOIgPG7SDXVmk4GPwJF9F+uhDW9T/wJzTk4UaxL37GpBeJDo43eutQ7mwluP+t88Luwf8S3WXlA==";
       };
     };
     "@lerna/write-log-file-3.0.0" = {
@@ -1624,6 +1633,24 @@ let
         sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
+    "@snyk/dep-graph-1.1.2" = {
+      name = "_at_snyk_slash_dep-graph";
+      packageName = "@snyk/dep-graph";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.1.2.tgz";
+        sha512 = "mCoAFKtmezBL61JOzLMzqqd/sXXxp0iektEwf4zw+sM3zuG4Tnmhf8OqNO6Wscn84bMIfLlI/nvECdxvSS7MTw==";
+      };
+    };
+    "@snyk/gemfile-1.1.0" = {
+      name = "_at_snyk_slash_gemfile";
+      packageName = "@snyk/gemfile";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.1.0.tgz";
+        sha512 = "mLwF+ccuvRZMS0SxUAxA3dAp8mB3m2FxIsBIUWFTYvzxl+E4XTZb8uFrUqXHbcxhZH1Z8taHohNTbzXZn3M8ag==";
+      };
+    };
     "@szmarczak/http-timer-1.1.1" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -1759,13 +1786,13 @@ let
         sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
       };
     };
-    "@types/node-10.12.9" = {
+    "@types/node-10.12.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.12.9";
+      version = "10.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.12.9.tgz";
-        sha512 = "eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz";
+        sha512 = "Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==";
       };
     };
     "@types/node-8.10.38" = {
@@ -1831,40 +1858,40 @@ let
         sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
       };
     };
-    "@vue/cli-shared-utils-3.1.1" = {
+    "@vue/cli-shared-utils-3.2.0" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "3.1.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.1.1.tgz";
-        sha512 = "r+R+5LI6IHHPI5tbOSDy5DpiY5O9eTy8LPr/QCPb5RIOg+Pg03VlElW4BL69hePXEHCQZZDsOzgItSmat6mBhg==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.2.0.tgz";
+        sha512 = "FCX5ABFg5pWhomyXLpCaogJktMvjsS5d4Mn5BfvqcJxCvzOX6ze8ihFK3u//XMeM78dOFpHSjxnRSvHtkEwgsg==";
       };
     };
-    "@vue/cli-ui-3.1.2" = {
+    "@vue/cli-ui-3.2.1" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "3.1.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.1.2.tgz";
-        sha512 = "PvadRrLAdIPB0PVIQDdNHhUdurP6EHg3XTs66Rame71yNUyyVI+l9Wh9xz3kFYC5CBsW/UrrdMJqU/ejXww17w==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.2.1.tgz";
+        sha512 = "ZcmR1inAs1IlfOlmCRK00fvZV8xHgsjZLviKCC2sbVQRORaeXwkJ1ysmYycjEHm44cqqJ1TawiPqBuSsO6U/YA==";
       };
     };
-    "@vue/cli-ui-addon-webpack-3.1.2" = {
+    "@vue/cli-ui-addon-webpack-3.2.1" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "3.1.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.1.2.tgz";
-        sha512 = "gob0dKcaewb/FfrhZ4qmN4KkrgVm6bfCml0zPAJZAWxUZ3PvuZ3sG9cpmYYhaC4ACBd5aOo/yys0qdGnaL29hA==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.2.1.tgz";
+        sha512 = "pXVhTc1xrrirvZqykUwJQuumlw58fx+S1egNhq05u08xVqG2d8QV/lP98Wgb/sNtOBaBccwBlailGj2Nqk8q6A==";
       };
     };
-    "@vue/cli-ui-addon-widgets-3.1.2" = {
+    "@vue/cli-ui-addon-widgets-3.2.1" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "3.1.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.1.2.tgz";
-        sha512 = "ZICSwa5lRfmeBySdKyL63nWUwC5QDrVm8KZDeFbxwxbSKIgeGksfKfMILDGShytKPCC5Nj99lgs6a9Ft3/jf4Q==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.2.1.tgz";
+        sha512 = "yaVX/rmc3KbFh3PS0N19ZWQs5mYSzefFaZEp08bwnw8VwTtJOl6RJQrKsNoUuA/9hEqgGv5CodLtVrRGnUHV0g==";
       };
     };
     "@webassemblyjs/ast-1.7.11" = {
@@ -2236,13 +2263,13 @@ let
         sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
       };
     };
-    "accord-0.29.0" = {
+    "accord-0.28.0" = {
       name = "accord";
       packageName = "accord";
-      version = "0.29.0";
+      version = "0.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz";
-        sha512 = "3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w==";
+        url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz";
+        sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ==";
       };
     };
     "ace.improved-0.2.1" = {
@@ -2353,13 +2380,13 @@ let
         sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==";
       };
     };
-    "acorn-jsx-5.0.0" = {
+    "acorn-jsx-5.0.1" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
-      version = "5.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz";
-        sha512 = "XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==";
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz";
+        sha512 = "HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==";
       };
     };
     "acorn-loose-6.0.0" = {
@@ -2596,13 +2623,22 @@ let
         sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==";
       };
     };
-    "ajv-6.5.5" = {
+    "ajv-6.6.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.5.5";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz";
-        sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
+        sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
+      };
+    };
+    "ajv-errors-1.0.0" = {
+      name = "ajv-errors";
+      packageName = "ajv-errors";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz";
+        sha1 = "ecf021fa108fd17dfb5e6b383f2dd233e31ffc59";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -2722,15 +2758,6 @@ let
         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";
@@ -2866,15 +2893,6 @@ let
         sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
-    "ansi-styles-3.2.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==";
-      };
-    };
     "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
@@ -2884,13 +2902,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-to-html-0.6.8" = {
+    "ansi-to-html-0.6.9" = {
       name = "ansi-to-html";
       packageName = "ansi-to-html";
-      version = "0.6.8";
+      version = "0.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.8.tgz";
-        sha512 = "wXwNl185AIu1QXuNApBiYNaWx0q+Ma1tLDVgc0HbA43GFWG8p1gcWLKKIBjQqamKe3rUkEILb6QMu9G/V14mzQ==";
+        url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.9.tgz";
+        sha512 = "hwNdg2DNgCzsrvaNc+LDqSxJkpxf9oEt4R7KE0IeURXhEOlontEqNpXNiGeFBpSes8TZF+ZZ9sjB85QzjPsI6A==";
       };
     };
     "ansi-wrap-0.1.0" = {
@@ -2965,40 +2983,40 @@ let
         sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692";
       };
     };
-    "apollo-cache-1.1.20" = {
+    "apollo-cache-1.1.21" = {
       name = "apollo-cache";
       packageName = "apollo-cache";
-      version = "1.1.20";
+      version = "1.1.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.20.tgz";
-        sha512 = "+Du0/4kUSuf5PjPx0+pvgMGV12ezbHA8/hubYuqRQoy/4AWb4faa61CgJNI6cKz2mhDd9m94VTNKTX11NntwkQ==";
+        url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz";
+        sha512 = "5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==";
       };
     };
-    "apollo-cache-control-0.3.2" = {
+    "apollo-cache-control-0.3.3" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.2.tgz";
-        sha512 = "/fhgCWGEoTsgyA83usy/1NvJWi6hbD4rSGO5jvyNNtMZ9ledOvKUvIdzSQ1r5hxK5yds/eehWXhMJ4Pu200qrQ==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.3.tgz";
+        sha512 = "X6JhKfIaMLfl2jpsK/880BflXA+2lmm2sAsOZL4Bn2VrMsDtOssI1Ij9vNRbch9k9cA4WJvKed7Sql/wUIa1Eg==";
       };
     };
-    "apollo-cache-inmemory-1.3.10" = {
+    "apollo-cache-inmemory-1.3.11" = {
       name = "apollo-cache-inmemory";
       packageName = "apollo-cache-inmemory";
-      version = "1.3.10";
+      version = "1.3.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.10.tgz";
-        sha512 = "cJL8xxX2iytludvxY4goxYJ41n8avXirAjQkEwgSvGqrEzC0PG2DwtHZZh1QTnRRuM1rgj4MKiUiX/Ykhc5L+Q==";
+        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.11.tgz";
+        sha512 = "fSoyjBV5RV57J3i/VHDDB74ZgXc0PFiogheNFHEhC0mL6rg5e/DjTx0Vg+csIBk23gvlzTvV+eypx7Q2NJ+dYg==";
       };
     };
-    "apollo-client-2.4.6" = {
+    "apollo-client-2.4.7" = {
       name = "apollo-client";
       packageName = "apollo-client";
-      version = "2.4.6";
+      version = "2.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.6.tgz";
-        sha512 = "RsZVMYone7mu3Wj4sr7ehctN8pdaHsP4X1Sv6Ly4gZ/YDetCCVnhbmnk5q7kvDtfoo0jhhHblxgFyA3FLLImtA==";
+        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.7.tgz";
+        sha512 = "6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==";
       };
     };
     "apollo-codegen-0.19.1" = {
@@ -3010,22 +3028,22 @@ let
         sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng==";
       };
     };
-    "apollo-datasource-0.2.0" = {
+    "apollo-datasource-0.2.1" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
-      version = "0.2.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.0.tgz";
-        sha512 = "WJM9Ix3uogIfAG7mjL1NZQM9+45rcikn4mPWhE1Iuyw2+Y857J3uKJqQgF5h9Fg64SlCJh9u5WL3N7N5mg1fVw==";
+        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.1.tgz";
+        sha512 = "r185+JTa5KuF1INeTAk7AEP76zwMN6c8Ph1lmpzJMNwBUEzTGnLClrccCskCBx4SxfnkdKbuQdwn9JwCJUWrdg==";
       };
     };
-    "apollo-engine-reporting-0.1.2" = {
+    "apollo-engine-reporting-0.1.3" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.2.tgz";
-        sha512 = "W6zBTypI2ZLe9ZpMI4EasyXJP2WG8CpxYOU3Q4iuCKh8HYJqrQC5QVFXRF7TRBQTE6tc1seYnAHdgqv0ozxBrw==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.3.tgz";
+        sha512 = "VkjiifHMHIAxydXecT+ck0WtqpFIsMlylKnKeuNAXfIfAXHX/JYtLhbArTTyhDunLrphMiUewfFv9P0K+aX2jw==";
       };
     };
     "apollo-engine-reporting-protobuf-0.1.0" = {
@@ -3037,49 +3055,49 @@ let
         sha512 = "GReJtAYTmpwg0drb9VgFtqObYYTCHkJhlHEYCeXY8bJV4fOgXsAZ7CIXR9nPKO0mBaoHIHaGYvXGcyCLrZ36VA==";
       };
     };
-    "apollo-env-0.2.4" = {
+    "apollo-env-0.2.5" = {
       name = "apollo-env";
       packageName = "apollo-env";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.2.4.tgz";
-        sha512 = "pphNvrS7JmgvkvhaNEh+u0GpolytboAQcNbwmgskvX0VaLPfrrVox0AwHCteReB8t8s87NhbLd0VTG1nxmjFfQ==";
-      };
-    };
-    "apollo-link-1.2.3" = {
-      name = "apollo-link";
-      packageName = "apollo-link";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.3.tgz";
-        sha512 = "iL9yS2OfxYhigme5bpTbmRyC+Htt6tyo2fRMHT3K1XRL/C5IQDDz37OjpPy4ndx7WInSvfSZaaOTKFja9VWqSw==";
-      };
-    };
-    "apollo-link-context-1.0.9" = {
-      name = "apollo-link-context";
-      packageName = "apollo-link-context";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.9.tgz";
-        sha512 = "gcC1WH7mTyNtS0bF4fPijepXqnERwZjm1JCkuOT6ADBTpDTXIqK+Ec+/QkVawDO26EV9OX5ujWe4kI1qC6T6tA==";
-      };
-    };
-    "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-dedup/-/apollo-link-dedup-1.0.10.tgz";
-        sha512 = "tpUI9lMZsidxdNygSY1FxflXEkUZnvKRkMUsXXuQUNoSLeNtEvUX7QtKRAl4k9ubLl8JKKc9X3L3onAFeGTK8w==";
-      };
-    };
-    "apollo-link-http-common-0.2.5" = {
-      name = "apollo-link-http-common";
-      packageName = "apollo-link-http-common";
       version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.5.tgz";
-        sha512 = "6FV1wr5AqAyJ64Em1dq5hhGgiyxZE383VJQmhIoDVc3MyNcFL92TkhxREOs4rnH2a9X2iJMko7nodHSGLC6d8w==";
+        url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.2.5.tgz";
+        sha512 = "Gc7TEbwCl7jJVutnn8TWfzNSkrrqyoo0DP92BQJFU9pZbJhpidoXf2Sw1YwOJl82rRKH3ujM3C8vdZLOgpFcFA==";
+      };
+    };
+    "apollo-link-1.2.4" = {
+      name = "apollo-link";
+      packageName = "apollo-link";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.4.tgz";
+        sha512 = "B1z+9H2nTyWEhMXRFSnoZ1vSuAYP+V/EdUJvRx9uZ8yuIBZMm6reyVtr1n0BWlKeSFyPieKJy2RLzmITAAQAMQ==";
+      };
+    };
+    "apollo-link-context-1.0.10" = {
+      name = "apollo-link-context";
+      packageName = "apollo-link-context";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.10.tgz";
+        sha512 = "HX3BEmkANs2A8AcYCy92SFJrW+0SbGrhDTSHV6ZwKIJ9ZrsOtly8cMrRLzEw1emjHIz5SP7XJEn3ko7BwhBBSw==";
+      };
+    };
+    "apollo-link-dedup-1.0.11" = {
+      name = "apollo-link-dedup";
+      packageName = "apollo-link-dedup";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.11.tgz";
+        sha512 = "RcvkXR0CNbQcsw6LdrPksGa+9YjZ1ghk0k2PKal6rSBCyyqzokcBawXOtoMN8q+0FLR1dGs5GnAQVeucQuY28g==";
+      };
+    };
+    "apollo-link-http-common-0.2.6" = {
+      name = "apollo-link-http-common";
+      packageName = "apollo-link-http-common";
+      version = "0.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.6.tgz";
+        sha512 = "LUOMWvrZuBP1hyWLBXyaW0KyFeKo79j+k3N+Q4HSkXKbLibnllXQ+JxxoSKGhm0bhREygiLtJAG9JnGlhxGO/Q==";
       };
     };
     "apollo-link-persisted-queries-0.2.2" = {
@@ -3100,31 +3118,31 @@ let
         sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw==";
       };
     };
-    "apollo-link-ws-1.0.9" = {
+    "apollo-link-ws-1.0.10" = {
       name = "apollo-link-ws";
       packageName = "apollo-link-ws";
-      version = "1.0.9";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.9.tgz";
-        sha512 = "CtKwLE61bCJTW5jrucOMm5PubeAlCl/9i45pg4GKKlAbl0zR4i2dww8TJkYoIY6iCyj4qjKW/uqGD6v5/aVwhg==";
+        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.10.tgz";
+        sha512 = "1Yx4iIUsWS8wuAdVJ2LF+LdIYAsqHSto8eShwJ/d2SovocsMCwN9hyS+JkaOPD/KHAkavTWzN6l3XwSOdOwevQ==";
       };
     };
-    "apollo-server-caching-0.2.0" = {
+    "apollo-server-caching-0.2.1" = {
       name = "apollo-server-caching";
       packageName = "apollo-server-caching";
-      version = "0.2.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.0.tgz";
-        sha512 = "/v7xWEcyyahs3hwX4baH/GekuHz3LRt9NoIYwg869G1eeqjuwY6NsowRIujZ100anJQwm9v5A9/sLtHBFvbgYg==";
+        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.1.tgz";
+        sha512 = "+U9F3X297LL8Gqy6ypfDNEv/DfV/tDht9Dr2z3AMaEkNW1bwO6rmdDL01zYxDuVDVq6Z3qSiNCSO2pXE2F0zmA==";
       };
     };
-    "apollo-server-core-2.2.2" = {
+    "apollo-server-core-2.2.6" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.2.2";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.2.tgz";
-        sha512 = "F6d4u5m1rJB4ucpLPGCoa9Dvo5OjGMIGdAzT9A35yOvlFWwvIR46jGmYmGmNp4Qx852rb1axSZVzNy7k/Dix0w==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.6.tgz";
+        sha512 = "hC3+Y9A4rN4W2X2cWqjrWWHkjKaG/jUQjtAVpQteDW+7n3bLKHCrpDFiFad++lq0ymRVW8diAaYDS4myJwjmoA==";
       };
     };
     "apollo-server-env-2.2.0" = {
@@ -3145,31 +3163,31 @@ let
         sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg==";
       };
     };
-    "apollo-server-express-2.2.2" = {
+    "apollo-server-express-2.2.6" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.2.2";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.2.tgz";
-        sha512 = "DPxHOUd0Waztuix0r1ed6xfdlR7P7RzIXPmybhPXj1bZJtYHz5If0ngYNjtFqnXVrC8aSRtMz108SQUAnduYwA==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.6.tgz";
+        sha512 = "+zajJDcJLhWdkW8f0D5KQfDsaxgx7fQ3ULGDT1eZgL0UY5pazWBOnXqeRoVKRl+r1WcrwN1SMfBVnAKWv6CyVw==";
       };
     };
-    "apollo-server-plugin-base-0.1.2" = {
+    "apollo-server-plugin-base-0.1.6" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.1.2";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.2.tgz";
-        sha512 = "+uicMcNctlP6YwIhzLLEycZzao/810OSzcxgPYKItXr5lGa1GuHD7sRIWldT3YoSdpw6Gal2lBuw6/DmnoDsPg==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.6.tgz";
+        sha512 = "nh6I2+mgSL5cYxqYXymAr8xBZ/ju8nunPjHp/21+/mgbF4Is0xtM9oDq5Qf0Q/cGh/djF6YcBuB1yUG+68gJXw==";
       };
     };
-    "apollo-tracing-0.3.2" = {
+    "apollo-tracing-0.3.3" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.2.tgz";
-        sha512 = "YwN1m1k0JJsxGh0QWsEM3OLnyem0GT2tZnGeO2OogCr6dH5lE0SjKPc6UzpcI/3fPyxRrx5QvpUiP+DJeehhTA==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.3.tgz";
+        sha512 = "gsTYgDVjtMlnomPq46aky7yk8XshCQfj9rxalCCismLlMomVW44fq+8GKQnZIkFOwiAsazRy4dzZ0cBbygA9sA==";
       };
     };
     "apollo-upload-client-9.1.0" = {
@@ -3181,13 +3199,13 @@ let
         sha512 = "ZN5gsbBjImEZTWWTUHpCEGDasnoBGbaODpznQ5EawyNHceuFYSNJbbft+ZZ841vZAcj9XZdKUKoaLBlMZ/r7nw==";
       };
     };
-    "apollo-utilities-1.0.25" = {
+    "apollo-utilities-1.0.26" = {
       name = "apollo-utilities";
       packageName = "apollo-utilities";
-      version = "1.0.25";
+      version = "1.0.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.25.tgz";
-        sha512 = "AXvqkhni3Ir1ffm4SA1QzXn8k8I5BBl4PVKEyak734i4jFdp+xgfUyi2VCqF64TJlFTA/B73TRDUvO2D+tKtZg==";
+        url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz";
+        sha512 = "URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==";
       };
     };
     "app-builder-5.2.0" = {
@@ -3492,17 +3510,17 @@ let
       packageName = "array-flatten";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+        url = "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
-    "array-flatten-2.1.1" = {
+    "array-flatten-2.1.2" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
-        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz";
+        sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==";
       };
     };
     "array-from-2.1.1" = {
@@ -3784,13 +3802,13 @@ let
         sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==";
       };
     };
-    "ast-types-0.11.6" = {
+    "ast-types-0.11.7" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.11.6";
+      version = "0.11.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.6.tgz";
-        sha512 = "nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz";
+        sha512 = "2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==";
       };
     };
     "ast-types-0.9.6" = {
@@ -4045,22 +4063,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.358.0" = {
+    "aws-sdk-2.371.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.358.0";
+      version = "2.371.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.358.0.tgz";
-        sha512 = "nS47i+YecWDAy3JE55GrC2dLbWsc5lqIub8y+VgHPoVI11f/wmWpF1kY+8FD20IGbZQHWiqiMdMZjFS86L1w6g==";
-      };
-    };
-    "aws-sign-0.2.1" = {
-      name = "aws-sign";
-      packageName = "aws-sign";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.1.tgz";
-        sha512 = "cQFl6jK/Lq416OqpT+lb1RIay1wShuQjHF3/kAJbyMvruV8vSpDahaGNkbeupdGRgXR8Ii0O/ZIbTQPdp+l3pA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.371.0.tgz";
+        sha512 = "SlSKhWEMCm3rC8LwaZ3Z2SaLp7qO0ZxUGsJs1TZp+dlYehDitFGZjfr0rD+ioxlzOniOViUFEACM63eLZjnTnA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -4252,13 +4261,13 @@ let
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
-    "azure-arm-resource-7.2.0" = {
+    "azure-arm-resource-7.2.1" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.0.tgz";
-        sha512 = "1WYsma7061MNc3MnRuS8s+HdWfLEJkrozdj4qJpRh1KQkYUk2pC76ypqNKBL9DdaWgYkqpys7j6juuITRW/pnQ==";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.1.tgz";
+        sha512 = "dtji3Eia9/TABcKzxWklTLh9zj24BtOkBObzxH4BAr/ZSFmyAtJA4lYXkjizEkPCS6XVsCiqsUJZtNrqQ8iTWA==";
       };
     };
     "azure-arm-servermanagement-1.1.0" = {
@@ -5332,13 +5341,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.36" = {
+    "big-integer-1.6.40" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.36";
+      version = "1.6.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz";
-        sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.40.tgz";
+        sha512 = "CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==";
       };
     };
     "big.js-3.2.0" = {
@@ -5418,17 +5427,17 @@ let
       packageName = "bindings";
       version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "bindings-1.3.0" = {
+    "bindings-1.3.1" = {
       name = "bindings";
       packageName = "bindings";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
-        sha512 = "DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==";
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz";
+        sha512 = "i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew==";
       };
     };
     "binwrap-0.2.0" = {
@@ -5764,15 +5773,6 @@ let
         sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
       };
     };
-    "boom-0.3.8" = {
-      name = "boom";
-      packageName = "boom";
-      version = "0.3.8";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
-        sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
-      };
-    };
     "boom-2.10.1" = {
       name = "boom";
       packageName = "boom";
@@ -5782,24 +5782,6 @@ let
         sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
       };
     };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==";
-      };
-    };
     "bottleneck-1.5.3" = {
       name = "bottleneck";
       packageName = "bottleneck";
@@ -5814,7 +5796,7 @@ let
       packageName = "bower";
       version = "1.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+        url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
         sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
       };
     };
@@ -6124,13 +6106,13 @@ let
         sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9";
       };
     };
-    "browserslist-4.3.4" = {
+    "browserslist-4.3.5" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.3.4";
+      version = "4.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz";
-        sha512 = "u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.3.5.tgz";
+        sha512 = "z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w==";
       };
     };
     "buffer-3.6.0" = {
@@ -6529,15 +6511,6 @@ let
         sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
       };
     };
-    "cacache-10.0.4" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "10.0.4";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
-        sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
-      };
-    };
     "cacache-11.3.1" = {
       name = "cacache";
       packageName = "cacache";
@@ -6660,7 +6633,7 @@ let
       packageName = "callsites";
       version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
+        url = "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
@@ -6669,7 +6642,7 @@ let
       packageName = "callsites";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz";
+        url = "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz";
         sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
       };
     };
@@ -6763,22 +6736,22 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-db-1.0.30000907" = {
+    "caniuse-db-1.0.30000916" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000907";
+      version = "1.0.30000916";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000907.tgz";
-        sha512 = "OKtlTmEPR9GgCxnKMlvdHTT2QD6n4eIovcVqEnjoR8iB9l6rk4abKnjsDSyTD36an/ebgigl8T2CSdwSf4JoGw==";
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000916.tgz";
+        sha512 = "XuMzGxlFYXDEm+e/6ti7ThqQki/hRXHw4aaFMQXtFHYoj2XNn92zZ5aH75AADfQ1tnXoZTOvS2+NbaaWWPypIw==";
       };
     };
-    "caniuse-lite-1.0.30000907" = {
+    "caniuse-lite-1.0.30000916" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000907";
+      version = "1.0.30000916";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz";
-        sha512 = "No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000916.tgz";
+        sha512 = "D6J9jloPm2MPkg0PXcODLMQAJKkeixKO9xhqTUMvtd44MtTYMyyDXPQ2Lk9IgBq5FH0frwiPa/N/w8ncQf7kIQ==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -7776,7 +7749,7 @@ let
       packageName = "coffee-script";
       version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
         sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
       };
     };
@@ -7848,7 +7821,7 @@ let
       packageName = "color-string";
       version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+        url = "http://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
         sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
       };
     };
@@ -8392,15 +8365,6 @@ let
         sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
       };
     };
-    "connect-3.5.1" = {
-      name = "connect";
-      packageName = "connect";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz";
-        sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e";
-      };
-    };
     "connect-3.6.6" = {
       name = "connect";
       packageName = "connect";
@@ -8761,15 +8725,6 @@ let
         sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
       };
     };
-    "cookie-jar-0.2.0" = {
-      name = "cookie-jar";
-      packageName = "cookie-jar";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
-        sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
-      };
-    };
     "cookie-parser-1.3.5" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -8928,7 +8883,7 @@ let
       packageName = "cordova-registry-mapper";
       version = "1.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
+        url = "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
         sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
       };
     };
@@ -8959,13 +8914,22 @@ let
         sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
       };
     };
-    "core-js-3.0.0-beta.3" = {
+    "core-js-2.6.0" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.0.0-beta.3";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.3.tgz";
-        sha512 = "kM/OfrnMThP5PwGAj5HhQLdjUqzjrllqN2EVnk/X9qrLsfYjR2hzZ+E/8CzH0xuosexZtqMTLQrk//BULrBj9w==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz";
+        sha512 = "kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==";
+      };
+    };
+    "core-js-3.0.0-beta.4" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "3.0.0-beta.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.4.tgz";
+        sha512 = "yz4iJCkkSQLQSLHPGUln6r5ZBkLPzZSvHG0g1nfvcdnmpIe+KE9WOb1ZEEf6EEaEmjp9Ol0Kw5J5vnoIWc5eWw==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -9274,15 +9238,6 @@ let
         sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
       };
     };
-    "cryptiles-0.1.3" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
-        sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
-      };
-    };
     "cryptiles-2.0.5" = {
       name = "cryptiles";
       packageName = "cryptiles";
@@ -9292,15 +9247,6 @@ let
         sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
       };
     };
-    "cryptiles-3.1.4" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.4.tgz";
-        sha512 = "8I1sgZHfVwcSOY6mSGpVU3lw/GSIZvusg8dD2+OGehCJpOhQRLNcH0qb9upQnOH4XhgxxFJSg6E2kx95deb1Tw==";
-      };
-    };
     "crypto-0.0.3" = {
       name = "crypto";
       packageName = "crypto";
@@ -10849,13 +10795,13 @@ let
         sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg==";
       };
     };
-    "dns-discovery-6.2.2" = {
+    "dns-discovery-6.2.3" = {
       name = "dns-discovery";
       packageName = "dns-discovery";
-      version = "6.2.2";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.2.2.tgz";
-        sha512 = "EZQxH4I5ZAQbV8Njlb4JXhgeIKtcXdCzLCLSJIyzEXbzEm6hNsJdX5F6oW+4a02etsaSPBX3iEDFyPg7VB91PQ==";
+        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.2.3.tgz";
+        sha512 = "ZULG1R5J9QHZfaXo5XFGVG22LIcnZorbEa7f83FYgCGDaQrVfyVmty3Z89OvBLpCPetwW+LzjCcT60ekhbQ+9g==";
       };
     };
     "dns-equal-1.0.0" = {
@@ -10912,6 +10858,15 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
+    "dockerfile-ast-0.0.12" = {
+      name = "dockerfile-ast";
+      packageName = "dockerfile-ast";
+      version = "0.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz";
+        sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
+      };
+    };
     "doctrine-2.1.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -11002,13 +10957,13 @@ let
         sha1 = "bd28773e2642881aec51544924299c5cd822185b";
       };
     };
-    "domelementtype-1.3.0" = {
+    "domelementtype-1.3.1" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz";
+        sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
     "domhandler-2.2.1" = {
@@ -11389,13 +11344,13 @@ let
         sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==";
       };
     };
-    "electron-to-chromium-1.3.84" = {
+    "electron-to-chromium-1.3.88" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.84";
+      version = "1.3.88";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz";
-        sha512 = "IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.88.tgz";
+        sha512 = "UPV4NuQMKeUh1S0OWRvwg0PI8ASHN9kBC8yDTk1ROXLC85W5GnhTRu/MZu3Teqx3JjlQYuckuHYXSUSgtb3J+A==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -11624,6 +11579,15 @@ let
         sha512 = "+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==";
       };
     };
+    "engine.io-3.3.2" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz";
+        sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -11651,6 +11615,15 @@ let
         sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==";
       };
     };
+    "engine.io-client-3.3.1" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.1.tgz";
+        sha512 = "q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==";
+      };
+    };
     "engine.io-parser-1.0.6" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -11759,6 +11732,15 @@ let
         sha512 = "rXbzXWvnQxy+TcqZlARbWVQwgGVVouVJgFZhLVN5htjLxl1thstrP2ZGi0pXC309AbK7gVOPU+ulz/tmpCI7iw==";
       };
     };
+    "envinfo-5.12.1" = {
+      name = "envinfo";
+      packageName = "envinfo";
+      version = "5.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/envinfo/-/envinfo-5.12.1.tgz";
+        sha512 = "pwdo0/G3CIkQ0y6PCXq4RdkvId2elvtPCJMG0konqlrfkWQbf1DWeH9K2b/cvu2YgGvPPTOnonZxXM1gikFu1w==";
+      };
+    };
     "epidemic-broadcast-trees-6.3.5" = {
       name = "epidemic-broadcast-trees";
       packageName = "epidemic-broadcast-trees";
@@ -12353,22 +12335,22 @@ let
         sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d";
       };
     };
-    "event-stream-3.3.6" = {
+    "event-stream-3.3.4" = {
       name = "event-stream";
       packageName = "event-stream";
-      version = "3.3.6";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz";
-        sha512 = "dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==";
+        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
+        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
       };
     };
-    "event-stream-4.0.1" = {
+    "event-stream-3.3.5" = {
       name = "event-stream";
       packageName = "event-stream";
-      version = "4.0.1";
+      version = "3.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz";
-        sha512 = "qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==";
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz";
+        sha512 = "vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==";
       };
     };
     "event-to-promise-0.8.0" = {
@@ -12619,7 +12601,7 @@ let
       packageName = "expand-range";
       version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
+        url = "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
         sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044";
       };
     };
@@ -12628,7 +12610,7 @@ let
       packageName = "expand-range";
       version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz";
+        url = "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz";
         sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
       };
     };
@@ -12974,13 +12956,13 @@ let
         sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c";
       };
     };
-    "fancy-log-1.3.2" = {
+    "fancy-log-1.3.3" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz";
-        sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz";
+        sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==";
       };
     };
     "fast-bitfield-1.2.1" = {
@@ -13082,13 +13064,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "fast-redact-1.3.0" = {
+    "fast-redact-1.4.0" = {
       name = "fast-redact";
       packageName = "fast-redact";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.3.0.tgz";
-        sha512 = "ci4qKDR8nDzQCQTPw4hviyDFaSwTgSYiqddRh/EslkUQa0otpzM8IGnuG+LwiUE54t4OjU2T7bYKmjtd7632Wg==";
+        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.0.tgz";
+        sha512 = "WsYhPdWJY+6d/pFJbBNWGUd5ENrBAJ6e7yDWcYNoFZoIQUUbKxnIRGS4d0kZkQlMPB4cLK3r4A0BZXpFxdoGhg==";
       };
     };
     "fast-safe-stringify-1.2.3" = {
@@ -13379,15 +13361,6 @@ let
         sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
       };
     };
-    "finalhandler-0.5.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
-      };
-    };
     "finalhandler-1.1.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -13424,6 +13397,15 @@ let
         sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f";
       };
     };
+    "find-cache-dir-2.0.0" = {
+      name = "find-cache-dir";
+      packageName = "find-cache-dir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz";
+        sha512 = "LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==";
+      };
+    };
     "find-elm-dependencies-2.0.0" = {
       name = "find-elm-dependencies";
       packageName = "find-elm-dependencies";
@@ -13613,22 +13595,22 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
-    "flatmap-stream-0.1.2" = {
-      name = "flatmap-stream";
-      packageName = "flatmap-stream";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.2.tgz";
-        sha512 = "ucyr6WkLXjyMuHPtOUq4l+nSAxgWi7v4QO508eQ9resnGj+lSup26oIsUI5aH8k4Qfpjsxa8dDf9UCKkS2KHzQ==";
-      };
-    };
-    "flatstr-1.0.8" = {
+    "flatstr-1.0.9" = {
       name = "flatstr";
       packageName = "flatstr";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.8.tgz";
-        sha512 = "YXblbv/vc1zuVVUtnKl1hPqqk7TalZCppnKE7Pr8FI/Rp48vzckS/4SJ4Y9O9RNiI82Vcw/FydmtqdQOg1Dpqw==";
+        url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.9.tgz";
+        sha512 = "qFlJnOBWDfIaunF54/lBqNKmXOI0HqNhu+mHkLmbaBXlS71PUd9OjFOdyevHt/aHoHB1+eW7eKHgRKOG5aHSpw==";
+      };
+    };
+    "flatted-2.0.0" = {
+      name = "flatted";
+      packageName = "flatted";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz";
+        sha512 = "R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==";
       };
     };
     "flatten-0.0.1" = {
@@ -13730,13 +13712,13 @@ let
         sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw==";
       };
     };
-    "flumeview-query-7.1.0" = {
+    "flumeview-query-7.1.1" = {
       name = "flumeview-query";
       packageName = "flumeview-query";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.1.0.tgz";
-        sha512 = "z/23qWuRW5dj7yNJ1i61R0RgnUWn4rdaf9Fr1Ckz3CzKpwJBWR1MqnABuGY3k1PZg1T11Busm2aRdb6oH1ZLsQ==";
+        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.1.1.tgz";
+        sha512 = "3HkgA4u5aIrUIFJ+uRfEpRy/xFwTresz05wf/Sg3NigWrw8JWaGMmHToJpoL8ec9EvYKgP3JNj5wHLw9WEocsA==";
       };
     };
     "flumeview-reduce-1.3.14" = {
@@ -13757,13 +13739,13 @@ let
         sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
       };
     };
-    "follow-redirects-1.5.9" = {
+    "follow-redirects-1.5.10" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.5.9";
+      version = "1.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz";
-        sha512 = "Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
       };
     };
     "for-each-0.3.3" = {
@@ -13829,15 +13811,6 @@ let
         sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
       };
     };
-    "forever-agent-0.2.0" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
-        sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
-      };
-    };
     "forever-agent-0.6.1" = {
       name = "forever-agent";
       packageName = "forever-agent";
@@ -13856,15 +13829,6 @@ let
         sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8";
       };
     };
-    "form-data-0.0.10" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
-        sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
-      };
-    };
     "form-data-0.1.3" = {
       name = "form-data";
       packageName = "form-data";
@@ -14572,7 +14536,7 @@ let
       packageName = "git-config-path";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/git-config-path/-/git-config-path-1.0.1.tgz";
+        url = "http://registry.npmjs.org/git-config-path/-/git-config-path-1.0.1.tgz";
         sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664";
       };
     };
@@ -14865,13 +14829,13 @@ let
         sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
       };
     };
-    "global-modules-path-2.3.0" = {
+    "global-modules-path-2.3.1" = {
       name = "global-modules-path";
       packageName = "global-modules-path";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.0.tgz";
-        sha512 = "HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==";
+        url = "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz";
+        sha512 = "y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==";
       };
     };
     "global-prefix-1.0.2" = {
@@ -14883,13 +14847,13 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "global-tunnel-ng-2.6.0" = {
+    "global-tunnel-ng-2.7.1" = {
       name = "global-tunnel-ng";
       packageName = "global-tunnel-ng";
-      version = "2.6.0";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.6.0.tgz";
-        sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA==";
+        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz";
+        sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==";
       };
     };
     "globals-11.9.0" = {
@@ -15126,13 +15090,13 @@ let
         sha512 = "gUC4YYsaiSJT1h40krG3J+USGlwhzNTXSb4IOZljn9ag5Tj+RkoXrWp+Kh7WyE3t1NCfab5kzCuxBIvOMERMXw==";
       };
     };
-    "graphql-anywhere-4.1.22" = {
+    "graphql-anywhere-4.1.23" = {
       name = "graphql-anywhere";
       packageName = "graphql-anywhere";
-      version = "4.1.22";
+      version = "4.1.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.22.tgz";
-        sha512 = "qm2/1cKM8nfotxDhm4J0r1znVlK0Yge/yEKt26EVVBgpIhvxjXYFALCGbr7cvfDlvzal1iSPpaYa+8YTtjsxQA==";
+        url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.23.tgz";
+        sha512 = "8wtmwxWmLzAy52Z4WAw9UiYZ4ViiNXM+2DMOSlg2F7WsVstD0v75uOjCLJQUvbld5kHrgzTxter/THFVkGL+Yw==";
       };
     };
     "graphql-cli-prepare-1.4.19" = {
@@ -15180,13 +15144,22 @@ let
         sha512 = "7Qh3TzZS3hwZpJbTNfTHXBM6UbzV7DMik9Mc95Rz76yTAs7Wr83xBFsH4Ap1NWlqBgANfO3cLLI4YomDJmO5SA==";
       };
     };
-    "graphql-extensions-0.3.2" = {
+    "graphql-extensions-0.3.3" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.2.tgz";
-        sha512 = "eIAWwtZNlUAHtHF6uNP6+4M+GCksqUYfNBxW5rTAlCB4/ZcuIvchVtN1CgVM7MooW3akPM1Eci11WyeXvgOugQ==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.3.tgz";
+        sha512 = "pudOaHq7Ok+rh1ElzlqFaoYZWGefUNsqn/jX6eKns7rl0VHuB4qZBfhpVLTpquJpM6Y19/hsCYZNPfnUVMFIiA==";
+      };
+    };
+    "graphql-extensions-0.3.6" = {
+      name = "graphql-extensions";
+      packageName = "graphql-extensions";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.6.tgz";
+        sha512 = "QGnDQ0TkF1YpVE/ZvKVl3bZ1PfwSbynVBcNU5U1DPU56pLkltETORiFL4TQ/Tt7RzagBX/xVaI3q0xJC6h9M5w==";
       };
     };
     "graphql-import-0.4.5" = {
@@ -15360,13 +15333,13 @@ let
         sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg==";
       };
     };
-    "gulp-less-4.0.1" = {
+    "gulp-less-3.5.0" = {
       name = "gulp-less";
       packageName = "gulp-less";
-      version = "4.0.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz";
-        sha512 = "hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA==";
+        url = "http://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz";
+        sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw==";
       };
     };
     "gulp-sourcemaps-2.6.4" = {
@@ -15378,13 +15351,13 @@ let
         sha1 = "cbb2008450b1bcce6cd23bf98337be751bf6e30a";
       };
     };
-    "gulp-typescript-5.0.0-alpha.3" = {
+    "gulp-typescript-4.0.2" = {
       name = "gulp-typescript";
       packageName = "gulp-typescript";
-      version = "5.0.0-alpha.3";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.0-alpha.3.tgz";
-        sha512 = "6iSBjqBXAUqRsLUh/9XtlOnSzpPMbLrr5rqGj4UPLtGpDwFHW/fVTuRgv6LAWiKesLIUDDM0ourxvcpu2trecQ==";
+        url = "http://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz";
+        sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA==";
       };
     };
     "gulp-uglify-3.0.1" = {
@@ -15729,13 +15702,13 @@ let
         sha1 = "33b40777754c6432573c120cc3808bbd10d47f04";
       };
     };
-    "hash.js-1.1.5" = {
+    "hash.js-1.1.7" = {
       name = "hash.js";
       packageName = "hash.js";
-      version = "1.1.5";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz";
-        sha512 = "eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==";
+        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
+        sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
       };
     };
     "hasha-2.2.0" = {
@@ -15756,13 +15729,13 @@ let
         sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
       };
     };
-    "hashlru-2.2.1" = {
+    "hashlru-2.3.0" = {
       name = "hashlru";
       packageName = "hashlru";
-      version = "2.2.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hashlru/-/hashlru-2.2.1.tgz";
-        sha1 = "10f2099a0d7c05a40f2beaf5c1d39cf2f7dabf36";
+        url = "https://registry.npmjs.org/hashlru/-/hashlru-2.3.0.tgz";
+        sha512 = "0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==";
       };
     };
     "hat-0.0.3" = {
@@ -15774,15 +15747,6 @@ let
         sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
       };
     };
-    "hawk-0.10.2" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "0.10.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
-        sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
-      };
-    };
     "hawk-3.1.3" = {
       name = "hawk";
       packageName = "hawk";
@@ -15792,15 +15756,6 @@ let
         sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
       };
     };
-    "hawk-6.0.2" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==";
-      };
-    };
     "he-0.5.0" = {
       name = "he";
       packageName = "he";
@@ -15900,15 +15855,6 @@ let
         sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
       };
     };
-    "hoek-0.7.6" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "0.7.6";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
-        sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
-      };
-    };
     "hoek-2.16.3" = {
       name = "hoek";
       packageName = "hoek";
@@ -15918,15 +15864,6 @@ let
         sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
       };
     };
-    "hoek-4.2.1" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
-        sha512 = "QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==";
-      };
-    };
     "hoek-5.0.4" = {
       name = "hoek";
       packageName = "hoek";
@@ -15936,13 +15873,13 @@ let
         sha512 = "Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==";
       };
     };
-    "hoek-6.0.3" = {
+    "hoek-6.1.2" = {
       name = "hoek";
       packageName = "hoek";
-      version = "6.0.3";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-6.0.3.tgz";
-        sha512 = "TU6RyZ/XaQCTWRLrdqZZtZqwxUVr6PDMfi6MlWNURZ7A6czanQqX4pFE1mdOUQR9FdPCsZ0UzL8jI/izZ+eBSQ==";
+        url = "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz";
+        sha512 = "6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==";
       };
     };
     "hogan.js-3.0.2" = {
@@ -16116,13 +16053,13 @@ let
         sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
-    "http-cache-semantics-4.0.0" = {
+    "http-cache-semantics-4.0.1" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz";
-        sha512 = "NtexGRtaV5z3ZUX78W9UDTOJPBdpqms6RmwQXmOhHws7CuQK3cqIoQtnmeqi1VvVD6u6eMMRL0sKE9BCZXTDWQ==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz";
+        sha512 = "OO/9K7uFN30qwAKvslzmCTbimZ/uRjtdN5S50vvWLwUKqFuZj0n96XyCzF5tHRHEO/Q4JYC01hv41gkX06gmHA==";
       };
     };
     "http-errors-1.3.1" = {
@@ -16296,13 +16233,13 @@ let
         sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-6.21.0" = {
+    "hypercore-6.22.0" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.21.0";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.21.0.tgz";
-        sha512 = "LPKI+nvgbFTKbXD1y6It3PUZDIQFHSYIeSDbqIZeIVuSoeI4PYcCehKdqB9Wls31AIZL7cFwA5o64uOtBxF1cA==";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.22.0.tgz";
+        sha512 = "x/6qeNqsV+CKrKAfSkHR5IHbP7Rv5oVhAx2BeDcdF7Y9cqKsus9O0/4hylb8mv35pXSXXGAthXyfrsYGiSSJZw==";
       };
     };
     "hypercore-crypto-1.0.0" = {
@@ -16314,13 +16251,13 @@ let
         sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw==";
       };
     };
-    "hypercore-protocol-6.7.1" = {
+    "hypercore-protocol-6.8.0" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.7.1";
+      version = "6.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.7.1.tgz";
-        sha512 = "6jjMwL/XgeAl9BDUWmAJmIum7ynHGqajCnXt5VbJuxNLKkPI8WQS2kpMfcvotI5QHKMu/15+92ZPM6WoYDtd8g==";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.8.0.tgz";
+        sha512 = "WJOcnhiHAZpFVcvc1+tSmhcZaC76fQBKz6yyN1pFmhhqu8knNMOm6pcUFU2w+/mVFcXSbHhSfRtKwpNBu0EZSQ==";
       };
     };
     "hyperdrive-9.14.0" = {
@@ -16836,13 +16773,13 @@ let
         sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==";
       };
     };
-    "inquirer-6.2.0" = {
+    "inquirer-6.2.1" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz";
-        sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz";
+        sha512 = "088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==";
       };
     };
     "inquirer-autocomplete-prompt-1.0.1" = {
@@ -18528,15 +18465,6 @@ let
         sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
       };
     };
-    "json-stringify-safe-3.0.0" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
-        sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
-      };
-    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -19150,13 +19078,13 @@ let
         sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==";
       };
     };
-    "layered-graph-1.1.1" = {
+    "layered-graph-1.1.2" = {
       name = "layered-graph";
       packageName = "layered-graph";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.1.tgz";
-        sha512 = "YqnSwwiLxLdvJBi6ZrUEQEdjv+Z3S5fO1mT6ItWCfZu2tsBG22gr49Bj+hgtMeose/74apZeCx+/T9j4NgMDNA==";
+        url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.2.tgz";
+        sha512 = "OaV2u8eMWxUkVYTGhXKDBjFBVPONubDJfnw6dy6ndZDTANfZeeapq35x3oWnqpW1GxbulXuf7fMhxy97r+k2Sg==";
       };
     };
     "lazy-1.0.11" = {
@@ -19249,15 +19177,6 @@ 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";
@@ -19465,13 +19384,13 @@ let
         sha1 = "8d84b4f3b225b3704410236ef494906436ba742b";
       };
     };
-    "libnested-1.4.0" = {
+    "libnested-1.4.1" = {
       name = "libnested";
       packageName = "libnested";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnested/-/libnested-1.4.0.tgz";
-        sha512 = "txW/cdkfe0eYhIfLbZl8pfkMu2NWEVWAuDAaiDawahx1hqTaDVoFbjISdWgU24XUI/10kBjJYDsisoPSMJKnpw==";
+        url = "https://registry.npmjs.org/libnested/-/libnested-1.4.1.tgz";
+        sha512 = "7fvNHrU8QTep71gIJuz7z6iBAQULEHJOcIA0MKUlwFrSnntvOvnke+/tnR7ZxyRAQQ303UJXNZBSRz3r0N5tqw==";
       };
     };
     "libnpmaccess-3.0.1" = {
@@ -19546,13 +19465,13 @@ let
         sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493";
       };
     };
-    "linkify-it-2.0.3" = {
+    "linkify-it-2.1.0" = {
       name = "linkify-it";
       packageName = "linkify-it";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz";
-        sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f";
+        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz";
+        sha512 = "4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==";
       };
     };
     "listenercount-1.0.1" = {
@@ -20955,35 +20874,35 @@ let
       packageName = "lru-cache";
       version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
         sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
       };
     };
-    "lru-cache-2.2.4" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
-        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
-      };
-    };
     "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";
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
         sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
       };
     };
-    "lru-cache-4.1.3" = {
+    "lru-cache-4.1.5" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.1.3";
+      version = "4.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
-        sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
+        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
+      };
+    };
+    "lru-cache-5.1.1" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
+        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
       };
     };
     "lru-queue-0.1.0" = {
@@ -21049,6 +20968,15 @@ let
         sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==";
       };
     };
+    "macos-release-2.0.0" = {
+      name = "macos-release";
+      packageName = "macos-release";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz";
+        sha512 = "iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==";
+      };
+    };
     "magic-string-0.22.5" = {
       name = "magic-string";
       packageName = "magic-string";
@@ -21729,7 +21657,7 @@ let
       packageName = "mime";
       version = "1.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
         sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
       };
     };
@@ -21738,7 +21666,7 @@ let
       packageName = "mime";
       version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
         sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
       };
     };
@@ -21747,7 +21675,7 @@ let
       packageName = "mime";
       version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
         sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
       };
     };
@@ -21756,7 +21684,7 @@ let
       packageName = "mime";
       version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
         sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
       };
     };
@@ -21778,13 +21706,13 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-2.3.1" = {
+    "mime-2.4.0" = {
       name = "mime";
       packageName = "mime";
-      version = "2.3.1";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz";
-        sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz";
+        sha512 = "ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==";
       };
     };
     "mime-db-1.12.0" = {
@@ -22003,15 +21931,6 @@ let
         sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g==";
       };
     };
-    "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==";
-      };
-    };
     "mississippi-3.0.0" = {
       name = "mississippi";
       packageName = "mississippi";
@@ -22327,13 +22246,13 @@ let
         sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "ms-rest-2.3.7" = {
+    "ms-rest-2.3.8" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.3.7";
+      version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.7.tgz";
-        sha512 = "zZwuckC/Uv8F1Jr1bW+U1tsDTErWhtH6W4mpxvRrta4YrKwkFeLMt53RsaDOWTqMFsVpjNuCfznV1uxeGUF3/g==";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.8.tgz";
+        sha512 = "8kaerSPk0Z9W6z8VnJXjKOHDaGGXbsGyO22X4DFtlllzbYLryWo0Dor+jnIKpgvUOzQKSoLW2fel81piG3LnHQ==";
       };
     };
     "ms-rest-azure-1.15.7" = {
@@ -22381,13 +22300,13 @@ let
         sha1 = "6462f1b204109ccc644601650110a828443d66e2";
       };
     };
-    "multiblob-1.13.1" = {
+    "multiblob-1.13.2" = {
       name = "multiblob";
       packageName = "multiblob";
-      version = "1.13.1";
+      version = "1.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.1.tgz";
-        sha512 = "AvU9tbDqf3TxYgF1ldo3nVz4HoKI/ZDJBo/znLc6KCRiqr7dQv5vW3i3xh0JKZdLzgKG9JpUiKtwB8E92gn3ZQ==";
+        url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.2.tgz";
+        sha512 = "z1nRV/iLDQQ2ih1lkOmOod4OLaaYk1LayU5mUJTGItekthyuWVWT+uuMp7mI1zXczEVuWky4MaDXuekKHkrJUQ==";
       };
     };
     "multiblob-http-0.4.2" = {
@@ -23177,13 +23096,13 @@ let
         sha512 = "9g2twBGSP6wIR5PW7tXvAWnEWKJDH/VskdXp168xsw9VVxpEGov8K4jsP4/VeoC7b2ZAyzckvMCuQuQlw44lXg==";
       };
     };
-    "node-addon-api-1.6.1" = {
+    "node-addon-api-1.6.2" = {
       name = "node-addon-api";
       packageName = "node-addon-api";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.1.tgz";
-        sha512 = "GcLOYrG5/enbqH4SMsqXt6GQUQGGnDnE3FLDZzXYkCgQHuZV5UDFR+EboeY8kpG0avroyOjpFQ2qLEBosFcRIA==";
+        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.2.tgz";
+        sha512 = "479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==";
       };
     };
     "node-alias-1.0.4" = {
@@ -23285,13 +23204,13 @@ let
         sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
       };
     };
-    "node-gyp-build-3.5.0" = {
+    "node-gyp-build-3.5.1" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
-        sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
+        sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
       };
     };
     "node-int64-0.4.0" = {
@@ -23411,13 +23330,13 @@ let
         sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA==";
       };
     };
-    "node-releases-1.0.3" = {
+    "node-releases-1.1.0" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.0.3.tgz";
-        sha512 = "ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.0.tgz";
+        sha512 = "+qV91QMDBvARuPxUEfI/mRF/BY+UAkTIn3pvmvM2iOLIRvv6RNYklFXBgrkky6P1wXUqQW1P3qKlWxxy4JZbfg==";
       };
     };
     "node-request-by-swagger-1.1.4" = {
@@ -23492,13 +23411,13 @@ let
         sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
       };
     };
-    "node.extend-2.0.1" = {
+    "node.extend-2.0.2" = {
       name = "node.extend";
       packageName = "node.extend";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.1.tgz";
-        sha512 = "42zXr2Cy16E58KEHm8vz2LE3IJWW0xUrQw0L+R2sII7NIiqKMa9JlwX02YFHg5+IKDg+Es1ZE8nD7ucUWR16UA==";
+        url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz";
+        sha512 = "pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==";
       };
     };
     "nodebmc-0.0.7" = {
@@ -23546,13 +23465,13 @@ let
         sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "nodemon-1.18.6" = {
+    "nodemon-1.18.7" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.18.6";
+      version = "1.18.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.6.tgz";
-        sha512 = "4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ==";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.7.tgz";
+        sha512 = "xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ==";
       };
     };
     "nomnom-1.6.2" = {
@@ -24042,15 +23961,6 @@ let
         sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
-    "oauth-sign-0.2.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
-        sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
-      };
-    };
     "oauth-sign-0.8.2" = {
       name = "oauth-sign";
       packageName = "oauth-sign";
@@ -24731,7 +24641,7 @@ let
       packageName = "os-name";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz";
+        url = "http://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz";
         sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
       };
     };
@@ -24740,10 +24650,19 @@ let
       packageName = "os-name";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz";
+        url = "http://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz";
         sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e";
       };
     };
+    "os-name-3.0.0" = {
+      name = "os-name";
+      packageName = "os-name";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz";
+        sha512 = "7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==";
+      };
+    };
     "os-shim-0.1.3" = {
       name = "os-shim";
       packageName = "os-shim";
@@ -25091,17 +25010,17 @@ let
       packageName = "pako";
       version = "0.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
+        url = "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
         sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
       };
     };
-    "pako-1.0.6" = {
+    "pako-1.0.7" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
-        sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz";
+        sha512 = "3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -25248,6 +25167,15 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
+    "parse-node-version-1.0.0" = {
+      name = "parse-node-version";
+      packageName = "parse-node-version";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz";
+        sha512 = "02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg==";
+      };
+    };
     "parse-numeric-range-0.0.2" = {
       name = "parse-numeric-range";
       packageName = "parse-numeric-range";
@@ -26103,13 +26031,13 @@ let
         sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
       };
     };
-    "portfinder-1.0.19" = {
+    "portfinder-1.0.20" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.19";
+      version = "1.0.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.19.tgz";
-        sha512 = "23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz";
+        sha512 = "Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -26158,6 +26086,15 @@ let
         sha512 = "HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==";
       };
     };
+    "postcss-7.0.6" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "7.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz";
+        sha512 = "Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==";
+      };
+    };
     "postcss-calc-5.3.1" = {
       name = "postcss-calc";
       packageName = "postcss-calc";
@@ -26932,13 +26869,13 @@ let
         sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
       };
     };
-    "progress-2.0.1" = {
+    "progress-2.0.3" = {
       name = "progress";
       packageName = "progress";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz";
-        sha512 = "OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==";
+        url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz";
+        sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
       };
     };
     "progress-string-1.2.2" = {
@@ -27207,19 +27144,10 @@ let
       packageName = "ps-tree";
       version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
+        url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
         sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
       };
     };
-    "ps-tree-1.1.0" = {
-      name = "ps-tree";
-      packageName = "ps-tree";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
-        sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
-      };
-    };
     "pseudomap-1.0.2" = {
       name = "pseudomap";
       packageName = "pseudomap";
@@ -27238,13 +27166,13 @@ let
         sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==";
       };
     };
-    "pstree.remy-1.1.0" = {
+    "pstree.remy-1.1.2" = {
       name = "pstree.remy";
       packageName = "pstree.remy";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz";
-        sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q==";
+        url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.2.tgz";
+        sha512 = "vL6NLxNHzkNTjGJUpMm5PLC+94/0tTlC1vkP9bdU0pOHih+EujMjgMTwfZopZvHWRFbqJ5Y73OMoau50PewDDA==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -27418,6 +27346,15 @@ let
         sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
       };
     };
+    "pull-catch-1.0.0" = {
+      name = "pull-catch";
+      packageName = "pull-catch";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-catch/-/pull-catch-1.0.0.tgz";
+        sha1 = "f58037eb5c282ccb506af9f76b0027d33931e48b";
+      };
+    };
     "pull-cont-0.0.0" = {
       name = "pull-cont";
       packageName = "pull-cont";
@@ -28008,25 +27945,16 @@ let
       packageName = "qs";
       version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
         sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
       };
     };
-    "qs-0.5.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
-        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
-      };
-    };
     "qs-0.6.5" = {
       name = "qs";
       packageName = "qs";
       version = "0.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
         sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
       };
     };
@@ -28035,7 +27963,7 @@ let
       packageName = "qs";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
         sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
       };
     };
@@ -28044,7 +27972,7 @@ let
       packageName = "qs";
       version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
         sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
       };
     };
@@ -28053,7 +27981,7 @@ let
       packageName = "qs";
       version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
         sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
       };
     };
@@ -28062,7 +27990,7 @@ let
       packageName = "qs";
       version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
         sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
       };
     };
@@ -28071,7 +27999,7 @@ let
       packageName = "qs";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+        url = "http://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
@@ -28102,6 +28030,15 @@ let
         sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
+    "qs-6.6.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz";
+        sha512 = "KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==";
+      };
+    };
     "qtdatastream-0.7.1" = {
       name = "qtdatastream";
       packageName = "qtdatastream";
@@ -28228,13 +28165,13 @@ let
         sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg==";
       };
     };
-    "random-access-memory-3.0.0" = {
+    "random-access-memory-3.1.1" = {
       name = "random-access-memory";
       packageName = "random-access-memory";
-      version = "3.0.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz";
-        sha512 = "O/d5C/kTOs/aDix1CD+N7z4SgNVGPx+xpFKXGfrC0TFpqYVrsJEUmQCl3ITTg7FVMoCmLBo5rdkA5FcFg00NTA==";
+        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.1.tgz";
+        sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA==";
       };
     };
     "random-access-storage-1.3.0" = {
@@ -28543,13 +28480,13 @@ let
         sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
-    "read-torrent-1.3.0" = {
+    "read-torrent-1.3.1" = {
       name = "read-torrent";
       packageName = "read-torrent";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz";
-        sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4";
+        url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.1.tgz";
+        sha512 = "TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g==";
       };
     };
     "readable-stream-1.0.27-1" = {
@@ -28858,13 +28795,13 @@ let
         sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==";
       };
     };
-    "regexpu-core-4.2.0" = {
+    "regexpu-core-4.4.0" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "4.2.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz";
-        sha512 = "Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz";
+        sha512 = "eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -28885,22 +28822,22 @@ let
         sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
-    "regjsgen-0.4.0" = {
+    "regjsgen-0.5.0" = {
       name = "regjsgen";
       packageName = "regjsgen";
-      version = "0.4.0";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz";
-        sha512 = "X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==";
+        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz";
+        sha512 = "RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==";
       };
     };
-    "regjsparser-0.3.0" = {
+    "regjsparser-0.6.0" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.3.0";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz";
-        sha512 = "zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz";
+        sha512 = "RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==";
       };
     };
     "reinterval-1.1.0" = {
@@ -29083,15 +29020,6 @@ let
         sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e";
       };
     };
-    "request-2.16.6" = {
-      name = "request";
-      packageName = "request";
-      version = "2.16.6";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
-        sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
-      };
-    };
     "request-2.74.0" = {
       name = "request";
       packageName = "request";
@@ -29110,15 +29038,6 @@ let
         sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
-    "request-2.83.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.83.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
-        sha512 = "lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==";
-      };
-    };
     "request-2.87.0" = {
       name = "request";
       packageName = "request";
@@ -29182,13 +29101,13 @@ let
         sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5";
       };
     };
-    "requestretry-3.0.2" = {
+    "requestretry-3.1.0" = {
       name = "requestretry";
       packageName = "requestretry";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/requestretry/-/requestretry-3.0.2.tgz";
-        sha512 = "3UXO4EOBwRFXm2AeAElyhM3bmMb57jZi5QC2httyXXSyT49O6o+AdzUZRA/vj5O2tE6xbdpDygRZb5Q19Q7lCA==";
+        url = "https://registry.npmjs.org/requestretry/-/requestretry-3.1.0.tgz";
+        sha512 = "DkvCPK6qvwxIuVA5TRCvi626WHC2rWjF/n7SCQvVHAr2JX9i1/cmIpSEZlmHAo+c1bj9rjaKoZ9IsKwCpTkoXA==";
       };
     };
     "require-directory-2.1.1" = {
@@ -29547,7 +29466,7 @@ let
       packageName = "rgba-regex";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz";
+        url = "http://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz";
         sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3";
       };
     };
@@ -29713,13 +29632,13 @@ let
         sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
       };
     };
-    "rss-parser-3.5.3" = {
+    "rss-parser-3.5.4" = {
       name = "rss-parser";
       packageName = "rss-parser";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.5.3.tgz";
-        sha512 = "oByqqKTuB6tCg/4UTPXUpJmG4Wr+H72qsBcSnBZM9nH1NhjV8lXzx8uKibN9Sq+mZwwZQyOitjoQvZ/ePsttKA==";
+        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.5.4.tgz";
+        sha512 = "dC7wHtz/p8QWQnsGgCB+HEYE01Dk8/AHMzSk0ZvoV3S0mhBqQNO/yi3H2fPh3qV2NNLNNEBg+8ZDSipKxjR5tQ==";
       };
     };
     "rsvp-3.6.2" = {
@@ -30001,6 +29920,15 @@ let
         sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==";
       };
     };
+    "schema-utils-1.0.0" = {
+      name = "schema-utils";
+      packageName = "schema-utils";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz";
+        sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
+      };
+    };
     "scoped-regex-1.0.0" = {
       name = "scoped-regex";
       packageName = "scoped-regex";
@@ -30735,7 +30663,7 @@ let
       packageName = "simple-plist";
       version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
+        url = "http://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
         sha1 = "71766db352326928cf3a807242ba762322636723";
       };
     };
@@ -31000,15 +30928,6 @@ let
         sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
-    "sntp-0.1.4" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
-        sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
-      };
-    };
     "sntp-1.0.9" = {
       name = "sntp";
       packageName = "sntp";
@@ -31018,15 +30937,6 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "sntp-2.1.0" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==";
-      };
-    };
     "snyk-1.103.2" = {
       name = "snyk";
       packageName = "snyk";
@@ -31036,13 +30946,13 @@ let
         sha512 = "rmMsNW94SQdmWQEtVDW1hiGKb3r7Gx1hVb0bTuK9mCm4/lHGmyuAG7QYdcwdhMrhGjg7yQDWCEXorEnq2JLs7Q==";
       };
     };
-    "snyk-1.108.2" = {
+    "snyk-1.116.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.108.2";
+      version = "1.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.108.2.tgz";
-        sha512 = "VfSHSRj4ISWf4EfySTdAVqUWnDspoFUaGs4uGp7FIbjZb35+JPaQ/hqgWKcDal+ZwTtzQvxKAdPsB3WUCBoSKg==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.116.0.tgz";
+        sha512 = "MIU4RTnlTda5xq8sqAvg9JS1zn1wip0IiF6kqnN9iS6+oKOgZWo5FTkC0pwBS4wqgFxHyDCg8ErG5/9RKK0RkA==";
       };
     };
     "snyk-config-2.2.0" = {
@@ -31063,13 +30973,13 @@ let
         sha512 = "QqKq2bGdnf1L2PNGQrHoqcoaV/PIlJv1qjKIzwA93gfhToKGkgJ31oPXwfef/l9N+ui0Y44c4POBHFbFf8PlJw==";
       };
     };
-    "snyk-docker-plugin-1.12.2" = {
+    "snyk-docker-plugin-1.13.1" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "1.12.2";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.2.tgz";
-        sha512 = "8bEn6tDSXPtNS6d1XRM6CSRMwM0bI3N0vRzcKVMZ9E52W9sIpv2E50noYjxcMpoRFxpLWAJ4WMtamcMtLPnNeQ==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.13.1.tgz";
+        sha512 = "rhVPwMryfGanLXeDoDzjQabGq8VlEPSkvDvraiOhm/F9o5E4zam6vDlVQXsYVRb4ydVKPLgux2ejWyFiG6shFA==";
       };
     };
     "snyk-go-plugin-1.5.2" = {
@@ -31144,13 +31054,13 @@ let
         sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A==";
       };
     };
-    "snyk-nodejs-lockfile-parser-1.7.0" = {
+    "snyk-nodejs-lockfile-parser-1.9.0" = {
       name = "snyk-nodejs-lockfile-parser";
       packageName = "snyk-nodejs-lockfile-parser";
-      version = "1.7.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.7.0.tgz";
-        sha512 = "57Gnw8o3HQbheb808GRsofnYPaJCbpt7n+zec+C7J/GZE6GJk+WA2u1EPsNQAsfTLQ3rxBwA1Sonhg498T4COA==";
+        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.9.0.tgz";
+        sha512 = "GRn70VDe+JISkRbnxc9vxCBV+Ekkdr79krVXbYNDJgQyIjH+FXh6PXVvpregVsvCcNqP1ctbBw/u1w6e9xX1QA==";
       };
     };
     "snyk-nuget-plugin-1.6.5" = {
@@ -31266,7 +31176,7 @@ let
       packageName = "socket.io";
       version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
         sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a";
       };
     };
@@ -31288,6 +31198,15 @@ let
         sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==";
       };
     };
+    "socket.io-2.2.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
+        sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
+      };
+    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -31320,7 +31239,7 @@ let
       packageName = "socket.io-client";
       version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
+        url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
         sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e";
       };
     };
@@ -31342,6 +31261,15 @@ let
         sha512 = "jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==";
       };
     };
+    "socket.io-client-2.2.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz";
+        sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
+      };
+    };
     "socket.io-parser-2.1.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
@@ -31378,6 +31306,15 @@ let
         sha512 = "FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==";
       };
     };
+    "socket.io-parser-3.3.0" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz";
+        sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==";
+      };
+    };
     "socks-1.1.10" = {
       name = "socks";
       packageName = "socks";
@@ -31477,13 +31414,13 @@ let
         sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
-    "sonic-boom-0.6.2" = {
+    "sonic-boom-0.6.3" = {
       name = "sonic-boom";
       packageName = "sonic-boom";
-      version = "0.6.2";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.2.tgz";
-        sha512 = "JVftM6ZJanmU/akt+bfiHUKQq0MtRe0ayXyEXjB1yiZYRH6ettF4gu7Dbei4HbzTmBVNshHpPJLZ9R9lY2FjWA==";
+        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.3.tgz";
+        sha512 = "TMhj6kDJk9LLzCTTL8+HPCfFn4MwkE4P6k2Up89Rz949+DSRw90V62upRKC99rJEOmu4E9ljH5Otu2JSRmx+bg==";
       };
     };
     "sorcery-0.10.0" = {
@@ -31621,15 +31558,6 @@ 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";
@@ -31693,13 +31621,13 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
-    "sourcemap-codec-1.4.3" = {
+    "sourcemap-codec-1.4.4" = {
       name = "sourcemap-codec";
       packageName = "sourcemap-codec";
-      version = "1.4.3";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz";
-        sha512 = "vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==";
+        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz";
+        sha512 = "CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==";
       };
     };
     "spark-md5-1.0.1" = {
@@ -31747,13 +31675,13 @@ let
         sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
       };
     };
-    "spdx-correct-3.0.2" = {
+    "spdx-correct-3.1.0" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz";
-        sha512 = "q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
       };
     };
     "spdx-exceptions-2.2.0" = {
@@ -31864,6 +31792,15 @@ let
         sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==";
       };
     };
+    "split2-3.0.0" = {
+      name = "split2";
+      packageName = "split2";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-3.0.0.tgz";
+        sha512 = "Cp7G+nUfKJyHCrAI8kze3Q00PFGEG1pMgrAlTFlDbn+GW24evSZHJuMl+iUJx1w/NTRDeBiTgvwnf6YOt94FMw==";
+      };
+    };
     "sprintf-js-1.0.3" = {
       name = "sprintf-js";
       packageName = "sprintf-js";
@@ -31873,15 +31810,6 @@ let
         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";
-      };
-    };
     "srt2vtt-1.3.1" = {
       name = "srt2vtt";
       packageName = "srt2vtt";
@@ -31900,13 +31828,13 @@ let
         sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39";
       };
     };
-    "ssb-blobs-1.1.6" = {
+    "ssb-blobs-1.1.7" = {
       name = "ssb-blobs";
       packageName = "ssb-blobs";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.6.tgz";
-        sha512 = "/dQIhg19Sk/cnRg25yUFFKhY67eB+Mlx00rK138dCVz3JhKLdmgDbK8kF5Ik/C/DdxDVya3xJZRW0fexwGOAkw==";
+        url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.7.tgz";
+        sha512 = "y2GP3xIyGPbRYvpwUgA/U8QaCE2y+7cT22/yN6PcoMqbZOPI7qNP7eFzCXa/HYa7LuIczyID5/25UFkP84rrig==";
       };
     };
     "ssb-client-4.6.0" = {
@@ -31927,13 +31855,13 @@ let
         sha512 = "djjLoNpDlE0K/UfhU1mNuJqOy8oJsv/6Q8RLDTHdby2Z+r2MxKRaACH3R9DMZyzgnd3wLjXba5ntNvsuabjx5g==";
       };
     };
-    "ssb-db-18.6.1" = {
+    "ssb-db-18.6.2" = {
       name = "ssb-db";
       packageName = "ssb-db";
-      version = "18.6.1";
+      version = "18.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-db/-/ssb-db-18.6.1.tgz";
-        sha512 = "wkUQfw2jZh8jKJ4pRl+fbBtHIDBRhVBBTF1onLr30KVT/Ce7Mb5YTbxmldU7USjBrZHaXTqShwgR3Rp7bTpC3Q==";
+        url = "https://registry.npmjs.org/ssb-db/-/ssb-db-18.6.2.tgz";
+        sha512 = "7Z/d9c+qGp/7Sg5RsqHwviOzUoOK52KlFbt+4GR8a95/b9KW9EO9nRDdOYXwa+hY+D0SZe8HMW3Qb/0NNga3uQ==";
       };
     };
     "ssb-ebt-5.2.7" = {
@@ -31945,13 +31873,13 @@ let
         sha512 = "dLiLRtGMagSKRuOIBQzPDfAQf7LNFR8+g91tKxMPbV6WMENF2bojz3POd75i6BhXJhJx1A6zpO6IrMz3StmtbA==";
       };
     };
-    "ssb-friends-3.1.6" = {
+    "ssb-friends-3.1.7" = {
       name = "ssb-friends";
       packageName = "ssb-friends";
-      version = "3.1.6";
+      version = "3.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.6.tgz";
-        sha512 = "0wKk/MpQ+Xdteso7Ipmgq1AO7m0sAyJjtbEpaAPLR8Mb5uPcK0n/rgGG6nnI6Vl8z1fuhkiqy4BtLQshaSBi/A==";
+        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.7.tgz";
+        sha512 = "3ph/L8m6zqNC1CX9BhCLqgDO227CVb86Mx7yHgSK6vilc9iby612VGsrRbAQaNiSRDPoBhLNOQLrQWaTkn7LBw==";
       };
     };
     "ssb-git-0.5.0" = {
@@ -32062,22 +31990,22 @@ let
         sha512 = "y4OA2MvGl1jU7bUTYsTmMNSqlPt4eh9401THUW1DO4aFyBFEWvpa3eKJHc8aTmaph2hutPPbdKgEFsWDzw26uw==";
       };
     };
-    "ssb-ref-2.13.6" = {
+    "ssb-ref-2.13.8" = {
       name = "ssb-ref";
       packageName = "ssb-ref";
-      version = "2.13.6";
+      version = "2.13.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.13.6.tgz";
-        sha512 = "l4mvU4PwXYTWJFhps4g9RkvPAEqJ5klR3oFBEaUqXTHfDzEq2pAn11Np2JqH0CM9JnW/AbK9H+Uzw4aofA9D8A==";
+        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.13.8.tgz";
+        sha512 = "HG52vbajkz4jZx1UnyqDuiu6GCKDgf+F70ljwJb/z0iLYhUVx4uvW2gxDrwLUQ9+kSKTEud8wGhWCfui1zu29w==";
       };
     };
-    "ssb-validate-4.0.3" = {
+    "ssb-validate-4.0.4" = {
       name = "ssb-validate";
       packageName = "ssb-validate";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.3.tgz";
-        sha512 = "ee0HgdtRef+dL98sbcEVB7+gnr8u5TqJcQqRdISWyfKcLKv1GXsmXb7VSYVRGveIkbnxHvOWps+XEJzmqqgxHQ==";
+        url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.4.tgz";
+        sha512 = "MojZCR1qgZHdO4pnh4Loiqxj7fxP3w+MrA/4smXoKD46ReEnOjt/8Vm2sq3qpqPmUBU2GbEoDlgw7OKy0mWJBw==";
       };
     };
     "ssb-ws-5.1.1" = {
@@ -32089,13 +32017,13 @@ let
         sha512 = "Wbttwlr+wVqcoxGsn+WoiBbSI9UMqgL/DZU6Pjm/KQ61LO7jaxV4hGw3+H4uRBtgtOE4pidvHeCk7jUuoXWZfQ==";
       };
     };
-    "ssh-config-1.1.3" = {
+    "ssh-config-1.1.5" = {
       name = "ssh-config";
       packageName = "ssh-config";
-      version = "1.1.3";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz";
-        sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c";
+        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.5.tgz";
+        sha512 = "j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw==";
       };
     };
     "ssh-key-to-pem-0.11.0" = {
@@ -32310,7 +32238,7 @@ let
       packageName = "stream-browserify";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
+        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
@@ -32688,7 +32616,7 @@ let
       packageName = "string_decoder";
       version = "0.10.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
@@ -32706,10 +32634,19 @@ let
       packageName = "string_decoder";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
+    "string_decoder-1.2.0" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz";
+        sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==";
+      };
+    };
     "stringify-entities-1.3.2" = {
       name = "stringify-entities";
       packageName = "stringify-entities";
@@ -33088,15 +33025,6 @@ let
         sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==";
       };
     };
-    "supports-color-5.1.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz";
-        sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==";
-      };
-    };
     "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -33268,13 +33196,13 @@ let
         sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==";
       };
     };
-    "table-5.1.0" = {
+    "table-5.1.1" = {
       name = "table";
       packageName = "table";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-5.1.0.tgz";
-        sha512 = "e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==";
+        url = "https://registry.npmjs.org/table/-/table-5.1.1.tgz";
+        sha512 = "NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==";
       };
     };
     "tabtab-1.3.2" = {
@@ -33323,22 +33251,22 @@ let
         sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd";
       };
     };
-    "tapable-0.2.8" = {
+    "tapable-0.2.9" = {
       name = "tapable";
       packageName = "tapable";
-      version = "0.2.8";
+      version = "0.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz";
-        sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22";
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz";
+        sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
       };
     };
-    "tapable-1.1.0" = {
+    "tapable-1.1.1" = {
       name = "tapable";
       packageName = "tapable";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz";
-        sha512 = "IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==";
+        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz";
+        sha512 = "9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==";
       };
     };
     "tape-2.3.3" = {
@@ -33346,7 +33274,7 @@ let
       packageName = "tape";
       version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz";
+        url = "http://registry.npmjs.org/tape/-/tape-2.3.3.tgz";
         sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
       };
     };
@@ -33494,22 +33422,22 @@ let
         sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "terminate-2.1.0" = {
-      name = "terminate";
-      packageName = "terminate";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terminate/-/terminate-2.1.0.tgz";
-        sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05";
-      };
-    };
-    "terser-3.10.11" = {
+    "terser-3.11.0" = {
       name = "terser";
       packageName = "terser";
-      version = "3.10.11";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-3.10.11.tgz";
-        sha512 = "iruZ7j14oBbRYJC5cP0/vTU7YOWjN+J1ZskEGoF78tFzXdkK2hbCL/3TRZN8XB+MuvFhvOHMp7WkOCBO4VEL5g==";
+        url = "https://registry.npmjs.org/terser/-/terser-3.11.0.tgz";
+        sha512 = "5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==";
+      };
+    };
+    "terser-webpack-plugin-1.1.0" = {
+      name = "terser-webpack-plugin";
+      packageName = "terser-webpack-plugin";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz";
+        sha512 = "61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==";
       };
     };
     "test-exclude-4.2.3" = {
@@ -33683,6 +33611,15 @@ let
         sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
+    "through2-3.0.0" = {
+      name = "through2";
+      packageName = "through2";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz";
+        sha512 = "8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==";
+      };
+    };
     "through2-filter-2.0.0" = {
       name = "through2-filter";
       packageName = "through2-filter";
@@ -34183,7 +34120,7 @@ let
       packageName = "tough-cookie";
       version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
         sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
       };
     };
@@ -34196,6 +34133,15 @@ let
         sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
       };
     };
+    "tough-cookie-2.5.0" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
+      };
+    };
     "township-client-1.3.2" = {
       name = "township-client";
       packageName = "township-client";
@@ -34259,15 +34205,6 @@ let
         sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
       };
     };
-    "tree-kill-1.2.0" = {
-      name = "tree-kill";
-      packageName = "tree-kill";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz";
-        sha512 = "DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==";
-      };
-    };
     "tree-kill-1.2.1" = {
       name = "tree-kill";
       packageName = "tree-kill";
@@ -34448,13 +34385,13 @@ let
         sha512 = "gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==";
       };
     };
-    "tunnel-agent-0.2.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.2.0";
+    "tunnel-0.0.6" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
-        sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
+        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz";
+        sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -34664,15 +34601,6 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "uglifyjs-webpack-plugin-1.3.0" = {
-      name = "uglifyjs-webpack-plugin";
-      packageName = "uglifyjs-webpack-plugin";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz";
-        sha512 = "ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==";
-      };
-    };
     "uid-0.0.2" = {
       name = "uid";
       packageName = "uid";
@@ -34831,7 +34759,7 @@ let
       packageName = "underscore";
       version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
@@ -34840,7 +34768,7 @@ let
       packageName = "underscore";
       version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
@@ -34849,7 +34777,7 @@ let
       packageName = "underscore";
       version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
@@ -34858,7 +34786,7 @@ let
       packageName = "underscore";
       version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
         sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     };
@@ -34867,7 +34795,7 @@ let
       packageName = "underscore";
       version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
         sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
@@ -34984,7 +34912,7 @@ let
       packageName = "union";
       version = "0.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/union/-/union-0.4.6.tgz";
+        url = "http://registry.npmjs.org/union/-/union-0.4.6.tgz";
         sha1 = "198fbdaeba254e788b0efcb630bc11f24a2959e0";
       };
     };
@@ -35438,13 +35366,13 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "useragent-2.2.1" = {
+    "useragent-2.3.0" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.2.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz";
-        sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz";
+        sha512 = "4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==";
       };
     };
     "ut_metadata-3.3.0" = {
@@ -36230,22 +36158,13 @@ let
         sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d";
       };
     };
-    "vue-cli-plugin-apollo-0.17.4" = {
+    "vue-cli-plugin-apollo-0.18.1" = {
       name = "vue-cli-plugin-apollo";
       packageName = "vue-cli-plugin-apollo";
-      version = "0.17.4";
+      version = "0.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.17.4.tgz";
-        sha512 = "3bB+Vc4kqvZYF8NW9D77HcIQpqwfLM3MvQEDjRvKEFeN+ZdJ9jtmcg+CUPm7li6xMkYWyFJcOSyI8kMYRfYFcw==";
-      };
-    };
-    "vue-cli-version-marker-3.1.2" = {
-      name = "vue-cli-version-marker";
-      packageName = "vue-cli-version-marker";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vue-cli-version-marker/-/vue-cli-version-marker-3.1.2.tgz";
-        sha512 = "aQe0I6AlB/RYw7C79wPjP+CuloWCcWHecfBiEB1K7Wxj73ybEE3tRmCkVDkp0nK7ix8XXQXwU5DhS2RZ1ooVnw==";
+        url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.18.1.tgz";
+        sha512 = "RfkBFGZKq9r8+DYwcT1Y5As7uzy3OjsIInSrhdCHKO4EeZ9pseb31rqtDmkT9/uNpd9BmRKPWti+hp3S64IUxg==";
       };
     };
     "walk-2.3.14" = {
@@ -36329,13 +36248,13 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.25.1" = {
+    "webpack-4.27.1" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.25.1";
+      version = "4.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.25.1.tgz";
-        sha512 = "T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.27.1.tgz";
+        sha512 = "WArHiLvHrlfyRM8i7f+2SFbr/XbQ0bXqTkPF8JpHOzub5482Y3wx7rEO8stuLGOKOgZJcqcisLhD7LrM/+fVMw==";
       };
     };
     "webpack-cli-3.1.2" = {
@@ -36532,7 +36451,7 @@ let
       packageName = "win-detect-browsers";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz";
+        url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz";
         sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0";
       };
     };
@@ -36581,6 +36500,15 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
+    "windows-release-3.1.0" = {
+      name = "windows-release";
+      packageName = "windows-release";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/windows-release/-/windows-release-3.1.0.tgz";
+        sha512 = "hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==";
+      };
+    };
     "winreg-0.0.12" = {
       name = "winreg";
       packageName = "winreg";
@@ -37185,13 +37113,13 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-3.0.2" = {
+    "yallist-3.0.3" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
+        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
       };
     };
     "yaml-ast-parser-0.0.40" = {
@@ -37230,15 +37158,6 @@ let
         sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
       };
     };
-    "yargs-10.0.3" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "10.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz";
-        sha512 = "DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==";
-      };
-    };
     "yargs-10.1.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -37275,6 +37194,15 @@ let
         sha512 = "f5esswlPO351AnejaO2A1ZZr0zesz19RehQKwiRDqWtrraWrJy16tsUIKgDXFMVytvNOHPVmTiaTh3wO67I0fQ==";
       };
     };
+    "yargs-12.0.5" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "12.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+      };
+    };
     "yargs-3.10.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -37329,13 +37257,13 @@ let
         sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
       };
     };
-    "yargs-parser-11.1.0" = {
+    "yargs-parser-11.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "11.1.0";
+      version = "11.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.0.tgz";
-        sha512 = "lGA5HsbjkpCfekDBHAhgE5OE8xEoqiUDylowr+BvhRCwG1xVYTsd8hx2CYC0NY4k9RIgJeybFTG2EZW4P2aN1w==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
       };
     };
     "yargs-parser-4.2.1" = {
@@ -37464,13 +37392,13 @@ let
         sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA==";
       };
     };
-    "z-schema-3.24.1" = {
+    "z-schema-3.24.2" = {
       name = "z-schema";
       packageName = "z-schema";
-      version = "3.24.1";
+      version = "3.24.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.24.1.tgz";
-        sha512 = "2eR8eq/v1coNqyBc5HzswEcoLbw+S33RMnR326uiuOIr97ve5vwPNMDrKS1IRCB12bZ3a8BrfGxrRwuSXUyPvw==";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.24.2.tgz";
+        sha512 = "Zb2YLJ9g72MexBXKPRzoypd4OZfVkFghdy10eVbcMNLl9YQsPXtyMpiK7a3sG7IIERg1lEDjEMrG9Km9DPbWLw==";
       };
     };
     "zen-observable-0.5.2" = {
@@ -37491,13 +37419,13 @@ let
         sha512 = "N3xXQVr4L61rZvGMpWe8XoCGX8vhU35dPyQ4fm5CY/KDlG0F75un14hjbckPXTDuKUY6V0dqR2giT6xN8Y4GEQ==";
       };
     };
-    "zen-observable-ts-0.8.10" = {
+    "zen-observable-ts-0.8.11" = {
       name = "zen-observable-ts";
       packageName = "zen-observable-ts";
-      version = "0.8.10";
+      version = "0.8.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz";
-        sha512 = "5vqMtRggU/2GhePC9OU4sYEWOdvmayp2k3gjPf4F0mXwB3CSbbNznfDUvDJx9O2ZTa1EIXdJhPchQveFKwNXPQ==";
+        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.11.tgz";
+        sha512 = "8bs7rgGV4kz5iTb9isudkuQjtWwPnQ8lXq6/T76vrepYZVMsDEv6BXaEA+DHdJSK3KVLduagi9jSpSAJ5NgKHw==";
       };
     };
     "zerr-1.0.4" = {
@@ -37549,7 +37477,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
@@ -37666,7 +37594,7 @@ in
       sources."@types/node-8.10.38"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -37726,7 +37654,7 @@ in
           sources."request-2.74.0"
         ];
       })
-      sources."azure-arm-resource-7.2.0"
+      sources."azure-arm-resource-7.2.1"
       sources."azure-arm-servermanagement-1.1.0"
       sources."azure-arm-storage-5.2.0"
       sources."azure-arm-trafficmanager-1.1.0-preview"
@@ -37907,7 +37835,7 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."moment-2.22.2"
-      (sources."ms-rest-2.3.7" // {
+      (sources."ms-rest-2.3.8" // {
         dependencies = [
           sources."through-2.3.8"
           sources."tunnel-0.0.5"
@@ -38060,16 +37988,16 @@ in
   azure-functions-core-tools = nodeEnv.buildNodePackage {
     name = "azure-functions-core-tools";
     packageName = "azure-functions-core-tools";
-    version = "2.2.70";
+    version = "2.3.148";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.2.70.tgz";
-      sha512 = "ma1oa15k0gDkyq0w80k//DY5aNA22Rsos6qA47kb9GpS0Ij+A7jJpcljbu3S10RxGcUEUGs4phM1tkyP37mihQ==";
+      url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.3.148.tgz";
+      sha512 = "Cmqcng1GYoyEFnVj6M31o+dRTAivxOrOIFbEhR5vKKWokq8GdkwnKNuP9LHOkA9S6y5n+KxbuY1dPpKHbJtdEQ==";
     };
     dependencies = [
       sources."agent-base-4.2.1"
       sources."ansi-styles-3.2.1"
       sources."balanced-match-1.0.0"
-      sources."big-integer-1.6.36"
+      sources."big-integer-1.6.40"
       sources."binary-0.3.0"
       sources."bluebird-3.4.7"
       sources."brace-expansion-1.1.11"
@@ -38105,7 +38033,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      sources."progress-2.0.1"
+      sources."progress-2.0.3"
       sources."readable-stream-2.3.6"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
@@ -38132,7 +38060,7 @@ in
     packageName = "bower";
     version = "1.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+      url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
       sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
     };
     buildInputs = globalBuildInputs;
@@ -38253,7 +38181,7 @@ 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.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -38357,7 +38285,7 @@ in
       sources."glob-7.1.3"
       sources."has-1.0.3"
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
@@ -38383,7 +38311,7 @@ in
       sources."module-deps-6.2.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
-      sources."pako-1.0.6"
+      sources."pako-1.0.7"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.1"
       sources."path-browserify-0.0.1"
@@ -38403,6 +38331,7 @@ in
       (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."resolve-1.8.1"
@@ -38417,7 +38346,7 @@ in
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.3"
       sources."stream-splicer-2.0.0"
-      sources."string_decoder-1.1.1"
+      sources."string_decoder-1.2.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -38463,6 +38392,7 @@ in
     dependencies = [
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
+      sources."ajv-6.6.1"
       sources."ansi-regex-1.1.1"
       sources."ansi-styles-2.2.1"
       sources."append-0.1.1"
@@ -38471,10 +38401,14 @@ in
       sources."array-loop-1.0.0"
       sources."array-shuffle-1.0.1"
       sources."ascli-0.3.0"
-      sources."async-0.2.10"
-      sources."aws-sign-0.2.1"
+      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."balanced-match-1.0.0"
       sources."base64-js-1.3.0"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
@@ -38490,7 +38424,6 @@ in
       sources."blob-to-buffer-1.2.8"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
-      sources."boom-0.3.8"
       sources."brace-expansion-1.1.11"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -38503,6 +38436,7 @@ in
       sources."bytebuffer-3.5.5"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
+      sources."caseless-0.12.0"
       sources."castv2-0.1.9"
       sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
@@ -38513,7 +38447,7 @@ in
       sources."co-3.1.0"
       sources."codepage-1.4.0"
       sources."colour-0.7.1"
-      sources."combined-stream-0.0.7"
+      sources."combined-stream-1.0.7"
       sources."commander-2.19.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
@@ -38524,19 +38458,19 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."cookie-jar-0.2.0"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-0.1.3"
       sources."currently-unhandled-0.4.1"
       sources."cyclist-0.1.1"
+      sources."dashdash-1.14.1"
       sources."debounced-seeker-1.0.0"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.2.11"
-      sources."delayed-stream-0.0.5"
+      sources."delayed-stream-1.0.0"
       sources."diveSync-0.3.0"
       sources."dns-js-0.2.1"
+      sources."ecc-jsbn-0.1.2"
       (sources."end-of-stream-1.0.0" // {
         dependencies = [
           sources."once-1.3.3"
@@ -38545,6 +38479,10 @@ in
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."exit-on-epipe-1.0.1"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."fifo-0.1.4"
       (sources."figures-1.7.0" // {
         dependencies = [
@@ -38553,12 +38491,8 @@ in
       })
       sources."find-up-1.1.2"
       sources."flatten-0.0.1"
-      sources."forever-agent-0.2.0"
-      (sources."form-data-0.0.10" // {
-        dependencies = [
-          sources."mime-1.2.11"
-        ];
-      })
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -38569,14 +38503,16 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-4.0.1"
+      sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."got-1.2.2"
       sources."graceful-fs-4.1.15"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
       sources."has-ansi-1.0.3"
       sources."hat-0.0.3"
-      sources."hawk-0.10.2"
-      sources."hoek-0.7.6"
       sources."hosted-git-info-2.7.1"
+      sources."http-signature-1.2.0"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
@@ -38590,9 +38526,15 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-builtin-module-1.0.0"
       sources."is-finite-1.0.2"
+      sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."isarray-0.0.1"
-      sources."json-stringify-safe-3.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
@@ -38620,6 +38562,8 @@ in
         ];
       })
       sources."mime-1.6.0"
+      sources."mime-db-1.37.0"
+      sources."mime-types-2.1.21"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -38629,11 +38573,10 @@ in
       sources."mutate.js-0.2.0"
       sources."mute-stream-0.0.4"
       sources."network-address-0.0.5"
-      sources."node-uuid-1.4.8"
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
       sources."numeral-1.5.6"
-      sources."oauth-sign-0.2.0"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-1.0.0"
       sources."once-1.4.0"
       sources."open-0.0.5"
@@ -38666,6 +38609,7 @@ in
       })
       sources."peer-wire-swarm-0.12.2"
       sources."peerflix-0.34.0"
+      sources."performance-now-2.1.0"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -38683,13 +38627,15 @@ in
       sources."process-nextick-args-2.0.0"
       sources."promiscuous-0.6.0"
       sources."protobufjs-3.8.2"
+      sources."psl-1.1.29"
       (sources."pump-0.3.5" // {
         dependencies = [
           sources."once-1.2.0"
         ];
       })
+      sources."punycode-2.1.1"
       sources."qap-3.3.1"
-      sources."qs-0.5.6"
+      sources."qs-6.5.2"
       sources."query-string-1.0.1"
       (sources."random-access-file-2.0.1" // {
         dependencies = [
@@ -38709,7 +38655,7 @@ in
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      (sources."read-torrent-1.3.0" // {
+      (sources."read-torrent-1.3.1" // {
         dependencies = [
           sources."magnet-uri-2.0.1"
           (sources."parse-torrent-4.1.0" // {
@@ -38724,11 +38670,7 @@ in
       sources."readline2-0.1.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      (sources."request-2.16.6" // {
-        dependencies = [
-          sources."mime-1.2.11"
-        ];
-      })
+      sources."request-2.88.0"
       sources."rimraf-2.6.2"
       sources."router-0.6.2"
       sources."run-parallel-1.1.9"
@@ -38736,6 +38678,7 @@ in
       sources."rusha-0.8.13"
       sources."rx-2.5.3"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
@@ -38759,13 +38702,13 @@ in
         ];
       })
       sources."single-line-log-0.4.1"
-      sources."sntp-0.1.4"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
       sources."speedometer-0.1.4"
       sources."srt2vtt-1.3.1"
+      sources."sshpk-1.15.2"
       sources."stream-transcoder-0.0.5"
       sources."string2compact-1.3.0"
       sources."string_decoder-0.10.31"
@@ -38789,16 +38732,25 @@ in
           sources."thirty-two-0.0.2"
         ];
       })
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
       sources."trim-newlines-1.0.0"
-      sources."tunnel-agent-0.2.0"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."ultron-1.1.1"
       sources."underscore-1.6.0"
       sources."uniq-1.0.1"
+      sources."uri-js-4.2.2"
       sources."utfx-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."utp-0.0.7"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.4"
+      sources."verror-1.10.0"
       sources."voc-1.1.0"
       sources."ware-1.3.0"
       sources."windows-no-runnable-0.0.6"
@@ -38885,7 +38837,7 @@ in
       sources."commander-2.19.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."follow-redirects-1.5.9"
+      sources."follow-redirects-1.5.10"
       sources."has-flag-3.0.0"
       sources."humanize-plus-1.8.2"
       sources."is-buffer-1.1.6"
@@ -38938,7 +38890,7 @@ in
       sources."eventemitter3-3.1.0"
       sources."fast-safe-stringify-2.0.6"
       sources."fecha-2.3.3"
-      sources."follow-redirects-1.5.9"
+      sources."follow-redirects-1.5.10"
       sources."http-proxy-1.17.0"
       sources."inherits-2.0.3"
       sources."is-arrayish-0.3.2"
@@ -38999,7 +38951,7 @@ in
         ];
       })
       sources."acorn-walk-6.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."aliasify-2.1.0"
       sources."ansi-0.3.1"
       sources."ansi-align-2.0.0"
@@ -39027,7 +38979,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.36"
+      sources."big-integer-1.6.40"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       sources."body-parser-1.18.3"
@@ -39205,7 +39157,7 @@ in
       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."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-2.7.1"
       sources."htmlescape-1.1.1"
@@ -39284,7 +39236,7 @@ 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"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
@@ -39423,7 +39375,7 @@ in
       sources."slash-1.0.0"
       sources."slide-1.1.6"
       sources."source-map-0.5.7"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -39774,7 +39726,7 @@ 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.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -39856,7 +39808,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.12.9"
+      sources."@types/node-10.12.12"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -39919,7 +39871,7 @@ in
       sources."lodash._root-3.0.1"
       sources."lodash._stringtopath-4.8.0"
       sources."lodash.uniqby-4.5.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.37.0"
@@ -39935,7 +39887,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.2"
+      sources."qs-6.6.0"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
@@ -40022,7 +39974,7 @@ in
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       sources."jsonfile-4.0.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
@@ -40085,7 +40037,7 @@ in
       sources."chalk-2.4.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."cross-spawn-5.1.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs-extra-4.0.3"
@@ -40093,7 +40045,7 @@ in
       sources."has-flag-3.0.0"
       sources."isexe-2.0.0"
       sources."jsonfile-4.0.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."minimist-1.2.0"
       sources."path-exists-3.0.0"
       sources."pseudomap-1.0.2"
@@ -40148,7 +40100,7 @@ in
     };
     dependencies = [
       sources."abstract-random-access-1.1.2"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-align-2.0.0"
       sources."ansi-diff-1.1.1"
       sources."ansi-regex-3.0.0"
@@ -40265,7 +40217,7 @@ in
         ];
       })
       sources."discovery-swarm-5.1.2"
-      (sources."dns-discovery-6.2.2" // {
+      (sources."dns-discovery-6.2.3" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."lru-2.0.1"
@@ -40316,14 +40268,14 @@ in
       sources."has-flag-3.0.0"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.21.0" // {
+      (sources."hypercore-6.22.0" // {
         dependencies = [
           sources."process-nextick-args-1.0.7"
           sources."unordered-set-2.0.1"
         ];
       })
       sources."hypercore-crypto-1.0.0"
-      (sources."hypercore-protocol-6.7.1" // {
+      (sources."hypercore-protocol-6.8.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -40391,14 +40343,14 @@ in
       sources."lodash.throttle-4.1.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-3.1.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."math-random-1.0.1"
       sources."memory-pager-1.1.0"
       sources."menu-string-1.2.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-2.3.11"
-      sources."mime-2.3.1"
+      sources."mime-2.4.0"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
       sources."min-document-2.19.0"
@@ -40429,7 +40381,7 @@ in
       sources."neat-tasks-1.1.1"
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.5.0"
+      sources."node-gyp-build-3.5.1"
       sources."normalize-path-2.1.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
@@ -40465,7 +40417,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-memory-3.0.0"
+      sources."random-access-memory-3.1.1"
       sources."random-access-storage-1.3.0"
       (sources."randomatic-3.1.1" // {
         dependencies = [
@@ -40630,7 +40582,7 @@ in
       sources."async-0.9.2"
       sources."better-curry-1.6.0"
       sources."binaryheap-0.0.3"
-      sources."bindings-1.3.0"
+      sources."bindings-1.3.1"
       sources."bluebird-2.9.9"
       sources."bottleneck-1.5.3"
       sources."buffercursor-0.0.12"
@@ -40768,12 +40720,12 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       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.358.0"
+      sources."aws-sdk-2.371.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
@@ -40831,7 +40783,7 @@ in
           sources."uuid-3.3.2"
         ];
       })
-      sources."requestretry-3.0.2"
+      sources."requestretry-3.1.0"
       sources."s3-stream-upload-2.0.2"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -40895,7 +40847,7 @@ in
       sha512 = "+zcutibM0LOG6uT48bMsSGzyPnptgenxBUjNMJFRYuddTrOFVH1dFCKUu512lsvihBUJixaxjIG+DjQbWlpO/Q==";
     };
     dependencies = [
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."arr-diff-2.0.0"
@@ -41076,7 +41028,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."math-random-1.0.1"
@@ -41387,7 +41339,7 @@ in
       sources."concat-map-0.0.1"
       sources."conf-1.4.0"
       sources."convert-source-map-1.6.0"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."cross-spawn-5.1.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-2.6.9"
@@ -41454,7 +41406,7 @@ in
       sources."loose-envify-1.4.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
@@ -41525,7 +41477,7 @@ in
       sources."slash-1.0.0"
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -41581,12 +41533,13 @@ in
       sources."@babel/code-frame-7.0.0"
       sources."@babel/highlight-7.0.0"
       sources."acorn-6.0.4"
-      sources."acorn-jsx-5.0.0"
-      sources."ajv-6.5.5"
+      sources."acorn-jsx-5.0.1"
+      sources."ajv-6.6.1"
       sources."ansi-escapes-3.1.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-regex-4.0.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
+      sources."astral-regex-1.0.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."caller-path-0.1.0"
@@ -41631,7 +41584,11 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-6.2.0"
+      (sources."inquirer-6.2.1" // {
+        dependencies = [
+          sources."strip-ansi-5.0.0"
+        ];
+      })
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
       sources."is-resolvable-1.1.0"
@@ -41660,7 +41617,7 @@ in
       sources."path-key-2.0.1"
       sources."pluralize-7.0.0"
       sources."prelude-ls-1.1.2"
-      sources."progress-2.0.1"
+      sources."progress-2.0.3"
       sources."punycode-2.1.1"
       sources."regexpp-2.0.1"
       sources."require-uncached-1.0.3"
@@ -41674,13 +41631,17 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."slice-ansi-1.0.0"
+      sources."slice-ansi-2.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      sources."strip-ansi-4.0.0"
+      (sources."strip-ansi-4.0.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."table-5.1.0"
+      sources."table-5.1.1"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -41704,21 +41665,22 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "7.1.1";
+    version = "7.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.1.1.tgz";
-      sha512 = "kmFnV0ohxSzVNA7/axp4MlLX+uZEY8uDF70RCtrpFcSgEB8PE9mWStv4JJMfYfSVIaJdsZBkhzj8S+BLIN7A+w==";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.2.0.tgz";
+      sha512 = "EKKAUB0GB8Wu7dy82Ah8Vypxao95VK3CWjBK8ucWjeLc8KCcr7Zf7W1SaEJNx/E2PzYZ4GJjAy4Ru8lMZ4T+TA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
       sources."@babel/highlight-7.0.0"
       sources."acorn-6.0.4"
-      sources."acorn-jsx-5.0.0"
-      sources."ajv-6.5.5"
+      sources."acorn-jsx-5.0.1"
+      sources."ajv-6.6.1"
       sources."ansi-escapes-3.1.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-regex-4.0.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
+      sources."astral-regex-1.0.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."caller-path-0.1.0"
@@ -41764,7 +41726,11 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-6.2.0"
+      (sources."inquirer-6.2.1" // {
+        dependencies = [
+          sources."strip-ansi-5.0.0"
+        ];
+      })
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
       sources."is-resolvable-1.1.0"
@@ -41795,7 +41761,7 @@ in
       sources."path-parse-1.0.6"
       sources."pluralize-7.0.0"
       sources."prelude-ls-1.1.2"
-      sources."progress-2.0.1"
+      sources."progress-2.0.3"
       sources."punycode-2.1.1"
       sources."regexpp-2.0.1"
       sources."require-uncached-1.0.3"
@@ -41810,13 +41776,17 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."slice-ansi-1.0.0"
+      sources."slice-ansi-2.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      sources."strip-ansi-4.0.0"
+      (sources."strip-ansi-4.0.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."table-5.1.0"
+      sources."table-5.1.1"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -41862,7 +41832,7 @@ in
       sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
     };
     dependencies = [
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -42003,7 +41973,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -42101,7 +42071,12 @@ in
       sources."iconv-lite-0.4.24"
       sources."indent-string-3.2.0"
       sources."inherits-2.0.3"
-      sources."inquirer-6.2.0"
+      (sources."inquirer-6.2.1" // {
+        dependencies = [
+          sources."ansi-regex-4.0.0"
+          sources."strip-ansi-5.0.0"
+        ];
+      })
       sources."inquirer-autocomplete-prompt-1.0.1"
       sources."into-stream-2.0.1"
       sources."is-arrayish-0.2.1"
@@ -42119,7 +42094,7 @@ in
       sources."locate-path-2.0.0"
       sources."lodash-4.17.11"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."map-obj-2.0.0"
       sources."meow-5.0.0"
       sources."mimic-fn-1.2.0"
@@ -42181,7 +42156,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."slice-ansi-1.0.0"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -42229,7 +42204,7 @@ in
     packageName = "forever";
     version = "0.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz";
+      url = "http://registry.npmjs.org/forever/-/forever-0.15.3.tgz";
       sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2";
     };
     dependencies = [
@@ -42694,7 +42669,7 @@ in
       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."hashlru-2.3.0"
       sources."highlight.js-9.13.1"
       sources."increment-buffer-1.0.1"
       sources."inherits-2.0.3"
@@ -42730,7 +42705,7 @@ in
       sources."muxrpc-6.4.1"
       sources."nan-2.11.1"
       sources."nearley-2.15.1"
-      sources."node-gyp-build-3.5.0"
+      sources."node-gyp-build-3.5.1"
       sources."node-polyglot-1.0.0"
       sources."nomnom-1.6.2"
       sources."non-private-ip-1.4.4"
@@ -42738,7 +42713,7 @@ in
       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."pako-1.0.7"
       sources."private-box-0.3.0"
       sources."progress-1.1.8"
       sources."pull-block-filter-1.0.0"
@@ -42827,7 +42802,7 @@ in
       })
       sources."ssb-msgs-5.2.0"
       sources."ssb-pull-requests-1.0.0"
-      sources."ssb-ref-2.13.6"
+      sources."ssb-ref-2.13.8"
       (sources."stream-to-pull-stream-1.7.2" // {
         dependencies = [
           sources."looper-3.0.0"
@@ -42854,10 +42829,10 @@ in
   git-standup = nodeEnv.buildNodePackage {
     name = "git-standup";
     packageName = "git-standup";
-    version = "2.2.0";
+    version = "2.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.2.0.tgz";
-      sha512 = "GlQib2CmkcPfPlZhelfZmFKP2AbkeAOZ9SK3Z2M+CwdsrAA62bhI6CTDYWk/bm0C3bxizlX+U86/RNSk4O9efQ==";
+      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.1.tgz";
+      sha512 = "c3ASD4cakIYrReY2lb4xKayyDgh4SICA8aFjuV5HRhabzrputa2Adj/eCJpnOV3Teoe9QNq1MgA2Rc4h45DJhw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -42967,7 +42942,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
@@ -43091,7 +43066,7 @@ in
       sources."har-schema-2.0.0"
       (sources."har-validator-5.1.3" // {
         dependencies = [
-          sources."ajv-6.5.5"
+          sources."ajv-6.6.1"
           sources."fast-deep-equal-2.0.1"
           sources."json-schema-traverse-0.4.1"
         ];
@@ -43198,7 +43173,7 @@ in
       sources."lower-case-1.1.4"
       sources."lower-case-first-1.0.2"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       (sources."make-dir-1.3.0" // {
         dependencies = [
           sources."pify-3.0.0"
@@ -43338,7 +43313,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -43421,7 +43396,7 @@ in
         ];
       })
       sources."yargs-parser-8.1.0"
-      sources."z-schema-3.24.1"
+      sources."z-schema-3.24.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -43807,7 +43782,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."fancy-log-1.3.2"
+      sources."fancy-log-1.3.3"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -43943,6 +43918,7 @@ in
       sources."ordered-read-streams-0.1.0"
       sources."os-homedir-1.0.2"
       sources."parse-filepath-1.0.2"
+      sources."parse-node-version-1.0.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-parse-1.0.6"
@@ -44178,7 +44154,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."fancy-log-1.3.2"
+      sources."fancy-log-1.3.3"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -44298,6 +44274,7 @@ in
       sources."os-locale-1.4.0"
       sources."parse-filepath-1.0.2"
       sources."parse-json-2.2.0"
+      sources."parse-node-version-1.0.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-exists-2.1.0"
@@ -44360,7 +44337,7 @@ in
       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-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -44436,10 +44413,13 @@ in
       sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w==";
     };
     dependencies = [
+      sources."@snyk/dep-graph-1.1.2"
+      sources."@snyk/gemfile-1.1.0"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-1.1.1"
       sources."agent-base-4.2.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
+      sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -44449,21 +44429,29 @@ in
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."ast-types-0.11.6"
+      sources."ast-types-0.11.7"
       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."boxen-1.3.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."bytes-3.0.0"
       sources."camelcase-2.1.1"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."chardet-0.4.2"
+      sources."ci-info-1.6.0"
       sources."cli-1.0.1"
+      sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       (sources."cliui-3.2.0" // {
@@ -44489,6 +44477,8 @@ in
       sources."console-browserify-1.1.0"
       sources."core-js-2.3.0"
       sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."csslint-1.0.5"
       sources."cycle-1.0.3"
@@ -44497,20 +44487,23 @@ in
       sources."date-now-0.1.4"
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
+      sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
+      sources."dockerfile-ast-0.0.12"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
           sources."entities-1.1.2"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
       sources."dot-prop-4.2.0"
+      sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."email-validator-2.0.4"
       sources."entities-1.0.0"
@@ -44521,6 +44514,7 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
+      sources."execa-0.7.0"
       sources."exit-0.1.2"
       sources."extend-3.0.2"
       sources."external-editor-2.2.0"
@@ -44549,6 +44543,7 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
+      sources."get-stream-3.0.0"
       (sources."get-uri-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -44559,6 +44554,8 @@ in
       sources."glob-7.1.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
+      sources."global-dirs-0.1.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
       sources."graphlib-2.1.5"
       sources."har-schema-2.0.0"
@@ -44587,6 +44584,7 @@ in
       sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.24"
       sources."immediate-3.0.6"
+      sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -44595,14 +44593,20 @@ in
       sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
+      sources."is-ci-1.2.1"
       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-installed-globally-0.1.0"
+      sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
+      sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
+      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-wsl-1.1.0"
@@ -44637,6 +44641,7 @@ in
       sources."kew-0.7.0"
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
+      sources."latest-version-3.1.0"
       sources."lazy-cache-0.2.7"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -44649,20 +44654,25 @@ in
       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."lowercase-keys-1.0.1"
+      sources."lru-cache-4.1.5"
       sources."macos-release-1.1.0"
       sources."make-dir-1.3.0"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.0"
       (sources."mixin-object-2.0.1" // {
         dependencies = [
           sources."for-in-0.1.8"
         ];
       })
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.1.1"
       sources."mute-stream-0.0.7"
       (sources."nconf-0.10.0" // {
@@ -44677,6 +44687,7 @@ in
         ];
       })
       sources."netmask-1.0.6"
+      sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
@@ -44686,13 +44697,17 @@ in
       sources."os-locale-1.4.0"
       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-resolver-3.0.0"
-      sources."pako-1.0.6"
+      sources."package-json-4.0.1"
+      sources."pako-1.0.7"
       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-is-inside-1.0.2"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
@@ -44702,6 +44717,7 @@ in
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prelude-ls-1.1.2"
+      sources."prepend-http-1.0.4"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."progress-1.1.8"
@@ -44717,6 +44733,7 @@ in
           sources."iconv-lite-0.4.23"
         ];
       })
+      sources."rc-1.2.8"
       (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -44724,6 +44741,8 @@ in
         ];
       })
       sources."recursive-readdir-2.2.2"
+      sources."registry-auth-token-3.3.2"
+      sources."registry-url-3.1.0"
       sources."request-2.88.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-2.0.0"
@@ -44735,23 +44754,26 @@ in
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
       sources."semver-5.6.0"
+      sources."semver-diff-2.1.0"
       sources."setprototypeof-1.1.0"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
           sources."kind-of-2.0.1"
         ];
       })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."shelljs-0.3.0"
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
-      sources."snyk-1.108.2"
+      sources."snyk-1.116.0"
       sources."snyk-config-2.2.0"
-      sources."snyk-docker-plugin-1.12.2"
+      sources."snyk-docker-plugin-1.13.1"
       sources."snyk-go-plugin-1.6.0"
       sources."snyk-gradle-plugin-2.1.1"
       sources."snyk-module-1.9.1"
       sources."snyk-mvn-plugin-2.0.0"
-      (sources."snyk-nodejs-lockfile-parser-1.7.0" // {
+      (sources."snyk-nodejs-lockfile-parser-1.9.0" // {
         dependencies = [
           sources."lodash-4.17.10"
         ];
@@ -44777,14 +44799,17 @@ in
       sources."string-width-2.1.1"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-4.0.0"
+      sources."strip-eof-1.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."term-size-1.2.0"
       sources."then-fs-2.0.0"
       sources."throttleit-1.0.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
+      sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
       sources."toml-2.3.3"
       (sources."tough-cookie-2.4.3" // {
@@ -44806,12 +44831,17 @@ in
       sources."unicode-5.2.0-0.7.5"
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
+      sources."unzip-response-2.0.1"
+      sources."update-notifier-2.5.0"
       sources."uri-js-4.2.2"
+      sources."url-parse-lax-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."vscode-languageserver-types-3.13.0"
       sources."which-1.3.1"
+      sources."widest-line-2.0.1"
       sources."win-release-1.1.1"
       sources."window-size-0.1.4"
       (sources."winston-2.4.4" // {
@@ -44902,7 +44932,7 @@ in
       sources."debug-3.1.0"
       sources."ecstatic-3.3.0"
       sources."eventemitter3-3.1.0"
-      sources."follow-redirects-1.5.9"
+      sources."follow-redirects-1.5.10"
       sources."he-1.2.0"
       sources."http-proxy-1.17.0"
       sources."mime-1.6.0"
@@ -44919,7 +44949,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."portfinder-1.0.19" // {
+      (sources."portfinder-1.0.20" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -44942,22 +44972,22 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "4.3.1";
+    version = "4.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-4.3.1.tgz";
-      sha512 = "zPMaUqiQTrDtZRjwaes0EUbqge+3CaUZRPPbusp7xCRCaT9H81ybhgVKNDzhWUvtWYPurarm4kIRPptoTv3LFA==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-4.5.0.tgz";
+      sha512 = "N25knF6/eV9UguOXO2TpEhCRiudkIuDDtZLfek5la65ageZ0VurRQDDm7D1ko0keYHiP0oynptw+J0Vl/0bYng==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-1.3.0"
-      sources."@ionic/discover-1.0.7"
-      sources."@ionic/utils-fs-0.0.4"
+      sources."@ionic/cli-framework-1.5.0"
+      sources."@ionic/discover-1.0.8"
+      sources."@ionic/utils-fs-0.0.5"
       sources."@ionic/utils-network-0.0.4"
       sources."agent-base-4.2.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      sources."ast-types-0.11.6"
+      sources."ast-types-0.11.7"
       sources."astral-regex-1.0.0"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
@@ -44984,7 +45014,7 @@ in
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."crypto-random-string-1.0.0"
       sources."data-uri-to-buffer-1.2.0"
       sources."debug-4.1.0"
@@ -45005,7 +45035,7 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."execa-0.7.0"
+      sources."execa-0.10.0"
       sources."extend-3.0.2"
       sources."external-editor-3.0.3"
       sources."fast-levenshtein-2.0.6"
@@ -45052,11 +45082,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      (sources."inquirer-6.2.0" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."inquirer-6.2.1"
       sources."ip-1.1.5"
       sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -45098,8 +45124,8 @@ in
         ];
       })
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
-      sources."macos-release-1.1.0"
+      sources."lru-cache-4.1.5"
+      sources."macos-release-2.0.0"
       sources."make-dir-1.3.0"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
@@ -45110,7 +45136,7 @@ in
       sources."minimist-1.2.0"
       (sources."minipass-2.3.5" // {
         dependencies = [
-          sources."yallist-3.0.2"
+          sources."yallist-3.0.3"
         ];
       })
       sources."minizlib-1.1.1"
@@ -45123,12 +45149,13 @@ in
       sources."mute-stream-0.0.7"
       sources."ncp-2.0.0"
       sources."netmask-1.0.6"
+      sources."nice-try-1.0.5"
       sources."npm-run-path-2.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."opn-5.4.0"
       sources."optionator-0.8.2"
-      sources."os-name-2.0.1"
+      sources."os-name-3.0.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
       (sources."pac-proxy-agent-3.0.0" // {
@@ -45152,7 +45179,7 @@ in
       })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.2"
+      sources."qs-6.6.0"
       (sources."raw-body-2.3.3" // {
         dependencies = [
           sources."iconv-lite-0.4.23"
@@ -45181,8 +45208,12 @@ in
       sources."socks-2.2.2"
       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."split2-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.0.6"
+        ];
+      })
+      sources."ssh-config-1.1.5"
       sources."statuses-1.5.0"
       sources."stream-combiner2-1.1.1"
       (sources."string-width-2.1.1" // {
@@ -45211,16 +45242,21 @@ in
       sources."supports-color-5.5.0"
       (sources."tar-4.4.8" // {
         dependencies = [
-          sources."yallist-3.0.2"
+          sources."yallist-3.0.3"
+        ];
+      })
+      (sources."term-size-1.2.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+          sources."execa-0.7.0"
         ];
       })
-      sources."term-size-1.2.0"
       sources."through-2.3.8"
-      sources."through2-2.0.5"
+      sources."through2-3.0.0"
       sources."thunkify-2.1.2"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
-      sources."tree-kill-1.2.0"
+      sources."tree-kill-1.2.1"
       sources."tslib-1.9.3"
       sources."type-check-0.3.2"
       sources."unique-string-1.0.0"
@@ -45233,7 +45269,7 @@ in
       sources."uuid-3.3.2"
       sources."which-1.3.1"
       sources."widest-line-2.0.1"
-      sources."win-release-1.1.1"
+      sources."windows-release-3.1.0"
       sources."wordwrap-1.0.0"
       (sources."wrap-ansi-4.0.0" // {
         dependencies = [
@@ -45437,7 +45473,7 @@ in
           sources."meow-4.0.1"
         ];
       })
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."cosmiconfig-4.0.0"
       sources."currently-unhandled-0.4.1"
@@ -45562,7 +45598,7 @@ in
       sources."semaphore-async-await-1.5.1"
       sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -45663,7 +45699,7 @@ in
       sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
     };
     dependencies = [
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-1.0.0"
@@ -45699,7 +45735,7 @@ in
           sources."entities-1.1.2"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
       sources."ecc-jsbn-0.1.2"
@@ -45826,14 +45862,14 @@ in
       sha512 = "qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg==";
     };
     dependencies = [
-      sources."@types/node-10.12.9"
+      sources."@types/node-10.12.12"
       sources."@types/semver-5.5.0"
       sources."abbrev-1.1.1"
       sources."commander-2.19.0"
       sources."config-chain-1.1.12"
       sources."editorconfig-0.15.2"
       sources."ini-1.3.5"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
@@ -45940,7 +45976,7 @@ in
       sources."path-loader-1.0.9"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.5.2"
+      sources."qs-6.6.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
@@ -45969,7 +46005,7 @@ in
     };
     dependencies = [
       sources."accepts-1.3.5"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -46095,7 +46131,7 @@ in
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
@@ -46243,10 +46279,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "3.1.1";
+    version = "3.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-3.1.1.tgz";
-      sha512 = "NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==";
+      url = "https://registry.npmjs.org/karma/-/karma-3.1.3.tgz";
+      sha512 = "JU4FYUtFEGsLZd6ZJzLrivcPj0TkteBiIRDcXWFsltPMGgZMDtby/MIzNOzgyZv/9dahs9vHpSxerC/ZfeX9Qw==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -46319,7 +46355,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."custom-event-1.0.1"
       sources."date-format-1.2.0"
@@ -46396,7 +46432,8 @@ in
           sources."statuses-1.3.1"
         ];
       })
-      (sources."follow-redirects-1.5.9" // {
+      sources."flatted-2.0.0"
+      (sources."follow-redirects-1.5.10" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -46458,12 +46495,12 @@ in
           sources."ms-2.1.1"
         ];
       })
-      sources."lru-cache-2.2.4"
+      sources."lru-cache-4.1.5"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
       sources."micromatch-3.1.10"
-      sources."mime-2.3.1"
+      sources."mime-2.4.0"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
       sources."minimatch-3.0.4"
@@ -46503,6 +46540,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.0"
+      sources."pseudomap-1.0.2"
       sources."qjobs-1.2.0"
       sources."qs-6.5.2"
       sources."range-parser-1.2.0"
@@ -46636,7 +46674,7 @@ in
       sources."upath-1.1.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
-      sources."useragent-2.2.1"
+      sources."useragent-2.3.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."void-elements-2.0.1"
@@ -46644,6 +46682,7 @@ in
       sources."wrappy-1.0.2"
       sources."ws-3.3.3"
       sources."xmlhttprequest-ssl-1.5.5"
+      sources."yallist-2.1.2"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -46752,18 +46791,18 @@ in
   leetcode-cli = nodeEnv.buildNodePackage {
     name = "leetcode-cli";
     packageName = "leetcode-cli";
-    version = "2.5.3";
+    version = "2.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.5.3.tgz";
-      sha512 = "FlV2bYtdELx6NPSyd+ZfiQ9LKpjNr/UZ3orAhwx2Llg361QvS03XIxFFAi/RuvMKDi01zvHfRzsONPJt4hRXlQ==";
+      url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.6.1.tgz";
+      sha512 = "B3OXkxcsHUBnXoO2X5JOt2tDAEjMO+Mf3PxVJwgLhjdbK5XeR2GKDa6YcMuBv5fhJRzGUfQ+l6KEMQE6lRl8eg==";
     };
     dependencies = [
       sources."abab-1.0.4"
       sources."acorn-2.7.0"
       sources."acorn-globals-1.0.9"
-      sources."ajv-5.5.2"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-1.5.2"
@@ -46773,21 +46812,15 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."boolbase-1.0.0"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."camelcase-2.1.1"
       sources."caseless-0.12.0"
-      (sources."chalk-2.4.1" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."chalk-2.4.1"
       sources."cheerio-0.20.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cliui-3.2.0"
-      sources."co-4.6.0"
+      sources."clone-1.0.4"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -46795,12 +46828,7 @@ in
       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"
-      (sources."cryptiles-3.1.4" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."cross-spawn-6.0.5"
       sources."css-select-1.2.0"
       sources."css-what-2.1.2"
       sources."cssom-0.3.4"
@@ -46810,13 +46838,14 @@ in
       sources."decamelize-1.2.0"
       sources."deep-equal-0.2.2"
       sources."deep-is-0.1.3"
+      sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
       sources."ecc-jsbn-0.1.2"
@@ -46826,14 +46855,14 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."execa-0.7.0"
+      sources."execa-0.10.0"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."eyes-0.1.8"
-      sources."fast-deep-equal-1.1.0"
+      sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."find-up-2.1.0"
+      sources."find-up-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs.realpath-1.0.0"
@@ -46842,11 +46871,9 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
+      sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
-      sources."hawk-6.0.2"
-      sources."he-1.1.1"
-      sources."hoek-4.2.1"
+      sources."he-1.2.0"
       (sources."htmlparser2-3.8.3" // {
         dependencies = [
           sources."entities-1.0.0"
@@ -46867,16 +46894,16 @@ in
       sources."jsbn-0.1.1"
       sources."jsdom-7.2.2"
       sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.3.1"
+      sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.11"
       sources."log-symbols-2.2.0"
-      sources."lru-cache-4.1.3"
-      sources."mem-1.1.0"
+      sources."map-age-cleaner-0.1.3"
+      sources."mem-4.0.0"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
       sources."mimic-fn-1.2.0"
@@ -46891,20 +46918,28 @@ in
         ];
       })
       sources."ncp-1.0.1"
+      sources."nice-try-1.0.5"
       sources."npm-run-path-2.0.2"
       sources."nth-check-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."nwmatcher-1.4.4"
-      sources."oauth-sign-0.8.2"
+      sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optionator-0.8.2"
-      sources."ora-1.4.0"
+      (sources."ora-3.0.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."os-locale-1.4.0"
+      sources."p-defer-1.0.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."p-is-promise-1.1.0"
+      sources."p-limit-2.0.0"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.0.0"
       sources."parse5-1.5.1"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
@@ -46913,15 +46948,15 @@ in
       sources."pkginfo-0.4.1"
       sources."prelude-ls-1.1.2"
       sources."prompt-1.0.0"
-      sources."pseudomap-1.0.2"
       sources."psl-1.1.29"
-      sources."punycode-1.4.1"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      (sources."request-2.83.0" // {
+      (sources."request-2.88.0" // {
         dependencies = [
-          sources."tough-cookie-2.3.4"
+          sources."punycode-1.4.1"
+          sources."tough-cookie-2.4.3"
         ];
       })
       sources."require-directory-2.1.1"
@@ -46933,32 +46968,27 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
       sources."source-map-0.6.1"
-      sources."sprintf-js-1.1.1"
       sources."sshpk-1.15.2"
       sources."stack-trace-0.0.10"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
-      (sources."supports-color-5.1.0" // {
-        dependencies = [
-          sources."has-flag-2.0.0"
-        ];
-      })
+      sources."supports-color-5.5.0"
       sources."symbol-tree-3.2.2"
-      sources."tough-cookie-2.4.3"
+      sources."tough-cookie-2.5.0"
       sources."tr46-0.0.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.1"
+      sources."uri-js-4.2.2"
       (sources."utile-0.3.0" // {
         dependencies = [
           sources."async-0.9.2"
@@ -46966,6 +46996,7 @@ in
       })
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
+      sources."wcwidth-1.0.1"
       sources."webidl-conversions-2.0.1"
       sources."whatwg-url-compat-0.6.5"
       sources."which-1.3.1"
@@ -46983,19 +47014,21 @@ in
       sources."wrappy-1.0.2"
       sources."xml-name-validator-2.0.1"
       sources."y18n-3.2.1"
-      sources."yallist-2.1.2"
-      (sources."yargs-10.0.3" // {
+      (sources."yargs-12.0.4" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
+          sources."cliui-4.1.0"
+          sources."invert-kv-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."os-locale-2.1.0"
+          sources."lcid-2.0.0"
+          sources."os-locale-3.0.1"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."yargs-parser-8.1.0" // {
+      (sources."yargs-parser-11.1.1" // {
         dependencies = [
-          sources."camelcase-4.1.0"
+          sources."camelcase-5.0.0"
         ];
       })
     ];
@@ -47011,41 +47044,41 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.4.3";
+    version = "3.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.3.tgz";
-      sha512 = "tWq1LvpHqkyB+FaJCmkEweivr88yShDMmauofPVdh0M5gU1cVucszYnIgWafulKYu2LMQ3IfUMUU5Pp3+MvADQ==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.5.1.tgz";
+      sha512 = "0AyxMr2UpR3RAJsyrfNtYvfcI01YVSSnbRdzum7frZAtb7S+8NSY2ip7aDbN6/YsQK2K/zOCQ4shu/nwgub8aw==";
     };
     dependencies = [
-      sources."@lerna/add-3.4.1"
+      sources."@lerna/add-3.5.0"
       sources."@lerna/batch-packages-3.1.2"
-      sources."@lerna/bootstrap-3.4.1"
-      sources."@lerna/changed-3.4.1"
-      sources."@lerna/check-working-tree-3.3.0"
+      sources."@lerna/bootstrap-3.5.0"
+      sources."@lerna/changed-3.5.0"
+      sources."@lerna/check-working-tree-3.5.0"
       sources."@lerna/child-process-3.3.0"
-      sources."@lerna/clean-3.3.2"
+      sources."@lerna/clean-3.5.0"
       sources."@lerna/cli-3.2.0"
-      sources."@lerna/collect-updates-3.3.2"
-      sources."@lerna/command-3.3.0"
-      sources."@lerna/conventional-commits-3.4.1"
-      (sources."@lerna/create-3.4.1" // {
+      sources."@lerna/collect-updates-3.5.0"
+      sources."@lerna/command-3.5.0"
+      sources."@lerna/conventional-commits-3.5.0"
+      (sources."@lerna/create-3.5.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
         ];
       })
       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/describe-ref-3.5.0"
+      sources."@lerna/diff-3.5.0"
+      sources."@lerna/exec-3.5.0"
+      sources."@lerna/filter-options-3.5.0"
       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.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/import-3.5.0"
+      sources."@lerna/init-3.5.0"
+      sources."@lerna/link-3.5.0"
+      sources."@lerna/list-3.5.0"
       sources."@lerna/listable-3.0.0"
       sources."@lerna/log-packed-3.0.4"
       sources."@lerna/npm-conf-3.4.1"
@@ -47056,18 +47089,19 @@ in
       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/project-3.5.0"
       sources."@lerna/prompt-3.3.1"
-      sources."@lerna/publish-3.4.3"
+      sources."@lerna/publish-3.5.1"
       sources."@lerna/resolve-symlink-3.3.0"
       sources."@lerna/rimraf-dir-3.3.0"
-      sources."@lerna/run-3.3.2"
+      sources."@lerna/run-3.5.0"
       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/timer-3.5.0"
       sources."@lerna/validation-error-3.0.0"
-      sources."@lerna/version-3.4.1"
+      sources."@lerna/version-3.5.0"
       sources."@lerna/write-log-file-3.0.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -47075,7 +47109,7 @@ in
       sources."abbrev-1.1.1"
       sources."agent-base-4.2.1"
       sources."agentkeepalive-3.5.2"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
@@ -47380,10 +47414,10 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."init-package-json-1.10.3"
-      (sources."inquirer-6.2.0" // {
+      (sources."inquirer-6.2.1" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-4.0.0"
+          sources."strip-ansi-5.0.0"
         ];
       })
       sources."invert-kv-2.0.0"
@@ -47444,7 +47478,7 @@ in
       sources."lodash.template-4.4.0"
       sources."lodash.templatesettings-4.1.0"
       sources."loud-rejection-1.6.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."make-fetch-happen-4.0.1"
       sources."map-age-cleaner-0.1.3"
@@ -47463,7 +47497,7 @@ in
       sources."minimist-options-3.0.2"
       (sources."minipass-2.3.5" // {
         dependencies = [
-          sources."yallist-3.0.2"
+          sources."yallist-3.0.3"
         ];
       })
       sources."minizlib-1.1.1"
@@ -47677,7 +47711,7 @@ 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.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -47721,7 +47755,7 @@ in
       sources."supports-color-5.5.0"
       (sources."tar-4.4.8" // {
         dependencies = [
-          sources."yallist-3.0.2"
+          sources."yallist-3.0.3"
         ];
       })
       sources."temp-dir-1.0.0"
@@ -47803,8 +47837,8 @@ in
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-12.0.4"
-      sources."yargs-parser-11.1.0"
+      sources."yargs-12.0.5"
+      sources."yargs-parser-11.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -47818,13 +47852,13 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.8.1";
+    version = "3.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.8.1.tgz";
-      sha512 = "8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==";
+      url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz";
+      sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==";
     };
     dependencies = [
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -47922,40 +47956,40 @@ in
   live-server = nodeEnv.buildNodePackage {
     name = "live-server";
     packageName = "live-server";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz";
-      sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3";
+      url = "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz";
+      sha512 = "Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==";
     };
     dependencies = [
       sources."accepts-1.3.5"
-      sources."anymatch-1.3.2"
+      sources."anymatch-2.0.0"
       sources."apache-crypt-1.2.1"
       sources."apache-md5-1.1.2"
-      sources."arr-diff-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."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."atob-2.1.2"
       (sources."base-0.11.2" // {
         dependencies = [
           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.12.0"
-      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."chokidar-1.7.0"
+      sources."cache-base-1.0.1"
+      sources."chokidar-2.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -47970,29 +48004,19 @@ in
             ];
           })
           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."component-emitter-1.2.1"
-      (sources."connect-3.5.1" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."connect-3.6.6"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
       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."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."duplexer-0.1.1"
@@ -48000,46 +48024,57 @@ in
       sources."encodeurl-1.0.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."event-stream-4.0.1"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      (sources."extend-shallow-3.0.2" // {
+      sources."event-stream-3.3.4"
+      (sources."expand-brackets-2.1.4" // {
         dependencies = [
-          sources."is-extendable-1.0.1"
+          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."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      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."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."fill-range-4.0.0" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
+      sources."finalhandler-1.1.0"
       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.15"
-      (sources."has-value-1.0.0" // {
+      (sources."glob-parent-3.1.0" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."is-glob-3.1.0"
         ];
       })
+      sources."graceful-fs-4.1.15"
+      sources."has-value-1.0.0"
       (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"
         ];
       })
@@ -48051,64 +48086,38 @@ in
       })
       sources."http-parser-js-0.5.0"
       sources."inherits-2.0.3"
-      (sources."is-accessor-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      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-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-6.0.2"
+          sources."kind-of-3.2.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-plain-object-2.0.4"
       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."isobject-3.0.1"
+      sources."kind-of-6.0.2"
+      sources."lodash.debounce-4.0.8"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.0.7"
+      sources."map-stream-0.1.0"
       sources."map-visit-1.0.0"
-      sources."math-random-1.0.1"
-      sources."micromatch-2.3.11"
+      sources."micromatch-3.1.10"
       sources."mime-1.4.1"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
-      (sources."mixin-deep-1.3.1" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      sources."mixin-deep-1.3.1"
       sources."morgan-1.9.1"
       sources."ms-2.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."nanomatch-1.2.13"
       sources."negotiator-0.6.1"
       sources."normalize-path-2.1.1"
       sources."object-assign-4.1.1"
@@ -48122,91 +48131,25 @@ in
               sources."kind-of-5.1.0"
             ];
           })
+          sources."kind-of-3.2.2"
         ];
       })
-      (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."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."opn-5.4.0"
-      sources."parse-glob-3.0.4"
       sources."parseurl-1.3.2"
       sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
       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"
-      (sources."randomatic-3.1.1" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-          sources."kind-of-6.0.2"
-        ];
-      })
       sources."range-parser-1.2.0"
       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."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."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
@@ -48224,6 +48167,7 @@ in
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
       sources."setprototypeof-1.1.0"
@@ -48242,20 +48186,24 @@ 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."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-0.3.3"
       sources."split-string-3.1.0"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -48275,19 +48223,20 @@ in
         ];
       })
       sources."statuses-1.3.1"
-      sources."stream-combiner-0.2.2"
+      sources."stream-combiner-0.0.4"
       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" // {
+      (sources."to-object-path-0.3.0" // {
         dependencies = [
-          sources."is-number-3.0.0"
+          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."is-extendable-0.1.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -48301,13 +48250,13 @@ 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."utils-merge-1.0.0"
+      sources."utils-merge-1.0.1"
       sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."websocket-driver-0.7.0"
@@ -48333,7 +48282,7 @@ in
     dependencies = [
       sources."accepts-1.3.5"
       sources."after-0.8.2"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."anymatch-1.3.2"
       sources."argparse-1.0.10"
       sources."arr-diff-2.0.0"
@@ -48419,12 +48368,12 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.2.1" // {
+      (sources."engine.io-3.3.2" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
       })
-      (sources."engine.io-client-3.2.1" // {
+      (sources."engine.io-client-3.3.1" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -48544,7 +48493,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."kind-of-3.2.2"
-      sources."linkify-it-2.0.3"
+      sources."linkify-it-2.1.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."markdown-it-8.4.2"
@@ -48727,18 +48676,19 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.1.1" // {
+      (sources."socket.io-2.2.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.0"
+          sources."ms-2.1.1"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.1.1" // {
+      (sources."socket.io-client-2.2.0" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
       })
-      (sources."socket.io-parser-3.2.0" // {
+      (sources."socket.io-parser-3.3.0" // {
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
@@ -48786,7 +48736,6 @@ in
       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"
@@ -48813,7 +48762,7 @@ in
       sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-3.3.3"
+      sources."ws-6.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -48833,11 +48782,12 @@ in
     src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.0.0"
-      sources."@babel/core-7.1.6"
-      sources."@babel/generator-7.1.6"
+      sources."@babel/core-7.2.0"
+      sources."@babel/generator-7.2.0"
       sources."@babel/helper-annotate-as-pure-7.0.0"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0"
       sources."@babel/helper-call-delegate-7.1.0"
+      sources."@babel/helper-create-class-features-plugin-7.2.1"
       sources."@babel/helper-define-map-7.1.0"
       sources."@babel/helper-explode-assignable-expression-7.1.0"
       sources."@babel/helper-function-name-7.1.0"
@@ -48853,56 +48803,55 @@ in
       sources."@babel/helper-replace-supers-7.1.0"
       sources."@babel/helper-simple-access-7.1.0"
       sources."@babel/helper-split-export-declaration-7.0.0"
-      sources."@babel/helper-wrap-function-7.1.0"
-      sources."@babel/helpers-7.1.5"
+      sources."@babel/helper-wrap-function-7.2.0"
+      sources."@babel/helpers-7.2.0"
       sources."@babel/highlight-7.0.0"
-      sources."@babel/parser-7.1.6"
+      sources."@babel/parser-7.2.0"
       sources."@babel/plugin-external-helpers-7.0.0"
-      sources."@babel/plugin-proposal-async-generator-functions-7.1.0"
-      sources."@babel/plugin-proposal-class-properties-7.1.0"
-      sources."@babel/plugin-proposal-json-strings-7.0.0"
-      sources."@babel/plugin-proposal-object-rest-spread-7.0.0"
-      sources."@babel/plugin-proposal-optional-catch-binding-7.0.0"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.0.0"
-      sources."@babel/plugin-syntax-async-generators-7.0.0"
-      sources."@babel/plugin-syntax-class-properties-7.0.0"
-      sources."@babel/plugin-syntax-json-strings-7.0.0"
-      sources."@babel/plugin-syntax-object-rest-spread-7.0.0"
-      sources."@babel/plugin-syntax-optional-catch-binding-7.0.0"
-      sources."@babel/plugin-transform-arrow-functions-7.0.0"
-      sources."@babel/plugin-transform-async-to-generator-7.1.0"
-      sources."@babel/plugin-transform-block-scoped-functions-7.0.0"
-      sources."@babel/plugin-transform-block-scoping-7.1.5"
-      sources."@babel/plugin-transform-classes-7.1.0"
-      sources."@babel/plugin-transform-computed-properties-7.0.0"
-      sources."@babel/plugin-transform-destructuring-7.1.3"
-      sources."@babel/plugin-transform-dotall-regex-7.0.0"
-      sources."@babel/plugin-transform-duplicate-keys-7.0.0"
-      sources."@babel/plugin-transform-exponentiation-operator-7.1.0"
-      sources."@babel/plugin-transform-for-of-7.0.0"
-      sources."@babel/plugin-transform-function-name-7.1.0"
-      sources."@babel/plugin-transform-literals-7.0.0"
-      sources."@babel/plugin-transform-modules-amd-7.1.0"
-      sources."@babel/plugin-transform-modules-commonjs-7.1.0"
-      sources."@babel/plugin-transform-modules-systemjs-7.1.3"
-      sources."@babel/plugin-transform-modules-umd-7.1.0"
+      sources."@babel/plugin-proposal-async-generator-functions-7.2.0"
+      sources."@babel/plugin-proposal-class-properties-7.2.1"
+      sources."@babel/plugin-proposal-json-strings-7.2.0"
+      sources."@babel/plugin-proposal-object-rest-spread-7.2.0"
+      sources."@babel/plugin-proposal-optional-catch-binding-7.2.0"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.2.0"
+      sources."@babel/plugin-syntax-async-generators-7.2.0"
+      sources."@babel/plugin-syntax-json-strings-7.2.0"
+      sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
+      sources."@babel/plugin-syntax-optional-catch-binding-7.2.0"
+      sources."@babel/plugin-transform-arrow-functions-7.2.0"
+      sources."@babel/plugin-transform-async-to-generator-7.2.0"
+      sources."@babel/plugin-transform-block-scoped-functions-7.2.0"
+      sources."@babel/plugin-transform-block-scoping-7.2.0"
+      sources."@babel/plugin-transform-classes-7.2.0"
+      sources."@babel/plugin-transform-computed-properties-7.2.0"
+      sources."@babel/plugin-transform-destructuring-7.2.0"
+      sources."@babel/plugin-transform-dotall-regex-7.2.0"
+      sources."@babel/plugin-transform-duplicate-keys-7.2.0"
+      sources."@babel/plugin-transform-exponentiation-operator-7.2.0"
+      sources."@babel/plugin-transform-for-of-7.2.0"
+      sources."@babel/plugin-transform-function-name-7.2.0"
+      sources."@babel/plugin-transform-literals-7.2.0"
+      sources."@babel/plugin-transform-modules-amd-7.2.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.2.0"
+      sources."@babel/plugin-transform-modules-systemjs-7.2.0"
+      sources."@babel/plugin-transform-modules-umd-7.2.0"
       sources."@babel/plugin-transform-new-target-7.0.0"
-      sources."@babel/plugin-transform-object-super-7.1.0"
-      sources."@babel/plugin-transform-parameters-7.1.0"
+      sources."@babel/plugin-transform-object-super-7.2.0"
+      sources."@babel/plugin-transform-parameters-7.2.0"
       sources."@babel/plugin-transform-regenerator-7.0.0"
-      sources."@babel/plugin-transform-runtime-7.1.0"
-      sources."@babel/plugin-transform-shorthand-properties-7.0.0"
-      sources."@babel/plugin-transform-spread-7.0.0"
-      sources."@babel/plugin-transform-sticky-regex-7.0.0"
-      sources."@babel/plugin-transform-template-literals-7.0.0"
-      sources."@babel/plugin-transform-typeof-symbol-7.0.0"
-      sources."@babel/plugin-transform-unicode-regex-7.0.0"
-      sources."@babel/preset-env-7.1.6"
+      sources."@babel/plugin-transform-runtime-7.2.0"
+      sources."@babel/plugin-transform-shorthand-properties-7.2.0"
+      sources."@babel/plugin-transform-spread-7.2.0"
+      sources."@babel/plugin-transform-sticky-regex-7.2.0"
+      sources."@babel/plugin-transform-template-literals-7.2.0"
+      sources."@babel/plugin-transform-typeof-symbol-7.2.0"
+      sources."@babel/plugin-transform-unicode-regex-7.2.0"
+      sources."@babel/preset-env-7.2.0"
       sources."@babel/preset-stage-2-7.0.0"
-      sources."@babel/runtime-7.1.5"
+      sources."@babel/runtime-7.2.0"
       sources."@babel/template-7.1.2"
       sources."@babel/traverse-7.1.6"
-      sources."@babel/types-7.1.6"
+      sources."@babel/types-7.2.0"
       sources."@calebboyd/semaphore-1.3.1"
       sources."@comandeer/babel-plugin-banner-4.1.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -48910,7 +48859,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@szmarczak/http-timer-1.1.1"
       sources."@types/estree-0.0.39"
-      sources."@types/node-10.12.9"
+      sources."@types/node-10.12.12"
       sources."@webassemblyjs/ast-1.7.11"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.11"
       sources."@webassemblyjs/helper-api-error-1.7.11"
@@ -48938,7 +48887,8 @@ in
           sources."acorn-5.7.3"
         ];
       })
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
+      sources."ajv-errors-1.0.0"
       sources."ajv-keywords-3.2.0"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
@@ -49102,7 +49052,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.3.4"
+      sources."browserslist-4.3.5"
       sources."buffer-3.6.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -49112,7 +49062,7 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-1.1.1"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-10.0.4"
+      sources."cacache-11.3.1"
       (sources."cache-base-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -49125,7 +49075,7 @@ in
       })
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.0.0"
-      sources."caniuse-lite-1.0.30000907"
+      sources."caniuse-lite-1.0.30000916"
       sources."caw-2.0.1"
       (sources."chalk-2.4.1" // {
         dependencies = [
@@ -49201,7 +49151,7 @@ in
       sources."convert-source-map-1.6.0"
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -49268,7 +49218,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.6.1"
-      sources."electron-to-chromium-1.3.84"
+      sources."electron-to-chromium-1.3.88"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -49360,6 +49310,7 @@ in
       })
       sources."fast-json-stable-stringify-2.0.0"
       sources."fd-slicer-1.1.0"
+      sources."figgy-pudding-3.5.1"
       sources."file-type-8.1.0"
       sources."filename-regex-2.0.1"
       sources."filename-reserved-regex-2.0.0"
@@ -49386,7 +49337,7 @@ in
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."glob-to-regexp-0.3.0"
-      sources."global-modules-path-2.3.0"
+      sources."global-modules-path-2.3.1"
       sources."globals-11.9.0"
       (sources."globby-8.0.1" // {
         dependencies = [
@@ -49399,7 +49350,7 @@ in
           sources."@sindresorhus/is-0.12.0"
           sources."cacheable-request-5.2.0"
           sources."get-stream-4.1.0"
-          sources."http-cache-semantics-4.0.0"
+          sources."http-cache-semantics-4.0.1"
           sources."normalize-url-3.3.0"
           sources."p-cancelable-1.0.0"
         ];
@@ -49428,7 +49379,7 @@ in
         ];
       })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-2.7.1"
       sources."http-cache-semantics-3.8.1"
@@ -49533,7 +49484,7 @@ in
       sources."log-symbols-2.2.0"
       sources."loose-envify-1.4.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."magic-string-0.25.1"
       (sources."make-dir-1.3.0" // {
         dependencies = [
@@ -49557,11 +49508,7 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."mississippi-2.0.0" // {
-        dependencies = [
-          sources."pump-2.0.1"
-        ];
-      })
+      sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.1" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -49598,7 +49545,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.0.3"
+      sources."node-releases-1.1.0"
       sources."normalize-package-data-2.4.0"
       sources."normalize-path-2.1.1"
       (sources."normalize-url-2.0.1" // {
@@ -49658,7 +49605,7 @@ in
       sources."p-locate-2.0.0"
       sources."p-timeout-2.0.1"
       sources."p-try-1.0.0"
-      sources."pako-1.0.6"
+      sources."pako-1.0.7"
       sources."parallel-transform-1.1.0"
       sources."paredit.js-0.3.4"
       sources."parse-asn1-5.1.1"
@@ -49686,7 +49633,7 @@ in
       sources."private-0.1.8"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
-      sources."progress-2.0.1"
+      sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."proto-list-1.2.4"
       sources."prr-1.0.1"
@@ -49771,9 +49718,9 @@ in
       sources."regenerator-transform-0.13.3"
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
-      sources."regexpu-core-4.2.0"
-      sources."regjsgen-0.4.0"
-      (sources."regjsparser-0.3.0" // {
+      sources."regexpu-core-4.4.0"
+      sources."regjsgen-0.5.0"
+      (sources."regjsparser-0.6.0" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -49867,14 +49814,19 @@ in
       sources."source-list-map-0.1.8"
       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."sourcemap-codec-1.4.3"
-      sources."spdx-correct-3.0.2"
+      sources."sourcemap-codec-1.4.4"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
       sources."split-string-3.1.0"
-      sources."ssri-5.3.0"
+      sources."ssri-6.0.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -49912,8 +49864,27 @@ in
       sources."strip-outer-1.0.1"
       sources."supports-color-2.0.0"
       sources."symbol-observable-1.2.0"
-      sources."tapable-1.1.0"
+      sources."tapable-1.1.1"
       sources."tar-stream-1.6.2"
+      (sources."terser-3.11.0" // {
+        dependencies = [
+          sources."commander-2.17.1"
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."terser-webpack-plugin-1.1.0" // {
+        dependencies = [
+          sources."find-cache-dir-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."pkg-dir-3.0.0"
+          sources."schema-utils-1.0.0"
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."test-exclude-4.2.3"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -49941,11 +49912,6 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."uglifyjs-webpack-plugin-1.3.0" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
       sources."unbzip2-stream-1.3.1"
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
@@ -49990,7 +49956,7 @@ in
       sources."vm-browserify-0.0.4"
       sources."watchpack-1.6.0"
       sources."wcwidth-1.0.1"
-      (sources."webpack-4.25.1" // {
+      (sources."webpack-4.27.1" // {
         dependencies = [
           sources."acorn-5.7.3"
           sources."arr-diff-4.0.0"
@@ -50067,7 +50033,7 @@ in
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-12.0.4" // {
+      (sources."yargs-12.0.5" // {
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
@@ -50076,7 +50042,7 @@ in
           sources."p-try-2.0.0"
         ];
       })
-      sources."yargs-parser-11.1.0"
+      sources."yargs-parser-11.1.1"
       sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -50163,10 +50129,10 @@ in
   meguca = nodeEnv.buildNodePackage {
     name = "meguca";
     packageName = "meguca";
-    version = "1.1.2";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/meguca/-/meguca-1.1.2.tgz";
-      sha512 = "WW3e3r7fCcjX5GH793OaF2SVMdMAhljVZNNCLBXrQhe7RhbhZiEVIGR/6lDLxgySfIF7Hf33ANoH1ytehnxnbg==";
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.1.3.tgz";
+      sha512 = "p9O6RWIqdP74tgmHNwfw6T2RJd8P+M7snBU2yfBrZAQT3SSL0IsbCPpQt42v0rxJOdQuPVVCsYesVAIzwa+VYQ==";
     };
     dependencies = [
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -50184,7 +50150,7 @@ in
           sources."through2-2.0.5"
         ];
       })
-      (sources."accord-0.29.0" // {
+      (sources."accord-0.28.0" // {
         dependencies = [
           sources."glob-7.1.3"
           sources."minimatch-3.0.4"
@@ -50193,7 +50159,7 @@ in
         ];
       })
       sources."acorn-5.7.3"
-      sources."ajv-6.5.5"
+      sources."ajv-4.11.8"
       (sources."align-text-0.1.4" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -50219,11 +50185,11 @@ in
       sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
+      sources."assert-plus-0.2.0"
       sources."assign-symbols-1.0.0"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
@@ -50233,6 +50199,7 @@ 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 = [
@@ -50277,6 +50244,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      sources."co-4.6.0"
       sources."collection-visit-1.0.0"
       sources."color-support-1.1.3"
       sources."combined-stream-1.0.7"
@@ -50287,13 +50255,18 @@ in
       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.4" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
       sources."d-1.0.0"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."dateformat-2.2.0"
       sources."debug-2.6.9"
       (sources."debug-fabulous-1.1.0" // {
@@ -50367,9 +50340,7 @@ in
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fancy-log-1.3.2"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fancy-log-1.3.3"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -50389,7 +50360,7 @@ in
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
+      sources."form-data-2.1.4"
       sources."fragment-cache-0.2.1"
       (sources."fs-mkdirp-stream-1.0.0" // {
         dependencies = [
@@ -50403,7 +50374,11 @@ in
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-value-2.0.6"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-4.5.3"
       sources."glob-parent-3.1.0"
       sources."glob-stream-3.1.18"
@@ -50429,7 +50404,7 @@ in
           sources."through2-2.0.3"
         ];
       })
-      (sources."gulp-less-4.0.1" // {
+      (sources."gulp-less-3.5.0" // {
         dependencies = [
           sources."arr-diff-1.1.0"
           sources."arr-union-2.1.0"
@@ -50451,18 +50426,23 @@ in
           sources."through2-2.0.5"
         ];
       })
-      (sources."gulp-typescript-5.0.0-alpha.3" // {
+      (sources."gulp-typescript-4.0.2" // {
         dependencies = [
-          sources."ansi-colors-2.0.5"
+          sources."arr-diff-1.1.0"
+          sources."arr-union-2.1.0"
+          sources."array-slice-0.2.3"
           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.15"
+          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.7.3"
+          sources."source-map-0.6.1"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.5"
           sources."unique-stream-2.2.1"
@@ -50489,8 +50469,8 @@ in
         ];
       })
       sources."gulplog-1.0.0"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-ansi-2.0.0"
       sources."has-gulplog-0.1.0"
       sources."has-symbols-1.0.0"
@@ -50500,8 +50480,10 @@ 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.2.0"
+      sources."http-signature-1.1.1"
       sources."image-size-0.5.5"
       sources."indx-0.2.3"
       sources."inflight-1.0.6"
@@ -50536,11 +50518,14 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.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"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."kind-of-6.0.2"
       sources."lazy-cache-1.0.4"
       (sources."lazystream-1.0.0" // {
@@ -50550,11 +50535,9 @@ in
         ];
       })
       sources."lead-1.0.0"
-      (sources."less-3.8.1" // {
+      (sources."less-2.7.3" // {
         dependencies = [
-          sources."clone-2.1.2"
           sources."graceful-fs-4.1.15"
-          sources."source-map-0.6.1"
         ];
       })
       sources."liftoff-2.5.0"
@@ -50614,7 +50597,7 @@ in
       sources."next-tick-1.0.0"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.0"
-      sources."oauth-sign-0.9.0"
+      sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -50640,6 +50623,7 @@ in
       sources."ordered-read-streams-0.1.0"
       sources."os-homedir-1.0.2"
       sources."parse-filepath-1.0.2"
+      sources."parse-node-version-1.0.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -50647,14 +50631,13 @@ in
       sources."path-parse-1.0.6"
       sources."path-root-0.1.1"
       sources."path-root-regex-0.1.2"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.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" // {
@@ -50665,8 +50648,8 @@ in
         ];
       })
       sources."pumpify-1.5.1"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
+      sources."punycode-1.4.1"
+      sources."qs-6.4.0"
       (sources."readable-stream-1.0.34" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -50686,7 +50669,7 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."request-2.88.0"
+      sources."request-2.81.0"
       sources."resolve-1.8.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
@@ -50732,12 +50715,17 @@ 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.15.2"
+      (sources."sshpk-1.15.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -50758,6 +50746,7 @@ 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"
@@ -50788,11 +50777,7 @@ in
           sources."through2-2.0.5"
         ];
       })
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typescript-3.1.6"
@@ -50820,7 +50805,6 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."user-home-1.1.1"
@@ -50828,7 +50812,11 @@ in
       sources."uuid-3.3.2"
       sources."v8flags-2.1.1"
       sources."value-or-function-3.0.0"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       (sources."vinyl-0.4.6" // {
         dependencies = [
           sources."clone-0.2.0"
@@ -50940,7 +50928,7 @@ in
       sources."path-loader-1.0.9"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.5.2"
+      sources."qs-6.6.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
@@ -51022,7 +51010,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -51130,7 +51118,7 @@ in
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
       sources."slide-1.1.6"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -51159,7 +51147,7 @@ in
       sources."walk-2.3.14"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.2"
+      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -51180,7 +51168,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -51291,10 +51279,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.5.0";
+    version = "3.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
-      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
+      sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -51333,7 +51321,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.36"
+      sources."big-integer-1.6.40"
       sources."block-stream-0.0.9"
       sources."body-parser-1.18.3"
       sources."boom-2.10.1"
@@ -51520,7 +51508,7 @@ in
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
       sources."sntp-1.0.9"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -51674,7 +51662,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.2"
+      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -51688,10 +51676,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.18.6";
+    version = "1.18.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.6.tgz";
-      sha512 = "4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.7.tgz";
+      sha512 = "xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -51765,10 +51753,8 @@ in
       sources."deep-extend-0.6.0"
       sources."define-property-2.0.2"
       sources."dot-prop-4.2.0"
-      sources."duplexer-0.1.1"
       sources."duplexer3-0.1.4"
       sources."escape-string-regexp-1.0.5"
-      sources."event-stream-3.3.6"
       sources."execa-0.7.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -51804,10 +51790,8 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."flatmap-stream-0.1.2"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
-      sources."from-0.1.7"
       sources."fsevents-1.2.4"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
@@ -51862,10 +51846,9 @@ in
       sources."latest-version-3.1.0"
       sources."lodash.debounce-4.0.8"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."micromatch-3.1.10"
       sources."minimatch-3.0.4"
@@ -51899,14 +51882,12 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."pause-stream-0.0.11"
       sources."pify-3.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
-      sources."pstree.remy-1.1.0"
+      sources."pstree.remy-1.1.2"
       sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.2.1"
@@ -51964,7 +51945,6 @@ in
       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 = [
@@ -51983,7 +51963,6 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."stream-combiner-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
@@ -51991,7 +51970,6 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
       sources."term-size-1.2.0"
-      sources."through-2.3.8"
       sources."timed-out-4.0.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -52079,6 +52057,7 @@ in
       (sources."bl-1.2.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."body-parser-1.18.3"
@@ -52101,6 +52080,7 @@ in
       (sources."callback-stream-1.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."caseless-0.12.0"
@@ -52113,6 +52093,7 @@ in
       (sources."concat-stream-1.6.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."content-disposition-0.5.2"
@@ -52145,12 +52126,13 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       (sources."duplexify-3.6.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."ecc-jsbn-0.1.2"
@@ -52185,6 +52167,7 @@ in
         dependencies = [
           sources."addressparser-1.0.1"
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       (sources."finalhandler-1.1.1" // {
@@ -52205,13 +52188,14 @@ in
       (sources."glob-stream-6.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."graceful-fs-4.1.15"
       sources."har-schema-2.0.0"
       (sources."har-validator-5.1.3" // {
         dependencies = [
-          sources."ajv-6.5.5"
+          sources."ajv-6.6.1"
         ];
       })
       sources."hash-sum-1.0.2"
@@ -52278,7 +52262,7 @@ in
       sources."lodash.reject-4.6.0"
       sources."lodash.some-4.6.0"
       sources."lodash.uniq-4.5.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."mailcomposer-2.1.0"
       sources."mailparser-0.6.2"
       sources."media-typer-0.3.0"
@@ -52309,6 +52293,7 @@ in
       (sources."mqtt-2.18.8" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."mqtt-packet-5.6.0"
@@ -52350,6 +52335,7 @@ in
       (sources."ordered-read-streams-1.0.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."os-homedir-1.0.2"
@@ -52406,10 +52392,11 @@ in
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.0"
       sources."streamsearch-0.1.2"
-      sources."string_decoder-1.1.1"
+      sources."string_decoder-1.2.0"
       (sources."through2-2.0.5" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."through2-filter-2.0.0"
@@ -52447,6 +52434,7 @@ in
       (sources."websocket-stream-5.1.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
           sources."ws-3.3.3"
         ];
       })
@@ -52500,7 +52488,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -52660,10 +52648,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.14.3";
+    version = "2.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.3.tgz";
-      sha512 = "3zRQkqa5JzSdzJBsWK1s+wycpwH7aNykm5rdg/ktYgAfKW2TzBuQm85irG0bmIb8ZKR7/0dzPkO8Ch1/g19aog==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.15.0.tgz";
+      sha512 = "0ZUokfgS+4uPVSVWP3CMie7kQwngiQag2e70CdcnUfBM7/tOUmxb0DDMfxqshw4MvgqlPsxSYprzKaBGlvXqnA==";
     };
     dependencies = [
       sources."ansi-align-2.0.0"
@@ -52729,7 +52717,7 @@ in
       sources."latest-version-3.1.0"
       sources."lodash-4.17.11"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."minimist-1.2.0"
       sources."ms-2.1.1"
@@ -52870,11 +52858,11 @@ in
       sources."ansi-styles-2.2.1"
       sources."appendable-cli-menu-2.0.0"
       sources."array-find-index-1.0.2"
-      sources."array-flatten-2.1.1"
+      sources."array-flatten-2.1.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.36"
+      sources."big-integer-1.6.40"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -52995,7 +52983,7 @@ in
       sources."magnet-uri-5.2.4"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-2.3.1"
+      sources."mime-2.4.0"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
@@ -53091,7 +53079,7 @@ in
         ];
       })
       sources."single-line-log-1.1.2"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -53161,11 +53149,16 @@ in
       sources."accepts-1.2.13"
       sources."addr-to-ip-port-1.5.1"
       sources."after-0.8.2"
+      sources."ajv-6.6.1"
       sources."archiver-3.0.0"
       sources."archiver-utils-2.0.0"
       sources."arraybuffer.slice-0.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
       sources."async-2.6.1"
-      sources."aws-sign-0.2.1"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
@@ -53175,6 +53168,7 @@ in
       sources."basic-auth-1.0.4"
       sources."basic-auth-connect-1.0.0"
       sources."batch-0.5.3"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
       sources."better-assert-1.0.2"
       sources."bitfield-0.1.0"
@@ -53196,7 +53190,6 @@ in
           sources."qs-4.0.0"
         ];
       })
-      sources."boom-0.3.8"
       sources."brace-expansion-1.1.11"
       sources."buffer-5.2.1"
       sources."buffer-alloc-1.2.0"
@@ -53208,7 +53201,8 @@ in
       sources."buffer-from-1.1.1"
       sources."bytes-2.1.0"
       sources."callsite-1.0.0"
-      sources."combined-stream-0.0.7"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.7"
       sources."commander-2.6.0"
       sources."compact2string-1.4.0"
       sources."component-bind-1.0.0"
@@ -53242,13 +53236,11 @@ in
       sources."content-disposition-0.5.0"
       sources."content-type-1.0.4"
       sources."cookie-0.1.3"
-      sources."cookie-jar-0.2.0"
       sources."cookie-parser-1.3.5"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       sources."crc32-stream-2.0.0"
-      sources."cryptiles-0.1.3"
       (sources."csrf-3.0.6" // {
         dependencies = [
           sources."uid-safe-2.1.4"
@@ -53260,11 +53252,13 @@ in
         ];
       })
       sources."cyclist-0.1.1"
+      sources."dashdash-1.14.1"
       sources."debug-2.2.0"
       sources."decompress-response-3.3.0"
-      sources."delayed-stream-0.0.5"
+      sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
+      sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."end-of-stream-1.4.1"
       (sources."engine.io-1.8.5" // {
@@ -53305,26 +53299,28 @@ in
           sources."uid-safe-2.0.0"
         ];
       })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."fd-slicer-1.1.0"
       sources."fifo-0.1.4"
       sources."finalhandler-0.4.0"
       sources."flatten-0.0.1"
       sources."fluent-ffmpeg-2.1.2"
-      sources."forever-agent-0.2.0"
-      (sources."form-data-0.0.10" // {
-        dependencies = [
-          sources."async-0.2.10"
-          sources."mime-1.2.11"
-        ];
-      })
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fresh-0.3.0"
       sources."fs-chunk-store-1.7.0"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."get-browser-rtc-1.0.2"
+      sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."graceful-fs-4.1.15"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
       (sources."has-binary-0.1.7" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -53332,9 +53328,8 @@ in
       })
       sources."has-cors-1.1.0"
       sources."hat-0.0.3"
-      sources."hawk-0.10.2"
-      sources."hoek-0.7.6"
       sources."http-errors-1.7.1"
+      sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.11"
       sources."ieee754-1.1.12"
       sources."immediate-chunk-store-1.0.8"
@@ -53344,10 +53339,16 @@ in
       sources."ip-1.1.5"
       sources."ip-set-1.0.1"
       sources."ipaddr.js-1.0.5"
+      sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."json-stringify-safe-3.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
       sources."json3-3.3.2"
+      sources."jsprim-1.4.1"
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
@@ -53395,9 +53396,8 @@ in
       sources."ms-0.7.1"
       sources."multiparty-4.2.1"
       sources."negotiator-0.5.3"
-      sources."node-uuid-1.4.8"
       sources."normalize-path-3.0.0"
-      sources."oauth-sign-0.2.0"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.0"
       sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
@@ -53426,9 +53426,12 @@ in
       })
       sources."peer-wire-swarm-0.12.2"
       sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.0.10"
+      sources."psl-1.1.29"
       sources."pump-1.0.3"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
       sources."random-access-storage-1.3.0"
@@ -53443,15 +53446,10 @@ in
         ];
       })
       sources."re-emitter-1.1.3"
-      sources."read-torrent-1.3.0"
+      sources."read-torrent-1.3.1"
       sources."readable-stream-2.3.6"
       sources."remove-trailing-separator-1.1.0"
-      (sources."request-2.16.6" // {
-        dependencies = [
-          sources."mime-1.2.11"
-          sources."qs-0.5.6"
-        ];
-      })
+      sources."request-2.88.0"
       sources."response-time-2.3.2"
       sources."rimraf-2.6.2"
       sources."rndm-1.2.0"
@@ -53459,6 +53457,7 @@ in
       sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       (sources."send-0.13.0" // {
         dependencies = [
           sources."depd-1.0.1"
@@ -53500,7 +53499,6 @@ in
           sources."ws-2.3.1"
         ];
       })
-      sources."sntp-0.1.4"
       (sources."socket.io-1.7.4" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -53526,6 +53524,7 @@ in
         ];
       })
       sources."speedometer-0.1.4"
+      sources."sshpk-1.15.2"
       sources."statuses-1.5.0"
       (sources."stream-counter-0.2.0" // {
         dependencies = [
@@ -53551,17 +53550,26 @@ in
           sources."once-1.3.3"
         ];
       })
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
       sources."tsscmp-1.0.5"
-      sources."tunnel-agent-0.2.0"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
       sources."uid-safe-2.1.5"
       sources."ultron-1.0.2"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
+      sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.0"
       sources."utp-0.0.7"
+      sources."uuid-3.3.2"
       sources."vary-1.0.1"
+      sources."verror-1.10.0"
       sources."vhost-3.0.2"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
@@ -53584,10 +53592,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.18.2";
+    version = "2.20.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.18.2.tgz";
-      sha512 = "yJu5pCPFmzxD9xQtWay4nI7JdcrpIIom/VwwMmUvU6itN0wAbbyIaGKz57JCu1E+ZfbOvcaOzEmifbypHfFNXw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
+      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -53608,13 +53616,13 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
-      (sources."@babel/core-7.1.6" // {
+      (sources."@babel/core-7.2.0" // {
         dependencies = [
           sources."json5-2.1.0"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.1.6" // {
+      (sources."@babel/generator-7.2.0" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -53638,65 +53646,65 @@ in
       sources."@babel/helper-replace-supers-7.1.0"
       sources."@babel/helper-simple-access-7.1.0"
       sources."@babel/helper-split-export-declaration-7.0.0"
-      sources."@babel/helper-wrap-function-7.1.0"
-      sources."@babel/helpers-7.1.5"
+      sources."@babel/helper-wrap-function-7.2.0"
+      sources."@babel/helpers-7.2.0"
       sources."@babel/highlight-7.0.0"
-      sources."@babel/parser-7.1.6"
-      sources."@babel/plugin-proposal-async-generator-functions-7.1.0"
-      sources."@babel/plugin-proposal-json-strings-7.0.0"
-      sources."@babel/plugin-proposal-object-rest-spread-7.0.0"
-      sources."@babel/plugin-proposal-optional-catch-binding-7.0.0"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.0.0"
-      sources."@babel/plugin-syntax-async-generators-7.0.0"
-      sources."@babel/plugin-syntax-flow-7.0.0"
-      sources."@babel/plugin-syntax-json-strings-7.0.0"
-      sources."@babel/plugin-syntax-jsx-7.0.0"
-      sources."@babel/plugin-syntax-object-rest-spread-7.0.0"
-      sources."@babel/plugin-syntax-optional-catch-binding-7.0.0"
-      sources."@babel/plugin-transform-arrow-functions-7.0.0"
-      sources."@babel/plugin-transform-async-to-generator-7.1.0"
-      sources."@babel/plugin-transform-block-scoped-functions-7.0.0"
-      sources."@babel/plugin-transform-block-scoping-7.1.5"
-      sources."@babel/plugin-transform-classes-7.1.0"
-      sources."@babel/plugin-transform-computed-properties-7.0.0"
-      sources."@babel/plugin-transform-destructuring-7.1.3"
-      sources."@babel/plugin-transform-dotall-regex-7.0.0"
-      sources."@babel/plugin-transform-duplicate-keys-7.0.0"
-      sources."@babel/plugin-transform-exponentiation-operator-7.1.0"
-      sources."@babel/plugin-transform-flow-strip-types-7.1.6"
-      sources."@babel/plugin-transform-for-of-7.0.0"
-      sources."@babel/plugin-transform-function-name-7.1.0"
-      sources."@babel/plugin-transform-literals-7.0.0"
-      sources."@babel/plugin-transform-modules-amd-7.1.0"
-      sources."@babel/plugin-transform-modules-commonjs-7.1.0"
-      sources."@babel/plugin-transform-modules-systemjs-7.1.3"
-      sources."@babel/plugin-transform-modules-umd-7.1.0"
+      sources."@babel/parser-7.2.0"
+      sources."@babel/plugin-proposal-async-generator-functions-7.2.0"
+      sources."@babel/plugin-proposal-json-strings-7.2.0"
+      sources."@babel/plugin-proposal-object-rest-spread-7.2.0"
+      sources."@babel/plugin-proposal-optional-catch-binding-7.2.0"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.2.0"
+      sources."@babel/plugin-syntax-async-generators-7.2.0"
+      sources."@babel/plugin-syntax-flow-7.2.0"
+      sources."@babel/plugin-syntax-json-strings-7.2.0"
+      sources."@babel/plugin-syntax-jsx-7.2.0"
+      sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
+      sources."@babel/plugin-syntax-optional-catch-binding-7.2.0"
+      sources."@babel/plugin-transform-arrow-functions-7.2.0"
+      sources."@babel/plugin-transform-async-to-generator-7.2.0"
+      sources."@babel/plugin-transform-block-scoped-functions-7.2.0"
+      sources."@babel/plugin-transform-block-scoping-7.2.0"
+      sources."@babel/plugin-transform-classes-7.2.0"
+      sources."@babel/plugin-transform-computed-properties-7.2.0"
+      sources."@babel/plugin-transform-destructuring-7.2.0"
+      sources."@babel/plugin-transform-dotall-regex-7.2.0"
+      sources."@babel/plugin-transform-duplicate-keys-7.2.0"
+      sources."@babel/plugin-transform-exponentiation-operator-7.2.0"
+      sources."@babel/plugin-transform-flow-strip-types-7.2.0"
+      sources."@babel/plugin-transform-for-of-7.2.0"
+      sources."@babel/plugin-transform-function-name-7.2.0"
+      sources."@babel/plugin-transform-literals-7.2.0"
+      sources."@babel/plugin-transform-modules-amd-7.2.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.2.0"
+      sources."@babel/plugin-transform-modules-systemjs-7.2.0"
+      sources."@babel/plugin-transform-modules-umd-7.2.0"
       sources."@babel/plugin-transform-new-target-7.0.0"
-      sources."@babel/plugin-transform-object-super-7.1.0"
-      sources."@babel/plugin-transform-parameters-7.1.0"
-      sources."@babel/plugin-transform-react-jsx-7.1.6"
+      sources."@babel/plugin-transform-object-super-7.2.0"
+      sources."@babel/plugin-transform-parameters-7.2.0"
+      sources."@babel/plugin-transform-react-jsx-7.2.0"
       sources."@babel/plugin-transform-regenerator-7.0.0"
-      sources."@babel/plugin-transform-shorthand-properties-7.0.0"
-      sources."@babel/plugin-transform-spread-7.0.0"
-      sources."@babel/plugin-transform-sticky-regex-7.0.0"
-      sources."@babel/plugin-transform-template-literals-7.0.0"
-      sources."@babel/plugin-transform-typeof-symbol-7.0.0"
-      sources."@babel/plugin-transform-unicode-regex-7.0.0"
-      sources."@babel/preset-env-7.1.6"
-      sources."@babel/runtime-7.1.5"
+      sources."@babel/plugin-transform-shorthand-properties-7.2.0"
+      sources."@babel/plugin-transform-spread-7.2.0"
+      sources."@babel/plugin-transform-sticky-regex-7.2.0"
+      sources."@babel/plugin-transform-template-literals-7.2.0"
+      sources."@babel/plugin-transform-typeof-symbol-7.2.0"
+      sources."@babel/plugin-transform-unicode-regex-7.2.0"
+      sources."@babel/preset-env-7.2.0"
+      sources."@babel/runtime-7.2.0"
       sources."@babel/template-7.1.2"
       sources."@babel/traverse-7.1.6"
-      sources."@babel/types-7.1.6"
+      sources."@babel/types-7.2.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
-      sources."@types/node-10.12.9"
+      sources."@types/node-10.12.12"
       sources."@types/semver-5.5.0"
       sources."abbrev-1.1.1"
       sources."acorn-5.7.3"
       sources."alphanum-sort-1.0.2"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
-      sources."ansi-to-html-0.6.8"
+      sources."ansi-to-html-0.6.9"
       sources."anymatch-2.0.0"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
@@ -53762,10 +53770,10 @@ in
       sources."browserify-sign-4.0.4"
       (sources."browserify-zlib-0.2.0" // {
         dependencies = [
-          sources."pako-1.0.6"
+          sources."pako-1.0.7"
         ];
       })
-      sources."browserslist-4.3.4"
+      sources."browserslist-4.3.5"
       sources."buffer-4.9.1"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
@@ -53777,8 +53785,8 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-db-1.0.30000907"
-      sources."caniuse-lite-1.0.30000907"
+      sources."caniuse-db-1.0.30000916"
+      sources."caniuse-lite-1.0.30000916"
       sources."chalk-2.4.1"
       sources."chokidar-2.0.4"
       sources."cipher-base-1.0.4"
@@ -53818,7 +53826,7 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.6.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."cosmiconfig-5.0.7"
       sources."create-ecdh-4.0.3"
@@ -53829,7 +53837,7 @@ in
       sources."css-color-names-0.0.4"
       (sources."css-declaration-sorter-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       sources."css-select-2.0.2"
@@ -53845,19 +53853,19 @@ in
       sources."cssesc-2.0.0"
       (sources."cssnano-4.1.7" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."cssnano-preset-default-4.0.5" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       sources."cssnano-util-get-arguments-4.0.0"
       sources."cssnano-util-get-match-4.0.0"
       (sources."cssnano-util-raw-cache-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       sources."cssnano-util-same-parent-4.0.1"
@@ -53906,7 +53914,7 @@ in
         ];
       })
       sources."domain-browser-1.2.0"
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
       sources."dot-prop-4.2.0"
@@ -53915,7 +53923,7 @@ in
       sources."duplexer2-0.1.4"
       sources."editorconfig-0.15.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.84"
+      sources."electron-to-chromium-1.3.88"
       sources."elliptic-6.4.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
@@ -53982,7 +53990,7 @@ in
         ];
       })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hex-color-regex-1.1.0"
       sources."hmac-drbg-1.0.1"
       sources."hsl-regex-1.0.0"
@@ -54112,7 +54120,7 @@ in
       sources."lodash.uniq-4.5.0"
       sources."log-symbols-2.2.0"
       sources."loose-envify-1.4.0"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."magic-string-0.22.5"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -54160,10 +54168,10 @@ in
         ];
       })
       sources."nice-try-1.0.5"
-      sources."node-addon-api-1.6.1"
+      sources."node-addon-api-1.6.2"
       sources."node-forge-0.7.6"
       sources."node-libs-browser-2.1.0"
-      sources."node-releases-1.0.3"
+      sources."node-releases-1.1.0"
       sources."nopt-4.0.1"
       sources."normalize-path-2.1.1"
       sources."normalize-range-0.1.2"
@@ -54203,37 +54211,37 @@ in
       sources."postcss-6.0.23"
       (sources."postcss-calc-7.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-colormin-4.0.2" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-convert-values-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-discard-comments-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-discard-duplicates-4.0.2" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-discard-empty-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-discard-overridden-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-discard-unused-2.2.3" // {
@@ -54283,85 +54291,85 @@ in
       })
       (sources."postcss-merge-longhand-4.0.9" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-merge-rules-4.0.2" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
           sources."postcss-selector-parser-3.1.1"
         ];
       })
       sources."postcss-message-helpers-2.0.0"
       (sources."postcss-minify-font-values-4.0.2" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-minify-gradients-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-minify-params-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-minify-selectors-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
           sources."postcss-selector-parser-3.1.1"
         ];
       })
       (sources."postcss-normalize-charset-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-display-values-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-positions-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-repeat-style-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-string-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-timing-functions-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-unicode-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-url-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-normalize-whitespace-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-ordered-values-4.1.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-reduce-idents-2.4.0" // {
@@ -54381,23 +54389,23 @@ in
       })
       (sources."postcss-reduce-initial-4.0.2" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-reduce-transforms-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       sources."postcss-selector-parser-5.0.0-rc.4"
       (sources."postcss-svgo-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       (sources."postcss-unique-selectors-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
         ];
       })
       sources."postcss-value-parser-3.3.1"
@@ -54455,9 +54463,9 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."regexpu-core-4.2.0"
-      sources."regjsgen-0.4.0"
-      (sources."regjsparser-0.3.0" // {
+      sources."regexpu-core-4.4.0"
+      sources."regjsgen-0.5.0"
+      (sources."regjsparser-0.6.0" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -54541,13 +54549,13 @@ in
       })
       (sources."stylehacks-4.0.1" // {
         dependencies = [
-          sources."postcss-7.0.5"
+          sources."postcss-7.0.6"
           sources."postcss-selector-parser-3.1.1"
         ];
       })
       sources."supports-color-5.5.0"
       sources."svgo-1.1.1"
-      (sources."terser-3.10.11" // {
+      (sources."terser-3.11.0" // {
         dependencies = [
           sources."commander-2.17.1"
         ];
@@ -54631,10 +54639,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.15.2";
+    version = "1.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.15.2.tgz";
-      sha512 = "YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.15.3.tgz";
+      sha512 = "gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -54838,7 +54846,7 @@ in
         ];
       })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
@@ -55021,7 +55029,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.3"
+      sources."sourcemap-codec-1.4.4"
       sources."split-string-3.1.0"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -55178,7 +55186,7 @@ in
       sources."cookie-0.3.1"
       sources."cookie-parser-1.4.3"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       (sources."dashdash-1.14.1" // {
@@ -55291,7 +55299,7 @@ in
       sources."negotiator-0.6.1"
       sources."net-browserify-alt-1.1.0"
       sources."node-abi-2.5.0"
-      sources."node.extend-2.0.1"
+      sources."node.extend-2.0.2"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
@@ -55554,7 +55562,7 @@ in
       sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
     };
     dependencies = [
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
@@ -55683,10 +55691,10 @@ in
   scuttlebot = nodeEnv.buildNodePackage {
     name = "scuttlebot";
     packageName = "scuttlebot";
-    version = "13.1.0";
+    version = "13.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.1.0.tgz";
-      sha512 = "wUP5ANKysTj9wSVjXLf0/+POSR+EBa7lbcQkMAKD529a3dt1/XUil5+2fez+ud02JCVvsZHRsFgyfV96f5TBqw==";
+      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.2.1.tgz";
+      sha512 = "Ehe2C7G987KLYqUZX5lek5nqRBU5z00cxvquQQJ+TW2k1HMJMZaXnk50/vFyrdmsJEDcFQtehWalG6xNnPJOvw==";
     };
     dependencies = [
       sources."abstract-leveldown-5.0.0"
@@ -55728,7 +55736,7 @@ in
       sources."bash-color-0.0.4"
       sources."binary-extensions-1.12.0"
       sources."binary-search-1.3.4"
-      sources."bindings-1.3.0"
+      sources."bindings-1.3.1"
       sources."bl-1.2.2"
       sources."blake2s-1.0.1"
       sources."brace-expansion-1.1.11"
@@ -55927,7 +55935,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hashlru-2.2.1"
+      sources."hashlru-2.3.0"
       sources."he-0.5.0"
       sources."heap-0.2.6"
       sources."hoox-0.0.1"
@@ -55986,7 +55994,7 @@ in
       sources."isobject-2.1.0"
       sources."json-buffer-2.0.11"
       sources."kind-of-3.2.2"
-      sources."layered-graph-1.1.1"
+      sources."layered-graph-1.1.2"
       sources."level-4.0.0"
       sources."level-codec-9.0.0"
       sources."level-errors-2.0.0"
@@ -56021,7 +56029,7 @@ in
         ];
       })
       sources."levelup-3.1.1"
-      sources."libnested-1.4.0"
+      sources."libnested-1.4.1"
       sources."libsodium-0.7.3"
       sources."libsodium-wrappers-0.7.3"
       sources."log-symbols-1.0.2"
@@ -56054,7 +56062,7 @@ in
       sources."monotonic-timestamp-0.0.9"
       sources."moo-0.4.3"
       sources."ms-2.0.0"
-      (sources."multiblob-1.13.1" // {
+      (sources."multiblob-1.13.2" // {
         dependencies = [
           sources."pull-file-0.5.0"
           sources."rimraf-2.2.8"
@@ -56093,7 +56101,7 @@ in
       sources."nearley-2.15.1"
       sources."nice-try-1.0.5"
       sources."node-abi-2.5.0"
-      sources."node-gyp-build-3.5.0"
+      sources."node-gyp-build-3.5.1"
       sources."nomnom-1.6.2"
       sources."non-private-ip-1.4.4"
       sources."noop-logger-0.1.1"
@@ -56161,6 +56169,7 @@ in
       sources."pull-abortable-4.0.0"
       sources."pull-box-stream-1.0.13"
       sources."pull-cat-1.1.11"
+      sources."pull-catch-1.0.0"
       sources."pull-cont-0.1.1"
       sources."pull-core-1.1.0"
       (sources."pull-cursor-3.0.0" // {
@@ -56370,27 +56379,27 @@ in
       sources."source-map-url-0.4.0"
       sources."split-buffer-1.0.0"
       sources."split-string-3.1.0"
-      sources."ssb-blobs-1.1.6"
+      sources."ssb-blobs-1.1.7"
       (sources."ssb-client-4.6.0" // {
         dependencies = [
           sources."multiserver-1.13.7"
         ];
       })
       sources."ssb-config-2.3.7"
-      sources."ssb-db-18.6.1"
+      sources."ssb-db-18.6.2"
       sources."ssb-ebt-5.2.7"
-      sources."ssb-friends-3.1.6"
+      sources."ssb-friends-3.1.7"
       sources."ssb-keys-7.1.3"
       sources."ssb-links-3.0.3"
       sources."ssb-msgs-5.2.0"
       (sources."ssb-query-2.3.0" // {
         dependencies = [
-          sources."flumeview-query-7.1.0"
+          sources."flumeview-query-7.1.1"
           sources."map-filter-reduce-3.2.2"
         ];
       })
-      sources."ssb-ref-2.13.6"
-      sources."ssb-validate-4.0.3"
+      sources."ssb-ref-2.13.8"
+      sources."ssb-validate-4.0.4"
       sources."ssb-ws-5.1.1"
       sources."stack-0.1.0"
       (sources."static-extend-0.1.2" // {
@@ -56580,7 +56589,7 @@ in
       sources."is-stream-1.1.0"
       sources."isexe-2.0.0"
       sources."json-schema-traverse-0.4.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
       sources."minimatch-3.0.4"
@@ -56644,7 +56653,7 @@ in
       sources."CSSwhat-0.4.7"
       sources."accepts-1.3.5"
       sources."after-0.8.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."array-flatten-1.1.1"
       sources."arraybuffer.slice-0.0.6"
       sources."asn1-0.2.4"
@@ -56683,7 +56692,7 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.2.1"
       sources."domutils-1.4.3"
       sources."duplexer-0.1.1"
@@ -56705,14 +56714,13 @@ in
       sources."entities-1.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."event-stream-3.3.6"
+      sources."event-stream-3.3.5"
       sources."express-4.16.4"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."finalhandler-1.1.1"
-      sources."flatmap-stream-0.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
@@ -57243,15 +57251,18 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.108.2";
+    version = "1.116.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.108.2.tgz";
-      sha512 = "VfSHSRj4ISWf4EfySTdAVqUWnDspoFUaGs4uGp7FIbjZb35+JPaQ/hqgWKcDal+ZwTtzQvxKAdPsB3WUCBoSKg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.116.0.tgz";
+      sha512 = "MIU4RTnlTda5xq8sqAvg9JS1zn1wip0IiF6kqnN9iS6+oKOgZWo5FTkC0pwBS4wqgFxHyDCg8ErG5/9RKK0RkA==";
     };
     dependencies = [
+      sources."@snyk/dep-graph-1.1.2"
+      sources."@snyk/gemfile-1.1.0"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-1.1.1"
       sources."agent-base-4.2.1"
+      sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -57259,15 +57270,23 @@ in
       sources."archy-1.0.0"
       sources."argparse-1.0.10"
       sources."asap-2.0.6"
-      sources."ast-types-0.11.6"
+      sources."ast-types-0.11.7"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."bytes-3.0.0"
       sources."camelcase-2.1.1"
+      sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.1"
       sources."chardet-0.4.2"
+      sources."ci-info-1.6.0"
+      sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       (sources."cliui-3.2.0" // {
@@ -57287,14 +57306,19 @@ in
       sources."configstore-3.1.2"
       sources."core-js-2.3.0"
       sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      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.6"
       sources."decamelize-1.2.0"
+      sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
       sources."depd-1.1.2"
+      sources."dockerfile-ast-0.0.12"
       sources."dot-prop-4.2.0"
+      sources."duplexer3-0.1.4"
       sources."email-validator-2.0.4"
       sources."es6-promise-4.2.5"
       sources."es6-promisify-5.0.0"
@@ -57303,6 +57327,7 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
+      sources."execa-0.7.0"
       sources."extend-3.0.2"
       sources."external-editor-2.2.0"
       sources."fast-levenshtein-2.0.6"
@@ -57315,12 +57340,15 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
+      sources."get-stream-3.0.0"
       (sources."get-uri-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
         ];
       })
+      sources."global-dirs-0.1.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
       sources."graphlib-2.1.5"
       sources."has-flag-3.0.0"
@@ -57336,6 +57364,7 @@ in
       sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.24"
       sources."immediate-3.0.6"
+      sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -57343,13 +57372,21 @@ in
       sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
+      sources."is-ci-1.2.1"
       sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-2.0.0"
+      sources."is-installed-globally-0.1.0"
+      sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
+      sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
       sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
+      sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       (sources."js-yaml-3.12.0" // {
         dependencies = [
@@ -57365,6 +57402,7 @@ in
         ];
       })
       sources."kind-of-3.2.2"
+      sources."latest-version-3.1.0"
       sources."lazy-cache-0.2.7"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -57377,11 +57415,13 @@ in
       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."lowercase-keys-1.0.1"
+      sources."lru-cache-4.1.5"
       sources."macos-release-1.1.0"
       sources."make-dir-1.3.0"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
       (sources."mixin-object-2.0.1" // {
         dependencies = [
           sources."for-in-0.1.8"
@@ -57397,6 +57437,7 @@ in
         ];
       })
       sources."netmask-1.0.6"
+      sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       sources."onetime-2.0.1"
       sources."opn-5.4.0"
@@ -57404,12 +57445,17 @@ in
       sources."os-locale-1.4.0"
       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-resolver-3.0.0"
-      sources."pako-1.0.6"
+      sources."package-json-4.0.1"
+      sources."pako-1.0.7"
       sources."path-0.12.7"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
       sources."pify-3.0.0"
       sources."prelude-ls-1.1.2"
+      sources."prepend-http-1.0.4"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."promise-7.3.1"
@@ -57421,6 +57467,7 @@ in
           sources."iconv-lite-0.4.23"
         ];
       })
+      sources."rc-1.2.8"
       (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -57428,6 +57475,8 @@ in
         ];
       })
       sources."recursive-readdir-2.2.2"
+      sources."registry-auth-token-3.3.2"
+      sources."registry-url-3.1.0"
       sources."restore-cursor-2.0.0"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
@@ -57437,21 +57486,24 @@ in
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
       sources."semver-5.6.0"
+      sources."semver-diff-2.1.0"
       sources."setprototypeof-1.1.0"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
           sources."kind-of-2.0.1"
         ];
       })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
       sources."snyk-config-2.2.0"
-      sources."snyk-docker-plugin-1.12.2"
+      sources."snyk-docker-plugin-1.13.1"
       sources."snyk-go-plugin-1.6.0"
       sources."snyk-gradle-plugin-2.1.1"
       sources."snyk-module-1.9.1"
       sources."snyk-mvn-plugin-2.0.0"
-      (sources."snyk-nodejs-lockfile-parser-1.7.0" // {
+      (sources."snyk-nodejs-lockfile-parser-1.9.0" // {
         dependencies = [
           sources."lodash-4.17.10"
         ];
@@ -57474,12 +57526,16 @@ in
       sources."string-width-2.1.1"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-4.0.0"
+      sources."strip-eof-1.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."term-size-1.2.0"
       sources."then-fs-2.0.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
+      sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
       sources."toml-2.3.3"
       sources."tslib-1.9.3"
@@ -57492,9 +57548,15 @@ in
       })
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
+      sources."unzip-response-2.0.1"
+      sources."update-notifier-2.5.0"
+      sources."url-parse-lax-1.0.0"
       sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
+      sources."vscode-languageserver-types-3.13.0"
+      sources."which-1.3.1"
+      sources."widest-line-2.0.1"
       sources."win-release-1.1.1"
       sources."window-size-0.1.4"
       sources."wordwrap-1.0.0"
@@ -57534,10 +57596,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.1.1";
+    version = "2.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz";
-      sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
+      sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -57554,9 +57616,19 @@ in
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."cookie-0.3.1"
-      sources."debug-3.1.0"
-      sources."engine.io-3.2.1"
-      sources."engine.io-client-3.2.1"
+      sources."debug-4.1.0"
+      (sources."engine.io-3.3.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."engine.io-client-3.3.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."engine.io-parser-2.1.3"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
@@ -57564,18 +57636,26 @@ in
       sources."isarray-2.0.1"
       sources."mime-db-1.37.0"
       sources."mime-types-2.1.21"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       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.1.1"
-      sources."socket.io-parser-3.2.0"
+      (sources."socket.io-client-2.2.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."socket.io-parser-3.3.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."to-array-0.1.4"
-      sources."ultron-1.1.1"
-      sources."ws-3.3.3"
+      sources."ws-6.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -57634,7 +57714,7 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-1.1.2"
       sources."es-abstract-1.12.0"
@@ -57781,12 +57861,12 @@ 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-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-5.1.0" // {
         dependencies = [
-          sources."lru-cache-4.1.3"
+          sources."lru-cache-4.1.5"
         ];
       })
       sources."crypt-0.0.2"
@@ -57808,7 +57888,6 @@ in
       })
       sources."diff-1.4.0"
       sources."dot-prop-4.2.0"
-      sources."duplexer-0.1.1"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -57816,7 +57895,6 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
-      sources."event-stream-3.3.6"
       sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
       (sources."expand-brackets-2.1.4" // {
@@ -57855,13 +57933,11 @@ in
         ];
       })
       sources."finalhandler-1.1.0"
-      sources."flatmap-stream-0.1.2"
       sources."for-in-1.0.2"
       sources."form-data-2.3.3"
       sources."formidable-1.2.1"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
-      sources."from-0.1.7"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
@@ -57997,7 +58073,6 @@ in
       sources."lru-cache-2.7.3"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."md5-2.2.1"
       sources."media-typer-0.3.0"
@@ -58029,7 +58104,7 @@ in
       sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
-      (sources."nodemon-1.18.6" // {
+      (sources."nodemon-1.18.7" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.1"
@@ -58072,7 +58147,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.1"
-          sources."qs-6.5.2"
+          sources."qs-6.6.0"
           sources."superagent-3.8.3"
         ];
       })
@@ -58081,14 +58156,12 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."pause-stream-0.0.11"
       sources."pify-3.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
-      sources."pstree.remy-1.1.0"
+      sources."pstree.remy-1.1.2"
       sources."punycode-2.1.1"
       sources."qs-4.0.0"
       sources."range-parser-1.2.0"
@@ -58174,7 +58247,6 @@ in
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spark-md5-1.0.1"
-      sources."split-1.0.1"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
       (sources."static-extend-0.1.2" // {
@@ -58195,7 +58267,6 @@ in
         ];
       })
       sources."statuses-1.3.1"
-      sources."stream-combiner-0.2.2"
       sources."streamsearch-0.1.2"
       sources."string-3.3.3"
       (sources."string-width-2.1.1" // {
@@ -58299,7 +58370,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
-      sources."z-schema-3.24.1"
+      sources."z-schema-3.24.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -58345,7 +58416,7 @@ in
       sources."resolve-from-2.0.0"
       sources."safe-buffer-5.1.2"
       sources."string_decoder-1.1.1"
-      sources."tapable-0.2.8"
+      sources."tapable-0.2.9"
       sources."util-deprecate-1.0.2"
       sources."wrappy-1.0.2"
     ];
@@ -58361,10 +58432,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.98.0";
+    version = "0.99.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.98.0.tgz";
-      sha512 = "fihjYVjCmQbI03zt1+YCl/m+UrZCcDHFNLexgqBOIdPwnO6PYkQaYUsIbqtvNNse+BiMeu+pQWzZn9/NSnIv6A==";
+      url = "https://registry.npmjs.org/three/-/three-0.99.0.tgz";
+      sha512 = "DmNNq6H6nRGaqxScJ8x7v5VjdtDZR72oTVwDdKbB2BYNFxCkAoo9vdFAznEsMu9YzTV2yFvbVs7qHRzvJZzTIg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -58378,10 +58449,10 @@ in
   tiddlywiki = nodeEnv.buildNodePackage {
     name = "tiddlywiki";
     packageName = "tiddlywiki";
-    version = "5.1.17";
+    version = "5.1.18";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.17.tgz";
-      sha1 = "bd3311146ba67fb4beee9933dd2e6d55e92665ed";
+      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.18.tgz";
+      sha512 = "BJqn9kgnexliEEH40DfArmbuXnQIXUWs5DCxwhCd80zJwqxJJ/HlI7rW7dD6KSht4oVtPg/QQvOw84EmqMOHTA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -58461,7 +58532,7 @@ in
           sources."extsprintf-1.3.0"
         ];
       })
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."lstream-0.0.4"
       sources."mime-1.6.0"
       sources."minimatch-3.0.4"
@@ -58600,15 +58671,15 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.1.6";
+    version = "3.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz";
-      sha512 = "tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz";
+      sha512 = "jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "TypeScript is a language for application scale JavaScript development";
-      homepage = http://typescriptlang.org/;
+      homepage = https://www.typescriptlang.org/;
       license = "Apache-2.0";
     };
     production = true;
@@ -58647,7 +58718,7 @@ in
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."after-0.8.2"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       (sources."are-we-there-yet-1.1.5" // {
@@ -58863,7 +58934,7 @@ in
       sources."locate-path-3.0.0"
       sources."locks-0.2.2"
       sources."lodash-4.17.11"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."map-age-cleaner-0.1.3"
       sources."media-typer-0.3.0"
       sources."mem-4.0.0"
@@ -58991,7 +59062,7 @@ in
           sources."isarray-2.0.1"
         ];
       })
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -59013,10 +59084,10 @@ in
           sources."delayed-stream-1.0.0"
           sources."form-data-2.3.3"
           sources."formidable-1.2.1"
-          sources."mime-2.3.1"
+          sources."mime-2.4.0"
           sources."ms-2.1.1"
           sources."readable-stream-3.0.6"
-          sources."string_decoder-1.1.1"
+          sources."string_decoder-1.2.0"
         ];
       })
       (sources."temp-0.8.3" // {
@@ -59062,7 +59133,7 @@ in
       sources."xmlhttprequest-ssl-1.5.5"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-12.0.4" // {
+      (sources."yargs-12.0.5" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
@@ -59070,7 +59141,7 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."yargs-parser-11.1.0"
+      sources."yargs-parser-11.1.1"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -59092,7 +59163,7 @@ in
     };
     dependencies = [
       sources."absolute-0.0.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-escapes-3.1.0"
       sources."ansi-red-0.1.1"
       sources."ansi-regex-3.0.0"
@@ -59211,7 +59282,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-6.2.0"
+      sources."inquirer-6.2.1"
       sources."is-3.2.1"
       sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -59305,9 +59376,17 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.15.2"
       sources."stat-mode-0.2.2"
-      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-dirs-2.1.0"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.5.0"
@@ -59367,17 +59446,17 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "3.1.3";
+    version = "3.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.1.3.tgz";
-      sha512 = "n2K36rlDioPKnJPVdtIt8GebwalkooGUdWYRmDO/qXB7q5izDoSlg3T6LMTjUeQW9GoHheSslUUUa0cYccDJLg==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.2.1.tgz";
+      sha512 = "40UjvK94VDlmQMqJwrGuZ7U7N1x2Wa6xK02yXn+030X4F04YZFUc5s3mF9NUSdxstp1bsMnOBFAXOlAdoz8ukw==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollographql/apollo-tools-0.2.7"
+      sources."@apollographql/apollo-tools-0.2.8"
       sources."@apollographql/apollo-upload-server-5.0.3"
-      sources."@apollographql/graphql-playground-html-1.6.4"
-      sources."@babel/runtime-corejs2-7.1.5"
+      sources."@apollographql/graphql-playground-html-1.6.6"
+      sources."@babel/runtime-corejs2-7.2.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@protobufjs/aspromise-1.1.2"
@@ -59400,56 +59479,73 @@ 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.12.9"
+      sources."@types/node-10.12.12"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-6.0.1"
       sources."@types/zen-observable-0.8.0"
-      sources."@vue/cli-shared-utils-3.1.1"
-      (sources."@vue/cli-ui-3.1.2" // {
+      sources."@vue/cli-shared-utils-3.2.0"
+      (sources."@vue/cli-ui-3.2.1" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-3.1.2"
-      sources."@vue/cli-ui-addon-widgets-3.1.2"
+      sources."@vue/cli-ui-addon-webpack-3.2.1"
+      sources."@vue/cli-ui-addon-widgets-3.2.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."aggregate-error-1.0.0"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-2.0.0"
-      sources."apollo-cache-1.1.20"
-      sources."apollo-cache-control-0.3.2"
-      sources."apollo-cache-inmemory-1.3.10"
-      sources."apollo-client-2.4.6"
-      sources."apollo-datasource-0.2.0"
-      sources."apollo-engine-reporting-0.1.2"
-      sources."apollo-engine-reporting-protobuf-0.1.0"
-      (sources."apollo-env-0.2.4" // {
+      sources."apollo-cache-1.1.21"
+      (sources."apollo-cache-control-0.3.3" // {
         dependencies = [
-          sources."core-js-3.0.0-beta.3"
+          sources."graphql-extensions-0.3.3"
         ];
       })
-      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-cache-inmemory-1.3.11"
+      sources."apollo-client-2.4.7"
+      sources."apollo-datasource-0.2.1"
+      (sources."apollo-engine-reporting-0.1.3" // {
+        dependencies = [
+          sources."graphql-extensions-0.3.3"
+        ];
+      })
+      sources."apollo-engine-reporting-protobuf-0.1.0"
+      (sources."apollo-env-0.2.5" // {
+        dependencies = [
+          sources."core-js-3.0.0-beta.4"
+        ];
+      })
+      sources."apollo-link-1.2.4"
+      sources."apollo-link-context-1.0.10"
+      sources."apollo-link-dedup-1.0.11"
+      sources."apollo-link-http-common-0.2.6"
       sources."apollo-link-persisted-queries-0.2.2"
       sources."apollo-link-state-0.4.2"
-      sources."apollo-link-ws-1.0.9"
-      sources."apollo-server-caching-0.2.0"
-      sources."apollo-server-core-2.2.2"
+      sources."apollo-link-ws-1.0.10"
+      (sources."apollo-server-caching-0.2.1" // {
+        dependencies = [
+          sources."lru-cache-5.1.1"
+          sources."yallist-3.0.3"
+        ];
+      })
+      sources."apollo-server-core-2.2.6"
       sources."apollo-server-env-2.2.0"
       sources."apollo-server-errors-2.2.0"
-      sources."apollo-server-express-2.2.2"
-      sources."apollo-server-plugin-base-0.1.2"
-      sources."apollo-tracing-0.3.2"
+      sources."apollo-server-express-2.2.6"
+      sources."apollo-server-plugin-base-0.1.6"
+      (sources."apollo-tracing-0.3.3" // {
+        dependencies = [
+          sources."graphql-extensions-0.3.3"
+        ];
+      })
       sources."apollo-upload-client-9.1.0"
-      sources."apollo-utilities-1.0.25"
+      sources."apollo-utilities-1.0.26"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -59557,7 +59653,7 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
       sources."create-error-class-3.0.2"
@@ -59617,7 +59713,6 @@ in
         ];
       })
       sources."download-git-repo-1.1.0"
-      sources."duplexer-0.1.1"
       sources."duplexer3-0.1.4"
       sources."easy-stack-1.0.0"
       sources."ecc-jsbn-0.1.2"
@@ -59626,6 +59721,7 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
+      sources."envinfo-5.12.1"
       sources."es-abstract-1.12.0"
       sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
@@ -59634,7 +59730,6 @@ in
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
       sources."event-pubsub-4.3.0"
-      sources."event-stream-3.3.6"
       sources."eventemitter3-3.1.0"
       sources."exec-sh-0.2.2"
       (sources."execa-1.0.0" // {
@@ -59702,14 +59797,12 @@ in
           sources."execa-0.10.0"
         ];
       })
-      sources."flatmap-stream-0.1.2"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
-      sources."from-0.1.7"
       sources."from2-2.3.0"
       sources."fs-constants-1.0.0"
       sources."fs-exists-sync-0.1.0"
@@ -59744,8 +59837,8 @@ in
       sources."graceful-fs-4.1.15"
       sources."graceful-readlink-1.0.1"
       sources."graphql-14.0.2"
-      sources."graphql-anywhere-4.1.22"
-      sources."graphql-extensions-0.3.2"
+      sources."graphql-anywhere-4.1.23"
+      sources."graphql-extensions-0.3.6"
       sources."graphql-subscriptions-1.0.0"
       sources."graphql-tag-2.10.0"
       sources."graphql-tools-4.0.3"
@@ -59764,7 +59857,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hoek-5.0.4"
       sources."homedir-polyfill-1.0.1"
       sources."http-errors-1.6.3"
@@ -59781,7 +59874,12 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-6.2.0"
+      (sources."inquirer-6.2.1" // {
+        dependencies = [
+          sources."ansi-regex-4.0.0"
+          sources."strip-ansi-5.0.0"
+        ];
+      })
       sources."into-stream-2.0.1"
       sources."ipaddr.js-1.8.0"
       sources."is-accessor-descriptor-1.0.0"
@@ -59851,11 +59949,10 @@ in
       sources."long-4.0.0"
       sources."lowdb-1.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."make-error-1.3.5"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
       sources."merge-1.2.1"
@@ -59906,7 +60003,7 @@ in
       sources."node-fetch-2.3.0"
       sources."node-ipc-9.1.1"
       sources."node-notifier-5.3.0"
-      sources."nodemon-1.18.6"
+      sources."nodemon-1.18.7"
       sources."nopt-1.0.10"
       sources."normalize-path-2.1.1"
       sources."npm-conf-1.1.3"
@@ -59951,7 +60048,6 @@ in
       sources."path-parse-1.0.6"
       sources."path-to-regexp-0.1.7"
       sources."path-type-3.0.0"
-      sources."pause-stream-0.0.11"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       (sources."pid-from-port-1.1.3" // {
@@ -59963,7 +60059,7 @@ in
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      (sources."portfinder-1.0.19" // {
+      (sources."portfinder-1.0.20" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -59978,10 +60074,9 @@ in
       sources."protobufjs-6.8.8"
       sources."proxy-addr-2.0.4"
       sources."ps-list-4.1.0"
-      sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
       sources."psl-1.1.29"
-      sources."pstree.remy-1.1.0"
+      sources."pstree.remy-1.1.2"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -60016,7 +60111,7 @@ in
       sources."ret-0.1.15"
       sources."retry-0.12.0"
       sources."rimraf-2.6.2"
-      sources."rss-parser-3.5.3"
+      sources."rss-parser-3.5.4"
       sources."run-async-2.3.0"
       sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.2"
@@ -60084,7 +60179,6 @@ in
         ];
       })
       sources."source-map-url-0.4.0"
-      sources."split-1.0.1"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -60114,7 +60208,6 @@ in
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."steno-0.4.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"
@@ -60148,7 +60241,6 @@ in
           sources."execa-0.7.0"
         ];
       })
-      sources."terminate-2.1.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."timed-out-4.0.1"
@@ -60169,7 +60261,7 @@ in
       sources."to-regex-range-2.1.1"
       (sources."topo-3.0.3" // {
         dependencies = [
-          sources."hoek-6.0.3"
+          sources."hoek-6.1.2"
         ];
       })
       sources."touch-3.1.0"
@@ -60223,8 +60315,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.17.4"
-      sources."vue-cli-version-marker-3.1.2"
+      sources."vue-cli-plugin-apollo-0.18.1"
       sources."watch-1.0.2"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
@@ -60245,7 +60336,7 @@ in
       sources."yauzl-2.10.0"
       sources."yn-2.0.0"
       sources."zen-observable-0.8.11"
-      sources."zen-observable-ts-0.8.10"
+      sources."zen-observable-ts-0.8.11"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -60374,11 +60465,11 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
-      sources."@babel/generator-7.1.6"
+      sources."@babel/generator-7.2.0"
       sources."@babel/highlight-7.0.0"
-      sources."@babel/parser-7.1.6"
+      sources."@babel/parser-7.2.0"
       sources."@babel/template-7.1.2"
-      sources."@babel/types-7.1.6"
+      sources."@babel/types-7.2.0"
       sources."@webassemblyjs/ast-1.7.11"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.11"
       sources."@webassemblyjs/helper-api-error-1.7.11"
@@ -60449,10 +60540,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.25.1";
+    version = "4.27.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.25.1.tgz";
-      sha512 = "T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.27.1.tgz";
+      sha512 = "WArHiLvHrlfyRM8i7f+2SFbr/XbQ0bXqTkPF8JpHOzub5482Y3wx7rEO8stuLGOKOgZJcqcisLhD7LrM/+fVMw==";
     };
     dependencies = [
       sources."@webassemblyjs/ast-1.7.11"
@@ -60477,7 +60568,8 @@ in
       sources."@xtuc/long-4.2.1"
       sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
+      sources."ajv-errors-1.0.0"
       sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
@@ -60523,7 +60615,7 @@ in
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-10.0.4"
+      sources."cacache-11.3.1"
       sources."cache-base-1.0.1"
       sources."chokidar-2.0.4"
       sources."chownr-1.1.1"
@@ -60547,7 +60639,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."commander-2.14.1"
+      sources."commander-2.17.1"
       sources."commondir-1.0.1"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -60611,13 +60703,14 @@ in
       })
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
+      sources."figgy-pudding-3.5.1"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."find-cache-dir-1.0.0"
-      sources."find-up-2.1.0"
+      sources."find-cache-dir-2.0.0"
+      sources."find-up-3.0.0"
       sources."flush-write-stream-1.0.3"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
@@ -60640,7 +60733,7 @@ in
         ];
       })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.5"
+      sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.12"
@@ -60672,9 +60765,9 @@ in
       sources."kind-of-6.0.2"
       sources."loader-runner-2.3.1"
       sources."loader-utils-1.1.0"
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash.debounce-4.0.8"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -60686,7 +60779,7 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."mississippi-2.0.0"
+      sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.1" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -60721,10 +60814,10 @@ in
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
-      sources."pako-1.0.6"
+      sources."p-limit-2.0.0"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.0.0"
+      sources."pako-1.0.7"
       sources."parallel-transform-1.1.0"
       sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
@@ -60734,7 +60827,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."pbkdf2-3.0.17"
       sources."pify-3.0.0"
-      sources."pkg-dir-2.0.0"
+      sources."pkg-dir-3.0.0"
       sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
@@ -60742,8 +60835,12 @@ in
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
       sources."public-encrypt-4.0.3"
-      sources."pump-2.0.1"
-      sources."pumpify-1.5.1"
+      sources."pump-3.0.0"
+      (sources."pumpify-1.5.1" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
       sources."punycode-2.1.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -60802,9 +60899,14 @@ in
       sources."source-list-map-2.0.1"
       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-string-3.1.0"
-      sources."ssri-5.3.0"
+      sources."ssri-6.0.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -60827,7 +60929,18 @@ in
       sources."stream-http-2.8.3"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
-      sources."tapable-1.1.0"
+      sources."tapable-1.1.1"
+      (sources."terser-3.11.0" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."terser-webpack-plugin-1.1.0" // {
+        dependencies = [
+          sources."schema-utils-1.0.0"
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."through2-2.0.5"
       sources."timers-browserify-2.0.10"
       sources."to-arraybuffer-1.0.1"
@@ -60841,16 +60954,6 @@ in
       sources."tslib-1.9.3"
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
-      (sources."uglify-es-3.3.10" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
-      (sources."uglifyjs-webpack-plugin-1.3.0" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
       (sources."union-value-1.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -61051,7 +61154,7 @@ in
         ];
       })
       sources."memory-chunk-store-1.3.0"
-      sources."mime-2.3.1"
+      sources."mime-2.4.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -61224,7 +61327,7 @@ in
       })
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.12.9"
+      sources."@types/node-10.12.12"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
@@ -61265,11 +61368,13 @@ in
         dependencies = [
           sources."async-2.6.1"
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       (sources."archiver-utils-1.3.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."archy-1.0.0"
@@ -61290,7 +61395,7 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."ast-types-0.11.6"
+      sources."ast-types-0.11.7"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
@@ -61322,6 +61427,7 @@ in
       (sources."bl-1.2.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."bluebird-2.9.34"
@@ -61397,22 +61503,25 @@ in
       (sources."compress-commons-1.2.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."configstore-3.1.2"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       (sources."crc32-stream-2.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."create-error-class-3.0.2"
@@ -61454,7 +61563,7 @@ in
           sources."p-try-2.0.0"
           sources."pino-5.8.1"
           sources."source-map-support-0.5.9"
-          sources."yargs-12.0.4"
+          sources."yargs-12.0.5"
         ];
       })
       sources."doctrine-2.1.0"
@@ -61463,7 +61572,7 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."domelementtype-1.3.0"
+      sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."dot-prop-4.2.0"
@@ -61587,7 +61696,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.3.0"
+      sources."fast-redact-1.4.0"
       sources."fast-safe-stringify-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
@@ -61608,10 +61717,11 @@ in
       (sources."first-chunk-stream-2.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."flat-cache-1.3.4"
-      sources."flatstr-1.0.8"
+      sources."flatstr-1.0.9"
       sources."fluent-syntax-0.7.0"
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
@@ -61646,6 +61756,7 @@ in
       (sources."get-uri-2.0.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."get-value-2.0.6"
@@ -61673,7 +61784,7 @@ in
       sources."har-schema-2.0.0"
       (sources."har-validator-5.1.3" // {
         dependencies = [
-          sources."ajv-6.5.5"
+          sources."ajv-6.6.1"
         ];
       })
       sources."has-1.0.3"
@@ -61821,6 +61932,7 @@ in
       (sources."lazystream-1.0.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."lcid-2.0.0"
@@ -61852,7 +61964,7 @@ in
       sources."lodash.set-4.3.2"
       sources."lodash.sortby-4.7.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."macos-release-1.1.0"
       sources."make-dir-1.3.0"
       sources."map-age-cleaner-0.1.3"
@@ -61978,7 +62090,7 @@ in
       })
       sources."pac-resolver-3.0.0"
       sources."package-json-4.0.1"
-      sources."pako-1.0.6"
+      sources."pako-1.0.7"
       sources."parse-json-4.0.0"
       sources."parse5-3.0.3"
       sources."pascalcase-0.1.1"
@@ -62016,7 +62128,7 @@ in
       sources."probe-image-size-4.0.0"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
-      sources."progress-2.0.1"
+      sources."progress-2.0.3"
       sources."promise-7.3.1"
       (sources."proxy-agent-2.3.1" // {
         dependencies = [
@@ -62048,6 +62160,7 @@ in
       (sources."readdirp-2.2.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       (sources."readline2-1.0.1" // {
@@ -62243,13 +62356,13 @@ in
       })
       sources."socks-1.1.10"
       sources."socks-proxy-agent-3.0.1"
-      sources."sonic-boom-0.6.2"
+      sources."sonic-boom-0.6.3"
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.2"
       sources."source-map-support-0.5.3"
       sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
-      sources."spdx-correct-3.0.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -62291,7 +62404,7 @@ in
         ];
       })
       sources."string.prototype.matchall-2.0.0"
-      sources."string_decoder-1.1.1"
+      sources."string_decoder-1.2.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-bom-buf-1.0.0"
@@ -62304,6 +62417,7 @@ in
       (sources."tar-stream-1.6.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."temp-dir-1.0.0"
@@ -62416,7 +62530,7 @@ in
           sources."yargs-parser-4.2.1"
         ];
       })
-      (sources."yargs-parser-11.1.0" // {
+      (sources."yargs-parser-11.1.1" // {
         dependencies = [
           sources."camelcase-5.0.0"
           sources."decamelize-1.2.0"
@@ -62432,6 +62546,7 @@ in
       (sources."zip-stream-1.2.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
     ];
@@ -62491,7 +62606,7 @@ in
       sources."@nodelib/fs.stat-1.1.3"
       sources."@sindresorhus/is-0.7.0"
       sources."aggregate-error-1.0.0"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-0.3.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
@@ -62701,7 +62816,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
-      sources."global-tunnel-ng-2.6.0"
+      sources."global-tunnel-ng-2.7.1"
       sources."globby-8.0.1"
       sources."got-8.3.2"
       sources."graceful-fs-4.1.15"
@@ -62735,13 +62850,14 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-6.2.0"
+      sources."inquirer-6.2.1"
       (sources."insight-0.10.1" // {
         dependencies = [
           sources."chardet-0.4.2"
           sources."external-editor-2.2.0"
           sources."inquirer-5.2.0"
           sources."rxjs-5.5.12"
+          sources."strip-ansi-4.0.0"
         ];
       })
       sources."into-stream-3.1.0"
@@ -62819,7 +62935,7 @@ in
       sources."log-symbols-2.2.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.3"
+      sources."lru-cache-4.1.5"
       sources."macos-release-1.1.0"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
@@ -62971,7 +63087,12 @@ in
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
       sources."replace-ext-0.0.1"
-      sources."request-2.88.0"
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+          sources."tough-cookie-2.4.3"
+        ];
+      })
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -63032,7 +63153,7 @@ 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.2"
+      sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.2"
@@ -63056,10 +63177,22 @@ in
         ];
       })
       sources."strict-uri-encode-1.1.0"
-      sources."string-length-2.0.0"
-      sources."string-width-2.1.1"
+      (sources."string-length-2.0.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      (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-bom-2.0.0"
       sources."strip-bom-stream-2.0.0"
       sources."strip-eof-1.0.0"
@@ -63116,14 +63249,10 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."trim-newlines-1.0.0"
       sources."tslib-1.9.3"
-      sources."tunnel-0.0.5"
+      sources."tunnel-0.0.6"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twig-1.12.0"
@@ -63192,6 +63321,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.1"
+          sources."strip-ansi-4.0.0"
         ];
       })
       (sources."yosay-2.0.2" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index cd0c1596915..45144618546 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -13,13 +13,13 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "ajv-6.5.5" = {
+    "ajv-6.6.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.5.5";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz";
-        sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
+        sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -1854,7 +1854,7 @@ let
       packageName = "string_decoder";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
@@ -2065,13 +2065,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "yallist-3.0.2" = {
+    "yallist-3.0.3" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
+        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
       };
     };
   };
@@ -2082,7 +2082,7 @@ in
     packageName = "bower";
     version = "1.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+      url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
       sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
     };
     buildInputs = globalBuildInputs;
@@ -2391,7 +2391,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -2502,10 +2502,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.5.0";
+    version = "3.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
-      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
+      sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -2592,7 +2592,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.2"
+      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -2606,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.18.2";
+    version = "2.20.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.18.2.tgz";
-      sha512 = "yJu5pCPFmzxD9xQtWay4nI7JdcrpIIom/VwwMmUvU6itN0wAbbyIaGKz57JCu1E+ZfbOvcaOzEmifbypHfFNXw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
+      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index e5717d00dbe..8260493dbaf 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -40,13 +40,13 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ajv-6.5.5" = {
+    "ajv-6.6.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.5.5";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz";
-        sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
+        sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -589,13 +589,13 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "core-js-2.5.7" = {
+    "core-js-2.6.0" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.5.7";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
-        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz";
+        sha512 = "kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2664,7 +2664,7 @@ let
       packageName = "string_decoder";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
@@ -2772,7 +2772,7 @@ let
       packageName = "tough-cookie";
       version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
         sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
       };
     };
@@ -2835,7 +2835,7 @@ let
       packageName = "underscore";
       version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
         sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     };
@@ -2929,13 +2929,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "walk-sync-0.3.3" = {
+    "walk-sync-0.3.4" = {
       name = "walk-sync";
       packageName = "walk-sync";
-      version = "0.3.3";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.3.tgz";
-        sha512 = "jQgTHmCazUngGqvHZFlr30u2VLKEKErBMLFe+fBl5mn4rh9aI/QVRog8PT1hv2vaOu4EBwigfmpRTyZrbnpRVA==";
+        url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz";
+        sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==";
       };
     };
     "which-1.3.1" = {
@@ -3010,13 +3010,13 @@ let
         sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
-    "yallist-3.0.2" = {
+    "yallist-3.0.3" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
+        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
       };
     };
   };
@@ -3025,10 +3025,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.13.4";
+    version = "1.13.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.4.tgz";
-      sha512 = "EjH9edCzDZzUFj5Cko6Za/nd9pQsxwL/kza+EI8sfH0UFA8YYuFBriOITnE/T9E4bJC3kEJEakGKaag0CcGWbw==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.5.tgz";
+      sha512 = "derWDIwsSR9Iq6XOU2LOoRztJ/6M6CegjoOiehXe97ifLbBuFaGaNAtbWKSwCWKw05YCV0ifsV5nA3cFUrbdOQ==";
     };
     dependencies = [
       sources."JSV-4.0.2"
@@ -3063,7 +3063,7 @@ in
       sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
-      sources."core-js-2.5.7"
+      sources."core-js-2.6.0"
       sources."debug-2.6.9"
       sources."detect-indent-4.0.0"
       sources."ejs-2.5.7"
@@ -3141,7 +3141,7 @@ in
       sources."trim-right-1.0.1"
       sources."underscore-1.6.0"
       sources."universalify-0.1.2"
-      sources."walk-sync-0.3.3"
+      sources."walk-sync-0.3.4"
       sources."which-1.3.1"
       sources."xml2js-0.2.8"
       sources."xml2tss-0.0.5"
@@ -3161,7 +3161,7 @@ in
     packageName = "bower";
     version = "1.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+      url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
       sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
     };
     buildInputs = globalBuildInputs;
@@ -3470,7 +3470,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -3581,10 +3581,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.5.0";
+    version = "3.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
-      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
+      sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -3671,7 +3671,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.2"
+      sources."yallist-3.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3685,10 +3685,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.18.2";
+    version = "2.20.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.18.2.tgz";
-      sha512 = "yJu5pCPFmzxD9xQtWay4nI7JdcrpIIom/VwwMmUvU6itN0wAbbyIaGKz57JCu1E+ZfbOvcaOzEmifbypHfFNXw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
+      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -3709,7 +3709,7 @@ in
     };
     dependencies = [
       sources."adm-zip-0.4.11"
-      sources."ajv-6.5.5"
+      sources."ajv-6.6.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"

From 1beff36b2f86198bf8963ff1d48e8a5c3635de7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Thu, 6 Dec 2018 11:41:59 -0600
Subject: [PATCH 1463/2793] hydron: 2018-09-25 -> 2018-10-08

---
 pkgs/servers/hydron/default.nix |  6 +++---
 pkgs/servers/hydron/deps.nix    | 34 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 012b66e1980..c96eed7a57b 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-09-25";
+  version = "2018-10-08";
   goPackagePath = "github.com/bakape/hydron";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "bakape";
     repo = "hydron";
-    rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c";
-    sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca";
+    rev = "0a834bcaf9af3a6bac8873fad981aa3736115258";
+    sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
index b2c367cf42d..92ac9a8325d 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/pkgs/servers/hydron/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/Masterminds/squirrel";
     fetch = {
       type = "git";
       url = "https://github.com/Masterminds/squirrel";
-      rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83";
-      sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h";
+      rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
+      sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
     };
   }
   {
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bakape/thumbnailer";
-      rev = "326c44736983c316d20c036ce34ca79ce9b96b01";
-      sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk";
+      rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
+      sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dimfeld/httptreemux";
-      rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5";
-      sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj";
+      rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
+      sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/handlers";
-      rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de";
-      sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38";
+      rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
+      sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
     };
   }
   {
@@ -59,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
-      sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
+      rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee";
+      sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10";
     };
   }
   {
@@ -68,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-sqlite3";
-      rev = "e85a2792f3166972d6619b7051f01a2df254192a";
-      sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd";
+      rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
+      sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/quicktemplate";
-      rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be";
-      sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6";
+      rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
+      sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056";
-      sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd";
+      rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
+      sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
     };
   }
 ]

From 531db1a8fadfe026bcc6dd7538b22893f07e5249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Thu, 6 Dec 2018 11:45:45 -0600
Subject: [PATCH 1464/2793] meguca: 2018-08-13 -> 2018-12-06

---
 pkgs/servers/meguca/default.nix     |  12 +--
 pkgs/servers/meguca/server_deps.nix | 151 +++++++++++++++-------------
 2 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index f6f4ee2e121..504df8bae0c 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -1,27 +1,27 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript
-, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }:
+, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }:
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-08-13";
+  version = "2018-12-06";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
 
   src = fetchFromGitHub {
     owner = "bakape";
     repo = "meguca";
-    rev = "f8b54370ba74b90f2814e6b42ac003a51fe02ce9";
-    sha256 = "1036qlvvz0la3fp514kw5qrplm1zsh23ywn2drigniacmqz4m7dv";
+    rev = "300b007cab238838f813faa9aad6abb3f22ad4d2";
+    sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9";
     fetchSubmodules = true;
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ];
+  buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ];
 
   buildPhase = ''
     export HOME=`pwd`
-    export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go
+    export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server
     cd $HOME/go/src/github.com/bakape/meguca
     ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
     sed -i "/npm install --progress false --depth 0/d" Makefile
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index cc08645547d..5dc53820a9d 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -1,4 +1,4 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/ErikDubbelboer/gspt";
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Masterminds/squirrel";
-      rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29";
-      sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn";
+      rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
+      sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/PuerkitoBio/goquery";
-      rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2";
-      sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2";
+      rev = "2d2796f41742ece03e8086188fa4db16a3a0b458";
+      sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/andybalholm/cascadia";
-      rev = "901648c87902174f774fac311d7f176f8647bdaa";
-      sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
+      rev = "680b6a57bda4f657485ad44bdea42342ead737bc";
+      sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm";
     };
   }
   {
@@ -59,8 +59,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/badoux/goscraper";
-      rev = "0213ced7087832e81e8892e8d044150cfc153856";
-      sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w";
+      rev = "363803726ad4e2ab262b4e01362e98458df0b231";
+      sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/boorufetch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/boorufetch";
+      rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0";
+      sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/captchouli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/captchouli";
+      rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680";
+      sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm";
     };
   }
   {
@@ -77,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bakape/thumbnailer";
-      rev = "326c44736983c316d20c036ce34ca79ce9b96b01";
-      sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk";
+      rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
+      sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
     };
   }
   {
@@ -90,22 +108,13 @@
       sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2";
     };
   }
-  {
-    goPackagePath = "github.com/dchest/captcha";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dchest/captcha";
-      rev = "6a29415a8364ec2971fdc62d9e415ed53fc20410";
-      sha256 = "0j0yspx5rlyx7fdfcx74viqc8jlq3nwyd62bdx4gvbd56cppldcm";
-    };
-  }
   {
     goPackagePath = "github.com/dimfeld/httptreemux";
     fetch = {
       type = "git";
       url = "https://github.com/dimfeld/httptreemux";
-      rev = "7f532489e7739b3d49df5c602bf63549881fe753";
-      sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
+      rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
+      sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
     };
   }
   {
@@ -158,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/handlers";
-      rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce";
-      sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm";
+      rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
+      sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
     };
   }
   {
@@ -167,17 +176,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
-      sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
+      rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
+      sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
     };
   }
   {
-    goPackagePath = "github.com/kardianos/osext";
+    goPackagePath = "github.com/julienschmidt/httprouter";
     fetch = {
       type = "git";
-      url = "https://github.com/kardianos/osext";
-      rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
-      sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "26a05976f9bf5c3aa992cc20e8588c359418ee58";
+      sha256 = "0bmvrgg373fxwqsr6nri01bmi9qdj6knxkmnbw70h9rmi2d9c585";
     };
   }
   {
@@ -203,26 +212,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
-      sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
+      rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee";
+      sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10";
     };
   }
   {
-    goPackagePath = "github.com/mailru/easyjson";
+    goPackagePath = "github.com/mattn/go-sqlite3";
     fetch = {
       type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
-      sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
-    };
-  }
-  {
-    goPackagePath = "github.com/mholt/archiver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mholt/archiver";
-      rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3";
-      sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
+      sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
     };
   }
   {
@@ -230,8 +230,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nwaples/rardecode";
-      rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6";
-      sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw";
+      rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7";
+      sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g";
     };
   }
   {
@@ -248,8 +248,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/oschwald/maxminddb-golang";
-      rev = "c5bec84d1963260297932a1b7a1753c8420717a7";
-      sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39";
+      rev = "ed835b22606182ff576f244643e52b25b7d6c4e7";
+      sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw";
     };
   }
   {
@@ -257,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/otium/ytdl";
-      rev = "b071cb3eb1579608df3b52084a017c5753b325e6";
-      sha256 = "01ankrjgdcw0ncwv0xzqh74xy22vdl2nza0arga72zrakpgk8nw0";
+      rev = "0227c2bacb82a434f2332d7d8c64093615c08a40";
+      sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs";
     };
   }
   {
@@ -266,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pierrec/lz4";
-      rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d";
-      sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs";
+      rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e";
+      sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki";
     };
   }
   {
@@ -275,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sevlyar/go-daemon";
-      rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f";
-      sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc";
+      rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1";
+      sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01";
     };
   }
   {
@@ -284,8 +284,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "e4b0c6d7829bcf64435536c4a88f4088a3c76203";
-      sha256 = "1s3m83wv1wjv95nhkbvml56c12z75x85wlmqill3zqvlm9az6bzg";
+      rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39";
+      sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4";
     };
   }
   {
@@ -293,8 +293,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ulikunitz/xz";
-      rev = "636d36a76670e6c700f22fd5f4588679ff2896c4";
-      sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g";
+      rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d";
+      sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/bytebufferpool";
-      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
-      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+      rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf";
+      sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag";
     };
   }
   {
@@ -311,8 +311,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/quicktemplate";
-      rev = "a91e0946457b6583004fbfc159339b8171423aed";
-      sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+      rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
+      sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
     };
   }
   {
@@ -320,8 +320,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "de0752318171da717af4ce24d0a2e8626afaeb11";
-      sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i";
+      rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447";
+      sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
     };
   }
   {
@@ -329,8 +329,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54";
-      sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3";
+      rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
+      sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
     };
   }
   {
@@ -338,8 +338,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031";
-      sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5";
+      rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695";
+      sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw";
     };
   }
   {
@@ -347,8 +347,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "6e3c4e7365ddcc329f090f96e4348398f6310088";
-      sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4";
+      rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
+      sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
     };
   }
   {
@@ -360,4 +360,13 @@
       sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
     };
   }
+  {
+    goPackagePath = "gopkg.in/mholt/archiver.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mholt/archiver.v2";
+      rev = "de0d89e255e17c8d75a40122055763e743ab0593";
+      sha256 = "02fsc0za0yi3dg0r5caa8vpxz6kqxjxxlmwzzj5899dlmdvqk57g";
+    };
+  }
 ]

From c26dbef830a2bc10a0cee7f77936af83116597df Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 3 Dec 2018 21:47:27 +0100
Subject: [PATCH 1465/2793] luppp: init at 1.2.0

---
 .../audio/luppp/build-install.patch           | 16 ++++++++
 pkgs/applications/audio/luppp/default.nix     | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/audio/luppp/build-install.patch
 create mode 100644 pkgs/applications/audio/luppp/default.nix

diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch
new file mode 100644
index 00000000000..4dae65438cb
--- /dev/null
+++ b/pkgs/applications/audio/luppp/build-install.patch
@@ -0,0 +1,16 @@
+commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090
+Author: Pavol Rusnak <stick@gk2.sk>
+Date:   Tue Dec 4 12:06:22 2018 +0100
+
+    build: add install: true to executable in meson.build
+
+diff --git a/meson.build b/meson.build
+index 050e1b1..9224ed5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,4 +39,5 @@ endforeach
+ 
+ # compile the main project
+ executable('luppp', luppp_src + [version_hxx],
++    install: true,
+     dependencies: deps)
diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix
new file mode 100644
index 00000000000..fdba836a6ae
--- /dev/null
+++ b/pkgs/applications/audio/luppp/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, jack2
+, cairo
+, liblo
+, libsndfile
+, libsamplerate
+, ntk
+}:
+
+stdenv.mkDerivation rec {
+  pname = "luppp";
+  version = "1.2.0";
+  patches = [ ./build-install.patch ];
+
+  src = fetchFromGitHub {
+    owner = "openAVproductions";
+    repo = "openAV-Luppp";
+    rev = "release-${version}";
+    sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig
+  ];
+
+  buildInputs = [
+    jack2 cairo liblo libsndfile libsamplerate ntk
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://openavproductions.com/luppp/;
+    description = "A music creation tool, intended for live use";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ prusnak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 234faea624f..293935a51e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17878,6 +17878,8 @@ in
     lua = lua5_1;
   };
 
+  luppp = callPackage ../applications/audio/luppp { };
+
   lv2bm = callPackage ../applications/audio/lv2bm { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };

From ce728ce4960cef3d9d5586206c2130d6542f8b70 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 6 Dec 2018 22:10:41 +0200
Subject: [PATCH 1466/2793] python: astroid: 2.0.4 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index d773c08e189..4cef66a5c2e 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.0.4";
+  version = "2.1.0";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
+    sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m";
   };
 
   # From astroid/__pkginfo__.py

From 6b5963ea2266e2c37c43ed9c7bdc8ad4ebfb0540 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 6 Dec 2018 22:11:12 +0200
Subject: [PATCH 1467/2793] python: pylint: 2.1.1 -> 2.2.2

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 4f4eb3cfc73..d5eec0f73bd 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.1.1";
+  version = "2.2.2";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
+    sha256 = "14klyan9lqanyi8qhrbn65k7bgv9p7i7ply662r2lr27wydf57b8";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

From 007e177f90408bc0f549731642c6fddf88f399ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCr?= <gurkan.gur@innogames.com>
Date: Thu, 6 Dec 2018 19:36:01 +0100
Subject: [PATCH 1468/2793] passExtensions.pass-genphrase: init at 0.1

---
 maintainers/maintainer-list.nix               |  5 +++
 .../security/pass/extensions/default.nix      |  1 +
 .../security/pass/extensions/genphrase.nix    | 32 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/security/pass/extensions/genphrase.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8058927a9c4..1c8ee9ff8e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3940,6 +3940,11 @@
     github = "seppeljordan";
     name = "Sebastian Jordan";
   };
+  seqizz = {
+    email = "seqizz@gmail.com";
+    github = "seqizz";
+    name = "Gurkan Gur";
+  };
   sfrijters = {
     email = "sfrijters@gmail.com";
     github = "sfrijters";
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
index f69687e512b..96d79a8dace 100644
--- a/pkgs/tools/security/pass/extensions/default.nix
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -12,4 +12,5 @@ with pkgs;
   pass-otp = callPackage ./otp.nix {};
   pass-tomb = callPackage ./tomb.nix {};
   pass-update = callPackage ./update.nix {};
+  pass-genphrase = callPackage ./genphrase.nix {};
 }
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
new file mode 100644
index 00000000000..0413234bad2
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -0,0 +1,32 @@
+{ stdenv, pass, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "pass-genphrase-${version}";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "congma";
+    repo = "pass-genphrase";
+    rev = "${version}";
+    sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd";
+  };
+
+  dontBuild = true;
+
+  installTargets = "globalinstall";
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    substituteInPlace $out/lib/password-store/extensions/genphrase.bash \
+      --replace '$EXTENSIONS' "$out/lib/password-store/extensions/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that generates memorable passwords";
+    homepage = https://github.com/congma/pass-genphrase;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ seqizz ];
+    platforms = platforms.unix;
+  };
+}

From 20c6acb4360a005555127aa90f32c4bcb4c6ebe3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 11:51:28 +0100
Subject: [PATCH 1469/2793] tdesktopPackages.preview: 1.4.7 -> 1.4.8

---
 .../telegram/tdesktop/default.nix                 |  4 ++--
 .../telegram/tdesktop/generic.nix                 | 15 +++++++++++++--
 2 files changed, 15 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 b5994d03bc6..6953b3bc6e8 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -13,8 +13,8 @@ let
 in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
-    version = "1.4.7";
-    sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp";
+    version = "1.4.8";
+    sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
     stable = false;
   });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 7736c8b66bd..900e0980e74 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -8,7 +8,15 @@
 
 with lib;
 
-mkDerivation rec {
+let
+  # TODO: Not optimal (maybe we should only package the stable versions)
+  previewPatches = fetchFromGitHub {
+    owner = "primeos";
+    repo = "nixpkgs-tdesktop-patches";
+    rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6";
+    sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9";
+  };
+in mkDerivation rec {
   name = "telegram-desktop-${version}";
   inherit version;
 
@@ -29,7 +37,10 @@ mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches = [ "${archPatches}/tdesktop.patch" ]
+  patches =
+    (if stable
+      then [ "${archPatches}/tdesktop.patch" ]
+      else [ "${previewPatches}/tdesktop.patch" ])
     # TODO: Only required to work around a compiler bug.
     # This should be fixed in GCC 7.3.1 (or later?)
     ++ [ ./fix-internal-compiler-error.patch ];

From 3a905059a7bd30ac41c804fc487a7270c7528b8b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 21:53:41 +0100
Subject: [PATCH 1470/2793] androidStudioPackages.{dev,canary}: 3.4.0.5 ->
 3.4.0.6

---
 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 de7e3977ad8..c8c6d74868a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.5"; # "Android Studio 3.4 Canary 6"
-    build = "183.5146016";
-    sha256Hash = "1z2asimpsw15iild7c4aqicph6v327qx3ffjgvl2n8vr5rspsns1";
+    version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"
+    build = "183.5159543";
+    sha256Hash = "0r685qqx4w1hwbd8jgrh7ks8bw9m7823ffhd3x6pl7j4b9hpc858";
   };
 in rec {
   # Old alias

From 577d73e486e5899132ff24b2c248e8ec56a26aec Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 21:58:25 +0100
Subject: [PATCH 1471/2793] androidStudioPackages.beta: 3.3.0.17 -> 3.3.0.18

---
 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 c8c6d74868a..8e54dd6f9ee 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
   };
   betaVersion = {
-    version = "3.3.0.17"; # "Android Studio 3.3 RC 1"
-    build = "182.5138683";
-    sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
+    version = "3.3.0.18"; # "Android Studio 3.3 RC 2"
+    build = "182.5160847";
+    sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
   };
   latestVersion = { # canary & dev
     version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"

From 67aa6cd8777206bede8d9ded039f540773d8ece4 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 6 Dec 2018 15:13:56 -0600
Subject: [PATCH 1472/2793] btrfs-progs: 4.19 -> 4.19.1

Fixes build of snapper
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 252f25ad8fa..8f3d41e8f4e 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
-  version = "4.19";
+  version = "4.19.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm";
+    sha256 = "1f7gpk9206ph081fr0af8k57i58zjb03xwd8k69177a7rzsjmn04";
   };
 
   nativeBuildInputs = [

From 3a5b4a631d84f9edde1c7cfcd1c5d08740dec6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 6 Dec 2018 18:56:43 +0000
Subject: [PATCH 1473/2793] rustc: 1.30.1 -> 1.31.0

---
 pkgs/development/compilers/rust/bootstrap.nix | 14 +++++++-------
 pkgs/development/compilers/rust/default.nix   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 4f16912a86b..f0413f19413 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.30.0";
+  version = "1.30.1";
 
   # fetch hashes by running `print-hashes.sh 1.30.0`
   hashes = {
-    i686-unknown-linux-gnu = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21";
-    x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f";
-    armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd";
-    aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e";
-    i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230";
-    x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b";
+    i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf";
+    x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e";
+    armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b";
+    aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874";
+    i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083";
+    x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 583b48e6dc6..1f24157eea4 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -7,11 +7,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.30.1";
-  cargoVersion = "1.30.0";
+  version = "1.31.0";
+  cargoVersion = "1.31.0";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
+    sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs";
   };
 in rec {
   rustc = callPackage ./rustc.nix {

From d01082aebc354d4aadf0f266ec0423d6098f7486 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Fri, 7 Dec 2018 00:18:09 +0100
Subject: [PATCH 1474/2793] tectonic: 0.1.9 -> 0.1.11

- handles unicode filenames correctly (since 0.1.10)
- switch to hopefully more reliable permantent URL for the default bundle (in 0.1.11)
---
 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 bcc69c7b223..e49707256c3 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.9";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "v${version}";
-    sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq";
+    sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x";
   };
 
-  cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq";
+  cargoSha256 = "1zgav5zxfvdnrr7himykj5ha20cb5ldxpcpl8y6d19dirxvcmpc6";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 879a509d79d58afb4bbbcd7781373df65f047f98 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:00:00 -0500
Subject: [PATCH 1475/2793] gitAndTools.git-test: init at 1.0.4

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-test/default.nix        | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-test/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 21cdd87ddcf..a1f79452242 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -104,6 +104,8 @@ let
 
   git-sync = callPackage ./git-sync { };
 
+  git-test = callPackage ./git-test { };
+
   git2cl = callPackage ./git2cl { };
 
   gitFastExport = callPackage ./fast-export { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
new file mode 100644
index 00000000000..1150f008299
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, makeWrapper, git }:
+
+stdenv.mkDerivation rec {
+  name = "git-test-${version}";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "spotify";
+    repo = "git-test";
+    rev = "v${version}";
+    sha256 = "01h3f0andv1p7pwir3k6n01v92hgr5zbjadfwl144yjw9x37fm2f";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -m755 -Dt $out/bin git-test
+    install -m444 -Dt $out/share/man/man1 git-test.1
+
+    wrapProgram $out/bin/git-test \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Test your commits";
+    homepage = https://github.com/spotify/git-test;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}

From b17eaa3aa96d5d2153301860087f569a7e553a82 Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Sun, 2 Dec 2018 22:26:10 -0500
Subject: [PATCH 1476/2793] scrcpy: 1.3 -> 1.5

---
 pkgs/misc/scrcpy/default.nix | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index b446363d7f3..afe8c0b7b67 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "1.3";
+  version = "1.5";
   prebuilt_server = fetchurl {
-    url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
-    sha256 = "1ha04wfmghblwr9ajfl96cswacfgrk0b7klq2ixfvw1kgwhmm6hg";
+    url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar";
+    sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr";
   };
 in
 stdenv.mkDerivation rec {
@@ -21,10 +21,23 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Genymobile";
     repo = "scrcpy";
-    rev = "v${version}";
-    sha256 = "02szi8w3w0lacyz42hlayxififi863qpm63yg9qir3jcl2vs7vdk";
+    rev = "v${version}-fixversion";
+    sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i";
   };
 
+  # postPatch:
+  #   screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
+  #   This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
+  #   It would be better to fix the OpenGL problem, but that seems much more intrusive.
+  #
+  #   command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally.
+  postPatch = ''
+    substituteInPlace app/src/screen.c \
+      --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
+    substituteInPlace app/src/command.c \
+      --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};'
+  '';
+
   nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];
 
   buildInputs = [ ffmpeg SDL2 ];
@@ -34,6 +47,7 @@ stdenv.mkDerivation rec {
     echo -n > server/meson.build
   '';
 
+  mesonFlags = ["-Doverride_server_path=${prebuilt_server}"];
   postInstall = ''
     mkdir -p "$out/share/scrcpy"
     ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"

From 5256cfd006a046ddc2ef9aba95091b79afe32600 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 6 Dec 2018 21:33:39 -0500
Subject: [PATCH 1477/2793] vivaldi: correct hash

Fixes #51635
---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 89dd6775719..e3269f15ac6 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "08x6abyz65vx4ycj8ys8sib9z1adb8ybmnrqjck69b30kbz78rj2";
+    sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
   };
 
   unpackPhase = ''

From b684e3d24b9ad824dfe77112f6abe3aa640a884e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Nov 2018 02:24:54 +0000
Subject: [PATCH 1478/2793] ocamlPackages.javalib: 2.3.5 -> 3.0

ocamlPackages.sawja: 1.5.3 -> 1.5.6
---
 .../ocaml-modules/javalib/default.nix         | 19 ++++++-------------
 .../ocaml-modules/sawja/default.nix           |  6 +++---
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 6e533092dc6..dde86bf3e52 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, ocaml, findlib, camlp4
+{ stdenv, fetchzip, which, ocaml, findlib, camlp4
 , camlzip, camomile, extlib
 }:
 
@@ -8,15 +8,14 @@ else
 
 let
   pname = "javalib";
-  webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "2.3.5";
+  version = "3.0";
 
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2";
-    sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd";
+  src = fetchzip {
+    url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
+    sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
   };
 
   buildInputs = [ which ocaml findlib camlp4 ];
@@ -30,17 +29,11 @@ stdenv.mkDerivation rec {
   configureScript = "./configure.sh";
   dontAddPrefix = "true";
 
-  preBuild = ''
-    make ptrees;
-    make installptrees;
-    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
-  '';
-
   propagatedBuildInputs = [ camlzip camomile extlib ];
 
   meta = with stdenv.lib; {
     description = "A library that parses Java .class files into OCaml data structures";
-    homepage = "${webpage}";
+    homepage = https://javalib-team.github.io/javalib/;
     license = licenses.lgpl3;
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 92d9cef351b..94120f2f8b9 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
 let
   pname = "sawja";
-  version = "1.5.3";
+  version = "1.5.6";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2;
-    sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2";
+    url = https://gforge.inria.fr/frs/download.php/file/37819/sawja-1.5.6.tar.bz2;
+    sha256 = "0dkfdc8h94r7kj4p8q57fz7fssypgmjrix8xff0va7x1nya5sdp3";
   };
 
   buildInputs = [ which perl ocaml findlib camlp4 ];

From 9852c74249cddb0bd857efc235205b7b1a68071e Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Sat, 1 Dec 2018 16:12:52 -0500
Subject: [PATCH 1479/2793] teyjus: fix build by using omake from ocaml 4.02
 package set

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c03f3c85d27..7111ff722ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7534,10 +7534,11 @@ in
     lua = lua5_1;
   };
 
-  teyjus = callPackage ../development/compilers/teyjus {
-    inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
-    omake = omake_rc1;
-  };
+  teyjus = callPackage ../development/compilers/teyjus (
+    with ocaml-ng.ocamlPackages_4_02; {
+      inherit ocaml;
+      omake = omake_rc1;
+  });
 
   thrust = callPackage ../development/tools/thrust {
     gconf = pkgs.gnome2.GConf;

From cf9743da48aeb0da81f0932f09ea47bbc14e89e5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Sun, 2 Dec 2018 12:17:49 -0500
Subject: [PATCH 1480/2793] remove omake_rc1 from all-packages.nix since it
 doesn't build

---
 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 7111ff722ea..2ebb6f6f7b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8814,8 +8814,6 @@ in
 
   omake = callPackage ../development/tools/ocaml/omake { };
 
-  inherit (ocamlPackages) omake_rc1;
-
   omniorb = callPackage ../development/tools/omniorb { };
 
   opengrok = callPackage ../development/tools/misc/opengrok { };

From 88b48753acfa4403b2d0676ca5b097882c474882 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:39:24 -0500
Subject: [PATCH 1481/2793] flow: 0.86.0 -> 0.87.0

---
 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 175114017f3..9457e88ed83 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "0.86.0";
+  version = "0.87.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp";
+    sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k";
   };
 
   installPhase = ''

From 0c9abf6436dca26e686c89c2be2e21713b36e38b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 7 Dec 2018 04:22:10 +0000
Subject: [PATCH 1482/2793] ocamlPackages.camlimages: 5.0.0 -> 5.0.1

---
 pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 065c5a650b8..8b0b70cae60 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
+{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
 
 buildDunePackage rec {
   pname = "camlimages";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchzip {
     url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz";
-    sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
+    sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5";
   };
 
   buildInputs = [ configurator cppo lablgtk ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "5.0";
     homepage = https://bitbucket.org/camlspotter/camlimages;
     description = "OCaml image processing library";

From 776f084cf1bc7d174184e2d51b224e168fcd6fa4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 7 Dec 2018 05:56:53 +0100
Subject: [PATCH 1483/2793] nixos/tests: Fix wrong arch in runInMachine test

Since 83b27f60ceff23967e477c90bef8e78cc96d50a2, the tests were moved
into all-tests.nix and some of the tooling has changed so that
subattributes of test expressions are now recursively evaluated until a
derivation with a .test attribute has been found.

Unfortunately this isn't the case for all of the tests and the
runInMachine doesn't use the makeTest function other tests are using but
instead uses runInMachine, which doesn't generate a .test attribute.

Whener a .test attribute wasn't found by the new handleTest function, it
recurses down again until there is no value left that is an attribute
set and subsequently returns its unchanged value. This however has the
drawback that instead of getting different attributes for each
architecture we only get the last architecture in the supportedSystems
list.

In the case of the release.nix, the last architecture in
supportedSystems is "aarch64-linux", so the runInMachine test is always
built on that architecture.

In order to work around this, I changed runInMachine to emit a .test
attribute so that it looks to handleTest like it was a test created via
makeTest.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/tests/run-in-machine.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 116f5dc28a6..339a4b9a740 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -10,11 +10,14 @@ let
     drv = pkgs.hello;
     machine = { ... }: { /* services.sshd.enable = true; */ };
   };
-in pkgs.runCommand "verify-output" { inherit output; } ''
-  if [ ! -e "$output/bin/hello" ]; then
-    echo "Derivation built using runInMachine produced incorrect output:" >&2
-    ls -laR "$output" >&2
-    exit 1
-  fi
-  "$output/bin/hello" > "$out"
-''
+
+  test = pkgs.runCommand "verify-output" { inherit output; } ''
+    if [ ! -e "$output/bin/hello" ]; then
+      echo "Derivation built using runInMachine produced incorrect output:" >&2
+      ls -laR "$output" >&2
+      exit 1
+    fi
+    "$output/bin/hello" > "$out"
+  '';
+
+in test // { inherit test; } # To emulate behaviour of makeTest

From fd8f754242638b42320c284cf81bc88986125f0d Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 7 Dec 2018 10:01:08 +0300
Subject: [PATCH 1484/2793] me_cleaner: init at 1.2

---
 pkgs/tools/misc/me_cleaner/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/me_cleaner/default.nix

diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix
new file mode 100644
index 00000000000..d224ad1dcc5
--- /dev/null
+++ b/pkgs/tools/misc/me_cleaner/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "me_cleaner";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "corna";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4";
+  };
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Tool for partial deblobbing of Intel ME/TXE firmware images";
+    longDescription = ''
+      me_cleaner is a Python script able to modify an Intel ME firmware image
+      with the final purpose of reducing its ability to interact with the system.
+    '';
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebb6f6f7b4..f6ce61df1f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7773,6 +7773,8 @@ in
 
   maude = callPackage ../development/interpreters/maude { };
 
+  me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { };
+
   mesos = callPackage ../applications/networking/cluster/mesos {
     sasl = cyrus_sasl;
     inherit (pythonPackages) python boto setuptools wrapPython;

From 0fc90852d9eef3b7e50a351fe4800a44e482f5db Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Fri, 7 Dec 2018 11:35:16 +0100
Subject: [PATCH 1485/2793] bloop: 1.1.0 -> 1.1.1

---
 pkgs/development/tools/build-managers/bloop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index c535740e5c8..c53ff2b505f 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.1.0";
+  version = "1.1.1";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,12 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "090ig5k1bd3pv4i8x6byyf9wda1430xysnbcllflcz6cf2ccjy2k";
+    outputHash     = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "0c8b937b";
+  nailgunCommit = "6992a3bf";
 
   buildInputs = [ jdk makeWrapper deps ];
 

From 4f87d7e733ae001ed45329b1cda569117f81c9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Dec 2018 11:58:09 +0000
Subject: [PATCH 1486/2793] Revert "fontconfig: fix cross make-fonts-cache &
 make-fonts-config"

This reverts commit 508cbf4d25aeead1442a4c3ef1ee1336cc703645.

This make the function ignore the fontconfig variable
---
 pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 4 ++--
 pkgs/development/libraries/fontconfig/make-fonts-conf.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index dcef4a4b205..1c88235b925 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,8 +1,8 @@
-{ runCommand, lib, fontconfig, fontDirectories, buildPackages }:
+{ runCommand, lib, fontconfig, fontDirectories }:
 
 runCommand "fc-cache"
   rec {
-    nativeBuildInputs = [ buildPackages.fontconfig.bin ];
+    buildInputs = [ fontconfig.bin ];
     preferLocalBuild = true;
     passAsFile = [ "fontDirs" ];
     fontDirs = ''
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index 4d353f5d7e2..3cd4a894b37 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -2,7 +2,7 @@
 
 runCommand "fonts.conf"
   {
-    nativeBuildInputs = [ libxslt fontconfig ];
+    buildInputs = [ libxslt fontconfig ];
     # Add a default font for non-nixos systems, <1MB and in nixos defaults.
     fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
   }

From bf050b13b0c10c9ffdb8d6c59edd973755c7c515 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Fri, 7 Dec 2018 13:19:04 +0100
Subject: [PATCH 1487/2793] libopusenc: init at 0.2.1

---
 .../libraries/libopusenc/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/libopusenc/default.nix

diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
new file mode 100644
index 00000000000..4ca0849447f
--- /dev/null
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, libopus }:
+
+let
+  version = "0.2.1";
+in
+stdenv.mkDerivation rec {
+  name = "libopusenc-${version}";
+
+  src = fetchurl {
+    url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
+    sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  doCheck = true;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libopus ];
+
+  meta = with stdenv.lib; {
+    description = "Library for encoding .opus audio files and live streams";
+    license = licenses.bsd3;
+    homepage = http://www.opus-codec.org/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebb6f6f7b4..a9a1a08efca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11123,6 +11123,8 @@ in
 
   libopus = callPackage ../development/libraries/libopus { };
 
+  libopusenc = callPackage ../development/libraries/libopusenc { };
+
   libosinfo = callPackage ../development/libraries/libosinfo {
     inherit (gnome3) libsoup;
   };

From e7548891e3fe44c486a479f788a70fb994b61ad4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 7 Dec 2018 13:23:09 +0100
Subject: [PATCH 1488/2793] uwsgi: fix build when withSystemd = false

Passing -lsystemd unconditionally breaks the build when withSystemd = false.
---
 pkgs/servers/uwsgi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index dd397598c97..074b19724d2 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     ${lib.concatMapStringsSep "\n" (x: x.install or "") needed}
   '';
 
-  NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed;
+  NIX_CFLAGS_LINK = lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed;
 
   meta = with stdenv.lib; {
     homepage = https://uwsgi-docs.readthedocs.org/en/latest/;

From 3df463d351df149eb0657a2f01836dc648e98c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 7 Dec 2018 14:16:26 +0100
Subject: [PATCH 1489/2793] seafile-shared: 6.2.7 -> 6.2.8

---
 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 2cff1edfc51..a1f69564166 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.7";
+  version = "6.2.8";
   name = "seafile-shared-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "0f8h7x6q830q4pw6f6bbykiyj3lkdlgvjzg2sdaqm4bhj2c4k1n0";
+    sha256 = "1sgrsj60gy4pqxjz1rxn4nyzmc67x3kx16kd2vmwbzr44hasnp46";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

From cb2a447c510848c925977c0ecc440eef7443c12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 7 Dec 2018 14:16:49 +0100
Subject: [PATCH 1490/2793] seafile-client: 6.2.7 -> 6.2.8

---
 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 3e6a057c422..5ac50da649d 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.7";
+  version = "6.2.8";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "16ikl6vkp9v16608bq2sfg48idn2p7ik3q8n6j866zxkmgdvkpsg";
+    sha256 = "1y57cw789cmssgl39kj94q259kba08v5i1yc1cmx7qxyigrpwyv6";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From 8b3949d989f195df77c856bd0acf8a3ea1eb2f3e Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Fri, 7 Dec 2018 15:00:26 +0100
Subject: [PATCH 1491/2793] zoom-us: 2.5.146186.1130 -> 2.6.146750.1204

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 069d37a4c7f..f8232f053eb 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.5.146186.1130";
+  version = "2.6.146750.1204";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1644xs7xg8a27xg7bgb7856hvlvfh2lin749alds782i52p9rsjr";
+      sha256 = "18cpl1ggyw6nf9r85jqn0cq9j7qrhxfy6nah2qqs5bqj84dqhsrg";
     };
   };
 

From 4deb04a97ab1cca77f24057d2f6ee9273091316c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 3 Dec 2018 16:59:49 +0100
Subject: [PATCH 1492/2793] openblas: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index b050a19db37..532a26481af 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.3";
+  version = "0.3.4";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "0cpkvfvc14xm9mifrm919rp8vrq70gpl7r2sww4f0izrl39wklwx";
+    sha256 = "1jdq4msfyg13pdmwwfqpixf4fshss68qzls820lmn0i6y7h4aix3";
   };
 
   inherit blas64;

From 09991d40e636181d37953e941c7f771a9c2cad49 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 7 Dec 2018 15:28:55 +0100
Subject: [PATCH 1493/2793] pythonPackages.tlslite-ng: init at 0.7.5

---
 .../python-modules/tlslite-ng/default.nix     | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/tlslite-ng/default.nix

diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix
new file mode 100644
index 00000000000..ac68019d369
--- /dev/null
+++ b/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ecdsa
+}:
+
+buildPythonPackage rec {
+  pname = "tlslite-ng";
+  version = "0.7.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2";
+  };
+
+  buildInputs = [ ecdsa ];
+
+  meta = with stdenv.lib; {
+    description = "Pure python implementation of SSL and TLS.";
+    homepage = https://pypi.python.org/pypi/tlslite-ng;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.erictapen ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c1956fc3d4..557ef81d56a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4293,6 +4293,8 @@ in {
 
   tlslite = callPackage ../development/python-modules/tlslite { };
 
+  tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };
+
   qrcode = callPackage ../development/python-modules/qrcode { };
 
   traits = callPackage ../development/python-modules/traits { };

From 12e8ec041a28abd8c5cabd2c9e873df89e41b571 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 7 Dec 2018 15:30:12 +0100
Subject: [PATCH 1494/2793] fix eval after merging

---
 pkgs/applications/networking/mailreaders/balsa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index be4cb69f4b9..f7f34a67183 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
   webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
-  libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
+  libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
   hicolor-icon-theme, wrapGAppsHook
 }:
 

From 691f6cceea28064ed1deca5532bf8f28e184b4cc Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Fri, 7 Dec 2018 15:33:18 +0100
Subject: [PATCH 1495/2793] grobi: 0.3.0 -> 0.5.1

---
 pkgs/tools/X11/grobi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 42f3bbdb019..1a7fc91311e 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  version = "0.3.0";
+  version = "0.5.1";
   name = "grobi-${version}";
 
   goPackagePath = "github.com/fd0/grobi";
 
   src = fetchFromGitHub {
-    rev = "78a0639ffad765933a5233a1c94d2626e24277b8";
+    rev = "5ddc167b9e4f84755a515828360abda15c54b7de";
     owner = "fd0";
     repo = "grobi";
-    sha256 = "16q7vnhb1p6ds561832sfdszvlafww67bjn3lc0d18v7lyak2l3i";
+    sha256 = "0iyxidq60pf6ki52f8fffplf10nl8w9jx1b7igg98csnc6iqxh89";
   };
 
    meta = with stdenv.lib; {

From 74d0b82f29cbc82e2a35e5a684a947f067851f70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Nov 2018 12:56:24 +0100
Subject: [PATCH 1496/2793] buildPython*: add updateScript to passthru

All Python packages now have an updateScript. The script calls
`update-python-libraries` and passes it the position of the derivation
expression obtained using `meta.position`. This works fine in case a Nix
expression represents only a single derivation. If there are more in it,
`update-python-libraries` will fail.
---
 maintainers/scripts/update-python-libraries   | 362 +-----------------
 .../python/build-python-package.nix           |   5 +-
 .../python/mk-python-derivation.nix           |  16 +-
 .../update-python-libraries/default.nix       |  12 +
 .../update-python-libraries.py                | 362 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 396 insertions(+), 363 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/update-python-libraries/default.nix
 create mode 100755 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index d95ff4f347e..d56c9e6338c 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,361 +1,3 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
+#!/bin/sh
+exec nix-shell -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git --run pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
 
-"""
-Update a Python package expression by passing in the `.nix` file, or the directory containing it.
-You can pass in multiple files or paths.
-
-You'll likely want to use
-``
-  $ ./update-python-libraries ../../pkgs/development/python-modules/*
-``
-to update all libraries in that folder.
-"""
-
-import argparse
-import logging
-import os
-import re
-import requests
-import toolz
-from concurrent.futures import ThreadPoolExecutor as Pool
-from packaging.version import Version as _Version
-from packaging.version import InvalidVersion
-from packaging.specifiers import SpecifierSet
-import collections
-import subprocess
-
-INDEX = "https://pypi.io/pypi"
-"""url of PyPI"""
-
-EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
-"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
-
-PRERELEASES = False
-
-import logging
-logging.basicConfig(level=logging.INFO)
-
-
-class Version(_Version, collections.abc.Sequence):
-
-    def __init__(self, version):
-        super().__init__(version)
-        # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
-        # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
-        self.raw_version = version
-
-    def __getitem__(self, i):
-        return self._version.release[i]
-
-    def __len__(self):
-        return len(self._version.release)
-
-    def __iter__(self):
-        yield from self._version.release
-
-
-def _get_values(attribute, text):
-    """Match attribute in text and return all matches.
-
-    :returns: List of matches.
-    """
-    regex = '{}\s+=\s+"(.*)";'.format(attribute)
-    regex = re.compile(regex)
-    values = regex.findall(text)
-    return values
-
-def _get_unique_value(attribute, text):
-    """Match attribute in text and return unique match.
-
-    :returns: Single match.
-    """
-    values = _get_values(attribute, text)
-    n = len(values)
-    if n > 1:
-        raise ValueError("found too many values for {}".format(attribute))
-    elif n == 1:
-        return values[0]
-    else:
-        raise ValueError("no value found for {}".format(attribute))
-
-def _get_line_and_value(attribute, text):
-    """Match attribute in text. Return the line and the value of the attribute."""
-    regex = '({}\s+=\s+"(.*)";)'.format(attribute)
-    regex = re.compile(regex)
-    value = regex.findall(text)
-    n = len(value)
-    if n > 1:
-        raise ValueError("found too many values for {}".format(attribute))
-    elif n == 1:
-        return value[0]
-    else:
-        raise ValueError("no value found for {}".format(attribute))
-
-
-def _replace_value(attribute, value, text):
-    """Search and replace value of attribute in text."""
-    old_line, old_value = _get_line_and_value(attribute, text)
-    new_line = old_line.replace(old_value, value)
-    new_text = text.replace(old_line, new_line)
-    return new_text
-
-def _fetch_page(url):
-    r = requests.get(url)
-    if r.status_code == requests.codes.ok:
-        return r.json()
-    else:
-        raise ValueError("request for {} failed".format(url))
-
-
-SEMVER = {
-    'major' : 0,
-    'minor' : 1,
-    'patch' : 2,
-}
-
-
-def _determine_latest_version(current_version, target, versions):
-    """Determine latest version, given `target`.
-    """
-    current_version = Version(current_version)
-
-    def _parse_versions(versions):
-        for v in versions:
-            try:
-                yield Version(v)
-            except InvalidVersion:
-                pass
-
-    versions = _parse_versions(versions)
-
-    index = SEMVER[target]
-
-    ceiling = list(current_version[0:index])
-    if len(ceiling) == 0:
-        ceiling = None
-    else:
-        ceiling[-1]+=1
-        ceiling = Version(".".join(map(str, ceiling)))
-
-    # We do not want prereleases
-    versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
-
-    if ceiling is not None:
-        versions = SpecifierSet(f"<{ceiling}").filter(versions)
-
-    return (max(sorted(versions))).raw_version
-
-
-def _get_latest_version_pypi(package, extension, current_version, target):
-    """Get latest version and hash from PyPI."""
-    url = "{}/{}/json".format(INDEX, package)
-    json = _fetch_page(url)
-
-    versions = json['releases'].keys()
-    version = _determine_latest_version(current_version, target, versions)
-
-    try:
-        releases = json['releases'][version]
-    except KeyError as e:
-        raise KeyError('Could not find version {} for {}'.format(version, package)) from e
-    for release in releases:
-        if release['filename'].endswith(extension):
-            # TODO: In case of wheel we need to do further checks!
-            sha256 = release['digests']['sha256']
-            break
-    else:
-        sha256 = None
-    return version, sha256
-
-
-def _get_latest_version_github(package, extension, current_version, target):
-    raise ValueError("updating from GitHub is not yet supported.")
-
-
-FETCHERS = {
-    'fetchFromGitHub'   :   _get_latest_version_github,
-    'fetchPypi'         :   _get_latest_version_pypi,
-    'fetchurl'          :   _get_latest_version_pypi,
-}
-
-
-DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
-
-
-FORMATS = {
-    'setuptools'        :   DEFAULT_SETUPTOOLS_EXTENSION,
-    'wheel'             :   'whl'
-}
-
-def _determine_fetcher(text):
-    # Count occurences of fetchers.
-    nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
-    if nfetchers == 0:
-        raise ValueError("no fetcher.")
-    elif nfetchers > 1:
-        raise ValueError("multiple fetchers.")
-    else:
-        # Then we check which fetcher to use.
-        for fetcher in FETCHERS.keys():
-            if 'src = {}'.format(fetcher) in text:
-                return fetcher
-
-
-def _determine_extension(text, fetcher):
-    """Determine what extension is used in the expression.
-
-    If we use:
-    - fetchPypi, we check if format is specified.
-    - fetchurl, we determine the extension from the url.
-    - fetchFromGitHub we simply use `.tar.gz`.
-    """
-    if fetcher == 'fetchPypi':
-        try:
-            src_format = _get_unique_value('format', text)
-        except ValueError as e:
-            src_format = None   # format was not given
-
-        try:
-            extension = _get_unique_value('extension', text)
-        except ValueError as e:
-            extension = None    # extension was not given
-
-        if extension is None:
-            if src_format is None:
-                src_format = 'setuptools'
-            elif src_format == 'flit':
-                raise ValueError("Don't know how to update a Flit package.")
-            extension = FORMATS[src_format]
-
-    elif fetcher == 'fetchurl':
-        url = _get_unique_value('url', text)
-        extension = os.path.splitext(url)[1]
-        if 'pypi' not in url:
-            raise ValueError('url does not point to PyPI.')
-
-    elif fetcher == 'fetchFromGitHub':
-        raise ValueError('updating from GitHub is not yet implemented.')
-
-    return extension
-
-
-def _update_package(path, target):
-
-    # Read the expression
-    with open(path, 'r') as f:
-        text = f.read()
-
-    # Determine pname.
-    pname = _get_unique_value('pname', text)
-
-    # Determine version.
-    version = _get_unique_value('version', text)
-
-    # First we check how many fetchers are mentioned.
-    fetcher = _determine_fetcher(text)
-
-    extension = _determine_extension(text, fetcher)
-
-    new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
-
-    if new_version == version:
-        logging.info("Path {}: no update available for {}.".format(path, pname))
-        return False
-    elif Version(new_version) <= Version(version):
-        raise ValueError("downgrade for {}.".format(pname))
-    if not new_sha256:
-        raise ValueError("no file available for {}.".format(pname))
-
-    text = _replace_value('version', new_version, text)
-    text = _replace_value('sha256', new_sha256, text)
-
-    with open(path, 'w') as f:
-        f.write(text)
-
-        logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
-
-    result = {
-        'path'  : path,
-        'target': target,
-        'pname': pname,
-        'old_version'   : version,
-        'new_version'   : new_version,
-        #'fetcher'       : fetcher,
-        }
-
-    return result
-
-
-def _update(path, target):
-
-    # We need to read and modify a Nix expression.
-    if os.path.isdir(path):
-        path = os.path.join(path, 'default.nix')
-
-    # If a default.nix does not exist, we quit.
-    if not os.path.isfile(path):
-        logging.info("Path {}: does not exist.".format(path))
-        return False
-
-    # If file is not a Nix expression, we quit.
-    if not path.endswith(".nix"):
-        logging.info("Path {}: does not end with `.nix`.".format(path))
-        return False
-
-    try:
-        return _update_package(path, target)
-    except ValueError as e:
-        logging.warning("Path {}: {}".format(path, e))
-        return False
-
-
-def _commit(path, pname, old_version, new_version, **kwargs):
-    """Commit result.
-    """
-
-    msg = f'python: {pname}: {old_version} -> {new_version}'
-
-    try:
-        subprocess.check_call(['git', 'add', path])
-        subprocess.check_call(['git', 'commit', '-m', msg])
-    except subprocess.CalledProcessError as e:
-        subprocess.check_call(['git', 'checkout', path])
-        raise subprocess.CalledProcessError(f'Could not commit {path}') from e
-
-    return True
-
-
-def main():
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument('package', type=str, nargs='+')
-    parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
-    parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
-
-    args = parser.parse_args()
-    target = args.target
-
-    packages = list(map(os.path.abspath, args.package))
-
-    logging.info("Updating packages...")
-
-    # Use threads to update packages concurrently
-    with Pool() as p:
-        results = list(p.map(lambda pkg: _update(pkg, target), packages))
-
-    logging.info("Finished updating packages.")
-
-    # Commits are created sequentially.
-    if args.commit:
-        logging.info("Committing updates...")
-        list(map(lambda x: _commit(**x), filter(bool, results)))
-        logging.info("Finished committing updates")
-
-    count = sum(map(bool, results))
-    logging.info("{} package(s) updated".format(count))
-
-
-
-if __name__ == '__main__':
-    main()
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index b55d6d874bb..391086a662e 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -12,6 +12,8 @@
 , namePrefix
 , bootstrapped-pip
 , flit
+, writeScript
+, update-python-libraries
 }:
 
 let
@@ -20,7 +22,8 @@ let
   wheel-specific = import ./build-python-package-wheel.nix { };
   common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
   mkPythonDerivation = import ./mk-python-derivation.nix {
-    inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
+    inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook;
+    inherit toPythonModule namePrefix writeScript update-python-libraries;
   };
 in
 
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 63ffdbb8c0a..eb913e1a375 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -10,6 +10,8 @@
 # Whether the derivation provides a Python module or not.
 , toPythonModule
 , namePrefix
+, writeScript
+, update-python-libraries
 }:
 
 { name ? "${attrs.pname}-${attrs.version}"
@@ -64,7 +66,7 @@ if disabled
 then throw "${name} not supported for interpreter ${python.executable}"
 else
 
-toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
+let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
     "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts"
   ] // {
 
@@ -106,4 +108,14 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
     platforms = python.meta.platforms;
     isBuildPythonPackage = python.meta.platforms;
   } // meta;
-}))
+}));
+
+passthru = {
+  updateScript = let
+    filename = builtins.head (lib.splitString ":" self.meta.position);
+  in writeScript "update-python" ''
+    #!${python.stdenv.shell}
+    ${update-python-libraries} ${filename}
+  '';
+};
+in lib.extendDerivation true passthru self
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix
new file mode 100644
index 00000000000..762ca2bdd34
--- /dev/null
+++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix
@@ -0,0 +1,12 @@
+{ python3, runCommand, git }:
+
+runCommand "update-python-libraries" {
+  buildInputs = [
+    (python3.withPackages(ps: with ps; [ packaging requests toolz ]))
+    git
+  ];
+} ''
+  cp ${./update-python-libraries.py} $out
+  patchShebangs $out
+  substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"'
+''
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
new file mode 100755
index 00000000000..9292a930703
--- /dev/null
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -0,0 +1,362 @@
+#!/usr/bin/env python3
+
+"""
+Update a Python package expression by passing in the `.nix` file, or the directory containing it.
+You can pass in multiple files or paths.
+
+You'll likely want to use
+``
+  $ ./update-python-libraries ../../pkgs/development/python-modules/*
+``
+to update all libraries in that folder.
+"""
+
+import argparse
+import logging
+import os
+import re
+import requests
+import toolz
+from concurrent.futures import ThreadPoolExecutor as Pool
+from packaging.version import Version as _Version
+from packaging.version import InvalidVersion
+from packaging.specifiers import SpecifierSet
+import collections
+import subprocess
+
+INDEX = "https://pypi.io/pypi"
+"""url of PyPI"""
+
+EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
+"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+
+PRERELEASES = False
+
+GIT = "git"
+
+import logging
+logging.basicConfig(level=logging.INFO)
+
+
+class Version(_Version, collections.abc.Sequence):
+
+    def __init__(self, version):
+        super().__init__(version)
+        # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
+        # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
+        self.raw_version = version
+
+    def __getitem__(self, i):
+        return self._version.release[i]
+
+    def __len__(self):
+        return len(self._version.release)
+
+    def __iter__(self):
+        yield from self._version.release
+
+
+def _get_values(attribute, text):
+    """Match attribute in text and return all matches.
+
+    :returns: List of matches.
+    """
+    regex = '{}\s+=\s+"(.*)";'.format(attribute)
+    regex = re.compile(regex)
+    values = regex.findall(text)
+    return values
+
+def _get_unique_value(attribute, text):
+    """Match attribute in text and return unique match.
+
+    :returns: Single match.
+    """
+    values = _get_values(attribute, text)
+    n = len(values)
+    if n > 1:
+        raise ValueError("found too many values for {}".format(attribute))
+    elif n == 1:
+        return values[0]
+    else:
+        raise ValueError("no value found for {}".format(attribute))
+
+def _get_line_and_value(attribute, text):
+    """Match attribute in text. Return the line and the value of the attribute."""
+    regex = '({}\s+=\s+"(.*)";)'.format(attribute)
+    regex = re.compile(regex)
+    value = regex.findall(text)
+    n = len(value)
+    if n > 1:
+        raise ValueError("found too many values for {}".format(attribute))
+    elif n == 1:
+        return value[0]
+    else:
+        raise ValueError("no value found for {}".format(attribute))
+
+
+def _replace_value(attribute, value, text):
+    """Search and replace value of attribute in text."""
+    old_line, old_value = _get_line_and_value(attribute, text)
+    new_line = old_line.replace(old_value, value)
+    new_text = text.replace(old_line, new_line)
+    return new_text
+
+def _fetch_page(url):
+    r = requests.get(url)
+    if r.status_code == requests.codes.ok:
+        return r.json()
+    else:
+        raise ValueError("request for {} failed".format(url))
+
+
+SEMVER = {
+    'major' : 0,
+    'minor' : 1,
+    'patch' : 2,
+}
+
+
+def _determine_latest_version(current_version, target, versions):
+    """Determine latest version, given `target`.
+    """
+    current_version = Version(current_version)
+
+    def _parse_versions(versions):
+        for v in versions:
+            try:
+                yield Version(v)
+            except InvalidVersion:
+                pass
+
+    versions = _parse_versions(versions)
+
+    index = SEMVER[target]
+
+    ceiling = list(current_version[0:index])
+    if len(ceiling) == 0:
+        ceiling = None
+    else:
+        ceiling[-1]+=1
+        ceiling = Version(".".join(map(str, ceiling)))
+
+    # We do not want prereleases
+    versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
+
+    if ceiling is not None:
+        versions = SpecifierSet(f"<{ceiling}").filter(versions)
+
+    return (max(sorted(versions))).raw_version
+
+
+def _get_latest_version_pypi(package, extension, current_version, target):
+    """Get latest version and hash from PyPI."""
+    url = "{}/{}/json".format(INDEX, package)
+    json = _fetch_page(url)
+
+    versions = json['releases'].keys()
+    version = _determine_latest_version(current_version, target, versions)
+
+    try:
+        releases = json['releases'][version]
+    except KeyError as e:
+        raise KeyError('Could not find version {} for {}'.format(version, package)) from e
+    for release in releases:
+        if release['filename'].endswith(extension):
+            # TODO: In case of wheel we need to do further checks!
+            sha256 = release['digests']['sha256']
+            break
+    else:
+        sha256 = None
+    return version, sha256
+
+
+def _get_latest_version_github(package, extension, current_version, target):
+    raise ValueError("updating from GitHub is not yet supported.")
+
+
+FETCHERS = {
+    'fetchFromGitHub'   :   _get_latest_version_github,
+    'fetchPypi'         :   _get_latest_version_pypi,
+    'fetchurl'          :   _get_latest_version_pypi,
+}
+
+
+DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
+
+
+FORMATS = {
+    'setuptools'        :   DEFAULT_SETUPTOOLS_EXTENSION,
+    'wheel'             :   'whl'
+}
+
+def _determine_fetcher(text):
+    # Count occurences of fetchers.
+    nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
+    if nfetchers == 0:
+        raise ValueError("no fetcher.")
+    elif nfetchers > 1:
+        raise ValueError("multiple fetchers.")
+    else:
+        # Then we check which fetcher to use.
+        for fetcher in FETCHERS.keys():
+            if 'src = {}'.format(fetcher) in text:
+                return fetcher
+
+
+def _determine_extension(text, fetcher):
+    """Determine what extension is used in the expression.
+
+    If we use:
+    - fetchPypi, we check if format is specified.
+    - fetchurl, we determine the extension from the url.
+    - fetchFromGitHub we simply use `.tar.gz`.
+    """
+    if fetcher == 'fetchPypi':
+        try:
+            src_format = _get_unique_value('format', text)
+        except ValueError as e:
+            src_format = None   # format was not given
+
+        try:
+            extension = _get_unique_value('extension', text)
+        except ValueError as e:
+            extension = None    # extension was not given
+
+        if extension is None:
+            if src_format is None:
+                src_format = 'setuptools'
+            elif src_format == 'flit':
+                raise ValueError("Don't know how to update a Flit package.")
+            extension = FORMATS[src_format]
+
+    elif fetcher == 'fetchurl':
+        url = _get_unique_value('url', text)
+        extension = os.path.splitext(url)[1]
+        if 'pypi' not in url:
+            raise ValueError('url does not point to PyPI.')
+
+    elif fetcher == 'fetchFromGitHub':
+        raise ValueError('updating from GitHub is not yet implemented.')
+
+    return extension
+
+
+def _update_package(path, target):
+
+    # Read the expression
+    with open(path, 'r') as f:
+        text = f.read()
+
+    # Determine pname.
+    pname = _get_unique_value('pname', text)
+
+    # Determine version.
+    version = _get_unique_value('version', text)
+
+    # First we check how many fetchers are mentioned.
+    fetcher = _determine_fetcher(text)
+
+    extension = _determine_extension(text, fetcher)
+
+    new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
+
+    if new_version == version:
+        logging.info("Path {}: no update available for {}.".format(path, pname))
+        return False
+    elif Version(new_version) <= Version(version):
+        raise ValueError("downgrade for {}.".format(pname))
+    if not new_sha256:
+        raise ValueError("no file available for {}.".format(pname))
+
+    text = _replace_value('version', new_version, text)
+    text = _replace_value('sha256', new_sha256, text)
+
+    with open(path, 'w') as f:
+        f.write(text)
+
+        logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
+
+    result = {
+        'path'  : path,
+        'target': target,
+        'pname': pname,
+        'old_version'   : version,
+        'new_version'   : new_version,
+        #'fetcher'       : fetcher,
+        }
+
+    return result
+
+
+def _update(path, target):
+
+    # We need to read and modify a Nix expression.
+    if os.path.isdir(path):
+        path = os.path.join(path, 'default.nix')
+
+    # If a default.nix does not exist, we quit.
+    if not os.path.isfile(path):
+        logging.info("Path {}: does not exist.".format(path))
+        return False
+
+    # If file is not a Nix expression, we quit.
+    if not path.endswith(".nix"):
+        logging.info("Path {}: does not end with `.nix`.".format(path))
+        return False
+
+    try:
+        return _update_package(path, target)
+    except ValueError as e:
+        logging.warning("Path {}: {}".format(path, e))
+        return False
+
+
+def _commit(path, pname, old_version, new_version, **kwargs):
+    """Commit result.
+    """
+
+    msg = f'python: {pname}: {old_version} -> {new_version}'
+
+    try:
+        subprocess.check_call([GIT, 'add', path])
+        subprocess.check_call([GIT, 'commit', '-m', msg])
+    except subprocess.CalledProcessError as e:
+        subprocess.check_call([GIT, 'checkout', path])
+        raise subprocess.CalledProcessError(f'Could not commit {path}') from e
+
+    return True
+
+
+def main():
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('package', type=str, nargs='+')
+    parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
+    parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
+
+    args = parser.parse_args()
+    target = args.target
+
+    packages = list(map(os.path.abspath, args.package))
+
+    logging.info("Updating packages...")
+
+    # Use threads to update packages concurrently
+    with Pool() as p:
+        results = list(p.map(lambda pkg: _update(pkg, target), packages))
+
+    logging.info("Finished updating packages.")
+
+    # Commits are created sequentially.
+    if args.commit:
+        logging.info("Committing updates...")
+        list(map(lambda x: _commit(**x), filter(bool, results)))
+        logging.info("Finished committing updates")
+
+    count = sum(map(bool, results))
+    logging.info("{} package(s) updated".format(count))
+
+
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a1a08efca..8cdbff37956 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7916,6 +7916,8 @@ in
   python37Packages = recurseIntoAttrs python37.pkgs;
   pypyPackages = pypy.pkgs;
 
+  update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };
+
   # Should eventually be moved inside Python interpreters.
   python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
 

From 8273e650fa1459fc167996e7591842d4346487ca Mon Sep 17 00:00:00 2001
From: Notkea <pacien@users.noreply.github.com>
Date: Fri, 7 Dec 2018 16:05:58 +0100
Subject: [PATCH 1497/2793] todoman: 3.4.1 -> 3.5.0

updating to latest version and remove already included patch
---
 pkgs/applications/office/todoman/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index 740224b15b3..3f4953fc12a 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -5,12 +5,12 @@ let
 in
 buildPythonApplication rec {
   pname = "todoman";
-  version = "3.4.1";
+  version = "3.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5";
+    sha256 = "051qjdpwif06x7qspnb4pfwdhb8nnmz99yqcp4kla5hv0n3jh0w9";
   };
 
     LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
@@ -29,13 +29,6 @@ buildPythonApplication rec {
   makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
                       "--set CHARSET en_us.UTF-8" ];
 
-  patches = [
-   (fetchpatch {
-     url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch";
-     sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag";
-    })
-  ];
-
   preCheck = ''
     # Remove one failing test that only checks whether the command line works
     rm tests/test_main.py

From 6e54e9561618459d0d0da2fb79efc5ae25aed94e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 7 Dec 2018 07:52:07 -0500
Subject: [PATCH 1498/2793] pythonPackages.rednose: fix build on darwin

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

diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix
index d9736dcb6f3..8257ca87dd9 100644
--- a/pkgs/development/python-modules/rednose/default.nix
+++ b/pkgs/development/python-modules/rednose/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, nose, six, colorama, termstyle }:
 
 buildPythonPackage rec {
   pname = "rednose";
@@ -13,10 +13,14 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
   '';
 
+  # Do not test on Python 2 darwin because the tests suite gets stuck
+  # https://github.com/JBKahn/rednose/issues/23
+  doCheck = !(stdenv.isDarwin && isPy27);
+
   checkInputs = [ six ];
   propagatedBuildInputs = [ nose colorama termstyle ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A python nose plugin adding color to console results";
     homepage = https://github.com/JBKahn/rednose;
     license = licenses.mit;

From d41661cea726e17734e6ed27beb58931ee02ad5d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 7 Dec 2018 16:04:49 +0000
Subject: [PATCH 1499/2793] virtualbox: 5.2.14 -> 5.2.22

I had to drop xorriso because it didn't seem to want to compile with it
any more, and had to add libopus as a build input because it wouldn't
compile without that.
---
 .../virtualization/virtualbox/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 72b2131764d..66a9872b06d 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
-, libpng, glib, lvm2, libXrandr, libXinerama
+, libpng, glib, lvm2, libXrandr, libXinerama, libopus
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, nettools, dbus
-, xorriso, makeself, perl
+, makeself, perl
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python2 ? null
 , extensionPack ? null, fakeroot ? null
@@ -20,8 +20,8 @@ let
   python = python2;
   buildType = "release";
   # Remember to change the extpackRev and version in extpack.nix as well.
-  main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644";
-  version = "5.2.14";
+  main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
+  version = "5.2.22";
 in stdenv.mkDerivation {
   name = "virtualbox-${version}";
 
@@ -36,8 +36,8 @@ in stdenv.mkDerivation {
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
-      libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
-      libXmu libpng python ]
+      libcap glib lvm2 alsaLib curl libvpx pam makeself perl
+      libXmu libpng libopus python ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
@@ -122,7 +122,7 @@ in stdenv.mkDerivation {
       ${optionalString (!pulseSupport) "--disable-pulse"} \
       ${optionalString (!enableHardening) "--disable-hardening"} \
       ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
-      --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs
+      --disable-kmods
     sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
         -i AutoConfig.kmk
     sed -e 's@arch/x86/@@' \

From 698b613564cc70f8f25a49b00bb7daf7457475ed Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 7 Dec 2018 16:05:55 +0000
Subject: [PATCH 1500/2793] virtualboxExtpack: 5.2.14 -> 5.2.22

Looks like the URL format has changed. Or maybe this is just the first
version and doesn't have a revision? I don't know.
---
 pkgs/applications/virtualization/virtualbox/extpack.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index bd7a0c0f099..703bf813686 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -2,13 +2,12 @@
 
 with lib;
 
-let extpackRev = "123301";
-    version = "5.2.14";
+let version = "5.2.22";
 in
 fetchurl rec {
-  name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack";
-  url = "http://download.virtualbox.org/virtualbox/${version}/${name}";
-  sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e";
+  name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
+  url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
+  sha256 = "1vria59m7xr521hp2sakfihv8282xcfd5hl6dr1gbcjicmk514kp";
 
   meta = {
     description = "Oracle Extension pack for VirtualBox";

From 40c8969b4c9a743332be781ba4739165f03f8b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Dec 2018 16:44:49 +0000
Subject: [PATCH 1501/2793] quassel-webserver: remove

Package is broken and the original maintainer does not respond.
Unless someone wants to pick it up, I propose the removal.

fixes #51614
---
 nixos/modules/module-list.nix                 |   1 -
 .../services/web-apps/quassel-webserver.nix   | 101 ------------------
 .../node-packages/node-packages-v10.json      |   1 -
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 105 deletions(-)
 delete mode 100644 nixos/modules/services/web-apps/quassel-webserver.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e2b2666888c..0df6e52b8cf 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -714,7 +714,6 @@
   ./services/web-apps/restya-board.nix
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
-  ./services/web-apps/quassel-webserver.nix
   ./services/web-apps/virtlyst.nix
   ./services/web-apps/youtrack.nix
   ./services/web-servers/apache-httpd/default.nix
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
deleted file mode 100644
index 2ba5698d6cb..00000000000
--- a/nixos/modules/services/web-apps/quassel-webserver.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.quassel-webserver;
-  quassel-webserver = cfg.pkg;
-  settings = ''
-    module.exports = {
-      default: {
-        host: '${cfg.quasselCoreHost}',  // quasselcore host
-        port: ${toString cfg.quasselCorePort},  // quasselcore port
-        initialBacklogLimit: ${toString cfg.initialBacklogLimit},  // Amount of backlogs to fetch per buffer on connection
-        backlogLimit: ${toString cfg.backlogLimit},  // Amount of backlogs to fetch per buffer after first retrieval
-        securecore: ${boolToString cfg.secureCore},  // Connect to the core using SSL
-        theme: '${cfg.theme}'  // Default UI theme
-      },
-      themes: ['default', 'darksolarized'],  //  Available themes
-      forcedefault: ${boolToString cfg.forceHostAndPort},  // Will force default host and port to be used, and will hide the corresponding fields in the UI
-      prefixpath: '${cfg.prefixPath}'  // Configure this if you use a reverse proxy
-    };
-  '';
-  settingsFile = pkgs.writeText "settings-user.js" settings;
-in {
-  options = {
-    services.quassel-webserver = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Whether to enable the quassel webclient service";
-      };
-      pkg = mkOption {
-        default = pkgs.quassel-webserver;
-        defaultText = "pkgs.quassel-webserver";
-        type = types.package;
-        description = "The quassel-webserver package";
-      };
-      quasselCoreHost = mkOption {
-        default = "";
-        type = types.str;
-        description = "The default host of the quassel core";
-      };
-      quasselCorePort = mkOption {
-        default = 4242;
-        type = types.int;
-        description = "The default quassel core port";
-      };
-      initialBacklogLimit = mkOption {
-        default = 20;
-        type = types.int;
-        description = "Amount of backlogs to fetch per buffer on connection";
-      };
-      backlogLimit = mkOption {
-        default = 100;
-        type = types.int;
-        description = "Amount of backlogs to fetch per buffer after first retrieval";
-      };
-      secureCore = mkOption {
-        default = true;
-        type = types.bool;
-        description = "Connect to the core using SSL";
-      };
-      theme = mkOption {
-        default = "default";
-        type = types.str;
-        description = "default or darksolarized";
-      };
-      prefixPath = mkOption {
-        default = "";
-        type = types.str;
-        description = "Configure this if you use a reverse proxy. Must start with a '/'";
-        example = "/quassel";
-      };
-      port = mkOption {
-        default = 60443;
-        type = types.int;
-        description = "The port the quassel webserver should listen on";
-      };
-      useHttps = mkOption {
-        default = true;
-        type = types.bool;
-        description = "Whether the quassel webserver connection should be a https connection";
-      };
-      forceHostAndPort = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Force the users to use the quasselCoreHost and quasselCorePort defaults";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.quassel-webserver = {
-      description = "A web server/client for Quassel";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${quassel-webserver}/lib/node_modules/quassel-webserver/bin/www -p ${toString cfg.port} -m ${if cfg.useHttps == true then "https" else "http"} -c ${settingsFile}";
-      };
-    };
-  };
-}
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index ebebbd5de43..4a1136901e7 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -87,7 +87,6 @@
 , "parcel-bundler"
 , "prettier"
 , "pulp"
-, "quassel-webserver"
 , "react-tools"
 , "react-native-cli"
 , "s3http"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cdbff37956..997eb53dbf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18794,8 +18794,6 @@ in
     withKDE = false;
   };
 
-  quassel-webserver = nodePackages.quassel-webserver;
-
   quirc = callPackage ../tools/graphics/quirc {};
 
   quilter = callPackage ../applications/editors/quilter { };

From 4a8d0927e18267794c14ed63d790a42da27da74c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 7 Dec 2018 17:49:33 +0100
Subject: [PATCH 1502/2793] bundix: 2.4.0 -> 2.4.1 (#51660)

fixes #51656
---
 pkgs/development/ruby-modules/bundix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index d0782513c75..45be83f6ebe 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -6,13 +6,13 @@ buildRubyGem rec {
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "manveru";
     repo = "bundix";
     rev = version;
-    sha256 = "1lq8nday6031mj7ivnk2wd47v2smz6frnb8xh2yhyhpld045v1rz";
+    sha256 = "175qmv7dj7v50v71b78dzn5pb4a35ml6p15asks9q1rrlkz0n4gn";
   };
 
   buildInputs = [ ruby bundler ];

From a17d94a295a03101be29594fcbe8431f2547abe6 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Fri, 7 Dec 2018 15:38:04 +0100
Subject: [PATCH 1503/2793] opusTools: 0.1.10 -> 0.2

---
 pkgs/applications/audio/opus-tools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 658ba1700f2..85d0e1fbaf7 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
+{stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.10";
+  name = "opus-tools-0.2";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2";
+    sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libogg libao libopus flac ];
+  buildInputs = [ libogg libao flac opusfile libopusenc ];
 
   meta = {
     description = "Tools to work with opus encoded audio streams";

From a14af16cfc8307e560ed6de573f81888d8424aad Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Fri, 7 Dec 2018 19:35:43 +0100
Subject: [PATCH 1504/2793] polkit: add patch for CVE-2018-19788

unprivileged users with UID > INT_MAX can successfully execute any systemctl command
Original issue: https://gitlab.freedesktop.org/polkit/polkit/issues/74
---
 pkgs/development/libraries/polkit/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 625e0d3e104..8093aec6bcc 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
     sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg";
   };
 
+  patches = [
+    # CVE-2018-19788 - high UID fixup
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch";
+      name = "CVE-2018-19788.patch";
+      sha256 = "1y3az4mlxx8k1zcss5qm7k102s7k1kqgcfnf11j9678fh7p008vp";
+    })
+  ];
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i -e "s/-Wl,--as-needed//" configure.ac

From 9f86eccafcc0f953b4742ab02ca2ac229733367b Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 1 Dec 2018 19:53:14 +0100
Subject: [PATCH 1505/2793] dropbox: add mesa, libxshmfence and libpthreadstubs

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 047ad734bd4..9862fe7576d 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -36,7 +36,7 @@ buildFHSUserEnv {
     libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
     libXxf86vm libxcb xkeyboardconfig
     curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
-    procps zlib
+    procps zlib mesa libxshmfence libpthreadstubs
   ];
 
   extraInstallCommands = ''

From d53077b20c4fb09aac0d5b32ee1fe0094f206f81 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 7 Dec 2018 22:42:55 +0300
Subject: [PATCH 1506/2793] nixos/bash: set title in PS1

---
 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 d325fff6a57..2b01c9d26c4 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -98,7 +98,7 @@ in
           if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
             PROMPT_COLOR="1;31m"
             let $UID && PROMPT_COLOR="1;32m"
-            PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+            PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
             if test "$TERM" = "xterm"; then
               PS1="\[\033]2;\h:\u:\w\007\]$PS1"
             fi

From 54b6c586a615bb7c615092874ce2e4963a12e3b1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 7 Dec 2018 21:13:42 +0000
Subject: [PATCH 1507/2793] cni: Remove go from runtime closure

---
 pkgs/applications/networking/cluster/cni/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 0f232772f07..130ccdc8311 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go }:
+{ stdenv, fetchFromGitHub, go, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   name = "cni-${version}";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
   };
 
-  buildInputs = [ go ];
+  buildInputs = [ removeReferencesTo go ];
+
+  GOCACHE = "off";
 
   buildPhase = ''
     patchShebangs build.sh
@@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
     mv bin/cnitool $out/bin
   '';
 
+  preFixup = ''
+    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+  '';
+
   meta = with stdenv.lib; {
     description = "Container Network Interface - networking for Linux containers";
     license = licenses.asl20;

From 2a7b82ca449c98eaba1bbb7870d2bbfcc1da71be Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 7 Dec 2018 21:14:03 +0000
Subject: [PATCH 1508/2793] cni-plugins: Remove go from runtime closure

---
 pkgs/applications/networking/cluster/cni/plugins.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 148e98ced80..27e0a038310 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, go }:
+{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   name = "cni-plugins-${version}";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
   };
 
-  buildInputs = [ go ];
+  buildInputs = [ removeReferencesTo go ];
+
+  GOCACHE = "off";
 
   buildPhase = ''
     patchShebangs build.sh
@@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
     mv bin/* $out/bin
   '';
 
+  preFixup = ''
+    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+  '';
+
   meta = with lib; {
     description = "Some standard networking plugins, maintained by the CNI team";
     homepage = https://github.com/containernetworking/plugins;

From a898f88d579299e34393eea827cd45edfa16300b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 7 Dec 2018 16:44:01 -0500
Subject: [PATCH 1509/2793] rstudioWrapper: include desktop file

---
 pkgs/development/r-modules/wrapper-rstudio.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 5cbedf403d2..c89773c2dd5 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -23,6 +23,7 @@ runCommand (rstudio.name + "-wrapper") {
 }
 ''
 mkdir $out
+ln -s ${rstudio}/share $out
 echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
 echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
 echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR

From b9c9de25b8b0974705d5861697558e8d549437de Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Dec 2018 16:14:08 -0600
Subject: [PATCH 1510/2793] elementary-icon-theme: 5.0 -> 5.0.1

---
 pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 75847041ce6..2716658ee36 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "elementary-icon-theme-${version}";
-  version = "5.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
     rev = version;
-    sha256 = "146s26q4bb5sag35iv42hrnbdciam2ajl7s5s5jayli5vp8bw08w";
+    sha256 = "1rw924b3ixfdff368dpv4vgsykwncmrvj9a6yfss0cf236xnvr9b";
   };
 
   nativeBuildInputs = [ meson ninja python3 gtk3 ];

From 4f1b5653cfbcd27eb1837e6841a49a3806cd3b3b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Dec 2018 12:11:48 -0600
Subject: [PATCH 1511/2793] vnstat: 1.18 -> 2.1

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

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index d689b17fe32..289d1dffc96 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, gd, ncurses }:
+{ stdenv, fetchurl, gd, ncurses, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
-  version = "1.18";
+  version = "2.1";
 
   src = fetchurl {
-    sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp";
+    sha256 = "0yk0x6bg9f36dsslhayyyi8fg04yvzjzqkjmlrcsrv6nnggchb6i";
     url = "https://humdi.net/vnstat/${name}.tar.gz";
   };
 
-  buildInputs = [ gd ncurses ];
+  buildInputs = [ gd ncurses sqlite ];
 
   postPatch = ''
     substituteInPlace src/cfg.c --replace /usr/local $out

From 3b6de728362bb9047d19ca418a9ecd48b7e5f534 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 7 Dec 2018 21:37:19 -0500
Subject: [PATCH 1512/2793] agda: use exec in agdaWrapper

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

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 356fd058cac..16fe748c3e5 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -78,7 +78,7 @@ let
           # Makes a wrapper available to the user. Very useful in
           # nix-shell where all dependencies are -i'd.
           agdaWrapper = writeShellScriptBin "agda" ''
-            ${self.agdaWithArgs} "$@"
+            exec ${self.agdaWithArgs} "$@"
           '';
         in [agdaWrapper] ++ self.buildDepends;
       };

From a02863edaca737f82a78c29b11f05e28cbcb1e6a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 6 Dec 2018 13:45:09 -0600
Subject: [PATCH 1513/2793] aminal: 0.7.8 -> 0.7.12

---
 pkgs/applications/misc/aminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 77f758394e5..e80921f46eb 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "aminal-${version}";
-  version = "0.7.8";
+  version = "0.7.12";
 
   goPackagePath = "github.com/liamg/aminal";
 
@@ -36,7 +36,7 @@ buildGoPackage rec {
     owner = "liamg";
     repo = "aminal";
     rev = "v${version}";
-    sha256 = "02gamvvs56w4zwqdvalbsgb2gbh0398gl7qk36pgyqkcgj3bcwv8";
+    sha256 = "1ak5g2i4ggi00b4q7qigfwsrwb5rvswjjbr2hp9kyxd45nycb0g4";
   };
 
   preBuild = ''

From 9a9d26fb77b17a58429e6aa20c010c856e63d7fd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 6 Dec 2018 13:44:39 -0600
Subject: [PATCH 1514/2793] elfinfo: 0.7.4 -> 0.7.5

https://github.com/xyproto/elfinfo/releases/tag/0.7.5
---
 pkgs/development/tools/misc/elfinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index bdf4d861466..51a5f52d375 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "elfinfo-${version}";
-  version = "0.7.4";
+  version = "0.7.5";
 
   goPackagePath = "github.com/xyproto/elfinfo";
   src = fetchFromGitHub {
     rev = version;
     owner = "xyproto";
     repo = "elfinfo";
-    sha256 = "12n86psri9077v7s6b4j7djg5kijf9gybd80f9sfs0xmgkbly3gv";
+    sha256 = "0b6zyfq0yhpbf03h52q2lgf6ff086gcsbnhm6chx18h0q1g17m96";
   };
 
   meta = with stdenv.lib; {

From 4046248c74f45051902edba1c3bf9e6b2d105a39 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 6 Dec 2018 00:54:55 -0600
Subject: [PATCH 1515/2793] dbus: 1.12.10 -> 1.12.12

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 3ca2bdd9abe..6d85fe1233c 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.12.10";
-  sha256 = "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab";
+  version = "1.12.12";
+  sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From 627e135935343dcd6ea4fd5871efc198b44e6aae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 5 Dec 2018 17:56:07 -0600
Subject: [PATCH 1516/2793] wayland-protocols: 1.16 -> 1.17

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

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 54fa9447775..b14dc03385c 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "wayland-protocols-${version}";
-  version = "1.16";
+  version = "1.17";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b";
+    sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 64a72afe63621997649735e9506463bad863070c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 5 Dec 2018 02:14:16 -0600
Subject: [PATCH 1517/2793] terminology: 1.2.1 -> 1.3.0

---
 pkgs/desktops/enlightenment/terminology.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 3b00ab55835..3cac8bca2d3 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "1ii8332bl88l8md3gvz5dhi9bjpm6shyf14ck9kfyy7d56hp71mc";
+    sha256 = "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r";
   };
 
   nativeBuildInputs = [

From 5eff07f211b2287e92de8ef39537988344972ef5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 4 Dec 2018 18:28:38 -0600
Subject: [PATCH 1518/2793] xf86videointel: 2017-10-19 -> 2018-12-03

---
 pkgs/servers/x11/xorg/overrides.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 48e67ac74a8..2157b7267d7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -640,11 +640,11 @@ self: super:
 
   xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
     # the update script only works with released tarballs :-/
-    name = "xf86-video-intel-2017-10-19";
+    name = "xf86-video-intel-2018-12-03";
     src = fetchurl {
       url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/"
-          + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz";
-      sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby";
+          + "e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.gz";
+      sha256 = "01136zljk6liaqbk8j9m43xxzqj6xy4v50yjgi7l7g6pp8pw0gx6";
     };
     buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman];
     nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];

From 01fab8778f2cc880698ba45128befe128c701ff3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 4 Dec 2018 00:45:15 -0600
Subject: [PATCH 1519/2793] sssd: 1.16.2 -> 1.16.3 (security!)

https://docs.pagure.org/SSSD.sssd/users/relnotes/notes_1_16_3.html
---
 pkgs/os-specific/linux/sssd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 7ee0f8d4ba1..79a79ac34a0 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "sssd-${version}";
-  version = "1.16.2";
+  version = "1.16.3";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
-    sha256 = "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy";
+    sha256 = "1i2fq37w0k71xwqcq1i4l3nglmwybc4694xbrccrih33qsh1fpgf";
   };
 
   patches = [

From be034ca70e9e0161ab4cbafda3428f3b035579c7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 2 Dec 2018 14:53:23 -0600
Subject: [PATCH 1520/2793] mercurial: install zsh completions

---
 pkgs/applications/version-management/mercurial/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 35d374866c8..e8b669d3d46 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -50,7 +50,8 @@ in python2Packages.buildPythonApplication {
       chmod u+x $out/share/cgi-bin/hgweb.cgi
 
       # install bash completion
-      install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial
+      install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/mercurial
+      install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
     '';
 
   meta = {

From cf3542bf92c458fea63762d8a6eed145a62a323b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 23:53:38 -0600
Subject: [PATCH 1521/2793] xpad: 5.1.0 -> 5.2.0

---
 pkgs/applications/misc/xpad/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
index fdd468a9c06..f066876f573 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -1,23 +1,19 @@
 { stdenv, fetchurl
 , autoreconfHook, pkgconfig, wrapGAppsHook
-, glib, intltool, gtk3, gtksourceview }:
+, glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "xpad-${version}";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = fetchurl {
     url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
-    sha256 = "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3";
+    sha256 = "1ab33vg3fz57lz19jjwa3vp3vnln4pnh60hwlkq59la53s8lyijk";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ glib intltool gtk3 gtksourceview ];
-
-  autoreconfPhase = ''
-    ./autogen.sh
-  '';
+  buildInputs = [ glib intltool gtk3 gtksourceview hicolor-icon-theme ];
 
   meta = with stdenv.lib; {
     description = "A sticky note application for jotting down things to remember";

From 273ec1886a20b756728c6054a3db4db869ff7d70 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 21:16:27 -0600
Subject: [PATCH 1522/2793] libmicrohttpd: 0.9.60 -> 0.9.61

err, changelog:
https://gnunet.org/git/libmicrohttpd.git/commit/?h=v0.9.61&id=a78bc73beb1c34421659258801569128b256f797
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index b284f321895..0b3b2418af4 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmicrohttpd-${version}";
-  version = "0.9.60";
+  version = "0.9.61";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0wf457bqbdvx53clk4dg2620p83vk4757l7lrpvmxrd9jlzms3nd";
+    sha256 = "0dfl96l5wxqmswdqsdxqisflvm0padk9rikxyrhrx9rhm6s6ki6v";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];

From 2ac1807deac2d67c839e0ecf62091389d84afcb2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 7 Dec 2018 22:30:17 -0500
Subject: [PATCH 1523/2793] elementary-icon-theme: don't install pallette file

---
 pkgs/data/icons/elementary-icon-theme/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 2716658ee36..4c3beaaef2b 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja python3 gtk3 ];
 
+  # Disable installing gimp and inkscape palette files
+  mesonFlags = [
+    "-Dpalettes=false"
+  ];
+
   postPatch = ''
     chmod +x meson/symlink.py
     patchShebangs .

From 05f6ec295f63d64763be882aa59c1e8fab187172 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 29 Nov 2018 21:16:16 -0600
Subject: [PATCH 1524/2793] lighttpd: 1.4.51 -> 1.4.52

https://www.lighttpd.net/2018/11/28/1.4.52/
---
 pkgs/servers/http/lighttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 9503fd14907..cdebbf739e6 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.51";
+  name = "lighttpd-1.4.52";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a";
+    sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17";
   };
 
   postPatch = ''

From 41194fc19c798630d3e9fc3c7702f972beb81eb6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 3 Dec 2018 00:52:00 -0600
Subject: [PATCH 1525/2793] mtools: 4.0.21 -> 4.0.22

https://lists.gnu.org/archive/html/info-gnu/2018-12/msg00000.html
---
 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 de9d1a16fdb..956b0039489 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.21";
+  name = "mtools-4.0.22";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1kybydx74qgbwpnjvjn49msf8zipchl43d4cq8zzwcyvfkdzw7h2";
+    sha256 = "08shiy9am4x65yg8l5mplj8jrvsimzbaf2id8cmfc02b00i0yb35";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

From f8a88b398916848ae452615584c9437020ef08e3 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 8 Dec 2018 07:56:26 +0300
Subject: [PATCH 1526/2793] monero: change desktop shortcut name to Monero

---
 pkgs/applications/altcoins/monero-gui/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index d1177c82fd6..331ef6b92a4 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     name = "monero-wallet-gui";
     exec = "monero-wallet-gui";
     icon = "monero";
-    desktopName = "Monero Wallet";
+    desktopName = "Monero";
     genericName = "Wallet";
     categories  = "Application;Network;Utility;";
   };

From acc45d8f4fc375f841a034da5f91f6b0dc96f59c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 00:32:26 -0500
Subject: [PATCH 1527/2793] postgresql: Build with icu support

---
 pkgs/servers/sql/postgresql/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index f802de9df9d..d62481339bd 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -1,9 +1,14 @@
-{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd }:
+{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd, icu, pkgconfig }:
 
 let
 
   common = { version, sha256, psqlSchema }:
-   let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
+  let
+    atLeast = lib.versionAtLeast version;
+
+    # Build with ICU by default on versions that support it
+    icuEnabled = atLeast "10";
+  in stdenv.mkDerivation (rec {
     name = "postgresql-${version}";
     inherit version;
 
@@ -17,9 +22,12 @@ let
 
     buildInputs =
       [ zlib readline openssl libxml2 makeWrapper ]
+      ++ lib.optionals icuEnabled [ icu ]
       ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
+    nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ];
+
     enableParallelBuilding = !stdenv.isDarwin;
 
     makeFlags = [ "world" ];
@@ -37,7 +45,7 @@ let
       "--with-system-tzdata=${tzdata}/share/zoneinfo"
       (lib.optionalString (atLeast "9.6" && !stdenv.isDarwin) "--with-systemd")
       (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
-    ];
+    ] ++ lib.optionals icuEnabled [ "--with-icu" ];
 
     patches =
       [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)

From 6492af66e1b2cbcc61a4b7874d29dd84f5f1b078 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 7 Dec 2018 13:17:57 -0500
Subject: [PATCH 1528/2793] vulkan-validation-layers: 1.1.82.0 -> 1.1.85.0

This requires knock-on upgrades for glslang and spirv-tools.

I have also made the validation layers easier to use:
- library files identified by layer definitions now use absolute paths
- the layer definition path is prepended to XDG_DATA_DIRS

Previously, one would have to modify LD_LIBRARY_PATH or install the
derivation in a known location for vulkan-loader to find relevant
files. These changes make using validation layers in a nix-shell work automatically.

Use XDG_DATA_DIRS environment variable rather than VK_LAYER_PATH
---
 .../development/compilers/glslang/default.nix | 14 +++----------
 .../development/tools/spirv-tools/default.nix | 10 +++++-----
 .../vulkan-validation-layers/default.nix      | 20 +++++++++++++++----
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index eb444fffe89..62c5a0de0a9 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -2,23 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "glslang-git-${version}";
-  version = "2018-07-27";
+  version = "2018-09-26";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "e99a26810f65314183163c07664a40e05647c15f";
-    sha256 = "1w11z518xfbnf34xgzg1mp3xicpw2qmpcvaixlzw79s9ifqg5lqs";
+    rev = "91ac4290bcf2cb930b4fb0981f09c00c0b6797e1";
+    sha256 = "0q477pm0n495acnss16ddlf82a6i5l2dfmvc7r8yi0bgmgpzi4av";
   };
 
-  patches = [
-    # spirv-tools bump for vulkan sdk 1.1.82.1; remove on update
-    (fetchpatch {
-      url = "https://github.com/lenny-lunarg/glslang/commit/c7f4e818ac55f545289f87f8c37571b2eadcde86.patch";
-      sha256 = "197293alxjdpm3x1vd6pksdb1d9za42vlyn8yn2w786av0l7vf1k";
-    })
-  ];
-
   buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 7d17170930a..5100b3624c4 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -7,14 +7,14 @@ spirv_sources = {
   tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "1a283f41ed09e31cd720744f904af3d823ceddbf";
-    sha256 = "1z65wglg081pri9rmiyydvppgd67qr269ppphy4yhg2wg81gg72c";
+    rev = "9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661";
+    sha256 = "1spfii4zib1lmz40vnz1d1cr6is7q2n7rvar1vfzi33gwrn8rqhi";
   };
   headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "ff684ffc6a35d2a58f0f63108877d0064ea33feb";
-    sha256 = "0ypjx61ksr6vda2iy3kxhyjia5qxf0x4qa4jij0giw9x5rsnga6g";
+    rev = "d5b2e1255f706ce1f88812217e9a554f299848af";
+    sha256 = "18530mpa030ckjhn78z9vbfd35l5jgh3mg22ra6k8gw8zx4wjhsl";
   };
 };
 
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
-  version = "2018-07-04";
+  version = "2018-09-20";
 
   src = spirv_sources.tools;
   patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index e5ab05e93bd..c76c670739e 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader,
-  glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
+{ stdenv, fetchFromGitHub, cmake, writeText, python3
+, vulkan-headers, vulkan-loader, glslang
+, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   name = "vulkan-validation-layers-${version}";
-  version = "1.1.82.0";
+  version = "1.1.85.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "0vq2hbha2i5wsi6w6kmxbv01a5f0d55w2grl73nya9i06764fdg6";
+    sha256 = "1y5ny587h62139fxnz760hsyv1dmw29m1a9vq096sn8qafh3jzbz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,6 +19,17 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
 
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
+  '';
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  patchPhase = ''
+    sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt
+  '';
+
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
     homepage    = https://www.lunarg.com;

From c37ae1dcf669b5b262350ddbb75a40be166e7e88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Dec 2018 11:45:41 +0100
Subject: [PATCH 1529/2793] ghc: add new compiler version 8.6.3

---
 pkgs/development/compilers/ghc/8.6.3.nix | 232 +++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix      |  11 ++
 2 files changed, 243 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.6.3.nix

diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix
new file mode 100644
index 00000000000..b29b7facd1f
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.6.3.nix
@@ -0,0 +1,232 @@
+{ stdenv, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+
+, 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"
+}:
+
+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.6.3";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "08vzq0dpg4a39bs61j6rq4z0n7jby5mc69h4m25xhd8rjyvkg7lz";
+  };
+
+  enableParallelBuilding = true;
+
+  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.
+  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 sphinx
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+  postInstall = ''
+    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.6.3";
+  };
+
+  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 357ab21fba1..af9ca77d9d2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -68,6 +68,12 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_6;
       llvmPackages = pkgs.llvmPackages_6;
     };
+    ghc863 = callPackage ../development/compilers/ghc/8.6.3.nix {
+      bootPkgs = packages.ghc822;
+      inherit (buildPackages.python3Packages) sphinx;
+      buildLlvmPackages = buildPackages.llvmPackages_6;
+      llvmPackages = pkgs.llvmPackages_6;
+    };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs = packages.ghc822Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -130,6 +136,11 @@ in {
       ghc = bh.compiler.ghc862;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
     };
+    ghc863 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc863;
+      ghc = bh.compiler.ghc863;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;

From 9bca1c6979f2e06cbcd63ee09ae3834dea05ac73 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Dec 2018 10:11:48 +0100
Subject: [PATCH 1530/2793] julia: default to 1.0

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cdbff37956..292541df7e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7188,7 +7188,8 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
-  julia = julia_06;
+  julia_1 = julia_10;
+  julia = julia_1;
 
   jwasm =  callPackage ../development/compilers/jwasm { };
 

From a4700aa526c2de1e4dc234215fdee5bc3c8ea4e5 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Tue, 27 Nov 2018 10:50:31 +0100
Subject: [PATCH 1531/2793] openjpeg: fix for CVE-2018-18088

---
 pkgs/development/libraries/openjpeg/2.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index 77d9e5829a1..fd9c7eea8c2 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -12,5 +12,10 @@ callPackage ./generic.nix (args // rec {
       url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
       sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
     })
+    (fetchpatch {
+      name = "CVE-2017-17480+CVE-2018-18088.patch";
+      url = "https://github.com/uclouvain/openjpeg/commit/92023cd6c377e0384a7725949b25655d4d94dced.patch";
+      sha256 = "0rrxxqcp3vjkmvywxj9ac766m3fppy0x0nszrkf8irrqy1gnp38k";
+    })
   ];
 })

From 4bb55815be4096b1e07fed71cd62636a37a7f07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 8 Dec 2018 14:35:07 +0100
Subject: [PATCH 1532/2793] nixos lirc: fix owner-ship of runtime directory

---
 nixos/modules/services/hardware/lirc.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index 5635d6f0971..0072406a438 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -49,6 +49,7 @@ in {
       description = "LIRC daemon socket";
       wantedBy = [ "sockets.target" ];
       socketConfig = {
+        # default search path
         ListenStream = "/run/lirc/lircd";
         SocketUser = "lirc";
         SocketMode = "0660";
@@ -66,9 +67,19 @@ in {
       serviceConfig = {
         RuntimeDirectory = "lirc";
 
-        # socket lives in runtime directory; we have to keep is available
+        # Service runtime directory and socket share same folder.
+        # Following hacks are necessary to get everything right:
+
+        # 1. prevent socket deletion during stop and restart
         RuntimeDirectoryPreserve = true;
 
+        # 2. fix runtime folder owner-ship, happens when socket activation
+        #    creates the folder
+        PermissionsStartOnly = true;
+        ExecStartPre = [
+          "${pkgs.coreutils}/bin/chown lirc /run/lirc/"
+        ];
+
         ExecStart = ''
           ${pkgs.lirc}/bin/lircd --nodaemon \
             ${escapeShellArgs cfg.extraArguments} \

From 53218d4a39cf2e9a09bec1b56d9ded7c444f71cc Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 8 Dec 2018 14:41:37 +0100
Subject: [PATCH 1533/2793] nixos/systemd-nspawn: accept all Exec and Files
 options

See: https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html
Closes #49712
---
 nixos/modules/system/boot/systemd-nspawn.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 649453418b5..34a34091a7d 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -10,8 +10,13 @@ let
   checkExec = checkUnitConfig "Exec" [
     (assertOnlyFields [
       "Boot" "ProcessTwo" "Parameters" "Environment" "User" "WorkingDirectory"
-      "Capability" "DropCapability" "KillSignal" "Personality" "MachineId"
-      "PrivateUsers" "NotifyReady"
+      "PivotRoot" "Capability" "DropCapability" "NoNewPrivileges" "KillSignal"
+      "Personality" "MachineId" "PrivateUsers" "NotifyReady" "SystemCallFilter"
+      "LimitCPU" "LimitFSIZE" "LimitDATA" "LimitSTACK" "LimitCORE" "LimitRSS"
+      "LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS"
+      "LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME"
+      "OOMScoreAdjust" "CPUAffinity" "Hostname" "ResolvConf" "Timezone"
+      "LinkJournal"
     ])
     (assertValueOneOf "Boot" boolValues)
     (assertValueOneOf "ProcessTwo" boolValues)
@@ -20,8 +25,8 @@ let
 
   checkFiles = checkUnitConfig "Files" [
     (assertOnlyFields [
-      "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystems"
-      "PrivateUsersChown"
+      "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem"
+      "Overlay" "OverlayReadOnly" "PrivateUsersChown"
     ])
     (assertValueOneOf "ReadOnly" boolValues)
     (assertValueOneOf "Volatile" (boolValues ++ [ "state" ]))

From 679a1f728ebd3e13f091ea3651f61cc2e91411e1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 08:56:32 -0500
Subject: [PATCH 1534/2793] texlive: fix link to poppler patch

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

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 73d8b6d0edb..29a7f05af07 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -29,7 +29,7 @@ let
     patches = [
       (fetchurl {
         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;
+        url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin&id=da56abf0f8a1e85daca0ec0f031b8fa268519e6b;
         sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w";
       })
       (fetchurl {

From 07e956171d1c92c9e04845396ece298c2f4be4a6 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Sat, 8 Dec 2018 15:56:19 +0200
Subject: [PATCH 1535/2793] shiboken: add support for Python 3.7

---
 pkgs/development/python-modules/pyside/shiboken.nix        | 4 ++--
 pkgs/development/python-modules/pyside/shiboken_py35.patch | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 43ae52338af..859e91c872e 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }:
+{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }:
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   '';
 
   # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
-  patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch);
+  patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
 
   cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
 
diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/pkgs/development/python-modules/pyside/shiboken_py35.patch
index 32088144ed7..fb095cf991c 100644
--- a/pkgs/development/python-modules/pyside/shiboken_py35.patch
+++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch
@@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs
  # CMAKE_FIND_FRAMEWORKS(Python)
  
 -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
-+FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
    IF(_CURRENT_VERSION GREATER 3.1)
        SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
    ELSE()

From e48b9b5d0e52b049ef3604e7ffbd6754de179c0c Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 7 Nov 2018 17:53:57 +0100
Subject: [PATCH 1536/2793] intel-media-driver: init at 18.3.0

---
 .../libraries/intel-media-driver/default.nix  | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/intel-media-driver/default.nix

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
new file mode 100644
index 00000000000..45a90ff520f
--- /dev/null
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig
+, libva, libpciaccess, intel-gmmlib, libX11
+}:
+
+stdenv.mkDerivation rec {
+  name = "intel-media-driver-${version}";
+  version = "18.3.0";
+
+  src = fetchFromGitHub {
+    owner  = "intel";
+    repo   = "media-driver";
+    rev    = "intel-media-${version}";
+    sha256 = "15kcyg9ss2v1bbw6yvxqb833h1vs0h659n8ix0x5x03cfm1wsi57";
+  };
+
+  cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" ];
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DLIBVA_DRIVERS_PATH=$out/lib/dri"
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/intel/media-driver;
+    license = with licenses; [ bsd3 mit ];
+    description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7291ebe3887..2e31e6538ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10255,6 +10255,8 @@ with pkgs;
 
   intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
 
+  intel-media-driver = callPackage ../development/libraries/intel-media-driver { };
+
   intltool = callPackage ../development/tools/misc/intltool { };
 
   ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix {};

From 9064f2b22d1182ad24fefb5a2c79d4cbc0865da9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 3 Dec 2018 13:29:45 -0600
Subject: [PATCH 1537/2793] packagekit: 1.1.11 -> 1.1.12

---
 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 5ba387a12f8..927c77f30f9 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.11";
+  version = "1.1.12";
 
   outputs = [ "out" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic";
+    sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
   };
 
   buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ]

From d21e281c954146171f1ede51cd38121a8fdc16ca Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Dec 2018 15:29:59 +0100
Subject: [PATCH 1538/2793] dpt-rp1-py: add unstable infix to version

---
 pkgs/tools/misc/dpt-rp1-py/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix
index 8e5b15e5ee5..88359adc318 100644
--- a/pkgs/tools/misc/dpt-rp1-py/default.nix
+++ b/pkgs/tools/misc/dpt-rp1-py/default.nix
@@ -1,7 +1,7 @@
 { lib, python3Packages, fetchFromGitHub }:
 python3Packages.buildPythonApplication rec {
   pname = "dpt-rp1-py";
-  version = "2018-10-16";
+  version = "unstable-2018-10-16";
 
   src = fetchFromGitHub {
     owner = "janten";

From 8dbc8e586cc0704b2801d511a3c02db133ff78a6 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 8 Dec 2018 09:39:05 -0500
Subject: [PATCH 1539/2793] fetchurl: refresh and add extra KDE mirrors

* fetchurl: fix and add extra KDE mirrors (#51480)

- The gwdg.de mirror has moved the relative path of its KDE tarballs
- Add new mirrors from Berkeley and MIT, which are on the list of officially supported mirrors

https://download.kde.org/extra/download-mirrors.html

* More KDE mirror touchups

- The official one is a redirect to HTTPS anyways, so go directly to HTTPS
- Add China USTC for Asian users
- Swap Finland university from FTP to HTTP

* fetchurl: keep one ftp KDE mirror
---
 pkgs/build-support/fetchurl/mirrors.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 852c797a386..2d29728dd95 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -70,13 +70,15 @@ rec {
     ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/
   ];
 
-  # Mirrors of ftp://ftp.kde.org/pub/kde/.
+  # Mirrors from https://download.kde.org/extra/download-mirrors.html
   kde = [
-    "http://download.kde.org/download.php?url="
-    http://ftp.gwdg.de/pub/x11/kde/
-    ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
+    "https://download.kde.org/download.php?url="
+    https://ftp.gwdg.de/pub/linux/kde/
+    https://mirrors.ocf.berkeley.edu/kde/
+    http://mirrors.mit.edu/kde/
+    https://mirrors.ustc.edu.cn/kde/
+    http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
     ftp://ftp.kde.org/pub/kde/
-    ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
   ];
 
   # Gentoo files.

From e32d63223b420d409500531b7be0e9e5e36088ef Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Dec 2018 16:17:25 +0100
Subject: [PATCH 1540/2793] hackrf: 2017.02.1 -> 2018.01.1

Use fetchFromGitHub instead of fetchgit
---
 pkgs/applications/misc/hackrf/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index 6186ed6f8f4..81a66bf503c 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
 
 stdenv.mkDerivation rec {
   name = "hackrf-${version}";
-  version = "2017.02.1";
+  version = "2018.01.1";
 
-  src = fetchgit {
-    url = "git://github.com/mossmann/hackrf";
-    rev = "refs/tags/v${version}";
-    sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
+  src = fetchFromGitHub {
+    owner = "mossmann";
+    repo = "hackrf";
+    rev = "v${version}";
+    sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From df96b2224b9ca6a87c9a7d0f05d179ec583b1135 Mon Sep 17 00:00:00 2001
From: Ben Phipathananunth <bensiraphob@gmail.com>
Date: Sat, 8 Dec 2018 22:11:07 +0700
Subject: [PATCH 1541/2793] polybar: correct description

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

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 9756e8ca6c4..0310b1a2f74 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
 
     meta = with stdenv.lib; {
-      description = "A fast and easy-to-use tool for creatin status bars.";
+      description = "A fast and easy-to-use tool for creating status bars";
       longDescription = ''
         Polybar aims to help users build beautiful and highly customizable
         status bars for their desktop environment, without the need of

From c7ea265e8ee5479343dd54c16781ee9985023a1e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Dec 2018 10:21:55 -0500
Subject: [PATCH 1542/2793] linux: 4.9.143 -> 4.9.144

---
 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 d05eead7f7f..fcb01793067 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.143";
+  version = "4.9.144";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1grcmh85n6ya8h2v0qx2pxryjxx3501kjbknz3a5yrwnlrj69dqf";
+    sha256 = "0avqc9v22jxf9p71279ssa1lhml3hf2zdkc4j0pzms929m1pzl85";
   };
 } // (args.argsOverride or {}))

From e4da78c349b3d472508f299e18188f22028d6201 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Dec 2018 10:22:19 -0500
Subject: [PATCH 1543/2793] linux: 4.14.86 -> 4.14.87

---
 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 a493ae359f7..e9fb0ac7a46 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.86";
+  version = "4.14.87";
 
   # 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 = "0a3f4rn9aixmx6ssqw0yqcr37js790qvb28v40rpg49b0aln14ns";
+    sha256 = "09g12a8lkx5xm3c65q6wbzr2asnws956w2d8apj27avxcmylsx1n";
   };
 } // (args.argsOverride or {}))

From 02f8d66efa337b983a219b1410cbc44c00a30246 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Dec 2018 10:22:27 -0500
Subject: [PATCH 1544/2793] linux: 4.19.7 -> 4.19.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index d432680d445..d4d0fcb243a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.7";
+  version = "4.19.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 = "1lm2s9yhzyqra1f16jrjwd66m3jl43n5k7av2r9hns8hdr1smmw4";
+    sha256 = "0wg1cy8ydd3m6x86mqxmcr4crwhsrmrp62byzq63zw87ydkd0h6m";
   };
 } // (args.argsOverride or {}))

From edc3559c1ae1cd1edeff11af52ae768359b38ba6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Dec 2018 16:35:24 +0100
Subject: [PATCH 1545/2793] pitivi: gst-transcoder: add python3 to
 nativeBuildInputs, fails otherwise

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

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 57ee1cf1275..6aaa4b674a9 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -18,7 +18,7 @@ let
       url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz";
       sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9";
     };
-    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ];
+    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection python3 ];
     buildInputs = with gst; [ gstreamer gst-plugins-base ];
   };
 

From 60532db0d38434667261f71c1718ba3c497b1c54 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 8 Dec 2018 16:34:13 +0100
Subject: [PATCH 1546/2793] libsass: 3.5.4 -> 3.5.5

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

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 38ba93d4f7c..54108e1a007 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,21 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.5.4";
+  version = "3.5.5";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz";
+    sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28";
   };
 
-  patches = [
-    # CVE-2018-11693, is in master but no release yet
-    (fetchpatch {
-      url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch";
-      sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl";
-    })
-  ];
-
   preConfigure = ''
     export LIBSASS_VERSION=${version}
   '';

From ef5161984c7b9c2f4a0bb8a9cd4e83149fa80561 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 6 Dec 2018 13:08:40 +0300
Subject: [PATCH 1547/2793] unit: init at v1.6

---
 pkgs/servers/http/unit/default.nix | 67 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    | 20 ++++++++-
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/http/unit/default.nix

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
new file mode 100644
index 00000000000..68676a07bf0
--- /dev/null
+++ b/pkgs/servers/http/unit/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchurl
+, which
+, python
+, php71
+, php72
+, perl526
+, perl
+, perldevel
+, ruby_2_3
+, ruby_2_4
+, ruby
+, withSSL ? true, openssl ? null
+, withIPv6 ? true
+, withDebug ? false
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "1.6";
+  name = "unit-${version}";
+
+  src = fetchurl {
+    url = "https://unit.nginx.org/download/${name}.tar.gz";
+    sha256 = "0lws5xpzkcmv0gc7vi8pgnymin02dq4gw0zb41jfzq0vbljxxl14";
+  };
+
+  buildInputs = [
+    which
+    python
+    php71
+    php72
+    perl526
+    perl
+    perldevel
+    ruby_2_3
+    ruby_2_4
+    ruby
+  ] ++ optional withSSL openssl;
+
+  configureFlags = [
+    "--control=unix:/run/control.unit.sock"
+    "--pid=/run/unit.pid"
+  ] ++ optional withSSL     [ "--openssl" ]
+    ++ optional (!withIPv6) [ "--no-ipv6" ]
+    ++ optional withDebug   [ "--debug" ];
+
+  postConfigure = ''
+    ./configure python  --module=python    --config=${python}/bin/python-config  --lib-path=${python}/lib
+    ./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib
+    ./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib
+    ./configure perl    --module=perl526   --perl=${perl526}/bin/perl
+    ./configure perl    --module=perl      --perl=${perl}/bin/perl
+    ./configure perl    --module=perl529   --perl=${perldevel}/bin/perl
+    ./configure ruby    --module=ruby23    --ruby=${ruby_2_3}/bin/ruby
+    ./configure ruby    --module=ruby24    --ruby=${ruby_2_4}/bin/ruby
+    ./configure ruby    --module=ruby      --ruby=${ruby}/bin/ruby
+  '';
+
+  meta = {
+    description = "Dynamic web and application server, designed to run applications in multiple languages.";
+    homepage    = https://unit.nginx.org/;
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ izorkin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e939afa1808..a273d116293 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7829,7 +7829,6 @@ in
     php = php72;
   });
 
-
   inherit (callPackages ../development/interpreters/php { })
     php71
     php72;
@@ -7846,6 +7845,20 @@ in
     config.php.apxs2 = false;
   };
 
+  php-unit = php72-unit;
+
+  php71-unit = php71.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+    config.php.fpm = false;
+  };
+
+  php72-unit = php72.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+    config.php.fpm = false;
+  };
+
   picoc = callPackage ../development/interpreters/picoc {};
 
   picolisp = callPackage ../development/interpreters/picolisp {};
@@ -13514,6 +13527,11 @@ in
 
   neard = callPackage ../servers/neard { };
 
+  unit = callPackage ../servers/http/unit {
+    php71 = php71-unit;
+    php72 = php72-unit;
+  };
+
   nginx = nginxStable;
 
   nginxStable = callPackage ../servers/http/nginx/stable.nix {

From 35eb1c21dce382fd73309afb3327da145915d1fc Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 8 Dec 2018 11:07:45 +0300
Subject: [PATCH 1548/2793] phpPackages: add build phpPackages with php-unit

---
 pkgs/top-level/all-packages.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a273d116293..78aa59d48f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7829,6 +7829,15 @@ in
     php = php72;
   });
 
+  phpPackages-unit = php72Packages-unit;
+
+  php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php71-unit;
+  });
+   php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php72-unit;
+  });
+
   inherit (callPackages ../development/interpreters/php { })
     php71
     php72;

From 9c5311251aa6ca9388cef07999ec604aae401812 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 8 Dec 2018 19:18:14 +0300
Subject: [PATCH 1549/2793] php: add option config.php.systemd

---
 pkgs/development/interpreters/php/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix               | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 03a235ae384..67ba470ac01 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -13,6 +13,7 @@ let
   { version
   , sha256
   , extraPatches ? []
+  , withSystemd ? config.php.systemd or stdenv.isLinux
   , imapSupport ? config.php.imap or (!stdenv.isDarwin)
   , ldapSupport ? config.php.ldap or true
   , mhashSupport ? config.php.mhash or true
@@ -68,7 +69,7 @@ let
 
       nativeBuildInputs = [ pkgconfig autoconf ];
       buildInputs = [ flex bison pcre ]
-        ++ optional stdenv.isLinux systemd
+        ++ optional withSystemd systemd
         ++ optionals imapSupport [ uwimap openssl pam ]
         ++ optionals curlSupport [ curl openssl ]
         ++ optionals ldapSupport [ openldap openssl ]
@@ -105,7 +106,7 @@ let
         "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
       ]
       ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
-      ++ optional stdenv.isLinux  "--with-fpm-systemd"
+      ++ optional withSystemd "--with-fpm-systemd"
       ++ optionals imapSupport [
         "--with-imap=${uwimap}"
         "--with-imap-ssl"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78aa59d48f2..daa1d12ffe6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7859,12 +7859,14 @@ in
   php71-unit = php71.override {
     config.php.embed = true;
     config.php.apxs2 = false;
+    config.php.systemd = false;
     config.php.fpm = false;
   };
 
   php72-unit = php72.override {
     config.php.embed = true;
     config.php.apxs2 = false;
+    config.php.systemd = false;
     config.php.fpm = false;
   };
 

From 91a7848fe27d73d7a677fb9f606d7f7b65de16c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 8 Dec 2018 16:29:56 +0000
Subject: [PATCH 1550/2793] nixos/release-notes: mention removal of
 quassel-webserver

---
 nixos/doc/manual/release-notes/rl-1903.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 65cc166c9a0..bade93c0984 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -299,6 +299,12 @@
       <option>services.kubernetes.addons.dns.replicas</option>.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       The quassel-webserver package and module was removed from nixpkgs due to the lack
+       of maintainers.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 02a1851362dc206a818e78760a1a4573edfacfa7 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 8 Dec 2018 17:33:14 +0100
Subject: [PATCH 1551/2793] pelican: 3.7.1 -> 4.0.1

---
 pkgs/development/python-modules/pelican/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 1ee93c753d8..19d9b785349 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "3.7.1";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "0nkxrb77k2bra7bqckg7f5k73wk98hcbz7rimxl8sw05b2bvd62g";
+    sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl";
   };
 
   doCheck = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     glibcLocales
     # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
     # again. Compare https://github.com/getpelican/pelican/pull/2252.
-    # Version 3.7.1 is incompatible with our current pandoc version.
+    # Version 4.0.1 is incompatible with our current pandoc version.
     # pandoc
     git
     mock

From 05882c0a74220543a9ded9aa99c5fc9a11b22418 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Dec 2018 17:45:18 +0100
Subject: [PATCH 1552/2793] weechatScripts.weechat-autosort: init at
 unstable-2018-01-11 (#51729)

Helpful weechat script to automatically keep buffers sorted.

Can be activated like this:

``` nix
weechat.override {
  configure = { ... }: {
    scripts = [
      weechatScripts.weechat-autosort
    ];
  };
}
```
---
 .../irc/weechat/scripts/default.nix           |  2 ++
 .../scripts/weechat-autosort/default.nix      | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix

diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 6324e8ec88c..439e0e11614 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -12,4 +12,6 @@
   wee-slack = callPackage ./wee-slack {
     inherit pythonPackages;
   };
+
+  weechat-autosort = callPackage ./weechat-autosort { };
 }
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
new file mode 100644
index 00000000000..95ae71cc70c
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "weechat-autosort-${version}";
+  version = "unstable-2018-01-11";
+
+  src = fetchFromGitHub {
+    owner = "de-vri-es";
+    repo = "weechat-autosort";
+    rev = "35ccd6335afd78ae8a6e050ed971d54c8524e37e";
+    sha256 = "1rgws960xys65cd1m529csalcgny87h7fkiwjv1yj9rpqp088z26";
+  };
+
+  passthru.scripts = [ "autosort.py" ];
+  installPhase = ''
+    install -D autosort.py $out/share/autosort.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Autosort is a weechat script to automatically or manually keep your buffers sorted";
+    homepage = https://github.com/de-vri-es/weechat-autosort;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}

From a00c862e97562b4fbc7024561a999d01a1feb1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 7 Dec 2018 07:37:25 +0100
Subject: [PATCH 1553/2793] cyrus_sasl: prune .la files

Version 2.1.27 adds `-lkrb5` etc. to `dependency_libs` in all the .la files,
which in turn breaks spice's build. Prune .la's dependency_libs with
pruneLibtoolFiles.
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 4344923f694..20a34adca94 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
 , pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false
-, buildPackages }:
+, buildPackages, pruneLibtoolFiles }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames ];
+  nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ];
   buildInputs =
     [ openssl db gettext kerberos ]
     ++ lib.optional enableLdap openldap

From f92943932de7ff2e7de41b693ad4001900910cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Dec 2018 10:23:55 +0000
Subject: [PATCH 1554/2793] cyrus-sasl: remove non-existing freebsd patch

---
 pkgs/development/libraries/cyrus-sasl/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 20a34adca94..5d84e12cc25 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -24,12 +24,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
     ./cyrus-sasl-ac-try-run-fix.patch
-  ] ++ lib.optional stdenv.isFreeBSD (
-      fetchurl {
-        url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
-        sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
-      }
-    );
+  ];
 
   configureFlags = [
     "--with-openssl=${openssl.dev}"

From ab984d24b0b84a969387deb0abb94ba6d5674066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 8 Dec 2018 17:10:09 +0000
Subject: [PATCH 1555/2793] cyrus-sasl: remove not-needed libtool fixup

since pruneLibtoolFiles is used openssl is no longer referenced
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 5d84e12cc25..27a8b7b1119 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -36,12 +36,6 @@ stdenv.mkDerivation rec {
 
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 
-  postInstall = ''
-    for f in $out/lib/*.la $out/lib/sasl2/*.la; do
-      substituteInPlace $f --replace "${openssl.dev}/lib" "${openssl.out}/lib"
-    done
-  '';
-
   meta = {
     homepage = https://www.cyrusimap.org/sasl;
     description = "Library for adding authentication support to connection-based protocols";

From 0ed7d3c62a9469da91804618f3a81f5360bd7413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 8 Dec 2018 19:14:03 +0100
Subject: [PATCH 1556/2793] ghostscript: 9.25 -> 9.26

---
 pkgs/misc/ghostscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 20b91ba466a..722f5344905 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,8 +9,8 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
   version = "9.${ver_min}";
-  ver_min = "25";
-  sha512 = "18pcqzva7pq2a9mmqf9pq8x4winb6qmzni49vq2qx50k60rwyv1kdmixik3ym2bpj5p1j8g0vb47w7w2cf4lba5q583ylpd8rshn73s";
+  ver_min = "26";
+  sha512 = "0z2mvsh06qgnxl7p9isw7swg8jp8xcx3rnbqk727avw7ammvfh8785d2bn5i4fhz8y45ka3cpgp7b598m06yq5zawijhcnzkq187nrx";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";

From 63c2dabccd77932b483005a689d32d4a15237071 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 8 Dec 2018 18:51:17 +0000
Subject: [PATCH 1557/2793] tmuxinator: 0.11.3 -> 0.13.0

No changes to dependencies.
---
 pkgs/tools/misc/tmuxinator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index be6a5070d61..d7f7c9f1669 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "0.11.3";
-  source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1";
+  version = "0.13.0";
+  source.sha256 = "0jyyih8w8b30czfv0dc642vj8yp8iqyci89hjb2279xmmigjzmwc";
 
   erubis = buildRubyGem rec {
     inherit ruby;

From 77cdbf7e8f66bf4ff2e825c17d6d49dbe30010ae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 00:02:08 -0600
Subject: [PATCH 1558/2793] tootle: hicolor-icon-theme dep, clear cache

---
 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 9043f9c42ca..c326868695c 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -2,7 +2,7 @@
 , meson, ninja, pkgconfig, python3
 , gnome3, vala, gobject-introspection, wrapGAppsHook
 , gtk3, granite
-, json-glib, glib, glib-networking
+, json-glib, glib, glib-networking, hicolor-icon-theme
 }:
 
 let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobject-introspection wrapGAppsHook ];
   buildInputs = [
-    gtk3 granite json-glib glib glib-networking
+    gtk3 granite json-glib glib glib-networking hicolor-icon-theme
     gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
   ];
 

From 420d02225438193a6fc32f48f6dc946541026079 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Dec 2018 14:34:01 -0500
Subject: [PATCH 1559/2793] tootle: use vala_0_40

---
 pkgs/applications/misc/tootle/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index c326868695c..c295a8fdb68 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, python3
-, gnome3, vala, gobject-introspection, wrapGAppsHook
+, gnome3, vala_0_40, gobject-introspection, wrapGAppsHook
 , gtk3, granite
 , json-glib, glib, glib-networking, hicolor-icon-theme
 }:
@@ -18,7 +18,15 @@ in stdenv.mkDerivation rec {
     sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobject-introspection wrapGAppsHook ];
+  nativeBuildInputs = [
+    gobject-introspection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
+    wrapGAppsHook
+  ];
   buildInputs = [
     gtk3 granite json-glib glib glib-networking hicolor-icon-theme
     gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas

From c1a9af12a101186d5e28d6ffbff0bb7119c23039 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Wed, 5 Dec 2018 22:27:45 -0200
Subject: [PATCH 1560/2793] tecoc: add BSD and Darwin/OSX support

Also, change some minor things.
---
 pkgs/applications/editors/tecoc/default.nix | 51 ++++++++++++---------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index 1c5730838ff..dd986b346a3 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit
+{ stdenv, fetchFromGitHub
 , ncurses }:
 
 stdenv.mkDerivation rec {
@@ -6,20 +6,27 @@ stdenv.mkDerivation rec {
   name = "tecoc-git-${version}";
   version = "20150606";
 
-  src = fetchgit {
-    url = "https://github.com/blakemcbride/TECOC.git";
+  src = fetchFromGitHub {
+    owner = "blakemcbride";
+    repo = "TECOC";
     rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb";
     sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj";
   };
 
   buildInputs = [ ncurses ];
 
-  configurePhase = ''
-    cp src/makefile.linux src/Makefile    
-  '';
-  buildPhase = ''
-    make CC=${stdenv.cc}/bin/cc -C src/
-  '';
+  makefile = if stdenv.hostPlatform.isDarwin
+  	     then "makefile.osx"
+	     else if stdenv.hostPlatform.isFreeBSD
+  	     then "makefile.bsd"
+  	     else if stdenv.hostPlatform.isOpenBSD
+  	     then "makefile.bsd"
+  	     else if stdenv.hostPlatform.isWindows
+  	     then "makefile.win"
+	     else "makefile.linux"; # I think Linux is a safe default...
+
+  makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
+
   installPhase = ''
     mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros
     cp src/tecoc $out/bin
@@ -31,26 +38,26 @@ stdenv.mkDerivation rec {
      ln -s tecoc teco
      ln -s tecoc Inspect )
   '';
-	
+
   meta = with stdenv.lib; {
     description = "A clone of the good old TECO editor";
     longDescription = ''
-      For those who don't know: TECO is the acronym of Tape Editor and
-      COrrector (because it was a paper tape edition tool in its debut 
-      days). Now the acronym follows after Text Editor and Corrector, 
-      or Text Editor Character-Oriented.
-      
-      TECO is a character-oriented text editor, originally developed
-      bu Dan Murphy at MIT circa 1962. It is also a Turing-complete
-      imperative interpreted programming language for text
-      manipulation, done via user-loaded sets of macros. In fact, Emacs
-      was born as a set of Editor MACroS for TECO.
+      For those who don't know: TECO is the acronym of Tape Editor and COrrector
+      (because it was a paper tape edition tool in its debut days). Now the
+      acronym follows after Text Editor and Corrector, or Text Editor
+      Character-Oriented.
+
+      TECO is a character-oriented text editor, originally developed by Dan
+      Murphy at MIT circa 1962. It is also a Turing-complete imperative
+      interpreted programming language for text manipulation, done via
+      user-loaded sets of macros. In fact, the venerable Emacs was born as a set
+      of Editor MACroS for TECO.
 
       TECOC is a portable C implementation of TECO-11.
  '';
     homepage = https://github.com/blakemcbride/TECOC;
+    license = {  url = https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt; };
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-# TODO: test in other platforms - especially Darwin

From 762333cbce21bfdb54e721b25516e325c6905d40 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Sat, 8 Dec 2018 22:46:13 +0300
Subject: [PATCH 1561/2793] parity: 2.1.6 -> 2.1.9

---
 pkgs/applications/altcoins/parity/default.nix |  9 +-
 pkgs/applications/altcoins/parity/parity.nix  |  5 +-
 .../parity/patches/vendored-sources-2.1.patch | 83 ----------------
 .../parity/patches/vendored-sources-2.2.patch | 98 -------------------
 4 files changed, 6 insertions(+), 189 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch
 delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 2abc1abe0ed..2ce8c3e0520 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,6 @@
 let
-  version     = "2.1.6";
-  sha256      = "0njkypszi0fjh9y0zfgxbycs4c1wpylk7wx6xn1pp6gqvvri6hav";
-  cargoSha256 = "116sj7pi50k5gb1i618g4pgckqaf8kb13jh2a3shj2kwywzzcgjs";
-  patches     = [ ./patches/vendored-sources-2.1.patch ];
+  version     = "2.1.9";
+  sha256      = "1xxpv2cxfcjwxfxkn2732y1wxh9rpiwmlb2ij09cg5nph669hy0v";
+  cargoSha256 = "1v44l90bacw8d3ilnmrc49dxdpyckh7iamylkpa1pc0rrpiv5vy4";
 in
-  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
+  import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
index 55665034ccf..9eb189f014e 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -1,7 +1,6 @@
 { version
 , sha256
 , cargoSha256
-, patches
 }:
 
 { stdenv
@@ -16,7 +15,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "parity-${version}";
-  inherit cargoSha256 patches;
+  inherit cargoSha256;
 
   src = fetchFromGitHub {
     owner = "paritytech";
@@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     systemd.lib systemd.dev openssl openssl.dev
   ];
 
-  # Some checks failed
+  # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch
deleted file mode 100644
index 678dd082923..00000000000
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-index 72652ad2f..3c0eca89a 100644
---- a/.cargo/config
-+++ b/.cargo/config
-@@ -1,3 +1,78 @@
- [target.x86_64-pc-windows-msvc]
- # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
- rustflags = ["-Ctarget-feature=+crt-static"]
-+
-+[source."https://github.com/alexcrichton/mio-named-pipes"]
-+git = "https://github.com/alexcrichton/mio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/parity-tokio-ipc"]
-+git = "https://github.com/nikvolf/parity-tokio-ipc"
-+rev = "c0f80b40399d7f08ef1e6869569640eb28645f56"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/tokio-named-pipes"]
-+git = "https://github.com/nikvolf/tokio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/app-dirs-rs"]
-+git = "https://github.com/paritytech/app-dirs-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/bn"]
-+git = "https://github.com/paritytech/bn"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/daemonize"]
-+git = "https://github.com/paritytech/daemonize"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hidapi-rs"]
-+git = "https://github.com/paritytech/hidapi-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/jsonrpc.git"]
-+git = "https://github.com/paritytech/jsonrpc.git"
-+branch = "parity-1.11"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-rs"]
-+git = "https://github.com/paritytech/libusb-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-sys"]
-+git = "https://github.com/paritytech/libusb-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/ring"]
-+git = "https://github.com/paritytech/ring"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-ctrlc.git"]
-+git = "https://github.com/paritytech/rust-ctrlc.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-secp256k1"]
-+git = "https://github.com/paritytech/rust-secp256k1"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/trezor-sys"]
-+git = "https://github.com/paritytech/trezor-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tomusdrw/ws-rs"]
-+git = "https://github.com/tomusdrw/ws-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch
deleted file mode 100644
index f45de5ed856..00000000000
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-index 72652ad2f..3c0eca89a 100644
---- a/.cargo/config
-+++ b/.cargo/config
-@@ -1,3 +1,93 @@
- [target.x86_64-pc-windows-msvc]
- # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
- rustflags = ["-Ctarget-feature=+crt-static"]
-+
-+[source."https://github.com/alexcrichton/mio-named-pipes"]
-+git = "https://github.com/alexcrichton/mio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/parity-tokio-ipc"]
-+git = "https://github.com/nikvolf/parity-tokio-ipc"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/tokio-named-pipes"]
-+git = "https://github.com/nikvolf/tokio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/app-dirs-rs"]
-+git = "https://github.com/paritytech/app-dirs-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/bn"]
-+git = "https://github.com/paritytech/bn"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/daemonize"]
-+git = "https://github.com/paritytech/daemonize"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hidapi-rs"]
-+git = "https://github.com/paritytech/hidapi-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/jsonrpc.git"]
-+git = "https://github.com/paritytech/jsonrpc.git"
-+branch = "parity-2.2"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-rs"]
-+git = "https://github.com/paritytech/libusb-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-sys"]
-+git = "https://github.com/paritytech/libusb-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/parity-common"]
-+git = "https://github.com/paritytech/parity-common"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/ring"]
-+git = "https://github.com/paritytech/ring"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-ctrlc.git"]
-+git = "https://github.com/paritytech/rust-ctrlc.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-rocksdb"]
-+git = "https://github.com/paritytech/rust-rocksdb"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-secp256k1"]
-+git = "https://github.com/paritytech/rust-secp256k1"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-snappy"]
-+git = "https://github.com/paritytech/rust-snappy"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/trezor-sys"]
-+git = "https://github.com/paritytech/trezor-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tomusdrw/ws-rs"]
-+git = "https://github.com/tomusdrw/ws-rs"
-+branch = "master"
-+replace-with = "vendored-sources"

From 794462485107c3fbd9a324568280fc20cdf8249e Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Sat, 8 Dec 2018 22:46:32 +0300
Subject: [PATCH 1562/2793] parity-beta: 2.2.1 -> 2.2.4

---
 pkgs/applications/altcoins/parity/beta.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index da504d63382..389bd820cc5 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,9 +1,6 @@
 let
-  version     = "2.2.1";
-  sha256      = "1m65pks2jk83j82f1i901p03qb54xhcp6gfjngcm975187zzvmcq";
-  cargoSha256 = "1mf1jgphwvhlqkvzrgbhnqfyqgf3ljc1l9zckyilzmw5k4lf4g1w";
-  patches     = [
-    ./patches/vendored-sources-2.2.patch
-  ];
+  version     = "2.2.4";
+  sha256      = "12qcfmc56vnay25nlflgwhm3iwlr7hd286wzzanlsalizaj5s5ja";
+  cargoSha256 = "11cwzqd459ld0apl2wnarfc4nb6j9j0dh26y3smvr0zsxvaz1r53";
 in
-  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
+  import ./parity.nix { inherit version sha256 cargoSha256; }

From 7eb700b9a6ba93cfcfba3a304f6406f7a7802d97 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 5 Dec 2018 17:10:31 +0300
Subject: [PATCH 1563/2793] polkadot: init at 0.2.17

---
 pkgs/applications/altcoins/default.nix        |  2 ++
 .../altcoins/polkadot/default.nix             | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/altcoins/polkadot/default.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 87945988321..4b7571b419f 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -94,5 +94,7 @@ rec {
   parity-beta = callPackage ./parity/beta.nix { };
   parity-ui = callPackage ./parity-ui { };
 
+  polkadot = callPackage ./polkadot { };
+
   particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; };
 }
diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/altcoins/polkadot/default.nix
new file mode 100644
index 00000000000..6d4e0417cde
--- /dev/null
+++ b/pkgs/applications/altcoins/polkadot/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkgconfig
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+  name = "polkadot-${version}";
+  version = "0.2.17";
+
+  src = fetchFromGitHub {
+    owner = "paritytech";
+    repo = "substrate";
+    rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c";
+    sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj";
+  }; 
+
+  cargoSha256 = "0wwkaxqj2v5zach5xcqfzf6prc0gxy2v47janglp44xbxbx9xk08";
+
+  buildInputs = [ pkgconfig openssl openssl.dev ];
+
+  meta = with stdenv.lib; {
+    description = "Polkadot Node Implementation";
+    homepage = http://polkadot.network;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.akru ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac0cd7c194b..770cd9e34c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15899,6 +15899,8 @@ in
   parity-beta = res.altcoins.parity-beta;
   parity-ui = res.altcoins.parity-ui;
 
+  polkadot = res.altcoins.polkadot;
+
   stellar-core = res.altcoins.stellar-core;
 
   particl-core = res.altcoins.particl-core;

From a27c51f71fca2232febdcb44ff1c5ab8521f9e99 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 2 Dec 2018 19:51:27 -0600
Subject: [PATCH 1564/2793] premake3: use premake3 -> premake

premake3 only has the "premake" executable. This is a little confusing
because premake4 and premake5 both have the version suffix.

Fixes #51744
---
 pkgs/development/tools/misc/premake/3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 8b02bf96fd5..a94614af796 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     install -Dm755 bin/premake $out/bin/premake
   '';
 
-  premake_cmd = "premake3";
+  premake_cmd = "premake";
   setupHook = ./setup-hook.sh;
 
   meta = {

From 186ec58e1ae97da8a1e9cff8b5fa4c0377e58dce Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Sat, 8 Dec 2018 22:17:40 +0100
Subject: [PATCH 1565/2793] haskellPackages.binary-parsers : disable tests

---
 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 0d0eee11d5c..b0d30724438 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -485,6 +485,7 @@ self: super: {
 
   # Test suite won't compile against tasty-hunit 0.10.x.
   binary-parser = dontCheck super.binary-parser;
+  binary-parsers = dontCheck super.binary-parsers;
   bytestring-strict-builder = dontCheck super.bytestring-strict-builder;
   bytestring-tree-builder = dontCheck super.bytestring-tree-builder;
 

From fa0d6e6481be741ad5b72a714a3423798cbd55c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 14:39:40 -0800
Subject: [PATCH 1566/2793] zsh-autosuggestions: 0.4.3 -> 0.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/zsh-autosuggestions/versions
---
 pkgs/shells/zsh/zsh-autosuggestions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 02e25cfdde6..cc7cf8fbb5e 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-autosuggestions-${version}";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-autosuggestions";
     rev = "v${version}";
-    sha256 = "117m4jk3lgh98k699v00pg554qblpr4pbfvgs0qrgygfx1n1bpl4";
+    sha256 = "19qkg4b2flvnp2l0cbkl4qbrnl8d3lym2mmh1mx9nmjd7b81r3pf";
   };
 
   buildInputs = [ zsh ];

From 9a619df54753e28945c8251af4837ed282915d55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 14:48:39 -0800
Subject: [PATCH 1567/2793] xl2tpd: 1.3.12 -> 1.3.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/xl2tpd/versions
---
 pkgs/tools/networking/xl2tpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index d86b1613a9a..f3c1fbd853a 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xl2tpd-${version}";
-  version = "1.3.12";
+  version = "1.3.13";
 
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
     rev = "v${version}";
-    sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1";
+    sha256 = "1nzkmhi9arwd4smhr07l0sssx46w48z0cblv7xcz25wg4hw86mcd";
   };
 
   buildInputs = [ libpcap ];

From 14541f76728cec22b3c8d818442515d2a2d5f269 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 15:03:18 -0800
Subject: [PATCH 1568/2793] wavebox: 4.4.0 -> 4.5.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/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 8297304e55c..e3504ad3285 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 = "4.4.0";
+  version = "4.5.3";
 
   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 = "0g77clrxks1ivldq496bg14hv57hm0kjh4g1askxyck69yf8illn";
+    sha256 = "0a89nlrd9xy853sxv7kb2bjcw209254ik15qrcnh0jhb1ckv16wm";
   };
 
   # don't remove runtime deps

From 7598fd57d33076e48e1cb6181e9d929c876ad349 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 15:12:59 -0800
Subject: [PATCH 1569/2793] yquake2: 7.20 -> 7.30

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

diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index bee7d7703ab..1e7032eb05c 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,13 +14,13 @@ let
 
   yquake2 = stdenv.mkDerivation rec {
     name = "yquake2-${version}";
-    version = "7.20";
+    version = "7.30";
 
     src = fetchFromGitHub {
       owner = "yquake2";
       repo = "yquake2";
       rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
-      sha256 = "1yrmn8vajab3zd0fni029s6wrvv2ljn1kyhaiw02wm1dc5yyzb2g";
+      sha256 = "0xfr620k1hns70dckv6k0kc72jbiwyghcys904jpriv5x94lnrlc";
     };
 
     enableParallelBuilding = true;

From 139c99ce9176d86b9b5020581c33df48cd93b73a Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Sun, 9 Dec 2018 00:14:58 +0100
Subject: [PATCH 1570/2793] displaylink: 4.1.9 -> 4.4.24

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

diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index af8c790e325..2b2874ac07a 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "displaylink-${version}";
-  version = "4.1.9";
+  version = "4.4.24";
 
   src = requireFile rec {
     name = "displaylink.zip";
-    sha256 = "d762145014df7fea8ca7af12206a077d73d8e7f2259c8dc2ce7e5fb1e69ef9a3";
+    sha256 = "0c02mg7vbijpfpk9imh0hmls1yiglc216zfllw5ar86r1slhd5y0";
     message = ''
       In order to install the DisplayLink drivers, you must first
       comply with DisplayLink's EULA and download the binaries and

From 4898e0921580fd3b53c6882ae6da1ef294d56aab Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 9 Dec 2018 01:09:57 +0200
Subject: [PATCH 1571/2793] pythonPackages.neovim-0.3.0 ->
 pythonPackages.pynvim-0.3.1

---
 pkgs/applications/editors/neovim/neovim-remote.nix          | 2 +-
 pkgs/applications/editors/neovim/wrapper.nix                | 4 ++--
 .../python-modules/{neovim => pynvim}/default.nix           | 6 +++---
 pkgs/top-level/python-packages.nix                          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{neovim => pynvim}/default.nix (86%)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 8e99005bbf6..c1b459638c9 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ neovim psutil ];
+  propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
 
   meta = {
     description = "A tool that helps controlling nvim processes from a terminal";
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index bd4304560fd..5e57fe4d141 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -43,13 +43,13 @@ let
 
   pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins;
   pythonEnv = pythonPackages.python.withPackages(ps:
-        (if withPyGUI then [ ps.neovim_gui ] else [ ps.neovim ])
+        (if withPyGUI then [ ps.neovim_gui ] else [ ps.pynvim ])
         ++ (extraPythonPackagesFun ps)
         ++ (concatMap (f: f ps) pluginPythonPackages));
 
   pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
   python3Env = python3Packages.python.withPackages (ps:
-        [ ps.neovim ]
+        [ ps.pynvim ]
         ++ (extraPython3PackagesFun ps)
         ++ (concatMap (f: f ps) pluginPython3Packages));
 
diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
similarity index 86%
rename from pkgs/development/python-modules/neovim/default.nix
rename to pkgs/development/python-modules/pynvim/default.nix
index 20479093a47..3811e5082c0 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "neovim";
-  version = "0.3.0";
+  pname = "pynvim";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18x7gi1idsch11hijvy0mm2mk4f42rapz9niax4rnak14x2klqq2";
+    sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37c1a0c9c67..71c33965cd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4627,7 +4627,7 @@ in {
 
   trollius = callPackage ../development/python-modules/trollius {};
 
-  neovim = callPackage ../development/python-modules/neovim {};
+  pynvim = callPackage ../development/python-modules/pynvim {};
 
   neovim_gui = callPackage ../development/python-modules/neovim_gui { };
 

From da042144da280bc61db8e0f5eb325e699bd7f82e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 15:24:05 -0800
Subject: [PATCH 1572/2793] vulkan-tools: 1.1.85.0 -> 1.1.92

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-tools/versions
---
 pkgs/tools/graphics/vulkan-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index afb6812b3a3..7d5283b3133 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "vulkan-tools-${version}";
-  version = "1.1.85.0";
+  version = "1.1.92";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "sdk-${version}";
-    sha256 = "0f4dfr8g0vy7y1hvs6z9lw52kissailzisby4qnz4akv0zz5y5s5";
+    sha256 = "1khbfxp2mha7h0vqs0fkqscxm76gn3zlia8yya11lkhk7sn3h0d3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 211938532cc788d9dadbb9b14d0845e4576dfeb4 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 9 Dec 2018 01:25:54 +0200
Subject: [PATCH 1573/2793] pythonPackages.neovim-remote: 2.1.0 -> 2.1.1

---
 pkgs/applications/editors/neovim/neovim-remote.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index c1b459638c9..11566293c49 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,14 +4,14 @@ with stdenv.lib;
 
 pythonPackages.buildPythonPackage rec {
   pname = "neovim-remote";
-  version = "2.1.0";
+  version = "2.1.1";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
     rev = "v${version}";
-    sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc";
+    sha256 = "1hkzcc141imjin03wpfykw50k0vs7vj1lr09czb2hsyf937gyjqn";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];

From dc0963b44538f7f6e8f09359fc5e9aa0c27e79e2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 8 Dec 2018 23:27:15 +0000
Subject: [PATCH 1574/2793] ant-theme: init at 1.2.0

---
 pkgs/data/themes/ant-theme/default.nix | 39 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/data/themes/ant-theme/default.nix

diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/default.nix
new file mode 100644
index 00000000000..8c4c865ef4a
--- /dev/null
+++ b/pkgs/data/themes/ant-theme/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "ant-theme";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar";
+    sha256 = "15751pnb94g2wi6y932l3d7ksaz18402zbzp3l7ryy0lqwjnqvkj";
+  };
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/themes/Ant
+    cp -a * $out/share/themes/Ant
+    rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
+    runHook postInstall
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1fzy7bq5v9fzjpfxplvk0nwjgamcva83462gkz01lhr1mipb92h1";
+
+  meta = with stdenv.lib; {
+    description = "A flat and light theme with a modern look";
+    homepage = https://github.com/EliverLara/Ant;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [
+      maintainers.pbogdan
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36113b642d..d1fff29408e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15219,6 +15219,8 @@ in
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
+  ant-theme = callPackage ../data/themes/ant-theme { };
+
   arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
 
   arkpandora_ttf = callPackage ../data/fonts/arkpandora { };

From a8c7bbaa693694c885fc64e0f38d5b1b2e3dbd4e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Dec 2018 15:30:18 -0800
Subject: [PATCH 1575/2793] vc: 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/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 7f46702c2e8..66c8e4fbc53 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.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "1jwwp3g8pqngdakqy3dxy3vgzh0gla5wvwqqlfvqdgsw6455xhm7";
+    sha256 = "09nf6j1hyq2yv0c1cmnv4ff5243ylsajy1xj3dz8c2qqcm14y6cm";
   };
 
   nativeBuildInputs = [ cmake ];

From 83d84c08b90141a1eb71a6d41cdd054df52c2a49 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Dec 2018 18:15:42 +0000
Subject: [PATCH 1576/2793] filterCoqPackages: honor `recurseIntoAttrs`

---
 pkgs/top-level/coq-packages.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 188ab06b969..6d6de4e22bd 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -43,11 +43,17 @@ let
       Verdi = callPackage ../development/coq-modules/Verdi {};
     };
 
-  filterCoqPackages = coq:
-    lib.filterAttrsRecursive
-    (_: p:
-      let pred = p.compatibleCoqVersions or (_: true);
-      in pred coq.coq-version
+  filterCoqPackages = coq: set:
+    lib.listToAttrs (
+      lib.concatMap (name:
+        let v = set.${name}; in
+        let p = v.compatibleCoqVersions or (_: true); in
+        lib.optional (p coq.coq-version)
+          (lib.nameValuePair name (
+            if lib.isAttrs v && v.recurseForDerivations or false
+            then filterCoqPackages coq v
+            else v))
+      ) (lib.attrNames set)
     );
 
 in rec {

From ccb93eb6b0f33c8ad667598c5efffca7f142293d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 9 Dec 2018 04:00:42 +0100
Subject: [PATCH 1577/2793] chromium: update conditionals and gcc patches for
 min version 71

(cherry picked from commit 604579e45f10ce5ccadd76c71f1bac648bd0971d)
---
 .../networking/browsers/chromium/common.nix        | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index aa59daa168e..bcf6df7417f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -121,12 +121,11 @@ let
       bison gperf kerberos
       glib gtk2 gtk3 dbus-glib
       libXScrnSaver libXcursor libXtst libGLU_combined
-      pciutils protobuf speechd libXdamage
+      pciutils protobuf speechd libXdamage at-spi2-core
     ] ++ optional gnomeKeyringSupport libgnome-keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional pulseSupport libpulseaudio
-      ++ optional (versionAtLeast version "71") at-spi2-core
       ++ optional (versionAtLeast version "72") jdk.jre;
 
     patches = optional enableWideVine ./patches/widevine.patch ++ [
@@ -141,15 +140,8 @@ let
       # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
       #
       # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
-    ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [
-       ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" )
-       ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" )
-       ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" )
-       ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" )
-       ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" )
-       ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" )
-       ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" )
-       ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" )
+    ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [
+      ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" )
     ] ++ optional stdenv.isAarch64
            (if (versionOlder version "71") then
               fetchpatch {

From 17acf57f9dabe8364abe46c39e2b4e993db142ac 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 Dec 2018 10:27:22 +0100
Subject: [PATCH 1578/2793] fbreader: fixup build with curl-7.62

This was easy to patch; submitted upstream.
---
 pkgs/applications/misc/fbreader/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 548966764fe..e7d0e6a63a5 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
 , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib
 , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
 , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
@@ -25,7 +25,14 @@ stdenv.mkDerivation {
     sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y";
   };
 
-  patches = [ ./typecheck.patch ];
+  patches = [
+    ./typecheck.patch
+    (fetchpatch {
+      name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311
+      url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff";
+      sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg";
+    })
+  ];
 
   postPatch = ''
     cat << EOF > makefiles/target.mk

From a9779bdfc442e2001769dddbea98518785e2a2b1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Dec 2018 10:55:02 +0100
Subject: [PATCH 1579/2793] spice: add kerberos dependency

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

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index dadbe57dccd..f22df5d51ef 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
-, libcacard, lz4 }:
+, libcacard, lz4, kerberos }:
 
 with stdenv.lib;
 
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
-                  python pyparsing glib cyrus_sasl libcacard lz4 ];
+                  python pyparsing glib cyrus_sasl libcacard lz4
+                  kerberos ];
 
   nativeBuildInputs = [ pkgconfig spice-protocol ];
 

From ad212c5991fb4fecd819554885686cae79fd763e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Dec 2018 10:57:52 +0100
Subject: [PATCH 1580/2793] stockfish: update to version 10

---
 pkgs/games/stockfish/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 1f99af85f9f..13033c7f9f0 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -3,15 +3,17 @@
 let arch = if stdenv.isx86_64 then "x86-64" else
            if stdenv.isi686 then "x86-32" else
            "unknown";
+
+    version = "10";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
-  name = "stockfish-9";
+  name = "stockfish-${version}";
 
   src = fetchurl {
-    url = "https://github.com/official-stockfish/Stockfish/archive/sf_9.tar.gz";
-    sha256 = "1i37izc3sq9vr663iaxpfh008lgsw7abzj1ws5l1hf3b6xjkgwyh";
+    url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
+    sha256 = "1lrxqq8fw1wrw5b45r4s3ddd51yr85a2k8a9i1wjvyd6v9vm7761";
   };
 
   postUnpack = "sourceRoot+=/src";

From 9895ce24b454980fbbebe90694d4317ec7ff2233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 4 Aug 2018 15:38:01 +0200
Subject: [PATCH 1581/2793] nixos/displayManager: Install wayland sessions from
 extraSessionFilePackages

---
 nixos/modules/services/x11/display-managers/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 26b79730dd3..cb3c0c7a843 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -78,8 +78,7 @@ let
       # This is required by user units using the session bus.
       ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
 
-      # Load X defaults.
-      # FIXME: Check XDG_SESSION_TYPE against x11
+      # Load X defaults. This should probably be safe on wayland too.
       ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
       if test -e ~/.Xresources; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources
@@ -194,6 +193,11 @@ let
       ${concatMapStrings (pkg: ''
         ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
       '') cfg.displayManager.extraSessionFilePackages}
+
+      mkdir -p "$out/share/wayland-sessions"
+      ${concatMapStrings (pkg: ''
+        ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
+      '') cfg.displayManager.extraSessionFilePackages}
     '';
 
 in

From 6dad52ebf690460855c20ec83637c8bbfb67373f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Dec 2018 11:03:41 +0100
Subject: [PATCH 1582/2793] Revert "spice: add kerberos dependency"

Already fixed by #51769

This reverts commit a9779bdfc442e2001769dddbea98518785e2a2b1.
---
 pkgs/development/libraries/spice/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index f22df5d51ef..dadbe57dccd 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
-, libcacard, lz4, kerberos }:
+, libcacard, lz4 }:
 
 with stdenv.lib;
 
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
-                  python pyparsing glib cyrus_sasl libcacard lz4
-                  kerberos ];
+                  python pyparsing glib cyrus_sasl libcacard lz4 ];
 
   nativeBuildInputs = [ pkgconfig spice-protocol ];
 

From b2333ed52ae62891a3615f490e8cbdfacb430cb2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 9 Dec 2018 11:18:13 +0100
Subject: [PATCH 1583/2793] rtl-sdr: remove linker-fix.patch

not needed on rtl-sdr-0.6.0
---
 pkgs/applications/misc/rtl-sdr/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index ef9f9d09ac2..aedc847ee69 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -26,13 +26,7 @@ stdenv.mkDerivation rec {
     grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; }
     echo "Requires: libusb-1.0" >> "$pcfile"
   '';
-  patches = lib.optionals stdenv.isDarwin [
-    (fetchpatch {
-      name = "linker-fix.patch";
-      url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch";
-      sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl";
-    })
-  ];
+
   meta = with stdenv.lib; {
     description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
     homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr;

From 395b69a6a0cb0421198ba1ab992ced1b88dfd479 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Sat, 8 Dec 2018 23:11:43 +0000
Subject: [PATCH 1584/2793] metamath: init at 0.167

---
 maintainers/maintainer-list.nix               |  5 +++
 .../interpreters/metamath/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/interpreters/metamath/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c8ee9ff8e1..93f035447a3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4278,6 +4278,11 @@
     github = "talyz";
     name = "Kim Lindberger";
   };
+  taneb = {
+    email = "nvd1234@gmail.com";
+    github = "Taneb";
+    name = "Nathan van Doorn";
+  };
   tari = {
     email = "peter@taricorp.net";
     github = "tari";
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
new file mode 100644
index 00000000000..198ee2acb50
--- /dev/null
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "metamath-${version}";
+  version = "0.167";
+
+  buildInputs = [ autoreconfHook ];
+
+  # This points to my own repository because there is no official repository
+  # for metamath; there's a download location but it gets updated in place with
+  # no permanent link. See discussion at
+  # https://groups.google.com/forum/#!topic/metamath/N4WEWQQVUfY
+  src = fetchFromGitHub {
+    owner = "Taneb";
+    repo = "metamath";
+    rev = "579166a649c5d9ae0cdc641185e68219d2812f24";
+    sha256 = "0ly7qv3gajlaf283fsy9ak41r09sh49ygzj0s9yxyjfli6rgxdby";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Interpreter for the metamath proof language";
+    longDescription = ''
+      The metamath program is an ASCII-based ANSI C program with a command-line
+      interface. It was used (along with mmj2) to build and verify the proofs
+      in the Metamath Proof Explorer, and it generated its web pages. The *.mm
+      ASCII databases (set.mm and others) are also included in this derivation.
+    '';
+    homepage = http://us.metamath.org;
+    downloadPage = "http://us.metamath.org/#downloads";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.taneb ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36113b642d..159b82b746c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7779,6 +7779,8 @@ in
 
   mesos-dns = callPackage ../servers/mesos-dns { };
 
+  metamath = callPackage ../development/interpreters/metamath { };
+
   mujs = callPackage ../development/interpreters/mujs { };
 
   nix-exec = callPackage ../development/interpreters/nix-exec {

From c047c26791639790fc2420747096cdefbc75ad20 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Dec 2018 19:55:40 +0100
Subject: [PATCH 1585/2793] lvm2: 2.02.177 -> 2.03.01

* switch to sources to git
* add libaio to buildInputs
---
 pkgs/os-specific/linux/lvm2/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 096eefe8a68..a33431f0f58 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
-, thin-provisioning-tools, enable_dmeventd ? false }:
+{ stdenv, fetchgit, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
+, thin-provisioning-tools, libaio
+, enable_dmeventd ? false }:
 
 let
-  version = "2.02.177";
+  version = "2.03.01";
 in
 
 stdenv.mkDerivation {
   name = "lvm2-${version}";
 
-  src = fetchurl {
-    url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0";
+  src = fetchgit {
+    url = "git://sourceware.org/git/lvm2.git";
+    rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    sha256 = "0jlaswf1srdxiqpgpp97j950ddjds8z0kr4pbwmal2za2blrgvbl";
   };
 
   configureFlags = [
@@ -27,7 +29,7 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ udev libuuid thin-provisioning-tools ];
+  buildInputs = [ udev libuuid thin-provisioning-tools libaio ];
 
   preConfigure =
     ''

From 24dcf0c4eabbf8b38501bf5d8ccf161e0ab8d282 Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Sun, 9 Dec 2018 12:35:58 +0100
Subject: [PATCH 1586/2793] displaylink: 4.1.9 -> 4.4.24 - updated link

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

diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 2b2874ac07a..35c9f087966 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
       comply with DisplayLink's EULA and download the binaries and
       sources from here:
 
-      http://www.displaylink.com/downloads/file?id=1087
+      http://www.displaylink.com/downloads/file?id=1261
 
       Once you have downloaded the file, please use the following
       commands and re-run the installation:

From f0f36737e20724aa8260c827c493ec0f26d879e2 Mon Sep 17 00:00:00 2001
From: eyJhb <eyjhbb@gmail.com>
Date: Sun, 9 Dec 2018 12:48:15 +0100
Subject: [PATCH 1587/2793] displaylink: changed systemd start to not block
 (#51760)

Previously during boot, displaylink would hang during boot for the 2
minutes timeout.
---
 pkgs/os-specific/linux/displaylink/default.nix | 15 ++++++++++-----
 .../linux/displaylink/udev-installer.patch     | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/displaylink/udev-installer.patch

diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 35c9f087966..9da5170c2e5 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, unzip, utillinux,
-  libusb1, evdi, systemd, makeWrapper, requireFile }:
+  libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }:
 
 let
   arch =
@@ -33,17 +33,23 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ unzip makeWrapper ];
 
-  buildCommand = ''
+  unpackPhase = ''
     unzip $src
     chmod +x displaylink-driver-${version}.run
     ./displaylink-driver-${version}.run --target . --noexec
+  '';
 
+  patches = [ (substituteAll {
+    src = ./udev-installer.patch;
+    inherit systemd;
+  })];
+
+  installPhase = ''
     sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh
     ( source udev-installer.sh
       mkdir -p $out/lib/udev/rules.d
       main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh"
     )
-    sed -i '2iPATH=${systemd}/bin:$PATH' $out/lib/udev/displaylink.sh
 
     install -Dt $out/lib/displaylink *.spkg
     install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager
@@ -53,13 +59,12 @@ in stdenv.mkDerivation rec {
       $out/bin/DisplayLinkManager
     wrapProgram $out/bin/DisplayLinkManager \
       --run "cd $out/lib/displaylink"
-
-    fixupPhase
   '';
 
   dontStrip = true;
   dontPatchELF = true;
 
+
   meta = with stdenv.lib; {
     description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/pkgs/os-specific/linux/displaylink/udev-installer.patch
new file mode 100644
index 00000000000..3e62e20c315
--- /dev/null
+++ b/pkgs/os-specific/linux/displaylink/udev-installer.patch
@@ -0,0 +1,18 @@
+--- a/udev-installer.sh	2018-12-09 12:05:53.772318942 +0100
++++ b/udev-installer.sh	2018-12-09 12:06:19.939947629 +0100
+@@ -21,12 +21,12 @@
+   cat <<'EOF'
+ start_service()
+ {
+-  systemctl start dlm
++  @systemd@/bin/systemctl start --no-block dlm
+ }
+ 
+ stop_service()
+ {
+-  systemctl stop dlm
++  @systemd@/bin/systemctl stop dlm
+ }
+ 
+ EOF
+

From 8eee1ec2a9f0925bcf9589b330faacd0255ae700 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 9 Dec 2018 13:36:53 +0100
Subject: [PATCH 1588/2793] tests/slurm: wait for open DBD port

This makes tests more reliable. It seems
that waitForUnit(slurmdbd.service) is not sufficient
on some systems.
---
 nixos/tests/slurm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 30e408c7db1..b4458d8d095 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -101,6 +101,7 @@ in {
   subtest "can_start_slurmdbd", sub {
     $dbd->succeed("systemctl restart slurmdbd");
     $dbd->waitForUnit("slurmdbd.service");
+    $dbd->waitForOpenPort(6819);
   };
 
   # there needs to be an entry for the current

From 0534ed2c598b3a46dee5a911ffb644c0c6b5f8df Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Dec 2018 16:41:01 +0100
Subject: [PATCH 1589/2793] libosmocore: 0.9.6 -> 0.12.1

Add gnutls to buildInputs
---
 pkgs/applications/misc/libosmocore/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 4f1745c0d8c..3590166177f 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
-, pcsclite, talloc, python2
+, pcsclite, talloc, python2, gnutls
 }:
 
 stdenv.mkDerivation rec {
   name = "libosmocore-${version}";
-  version = "0.9.6";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmocore";
-    rev = "3cc757df1822114bf446dc2d5f6a95da92321a25";
-    sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017";
+    rev = version;
+    sha256 = "140c9jii0qs00s50kji1znc2339s22x8sz259x4pj35rrjzyyjgp";
   };
 
   propagatedBuildInputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    pcsclite python2
+    pcsclite python2 gnutls
   ];
 
   enableParallelBuilding = true;

From 09f9e5456b42cec1646c2259ec20518056f4677e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Dec 2018 19:37:48 +0100
Subject: [PATCH 1590/2793] gnuradio-with-packages: build gsm and limesdr only
 on linux

This allows to build gnuradio-with-packages again on darwin

* libosmocore: remove darwin from platforms
* gnuradio-limesdr: remove darwin from platforms
---
 pkgs/applications/misc/gnuradio/gsm.nix        | 2 +-
 pkgs/applications/misc/gnuradio/limesdr.nix    | 2 +-
 pkgs/applications/misc/libosmocore/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/gsm.nix b/pkgs/applications/misc/gnuradio/gsm.nix
index 6e0856ce66a..dcb50df7052 100644
--- a/pkgs/applications/misc/gnuradio/gsm.nix
+++ b/pkgs/applications/misc/gnuradio/gsm.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Gnuradio block for gsm";
     homepage = https://github.com/ptrkrysik/gr-gsm;
     license = licenses.gpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ mog ];
   };
 }
diff --git a/pkgs/applications/misc/gnuradio/limesdr.nix b/pkgs/applications/misc/gnuradio/limesdr.nix
index 535dbfa3c53..0a5d4f56d27 100644
--- a/pkgs/applications/misc/gnuradio/limesdr.nix
+++ b/pkgs/applications/misc/gnuradio/limesdr.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     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;
+    platforms = platforms.linux;
     maintainers = [ maintainers.markuskowa ];
   };
 }
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 3590166177f..13e7e4f9801 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "libosmocore";
     homepage = https://github.com/osmocom/libosmocore;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ mog ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 159b82b746c..e372bfaa3dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16848,7 +16848,8 @@ in
 
   gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
     inherit (python2Packages) python;
-    extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds gnuradio-limesdr ];
+    extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ]
+      ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ];
   };
 
   gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { };

From b4f0faf42fad6b0f57f82268b3bf289c7c5ec905 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sun, 9 Dec 2018 14:29:28 +0100
Subject: [PATCH 1591/2793] ipmicfg: 1.28.0 -> 1.29.0

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

diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index e150ab457e0..d9bccee889a 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ipmicfg-${version}";
-  version = "1.28.0";
-  buildVersion = "180302";
+  version = "1.29.0";
+  buildVersion = "181029";
 
   src = fetchzip {
     url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
-    sha256 = "0hw853cwaaxmxy1sa3m7l9gqalwpbbvp4ghk8inr7dzwxjljmr02";
+    sha256 = "18nljs4xg6hffahyd0d5zlg1jhbwl7zr9ym925bkzwcnrkgqs2v3";
     extraPostFetch = "chmod u+rwX,go-rwx+X $out/";
   };
 

From 9b484cfb91e86fb3e84b984750e07d004dfe38d4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 9 Dec 2018 15:48:55 +0100
Subject: [PATCH 1592/2793] monero: build with hidapi

---
 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 120bd430151..3a962458632 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, libsodium
+, zeromq, pcsclite, readline, libsodium, hidapi
 , CoreData, IOKit, PCSC
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
-    libsodium
+    libsodium hidapi
   ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
 
   cmakeFlags = [

From 14087abe6a4a38fbd9c1a8865ce6c5ff0211e22b Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 9 Dec 2018 01:42:05 -0800
Subject: [PATCH 1593/2793] openssl_1_1: Add "doc" output to contain HTML
 documentation

This prevents cluttering up openssl_1_1.out with many megabytes of
documentation.

Fixes #51659
---
 pkgs/development/libraries/openssl/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5fd7e14f2bd..32fd6e727f7 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 let
-  common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
+  common = args@{ version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
     name = "openssl-${version}";
 
     src = fetchurl {
@@ -33,7 +33,7 @@ let
                   '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
     '';
 
-    outputs = [ "bin" "dev" "out" "man" ];
+    outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
     setOutputFlags = false;
     separateDebugInfo = stdenv.hostPlatform.isLinux;
 
@@ -135,6 +135,7 @@ in {
     version = "1.1.1a";
     sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
     patches = [ ./1.1/nix-ssl-cert-file.patch ];
+    withDocs = true;
   };
 
 }

From 75a1dfbe756d112f9d21632b5da573b40777b278 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Wed, 5 Dec 2018 15:17:39 +0100
Subject: [PATCH 1594/2793] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 176 ++++++++++++++--------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 48a8a444db4..197a5d756cc 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -43,22 +43,22 @@
   };
 
   alchemist-vim = buildVimPluginFrom2Nix {
-    name = "alchemist-vim-2018-09-02";
+    name = "alchemist-vim-2018-12-07";
     src = fetchFromGitHub {
       owner = "slashmili";
       repo = "alchemist.vim";
-      rev = "35e7e3062d1661b1c081765ed05bd8f0f5265183";
-      sha256 = "08i2nzsaq73iz8wkryq5nly3hl0xb3zy16zk7k28bslvyj3ricnc";
+      rev = "f05c2061aa0b3612fdfe7f35c47f850bf5974603";
+      sha256 = "0j5r3glnrdlylgq87x3rc9m37vdys4xf7p3isw9acv77yhd703wx";
     };
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-11-30";
+    name = "ale-2018-12-07";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "1d4f98553852499e0f8ebd951db6ada2b1d973e3";
-      sha256 = "112i5722364xi8vsipwi9wvrxnzzvisfwbzwqmk01ag0lnlj2qg4";
+      rev = "9226e13b31474ac17d0c25cd27aa55bff21d55c2";
+      sha256 = "0x3ihhswcqy3451721f3yfi5m2m09src7yd4r67q9k2gcyldbwj8";
     };
   };
 
@@ -344,12 +344,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-11-23";
+    name = "denite-nvim-2018-12-05";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "db2d7c307e70a4575baea3097e0977b59696e855";
-      sha256 = "1l1ny781c1glqwkkhny5d80z186l485ixkwlshcyrmd8p8wnfb6m";
+      rev = "a59c3e2f50452e0ddd1988e921624f6cfb47807d";
+      sha256 = "1m96l3kflywdggypmh832piisaah3958v3ql4s267b9pk1phsgsy";
     };
   };
 
@@ -386,12 +386,12 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-11-21";
+    name = "deoplete-jedi-2018-12-03";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "9d9796a53ae402e469fa5ea8766102ba40259230";
-      sha256 = "1dpczpzwvjlmszaia5i90bj4q62va3dckw6rjgy1j3lzj7w2izaf";
+      rev = "583ee29a0a0fe6206f3f106b8866ff2b663fde74";
+      sha256 = "0lbiwk6fc1z9i3sx4y62gsl3yr8pzv09s4wwxq1k8cziddbiypig";
       fetchSubmodules = true;
     };
   };
@@ -427,12 +427,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-11-28";
+    name = "deoplete-nvim-2018-12-05";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "acae3732524443ecb53af2f4c8078af47381a180";
-      sha256 = "0qm0plgri6bf4bm6mvhqkpl075gdr03n5939vi99v4wy3iymh5w5";
+      rev = "a5ac69adb4ca5fae12e2f07a07c934213248779a";
+      sha256 = "182ygr2fsbvxm3smp1s1m585vfyk5ivwmwa2wknzqwysz96bhfaf";
     };
   };
 
@@ -457,12 +457,12 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-11-26";
+    name = "echodoc-vim-2018-12-05";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "1cad58aed10e999b64008fed12401d5919552863";
-      sha256 = "15ndcaypw10jrdmscgrh969lrhb6jhh43d6a4ymam16ljg5590z2";
+      rev = "39cc8d6b5645088d3449006cffb202e751c92865";
+      sha256 = "1s59jz88pdvz1nca7z5bzvazn2dp4n6xb39hagnbh4rw70s18xnx";
     };
   };
 
@@ -529,12 +529,12 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-10-18";
+    name = "ferret-2018-12-04";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "984f0364f8a4ea77c7075e67cd753037ecfdafdf";
-      sha256 = "0vis6zgknjmwjhv5vxiv4k5d78971sv61rjc8gh32sq2ksxk07zr";
+      rev = "fbef13c37f0083ecbcec131c2a8f62079f3cdacb";
+      sha256 = "1ajrwg5fg3myhazsdfprlj50qlw25jk1viy1cny6mzhbvmb80qln";
     };
   };
 
@@ -750,12 +750,12 @@
   };
 
   jedi-vim = buildVimPluginFrom2Nix {
-    name = "jedi-vim-2018-11-08";
+    name = "jedi-vim-2018-12-03";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "2f65c636f83139b9982b1c1c90cb7f34915ad815";
-      sha256 = "02sdgczj7r19xvni1xd7kf3rhibxx36zsca42wjb605s6qgmkvph";
+      rev = "7f4f2db260e3e693c8b9fc91498f9299c99148c2";
+      sha256 = "0rykw5nbk6xxgifav30fmnzwfhbi4mc1qp84p8gc1lv2pajncx31";
       fetchSubmodules = true;
     };
   };
@@ -861,22 +861,22 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-11-17";
+    name = "ncm2-2018-12-08";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "07aaaaa143a1dff32c2fbc967f4bc574cf40cb03";
-      sha256 = "1vi6dprwzrknnmqxp47hacc9gaa9bafdzm5ihs09yg3rwi0drjbl";
+      rev = "40d1eb9b52805e0e81bbaac4bb87788007ad19de";
+      sha256 = "1awbzm3vgp31afjlbagxjzzxxgwmy2axhnyhcal7x1rk93cr78iw";
     };
   };
 
   ncm2-bufword = buildVimPluginFrom2Nix {
-    name = "ncm2-bufword-2018-07-28";
+    name = "ncm2-bufword-2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-bufword";
-      rev = "86a92eb3fb217f9ea1e93f890b7e5e0eb1671ca9";
-      sha256 = "02f43rr9apgcjpz4ipnin4v3cvdlx931a0787x87iyr8a0aljg3y";
+      rev = "183843100999d021e5d52c09c61faa6c64ac6e2f";
+      sha256 = "11ma0wfzxjd0mv1ykxjwqk9ixlr6grpkk1md85flqqdngnyif6di";
     };
   };
 
@@ -891,12 +891,12 @@
   };
 
   ncm2-tmux = buildVimPluginFrom2Nix {
-    name = "ncm2-tmux-2018-07-30";
+    name = "ncm2-tmux-2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-tmux";
-      rev = "4f60ee1be57531295075d808e0006c83894096d1";
-      sha256 = "1ihbm65b9bc0y068w6r0k8f9lsc3603npb55chcchpj7z75539yh";
+      rev = "196131f285f05966bdd1126d6bd0c912d01b92c5";
+      sha256 = "0i9j9yn7ayisl3rwawjic7g3a07cg2541zh3jangjd9wz271l69r";
     };
   };
 
@@ -991,12 +991,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-02";
+    name = "neomake-2018-12-07";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "bbdd0847ef06e3a1b7fe9ea2bec8dd9fbd9068f7";
-      sha256 = "17l15i9zgwv7m802k4zpv53116zbg0fsl6kqy83aql2xn8yr1amy";
+      rev = "1481dd4fb9effef8831ed57ae2459310621f5df0";
+      sha256 = "0y1mw113c58cy54vgfbv6km5g61wpd9v08r131jkbzylhzg2yqyh";
     };
   };
 
@@ -1021,42 +1021,42 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-11-10";
+    name = "neosnippet-vim-2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "9f87934708db75cfafd3ec957c11cfe190281c5f";
-      sha256 = "03frmqsxw047j4im2gacr8xiarck6dwpp32b0hza39bmsimc09m7";
+      rev = "45b6a8688cc743f3855b866ff47b0f0e9481bf8d";
+      sha256 = "02h6gqg1nmkg3c9k5ar77khqa9raxx3wlbf421q3w3k7fsmn31dv";
     };
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-11-08";
+    name = "neoyank-vim-2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
-      rev = "ecce36986f02358bd4377c52a61bfebe0287fce0";
-      sha256 = "0pf82pb3mm2pgi6nc6s3a3jzlfgi7c80qr9x7bc6ddzkhw1v92jn";
+      rev = "9ff9d9df82a7671c3ffd7735953d6cf269bac213";
+      sha256 = "1jaiw86gvb6dnzwnzq7hp04cc3b9yibzw0z868izpnc1696hkb3d";
     };
   };
 
   nerdcommenter = buildVimPluginFrom2Nix {
-    name = "nerdcommenter-2018-07-31";
+    name = "nerdcommenter-2018-12-03";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "fdf950f20b3907c6a6fa0bc5c7ac0aeb567841dd";
-      sha256 = "17b742fzybdcsf623n6xz21kb11xk2wz6w24iwdh8pkmqqh5mgzp";
+      rev = "d24868bc85de599ee2424ca93aa5f6991bd3128c";
+      sha256 = "1xrnngrn537757as4jfiaamjq7yymgh8cdbciiwpc6a2qpiscmdb";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-11-29";
+    name = "nerdtree-2018-12-07";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "c905a5d7b87051e574c2e72fae57e56c456ba2f4";
-      sha256 = "178nv2jbxn7a8m1amy075m1iwif9bnj9cfz278rzj7i5fr50gqp8";
+      rev = "c1876da09c38315d7fdea33d9082d1868b5fbd2b";
+      sha256 = "1v2w5gf4ggm2bvnl6zhpqxna8c72fssp5bg2z350kncjjq069bks";
     };
   };
 
@@ -1531,12 +1531,12 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-10-14";
+    name = "traces-vim-2018-12-04";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "9520ed3837340028b871a9e497dd0d0b07cb4953";
-      sha256 = "0dfm04c4v0qk2f7fycpkwhbws0m5q383bizyaslflb1mmx3jnc48";
+      rev = "47bd356e8a5e32b9b0be5d9805b603ee1cbb4242";
+      sha256 = "145baj6jsp7j7amcgrmm3607lvgy2z2w6map0s1fcmgykrn89xfz";
     };
   };
 
@@ -1601,12 +1601,12 @@
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-11-18";
+    name = "verilog_systemverilog-vim-2018-12-08";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "c1d30130cdf3420fa9043e4b875a63eebb868f02";
-      sha256 = "1hrlzqmpyvjciczcijaag53ms1wn4i2f10irjlm0c3wynsxx9khp";
+      rev = "c09406a32e55015bdb0e12490c452128f6f1425d";
+      sha256 = "0nnfa5rcdjjy4hv6b6kqbyg2s3ghj4knyy7m35qibnjvzwnj7smg";
     };
   };
 
@@ -1821,12 +1821,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-11-22";
+    name = "vim-airline-2018-12-03";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "bd468dacfe874fd669ec69522b550d3e1371cf56";
-      sha256 = "0a92a42xnx0rif7r85mrp7jhzmlnbaiqafpc8bn1848bbq9wg880";
+      rev = "3d9071e6b618280000a021a2517e28cb4b497be4";
+      sha256 = "1qhwyaszhgd6vnpa9xmbnrsgs39nc87m0d35a3ccpkjp0q7bpzgq";
     };
   };
 
@@ -1921,22 +1921,22 @@
   };
 
   vim-closetag = buildVimPluginFrom2Nix {
-    name = "vim-closetag-2018-11-07";
+    name = "vim-closetag-2018-12-08";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
-      rev = "6fe822a730d4a5774ce6ffbb3bd88062e18ada9a";
-      sha256 = "1pa0dpb6d20acvlkgpcjb358m658q23666m567lvs849bjzsdlwp";
+      rev = "fbcd62bf30e3322894e03ccc2f17cef96ca535ac";
+      sha256 = "097jqajbpzm8cl5a5bci75sjwb34c998z9kkx3s0dd2xyw3la8jq";
     };
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-08-17";
+    name = "vim-codefmt-2018-12-05";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "18fe8fbd7a6c0875f922aa682f5dec81b9f4e554";
-      sha256 = "0fzhwxcg4yx6zm1ndzp4vmrsi4za9kxymqbrrsj9zk46lm4bv74h";
+      rev = "5a198e23de16e3efabd041dc67b7718007bb7d83";
+      sha256 = "0z7f5qh453hpcba1gbyknn7244lhkwn18bkjx0xhrhi9qjz8bz9d";
     };
   };
 
@@ -2051,12 +2051,12 @@
   };
 
   vim-dirvish = buildVimPluginFrom2Nix {
-    name = "vim-dirvish-2018-11-15";
+    name = "vim-dirvish-2018-12-04";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "ba3be081de598878edf9624f5c4cb06961b6e842";
-      sha256 = "1bcwj0w5v67mba4m4abmcxncawxz6dpflz34flpcn8869rsghbgv";
+      rev = "d33796c460229b2cf0dd09fedf1b272da9d13a42";
+      sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd";
     };
   };
 
@@ -2131,12 +2131,12 @@
   };
 
   vim-elixir = buildVimPluginFrom2Nix {
-    name = "vim-elixir-2018-08-17";
+    name = "vim-elixir-2018-12-06";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b";
-      sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04";
+      rev = "34873ee66e0dfd7c8105d6f0ad048a2df04e77f2";
+      sha256 = "0vg82nhmliz8330znfy5yqldrgfpb9h52jc9bdhc9pw3d0szx74q";
     };
   };
 
@@ -2271,12 +2271,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-01";
+    name = "vim-go-2018-12-07";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "3577e475ac6f1089e0a32d2921989a4279e9867b";
-      sha256 = "10i3jzwp0rgdyyzmkdvpxfxq2i1dk3hdcxanbi4gm0xh8zs1c0h2";
+      rev = "ef278b486ad0698b74c53b61b9ebb3752d0384c2";
+      sha256 = "0ki5fa6n40818rfscffpb12lzkmqns9yfbbxwipq7sf0bg2slys3";
     };
   };
 
@@ -2471,12 +2471,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-11-14";
+    name = "vim-javacomplete2-2018-12-05";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "cc9eb84b43b455ed61e647eac577fd6b850f0e8b";
-      sha256 = "0xxashigb3jifhwcsbi8mdzhd049mi1naaaih69cmmvzwrs3ik1p";
+      rev = "876aaf702bb4632c15f44b7f679bd5dbe84ae756";
+      sha256 = "1p3g16gk6b3wv0hmg0wzahpg3l0vk35abcr6hgs0rkwhgbnhl3xk";
     };
   };
 
@@ -3052,12 +3052,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-11-27";
+    name = "vim-snippets-2018-12-09";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "97e4ae4fe8d4e8af8c7d1a1d0c41e34ac81cf636";
-      sha256 = "1spf9bvn0a5cx3nhgzj6i5aqrh47v27a8rjxi3im2n1is0gyar7r";
+      rev = "1accde62ad62fe4adac62bbb16c4915d97786637";
+      sha256 = "0rgshn7w2c6dgykaqnlxvwb92wvv2rpvx5i7h5xmh67bira4bc5f";
     };
   };
 
@@ -3092,12 +3092,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-11-28";
+    name = "vim-startify-2018-12-08";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "e25fbe1c0d6f8cda83c0e300d70f9b8009e4134f";
-      sha256 = "0j3yr5g97s8lb9z68rx5clbg7af74r5y3rlgj5jx0mxlxx3yysyc";
+      rev = "5cd4faf2c681c36edfae3aa907d0ab720ff9c6e5";
+      sha256 = "0zs1sxwpi24lfiaz5k5wglm642qrmd8krcv8vjrvg222jq4inhlf";
     };
   };
 
@@ -3402,12 +3402,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-02";
+    name = "vimtex-2018-12-08";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "c3d40a9bc136bbe01739b193e188f3ad450edaa5";
-      sha256 = "1mgji6w1630npqps3mysapqg08zd7abvkr3vvdl4ns7f582rm2b6";
+      rev = "f6fae0c858558344d622cde4e2ed4a58caffb813";
+      sha256 = "1pv05c90pcmxiq1553hz6f8g0x6a8b77g1m05i9f6j39acr63nrg";
     };
   };
 
@@ -3523,12 +3523,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-11-27";
+    name = "youcompleteme-2018-12-07";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "75bf1738dcac502fa2d04e87116a3ce65249be8c";
-      sha256 = "19mdhpiqkn9zr23b55cpx66lwmm2a6kdss98dwzib3swr3dgcvcg";
+      rev = "80246aa9a23cab4175c41a514598284efe218c20";
+      sha256 = "1s002jq0n4nhaxk42hdgqdgww67f3crx5rj5xns34ifg3y1zagn2";
       fetchSubmodules = true;
     };
   };
@@ -3582,4 +3582,4 @@
       sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6";
     };
   };
-}
+}
\ No newline at end of file

From 307ccf9dd16138b17928da3dcf32008333be7672 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 9 Dec 2018 10:45:29 -0500
Subject: [PATCH 1595/2793] plank: hide launcher in pantheon

---
 pkgs/applications/misc/plank/default.nix            | 3 +++
 pkgs/applications/misc/plank/hide-in-pantheon.patch | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/applications/misc/plank/hide-in-pantheon.patch

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index f9291117ed4..626e400eac4 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  # Make plank's application launcher hidden in Pantheon
+  patches = [ ./hide-in-pantheon.patch ];
+
   postPatch = ''
     substituteInPlace ./configure \
       --replace "/usr/bin/file" "${file}/bin/file"
diff --git a/pkgs/applications/misc/plank/hide-in-pantheon.patch b/pkgs/applications/misc/plank/hide-in-pantheon.patch
new file mode 100644
index 00000000000..ab8a4c72389
--- /dev/null
+++ b/pkgs/applications/misc/plank/hide-in-pantheon.patch
@@ -0,0 +1,9 @@
+diff --git a/data/plank.desktop.in b/data/plank.desktop.in
+index 330c3a4..e1bdf5f 100644
+--- a/data/plank.desktop.in
++++ b/data/plank.desktop.in
+@@ -8,3 +8,4 @@ Exec=plank
+ Icon=plank
+ Terminal=false
+ NoDisplay=false
++NotShowIn=Pantheon;

From efe8be7fd438a56f15ee23e0902ef344b8496378 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sun, 9 Dec 2018 18:38:23 +0200
Subject: [PATCH 1596/2793] distrobuilder: 2018_06_29 -> 2018_10_04

---
 .../virtualization/distrobuilder/default.nix  |  6 +--
 .../virtualization/distrobuilder/deps.nix     | 54 ++++++++++++++-----
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index 2286faf4d1b..54f1f492487 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -8,8 +8,8 @@ let binPath = stdenv.lib.makeBinPath [
 in
 buildGoPackage rec {
   name = "distrobuilder-${version}";
-  version = "2018_06_29";
-  rev = "e5acd73f81ad37151f3a2088fde650cea9b6a7e6";
+  version = "2018_10_04";
+  rev = "d2329be9569d45028a38836186d2353b8ddfe1ca";
 
   goPackagePath = "github.com/lxc/distrobuilder";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "lxc";
     repo = "distrobuilder";
-    sha256 = "19rc11s0paqga72jr8bziixihfv7dlkszmfk6xkg0349hzdg0gac";
+    sha256 = "1sn1wif86p089kr6zq83k81hjd1d73kamnawc2p0k0vd0w91d3v4";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix
index 56ff3c0cc12..e4c65946551 100644
--- a/pkgs/tools/virtualization/distrobuilder/deps.nix
+++ b/pkgs/tools/virtualization/distrobuilder/deps.nix
@@ -1,12 +1,30 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
+  {
+    goPackagePath = "github.com/flosch/pongo2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/flosch/pongo2";
+      rev = "24195e6d38b06020d7a92c7b11960cf2e7cad2f2";
+      sha256 = "1cbg3ya8l2v34gcxnd73nvzpfpx8kzkbiv0kpgaxqpcqjhanhgj9";
+    };
+  }
   {
     goPackagePath = "github.com/gorilla/websocket";
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
-      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+      rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
+      sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/errors";
+      rev = "089d3ea4e4d597bd98acac068193d341983326a3";
+      sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
     };
   }
   {
@@ -14,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lxc/lxd";
-      rev = "a81aac803bc22dcb14982b80dce005444e2b22f1";
-      sha256 = "1pjwgh6551mjzkdzmvxx065sxxn8ixb3vdq2i6g1pyb56h5hnayi";
+      rev = "5507ca02c639b378290402c7d33911a90caa4f9e";
+      sha256 = "08h6ycnq43zhkzlrfvk656d1xqjbxhz6dpqmzcmrkb3pw0h0f8hg";
     };
   }
   {
@@ -23,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
-      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+      rev = "059132a15dd08d6704c67711dae0cf35ab991756";
+      sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg";
     };
   }
   {
@@ -32,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
-      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+      rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc";
+      sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy";
     };
   }
   {
@@ -41,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
-      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+      rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9";
+      sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2";
     };
   }
   {
@@ -54,14 +72,22 @@
       sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
     };
   }
+  {
+    goPackagePath = "gopkg.in/robfig/cron.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/robfig/cron.v2";
+      rev = "be2e0b0deed5a68ffee390b4583a13aff8321535";
+      sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y";
+    };
+  }
   {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
     };
   }
 ]
-

From 3adf8427d2b4038f92d7991aaec6f0ca849ad0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 9 Dec 2018 18:01:54 +0100
Subject: [PATCH 1597/2793] borgbackup: 1.1.7 -> 1.1.8

---
 pkgs/tools/backup/borg/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 72f6cd03e03..0c93e183f47 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,22 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.1.7";
+  version = "1.1.8";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
+    sha256 = "0b4370480ca0114cb0bb534286241af8a35c6ffb71404dfa409ed06099661b63";
   };
 
-  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 3cbf18f32b1fb4290819b76b9981164c4bf5c0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 9 Dec 2018 18:17:27 +0100
Subject: [PATCH 1598/2793] nixos/tests/borgbackup: test `borg mount`

---
 nixos/tests/borgbackup.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 9b39abdfa8e..fdb87dbea43 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -130,6 +130,9 @@ in {
       # Make sure keepFile has the correct content
       $client->succeed("$borg extract '${localRepo}::${archiveName}'");
       $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
+      # Make sure the same is true when using `borg mount`
+      $client->succeed("mkdir -p /mnt/borg && $borg mount '${localRepo}::${archiveName}' /mnt/borg");
+      $client->succeed('c=$(cat /mnt/borg/${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
     };
 
     subtest "remote", sub {

From 373be8207ac409f752dbea66d4ff00a653d5b620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 9 Dec 2018 18:16:49 +0100
Subject: [PATCH 1599/2793] nixos/tests/i3wm: fix terminal title

Probably due to #51678 which makes bash set the terminal title.
---
 nixos/tests/i3wm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index e51aee30fdb..d309f19a0b4 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     $machine->waitForFile("/home/alice/.config/i3/config");
     $machine->sleep(2);
     $machine->sendKeys("alt-ret");
-    $machine->waitForWindow(qr/machine.*alice/);
+    $machine->waitForWindow(qr/alice.*machine/);
     $machine->sleep(2);
     $machine->screenshot("terminal");
   '';

From 80fdafb37362e8c55a8b17be538cea64b122cb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 9 Dec 2018 19:27:06 +0100
Subject: [PATCH 1600/2793] nixos/tests/gnome3: fix terminal title

The tests passes, but that's just because a race condition where the window is
titled `Terminal` long enough.
---
 nixos/tests/gnome3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 3f0368592b8..6e92079f65a 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -33,7 +33,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->succeed("xauth merge ~alice/.Xauthority");
-      $machine->waitForWindow(qr/Terminal/);
+      $machine->waitForWindow(qr/alice.*machine/);
       $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
       $machine->sleep(10);
       $machine->screenshot("screen");

From aad9baeba80266fcabbae29e16c78af3710e89f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 9 Dec 2018 20:45:03 +0100
Subject: [PATCH 1601/2793] linuxPackages.virtualboxGuestAdditions: fix hash

---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index fc957f6f461..2ed0fb5cabd 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "e149ff0876242204fe924763f9272f691242d6a6ad4538a128fb7dba770781de";
+    sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From 8c11c9528eb2de2b203706bf8060634839cd7308 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 2 Dec 2018 13:14:31 +0000
Subject: [PATCH 1602/2793] frama-c: Chlorine -> Argon

---
 .../development/tools/analysis/frama-c/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 2f517eb0084..29a19022094 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
-, ltl2ba, coq, alt-ergo, why3, autoconf
+, ltl2ba, coq, why3, autoconf
 }:
 
 let
@@ -9,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "20180502";
-  slang   = "Chlorine";
+  version = "18.0";
+  slang   = "Argon";
 
   src = fetchurl {
-    url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "1m4r8h8n1z957pylyf9b0kjblh59imnqm1bkb4s6rdwl4a1gbjgc";
+    url    = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
+    sha256 = "0a88k2mhafj7pz3dzgsqkrc9digkxpnvr9jqq9nbzwq8qr02bca2";
   };
 
   why2 = fetchurl {
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf makeWrapper ];
 
   buildInputs = with ocamlPackages; [
-    ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
-    lablgtk coq graphviz zarith why3 apron camlp4
+    ncurses ocaml findlib ltl2ba ocamlgraph
+    lablgtk coq graphviz zarith why3 apron
   ];
 
 

From acf738bc54bffcecce2eae2bb26f1b4a59c3ce21 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 9 Dec 2018 21:14:04 +0100
Subject: [PATCH 1603/2793] smartmontools: drivedb 4548 -> 4852

---
 pkgs/tools/system/smartmontools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 039c9a8e6a5..e8fbe90acde 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -4,11 +4,11 @@
 let
   version = "6.6";
 
-  dbrev = "4548";
+  dbrev = "4852";
   drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
   driverdb = fetchurl {
     url    = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
-    sha256 = "0nwk4ir0c40b01frqm7a0lvljh5k9yhslc3j4485zjsx3v5w269f";
+    sha256 = "15gbwiw38yzl3cdvys6r7wknv5zdycm7zbswa2p9vzxlc8s63rlr";
     name   = "smartmontools-drivedb.h";
   };
 

From b5435d0551ce5244c8b4e873a173d91b3bd81da7 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 4 Dec 2018 23:19:33 +0100
Subject: [PATCH 1604/2793] giac: 1.4.9 -> 1.5.0

---
 pkgs/applications/science/math/giac/default.nix    |  4 ++--
 .../science/math/sage/patches/giac-1.5.0.patch     | 14 ++++++++++++++
 pkgs/applications/science/math/sage/sage-src.nix   |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/math/sage/patches/giac-1.5.0.patch

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 2823165d022..4ad498e5922 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -9,11 +9,11 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
 stdenv.mkDerivation rec {
   name = "${attr}-${version}";
   attr = if enableGUI then "giac-with-xcas" else "giac";
-  version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade
+  version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade
 
   src = fetchurl {
     url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
-    sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk";
+    sha256 = "1b9khiv0mk2xzw1rblm2jy6qsf8y6f9k7qy15sxpb21d72hzzbl2";
   };
 
   patches = stdenv.lib.optionals (!enableGUI) [
diff --git a/pkgs/applications/science/math/sage/patches/giac-1.5.0.patch b/pkgs/applications/science/math/sage/patches/giac-1.5.0.patch
new file mode 100644
index 00000000000..58090b241d2
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/giac-1.5.0.patch
@@ -0,0 +1,14 @@
+--- a/src/sage/interfaces/giac.py	2018-12-08 22:11:56.285500644 +0100
++++ b/src/sage/interfaces/giac.py	2018-12-08 22:11:56.285500644 +0100
+@@ -617,10 +617,7 @@
+             '4\n3'
+             sage: s='g(x):={\nx+1;\nx+2;\n}'
+             sage: giac(s)
+-            (x)->{
+-            x+1;
+-            x+2;
+-            }
++            (x)->[x+1,x+2]
+             sage: giac.g(5)
+             7
+         """
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 5d729d9c5fd..5dc73e26a59 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/25260
     ./patches/numpy-1.15.1.patch
 
+    # https://trac.sagemath.org/ticket/26315
+    ./patches/giac-1.5.0.patch
+
     # needed for ntl update
     # https://trac.sagemath.org/ticket/25532
     (fetchpatch {

From e7801461e069753461a4ee50863bba72282aa99a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 7 Dec 2018 11:46:25 +0100
Subject: [PATCH 1605/2793] giac: don't split in multiple outputs for when gui
 enabled

This breaks the Phys and Turtle menu, among other things.
---
 pkgs/applications/science/math/giac/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 4ad498e5922..ecd55f62e33 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -47,7 +47,9 @@ stdenv.mkDerivation rec {
     libGLU_combined fltk xorg.libX11
   ];
 
-  outputs = [ "out" "doc" ];
+  # xcas Phys and Turtle menus are broken with split outputs
+  # and interactive use is likely to need docs
+  outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc";
 
   doCheck = true;
   preCheck = ''
@@ -80,9 +82,15 @@ stdenv.mkDerivation rec {
     # reference cycle
     rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
 
-    mkdir -p "$doc/share/giac"
-    mv "$out/share/giac/doc" "$doc/share/giac"
-    mv "$out/share/giac/examples" "$doc/share/giac"
+    if [ -n "$doc" ]; then
+      mkdir -p "$doc/share/giac"
+      mv "$out/share/giac/doc" "$doc/share/giac"
+      mv "$out/share/giac/examples" "$doc/share/giac"
+    fi
+  '' + stdenv.lib.optionalString (!enableGUI) ''
+    for i in pixmaps application-registry applications icons; do
+      rm -r "$out/share/$i";
+    done;
   '';
 
   meta = with stdenv.lib; {

From 8b4f885264da0af8c3142f90c8c89c73501b8703 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 8 Dec 2018 21:10:24 +0100
Subject: [PATCH 1606/2793] giac: add missing optional dependencies

---
 pkgs/applications/science/math/giac/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index ecd55f62e33..2afa52dd511 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
-, gmp, mpfr, pari, ntl, gsl, blas, mpfi
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
 }:
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
 
   # perl is only needed for patchShebangs fixup.
   buildInputs = [
-    gmp mpfr pari ntl gsl blas mpfi
-    readline gettext libpng libao perl
+    gmp mpfr pari ntl gsl blas mpfi glpk
+    readline gettext libpng libao perl ecm
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead
     (stdenv.lib.getLib gfortran.cc)
@@ -47,6 +47,13 @@ stdenv.mkDerivation rec {
     libGLU_combined fltk xorg.libX11
   ];
 
+  /* fixes:
+  configure:16211: checking for main in -lntl
+  configure:16230: g++ -o conftest -g -O2   conftest.cpp -lntl  -llapack -lblas -lgfortran -ldl -lpng16 -lm -lmpfi -lmpfr -lgmp  >&5
+  /nix/store/y9c1v4x7y39j2rfbg17agjwqdzxpsn18-ntl-11.3.2/lib/libntl.so: undefined reference to `pthread_key_create'
+  */
+  NIX_CFLAGS_LINK="-lpthread";
+
   # xcas Phys and Turtle menus are broken with split outputs
   # and interactive use is likely to need docs
   outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc";
@@ -66,7 +73,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
     "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa"
-    "--enable-ao"
+    "--enable-ao" "--enable-ecm" "--enable-glpk"
   ] ++ stdenv.lib.optionals enableGUI [
     "--enable-gui" "--with-x"
   ];

From 2253b3e7605369f75109e0798d20903c762b8a0c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 8 Dec 2018 21:58:45 +0100
Subject: [PATCH 1607/2793] nauty: also install libs

---
 pkgs/applications/science/math/nauty/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 9639376fbda..5b431f41926 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -6,13 +6,20 @@ stdenv.mkDerivation rec {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
     sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
   };
+  outputs = [ "out" "dev" ];
   buildInputs = [];
   installPhase = ''
-    mkdir -p "$out"/{bin,share/doc/nauty}
+    mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
 
-    cp $(find . -type f -perm -111 \! -name '*.*' ) "$out/bin"
+    find . -type f -perm -111 \! -name '*.*' \! -name configure -exec cp '{}' "$out/bin" \;
     cp [Rr][Ee][Aa][Dd]* COPYRIGHT This* [Cc]hange* "$out/share/doc/nauty"
+
+    cp *.h $dev/include/nauty
+    for i in *.a; do
+      cp "$i" "$dev/lib/lib$i";
+    done
   '';
+  checkTarget = "checks";
   meta = {
     inherit version;
     description = ''Programs for computing automorphism groups of graphs and digraphs'';

From 29242e472ea0c8fc87aa7ee31143bf3340228547 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 8 Dec 2018 21:58:57 +0100
Subject: [PATCH 1608/2793] giac: build with nauty support

---
 pkgs/applications/science/math/giac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 2afa52dd511..ad82d7572e3 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
-, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   # perl is only needed for patchShebangs fixup.
   buildInputs = [
-    gmp mpfr pari ntl gsl blas mpfi glpk
+    gmp mpfr pari ntl gsl blas mpfi glpk nauty
     readline gettext libpng libao perl ecm
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead

From 7a1a98e745aca4b7d234acf0d44d79b4d8c829c8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 15:52:19 -0500
Subject: [PATCH 1609/2793] altcoins.dero: use boost165

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

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 87945988321..9a47a853e47 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -45,7 +45,7 @@ rec {
   dcrd = callPackage ./dcrd.nix { };
   dcrwallet = callPackage ./dcrwallet.nix { };
 
-  dero = callPackage ./dero.nix { };
+  dero = callPackage ./dero.nix { boost = boost165; };
 
   dogecoin  = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };

From af0da185779b84ba6e3fae4b64e5c3f6778f2cd1 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 16:25:37 -0500
Subject: [PATCH 1610/2793] altcoins.masari: use boost165

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

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 9a47a853e47..21ca69369fc 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -65,7 +65,7 @@ rec {
   };
   litecoind = litecoin.override { withGui = false; };
 
-  masari = callPackage ./masari.nix { };
+  masari = callPackage ./masari.nix { boost = boost165; };
 
   memorycoin  = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
   memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };

From 8ded84ec2ad29828a59e8f90d88163250771c581 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 16:25:48 -0500
Subject: [PATCH 1611/2793] altcoins.sumokoin: use boost165

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

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 21ca69369fc..77e2f8f5b35 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -79,7 +79,7 @@ rec {
 
   stellar-core = callPackage ./stellar-core.nix { };
 
-  sumokoin = callPackage ./sumokoin.nix { };
+  sumokoin = callPackage ./sumokoin.nix { boost = boost165; };
 
   wownero = callPackage ./wownero.nix {
     inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;

From 357f6a8b7e21b901c8a5b6d3e7d425415c8c1300 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Dec 2018 06:38:45 +0300
Subject: [PATCH 1612/2793] cernlib: fix build

The imake rules contain a comment line that looks like a pragma. Recently imake
in nixpkgs was switched to use tradcpp, which is a bit more strict about
interpreting unknown pragmas. To fix the build, the comments is changed to use
C++ style comments.
---
 pkgs/development/libraries/physics/cernlib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index 92d2ab96232..36b385828bc 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace 2006/src/config/site.def \
       --replace "# define MakeCmd gmake" "# define MakeCmd make"
+    substituteInPlace 2006/src/config/lnxLib.rules \
+      --replace "# lib" "// lib"
   '';
 
   configurePhase = ''

From 2b66c286be34c87829c5555ca5a92238231e6d0d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Nov 2018 16:54:24 +0000
Subject: [PATCH 1613/2793] coqPackages.corn: init at 8.8.1

---
 pkgs/development/coq-modules/corn/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/coq-modules/corn/default.nix

diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix
new file mode 100644
index 00000000000..dc0f0873d07
--- /dev/null
+++ b/pkgs/development/coq-modules/corn/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, coq, bignums, math-classes }:
+
+stdenv.mkDerivation rec {
+  pname = "corn";
+  version = "8.8.1";
+  name = "coq${coq.coq-version}-${pname}-${version}";
+  src = fetchFromGitHub {
+    owner = "coq-community";
+    repo = pname;
+    rev = version;
+    sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
+  };
+
+  buildInputs = [ coq ];
+
+  preConfigure = "patchShebangs ./configure.sh";
+  configureScript = "./configure.sh";
+  dontAddPrefix = true;
+
+  propagatedBuildInputs = [ bignums math-classes ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = {
+    homepage = http://c-corn.github.io/;
+    license = stdenv.lib.licenses.gpl2;
+    description = "A Coq library for constructive analysis";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (coq.meta) platforms;
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+  };
+
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 6d6de4e22bd..5a392b20cae 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -20,6 +20,7 @@ let
       coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
       coqprime = callPackage ../development/coq-modules/coqprime {};
       coquelicot = callPackage ../development/coq-modules/coquelicot {};
+      corn = callPackage ../development/coq-modules/corn {};
       dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
       equations = callPackage ../development/coq-modules/equations { };
       fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};

From 3cdbdd20c4e77c2d1943188deb6fb74ef78eba02 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 10 Dec 2018 09:13:37 +0100
Subject: [PATCH 1614/2793] sequeler: 0.6.3 -> 0.6.4

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.4
---
 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 2f91a9fa449..51d6e5c2f7e 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  version = "0.6.3";
+  version = "0.6.4";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k";
+    sha256 = "1np7554535vwkjlk5kq4fpighfw92l4j35pfn1b2mgnh7xd6zhaj";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];

From f6172b634dd4cf6f88423675147576f045dff563 Mon Sep 17 00:00:00 2001
From: qoli <qoli@protonmail.com>
Date: Fri, 30 Nov 2018 10:00:30 -0800
Subject: [PATCH 1615/2793] linux_hardkernel_4_14: 4.14.78-150 -> 4.14.85.152

---
 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 8ad96f4f1bf..863455f29ab 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.78-150";
+  version = "4.14.85-152";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.78";
+  modDirVersion = "4.14.85";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "0139qciaf1vlz41s9idjbcx20c1svrp1l7qaazfkwfx52ghb4pvv";
+    sha256 = "1bpsxrbsdygnk2414ajf2za7rnb6xxnjngkzrg060c4i3bcrwrzf";
   };
 
   defconfig = "odroidxu4_defconfig";

From 57b2bcf7f5ca7def1d0289247c6c96770842bb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Dec 2018 07:11:34 -0200
Subject: [PATCH 1616/2793] zafiro-icons: 0.7.3 -> 0.7.7

---
 pkgs/data/icons/zafiro-icons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index dd869523267..1614f6cd3d8 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zafiro-icons";
-  version = "0.7.3";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "02q3wcklmqdy4ycyly7477q98y3mkgnpr7c78jqxvy2yr486wwyx";
+    sha256 = "0471gf4s32dhcm3667l1bnam04jk4miw3c6s557vix59rih1y71p";
   };
 
   nativeBuildInputs = [ gtk3 ];

From d54bfa8f4114a64747a6165c21599a5cc036e91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 4 Aug 2018 15:17:32 +0200
Subject: [PATCH 1617/2793] gnome3.gnome-session: prevent crash when launching
 wayland sessions

gnome-session inherits GDMS PATH, which is at the moment non-functional. In X11
this didn't matter as the `Xsession` wrapper would populate the environment
beforehand. Wayland sessions doesn't source `Xesssion` (duh), so we patch
`bin/gnome-session` to use absolute paths for `grep` and `bash`.

In addition `bin/gnome-session` is a simple wrapper around
`libexec/gnome-session-binary` mostly responsible for sourcing the users profile
before launching the binary. This made our wrapping of `bin/gnome-session`
ineffective on wayland as the profile would reset the environment. Simply wrap
`libexec/gnome-session-binary` instead.
---
 .../gnome-3/core/gnome-session/default.nix     |  9 +++++++--
 .../gnome-3/core/gnome-session/fix-paths.patch | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index ceda3dfd56f..2f44a4e168d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
 
 stdenv.mkDerivation rec {
   name = "gnome-session-${version}";
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       gsettings = "${glib.bin}/bin/gsettings";
       dbusLaunch = "${dbus.lib}/bin/dbus-launch";
+      grep = "${gnugrep}/bin/grep";
+      bash = "${bash}/bin/bash";
     })
   ];
 
@@ -37,8 +39,11 @@ stdenv.mkDerivation rec {
     patchShebangs meson_post_install.py
   '';
 
+  # `bin/gnome-session` will reset the environment when run in wayland, we
+  # therefor wrap `libexec/gnome-session-binary` instead which is the actual
+  # binary needing wrapping
   preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
+    wrapProgram "$out/libexec/gnome-session-binary" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index c1b5ebe842f..fe4feaf7085 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
@@ -1,6 +1,22 @@
 --- a/gnome-session/gnome-session.in
 +++ b/gnome-session/gnome-session.in
-@@ -13,7 +13,7 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
+@@ -3,11 +3,11 @@
+ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
+    [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
+    [  -n "$SHELL" ] &&
+-   grep -q "$SHELL" /etc/shells &&
+-   ! (echo "$SHELL" | grep -q "false") &&
+-   ! (echo "$SHELL" | grep -q "nologin"); then
++   @grep@ -q "$SHELL" /etc/shells &&
++   ! (echo "$SHELL" | @grep@ -q "false") &&
++   ! (echo "$SHELL" | @grep@ -q "nologin"); then
+   if [ "$1" != '-l' ]; then
+-    exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
++    exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
+   else
+     shift
+   fi
+@@ -13,7 +13,7 @@
    fi
  fi
  

From 48a9a24910669f07ca158789fcf92ccf13a97db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sat, 4 Aug 2018 15:51:55 +0200
Subject: [PATCH 1618/2793] nixos/sddm: Enable wayland-sessions

LightDM is unable to separate between `wayland-sessions/gnome.desktop` and
`xsessions/gnome.desktop` so I ommitted adding this to LightDM.
---
 nixos/modules/services/x11/display-managers/sddm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index b7511dfd5a8..d5f98874b6e 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -59,6 +59,7 @@ let
 
     [Wayland]
     EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
+    SessionDir=${dmcfg.session.desktops}/share/wayland-sessions
 
     ${optionalString cfg.autoLogin.enable ''
     [Autologin]

From cdd266c73bee26b6cd7e092da9a4cc0f34237434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 5 Aug 2018 16:49:00 +0200
Subject: [PATCH 1619/2793] nixos/gnome3: Implement `sessionPath` through
 `environment.extraInit`

This will simply make the `sessionPath` more likely to work.
---
 .../services/x11/desktop-managers/gnome3.nix  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 72109cf31af..ba6d333b534 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -136,19 +136,17 @@ in {
 
     services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
 
-    services.xserver.displayManager.sessionCommands = ''
-      if test "$XDG_CURRENT_DESKTOP" = "GNOME"; then
-          ${concatMapStrings (p: ''
-            if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
-              export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
-            fi
+    environment.extraInit = ''
+      ${concatMapStrings (p: ''
+        if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+        fi
 
-            if [ -d "${p}/lib/girepository-1.0" ]; then
-              export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
-              export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
-            fi
-          '') cfg.sessionPath}
-      fi
+        if [ -d "${p}/lib/girepository-1.0" ]; then
+          export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+        fi
+      '') cfg.sessionPath}
     '';
 
     environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";

From 3c0e70402f54aa05f47cf2b4266f70b4a10d3aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 6 Aug 2018 13:45:42 +0200
Subject: [PATCH 1620/2793] nixos/displayManager: Note that `sessionCommands`
 aren't run on Wayland

---
 nixos/modules/services/x11/display-managers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index cb3c0c7a843..035029150c8 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -244,7 +244,10 @@ in
           ''
             xmessage "Hello World!" &
           '';
-        description = "Shell commands executed just before the window or desktop manager is started.";
+        description = ''
+          Shell commands executed just before the window or desktop manager is
+          started. These commands are not currently sourced for Wayland sessions.
+        '';
       };
 
       hiddenUsers = mkOption {

From 116c16d9e234a4f1c3ef3bfa29f46a105eef8f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 9 Dec 2018 13:19:42 +0100
Subject: [PATCH 1621/2793] nixos/tests/gnome3: select X11 gnome shell
 explicitely

This isn't strictly necessary yet as LightDM doesn't read the wayland sessions,
but there's no harm in being explicit.
---
 nixos/tests/gnome3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 3f0368592b8..32c6ab226e3 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.xserver.displayManager.lightdm.autoLogin.enable = true;
       services.xserver.displayManager.lightdm.autoLogin.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
-      services.xserver.desktopManager.default = "gnome";
+      services.xserver.desktopManager.default = "gnome-xorg";
 
       virtualisation.memorySize = 1024;
     };

From 75e223bf7ac358bcf4320bb80b386d7cfddc90d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 9 Dec 2018 16:35:51 +0100
Subject: [PATCH 1622/2793] nixos/tests/gnome3-gdm: port to wayland

The test now runs wayland, which means we can no longer use X11 style testing.
Instead we get gnome shell to execute javascript through its dbus interface.
---
 nixos/tests/gnome3-gdm.nix | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 959030d5988..c2808d87d99 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -23,11 +23,21 @@ import ./make-test.nix ({ pkgs, ...} : {
       virtualisation.memorySize = 1024;
     };
 
-  testScript =
-    ''
-      # wait for gdm to start and bring up X
+  testScript = let
+    # Keep line widths somewhat managable
+    bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus";
+    gdbus = "${bus} gdbus";
+    # Call javascript in gnome shell, returns a tuple (success, output), where
+    # `success` is true if the dbus call was successful and output is what the
+    # javascript evaluates to.
+    eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";
+    # False when startup is done
+    startingUp = "${gdbus} ${eval} Main.layoutManager._startingUp";
+    # Hopefully gnome-terminal's wm class
+    wmClass = "${gdbus} ${eval} global.display.focus_window.wm_class";
+  in ''
+      # wait for gdm to start
       $machine->waitForUnit("display-manager.service");
-      $machine->waitForX;
 
       # wait for alice to be logged in
       $machine->waitForUnit("default.target","alice");
@@ -35,10 +45,16 @@ import ./make-test.nix ({ pkgs, ...} : {
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
 
-      # open a terminal and check it's there
-      $machine->succeed("su - alice -c 'DISPLAY=:0.0 XAUTHORITY=/run/user/\$UID/gdm/Xauthority gnome-terminal'");
-      $machine->succeed("xauth merge /run/user/1000/gdm/Xauthority");
-      $machine->waitForWindow(qr/Terminal/);
+      # Wait for the wayland server
+      $machine->waitForFile("/run/user/1000/wayland-0");
+
+      # Wait for gnome shell, correct output should be "(true, 'false')"
+      $machine->waitUntilSucceeds("su - alice -c '${startingUp} | grep -q true,..false'");
+
+      # open a terminal
+      $machine->succeed("su - alice -c '${bus} gnome-terminal'");
+      # and check it's there
+      $machine->waitUntilSucceeds("su - alice -c '${wmClass} | grep -q gnome-terminal-server'");
 
       # wait to get a nice screenshot
       $machine->sleep(20);

From 3b7a7f7b22401174e62899e84ac3b4dcb7b67bb5 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 10 Dec 2018 09:52:38 +0100
Subject: [PATCH 1623/2793] mopidy-iris: 3.31.2 -> 3.31.3

---
 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 c3f45caf531..26cef8dc5ec 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.31.2";
+  version = "3.31.3";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0639ib5nicrabckjd17wdmhl8n3822gc2p1bn0xv8mq70paspar6";
+    sha256 = "060kvwlch2jgiriafly8y03fp8gpbw9xiwhq8ncdij390a03iz8n";
   };
 
   propagatedBuildInputs = [

From 6d21e8d361157697dfe870f90eddceacecc3e576 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 6 Dec 2018 11:10:07 +0100
Subject: [PATCH 1624/2793] nodePackages: Regenerate and fix azure-cli

Regenerates the `nixpkgs` NodeJS set (and updates all dependencies
internally).

Also, the `azure-cli` package doesn't build with NodeJS 10, so now
NodeJS 8 is used for `azure-cli`.

Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
---
 .../node-packages/node-packages-v10.json      |    1 -
 .../node-packages/node-packages-v10.nix       | 3041 +++--------------
 .../node-packages/node-packages-v6.nix        |   16 +-
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        | 1932 ++++++++++-
 pkgs/top-level/all-packages.nix               |    2 +-
 6 files changed, 2497 insertions(+), 2496 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 4a1136901e7..c287ea6d2e6 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -1,6 +1,5 @@
 [
   "asar"
-, "azure-cli"
 , "azure-functions-core-tools"
 , "bower"
 , "bower2nix"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 2a581faab3f..097f8bfe1db 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,13 +13,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@apollographql/apollo-tools-0.2.8" = {
+    "@apollographql/apollo-tools-0.2.9" = {
       name = "_at_apollographql_slash_apollo-tools";
       packageName = "@apollographql/apollo-tools";
-      version = "0.2.8";
+      version = "0.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.8.tgz";
-        sha512 = "A7FTUigtpGCFBaLT1ILicdjM6pZ7LQNw7Vgos0t4aLYtvlKO/L1nMi/NO7bPypzZaJSToTgcxHJPRydP1Md+Kw==";
+        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.2.9.tgz";
+        sha512 = "AEIQwPkS0QLbkpb6WyRhV4aOMxuErasp47ABv5niDKOasQH8mrD8JSGKJAHuQxVe4kB8DE9sLRoc5qeQ0KFCHA==";
       };
     };
     "@apollographql/apollo-upload-server-5.0.3" = {
@@ -1057,49 +1057,49 @@ let
         sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
       };
     };
-    "@lerna/add-3.5.0" = {
+    "@lerna/add-3.6.0" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-3.5.0.tgz";
-        sha512 = "hoOqtal/ChEEtt9rxR/6xmyvTN7581XF4kWHoWPV9NbfZN9e8uTR8z4mCcJq2DiZhRuY7aA5FEROEbl12soowQ==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-3.6.0.tgz";
+        sha512 = "aFVekkHMno3hj1Vg3EiIpAwrZ4g34i8z4KrCx7ATY6BRuxVT4Nt/Nk3l2k6gEOq3tWUDtUctLHxIAo14FI8sng==";
       };
     };
-    "@lerna/batch-packages-3.1.2" = {
+    "@lerna/batch-packages-3.6.0" = {
       name = "_at_lerna_slash_batch-packages";
       packageName = "@lerna/batch-packages";
-      version = "3.1.2";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.1.2.tgz";
-        sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
+        url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.6.0.tgz";
+        sha512 = "khG15B+EFLH3Oms6A6WsMAy54DrnKIhEAm6CCATN2BKnBkNgitYjLN2vKBzlR2LfQpTkgub67QKIJkMFQcK1Sg==";
       };
     };
-    "@lerna/bootstrap-3.5.0" = {
+    "@lerna/bootstrap-3.6.0" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.5.0.tgz";
-        sha512 = "+z4kVVJFO5EGfC2ob/4C9LetqWwDtbhZgTRllr1+zOi/2clbD+WKcVI0ku+/ckzKjz783SOc83swX7RrmiLwMQ==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.6.0.tgz";
+        sha512 = "z6rZQw/aLEN+ragWRYqIIVwA9rDv3QtmRc5VyIRrlV/JiuGpq67FcSR6BrCMc/A7UJ9Kx95+bESm/HUwheKoiQ==";
       };
     };
-    "@lerna/changed-3.5.0" = {
+    "@lerna/changed-3.6.0" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.5.0.tgz";
-        sha512 = "p9o7/hXwFAoet7UPeHIzIPonYxLHZe9bcNcjxKztZYAne5/OgmZiF4X1UPL2S12wtkT77WQy4Oz8NjRTczcapg==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.6.0.tgz";
+        sha512 = "L1SXTtQrsv+4F5Knw5sW/nGnMJq+bbOzhZX2srJ10WsuHuzk3cJWAi7dVEsS3RPKUw9DWOuHKy86o3v6byEiqA==";
       };
     };
-    "@lerna/check-working-tree-3.5.0" = {
+    "@lerna/check-working-tree-3.6.0" = {
       name = "_at_lerna_slash_check-working-tree";
       packageName = "@lerna/check-working-tree";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.5.0.tgz";
-        sha512 = "aWeIputHddeZgf7/wA1e5yuv6q9S5si2y7fzO2Ah7m3KyDyl8XHP1M0VSSDzZeiloYCryAYQAoRgcrdH65Vhow==";
+        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.6.0.tgz";
+        sha512 = "Ioy1t2aVasAwhY1Oi5kfpwbW9RDupxxVVu2t2c1EeBYYCu3jIt1A5ad34gidgsKyiG3HeBEVziI4Uaihnb96ZQ==";
       };
     };
     "@lerna/child-process-3.3.0" = {
@@ -1111,121 +1111,121 @@ let
         sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==";
       };
     };
-    "@lerna/clean-3.5.0" = {
+    "@lerna/clean-3.6.0" = {
       name = "_at_lerna_slash_clean";
       packageName = "@lerna/clean";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.5.0.tgz";
-        sha512 = "bHUFF6Wv7ms81Tmwe56xk296oqU74Sg9NSkUCDG4kZLpYZx347Aw+89ZPTlaSmUwqCgEXKYLr65ZVVvKmflpcA==";
+        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.6.0.tgz";
+        sha512 = "4LodI/jh8IEYtqnrY/OFSpWn5YfDWoDv+5QjiJpd91EjW9vjmkvyhzQ5fG9KtltwgYVn/NJ5zlI1WfmMEXvFFQ==";
       };
     };
-    "@lerna/cli-3.2.0" = {
+    "@lerna/cli-3.6.0" = {
       name = "_at_lerna_slash_cli";
       packageName = "@lerna/cli";
-      version = "3.2.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz";
-        sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==";
+        url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.6.0.tgz";
+        sha512 = "FGCx7XOLpqmU5eFOlo0Lt0hRZraxSUTEWM0bce0p+HNpOxBc91o6d2tenW1azPYFP9HzsMQey1NBtU0ofJJeog==";
       };
     };
-    "@lerna/collect-updates-3.5.0" = {
+    "@lerna/collect-updates-3.6.0" = {
       name = "_at_lerna_slash_collect-updates";
       packageName = "@lerna/collect-updates";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.5.0.tgz";
-        sha512 = "rFCng14K8vHyrDJSAacj6ABKKT/TxZdpL9uPEtZN7DsoJKlKPzqFeRvRGA2+ed/I6mEm4ltauEjEpKG5O6xqtw==";
+        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.6.0.tgz";
+        sha512 = "knliEz3phY51SGnwDhhYqx6SJN6y9qh/gZrZgQ7ogqz1UgA/MyJb27gszjsyyG6jUQshimBpjsG7OMwjt8+n9A==";
       };
     };
-    "@lerna/command-3.5.0" = {
+    "@lerna/command-3.6.0" = {
       name = "_at_lerna_slash_command";
       packageName = "@lerna/command";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/command/-/command-3.5.0.tgz";
-        sha512 = "C/0e7qPbuKZ9vEqzRePksoKDJk4TOWzsU5qaPP/ikqc6vClJbKucsIehk3za6glSjlgLCJpzBTF2lFjHfb+JNw==";
+        url = "https://registry.npmjs.org/@lerna/command/-/command-3.6.0.tgz";
+        sha512 = "BGpXaY2WrxPcIiZX0aATO2HQBatvYT7Qy46lqMnV9RrTePYJ1PPbX1nMzLXSxgrnnlTcTwJNEkw/TL9Xzrph7Q==";
       };
     };
-    "@lerna/conventional-commits-3.5.0" = {
+    "@lerna/conventional-commits-3.6.0" = {
       name = "_at_lerna_slash_conventional-commits";
       packageName = "@lerna/conventional-commits";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.5.0.tgz";
-        sha512 = "roKPILPYnDWiCDxOeBQ0cObJ2FbDgzJSToxr1ZwIqvJU5hGQ4RmooCf8GHcCW9maBJz7ETeestv8M2mBUgBPbg==";
+        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.6.0.tgz";
+        sha512 = "KkY3wd7w/tj76EEIhTMYZlSBk/5WkT2NA9Gr/EuSwKV70PYyVA55l1OGlikBUAnuqIjwyfw9x3y+OcbYI4aNEg==";
       };
     };
-    "@lerna/create-3.5.0" = {
+    "@lerna/create-3.6.0" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-3.5.0.tgz";
-        sha512 = "ek4flHRmpMegZp9tP3RmuDhmMb9+/Hhy9B5eaZc5X5KWqDvFKJtn56sw+M9hNjiYehiimCwhaLWgE2WSikPvcQ==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-3.6.0.tgz";
+        sha512 = "21OunW25Y3Q/oynqWVk0znQFBvZ5tHyLPhzkJeomGmOj0il1RdOUiChu9G9AYsCaLDwBFR0ZFqvTgJ5iw/eaIg==";
       };
     };
-    "@lerna/create-symlink-3.3.0" = {
+    "@lerna/create-symlink-3.6.0" = {
       name = "_at_lerna_slash_create-symlink";
       packageName = "@lerna/create-symlink";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.3.0.tgz";
-        sha512 = "0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w==";
+        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.6.0.tgz";
+        sha512 = "YG3lTb6zylvmGqKU+QYA3ylSnoLn+FyLH5XZmUsD0i85R884+EyJJeHx/zUk+yrL2ZwHS4RBUgJfC24fqzgPoA==";
       };
     };
-    "@lerna/describe-ref-3.5.0" = {
+    "@lerna/describe-ref-3.6.0" = {
       name = "_at_lerna_slash_describe-ref";
       packageName = "@lerna/describe-ref";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.5.0.tgz";
-        sha512 = "XvecK2PSwUv4z+otib5moWJMI+h3mtAg8nFlfo4KbivVtD/sI11jfKsr3S75HuAwhVAa8tAijoAxmuBJSsTE1g==";
+        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.6.0.tgz";
+        sha512 = "hVZJ2hYVbrrNiEG+dEg/Op4pYAbROkDZdiIUabAJffr0T/frcN+5es2HfmOC//4+78Cs1M9iTyQRoyC1RXS2BQ==";
       };
     };
-    "@lerna/diff-3.5.0" = {
+    "@lerna/diff-3.6.0" = {
       name = "_at_lerna_slash_diff";
       packageName = "@lerna/diff";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.5.0.tgz";
-        sha512 = "iyZ0ZRPqH5Y5XEhOYoKS8H/8UXC/gZ/idlToMFHhUn1oTSd8v9HVU1c2xq1ge0u36ZH/fx/YydUk0A/KSv+p3Q==";
+        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.6.0.tgz";
+        sha512 = "p5+VyYKuAnw6NFVrT4s9eBubFZEYlJmiR1mdVlwNtohqS86gERjrPtI0unUK/pxFKb1U2ZNo4fhSlPd+pLwfHg==";
       };
     };
-    "@lerna/exec-3.5.0" = {
+    "@lerna/exec-3.6.0" = {
       name = "_at_lerna_slash_exec";
       packageName = "@lerna/exec";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.5.0.tgz";
-        sha512 = "H5jeIueDiuNsxeuGKaP7HqTcenvMsFfBFeWr0W6knHv9NrOF8il34dBqYgApZEDSQ7+2fA3ghwWbF+jUGTSh/A==";
+        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.6.0.tgz";
+        sha512 = "lwLYASpS8FoQpVYLBpoZlS7bpzkO9pD3D9XeDDKZBodDhdZeCEx2Md2CxZU1RKYDSVIXA8oObvlUh1FEhRQv2w==";
       };
     };
-    "@lerna/filter-options-3.5.0" = {
+    "@lerna/filter-options-3.6.0" = {
       name = "_at_lerna_slash_filter-options";
       packageName = "@lerna/filter-options";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.5.0.tgz";
-        sha512 = "7pEQy1i5ynYOYjcSeo+Qaps4+Ais55RRdnT6/SLLBgyyHAMziflFLX5TnoyEaaXoU90iKfQ5z/ioEp6dFAXSMg==";
+        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.6.0.tgz";
+        sha512 = "6iUMZuvvXPL5EAF7Zo9azaZ6FxOq6tGbiSX8fUXgCdN+jlRjorvkzR+E0HS4bEGTWmV446lnLwdQLZuySfLcbQ==";
       };
     };
-    "@lerna/filter-packages-3.0.0" = {
+    "@lerna/filter-packages-3.6.0" = {
       name = "_at_lerna_slash_filter-packages";
       packageName = "@lerna/filter-packages";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.0.0.tgz";
-        sha512 = "zwbY1J4uRjWRZ/FgYbtVkq7I3Nduwsg2V2HwLKSzwV2vPglfGqgovYOVkND6/xqe2BHwDX4IyA2+e7OJmLaLSA==";
+        url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.6.0.tgz";
+        sha512 = "O/nIENV3LOqp/TiUIw3Ir6L/wUGFDeYBdJsJTQDlTAyHZsgYA1OIn9FvlW8nqBu1bNLzoBVHXh3c5azx1kE+Hg==";
       };
     };
-    "@lerna/get-npm-exec-opts-3.0.0" = {
+    "@lerna/get-npm-exec-opts-3.6.0" = {
       name = "_at_lerna_slash_get-npm-exec-opts";
       packageName = "@lerna/get-npm-exec-opts";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz";
-        sha512 = "arcYUm+4xS8J3Palhl+5rRJXnZnFHsLFKHBxznkPIxjwGQeAEw7df38uHdVjEQ+HNeFmHnBgSqfbxl1VIw5DHg==";
+        url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz";
+        sha512 = "ruH6KuLlt75aCObXfUIdVJqmfVq7sgWGq5mXa05vc1MEqxTIiU23YiJdWzofQOOUOACaZkzZ4K4Nu7wXEg4Xgg==";
       };
     };
     "@lerna/global-options-3.1.3" = {
@@ -1246,58 +1246,58 @@ let
         sha512 = "GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g==";
       };
     };
-    "@lerna/import-3.5.0" = {
+    "@lerna/import-3.6.0" = {
       name = "_at_lerna_slash_import";
       packageName = "@lerna/import";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/import/-/import-3.5.0.tgz";
-        sha512 = "vgI6lMEzd1ODgi75cmAlfPYylaK37WY3E2fwKyO/lj6UKSGj46dVSK0KwTRHx33tu4PLvPzFi5C6nbY57o5ykQ==";
+        url = "https://registry.npmjs.org/@lerna/import/-/import-3.6.0.tgz";
+        sha512 = "8jxNRbAaa4mvMJr0u+sy75gMFPyWfxLHEp+pDs73x1oqMZhpS8O5901QMnpZyRyOvJRhoBJd5hBX2dpsLxC6Xw==";
       };
     };
-    "@lerna/init-3.5.0" = {
+    "@lerna/init-3.6.0" = {
       name = "_at_lerna_slash_init";
       packageName = "@lerna/init";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/init/-/init-3.5.0.tgz";
-        sha512 = "V21/UWj34Mph+9NxIGH1kYcuJAp+uFjfG8Ku2nMy62OGL3553+YQ+Izr+R6egY8y/99UMCDpi5gkQni5eGv3MA==";
+        url = "https://registry.npmjs.org/@lerna/init/-/init-3.6.0.tgz";
+        sha512 = "MTLy3rmMdvpXRmDdoYiVPx7I8sXH4dquq/0MxntL5VxSVh/ZS1HsbrjyRqpdkUKWD9QguxR/w0pzOjVvCeM8CQ==";
       };
     };
-    "@lerna/link-3.5.0" = {
+    "@lerna/link-3.6.0" = {
       name = "_at_lerna_slash_link";
       packageName = "@lerna/link";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/link/-/link-3.5.0.tgz";
-        sha512 = "KSu1mhxwNRmguqMqUTJd4c7QIk9/xmxJxbmMkA71OaJd4fwondob6DyI/B17NIWutdLbvSWQ7pRlFOPxjQVoUw==";
+        url = "https://registry.npmjs.org/@lerna/link/-/link-3.6.0.tgz";
+        sha512 = "Xk8TTAE4EWGyhxLuPxWdyS7i7vfsM5igb6tEyhZm94XUdlA4PmMOYe25BfO7SM/9LYroFknZeDyWAebye3r+PA==";
       };
     };
-    "@lerna/list-3.5.0" = {
+    "@lerna/list-3.6.0" = {
       name = "_at_lerna_slash_list";
       packageName = "@lerna/list";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/list/-/list-3.5.0.tgz";
-        sha512 = "T+NZBQ/l6FmZklgrtFuN7luMs3AC/BoS52APOPrM7ZmxW4nenvov0xMwQW1783w/t365YDkDlYd5gM0nX3D1Hg==";
+        url = "https://registry.npmjs.org/@lerna/list/-/list-3.6.0.tgz";
+        sha512 = "hlQOJkg8K3XXUVXotofP71XsgkhXkkmU/EkqlNg15D78MjzhT+p1wCbG5m89K3tzvjcWVeZwU6L0elaOIXVyCw==";
       };
     };
-    "@lerna/listable-3.0.0" = {
+    "@lerna/listable-3.6.0" = {
       name = "_at_lerna_slash_listable";
       packageName = "@lerna/listable";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.0.0.tgz";
-        sha512 = "HX/9hyx1HLg2kpiKXIUc1EimlkK1T58aKQ7ovO7rQdTx9ForpefoMzyLnHE1n4XrUtEszcSWJIICJ/F898M6Ag==";
+        url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.6.0.tgz";
+        sha512 = "fz63+zlqrJ9KQxIiv0r7qtufM4DEinSayAuO8YJuooz+1ctIP7RvMEQNvYI/E9tDlUo9Q0de68b5HbKrpmA5rQ==";
       };
     };
-    "@lerna/log-packed-3.0.4" = {
+    "@lerna/log-packed-3.6.0" = {
       name = "_at_lerna_slash_log-packed";
       packageName = "@lerna/log-packed";
-      version = "3.0.4";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.0.4.tgz";
-        sha512 = "vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA==";
+        url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.6.0.tgz";
+        sha512 = "T/J41zMkzpWB5nbiTRS5PmYTFn74mJXe6RQA2qhkdLi0UqnTp97Pux1loz3jsJf2yJtiQUnyMM7KuKIAge0Vlw==";
       };
     };
     "@lerna/npm-conf-3.4.1" = {
@@ -1309,130 +1309,130 @@ let
         sha512 = "i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ==";
       };
     };
-    "@lerna/npm-dist-tag-3.3.0" = {
+    "@lerna/npm-dist-tag-3.6.0" = {
       name = "_at_lerna_slash_npm-dist-tag";
       packageName = "@lerna/npm-dist-tag";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz";
-        sha512 = "EtZJXzh3w5tqXEev+EBBPrWKWWn0WgJfxm4FihfS9VgyaAW8udIVZHGkIQ3f+tBtupcAzA9Q8cQNUkGF2efwmA==";
+        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.6.0.tgz";
+        sha512 = "qX6IfQPX9Tum1LRjvjgj/yr2FYbc9dfHyeh7RI9zJ8pGncWbksBmnMcvoxF0Eu4+d7MjjIGfEnIp9LIl4MHSIA==";
       };
     };
-    "@lerna/npm-install-3.3.0" = {
+    "@lerna/npm-install-3.6.0" = {
       name = "_at_lerna_slash_npm-install";
       packageName = "@lerna/npm-install";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.3.0.tgz";
-        sha512 = "WoVvKdS8ltROTGSNQwo6NDq0YKnjwhvTG4li1okcN/eHKOS3tL9bxbgPx7No0wOq5DKBpdeS9KhAfee6LFAZ5g==";
+        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.6.0.tgz";
+        sha512 = "RKV31VdrBZKjmKfq25JG4mIHJ8NAOsLKq/aYSaBs8zP+uwXH7RU39saVfv9ReKiAzhKE2ghOG2JeMdIHtYnPNA==";
       };
     };
-    "@lerna/npm-publish-3.3.1" = {
+    "@lerna/npm-publish-3.6.0" = {
       name = "_at_lerna_slash_npm-publish";
       packageName = "@lerna/npm-publish";
-      version = "3.3.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.3.1.tgz";
-        sha512 = "bVTlWIcBL6Zpyzqvr9C7rxXYcoPw+l7IPz5eqQDNREj1R39Wj18OWB2KTJq8l7LIX7Wf4C2A1uT5hJaEf9BuvA==";
+        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.6.0.tgz";
+        sha512 = "k4yF8ursajoGRlJeRh7xdeGN0HV/ALt5qImUnpTliux0213jqxA0YigiD8WSaXpvSqxSFyvh38DbJhhy9q+NuQ==";
       };
     };
-    "@lerna/npm-run-script-3.3.0" = {
+    "@lerna/npm-run-script-3.6.0" = {
       name = "_at_lerna_slash_npm-run-script";
       packageName = "@lerna/npm-run-script";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz";
-        sha512 = "YqDguWZzp4jIomaE4aWMUP7MIAJAFvRAf6ziQLpqwoQskfWLqK5mW0CcszT1oLjhfb3cY3MMfSTFaqwbdKmICg==";
+        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.6.0.tgz";
+        sha512 = "6DRNFma30ex9r1a8mMDXziSRHf1/mo//hnvW1Zc1ctBh+7PU4I8n3A2ht/+742vtoTQH93Iqs3QSJl2KOLSsYg==";
       };
     };
-    "@lerna/output-3.0.0" = {
+    "@lerna/output-3.6.0" = {
       name = "_at_lerna_slash_output";
       packageName = "@lerna/output";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/output/-/output-3.0.0.tgz";
-        sha512 = "EFxnSbO0zDEVKkTKpoCUAFcZjc3gn3DwPlyTDxbeqPU7neCfxP4rA4+0a6pcOfTlRS5kLBRMx79F2TRCaMM3DA==";
+        url = "https://registry.npmjs.org/@lerna/output/-/output-3.6.0.tgz";
+        sha512 = "9sjQouf6p7VQtVCRnzoTGlZyURd48i3ha3WBHC/UBJnHZFuXMqWVPKNuvnMf2kRXDyoQD+2mNywpmEJg5jOnRg==";
       };
     };
-    "@lerna/package-3.0.0" = {
+    "@lerna/package-3.6.0" = {
       name = "_at_lerna_slash_package";
       packageName = "@lerna/package";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/package/-/package-3.0.0.tgz";
-        sha512 = "djzEJxzn212wS8d9znBnlXkeRlPL7GqeAYBykAmsuq51YGvaQK67Umh5ejdO0uxexF/4r7yRwgrlRHpQs8Rfqg==";
+        url = "https://registry.npmjs.org/@lerna/package/-/package-3.6.0.tgz";
+        sha512 = "XbXcjwPKA1V640mqjEicpBriO6QcNtocdfLAtEUP4uCKkRx5r9h7DdznQMCoSJYJF6Gh/PpLokPUItfMhJP3Hg==";
       };
     };
-    "@lerna/package-graph-3.1.2" = {
+    "@lerna/package-graph-3.6.0" = {
       name = "_at_lerna_slash_package-graph";
       packageName = "@lerna/package-graph";
-      version = "3.1.2";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.1.2.tgz";
-        sha512 = "9wIWb49I1IJmyjPdEVZQ13IAi9biGfH/OZHOC04U2zXGA0GLiY+B3CAx6FQvqkZ8xEGfqzmXnv3LvZ0bQfc1aQ==";
+        url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.6.0.tgz";
+        sha512 = "Xtldh3DTiC3cPDrs6OY5URiuRXGPMIN6uFKcx59rOu3TkqYRt346jRyX+hm85996Y/pboo3+JuQlonvuEP/9QQ==";
       };
     };
-    "@lerna/project-3.5.0" = {
+    "@lerna/project-3.6.0" = {
       name = "_at_lerna_slash_project";
       packageName = "@lerna/project";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/project/-/project-3.5.0.tgz";
-        sha512 = "uFDzqwrD7a/tTohQoo0voTsRy2cgl9D1ZOU2pHZzHzow9S1M8E0x5q3hJI2HlwsZry9IUugmDUGO6UddTjwm3Q==";
+        url = "https://registry.npmjs.org/@lerna/project/-/project-3.6.0.tgz";
+        sha512 = "pEOZF1igGFqs+qWog6cJWqVyBUX21xSqrlcgeN0yzqzI36VMHozmf/u7dgclIb5MylWk5Yp87KCKswBF4hrcuQ==";
       };
     };
-    "@lerna/prompt-3.3.1" = {
+    "@lerna/prompt-3.6.0" = {
       name = "_at_lerna_slash_prompt";
       packageName = "@lerna/prompt";
-      version = "3.3.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.3.1.tgz";
-        sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==";
+        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.6.0.tgz";
+        sha512 = "nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg==";
       };
     };
-    "@lerna/publish-3.5.1" = {
+    "@lerna/publish-3.6.0" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.5.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.5.1.tgz";
-        sha512 = "ltw2YdWWzev9cZRAzons5ywZh9NJARPX67meeA95oMDVMrhD4Y9VHQNJ3T8ueec/W78/4sKlMSr3ecWyPNp5bg==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.6.0.tgz";
+        sha512 = "F2bT96ZS7NJfid6T4a6TSanpVUQ4VOuhjPBPX2hagt5gnocm7lluvAFR7dl/cbEgmKIg2zJQnfAPTYjrtxXMVg==";
       };
     };
-    "@lerna/resolve-symlink-3.3.0" = {
+    "@lerna/resolve-symlink-3.6.0" = {
       name = "_at_lerna_slash_resolve-symlink";
       packageName = "@lerna/resolve-symlink";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz";
-        sha512 = "KmoPDcFJ2aOK2inYHbrsiO9SodedUj0L1JDvDgirVNIjMUaQe2Q6Vi4Gh+VCJcyB27JtfHioV9R2NxU72Pk2hg==";
+        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz";
+        sha512 = "TVOAEqHJSQVhNDMFCwEUZPaOETqHDQV1TQWQfC8ZlOqyaUQ7veZUbg0yfG7RPNzlSpvF0ZaGFeR0YhYDAW03GA==";
       };
     };
-    "@lerna/rimraf-dir-3.3.0" = {
+    "@lerna/rimraf-dir-3.6.0" = {
       name = "_at_lerna_slash_rimraf-dir";
       packageName = "@lerna/rimraf-dir";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz";
-        sha512 = "vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw==";
+        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.6.0.tgz";
+        sha512 = "2CfyWP1lqxDET+SfwGlLUfgqGF4vz9TYDrmb7Zi//g7IFCo899uU2vWOrEcdWTgbKE3Qgwwfk9c008w5MWUhog==";
       };
     };
-    "@lerna/run-3.5.0" = {
+    "@lerna/run-3.6.0" = {
       name = "_at_lerna_slash_run";
       packageName = "@lerna/run";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run/-/run-3.5.0.tgz";
-        sha512 = "BnPD52tj794xG2Xsc4FvgksyFX2CLmSR28TZw/xASEuy14NuQYMZkvbaj61SEhyOEsq7pLhHE5PpfbIv2AIFJw==";
+        url = "https://registry.npmjs.org/@lerna/run/-/run-3.6.0.tgz";
+        sha512 = "OYa5pQTOiES/h9rg8vwnt0nYU/wLKUQmFYhMUxdX3lXYpoIcQ28PR7qPG1CVhex4KAU2OW42a7vnm5MAOoScDg==";
       };
     };
-    "@lerna/run-lifecycle-3.4.1" = {
+    "@lerna/run-lifecycle-3.6.0" = {
       name = "_at_lerna_slash_run-lifecycle";
       packageName = "@lerna/run-lifecycle";
-      version = "3.4.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz";
-        sha512 = "N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw==";
+        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.6.0.tgz";
+        sha512 = "/1+vAZnckgKwHVgWG0plVO24erNWUduz9htMOO9wuOfglTnHlMRqDc3s9B/OIKxGDkyzEvxqzfzq3c6JqEolRQ==";
       };
     };
     "@lerna/run-parallel-batches-3.0.0" = {
@@ -1444,22 +1444,22 @@ let
         sha512 = "Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw==";
       };
     };
-    "@lerna/symlink-binary-3.3.0" = {
+    "@lerna/symlink-binary-3.6.0" = {
       name = "_at_lerna_slash_symlink-binary";
       packageName = "@lerna/symlink-binary";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz";
-        sha512 = "zRo6CimhvH/VJqCFl9T4IC6syjpWyQIxEfO2sBhrapEcfwjtwbhoGgKwucsvt4rIpFazCw63jQ/AXMT27KUIHg==";
+        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.6.0.tgz";
+        sha512 = "h69AQBBWgZOEzQ1RJEYQ7Ou6llrJNhNNkpqT6k8qSWZ93iXyFmLE4hWoxMXXHFmxmQ0CqjEYKmeLV1Dr5DKT4g==";
       };
     };
-    "@lerna/symlink-dependencies-3.3.0" = {
+    "@lerna/symlink-dependencies-3.6.0" = {
       name = "_at_lerna_slash_symlink-dependencies";
       packageName = "@lerna/symlink-dependencies";
-      version = "3.3.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz";
-        sha512 = "IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg==";
+        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.6.0.tgz";
+        sha512 = "mLpbWLidAU5Xi7bc9Fj8Yt/9XvDczzWocnS/yEe0E6RqWXh2KK+4VR9H24rLywBAWTv2s4GEXrb/ofbPb8gwBQ==";
       };
     };
     "@lerna/timer-3.5.0" = {
@@ -1471,31 +1471,31 @@ let
         sha512 = "TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA==";
       };
     };
-    "@lerna/validation-error-3.0.0" = {
+    "@lerna/validation-error-3.6.0" = {
       name = "_at_lerna_slash_validation-error";
       packageName = "@lerna/validation-error";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.0.0.tgz";
-        sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
+        url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.6.0.tgz";
+        sha512 = "MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw==";
       };
     };
-    "@lerna/version-3.5.0" = {
+    "@lerna/version-3.6.0" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-3.5.0.tgz";
-        sha512 = "vxuGkUSfjJuvOIgPG7SDXVmk4GPwJF9F+uhDW9T/wJzTk4UaxL37GpBeJDo43eutQ7mwluP+t88Luwf8S3WXlA==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-3.6.0.tgz";
+        sha512 = "V1f3fNM5ELGHmF824Wc8ah505SMpfiBqOHAIiW+u9soH/3W/t256c1P9UeaDh5blWAk3HeZMzbpRZ9Nlpf6aQA==";
       };
     };
-    "@lerna/write-log-file-3.0.0" = {
+    "@lerna/write-log-file-3.6.0" = {
       name = "_at_lerna_slash_write-log-file";
       packageName = "@lerna/write-log-file";
-      version = "3.0.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.0.0.tgz";
-        sha512 = "SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A==";
+        url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.6.0.tgz";
+        sha512 = "OkLK99V6sYXsJsYg+O9wtiFS3z6eUPaiz2e6cXJt80mfIIdI1t2dnmyua0Ib5cZWExQvx2z6Y32Wlf0MnsoNsA==";
       };
     };
     "@marionebl/sander-0.6.1" = {
@@ -1678,24 +1678,6 @@ let
         sha512 = "VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==";
       };
     };
-    "@types/babel-types-7.0.4" = {
-      name = "_at_types_slash_babel-types";
-      packageName = "@types/babel-types";
-      version = "7.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz";
-        sha512 = "WiZhq3SVJHFRgRYLXvpf65XnV6ipVHhnNaNvE8yCimejrGglkg38kEj0JcizqwSHxmPSjcTlig/6JouxLGEhGw==";
-      };
-    };
-    "@types/babylon-6.16.4" = {
-      name = "_at_types_slash_babylon";
-      packageName = "@types/babylon";
-      version = "6.16.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.4.tgz";
-        sha512 = "8dZMcGPno3g7pJ/d0AyJERo+lXh9i1JhDuCUs+4lNIN9eUe5Yh6UCLrpgSEi05Ve2JMLauL2aozdvKwNL0px1Q==";
-      };
-    };
     "@types/body-parser-1.17.0" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
@@ -1795,22 +1777,13 @@ let
         sha512 = "Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==";
       };
     };
-    "@types/node-8.10.38" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "8.10.38";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz";
-        sha512 = "EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==";
-      };
-    };
-    "@types/range-parser-1.2.2" = {
+    "@types/range-parser-1.2.3" = {
       name = "_at_types_slash_range-parser";
       packageName = "@types/range-parser";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.2.tgz";
-        sha512 = "HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==";
+        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz";
+        sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
     "@types/semver-5.5.0" = {
@@ -2299,15 +2272,6 @@ let
         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.3" = {
       name = "acorn";
       packageName = "acorn";
@@ -2353,15 +2317,6 @@ let
         sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
       };
     };
-    "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";
@@ -2416,15 +2371,6 @@ let
         sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==";
       };
     };
-    "adal-node-0.1.28" = {
-      name = "adal-node";
-      packageName = "adal-node";
-      version = "0.1.28";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz";
-        sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485";
-      };
-    };
     "adbkit-2.11.0" = {
       name = "adbkit";
       packageName = "adbkit";
@@ -2632,13 +2578,13 @@ let
         sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
       };
     };
-    "ajv-errors-1.0.0" = {
+    "ajv-errors-1.0.1" = {
       name = "ajv-errors";
       packageName = "ajv-errors";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz";
-        sha1 = "ecf021fa108fd17dfb5e6b383f2dd233e31ffc59";
+        url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz";
+        sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -3271,15 +3217,6 @@ let
         sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66";
       };
     };
-    "applicationinsights-0.16.0" = {
-      name = "applicationinsights";
-      packageName = "applicationinsights";
-      version = "0.16.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
-        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
-      };
-    };
     "aproba-1.2.0" = {
       name = "aproba";
       packageName = "aproba";
@@ -3847,15 +3784,6 @@ let
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "async-0.2.7" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz";
-        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
-      };
-    };
     "async-0.2.9" = {
       name = "async";
       packageName = "async";
@@ -3883,15 +3811,6 @@ let
         sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
-    "async-1.4.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
-        sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
-      };
-    };
     "async-1.5.2" = {
       name = "async";
       packageName = "async";
@@ -4063,13 +3982,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.371.0" = {
+    "aws-sdk-2.373.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.371.0";
+      version = "2.373.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.371.0.tgz";
-        sha512 = "SlSKhWEMCm3rC8LwaZ3Z2SaLp7qO0ZxUGsJs1TZp+dlYehDitFGZjfr0rD+ioxlzOniOViUFEACM63eLZjnTnA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.373.0.tgz";
+        sha512 = "NZYXwXGtFt9jxaKXc+PJsLPnpbD03t0MAZRxh93g36kbFMuRXtY8CDqHYNQ0ZcrgQpXbCQiz1fxT5/wu5Cu70g==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -4108,366 +4027,6 @@ let
         sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d";
       };
     };
-    "azure-arm-authorization-2.0.0" = {
-      name = "azure-arm-authorization";
-      packageName = "azure-arm-authorization";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
-        sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
-      };
-    };
-    "azure-arm-batch-3.2.0" = {
-      name = "azure-arm-batch";
-      packageName = "azure-arm-batch";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.2.0.tgz";
-        sha512 = "DDfgAiRruGAiL8Yot5nufG3O8GLA0r5lf1CGYhuF8pEzQ+vYfhLpgJzme7LPh3ASPb8UBSVYHm1IK4W4StvVnw==";
-      };
-    };
-    "azure-arm-cdn-4.1.0" = {
-      name = "azure-arm-cdn";
-      packageName = "azure-arm-cdn";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.1.0.tgz";
-        sha512 = "5xD2CkCx5ONn1vaGa4USAzv3LtCs0kmZCkdSNj98eQlQJLJQ7RPpIsNAXHGuHX4yN+EKHdaA2/hC/ynuQujNEQ==";
-      };
-    };
-    "azure-arm-commerce-2.1.0" = {
-      name = "azure-arm-commerce";
-      packageName = "azure-arm-commerce";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.1.0.tgz";
-        sha512 = "zhZ9b1Comp1Owa8/Pn7ORTL0l+uX9elz5A5yOoL/XdYXC8S6bN2QaiRLPmue9ZB55qGE1Tn7Cf+KRlpskL17hQ==";
-      };
-    };
-    "azure-arm-compute-3.0.0-preview" = {
-      name = "azure-arm-compute";
-      packageName = "azure-arm-compute";
-      version = "3.0.0-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz";
-        sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b";
-      };
-    };
-    "azure-arm-datalake-analytics-1.0.2-preview" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "1.0.2-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz";
-        sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63";
-      };
-    };
-    "azure-arm-datalake-store-1.0.2-preview" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "1.0.2-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz";
-        sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763";
-      };
-    };
-    "azure-arm-devtestlabs-2.1.1" = {
-      name = "azure-arm-devtestlabs";
-      packageName = "azure-arm-devtestlabs";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-2.1.1.tgz";
-        sha512 = "S5dCYTMrqL+BJc699fIQtXwLFuv5m8jTDqPdXTFpn/CSkyBcOyJwuZH2zPExQjGNZTyjIR6GWi8oeg/IpYLBWw==";
-      };
-    };
-    "azure-arm-dns-2.1.0" = {
-      name = "azure-arm-dns";
-      packageName = "azure-arm-dns";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz";
-        sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q==";
-      };
-    };
-    "azure-arm-hdinsight-0.2.2" = {
-      name = "azure-arm-hdinsight";
-      packageName = "azure-arm-hdinsight";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
-        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
-      };
-    };
-    "azure-arm-hdinsight-jobs-0.1.0" = {
-      name = "azure-arm-hdinsight-jobs";
-      packageName = "azure-arm-hdinsight-jobs";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz";
-        sha1 = "252938f18d4341adf9942261656e791490c3c220";
-      };
-    };
-    "azure-arm-insights-0.11.3" = {
-      name = "azure-arm-insights";
-      packageName = "azure-arm-insights";
-      version = "0.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz";
-        sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
-      };
-    };
-    "azure-arm-iothub-1.0.1-preview" = {
-      name = "azure-arm-iothub";
-      packageName = "azure-arm-iothub";
-      version = "1.0.1-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz";
-        sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91";
-      };
-    };
-    "azure-arm-network-5.3.0" = {
-      name = "azure-arm-network";
-      packageName = "azure-arm-network";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
-        sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig==";
-      };
-    };
-    "azure-arm-powerbiembedded-0.1.1" = {
-      name = "azure-arm-powerbiembedded";
-      packageName = "azure-arm-powerbiembedded";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz";
-        sha1 = "7103c94e06b3ddf628293f60e02fd0ba8f9c3ca9";
-      };
-    };
-    "azure-arm-rediscache-0.2.3" = {
-      name = "azure-arm-rediscache";
-      packageName = "azure-arm-rediscache";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
-        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
-      };
-    };
-    "azure-arm-resource-1.6.1-preview" = {
-      name = "azure-arm-resource";
-      packageName = "azure-arm-resource";
-      version = "1.6.1-preview";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
-        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
-      };
-    };
-    "azure-arm-resource-7.2.1" = {
-      name = "azure-arm-resource";
-      packageName = "azure-arm-resource";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.1.tgz";
-        sha512 = "dtji3Eia9/TABcKzxWklTLh9zj24BtOkBObzxH4BAr/ZSFmyAtJA4lYXkjizEkPCS6XVsCiqsUJZtNrqQ8iTWA==";
-      };
-    };
-    "azure-arm-servermanagement-1.1.0" = {
-      name = "azure-arm-servermanagement";
-      packageName = "azure-arm-servermanagement";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-1.1.0.tgz";
-        sha512 = "GlPXPD5Up2U6Qxv40ScC/+7WRcVVYQf7EHUSomD385o/MuyJAjM6CxBS8fPKwkZR5MRSd60p6kBo5AQ+bwfpeA==";
-      };
-    };
-    "azure-arm-storage-5.2.0" = {
-      name = "azure-arm-storage";
-      packageName = "azure-arm-storage";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-5.2.0.tgz";
-        sha512 = "BVFUPi48eJNJFP4ryQ3BwNRlKRNuAA7cZeSxCvr6dGEP+wrd1Ixmb2MlvoMRjgjcEOVnhP4t2YQyHcHNqQsH9A==";
-      };
-    };
-    "azure-arm-trafficmanager-1.1.0-preview" = {
-      name = "azure-arm-trafficmanager";
-      packageName = "azure-arm-trafficmanager";
-      version = "1.1.0-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz";
-        sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50";
-      };
-    };
-    "azure-arm-website-5.7.0" = {
-      name = "azure-arm-website";
-      packageName = "azure-arm-website";
-      version = "5.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.7.0.tgz";
-        sha512 = "GnwqaelTIhv40YI3Ch8+Q272X6XXWTq99Y1aYWZb1cejSP4gjrWWeppwor4HtjlVU9i9YIvYO91TRjQt8FrHVA==";
-      };
-    };
-    "azure-asm-compute-0.18.0" = {
-      name = "azure-asm-compute";
-      packageName = "azure-asm-compute";
-      version = "0.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
-        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
-      };
-    };
-    "azure-asm-hdinsight-0.10.2" = {
-      name = "azure-asm-hdinsight";
-      packageName = "azure-asm-hdinsight";
-      version = "0.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz";
-        sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0";
-      };
-    };
-    "azure-asm-mgmt-0.10.1" = {
-      name = "azure-asm-mgmt";
-      packageName = "azure-asm-mgmt";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz";
-        sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751";
-      };
-    };
-    "azure-asm-network-0.13.0" = {
-      name = "azure-asm-network";
-      packageName = "azure-asm-network";
-      version = "0.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz";
-        sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
-      };
-    };
-    "azure-asm-sb-0.10.1" = {
-      name = "azure-asm-sb";
-      packageName = "azure-asm-sb";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz";
-        sha1 = "92487b24166041119714f66760ec1f36e8dc7222";
-      };
-    };
-    "azure-asm-sql-0.10.1" = {
-      name = "azure-asm-sql";
-      packageName = "azure-asm-sql";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz";
-        sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42";
-      };
-    };
-    "azure-asm-storage-0.12.0" = {
-      name = "azure-asm-storage";
-      packageName = "azure-asm-storage";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz";
-        sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3";
-      };
-    };
-    "azure-asm-subscription-0.10.1" = {
-      name = "azure-asm-subscription";
-      packageName = "azure-asm-subscription";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz";
-        sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c";
-      };
-    };
-    "azure-asm-trafficmanager-0.10.3" = {
-      name = "azure-asm-trafficmanager";
-      packageName = "azure-asm-trafficmanager";
-      version = "0.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz";
-        sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
-      };
-    };
-    "azure-asm-website-0.10.7" = {
-      name = "azure-asm-website";
-      packageName = "azure-asm-website";
-      version = "0.10.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.7.tgz";
-        sha512 = "h3OmXKKOLd4sbf4khrxqGTjspjqpKduKN9EWgEoIeNhMY+PVKrVEIMr3ZyKzmmy/8123MD+ip67wMqUKSTLtUA==";
-      };
-    };
-    "azure-batch-3.2.2" = {
-      name = "azure-batch";
-      packageName = "azure-batch";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.2.tgz";
-        sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw==";
-      };
-    };
-    "azure-common-0.9.20" = {
-      name = "azure-common";
-      packageName = "azure-common";
-      version = "0.9.20";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz";
-        sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ==";
-      };
-    };
-    "azure-gallery-2.0.0-pre.18" = {
-      name = "azure-gallery";
-      packageName = "azure-gallery";
-      version = "2.0.0-pre.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz";
-        sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
-      };
-    };
-    "azure-graph-2.2.0" = {
-      name = "azure-graph";
-      packageName = "azure-graph";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.2.0.tgz";
-        sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw==";
-      };
-    };
-    "azure-keyvault-3.0.4" = {
-      name = "azure-keyvault";
-      packageName = "azure-keyvault";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz";
-        sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5";
-      };
-    };
-    "azure-monitoring-0.10.6" = {
-      name = "azure-monitoring";
-      packageName = "azure-monitoring";
-      version = "0.10.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.6.tgz";
-        sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q==";
-      };
-    };
-    "azure-servicefabric-2.2.0" = {
-      name = "azure-servicefabric";
-      packageName = "azure-servicefabric";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.2.0.tgz";
-        sha512 = "b+rxF8esa1Cm+bnJLs6a+hO/7U9QwvQzg0bSR1rKP9NTKjZji3GxdndcPVkHqFv28QiLo9ifyR/FaJMA0cDcTw==";
-      };
-    };
-    "azure-storage-2.10.2" = {
-      name = "azure-storage";
-      packageName = "azure-storage";
-      version = "2.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz";
-        sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA==";
-      };
-    };
     "babel-code-frame-6.26.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
@@ -5368,6 +4927,15 @@ let
         sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a";
       };
     };
+    "bin-links-1.1.2" = {
+      name = "bin-links";
+      packageName = "bin-links";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-links/-/bin-links-1.1.2.tgz";
+        sha512 = "8eEHVgYP03nILphilltWjeIjMbKyJo3wvp9K816pHbhP301ismzw15mxAAEVQ/USUwcP++1uNrbERbp8lOA6Fg==";
+      };
+    };
     "bin-version-2.0.0" = {
       name = "bin-version";
       packageName = "bin-version";
@@ -5548,15 +5116,6 @@ let
         sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
       };
     };
-    "bl-1.1.2" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
-        sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
-      };
-    };
     "bl-1.2.2" = {
       name = "bl";
       packageName = "bl";
@@ -5904,7 +5463,7 @@ let
       packageName = "brfs";
       version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz";
+        url = "http://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz";
         sha512 = "OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==";
       };
     };
@@ -5949,7 +5508,7 @@ let
       packageName = "browser-pack";
       version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
+        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
         sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
@@ -6034,15 +5593,6 @@ let
         sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a";
       };
     };
-    "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-package-json-1.0.1" = {
       name = "browserify-package-json";
       packageName = "browserify-package-json";
@@ -6295,15 +5845,6 @@ let
         sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
       };
     };
-    "bufferutil-2.0.1" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-2.0.1.tgz";
-        sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288";
-      };
-    };
     "bufferutil-4.0.0" = {
       name = "bufferutil";
       packageName = "bufferutil";
@@ -6592,15 +6133,6 @@ let
         sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
       };
     };
-    "caller-id-0.1.0" = {
-      name = "caller-id";
-      packageName = "caller-id";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz";
-        sha1 = "59bdac0893d12c3871408279231f97458364f07b";
-      };
-    };
     "caller-path-0.1.0" = {
       name = "caller-path";
       packageName = "caller-path";
@@ -6736,22 +6268,22 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-db-1.0.30000916" = {
+    "caniuse-db-1.0.30000917" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000916";
+      version = "1.0.30000917";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000916.tgz";
-        sha512 = "XuMzGxlFYXDEm+e/6ti7ThqQki/hRXHw4aaFMQXtFHYoj2XNn92zZ5aH75AADfQ1tnXoZTOvS2+NbaaWWPypIw==";
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000917.tgz";
+        sha512 = "aQkGkrWEZo+HlcBMUHQnxjbwkzrHNcMPRkks2UFAYU8ync4v/8Wl1yKQkNujYozQ77aHa0jNWviSOl5fsja+rg==";
       };
     };
-    "caniuse-lite-1.0.30000916" = {
+    "caniuse-lite-1.0.30000917" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000916";
+      version = "1.0.30000917";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000916.tgz";
-        sha512 = "D6J9jloPm2MPkg0PXcODLMQAJKkeixKO9xhqTUMvtd44MtTYMyyDXPQ2Lk9IgBq5FH0frwiPa/N/w8ncQf7kIQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000917.tgz";
+        sha512 = "j27ZOs81aF3yqPSSWcUT/0rk5ntnqyZdXYN5M0C7WX+8wSNHjioKPYrjDAJgL9ldL83RSSh+fIhyUa4np/5m6g==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -6763,15 +6295,6 @@ let
         sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
       };
     };
-    "caseless-0.11.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
-        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
-      };
-    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -6970,15 +6493,6 @@ let
         sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==";
       };
     };
-    "character-parser-2.2.0" = {
-      name = "character-parser";
-      packageName = "character-parser";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz";
-        sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
-      };
-    };
     "character-reference-invalid-1.1.2" = {
       name = "character-reference-invalid";
       packageName = "character-reference-invalid";
@@ -7906,6 +7420,15 @@ let
         sha512 = "rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==";
       };
     };
+    "colors-1.3.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
+        sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
+      };
+    };
     "colorspace-1.1.1" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -8005,24 +7528,6 @@ let
         sha1 = "5e6a88e7070ff5908836ead19169548c30f90bcd";
       };
     };
-    "commander-1.0.4" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
-        sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
-      };
-    };
-    "commander-1.1.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
-        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
-      };
-    };
     "commander-1.3.2" = {
       name = "commander";
       packageName = "commander";
@@ -8446,15 +7951,6 @@ let
         sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46";
       };
     };
-    "constantinople-3.1.2" = {
-      name = "constantinople";
-      packageName = "constantinople";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz";
-        sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==";
-      };
-    };
     "constants-browserify-1.0.0" = {
       name = "constants-browserify";
       packageName = "constants-browserify";
@@ -9562,15 +9058,6 @@ let
         sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b";
       };
     };
-    "ctype-0.5.2" = {
-      name = "ctype";
-      packageName = "ctype";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
-        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
-      };
-    };
     "ctype-0.5.3" = {
       name = "ctype";
       packageName = "ctype";
@@ -9859,24 +9346,6 @@ let
         sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
       };
     };
-    "date-utils-1.2.21" = {
-      name = "date-utils";
-      packageName = "date-utils";
-      version = "1.2.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
-        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
-      };
-    };
-    "dateformat-1.0.2-1.2.3" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "1.0.2-1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
-        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
-      };
-    };
     "dateformat-2.2.0" = {
       name = "dateformat";
       packageName = "dateformat";
@@ -10503,7 +9972,7 @@ let
       packageName = "deps-sort";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
+        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
         sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
       };
     };
@@ -10602,7 +10071,7 @@ let
       packageName = "detective";
       version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
+        url = "http://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
         sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==";
       };
     };
@@ -10876,15 +10345,6 @@ let
         sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
       };
     };
-    "doctypes-1.1.0" = {
-      name = "doctypes";
-      packageName = "doctypes";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz";
-        sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9";
-      };
-    };
     "dom-serialize-2.2.1" = {
       name = "dom-serialize";
       packageName = "dom-serialize";
@@ -11227,15 +10687,6 @@ let
         sha1 = "12c91b3085a37f0baa336e9486eac4bf94e3e788";
       };
     };
-    "easy-table-1.1.0" = {
-      name = "easy-table";
-      packageName = "easy-table";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz";
-        sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73";
-      };
-    };
     "ecc-jsbn-0.1.2" = {
       name = "ecc-jsbn";
       packageName = "ecc-jsbn";
@@ -11714,15 +11165,6 @@ let
         sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==";
       };
     };
-    "envconf-0.0.4" = {
-      name = "envconf";
-      packageName = "envconf";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz";
-        sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
-      };
-    };
     "envinfo-5.10.0" = {
       name = "envinfo";
       packageName = "envinfo";
@@ -12074,13 +11516,13 @@ let
         sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
       };
     };
-    "eslint-5.9.0" = {
+    "eslint-5.10.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "5.9.0";
+      version = "5.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz";
-        sha512 = "g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz";
+        sha512 = "HpqzC+BHULKlnPwWae9MaVZ5AXJKpkxCVXQHrFaRw3hbDj26V/9ArYM4Rr/SQ8pi6qUPLXSSXC4RBJlyq2Z2OQ==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -12155,13 +11597,13 @@ let
         sha512 = "kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==";
       };
     };
-    "espree-4.1.0" = {
+    "espree-5.0.0" = {
       name = "espree";
       packageName = "espree";
-      version = "4.1.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz";
-        sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==";
+        url = "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz";
+        sha512 = "1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==";
       };
     };
     "esprima-2.7.3" = {
@@ -12317,15 +11759,6 @@ let
         sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
       };
     };
-    "event-stream-3.1.5" = {
-      name = "event-stream";
-      packageName = "event-stream";
-      version = "3.1.5";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz";
-        sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c";
-      };
-    };
     "event-stream-3.2.2" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -12371,15 +11804,6 @@ let
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "eventemitter2-3.0.2" = {
-      name = "eventemitter2";
-      packageName = "eventemitter2";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-3.0.2.tgz";
-        sha1 = "81c0edb739ffa64fb9f21bbcb1d2b419a5133512";
-      };
-    };
     "eventemitter3-0.1.6" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
@@ -13028,15 +12452,6 @@ let
         sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==";
       };
     };
-    "fast-json-patch-0.5.6" = {
-      name = "fast-json-patch";
-      packageName = "fast-json-patch";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
-        sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
-      };
-    };
     "fast-json-patch-2.0.7" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
@@ -13064,13 +12479,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "fast-redact-1.4.0" = {
+    "fast-redact-1.4.2" = {
       name = "fast-redact";
       packageName = "fast-redact";
-      version = "1.4.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.0.tgz";
-        sha512 = "WsYhPdWJY+6d/pFJbBNWGUd5ENrBAJ6e7yDWcYNoFZoIQUUbKxnIRGS4d0kZkQlMPB4cLK3r4A0BZXpFxdoGhg==";
+        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.2.tgz";
+        sha512 = "ttC8IgelNvYqb9RBC+rirgUCVPtPVonfdeRdsHBcBx3kzQat1DafbUKAEhLo5GnvuBqda+Xe1BvblecPpQkZ2Q==";
       };
     };
     "fast-safe-stringify-1.2.3" = {
@@ -13154,15 +12569,6 @@ let
         sha1 = "9138197dafdae05fcadde0036beeaf6066c2c5e9";
       };
     };
-    "fibers-1.0.15" = {
-      name = "fibers";
-      packageName = "fibers";
-      version = "1.0.15";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
-        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
-      };
-    };
     "fifo-0.1.4" = {
       name = "fifo";
       packageName = "fifo";
@@ -13424,6 +12830,15 @@ let
         sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
       };
     };
+    "find-npm-prefix-1.0.2" = {
+      name = "find-npm-prefix";
+      packageName = "find-npm-prefix";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz";
+        sha512 = "KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA==";
+      };
+    };
     "find-parent-dir-0.3.0" = {
       name = "find-parent-dir";
       packageName = "find-parent-dir";
@@ -13847,15 +13262,6 @@ let
         sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
       };
     };
-    "form-data-1.0.1" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz";
-        sha1 = "ae315db9a4907fa065502304a66d7733475ee37c";
-      };
-    };
     "form-data-2.1.4" = {
       name = "form-data";
       packageName = "form-data";
@@ -14135,6 +13541,15 @@ let
         sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
       };
     };
+    "fs-vacuum-1.2.10" = {
+      name = "fs-vacuum";
+      packageName = "fs-vacuum";
+      version = "1.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz";
+        sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36";
+      };
+    };
     "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
@@ -14279,15 +13694,6 @@ let
         sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0";
       };
     };
-    "galaxy-0.1.12" = {
-      name = "galaxy";
-      packageName = "galaxy";
-      version = "0.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz";
-        sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
-      };
-    };
     "gauge-1.2.7" = {
       name = "gauge";
       packageName = "gauge";
@@ -14351,6 +13757,15 @@ let
         sha512 = "KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==";
       };
     };
+    "gentle-fs-2.0.1" = {
+      name = "gentle-fs";
+      packageName = "gentle-fs";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gentle-fs/-/gentle-fs-2.0.1.tgz";
+        sha512 = "cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew==";
+      };
+    };
     "get-assigned-identifiers-1.2.0" = {
       name = "get-assigned-identifiers";
       packageName = "get-assigned-identifiers";
@@ -14621,15 +14036,6 @@ let
         sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b";
       };
     };
-    "github-0.1.6" = {
-      name = "github";
-      packageName = "github";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz";
-        sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922";
-      };
-    };
     "github-from-package-0.0.0" = {
       name = "github-from-package";
       packageName = "github-from-package";
@@ -15054,13 +14460,13 @@ let
         sha1 = "5b9e6b78c3832452d2ba2bb1cb830f96276410ac";
       };
     };
-    "graphlib-2.1.5" = {
+    "graphlib-2.1.7" = {
       name = "graphlib";
       packageName = "graphlib";
-      version = "2.1.5";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
-        sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==";
+        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz";
+        sha512 = "TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==";
       };
     };
     "graphql-0.12.3" = {
@@ -15414,15 +14820,6 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-2.0.6" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
-        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
-      };
-    };
     "har-validator-4.2.1" = {
       name = "har-validator";
       packageName = "har-validator";
@@ -16035,15 +15432,6 @@ let
         sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31";
       };
     };
-    "http-basic-2.5.1" = {
-      name = "http-basic";
-      packageName = "http-basic";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz";
-        sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb";
-      };
-    };
     "http-cache-semantics-3.8.1" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
@@ -16134,15 +15522,6 @@ let
         sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
-    "http-response-object-1.1.0" = {
-      name = "http-response-object";
-      packageName = "http-response-object";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz";
-        sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3";
-      };
-    };
     "http-signature-0.11.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -16170,15 +15549,6 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "httpolyglot-0.1.2" = {
-      name = "httpolyglot";
-      packageName = "httpolyglot";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz";
-        sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b";
-      };
-    };
     "https-browserify-0.0.1" = {
       name = "https-browserify";
       packageName = "https-browserify";
@@ -17250,15 +16620,6 @@ let
         sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534";
       };
     };
-    "is-expression-3.0.0" = {
-      name = "is-expression";
-      packageName = "is-expression";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz";
-        sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f";
-      };
-    };
     "is-extendable-0.1.1" = {
       name = "is-extendable";
       packageName = "is-extendable";
@@ -18141,13 +17502,13 @@ let
         sha512 = "xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==";
       };
     };
-    "js-beautify-1.8.8" = {
+    "js-beautify-1.8.9" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.8.8";
+      version = "1.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.8.tgz";
-        sha512 = "qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz";
+        sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==";
       };
     };
     "js-levenshtein-1.1.4" = {
@@ -18195,15 +17556,6 @@ let
         sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef";
       };
     };
-    "js-stringify-1.0.2" = {
-      name = "js-stringify";
-      packageName = "js-stringify";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz";
-        sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db";
-      };
-    };
     "js-tokens-3.0.2" = {
       name = "js-tokens";
       packageName = "js-tokens";
@@ -18240,15 +17592,6 @@ let
         sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
       };
     };
-    "js2xmlparser-1.0.0" = {
-      name = "js2xmlparser";
-      packageName = "js2xmlparser";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz";
-        sha1 = "5a170f2e8d6476ce45405e04823242513782fe30";
-      };
-    };
     "js2xmlparser-3.0.0" = {
       name = "js2xmlparser";
       packageName = "js2xmlparser";
@@ -18303,13 +17646,13 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
-    "jshint-2.9.6" = {
+    "jshint-2.9.7" = {
       name = "jshint";
       packageName = "jshint";
-      version = "2.9.6";
+      version = "2.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
-        sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz";
+        sha512 = "Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==";
       };
     };
     "json-buffer-2.0.11" = {
@@ -18330,15 +17673,6 @@ let
         sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
       };
     };
-    "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-merge-patch-0.2.3" = {
       name = "json-merge-patch";
       packageName = "json-merge-patch";
@@ -18573,24 +17907,6 @@ let
         sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
       };
     };
-    "jsonlint-1.6.2" = {
-      name = "jsonlint";
-      packageName = "jsonlint";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";
-        sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
-      };
-    };
-    "jsonminify-0.4.1" = {
-      name = "jsonminify";
-      packageName = "jsonminify";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz";
-        sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c";
-      };
-    };
     "jsonparse-0.0.5" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -18609,15 +17925,6 @@ let
         sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e";
       };
     };
-    "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";
-      };
-    };
     "jsonparse-1.3.1" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -18681,15 +17988,6 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "jsrsasign-4.8.2" = {
-      name = "jsrsasign";
-      packageName = "jsrsasign";
-      version = "4.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz";
-        sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
-      };
-    };
     "jstransform-10.1.0" = {
       name = "jstransform";
       packageName = "jstransform";
@@ -18699,15 +17997,6 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "jstransformer-1.0.0" = {
-      name = "jstransformer";
-      packageName = "jstransformer";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz";
-        sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
-      };
-    };
     "jszip-2.6.1" = {
       name = "jszip";
       packageName = "jszip";
@@ -18772,15 +18061,6 @@ let
         sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==";
       };
     };
-    "jwt-decode-2.2.0" = {
-      name = "jwt-decode";
-      packageName = "jwt-decode";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
-        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
-      };
-    };
     "k-bucket-0.6.0" = {
       name = "k-bucket";
       packageName = "k-bucket";
@@ -19006,15 +18286,6 @@ let
         sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g==";
       };
     };
-    "kuduscript-1.0.16" = {
-      name = "kuduscript";
-      packageName = "kuduscript";
-      version = "1.0.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz";
-        sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
-      };
-    };
     "kuler-1.0.1" = {
       name = "kuler";
       packageName = "kuler";
@@ -19047,7 +18318,7 @@ let
       packageName = "labeled-stream-splicer";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz";
+        url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz";
         sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==";
       };
     };
@@ -19177,15 +18448,6 @@ let
         sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
       };
     };
-    "less-middleware-2.2.1" = {
-      name = "less-middleware";
-      packageName = "less-middleware";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz";
-        sha512 = "1fDsyifwRGObMmqaZhkTDAmVnvgpZmdf6ZTSCbVv9vt+xhlzOz5TDNlLCbITsusEB3d0OKOEadwN9ic3PyOWCg==";
-      };
-    };
     "level-3.0.2" = {
       name = "level";
       packageName = "level";
@@ -19393,6 +18655,15 @@ let
         sha512 = "7fvNHrU8QTep71gIJuz7z6iBAQULEHJOcIA0MKUlwFrSnntvOvnke+/tnR7ZxyRAQQ303UJXNZBSRz3r0N5tqw==";
       };
     };
+    "libnpm-2.0.1" = {
+      name = "libnpm";
+      packageName = "libnpm";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpm/-/libnpm-2.0.1.tgz";
+        sha512 = "qTKoxyJvpBxHZQB6k0AhSLajyXq9ZE/lUsZzuHAplr2Bpv9G+k4YuYlExYdUCeVRRGqcJt8hvkPh4tBwKoV98w==";
+      };
+    };
     "libnpmaccess-3.0.1" = {
       name = "libnpmaccess";
       packageName = "libnpmaccess";
@@ -19402,6 +18673,60 @@ let
         sha512 = "RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==";
       };
     };
+    "libnpmconfig-1.2.1" = {
+      name = "libnpmconfig";
+      packageName = "libnpmconfig";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz";
+        sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==";
+      };
+    };
+    "libnpmhook-5.0.2" = {
+      name = "libnpmhook";
+      packageName = "libnpmhook";
+      version = "5.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmhook/-/libnpmhook-5.0.2.tgz";
+        sha512 = "vLenmdFWhRfnnZiNFPNMog6CK7Ujofy2TWiM2CrpZUjBRIhHkJeDaAbJdYCT6W4lcHtyrJR8yXW8KFyq6UAp1g==";
+      };
+    };
+    "libnpmorg-1.0.0" = {
+      name = "libnpmorg";
+      packageName = "libnpmorg";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmorg/-/libnpmorg-1.0.0.tgz";
+        sha512 = "o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==";
+      };
+    };
+    "libnpmpublish-1.1.0" = {
+      name = "libnpmpublish";
+      packageName = "libnpmpublish";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-1.1.0.tgz";
+        sha512 = "mQ3LT2EWlpJ6Q8mgHTNqarQVCgcY32l6xadPVPMcjWLtVLz7II4WlWkzlbYg1nHGAf+xyABDwS+3aNUiRLkyaA==";
+      };
+    };
+    "libnpmsearch-2.0.0" = {
+      name = "libnpmsearch";
+      packageName = "libnpmsearch";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-2.0.0.tgz";
+        sha512 = "vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==";
+      };
+    };
+    "libnpmteam-1.0.1" = {
+      name = "libnpmteam";
+      packageName = "libnpmteam";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmteam/-/libnpmteam-1.0.1.tgz";
+        sha512 = "gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==";
+      };
+    };
     "libqp-1.1.0" = {
       name = "libqp";
       packageName = "libqp";
@@ -19411,15 +18736,6 @@ let
         sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8";
       };
     };
-    "libquassel-2.1.9" = {
-      name = "libquassel";
-      packageName = "libquassel";
-      version = "2.1.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/libquassel/-/libquassel-2.1.9.tgz";
-        sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64";
-      };
-    };
     "libsodium-0.7.3" = {
       name = "libsodium";
       packageName = "libsodium";
@@ -19555,6 +18871,15 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
+    "lock-verify-2.0.2" = {
+      name = "lock-verify";
+      packageName = "lock-verify";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.2.tgz";
+        sha512 = "QNVwK0EGZBS4R3YQ7F1Ox8p41Po9VGl2QG/2GsuvTbkJZYSsPeWHKMbbH6iZMCHWSMww5nrJroZYnGzI4cePuw==";
+      };
+    };
     "locks-0.2.2" = {
       name = "locks";
       packageName = "locks";
@@ -21265,15 +20590,6 @@ let
         sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
       };
     };
-    "md5.js-1.3.4" = {
-      name = "md5.js";
-      packageName = "md5.js";
-      version = "1.3.4";
-      src = fetchurl {
-        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";
@@ -21427,13 +20743,13 @@ let
         sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
-    "memory-pager-1.1.0" = {
+    "memory-pager-1.2.0" = {
       name = "memory-pager";
       packageName = "memory-pager";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz";
-        sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg==";
+        url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.2.0.tgz";
+        sha512 = "Xhn92T9hAzhAiK57oII2ypipea+7Cd6Ja3iEmcdH2z4ETKJ5HVGZ2zzJwVEmRFq776ZQJdpCf6xKBq4aeR5rnw==";
       };
     };
     "memorystore-1.6.0" = {
@@ -21913,13 +21229,13 @@ let
         sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
       };
     };
-    "minizlib-1.1.1" = {
+    "minizlib-1.2.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
-        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
+        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
       };
     };
     "mirror-folder-3.0.0" = {
@@ -22237,42 +21553,6 @@ let
         sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
-    "ms-rest-1.15.7" = {
-      name = "ms-rest";
-      packageName = "ms-rest";
-      version = "1.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
-        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
-      };
-    };
-    "ms-rest-2.3.8" = {
-      name = "ms-rest";
-      packageName = "ms-rest";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.8.tgz";
-        sha512 = "8kaerSPk0Z9W6z8VnJXjKOHDaGGXbsGyO22X4DFtlllzbYLryWo0Dor+jnIKpgvUOzQKSoLW2fel81piG3LnHQ==";
-      };
-    };
-    "ms-rest-azure-1.15.7" = {
-      name = "ms-rest-azure";
-      packageName = "ms-rest-azure";
-      version = "1.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
-        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
-      };
-    };
-    "ms-rest-azure-2.5.9" = {
-      name = "ms-rest-azure";
-      packageName = "ms-rest-azure";
-      version = "2.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.9.tgz";
-        sha512 = "qonobzWLS7Jl6qwgTuA/SfyCtnv7olvCRKrcF8nzXSj68ds4Oj3K64ntzgQajroKa0hKVMcPUFbTk1IYMGvu8w==";
-      };
-    };
     "msgpack-lite-0.1.26" = {
       name = "msgpack-lite";
       packageName = "msgpack-lite";
@@ -22404,7 +21684,7 @@ let
       packageName = "multipipe";
       version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
+        url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
         sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
       };
     };
@@ -22615,15 +21895,6 @@ let
         sha512 = "iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==";
       };
     };
-    "nan-2.5.1" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
-        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
-      };
-    };
     "nanoassert-1.1.0" = {
       name = "nanoassert";
       packageName = "nanoassert";
@@ -22979,15 +22250,6 @@ let
         sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
       };
     };
-    "net-browserify-alt-1.1.0" = {
-      name = "net-browserify-alt";
-      packageName = "net-browserify-alt";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/net-browserify-alt/-/net-browserify-alt-1.1.0.tgz";
-        sha1 = "02c9ecac88437be23f5948b208a1e65d8d138a73";
-      };
-    };
     "netmask-1.0.6" = {
       name = "netmask";
       packageName = "netmask";
@@ -23168,15 +22430,6 @@ let
         sha512 = "nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==";
       };
     };
-    "node-forge-0.6.23" = {
-      name = "node-forge";
-      packageName = "node-forge";
-      version = "0.6.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz";
-        sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
-      };
-    };
     "node-forge-0.7.6" = {
       name = "node-forge";
       packageName = "node-forge";
@@ -23411,15 +22664,6 @@ let
         sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
       };
     };
-    "node.extend-2.0.2" = {
-      name = "node.extend";
-      packageName = "node.extend";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz";
-        sha512 = "pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==";
-      };
-    };
     "nodebmc-0.0.7" = {
       name = "nodebmc";
       packageName = "nodebmc";
@@ -23690,6 +22934,15 @@ let
         sha512 = "QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==";
       };
     };
+    "npm-logical-tree-1.2.1" = {
+      name = "npm-logical-tree";
+      packageName = "npm-logical-tree";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz";
+        sha512 = "AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==";
+      };
+    };
     "npm-package-arg-6.1.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -23744,6 +22997,15 @@ let
         sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0";
       };
     };
+    "npm-profile-4.0.1" = {
+      name = "npm-profile";
+      packageName = "npm-profile";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.1.tgz";
+        sha512 = "NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==";
+      };
+    };
     "npm-registry-client-0.2.27" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -24213,15 +23475,6 @@ let
         sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30";
       };
     };
-    "omelette-0.3.2" = {
-      name = "omelette";
-      packageName = "omelette";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
-        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
-      };
-    };
     "on-change-network-0.0.2" = {
       name = "on-change-network";
       packageName = "on-change-network";
@@ -24348,13 +23601,13 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "ono-4.0.10" = {
+    "ono-4.0.11" = {
       name = "ono";
       packageName = "ono";
-      version = "4.0.10";
+      version = "4.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-4.0.10.tgz";
-        sha512 = "4Xz4hlbq7MzV0I3vKfZwRvyj8tCbXODqBNzFqtkjP+KTV93zzDRju8kw1qnf6P5kcZ2+xlIq6wSCqA+euSKxhA==";
+        url = "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz";
+        sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
       };
     };
     "open-0.0.2" = {
@@ -24411,15 +23664,6 @@ let
         sha1 = "707375e59ab9f73025899727679b20328171c9aa";
       };
     };
-    "openssl-wrapper-0.3.4" = {
-      name = "openssl-wrapper";
-      packageName = "openssl-wrapper";
-      version = "0.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.3.4.tgz";
-        sha1 = "c01ec98e4dcd2b5dfe0b693f31827200e3b81b07";
-      };
-    };
     "opentracing-0.13.0" = {
       name = "opentracing";
       packageName = "opentracing";
@@ -25406,7 +24650,7 @@ let
       packageName = "path-browserify";
       version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+        url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
         sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
       };
     };
@@ -25707,15 +24951,6 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "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";
@@ -26644,15 +25879,6 @@ let
         sha512 = "jL6eFIzoN3xUEvbo33OAkSDE2VIKU4JQ1wENOows1DpfnrdapR/K3Q1/fB43Mq7wQlcSgRm23nFrvoioufM7eA==";
       };
     };
-    "prebuild-install-2.1.2" = {
-      name = "prebuild-install";
-      packageName = "prebuild-install";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.1.2.tgz";
-        sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
-      };
-    };
     "prebuild-install-4.0.0" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
@@ -27184,114 +26410,6 @@ let
         sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
       };
     };
-    "pug-2.0.3" = {
-      name = "pug";
-      packageName = "pug";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz";
-        sha1 = "71cba82537c95a5eab7ed04696e4221f53aa878e";
-      };
-    };
-    "pug-attrs-2.0.3" = {
-      name = "pug-attrs";
-      packageName = "pug-attrs";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz";
-        sha1 = "a3095f970e64151f7bdad957eef55fb5d7905d15";
-      };
-    };
-    "pug-code-gen-2.0.1" = {
-      name = "pug-code-gen";
-      packageName = "pug-code-gen";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz";
-        sha1 = "0951ec83225d74d8cfc476a7f99a259b5f7d050c";
-      };
-    };
-    "pug-error-1.3.2" = {
-      name = "pug-error";
-      packageName = "pug-error";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz";
-        sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26";
-      };
-    };
-    "pug-filters-3.1.0" = {
-      name = "pug-filters";
-      packageName = "pug-filters";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz";
-        sha1 = "27165555bc04c236e4aa2b0366246dfa021b626e";
-      };
-    };
-    "pug-lexer-4.0.0" = {
-      name = "pug-lexer";
-      packageName = "pug-lexer";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz";
-        sha1 = "210c18457ef2e1760242740c5e647bd794cec278";
-      };
-    };
-    "pug-linker-3.0.5" = {
-      name = "pug-linker";
-      packageName = "pug-linker";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz";
-        sha1 = "9e9a7ae4005682d027deeb96b000f88eeb83a02f";
-      };
-    };
-    "pug-load-2.0.11" = {
-      name = "pug-load";
-      packageName = "pug-load";
-      version = "2.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz";
-        sha1 = "e648e57ed113fe2c1f45d57858ea2bad6bc01527";
-      };
-    };
-    "pug-parser-5.0.0" = {
-      name = "pug-parser";
-      packageName = "pug-parser";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz";
-        sha1 = "e394ad9b3fca93123940aff885c06e44ab7e68e4";
-      };
-    };
-    "pug-runtime-2.0.4" = {
-      name = "pug-runtime";
-      packageName = "pug-runtime";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz";
-        sha1 = "e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58";
-      };
-    };
-    "pug-strip-comments-1.0.3" = {
-      name = "pug-strip-comments";
-      packageName = "pug-strip-comments";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz";
-        sha1 = "f1559592206edc6f85310dacf4afb48a025af59f";
-      };
-    };
-    "pug-walk-1.1.7" = {
-      name = "pug-walk";
-      packageName = "pug-walk";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz";
-        sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3";
-      };
-    };
     "pull-abortable-4.0.0" = {
       name = "pull-abortable";
       packageName = "pull-abortable";
@@ -28003,15 +27121,6 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "qs-6.2.3" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
-        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
-      };
-    };
     "qs-6.4.0" = {
       name = "qs";
       packageName = "qs";
@@ -28039,15 +27148,6 @@ let
         sha512 = "KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==";
       };
     };
-    "qtdatastream-0.7.1" = {
-      name = "qtdatastream";
-      packageName = "qtdatastream";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.7.1.tgz";
-        sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5";
-      };
-    };
     "query-string-1.0.1" = {
       name = "query-string";
       packageName = "query-string";
@@ -29020,15 +28120,6 @@ let
         sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e";
       };
     };
-    "request-2.74.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.74.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz";
-        sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
-      };
-    };
     "request-2.81.0" = {
       name = "request";
       packageName = "request";
@@ -29187,7 +28278,7 @@ let
       packageName = "resolve";
       version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        url = "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
@@ -29196,7 +28287,7 @@ let
       packageName = "resolve";
       version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
+        url = "http://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
         sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==";
       };
     };
@@ -29875,15 +28966,6 @@ let
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
-    "sax-0.5.2" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
-        sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
-      };
-    };
     "sax-1.1.4" = {
       name = "sax";
       packageName = "sax";
@@ -30604,15 +29686,6 @@ let
         sha1 = "b0bbecac1f1082f13b3962894b4a9e88f3a0c9ef";
       };
     };
-    "simple-get-1.4.3" = {
-      name = "simple-get";
-      packageName = "simple-get";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz";
-        sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb";
-      };
-    };
     "simple-get-2.8.1" = {
       name = "simple-get";
       packageName = "simple-get";
@@ -30946,13 +30019,13 @@ let
         sha512 = "rmMsNW94SQdmWQEtVDW1hiGKb3r7Gx1hVb0bTuK9mCm4/lHGmyuAG7QYdcwdhMrhGjg7yQDWCEXorEnq2JLs7Q==";
       };
     };
-    "snyk-1.116.0" = {
+    "snyk-1.116.2" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.116.0";
+      version = "1.116.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.116.0.tgz";
-        sha512 = "MIU4RTnlTda5xq8sqAvg9JS1zn1wip0IiF6kqnN9iS6+oKOgZWo5FTkC0pwBS4wqgFxHyDCg8ErG5/9RKK0RkA==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.116.2.tgz";
+        sha512 = "zkW+IjSEDJ5f4leXck7a7aF36pJcIKRk3o2or78cnabq1mxQzgY8+ooECPDBnwvqySIwUKA8jOjnGRujaNCMpg==";
       };
     };
     "snyk-config-2.2.0" = {
@@ -30991,13 +30064,13 @@ let
         sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA==";
       };
     };
-    "snyk-go-plugin-1.6.0" = {
+    "snyk-go-plugin-1.6.1" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.0.tgz";
-        sha512 = "E6aYw7XAXSs2wJR3fU+vGQ1lVyjAw8PHIQYQwBwMkTHByhJIWPcu6Hy/jT5LcjJHlhYXlpOuk53HeLVK+kcXrQ==";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.1.tgz";
+        sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA==";
       };
     };
     "snyk-gradle-plugin-2.1.0" = {
@@ -31522,15 +30595,6 @@ let
         sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
       };
     };
-    "source-map-0.1.43" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.1.43";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
-        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
-      };
-    };
     "source-map-0.4.4" = {
       name = "source-map";
       packageName = "source-map";
@@ -31738,15 +30802,6 @@ let
         sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==";
       };
     };
-    "split-0.2.10" = {
-      name = "split";
-      packageName = "split";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz";
-        sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
-      };
-    };
     "split-0.3.3" = {
       name = "split";
       packageName = "split";
@@ -31806,7 +30861,7 @@ let
       packageName = "sprintf-js";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
@@ -32026,15 +31081,6 @@ let
         sha512 = "j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw==";
       };
     };
-    "ssh-key-to-pem-0.11.0" = {
-      name = "ssh-key-to-pem";
-      packageName = "ssh-key-to-pem";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
-        sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
-      };
-    };
     "sshpk-1.14.1" = {
       name = "sshpk";
       packageName = "sshpk";
@@ -32346,7 +31392,7 @@ let
       packageName = "stream-splicer";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz";
+        url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz";
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
@@ -32422,33 +31468,6 @@ let
         sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg==";
       };
     };
-    "streamline-0.10.17" = {
-      name = "streamline";
-      packageName = "streamline";
-      version = "0.10.17";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz";
-        sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af";
-      };
-    };
-    "streamline-0.4.11" = {
-      name = "streamline";
-      packageName = "streamline";
-      version = "0.4.11";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz";
-        sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
-      };
-    };
-    "streamline-streams-0.1.5" = {
-      name = "streamline-streams";
-      packageName = "streamline-streams";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz";
-        sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54";
-      };
-    };
     "streamroller-0.7.0" = {
       name = "streamroller";
       packageName = "streamroller";
@@ -32656,6 +31675,15 @@ let
         sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==";
       };
     };
+    "stringify-package-1.0.0" = {
+      name = "stringify-package";
+      packageName = "stringify-package";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz";
+        sha512 = "JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==";
+      };
+    };
     "stringstream-0.0.6" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -33160,21 +32188,12 @@ let
         sha1 = "717d22cc53f0ce1def5594362f3a89a2ebb91105";
       };
     };
-    "sync-request-3.0.0" = {
-      name = "sync-request";
-      packageName = "sync-request";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz";
-        sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c";
-      };
-    };
     "syntax-error-1.4.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
       version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
+        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
@@ -33485,15 +32504,6 @@ let
         sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2";
       };
     };
-    "then-request-2.2.0" = {
-      name = "then-request";
-      packageName = "then-request";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz";
-        sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
-      };
-    };
     "thenify-3.3.0" = {
       name = "thenify";
       packageName = "thenify";
@@ -33566,15 +32576,6 @@ let
         sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
       };
     };
-    "through-2.3.4" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.4";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
-        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
-      };
-    };
     "through-2.3.8" = {
       name = "through";
       packageName = "through";
@@ -33706,7 +32707,7 @@ let
       packageName = "timers-browserify";
       version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz";
+        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz";
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
@@ -34007,15 +33008,6 @@ let
         sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA==";
       };
     };
-    "token-stream-0.0.1" = {
-      name = "token-stream";
-      packageName = "token-stream";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz";
-        sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
-      };
-    };
     "toml-2.3.3" = {
       name = "toml";
       packageName = "toml";
@@ -34354,7 +33346,7 @@ let
       packageName = "tty-browserify";
       version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+        url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
         sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
       };
     };
@@ -34367,24 +33359,6 @@ let
         sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
-    "tunnel-0.0.2" = {
-      name = "tunnel";
-      packageName = "tunnel";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
-        sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
-      };
-    };
-    "tunnel-0.0.5" = {
-      name = "tunnel";
-      packageName = "tunnel";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz";
-        sha512 = "gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==";
-      };
-    };
     "tunnel-0.0.6" = {
       name = "tunnel";
       packageName = "tunnel";
@@ -34484,13 +33458,13 @@ let
         sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==";
       };
     };
-    "typechecker-4.6.0" = {
+    "typechecker-4.7.0" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.6.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.6.0.tgz";
-        sha512 = "83OrXpyP3LNr7aRbLkt2nkjE/d7q8su8/uRvrKxCpswqVCVGOgyaKpaz8/MTjQqBYe4eLNuJ44pNakFZKqyPMA==";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz";
+        sha512 = "4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==";
       };
     };
     "typedarray-0.0.6" = {
@@ -34835,15 +33809,6 @@ let
         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==";
-      };
-    };
     "unicode-canonical-property-names-ecmascript-1.0.4" = {
       name = "unicode-canonical-property-names-ecmascript";
       packageName = "unicode-canonical-property-names-ecmascript";
@@ -35132,15 +34097,6 @@ let
         sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180";
       };
     };
-    "unzip-response-1.0.2" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
-      };
-    };
     "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -35690,24 +34646,6 @@ let
         sha512 = "hZJcZSWz9poXBlAkjjcsNAdrZ6JbjD3kWlNjq/+vE7RLLS/+8PAj3qVVwrwsOz/WL8jPmZ1hYkRvtlUeZAm4ug==";
       };
     };
-    "validator-5.2.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
-        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
-      };
-    };
-    "validator-9.4.1" = {
-      name = "validator";
-      packageName = "validator";
-      version = "9.4.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
-        sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
-      };
-    };
     "value-or-function-3.0.0" = {
       name = "value-or-function";
       packageName = "value-or-function";
@@ -36019,7 +34957,7 @@ let
       packageName = "vm-browserify";
       version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+        url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
@@ -36590,15 +35528,6 @@ let
         sha512 = "0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==";
       };
     };
-    "with-5.1.1" = {
-      name = "with";
-      packageName = "with";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz";
-        sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
-      };
-    };
     "word-wrap-1.2.3" = {
       name = "word-wrap";
       packageName = "word-wrap";
@@ -36869,15 +35798,6 @@ let
         sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635";
       };
     };
-    "xml2js-0.1.14" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
-        sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
-      };
-    };
     "xml2js-0.2.4" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -36887,24 +35807,6 @@ let
         sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
       };
     };
-    "xml2js-0.2.7" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz";
-        sha1 = "1838518bb01741cae0878bab4915e494c32306af";
-      };
-    };
-    "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";
@@ -37014,15 +35916,6 @@ let
         sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a";
       };
     };
-    "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";
@@ -37582,409 +36475,6 @@ in
     production = true;
     bypassCache = true;
   };
-  azure-cli = nodeEnv.buildNodePackage {
-    name = "azure-cli";
-    packageName = "azure-cli";
-    version = "0.10.20";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.20.tgz";
-      sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
-    };
-    dependencies = [
-      sources."@types/node-8.10.38"
-      sources."JSV-4.0.2"
-      sources."adal-node-0.1.28"
-      sources."ajv-6.6.1"
-      sources."amdefine-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."applicationinsights-0.16.0"
-      sources."asap-2.0.6"
-      sources."asn1-0.2.4"
-      sources."assert-plus-0.2.0"
-      sources."async-1.4.2"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.8.0"
-      sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-batch-3.2.0"
-      sources."azure-arm-cdn-4.1.0"
-      sources."azure-arm-commerce-2.1.0"
-      sources."azure-arm-compute-3.0.0-preview"
-      (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"
-        ];
-      })
-      (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"
-        ];
-      })
-      sources."azure-arm-devtestlabs-2.1.1"
-      sources."azure-arm-dns-2.1.0"
-      sources."azure-arm-hdinsight-0.2.2"
-      sources."azure-arm-hdinsight-jobs-0.1.0"
-      sources."azure-arm-insights-0.11.3"
-      sources."azure-arm-iothub-1.0.1-preview"
-      sources."azure-arm-network-5.3.0"
-      (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"
-        ];
-      })
-      (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-7.2.1"
-      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-5.7.0"
-      sources."azure-asm-compute-0.18.0"
-      sources."azure-asm-hdinsight-0.10.2"
-      sources."azure-asm-mgmt-0.10.1"
-      sources."azure-asm-network-0.13.0"
-      sources."azure-asm-sb-0.10.1"
-      sources."azure-asm-sql-0.10.1"
-      sources."azure-asm-storage-0.12.0"
-      sources."azure-asm-subscription-0.10.1"
-      sources."azure-asm-trafficmanager-0.10.3"
-      (sources."azure-asm-website-0.10.7" // {
-        dependencies = [
-          sources."underscore-1.9.1"
-        ];
-      })
-      (sources."azure-batch-3.2.2" // {
-        dependencies = [
-          sources."underscore-1.9.1"
-        ];
-      })
-      (sources."azure-common-0.9.20" // {
-        dependencies = [
-          sources."validator-9.4.1"
-          sources."xml2js-0.2.7"
-        ];
-      })
-      sources."azure-gallery-2.0.0-pre.18"
-      sources."azure-graph-2.2.0"
-      sources."azure-keyvault-3.0.4"
-      (sources."azure-monitoring-0.10.6" // {
-        dependencies = [
-          sources."underscore-1.9.1"
-        ];
-      })
-      sources."azure-servicefabric-2.2.0"
-      (sources."azure-storage-2.10.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."underscore-1.8.3"
-          sources."validator-9.4.1"
-          sources."xml2js-0.2.8"
-          sources."xmlbuilder-9.0.7"
-        ];
-      })
-      sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      sources."boom-2.10.1"
-      sources."brace-expansion-1.1.11"
-      sources."browserify-mime-1.2.9"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-from-1.1.1"
-      sources."caller-id-0.1.0"
-      sources."caseless-0.11.0"
-      sources."chalk-1.1.3"
-      sources."clone-1.0.4"
-      sources."colors-1.1.2"
-      sources."combined-stream-1.0.7"
-      sources."commander-1.0.4"
-      sources."concat-map-0.0.1"
-      (sources."concat-stream-1.6.2" // {
-        dependencies = [
-          sources."process-nextick-args-2.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
-      sources."ctype-0.5.2"
-      sources."cycle-1.0.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."date-utils-1.2.21"
-      sources."dateformat-1.0.2-1.2.3"
-      sources."deep-equal-1.0.1"
-      sources."defaults-1.0.3"
-      sources."delayed-stream-1.0.0"
-      sources."duplexer-0.1.1"
-      sources."easy-table-1.1.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."ecdsa-sig-formatter-1.0.10"
-      sources."envconf-0.0.4"
-      sources."escape-string-regexp-1.0.5"
-      sources."event-stream-3.1.5"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."eyes-0.1.8"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-patch-0.5.6"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."fibers-1.0.15"
-      sources."forever-agent-0.6.1"
-      (sources."form-data-1.0.1" // {
-        dependencies = [
-          sources."async-2.6.1"
-        ];
-      })
-      sources."from-0.1.7"
-      sources."fs.realpath-1.0.0"
-      sources."galaxy-0.1.12"
-      sources."generate-function-2.3.1"
-      sources."generate-object-property-1.2.0"
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."github-0.1.6"
-      sources."glob-7.1.3"
-      sources."har-schema-2.0.0"
-      (sources."har-validator-2.0.6" // {
-        dependencies = [
-          sources."commander-2.19.0"
-        ];
-      })
-      sources."has-ansi-2.0.0"
-      sources."has-color-0.1.7"
-      sources."hash-base-3.0.4"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-basic-2.5.1"
-      sources."http-response-object-1.1.0"
-      sources."http-signature-1.1.1"
-      sources."i-0.3.6"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."is-buffer-1.1.6"
-      sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.19.0"
-      sources."is-property-1.0.2"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."js2xmlparser-1.0.0"
-      sources."jsbn-0.1.1"
-      sources."json-edm-parser-0.1.2"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonlint-1.6.2"
-      sources."jsonminify-0.4.1"
-      sources."jsonparse-1.2.0"
-      sources."jsonpointer-4.0.1"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsrsasign-4.8.2"
-      sources."jwa-1.1.6"
-      sources."jws-3.1.5"
-      sources."jwt-decode-2.2.0"
-      sources."keypress-0.1.0"
-      (sources."kuduscript-1.0.16" // {
-        dependencies = [
-          sources."commander-1.1.1"
-          sources."streamline-0.4.11"
-        ];
-      })
-      sources."lodash-4.17.11"
-      sources."map-stream-0.1.0"
-      sources."md5.js-1.3.4"
-      sources."mime-db-1.37.0"
-      sources."mime-types-2.1.21"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.22.2"
-      (sources."ms-rest-2.3.8" // {
-        dependencies = [
-          sources."through-2.3.8"
-          sources."tunnel-0.0.5"
-        ];
-      })
-      (sources."ms-rest-azure-2.5.9" // {
-        dependencies = [
-          sources."async-2.6.0"
-        ];
-      })
-      sources."mute-stream-0.0.7"
-      sources."ncp-0.4.2"
-      sources."node-forge-0.6.23"
-      sources."node-uuid-1.4.8"
-      (sources."nomnom-1.8.1" // {
-        dependencies = [
-          sources."ansi-styles-1.0.0"
-          sources."chalk-0.4.0"
-          sources."strip-ansi-0.1.1"
-          sources."underscore-1.6.0"
-        ];
-      })
-      sources."oauth-sign-0.8.2"
-      sources."omelette-0.3.2"
-      sources."once-1.4.0"
-      sources."openssl-wrapper-0.3.4"
-      sources."os-homedir-1.0.2"
-      sources."path-is-absolute-1.0.1"
-      sources."pause-stream-0.0.11"
-      sources."performance-now-2.1.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pkginfo-0.4.1"
-      sources."process-nextick-args-1.0.7"
-      sources."progress-1.1.8"
-      sources."promise-7.3.1"
-      (sources."prompt-0.2.14" // {
-        dependencies = [
-          sources."async-0.2.10"
-          sources."colors-0.6.2"
-          (sources."winston-0.8.3" // {
-            dependencies = [
-              sources."pkginfo-0.3.1"
-            ];
-          })
-        ];
-      })
-      sources."psl-1.1.29"
-      sources."punycode-1.4.1"
-      sources."qs-6.2.3"
-      sources."read-1.0.7"
-      (sources."readable-stream-1.0.34" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."aws-sign2-0.7.0"
-          sources."caseless-0.12.0"
-          sources."form-data-2.3.3"
-          sources."har-validator-5.1.3"
-          sources."http-signature-1.2.0"
-          sources."oauth-sign-0.9.0"
-          sources."qs-6.5.2"
-          sources."tough-cookie-2.4.3"
-          sources."tunnel-agent-0.6.0"
-        ];
-      })
-      sources."revalidator-0.1.8"
-      sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."sax-0.5.2"
-      sources."sntp-1.0.9"
-      sources."source-map-0.1.43"
-      sources."split-0.2.10"
-      (sources."ssh-key-to-pem-0.11.0" // {
-        dependencies = [
-          sources."asn1-0.1.11"
-        ];
-      })
-      (sources."sshpk-1.15.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."stack-trace-0.0.10"
-      sources."stream-combiner-0.0.4"
-      sources."streamline-0.10.17"
-      sources."streamline-streams-0.1.5"
-      sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.6"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."sync-request-3.0.0"
-      sources."then-request-2.2.0"
-      sources."through-2.3.4"
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-0.0.2"
-      sources."tunnel-agent-0.4.3"
-      sources."tweetnacl-0.14.5"
-      sources."typedarray-0.0.6"
-      sources."underscore-1.4.4"
-      (sources."uri-js-4.2.2" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-        ];
-      })
-      sources."user-home-2.0.0"
-      sources."util-deprecate-1.0.2"
-      (sources."utile-0.2.1" // {
-        dependencies = [
-          sources."async-0.2.10"
-        ];
-      })
-      sources."uuid-3.3.2"
-      sources."validator-5.2.0"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."wcwidth-1.0.1"
-      (sources."winston-2.1.1" // {
-        dependencies = [
-          sources."async-1.0.0"
-          sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
-        ];
-      })
-      sources."wordwrap-0.0.2"
-      sources."wrappy-1.0.2"
-      sources."xml2js-0.1.14"
-      sources."xmlbuilder-0.4.3"
-      sources."xmldom-0.1.27"
-      sources."xpath.js-1.1.0"
-      sources."xtend-4.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Microsoft Azure Cross Platform Command Line tool";
-      homepage = https://github.com/Azure/azure-xplat-cli;
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-  };
   azure-functions-core-tools = nodeEnv.buildNodePackage {
     name = "azure-functions-core-tools";
     packageName = "azure-functions-core-tools";
@@ -38833,7 +37323,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."commander-2.19.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
@@ -38879,7 +37369,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.3"
       sources."colornames-1.1.1"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."colorspace-1.1.1"
       sources."commander-2.19.0"
       sources."core-util-is-1.0.2"
@@ -40161,7 +38651,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -40346,7 +38836,7 @@ in
       sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."math-random-1.0.1"
-      sources."memory-pager-1.1.0"
+      sources."memory-pager-1.2.0"
       sources."menu-string-1.2.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-2.3.11"
@@ -40725,7 +39215,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.371.0"
+      sources."aws-sdk-2.373.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
@@ -41524,10 +40014,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "5.9.0";
+    version = "5.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz";
-      sha512 = "g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz";
+      sha512 = "HpqzC+BHULKlnPwWae9MaVZ5AXJKpkxCVXQHrFaRw3hbDj26V/9ArYM4Rr/SQ8pi6qUPLXSSXC4RBJlyq2Z2OQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
@@ -41560,7 +40050,7 @@ in
       sources."eslint-scope-4.0.0"
       sources."eslint-utils-1.3.1"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-4.1.0"
+      sources."espree-5.0.0"
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
@@ -41591,7 +40081,6 @@ in
       })
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
-      sources."is-resolvable-1.1.0"
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.12.0"
@@ -41698,11 +40187,11 @@ in
       sources."deep-is-0.1.3"
       sources."doctrine-2.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-5.9.0"
+      sources."eslint-5.10.0"
       sources."eslint-scope-4.0.0"
       sources."eslint-utils-1.3.1"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-4.1.0"
+      sources."espree-5.0.0"
       sources."esprima-4.0.1"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
@@ -41733,7 +40222,6 @@ in
       })
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
-      sources."is-resolvable-1.1.0"
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.12.0"
@@ -42439,7 +40927,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.3.2"
+          sources."colors-1.3.3"
           sources."minimist-1.2.0"
         ];
       })
@@ -43213,7 +41701,7 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."ono-4.0.10"
+      sources."ono-4.0.11"
       sources."open-0.0.5"
       sources."opn-5.4.0"
       sources."ora-1.4.0"
@@ -44472,7 +42960,6 @@ in
       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"
@@ -44481,7 +42968,6 @@ in
       sources."cross-spawn-5.1.0"
       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"
@@ -44518,25 +43004,16 @@ in
       sources."exit-0.1.2"
       sources."extend-3.0.2"
       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-2.0.1"
       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.3"
-      sources."fs-extra-1.0.0"
       sources."fs.realpath-1.0.0"
       (sources."ftp-0.3.10" // {
         dependencies = [
@@ -44557,7 +43034,7 @@ in
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
-      sources."graphlib-2.1.5"
+      sources."graphlib-2.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
@@ -44566,7 +43043,6 @@ in
           sources."async-1.5.2"
         ];
       })
-      sources."hasha-2.2.0"
       sources."hosted-git-info-2.7.1"
       (sources."htmlparser2-3.8.3" // {
         dependencies = [
@@ -44620,7 +43096,7 @@ in
         ];
       })
       sources."jsbn-0.1.1"
-      (sources."jshint-2.9.6" // {
+      (sources."jshint-2.9.7" // {
         dependencies = [
           sources."strip-json-comments-1.0.4"
         ];
@@ -44628,7 +43104,6 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
       sources."jsprim-1.4.1"
       (sources."jszip-3.1.5" // {
         dependencies = [
@@ -44638,9 +43113,7 @@ in
           sources."readable-stream-2.0.6"
         ];
       })
-      sources."kew-0.7.0"
       sources."kind-of-3.2.2"
-      sources."klaw-1.3.1"
       sources."latest-version-3.1.0"
       sources."lazy-cache-0.2.7"
       sources."lcid-1.0.0"
@@ -44668,11 +43141,6 @@ in
           sources."for-in-0.1.8"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
       sources."ms-2.1.1"
       sources."mute-stream-0.0.7"
       (sources."nconf-0.10.0" // {
@@ -44709,18 +43177,12 @@ in
       sources."path-is-inside-1.0.2"
       sources."path-key-2.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."prepend-http-1.0.4"
       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"
@@ -44744,7 +43206,6 @@ in
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       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"
@@ -44766,10 +43227,10 @@ in
       sources."shelljs-0.3.0"
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
-      sources."snyk-1.116.0"
+      sources."snyk-1.116.2"
       sources."snyk-config-2.2.0"
       sources."snyk-docker-plugin-1.13.1"
-      sources."snyk-go-plugin-1.6.0"
+      sources."snyk-go-plugin-1.6.1"
       sources."snyk-gradle-plugin-2.1.1"
       sources."snyk-module-1.9.1"
       sources."snyk-mvn-plugin-2.0.0"
@@ -44791,10 +43252,8 @@ in
       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.15.2"
-      sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."string-width-2.1.1"
       sources."string_decoder-0.10.31"
@@ -44806,7 +43265,6 @@ in
       sources."tempfile-2.0.0"
       sources."term-size-1.2.0"
       sources."then-fs-2.0.0"
-      sources."throttleit-1.0.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."timed-out-4.0.1"
@@ -44821,14 +43279,12 @@ in
       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."unzip-response-2.0.1"
@@ -44844,12 +43300,6 @@ in
       sources."widest-line-2.0.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 = [
@@ -44876,7 +43326,6 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."yauzl-2.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -45139,7 +43588,7 @@ in
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -45693,42 +44142,19 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.9.6";
+    version = "2.9.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
-      sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz";
+      sha512 = "Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==";
     };
     dependencies = [
-      sources."ajv-6.6.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.8.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."cli-1.0.1"
-      sources."colors-1.0.3"
-      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
-      (sources."concat-stream-1.6.2" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
       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"
@@ -45738,95 +44164,23 @@ in
       sources."domelementtype-1.3.1"
       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.5"
       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-2.0.1"
-      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.3"
-      sources."fs-extra-1.0.0"
       sources."fs.realpath-1.0.0"
-      sources."getpass-0.1.7"
       sources."glob-7.1.3"
-      sources."graceful-fs-4.1.15"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      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-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
       sources."isarray-0.0.1"
-      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.4.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.11"
-      sources."mime-db-1.37.0"
-      sources."mime-types-2.1.21"
       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."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."process-nextick-args-2.0.0"
-      sources."progress-1.1.8"
-      sources."psl-1.1.29"
-      sources."punycode-2.1.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."split-1.0.1"
-      sources."sshpk-1.15.2"
-      sources."stack-trace-0.0.10"
       sources."string_decoder-0.10.31"
       sources."strip-json-comments-1.0.4"
-      sources."throttleit-1.0.0"
-      sources."through-2.3.8"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      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."uri-js-4.2.2"
-      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"
       sources."wrappy-1.0.2"
-      sources."yauzl-2.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -45856,30 +44210,41 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.8.8";
+    version = "1.8.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.8.tgz";
-      sha512 = "qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz";
+      sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA==";
     };
     dependencies = [
       sources."@types/node-10.12.12"
       sources."@types/semver-5.5.0"
       sources."abbrev-1.1.1"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
       sources."commander-2.19.0"
+      sources."concat-map-0.0.1"
       sources."config-chain-1.1.12"
       sources."editorconfig-0.15.2"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."lru-cache-4.1.5"
+      sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.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."proto-list-1.2.4"
       sources."pseudomap-1.0.2"
       sources."semver-5.6.0"
       sources."sigmund-1.0.1"
+      sources."wrappy-1.0.2"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -45962,7 +44327,7 @@ in
       sources."extend-3.0.2"
       sources."form-data-2.3.3"
       sources."formidable-1.2.1"
-      sources."graphlib-2.1.5"
+      sources."graphlib-2.1.7"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."js-yaml-3.12.0"
@@ -46345,7 +44710,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."combine-lists-1.0.1"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
@@ -46824,7 +45189,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -47044,65 +45409,65 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.5.1";
+    version = "3.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.5.1.tgz";
-      sha512 = "0AyxMr2UpR3RAJsyrfNtYvfcI01YVSSnbRdzum7frZAtb7S+8NSY2ip7aDbN6/YsQK2K/zOCQ4shu/nwgub8aw==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.6.0.tgz";
+      sha512 = "iQFAgrgtv18SI5LtQBBca0WVeYvk2r8eYgiEQtcZBT63T5R9RVv+snsviIiOp0z6gD43tcyiWXiLvBdp1IY/Rg==";
     };
     dependencies = [
-      sources."@lerna/add-3.5.0"
-      sources."@lerna/batch-packages-3.1.2"
-      sources."@lerna/bootstrap-3.5.0"
-      sources."@lerna/changed-3.5.0"
-      sources."@lerna/check-working-tree-3.5.0"
+      sources."@lerna/add-3.6.0"
+      sources."@lerna/batch-packages-3.6.0"
+      sources."@lerna/bootstrap-3.6.0"
+      sources."@lerna/changed-3.6.0"
+      sources."@lerna/check-working-tree-3.6.0"
       sources."@lerna/child-process-3.3.0"
-      sources."@lerna/clean-3.5.0"
-      sources."@lerna/cli-3.2.0"
-      sources."@lerna/collect-updates-3.5.0"
-      sources."@lerna/command-3.5.0"
-      sources."@lerna/conventional-commits-3.5.0"
-      (sources."@lerna/create-3.5.0" // {
+      sources."@lerna/clean-3.6.0"
+      sources."@lerna/cli-3.6.0"
+      sources."@lerna/collect-updates-3.6.0"
+      sources."@lerna/command-3.6.0"
+      sources."@lerna/conventional-commits-3.6.0"
+      (sources."@lerna/create-3.6.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
         ];
       })
-      sources."@lerna/create-symlink-3.3.0"
-      sources."@lerna/describe-ref-3.5.0"
-      sources."@lerna/diff-3.5.0"
-      sources."@lerna/exec-3.5.0"
-      sources."@lerna/filter-options-3.5.0"
-      sources."@lerna/filter-packages-3.0.0"
-      sources."@lerna/get-npm-exec-opts-3.0.0"
+      sources."@lerna/create-symlink-3.6.0"
+      sources."@lerna/describe-ref-3.6.0"
+      sources."@lerna/diff-3.6.0"
+      sources."@lerna/exec-3.6.0"
+      sources."@lerna/filter-options-3.6.0"
+      sources."@lerna/filter-packages-3.6.0"
+      sources."@lerna/get-npm-exec-opts-3.6.0"
       sources."@lerna/global-options-3.1.3"
       sources."@lerna/has-npm-version-3.3.0"
-      sources."@lerna/import-3.5.0"
-      sources."@lerna/init-3.5.0"
-      sources."@lerna/link-3.5.0"
-      sources."@lerna/list-3.5.0"
-      sources."@lerna/listable-3.0.0"
-      sources."@lerna/log-packed-3.0.4"
+      sources."@lerna/import-3.6.0"
+      sources."@lerna/init-3.6.0"
+      sources."@lerna/link-3.6.0"
+      sources."@lerna/list-3.6.0"
+      sources."@lerna/listable-3.6.0"
+      sources."@lerna/log-packed-3.6.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"
-      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.5.0"
-      sources."@lerna/prompt-3.3.1"
-      sources."@lerna/publish-3.5.1"
-      sources."@lerna/resolve-symlink-3.3.0"
-      sources."@lerna/rimraf-dir-3.3.0"
-      sources."@lerna/run-3.5.0"
-      sources."@lerna/run-lifecycle-3.4.1"
+      sources."@lerna/npm-dist-tag-3.6.0"
+      sources."@lerna/npm-install-3.6.0"
+      sources."@lerna/npm-publish-3.6.0"
+      sources."@lerna/npm-run-script-3.6.0"
+      sources."@lerna/output-3.6.0"
+      sources."@lerna/package-3.6.0"
+      sources."@lerna/package-graph-3.6.0"
+      sources."@lerna/project-3.6.0"
+      sources."@lerna/prompt-3.6.0"
+      sources."@lerna/publish-3.6.0"
+      sources."@lerna/resolve-symlink-3.6.0"
+      sources."@lerna/rimraf-dir-3.6.0"
+      sources."@lerna/run-3.6.0"
+      sources."@lerna/run-lifecycle-3.6.0"
       sources."@lerna/run-parallel-batches-3.0.0"
-      sources."@lerna/symlink-binary-3.3.0"
-      sources."@lerna/symlink-dependencies-3.3.0"
+      sources."@lerna/symlink-binary-3.6.0"
+      sources."@lerna/symlink-dependencies-3.6.0"
       sources."@lerna/timer-3.5.0"
-      sources."@lerna/validation-error-3.0.0"
-      sources."@lerna/version-3.5.0"
-      sources."@lerna/write-log-file-3.0.0"
+      sources."@lerna/validation-error-3.6.0"
+      sources."@lerna/version-3.6.0"
+      sources."@lerna/write-log-file-3.6.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."JSONStream-1.3.5"
@@ -47142,6 +45507,7 @@ in
         ];
       })
       sources."bcrypt-pbkdf-1.0.2"
+      sources."bin-links-1.1.2"
       sources."block-stream-0.0.9"
       sources."bluebird-3.5.3"
       sources."brace-expansion-1.1.11"
@@ -47309,6 +45675,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
+      sources."find-npm-prefix-1.0.2"
       sources."find-up-3.0.0"
       sources."flush-write-stream-1.0.3"
       sources."for-in-1.0.2"
@@ -47318,6 +45685,7 @@ in
       sources."from2-2.3.0"
       sources."fs-extra-7.0.1"
       sources."fs-minipass-1.2.5"
+      sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
@@ -47328,6 +45696,7 @@ in
         ];
       })
       sources."genfun-5.0.0"
+      sources."gentle-fs-2.0.1"
       sources."get-caller-file-1.0.3"
       (sources."get-pkg-repo-1.4.0" // {
         dependencies = [
@@ -47465,15 +45834,40 @@ in
       sources."jsprim-1.4.1"
       sources."kind-of-6.0.2"
       sources."lcid-2.0.0"
+      sources."libnpm-2.0.1"
       (sources."libnpmaccess-3.0.1" // {
         dependencies = [
           sources."aproba-2.0.0"
         ];
       })
+      sources."libnpmconfig-1.2.1"
+      (sources."libnpmhook-5.0.2" // {
+        dependencies = [
+          sources."aproba-2.0.0"
+        ];
+      })
+      (sources."libnpmorg-1.0.0" // {
+        dependencies = [
+          sources."aproba-2.0.0"
+        ];
+      })
+      (sources."libnpmpublish-1.1.0" // {
+        dependencies = [
+          sources."aproba-2.0.0"
+        ];
+      })
+      sources."libnpmsearch-2.0.0"
+      (sources."libnpmteam-1.0.1" // {
+        dependencies = [
+          sources."aproba-2.0.0"
+        ];
+      })
       sources."load-json-file-4.0.0"
       sources."locate-path-3.0.0"
+      sources."lock-verify-2.0.2"
       sources."lodash-4.17.11"
       sources."lodash._reinterpolate-3.0.0"
+      sources."lodash.clonedeep-4.5.0"
       sources."lodash.sortby-4.7.0"
       sources."lodash.template-4.4.0"
       sources."lodash.templatesettings-4.1.0"
@@ -47500,7 +45894,7 @@ in
           sources."yallist-3.0.3"
         ];
       })
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.1" // {
         dependencies = [
@@ -47523,16 +45917,17 @@ in
       (sources."node-gyp-3.8.0" // {
         dependencies = [
           sources."semver-5.3.0"
-          sources."tar-2.2.1"
         ];
       })
       sources."nopt-3.0.6"
       sources."normalize-package-data-2.4.0"
       sources."npm-bundled-1.0.5"
       sources."npm-lifecycle-2.1.0"
+      sources."npm-logical-tree-1.2.1"
       sources."npm-package-arg-6.1.0"
       sources."npm-packlist-1.1.12"
       sources."npm-pick-manifest-2.2.3"
+      sources."npm-profile-4.0.1"
       sources."npm-registry-fetch-3.8.0"
       sources."npm-run-path-2.0.2"
       sources."npmlog-4.1.2"
@@ -47581,7 +45976,12 @@ in
       sources."p-reduce-1.0.0"
       sources."p-try-2.0.0"
       sources."p-waterfall-1.0.0"
-      sources."pacote-9.2.3"
+      (sources."pacote-9.2.3" // {
+        dependencies = [
+          sources."tar-4.4.8"
+          sources."yallist-3.0.3"
+        ];
+      })
       sources."parallel-transform-1.1.0"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-4.0.0"
@@ -47589,6 +45989,7 @@ in
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-type-3.0.0"
       sources."performance-now-2.1.0"
@@ -47747,17 +46148,14 @@ in
         ];
       })
       sources."string_decoder-1.1.1"
+      sources."stringify-package-1.0.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-indent-2.0.0"
       sources."strong-log-transformer-2.0.0"
       sources."supports-color-5.5.0"
-      (sources."tar-4.4.8" // {
-        dependencies = [
-          sources."yallist-3.0.3"
-        ];
-      })
+      sources."tar-2.2.1"
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
       sources."text-extensions-1.9.0"
@@ -48008,7 +46406,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."component-emitter-1.2.1"
       sources."connect-3.6.6"
       sources."copy-descriptor-0.1.1"
@@ -48888,7 +47286,7 @@ in
         ];
       })
       sources."ajv-6.6.1"
-      sources."ajv-errors-1.0.0"
+      sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.2.0"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
@@ -49075,7 +47473,7 @@ in
       })
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.0.0"
-      sources."caniuse-lite-1.0.30000916"
+      sources."caniuse-lite-1.0.30000917"
       sources."caw-2.0.1"
       (sources."chalk-2.4.1" // {
         dependencies = [
@@ -50913,7 +49311,7 @@ in
       sources."extend-3.0.2"
       sources."form-data-2.3.3"
       sources."formidable-1.2.1"
-      sources."graphlib-2.1.5"
+      sources."graphlib-2.1.7"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."js-yaml-3.12.0"
@@ -51078,7 +49476,7 @@ in
       sources."mime-types-2.1.21"
       sources."minimist-0.0.8"
       sources."minipass-2.3.5"
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
@@ -51625,7 +50023,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.5"
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
@@ -53592,10 +51990,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.20.1";
+    version = "2.21.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
-      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.21.1.tgz";
+      sha512 = "0UEIdUM8VqRHolaBPREYhTEuu/Zfi4qp3Kp0u6ioCtn7Yi33sGFdApEczb/SenmaqtnWD7OUIO74v8Aw9wnYeg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -53760,6 +52158,11 @@ in
       sources."bindings-1.2.1"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
+      (sources."brace-expansion-1.1.11" // {
+        dependencies = [
+          sources."balanced-match-1.0.0"
+        ];
+      })
       sources."braces-2.3.2"
       sources."brfs-1.6.1"
       sources."brorand-1.1.0"
@@ -53785,8 +52188,8 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-db-1.0.30000916"
-      sources."caniuse-lite-1.0.30000916"
+      sources."caniuse-db-1.0.30000917"
+      sources."caniuse-lite-1.0.30000917"
       sources."chalk-2.4.1"
       sources."chokidar-2.0.4"
       sources."cipher-base-1.0.4"
@@ -53820,6 +52223,7 @@ in
       sources."command-exists-1.2.8"
       sources."commander-2.19.0"
       sources."component-emitter-1.2.1"
+      sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."config-chain-1.1.12"
       sources."console-browserify-1.1.0"
@@ -53965,11 +52369,13 @@ in
       sources."foreach-2.0.5"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
+      sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       sources."fswatcher-child-1.1.1"
       sources."function-bind-1.1.1"
       sources."get-port-3.2.0"
       sources."get-value-2.0.6"
+      sources."glob-7.1.3"
       (sources."glob-parent-3.1.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
@@ -54056,6 +52462,7 @@ in
       sources."import-fresh-2.0.0"
       sources."indexes-of-1.0.1"
       sources."indexof-0.0.1"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."invariant-2.2.4"
@@ -54100,7 +52507,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."js-base64-2.4.9"
-      sources."js-beautify-1.8.8"
+      sources."js-beautify-1.8.9"
       sources."js-levenshtein-1.1.4"
       sources."js-tokens-4.0.0"
       (sources."js-yaml-3.12.0" // {
@@ -54146,6 +52553,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
+      sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       (sources."mixin-deep-1.3.1" // {
         dependencies = [
@@ -54187,6 +52595,7 @@ in
       sources."object.pick-1.3.0"
       sources."object.values-1.0.4"
       sources."on-finished-2.3.0"
+      sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."opn-5.4.0"
       sources."optionator-0.8.2"
@@ -54623,6 +53032,7 @@ in
       sources."whet.extend-0.9.9"
       sources."which-1.3.1"
       sources."wordwrap-1.0.0"
+      sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
@@ -54758,7 +53168,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."combine-source-map-0.8.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -55120,321 +53530,6 @@ in
     production = true;
     bypassCache = true;
   };
-  quassel-webserver = nodeEnv.buildNodePackage {
-    name = "quassel-webserver";
-    packageName = "quassel-webserver";
-    version = "2.2.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/quassel-webserver/-/quassel-webserver-2.2.8.tgz";
-      sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa";
-    };
-    dependencies = [
-      sources."@types/babel-types-7.0.4"
-      sources."@types/babylon-6.16.4"
-      sources."accepts-1.3.5"
-      sources."acorn-3.3.0"
-      (sources."acorn-globals-3.1.0" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
-      sources."ajv-4.11.8"
-      sources."align-text-0.1.4"
-      sources."ansi-regex-2.1.1"
-      sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.5"
-      sources."array-flatten-1.1.1"
-      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.8.0"
-      sources."babel-runtime-6.26.0"
-      sources."babel-types-6.26.0"
-      sources."babylon-6.18.0"
-      sources."basic-auth-2.0.1"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."bindings-1.2.1"
-      sources."bl-1.2.2"
-      sources."body-parser-1.18.3"
-      sources."boom-2.10.1"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-fill-1.0.0"
-      sources."bufferutil-2.0.1"
-      sources."bytes-3.0.0"
-      sources."camelcase-1.2.1"
-      sources."caseless-0.12.0"
-      sources."center-align-0.1.3"
-      sources."character-parser-2.2.0"
-      sources."chownr-1.1.1"
-      (sources."clean-css-4.2.1" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
-      sources."cliui-2.1.0"
-      sources."co-4.6.0"
-      sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.7"
-      sources."commander-2.19.0"
-      sources."console-control-strings-1.1.0"
-      sources."constantinople-3.1.2"
-      sources."content-disposition-0.5.2"
-      sources."content-type-1.0.4"
-      sources."cookie-0.3.1"
-      sources."cookie-parser-1.4.3"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.0"
-      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."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.6.0"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
-      sources."doctypes-1.1.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.1"
-      sources."errno-0.1.7"
-      sources."escape-html-1.0.3"
-      sources."esutils-2.0.2"
-      sources."etag-1.8.1"
-      sources."eventemitter2-3.0.2"
-      sources."expand-template-1.1.1"
-      (sources."express-4.16.4" // {
-        dependencies = [
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      (sources."finalhandler-1.1.1" // {
-        dependencies = [
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."forwarded-0.1.2"
-      sources."fresh-0.5.2"
-      sources."fs-constants-1.0.0"
-      sources."function-bind-1.1.1"
-      sources."gauge-2.7.4"
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."github-from-package-0.0.0"
-      sources."graceful-fs-4.1.15"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
-      sources."has-1.0.3"
-      sources."has-unicode-2.0.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-errors-1.6.3"
-      sources."http-signature-1.1.1"
-      sources."httpolyglot-0.1.2"
-      sources."iconv-lite-0.4.23"
-      sources."image-size-0.5.5"
-      sources."inherits-2.0.3"
-      sources."ini-1.3.5"
-      sources."int64-buffer-0.1.10"
-      sources."ipaddr.js-1.8.0"
-      sources."is-3.2.1"
-      sources."is-buffer-1.1.6"
-      (sources."is-expression-3.0.0" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-promise-2.1.0"
-      sources."is-regex-1.0.4"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."js-stringify-1.0.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."jstransformer-1.0.0"
-      sources."kind-of-3.2.2"
-      sources."lazy-cache-1.0.4"
-      sources."less-2.7.3"
-      sources."less-middleware-2.2.1"
-      sources."libquassel-2.1.9"
-      sources."lodash-4.17.11"
-      sources."longest-1.0.1"
-      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.37.0"
-      sources."mime-types-2.1.21"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      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.5.0"
-      sources."node.extend-2.0.2"
-      sources."noop-logger-0.1.1"
-      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."on-finished-2.3.0"
-      sources."on-headers-1.0.1"
-      sources."once-1.4.0"
-      sources."os-homedir-1.0.2"
-      sources."parseurl-1.3.2"
-      sources."path-parse-1.0.6"
-      sources."path-to-regexp-0.1.7"
-      sources."performance-now-0.2.0"
-      (sources."prebuild-install-2.1.2" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-          sources."tunnel-agent-0.4.3"
-        ];
-      })
-      sources."process-nextick-args-2.0.0"
-      sources."promise-7.3.1"
-      sources."proxy-addr-2.0.4"
-      sources."prr-1.0.1"
-      sources."pug-2.0.3"
-      sources."pug-attrs-2.0.3"
-      sources."pug-code-gen-2.0.1"
-      sources."pug-error-1.3.2"
-      sources."pug-filters-3.1.0"
-      sources."pug-lexer-4.0.0"
-      sources."pug-linker-3.0.5"
-      sources."pug-load-2.0.11"
-      sources."pug-parser-5.0.0"
-      sources."pug-runtime-2.0.4"
-      sources."pug-strip-comments-1.0.3"
-      sources."pug-walk-1.1.7"
-      sources."pump-1.0.3"
-      sources."punycode-1.4.1"
-      sources."qs-6.5.2"
-      sources."qtdatastream-0.7.1"
-      sources."range-parser-1.2.0"
-      sources."raw-body-2.3.3"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."readable-stream-2.3.6"
-      sources."regenerator-runtime-0.11.1"
-      sources."repeat-string-1.6.1"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."qs-6.4.0"
-        ];
-      })
-      sources."resolve-1.8.1"
-      sources."right-align-0.1.3"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.6.0"
-      (sources."send-0.16.2" // {
-        dependencies = [
-          sources."statuses-1.4.0"
-        ];
-      })
-      (sources."serve-favicon-2.3.2" // {
-        dependencies = [
-          sources."etag-1.7.0"
-          sources."fresh-0.3.0"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."serve-static-1.13.2"
-      sources."set-blocking-2.0.0"
-      sources."setprototypeof-1.1.0"
-      sources."signal-exit-3.0.2"
-      sources."simple-get-1.4.3"
-      sources."sntp-1.0.9"
-      sources."source-map-0.5.7"
-      (sources."sshpk-1.15.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."statuses-1.5.0"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.6"
-      sources."strip-ansi-3.0.1"
-      sources."strip-json-comments-2.0.1"
-      sources."tar-fs-1.16.3"
-      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"
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.16"
-      sources."uglify-js-2.8.29"
-      sources."uglify-to-browserify-1.0.2"
-      sources."ultron-1.1.1"
-      sources."unpipe-1.0.0"
-      sources."unzip-response-1.0.2"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
-      sources."vary-1.1.2"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."void-elements-2.0.1"
-      sources."wide-align-1.1.3"
-      sources."window-size-0.1.0"
-      sources."with-5.1.1"
-      sources."wordwrap-0.0.2"
-      sources."wrappy-1.0.2"
-      (sources."ws-2.3.1" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
-      sources."xtend-4.0.1"
-      sources."yargs-3.10.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Quassel web interface";
-      homepage = https://github.com/magne4000/quassel-webserver;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-  };
   react-tools = nodeEnv.buildNodePackage {
     name = "react-tools";
     packageName = "react-tools";
@@ -57251,10 +55346,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.116.0";
+    version = "1.116.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.116.0.tgz";
-      sha512 = "MIU4RTnlTda5xq8sqAvg9JS1zn1wip0IiF6kqnN9iS6+oKOgZWo5FTkC0pwBS4wqgFxHyDCg8ErG5/9RKK0RkA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.116.2.tgz";
+      sha512 = "zkW+IjSEDJ5f4leXck7a7aF36pJcIKRk3o2or78cnabq1mxQzgY8+ooECPDBnwvqySIwUKA8jOjnGRujaNCMpg==";
     };
     dependencies = [
       sources."@snyk/dep-graph-1.1.2"
@@ -57350,7 +55445,7 @@ in
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
-      sources."graphlib-2.1.5"
+      sources."graphlib-2.1.7"
       sources."has-flag-3.0.0"
       sources."hasbin-1.2.3"
       sources."hosted-git-info-2.7.1"
@@ -57499,7 +55594,7 @@ in
       sources."smart-buffer-1.1.15"
       sources."snyk-config-2.2.0"
       sources."snyk-docker-plugin-1.13.1"
-      sources."snyk-go-plugin-1.6.0"
+      sources."snyk-go-plugin-1.6.1"
       sources."snyk-gradle-plugin-2.1.1"
       sources."snyk-module-1.9.1"
       sources."snyk-mvn-plugin-2.0.0"
@@ -57952,7 +56047,7 @@ in
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
-      (sources."graphlib-2.1.5" // {
+      (sources."graphlib-2.1.7" // {
         dependencies = [
           sources."lodash-4.17.11"
         ];
@@ -58671,10 +56766,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.2.1";
+    version = "3.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz";
-      sha512 = "jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz";
+      sha512 = "VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -59104,7 +57199,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
-      sources."typechecker-4.6.0"
+      sources."typechecker-4.7.0"
       sources."typedarray-0.0.6"
       sources."uid-safe-2.1.5"
       sources."ultron-1.1.1"
@@ -59453,7 +57548,7 @@ in
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollographql/apollo-tools-0.2.8"
+      sources."@apollographql/apollo-tools-0.2.9"
       sources."@apollographql/apollo-upload-server-5.0.3"
       sources."@apollographql/graphql-playground-html-1.6.6"
       sources."@babel/runtime-corejs2-7.2.0"
@@ -59480,7 +57575,7 @@ in
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
       sources."@types/node-10.12.12"
-      sources."@types/range-parser-1.2.2"
+      sources."@types/range-parser-1.2.3"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-6.0.1"
       sources."@types/zen-observable-0.8.0"
@@ -60569,7 +58664,7 @@ in
       sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."ajv-6.6.1"
-      sources."ajv-errors-1.0.0"
+      sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
@@ -61696,7 +59791,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.4.0"
+      sources."fast-redact-1.4.2"
       sources."fast-safe-stringify-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
@@ -61779,7 +59874,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.1.15"
       sources."graceful-readlink-1.0.1"
-      sources."graphlib-2.1.5"
+      sources."graphlib-2.1.7"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
       (sources."har-validator-5.1.3" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 45144618546..a8df0951cc5 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1228,13 +1228,13 @@ let
         sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
       };
     };
-    "minizlib-1.1.1" = {
+    "minizlib-1.2.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
-        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
+        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -2555,7 +2555,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.5"
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
@@ -2606,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.20.1";
+    version = "2.21.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
-      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.21.1.tgz";
+      sha512 = "0UEIdUM8VqRHolaBPREYhTEuu/Zfi4qp3Kp0u6ioCtn7Yi33sGFdApEczb/SenmaqtnWD7OUIO74v8Aw9wnYeg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index ff7b5c2705b..3fd66bd989f 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -1,5 +1,6 @@
 [
   "alloy"
+, "azure-cli"
 , "bower"
 , "coffee-script"
 , "grunt-cli"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 8260493dbaf..151bd784453 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -4,6 +4,15 @@
 
 let
   sources = {
+    "@types/node-8.10.38" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "8.10.38";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz";
+        sha512 = "EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==";
+      };
+    };
     "JSV-4.0.2" = {
       name = "JSV";
       packageName = "JSV";
@@ -22,6 +31,15 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
+    "adal-node-0.1.28" = {
+      name = "adal-node";
+      packageName = "adal-node";
+      version = "0.1.28";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz";
+        sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485";
+      };
+    };
     "adm-zip-0.4.11" = {
       name = "adm-zip";
       packageName = "adm-zip";
@@ -49,6 +67,15 @@ let
         sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
       };
     };
+    "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";
+      };
+    };
     "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -76,6 +103,15 @@ let
         sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
+    "applicationinsights-0.16.0" = {
+      name = "applicationinsights";
+      packageName = "applicationinsights";
+      version = "0.16.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
+      };
+    };
     "aproba-1.2.0" = {
       name = "aproba";
       packageName = "aproba";
@@ -148,6 +184,24 @@ let
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
+    "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.1.11" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      };
+    };
     "asn1-0.2.4" = {
       name = "asn1";
       packageName = "asn1";
@@ -157,6 +211,15 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
+    "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";
@@ -175,6 +238,24 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    };
+    "async-0.2.7" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz";
+        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
+      };
+    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -184,6 +265,24 @@ let
         sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
+    "async-1.4.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
+        sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+      };
+    };
+    "async-2.6.0" = {
+      name = "async";
+      packageName = "async";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz";
+        sha512 = "xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==";
+      };
+    };
     "async-2.6.1" = {
       name = "async";
       packageName = "async";
@@ -211,6 +310,15 @@ let
         sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
       };
     };
+    "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";
@@ -229,6 +337,366 @@ let
         sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
       };
     };
+    "azure-arm-authorization-2.0.0" = {
+      name = "azure-arm-authorization";
+      packageName = "azure-arm-authorization";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
+        sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
+      };
+    };
+    "azure-arm-batch-3.2.0" = {
+      name = "azure-arm-batch";
+      packageName = "azure-arm-batch";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.2.0.tgz";
+        sha512 = "DDfgAiRruGAiL8Yot5nufG3O8GLA0r5lf1CGYhuF8pEzQ+vYfhLpgJzme7LPh3ASPb8UBSVYHm1IK4W4StvVnw==";
+      };
+    };
+    "azure-arm-cdn-4.1.0" = {
+      name = "azure-arm-cdn";
+      packageName = "azure-arm-cdn";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.1.0.tgz";
+        sha512 = "5xD2CkCx5ONn1vaGa4USAzv3LtCs0kmZCkdSNj98eQlQJLJQ7RPpIsNAXHGuHX4yN+EKHdaA2/hC/ynuQujNEQ==";
+      };
+    };
+    "azure-arm-commerce-2.1.0" = {
+      name = "azure-arm-commerce";
+      packageName = "azure-arm-commerce";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.1.0.tgz";
+        sha512 = "zhZ9b1Comp1Owa8/Pn7ORTL0l+uX9elz5A5yOoL/XdYXC8S6bN2QaiRLPmue9ZB55qGE1Tn7Cf+KRlpskL17hQ==";
+      };
+    };
+    "azure-arm-compute-3.0.0-preview" = {
+      name = "azure-arm-compute";
+      packageName = "azure-arm-compute";
+      version = "3.0.0-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz";
+        sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b";
+      };
+    };
+    "azure-arm-datalake-analytics-1.0.2-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.2-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz";
+        sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63";
+      };
+    };
+    "azure-arm-datalake-store-1.0.2-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.2-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz";
+        sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763";
+      };
+    };
+    "azure-arm-devtestlabs-2.1.1" = {
+      name = "azure-arm-devtestlabs";
+      packageName = "azure-arm-devtestlabs";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-2.1.1.tgz";
+        sha512 = "S5dCYTMrqL+BJc699fIQtXwLFuv5m8jTDqPdXTFpn/CSkyBcOyJwuZH2zPExQjGNZTyjIR6GWi8oeg/IpYLBWw==";
+      };
+    };
+    "azure-arm-dns-2.1.0" = {
+      name = "azure-arm-dns";
+      packageName = "azure-arm-dns";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz";
+        sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q==";
+      };
+    };
+    "azure-arm-hdinsight-0.2.2" = {
+      name = "azure-arm-hdinsight";
+      packageName = "azure-arm-hdinsight";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
+      };
+    };
+    "azure-arm-hdinsight-jobs-0.1.0" = {
+      name = "azure-arm-hdinsight-jobs";
+      packageName = "azure-arm-hdinsight-jobs";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz";
+        sha1 = "252938f18d4341adf9942261656e791490c3c220";
+      };
+    };
+    "azure-arm-insights-0.11.3" = {
+      name = "azure-arm-insights";
+      packageName = "azure-arm-insights";
+      version = "0.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz";
+        sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
+      };
+    };
+    "azure-arm-iothub-1.0.1-preview" = {
+      name = "azure-arm-iothub";
+      packageName = "azure-arm-iothub";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz";
+        sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91";
+      };
+    };
+    "azure-arm-network-5.3.0" = {
+      name = "azure-arm-network";
+      packageName = "azure-arm-network";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
+        sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig==";
+      };
+    };
+    "azure-arm-powerbiembedded-0.1.1" = {
+      name = "azure-arm-powerbiembedded";
+      packageName = "azure-arm-powerbiembedded";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz";
+        sha1 = "7103c94e06b3ddf628293f60e02fd0ba8f9c3ca9";
+      };
+    };
+    "azure-arm-rediscache-0.2.3" = {
+      name = "azure-arm-rediscache";
+      packageName = "azure-arm-rediscache";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
+      };
+    };
+    "azure-arm-resource-1.6.1-preview" = {
+      name = "azure-arm-resource";
+      packageName = "azure-arm-resource";
+      version = "1.6.1-preview";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
+      };
+    };
+    "azure-arm-resource-7.2.1" = {
+      name = "azure-arm-resource";
+      packageName = "azure-arm-resource";
+      version = "7.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.1.tgz";
+        sha512 = "dtji3Eia9/TABcKzxWklTLh9zj24BtOkBObzxH4BAr/ZSFmyAtJA4lYXkjizEkPCS6XVsCiqsUJZtNrqQ8iTWA==";
+      };
+    };
+    "azure-arm-servermanagement-1.1.0" = {
+      name = "azure-arm-servermanagement";
+      packageName = "azure-arm-servermanagement";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-1.1.0.tgz";
+        sha512 = "GlPXPD5Up2U6Qxv40ScC/+7WRcVVYQf7EHUSomD385o/MuyJAjM6CxBS8fPKwkZR5MRSd60p6kBo5AQ+bwfpeA==";
+      };
+    };
+    "azure-arm-storage-5.2.0" = {
+      name = "azure-arm-storage";
+      packageName = "azure-arm-storage";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-5.2.0.tgz";
+        sha512 = "BVFUPi48eJNJFP4ryQ3BwNRlKRNuAA7cZeSxCvr6dGEP+wrd1Ixmb2MlvoMRjgjcEOVnhP4t2YQyHcHNqQsH9A==";
+      };
+    };
+    "azure-arm-trafficmanager-1.1.0-preview" = {
+      name = "azure-arm-trafficmanager";
+      packageName = "azure-arm-trafficmanager";
+      version = "1.1.0-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz";
+        sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50";
+      };
+    };
+    "azure-arm-website-5.7.0" = {
+      name = "azure-arm-website";
+      packageName = "azure-arm-website";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.7.0.tgz";
+        sha512 = "GnwqaelTIhv40YI3Ch8+Q272X6XXWTq99Y1aYWZb1cejSP4gjrWWeppwor4HtjlVU9i9YIvYO91TRjQt8FrHVA==";
+      };
+    };
+    "azure-asm-compute-0.18.0" = {
+      name = "azure-asm-compute";
+      packageName = "azure-asm-compute";
+      version = "0.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
+        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
+      };
+    };
+    "azure-asm-hdinsight-0.10.2" = {
+      name = "azure-asm-hdinsight";
+      packageName = "azure-asm-hdinsight";
+      version = "0.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz";
+        sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0";
+      };
+    };
+    "azure-asm-mgmt-0.10.1" = {
+      name = "azure-asm-mgmt";
+      packageName = "azure-asm-mgmt";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz";
+        sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751";
+      };
+    };
+    "azure-asm-network-0.13.0" = {
+      name = "azure-asm-network";
+      packageName = "azure-asm-network";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz";
+        sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
+      };
+    };
+    "azure-asm-sb-0.10.1" = {
+      name = "azure-asm-sb";
+      packageName = "azure-asm-sb";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz";
+        sha1 = "92487b24166041119714f66760ec1f36e8dc7222";
+      };
+    };
+    "azure-asm-sql-0.10.1" = {
+      name = "azure-asm-sql";
+      packageName = "azure-asm-sql";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz";
+        sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42";
+      };
+    };
+    "azure-asm-storage-0.12.0" = {
+      name = "azure-asm-storage";
+      packageName = "azure-asm-storage";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz";
+        sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3";
+      };
+    };
+    "azure-asm-subscription-0.10.1" = {
+      name = "azure-asm-subscription";
+      packageName = "azure-asm-subscription";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz";
+        sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c";
+      };
+    };
+    "azure-asm-trafficmanager-0.10.3" = {
+      name = "azure-asm-trafficmanager";
+      packageName = "azure-asm-trafficmanager";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz";
+        sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
+      };
+    };
+    "azure-asm-website-0.10.7" = {
+      name = "azure-asm-website";
+      packageName = "azure-asm-website";
+      version = "0.10.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.7.tgz";
+        sha512 = "h3OmXKKOLd4sbf4khrxqGTjspjqpKduKN9EWgEoIeNhMY+PVKrVEIMr3ZyKzmmy/8123MD+ip67wMqUKSTLtUA==";
+      };
+    };
+    "azure-batch-3.2.2" = {
+      name = "azure-batch";
+      packageName = "azure-batch";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.2.tgz";
+        sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw==";
+      };
+    };
+    "azure-common-0.9.20" = {
+      name = "azure-common";
+      packageName = "azure-common";
+      version = "0.9.20";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz";
+        sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ==";
+      };
+    };
+    "azure-gallery-2.0.0-pre.18" = {
+      name = "azure-gallery";
+      packageName = "azure-gallery";
+      version = "2.0.0-pre.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz";
+        sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
+      };
+    };
+    "azure-graph-2.2.0" = {
+      name = "azure-graph";
+      packageName = "azure-graph";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.2.0.tgz";
+        sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw==";
+      };
+    };
+    "azure-keyvault-3.0.4" = {
+      name = "azure-keyvault";
+      packageName = "azure-keyvault";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz";
+        sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5";
+      };
+    };
+    "azure-monitoring-0.10.6" = {
+      name = "azure-monitoring";
+      packageName = "azure-monitoring";
+      version = "0.10.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.6.tgz";
+        sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q==";
+      };
+    };
+    "azure-servicefabric-2.2.0" = {
+      name = "azure-servicefabric";
+      packageName = "azure-servicefabric";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.2.0.tgz";
+        sha512 = "b+rxF8esa1Cm+bnJLs6a+hO/7U9QwvQzg0bSR1rKP9NTKjZji3GxdndcPVkHqFv28QiLo9ifyR/FaJMA0cDcTw==";
+      };
+    };
+    "azure-storage-2.10.2" = {
+      name = "azure-storage";
+      packageName = "azure-storage";
+      version = "2.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz";
+        sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA==";
+      };
+    };
     "babel-code-frame-6.26.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
@@ -355,6 +823,15 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
+    "bl-1.1.2" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
+        sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
+      };
+    };
     "block-stream-0.0.9" = {
       name = "block-stream";
       packageName = "block-stream";
@@ -364,6 +841,15 @@ let
         sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
       };
     };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
     "brace-expansion-1.1.11" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
@@ -382,6 +868,24 @@ let
         sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
+    "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";
+      };
+    };
+    "buffer-equal-constant-time-1.0.1" = {
+      name = "buffer-equal-constant-time";
+      packageName = "buffer-equal-constant-time";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+      };
+    };
     "buffer-from-1.1.1" = {
       name = "buffer-from";
       packageName = "buffer-from";
@@ -400,6 +904,24 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
+    "caller-id-0.1.0" = {
+      name = "caller-id";
+      packageName = "caller-id";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz";
+        sha1 = "59bdac0893d12c3871408279231f97458364f07b";
+      };
+    };
+    "caseless-0.11.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -454,6 +976,15 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
+    "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";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -499,6 +1030,15 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+      };
+    };
     "colors-1.3.0" = {
       name = "colors";
       packageName = "colors";
@@ -508,13 +1048,13 @@ let
         sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==";
       };
     };
-    "colors-1.3.2" = {
+    "colors-1.3.3" = {
       name = "colors";
       packageName = "colors";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz";
-        sha512 = "rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==";
+        url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz";
+        sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
     "combined-stream-1.0.7" = {
@@ -526,6 +1066,24 @@ let
         sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
       };
     };
+    "commander-1.0.4" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
+        sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
+      };
+    };
+    "commander-1.1.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
+        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
+      };
+    };
     "commander-2.17.1" = {
       name = "commander";
       packageName = "commander";
@@ -562,6 +1120,15 @@ let
         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==";
+      };
+    };
     "console-control-strings-1.1.0" = {
       name = "console-control-strings";
       packageName = "console-control-strings";
@@ -607,6 +1174,24 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "ctype-0.5.2" = {
+      name = "ctype";
+      packageName = "ctype";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+      };
+    };
     "cycle-1.0.3" = {
       name = "cycle";
       packageName = "cycle";
@@ -625,6 +1210,24 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
+    "date-utils-1.2.21" = {
+      name = "date-utils";
+      packageName = "date-utils";
+      version = "1.2.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
+        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
+      };
+    };
+    "dateformat-1.0.2-1.2.3" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "1.0.2-1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+      };
+    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -643,6 +1246,15 @@ let
         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";
@@ -652,6 +1264,15 @@ let
         sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
+    "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-property-0.2.5" = {
       name = "define-property";
       packageName = "define-property";
@@ -733,6 +1354,24 @@ let
         sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
+    "duplexer-0.1.1" = {
+      name = "duplexer";
+      packageName = "duplexer";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    };
+    "easy-table-1.1.0" = {
+      name = "easy-table";
+      packageName = "easy-table";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz";
+        sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73";
+      };
+    };
     "ecc-jsbn-0.1.2" = {
       name = "ecc-jsbn";
       packageName = "ecc-jsbn";
@@ -742,6 +1381,15 @@ let
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
+    "ecdsa-sig-formatter-1.0.10" = {
+      name = "ecdsa-sig-formatter";
+      packageName = "ecdsa-sig-formatter";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz";
+        sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3";
+      };
+    };
     "ejs-2.5.7" = {
       name = "ejs";
       packageName = "ejs";
@@ -760,6 +1408,15 @@ let
         sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2";
       };
     };
+    "envconf-0.0.4" = {
+      name = "envconf";
+      packageName = "envconf";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz";
+        sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
+      };
+    };
     "escape-string-regexp-1.0.5" = {
       name = "escape-string-regexp";
       packageName = "escape-string-regexp";
@@ -778,6 +1435,15 @@ let
         sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
       };
     };
+    "event-stream-3.1.5" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.1.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz";
+        sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c";
+      };
+    };
     "expand-brackets-2.1.4" = {
       name = "expand-brackets";
       packageName = "expand-brackets";
@@ -868,6 +1534,15 @@ let
         sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
       };
     };
+    "fast-json-patch-0.5.6" = {
+      name = "fast-json-patch";
+      packageName = "fast-json-patch";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
+        sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
+      };
+    };
     "fast-json-stable-stringify-2.0.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
@@ -877,6 +1552,15 @@ let
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
+    "fibers-1.0.15" = {
+      name = "fibers";
+      packageName = "fibers";
+      version = "1.0.15";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
+        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
+      };
+    };
     "fields-0.1.24" = {
       name = "fields";
       packageName = "fields";
@@ -949,6 +1633,15 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
+    "form-data-1.0.1" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz";
+        sha1 = "ae315db9a4907fa065502304a66d7733475ee37c";
+      };
+    };
     "form-data-2.3.3" = {
       name = "form-data";
       packageName = "form-data";
@@ -967,6 +1660,15 @@ let
         sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
       };
     };
+    "from-0.1.7" = {
+      name = "from";
+      packageName = "from";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
+      };
+    };
     "fs-extra-5.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -1012,6 +1714,15 @@ let
         sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
       };
     };
+    "galaxy-0.1.12" = {
+      name = "galaxy";
+      packageName = "galaxy";
+      version = "0.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz";
+        sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
+      };
+    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -1021,6 +1732,24 @@ let
         sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
       };
     };
+    "generate-function-2.3.1" = {
+      name = "generate-function";
+      packageName = "generate-function";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz";
+        sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==";
+      };
+    };
+    "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";
+      };
+    };
     "get-value-2.0.6" = {
       name = "get-value";
       packageName = "get-value";
@@ -1039,6 +1768,15 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
+    "github-0.1.6" = {
+      name = "github";
+      packageName = "github";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz";
+        sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922";
+      };
+    };
     "glob-7.1.3" = {
       name = "glob";
       packageName = "glob";
@@ -1129,6 +1867,15 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
+    "har-validator-2.0.6" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
+      };
+    };
     "har-validator-5.0.3" = {
       name = "har-validator";
       packageName = "har-validator";
@@ -1210,6 +1957,33 @@ let
         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";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "http://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";
@@ -1228,6 +2002,33 @@ let
         sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
       };
     };
+    "http-basic-2.5.1" = {
+      name = "http-basic";
+      packageName = "http-basic";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz";
+        sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb";
+      };
+    };
+    "http-response-object-1.1.0" = {
+      name = "http-response-object";
+      packageName = "http-response-object";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz";
+        sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3";
+      };
+    };
+    "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";
@@ -1246,6 +2047,15 @@ let
         sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
       };
     };
+    "i-0.3.6" = {
+      name = "i";
+      packageName = "i";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz";
+        sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
+      };
+    };
     "iconv-lite-0.4.24" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -1444,6 +2254,24 @@ let
         sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
+    "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.19.0" = {
+      name = "is-my-json-valid";
+      packageName = "is-my-json-valid";
+      version = "2.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz";
+        sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==";
+      };
+    };
     "is-number-3.0.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -1462,6 +2290,15 @@ let
         sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
+    "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-relative-1.0.0" = {
       name = "is-relative";
       packageName = "is-relative";
@@ -1471,6 +2308,15 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
+    "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";
@@ -1507,6 +2353,15 @@ let
         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";
@@ -1561,6 +2416,15 @@ let
         sha1 = "9866df395102130e38f7f996bceb65443209c25b";
       };
     };
+    "js2xmlparser-1.0.0" = {
+      name = "js2xmlparser";
+      packageName = "js2xmlparser";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz";
+        sha1 = "5a170f2e8d6476ce45405e04823242513782fe30";
+      };
+    };
     "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
@@ -1579,6 +2443,15 @@ let
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
+    "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-schema-0.2.3" = {
       name = "json-schema";
       packageName = "json-schema";
@@ -1642,6 +2515,33 @@ let
         sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
       };
     };
+    "jsonminify-0.4.1" = {
+      name = "jsonminify";
+      packageName = "jsonminify";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz";
+        sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c";
+      };
+    };
+    "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";
@@ -1651,6 +2551,51 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
+    "jsrsasign-4.8.2" = {
+      name = "jsrsasign";
+      packageName = "jsrsasign";
+      version = "4.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz";
+        sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
+      };
+    };
+    "jwa-1.1.6" = {
+      name = "jwa";
+      packageName = "jwa";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz";
+        sha512 = "tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==";
+      };
+    };
+    "jws-3.1.5" = {
+      name = "jws";
+      packageName = "jws";
+      version = "3.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz";
+        sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==";
+      };
+    };
+    "jwt-decode-2.2.0" = {
+      name = "jwt-decode";
+      packageName = "jwt-decode";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
+        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
+      };
+    };
+    "keypress-0.1.0" = {
+      name = "keypress";
+      packageName = "keypress";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+      };
+    };
     "keypress-0.2.1" = {
       name = "keypress";
       packageName = "keypress";
@@ -1696,6 +2641,15 @@ let
         sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
       };
     };
+    "kuduscript-1.0.16" = {
+      name = "kuduscript";
+      packageName = "kuduscript";
+      version = "1.0.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz";
+        sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
+      };
+    };
     "liftoff-2.5.0" = {
       name = "liftoff";
       packageName = "liftoff";
@@ -1750,6 +2704,15 @@ let
         sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
       };
     };
+    "map-stream-0.1.0" = {
+      name = "map-stream";
+      packageName = "map-stream";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+      };
+    };
     "map-visit-1.0.0" = {
       name = "map-visit";
       packageName = "map-visit";
@@ -1768,6 +2731,15 @@ let
         sha512 = "nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==";
       };
     };
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    };
     "micromatch-3.1.10" = {
       name = "micromatch";
       packageName = "micromatch";
@@ -1840,13 +2812,13 @@ let
         sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==";
       };
     };
-    "minizlib-1.1.1" = {
+    "minizlib-1.2.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
-        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
+        sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -1894,6 +2866,51 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
+    "ms-rest-1.15.7" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "1.15.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
+        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
+      };
+    };
+    "ms-rest-2.3.8" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.8.tgz";
+        sha512 = "8kaerSPk0Z9W6z8VnJXjKOHDaGGXbsGyO22X4DFtlllzbYLryWo0Dor+jnIKpgvUOzQKSoLW2fel81piG3LnHQ==";
+      };
+    };
+    "ms-rest-azure-1.15.7" = {
+      name = "ms-rest-azure";
+      packageName = "ms-rest-azure";
+      version = "1.15.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
+        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
+      };
+    };
+    "ms-rest-azure-2.5.9" = {
+      name = "ms-rest-azure";
+      packageName = "ms-rest-azure";
+      version = "2.5.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.9.tgz";
+        sha512 = "qonobzWLS7Jl6qwgTuA/SfyCtnv7olvCRKrcF8nzXSj68ds4Oj3K64ntzgQajroKa0hKVMcPUFbTk1IYMGvu8w==";
+      };
+    };
+    "mute-stream-0.0.7" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+      };
+    };
     "nanomatch-1.2.13" = {
       name = "nanomatch";
       packageName = "nanomatch";
@@ -1903,6 +2920,15 @@ let
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
+    "ncp-0.4.2" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+      };
+    };
     "needle-2.2.4" = {
       name = "needle";
       packageName = "needle";
@@ -1921,6 +2947,24 @@ let
         sha512 = "PldEN7CgEy7ekSZyomgpajLX7STCZPDJI6rGy7FCbWi7ZJgTt9/C3omCxPkIKVjtwcXzXoSA31zUWUnBzTkEUg==";
       };
     };
+    "node-forge-0.6.23" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.6.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz";
+        sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
+      };
+    };
+    "node-uuid-1.4.8" = {
+      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";
+      };
+    };
     "node.extend-2.0.0" = {
       name = "node.extend";
       packageName = "node.extend";
@@ -2065,6 +3109,15 @@ let
         sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
       };
     };
+    "omelette-0.3.2" = {
+      name = "omelette";
+      packageName = "omelette";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
+        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
+      };
+    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -2074,6 +3127,15 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "openssl-wrapper-0.3.4" = {
+      name = "openssl-wrapper";
+      packageName = "openssl-wrapper";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.3.4.tgz";
+        sha1 = "c01ec98e4dcd2b5dfe0b693f31827200e3b81b07";
+      };
+    };
     "optimist-0.6.1" = {
       name = "optimist";
       packageName = "optimist";
@@ -2173,6 +3235,15 @@ let
         sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
       };
     };
+    "pause-stream-0.0.11" = {
+      name = "pause-stream";
+      packageName = "pause-stream";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+        sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+      };
+    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -2182,6 +3253,24 @@ let
         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";
+      };
+    };
     "pkginfo-0.3.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
@@ -2218,6 +3307,15 @@ let
         sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
       };
     };
+    "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";
@@ -2227,6 +3325,33 @@ let
         sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
       };
     };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "http://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==";
+      };
+    };
+    "prompt-0.2.14" = {
+      name = "prompt";
+      packageName = "prompt";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
+        sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
+      };
+    };
     "psl-1.1.29" = {
       name = "psl";
       packageName = "psl";
@@ -2254,6 +3379,15 @@ let
         sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
+    "qs-6.2.3" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
+        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
+      };
+    };
     "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
@@ -2272,6 +3406,33 @@ let
         sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
+    "read-1.0.7" = {
+      name = "read";
+      packageName = "read";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
+        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
+      };
+    };
+    "readable-stream-1.0.34" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.0.34";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
+        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
+      };
+    };
+    "readable-stream-2.0.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+      };
+    };
     "readable-stream-2.3.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -2335,6 +3496,15 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
+    "request-2.74.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.74.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz";
+        sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
+      };
+    };
     "request-2.87.0" = {
       name = "request";
       packageName = "request";
@@ -2389,6 +3559,15 @@ let
         sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
+    "revalidator-0.1.8" = {
+      name = "revalidator";
+      packageName = "revalidator";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -2434,6 +3613,15 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
+    "sax-0.5.2" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
+        sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
+      };
+    };
     "sax-0.5.8" = {
       name = "sax";
       packageName = "sax";
@@ -2551,6 +3739,24 @@ let
         sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "source-map-0.1.43" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.43";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+      };
+    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -2605,6 +3811,15 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
+    "split-0.2.10" = {
+      name = "split";
+      packageName = "split";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz";
+        sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
+      };
+    };
     "split-string-3.1.0" = {
       name = "split-string";
       packageName = "split-string";
@@ -2623,6 +3838,15 @@ let
         sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
       };
     };
+    "ssh-key-to-pem-0.11.0" = {
+      name = "ssh-key-to-pem";
+      packageName = "ssh-key-to-pem";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
+        sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
+      };
+    };
     "sshpk-1.15.2" = {
       name = "sshpk";
       packageName = "sshpk";
@@ -2650,6 +3874,42 @@ let
         sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
       };
     };
+    "stream-combiner-0.0.4" = {
+      name = "stream-combiner";
+      packageName = "stream-combiner";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+      };
+    };
+    "streamline-0.10.17" = {
+      name = "streamline";
+      packageName = "streamline";
+      version = "0.10.17";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz";
+        sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af";
+      };
+    };
+    "streamline-0.4.11" = {
+      name = "streamline";
+      packageName = "streamline";
+      version = "0.4.11";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz";
+        sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
+      };
+    };
+    "streamline-streams-0.1.5" = {
+      name = "streamline-streams";
+      packageName = "streamline-streams";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz";
+        sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54";
+      };
+    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -2659,6 +3919,15 @@ let
         sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
     "string_decoder-1.1.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -2668,6 +3937,15 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
+    "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";
@@ -2704,6 +3982,15 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
+    "sync-request-3.0.0" = {
+      name = "sync-request";
+      packageName = "sync-request";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz";
+        sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c";
+      };
+    };
     "tar-2.2.1" = {
       name = "tar";
       packageName = "tar";
@@ -2731,6 +4018,33 @@ let
         sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
       };
     };
+    "then-request-2.2.0" = {
+      name = "then-request";
+      packageName = "then-request";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz";
+        sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
+      };
+    };
+    "through-2.3.4" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
+        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "to-fast-properties-1.0.3" = {
       name = "to-fast-properties";
       packageName = "to-fast-properties";
@@ -2794,6 +4108,33 @@ let
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
+    "tunnel-0.0.2" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
+        sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
+      };
+    };
+    "tunnel-0.0.5" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz";
+        sha512 = "gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==";
+      };
+    };
+    "tunnel-agent-0.4.3" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+      };
+    };
     "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -2812,6 +4153,15 @@ let
         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-js-3.4.9" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -2830,6 +4180,15 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
+    "underscore-1.4.4" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      };
+    };
     "underscore-1.6.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -2839,6 +4198,24 @@ let
         sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     };
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "http://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==";
+      };
+    };
     "union-value-1.0.0" = {
       name = "union-value";
       packageName = "union-value";
@@ -2893,6 +4270,15 @@ let
         sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
       };
     };
+    "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-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -2902,6 +4288,15 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
+    "utile-0.2.1" = {
+      name = "utile";
+      packageName = "utile";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
+        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
+      };
+    };
     "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -2920,6 +4315,24 @@ let
         sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==";
       };
     };
+    "validator-5.2.0" = {
+      name = "validator";
+      packageName = "validator";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
+        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
+      };
+    };
+    "validator-9.4.1" = {
+      name = "validator";
+      packageName = "validator";
+      version = "9.4.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
+      };
+    };
     "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
@@ -2938,6 +4351,15 @@ let
         sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==";
       };
     };
+    "wcwidth-1.0.1" = {
+      name = "wcwidth";
+      packageName = "wcwidth";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
+        sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
+      };
+    };
     "which-1.3.1" = {
       name = "which";
       packageName = "which";
@@ -2956,6 +4378,15 @@ let
         sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
+    "winston-0.8.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
+        sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
+      };
+    };
     "winston-1.1.2" = {
       name = "winston";
       packageName = "winston";
@@ -2965,6 +4396,24 @@ let
         sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
+    "winston-2.1.1" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
+        sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
+      };
+    };
+    "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";
@@ -2983,6 +4432,24 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "xml2js-0.1.14" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
+        sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
+      };
+    };
+    "xml2js-0.2.7" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz";
+        sha1 = "1838518bb01741cae0878bab4915e494c32306af";
+      };
+    };
     "xml2js-0.2.8" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -3001,6 +4468,24 @@ let
         sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
       };
     };
+    "xmlbuilder-0.4.3" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "http://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 = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
+        sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
+      };
+    };
     "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
@@ -3010,6 +4495,24 @@ let
         sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
+    "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==";
+      };
+    };
+    "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";
+      };
+    };
     "yallist-3.0.3" = {
       name = "yallist";
       packageName = "yallist";
@@ -3059,7 +4562,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.2.0"
-      sources."colors-1.3.2"
+      sources."colors-1.3.3"
       sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
@@ -3156,6 +4659,409 @@ in
     production = true;
     bypassCache = true;
   };
+  azure-cli = nodeEnv.buildNodePackage {
+    name = "azure-cli";
+    packageName = "azure-cli";
+    version = "0.10.20";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.20.tgz";
+      sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
+    };
+    dependencies = [
+      sources."@types/node-8.10.38"
+      sources."JSV-4.0.2"
+      sources."adal-node-0.1.28"
+      sources."ajv-6.6.1"
+      sources."amdefine-1.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."applicationinsights-0.16.0"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-0.2.0"
+      sources."async-1.4.2"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.8.0"
+      sources."azure-arm-authorization-2.0.0"
+      sources."azure-arm-batch-3.2.0"
+      sources."azure-arm-cdn-4.1.0"
+      sources."azure-arm-commerce-2.1.0"
+      sources."azure-arm-compute-3.0.0-preview"
+      (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"
+        ];
+      })
+      (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"
+        ];
+      })
+      sources."azure-arm-devtestlabs-2.1.1"
+      sources."azure-arm-dns-2.1.0"
+      sources."azure-arm-hdinsight-0.2.2"
+      sources."azure-arm-hdinsight-jobs-0.1.0"
+      sources."azure-arm-insights-0.11.3"
+      sources."azure-arm-iothub-1.0.1-preview"
+      sources."azure-arm-network-5.3.0"
+      (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"
+        ];
+      })
+      (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-7.2.1"
+      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-5.7.0"
+      sources."azure-asm-compute-0.18.0"
+      sources."azure-asm-hdinsight-0.10.2"
+      sources."azure-asm-mgmt-0.10.1"
+      sources."azure-asm-network-0.13.0"
+      sources."azure-asm-sb-0.10.1"
+      sources."azure-asm-sql-0.10.1"
+      sources."azure-asm-storage-0.12.0"
+      sources."azure-asm-subscription-0.10.1"
+      sources."azure-asm-trafficmanager-0.10.3"
+      (sources."azure-asm-website-0.10.7" // {
+        dependencies = [
+          sources."underscore-1.9.1"
+        ];
+      })
+      (sources."azure-batch-3.2.2" // {
+        dependencies = [
+          sources."underscore-1.9.1"
+        ];
+      })
+      (sources."azure-common-0.9.20" // {
+        dependencies = [
+          sources."validator-9.4.1"
+          sources."xml2js-0.2.7"
+        ];
+      })
+      sources."azure-gallery-2.0.0-pre.18"
+      sources."azure-graph-2.2.0"
+      sources."azure-keyvault-3.0.4"
+      (sources."azure-monitoring-0.10.6" // {
+        dependencies = [
+          sources."underscore-1.9.1"
+        ];
+      })
+      sources."azure-servicefabric-2.2.0"
+      (sources."azure-storage-2.10.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+          sources."underscore-1.8.3"
+          sources."validator-9.4.1"
+          sources."xml2js-0.2.8"
+          sources."xmlbuilder-9.0.7"
+        ];
+      })
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      (sources."bl-1.1.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."boom-2.10.1"
+      sources."brace-expansion-1.1.11"
+      sources."browserify-mime-1.2.9"
+      sources."buffer-equal-constant-time-1.0.1"
+      sources."buffer-from-1.1.1"
+      sources."caller-id-0.1.0"
+      sources."caseless-0.11.0"
+      sources."chalk-1.1.3"
+      sources."clone-1.0.4"
+      sources."colors-1.1.2"
+      sources."combined-stream-1.0.7"
+      sources."commander-1.0.4"
+      sources."concat-map-0.0.1"
+      (sources."concat-stream-1.6.2" // {
+        dependencies = [
+          sources."process-nextick-args-2.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."core-util-is-1.0.2"
+      sources."cryptiles-2.0.5"
+      sources."ctype-0.5.2"
+      sources."cycle-1.0.3"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."date-utils-1.2.21"
+      sources."dateformat-1.0.2-1.2.3"
+      sources."deep-equal-1.0.1"
+      sources."defaults-1.0.3"
+      sources."delayed-stream-1.0.0"
+      sources."duplexer-0.1.1"
+      sources."easy-table-1.1.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."ecdsa-sig-formatter-1.0.10"
+      sources."envconf-0.0.4"
+      sources."escape-string-regexp-1.0.5"
+      sources."event-stream-3.1.5"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-patch-0.5.6"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fibers-1.0.15"
+      sources."forever-agent-0.6.1"
+      (sources."form-data-1.0.1" // {
+        dependencies = [
+          sources."async-2.6.1"
+        ];
+      })
+      sources."from-0.1.7"
+      sources."fs.realpath-1.0.0"
+      sources."galaxy-0.1.12"
+      sources."generate-function-2.3.1"
+      sources."generate-object-property-1.2.0"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."github-0.1.6"
+      sources."glob-7.1.3"
+      sources."har-schema-2.0.0"
+      (sources."har-validator-2.0.6" // {
+        dependencies = [
+          sources."commander-2.19.0"
+        ];
+      })
+      sources."has-ansi-2.0.0"
+      sources."has-color-0.1.7"
+      sources."hash-base-3.0.4"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-basic-2.5.1"
+      sources."http-response-object-1.1.0"
+      sources."http-signature-1.1.1"
+      sources."i-0.3.6"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-buffer-1.1.6"
+      sources."is-my-ip-valid-1.0.0"
+      sources."is-my-json-valid-2.19.0"
+      sources."is-property-1.0.2"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."js2xmlparser-1.0.0"
+      sources."jsbn-0.1.1"
+      sources."json-edm-parser-0.1.2"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonlint-1.6.2"
+      sources."jsonminify-0.4.1"
+      sources."jsonparse-1.2.0"
+      sources."jsonpointer-4.0.1"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsrsasign-4.8.2"
+      sources."jwa-1.1.6"
+      sources."jws-3.1.5"
+      sources."jwt-decode-2.2.0"
+      sources."keypress-0.1.0"
+      (sources."kuduscript-1.0.16" // {
+        dependencies = [
+          sources."commander-1.1.1"
+          sources."streamline-0.4.11"
+        ];
+      })
+      sources."lodash-4.17.11"
+      sources."map-stream-0.1.0"
+      sources."md5.js-1.3.4"
+      sources."mime-db-1.37.0"
+      sources."mime-types-2.1.21"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      (sources."ms-rest-2.3.8" // {
+        dependencies = [
+          sources."through-2.3.8"
+          sources."tunnel-0.0.5"
+        ];
+      })
+      (sources."ms-rest-azure-2.5.9" // {
+        dependencies = [
+          sources."async-2.6.0"
+        ];
+      })
+      sources."mute-stream-0.0.7"
+      sources."ncp-0.4.2"
+      sources."node-forge-0.6.23"
+      sources."node-uuid-1.4.8"
+      (sources."nomnom-1.8.1" // {
+        dependencies = [
+          sources."ansi-styles-1.0.0"
+          sources."chalk-0.4.0"
+          sources."strip-ansi-0.1.1"
+          sources."underscore-1.6.0"
+        ];
+      })
+      sources."oauth-sign-0.8.2"
+      sources."omelette-0.3.2"
+      sources."once-1.4.0"
+      sources."openssl-wrapper-0.3.4"
+      sources."os-homedir-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."pause-stream-0.0.11"
+      sources."performance-now-2.1.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pkginfo-0.4.1"
+      sources."process-nextick-args-1.0.7"
+      sources."progress-1.1.8"
+      sources."promise-7.3.1"
+      (sources."prompt-0.2.14" // {
+        dependencies = [
+          sources."async-0.2.10"
+          sources."colors-0.6.2"
+          (sources."winston-0.8.3" // {
+            dependencies = [
+              sources."pkginfo-0.3.1"
+            ];
+          })
+        ];
+      })
+      sources."psl-1.1.29"
+      sources."punycode-1.4.1"
+      sources."qs-6.2.3"
+      sources."read-1.0.7"
+      (sources."readable-stream-1.0.34" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          sources."aws-sign2-0.7.0"
+          sources."caseless-0.12.0"
+          sources."form-data-2.3.3"
+          sources."har-validator-5.1.3"
+          sources."http-signature-1.2.0"
+          sources."oauth-sign-0.9.0"
+          sources."qs-6.5.2"
+          sources."tough-cookie-2.4.3"
+          sources."tunnel-agent-0.6.0"
+        ];
+      })
+      sources."revalidator-0.1.8"
+      sources."rimraf-2.6.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-0.5.2"
+      sources."sntp-1.0.9"
+      sources."source-map-0.1.43"
+      sources."split-0.2.10"
+      (sources."ssh-key-to-pem-0.11.0" // {
+        dependencies = [
+          sources."asn1-0.1.11"
+        ];
+      })
+      (sources."sshpk-1.15.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."stack-trace-0.0.10"
+      sources."stream-combiner-0.0.4"
+      sources."streamline-0.10.17"
+      sources."streamline-streams-0.1.5"
+      sources."string_decoder-0.10.31"
+      sources."stringstream-0.0.6"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."sync-request-3.0.0"
+      sources."then-request-2.2.0"
+      sources."through-2.3.4"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-0.0.2"
+      sources."tunnel-agent-0.4.3"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."underscore-1.4.4"
+      (sources."uri-js-4.2.2" // {
+        dependencies = [
+          sources."punycode-2.1.1"
+        ];
+      })
+      sources."user-home-2.0.0"
+      sources."util-deprecate-1.0.2"
+      (sources."utile-0.2.1" // {
+        dependencies = [
+          sources."async-0.2.10"
+        ];
+      })
+      sources."uuid-3.3.2"
+      sources."validator-5.2.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."wcwidth-1.0.1"
+      (sources."winston-2.1.1" // {
+        dependencies = [
+          sources."async-1.0.0"
+          sources."colors-1.0.3"
+          sources."pkginfo-0.3.1"
+        ];
+      })
+      sources."wordwrap-0.0.2"
+      sources."wrappy-1.0.2"
+      sources."xml2js-0.1.14"
+      sources."xmlbuilder-0.4.3"
+      sources."xmldom-0.1.27"
+      sources."xpath.js-1.1.0"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Microsoft Azure Cross Platform Command Line tool";
+      homepage = https://github.com/Azure/azure-xplat-cli;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
@@ -3634,7 +5540,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.5"
-      sources."minizlib-1.1.1"
+      sources."minizlib-1.2.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
@@ -3685,10 +5591,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.20.1";
+    version = "2.21.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
-      sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.21.1.tgz";
+      sha512 = "0UEIdUM8VqRHolaBPREYhTEuu/Zfi4qp3Kp0u6ioCtn7Yi33sGFdApEczb/SenmaqtnWD7OUIO74v8Aw9wnYeg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3e9663756..d85a1ddf9a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -638,7 +638,7 @@ in
 
   iamy = callPackage ../tools/admin/iamy { };
 
-  azure-cli = nodePackages.azure-cli;
+  azure-cli = nodePackages_8_x.azure-cli;
 
   azure-storage-azcopy = callPackage ../development/tools/azcopy { };
 

From cd075e50452a9214a3e7527c958ea0d81ca6bf64 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Fri, 7 Dec 2018 19:56:52 +0100
Subject: [PATCH 1625/2793] pro-office-calculator: init at 1.0.6

---
 pkgs/games/pro-office-calculator/default.nix | 30 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/games/pro-office-calculator/default.nix

diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
new file mode 100644
index 00000000000..f7eebea7563
--- /dev/null
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }:
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "pro-office-calculator-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "RobJinman";
+    repo   = "pro_office_calc";
+    rev    = "v${version}";
+    sha256 = "1irgch6cbc2f8il1zh8qf98m43h41hma80dxzz9c7xvbvl99lybd";
+  };
+
+  buildInputs = [ qtbase qtmultimedia tinyxml-2 ];
+
+  # This fixes a bug resulting in "illegal instruction"
+  patches = [(fetchpatch {
+    url = https://github.com/RobJinman/pro_office_calc/commit/806180d69d4af6b3183873f471c57bfdaf529560.patch;
+    sha256 = "1rcdjy233yf3kv4v18c82jyg08dykj2qspvg08n5b3bir870sbxz";
+  })];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Just an ordinary calculator. Nothing to see here...";
+    homepage = http://proofficecalculator.com/;
+    maintainers = [ maintainers.pmiddend ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebb6f6f7b4..a4ddfce10e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4446,6 +4446,8 @@ in
 
   pnmixer = callPackage ../tools/audio/pnmixer { };
 
+  pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
+
   pulsemixer = callPackage ../tools/audio/pulsemixer { };
 
   pwsafe = callPackage ../applications/misc/pwsafe { };

From 3946d83a3c5d6d93a83ca358372a107d4e8ccbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Dec 2018 13:19:00 +0100
Subject: [PATCH 1626/2793] nixos tests: disable kafka for now

They consistently fail since openjdk bump with some out-of-space errors.
That's not a problem by itself, but each test instance ties a build slot
for many hours and consequently they also delay channels as those wait
for all builds to finish.

Feel free to re-enable when fixed, of course.
---
 nixos/tests/all-tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index feffdb97c18..10781168ee4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -106,7 +106,7 @@ in
   installer = handleTest ./installer.nix {};
   ipv6 = handleTest ./ipv6.nix {};
   jenkins = handleTest ./jenkins.nix {};
-  kafka = handleTest ./kafka.nix {};
+  #kafka = handleTest ./kafka.nix {}; # broken since openjdk: 8u181 -> 8u192
   kernel-latest = handleTest ./kernel-latest.nix {};
   kernel-lts = handleTest ./kernel-lts.nix {};
   keymap = handleTest ./keymap.nix {};

From 93bf0a02f559e4fecd2bfe2ebc36c0873fab1f2e Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 7 Dec 2018 15:29:24 +0100
Subject: [PATCH 1627/2793] pythonPackages.tlslite: delete, migrate refs to
 pythonPackages.tlslite-ng

tlslite has a test failure on Python 3.7 [0]. @tomato42, a commiter of
tlslite and author of tlslite-ng said, that tlslite is abandoned (last
commit 2015) and tlslite-ng should be used as a drop in replacement.

[0] https://github.com/trevp/tlslite/issues/121
---
 .../misc/electron-cash/default.nix            |  2 +-
 pkgs/applications/misc/electrum/dash.nix      |  2 +-
 pkgs/applications/misc/electrum/default.nix   |  2 +-
 .../python-modules/tlslite/default.nix        | 21 -------------------
 pkgs/top-level/python-packages.nix            |  2 +-
 5 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tlslite/default.nix

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 8105f4d61bd..170690cdad3 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     pysocks
     qrcode
     requests
-    tlslite
+    tlslite-ng
 
     # plugins
     keepkey
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index c98efa547b3..98ed10b0c7c 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec {
     qrcode
     requests
     pyaes
-    tlslite
+    tlslite-ng
     x11_hash
     mnemonic
     jsonrpclib
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 843257a74e5..9adcea83773 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
     qdarkstyle
     qrcode
     requests
-    tlslite
+    tlslite-ng
     typing
 
     # plugins
diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix
deleted file mode 100644
index 75d622ef34f..00000000000
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "tlslite";
-  version = "0.4.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r";
-  };
-
-  meta = with stdenv.lib; {
-    description = "A pure Python implementation of SSL and TLS";
-    homepage = https://pypi.python.org/pypi/tlslite;
-    license = licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 557ef81d56a..0f3c25d17c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4291,7 +4291,7 @@ in {
     py = python.override{x11Support=true;};
   in callPackage ../development/python-modules/tkinter { py = py; };
 
-  tlslite = callPackage ../development/python-modules/tlslite { };
+  tlslite = throw "deprecated 2018-12-10; use pythonPackages.tlslite-ng instead";
 
   tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };
 

From 1de88c36cc99a20ccb78e1bfc9cef182475919e1 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Dec 2018 13:38:58 +0100
Subject: [PATCH 1628/2793] steam: ran update-runtime.py

---
 pkgs/games/steam/runtime-generated.nix | 240 ++++++++++++++++---------
 1 file changed, 156 insertions(+), 84 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index ac24f0c15a5..f5b79db1915 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -30,6 +30,15 @@
         name = "gcc-4.6-base.deb";
       };
     }
+    rec {
+      name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64";
+      sha256 = "0lgab6qkkx7xzrl349c3xqcajgby6v6l6xq0cn5bzbs2dhn3ggpb";
+      url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "gcc-5-base.deb";
+      };
+    }
     rec {
       name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64";
       sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly";
@@ -58,9 +67,9 @@
       };
     }
     rec {
-      name = "libacl1_2.2.51-5ubuntu1+srt7_amd64";
-      sha256 = "199r529wahl2947iwnwf4qazv6jqipsjaj2dqvplacmm197rsvdc";
-      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_amd64.deb";
+      name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64";
+      sha256 = "0pzm4hpi2rynds21764qhpz8mjbd504as6350qgz5i8rbd3h9gbw";
+      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libacl1.deb";
@@ -121,9 +130,9 @@
       };
     }
     rec {
-      name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64";
-      sha256 = "1d7xlyz5phsgka2psf6hwa393lgmlyjl3cd7a8dbzs9862h5f2v8";
-      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64.deb";
+      name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64";
+      sha256 = "1d19qccdzn82iqql513xgg0yb9w9frbq7v24v2i17140c0w0jhvn";
+      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libattr1.deb";
@@ -256,9 +265,9 @@
       };
     }
     rec {
-      name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64";
-      sha256 = "12ihcwb2qlkms5si1sz7an61ndhxqhd2dxrx9likm07bz2c9mq9b";
-      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64.deb";
+      name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64";
+      sha256 = "162s3pdgxhjfpg3jdxp4dp4qmn81da21g9hn5fb7karzkgw59mns";
+      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcups2.deb";
@@ -426,6 +435,15 @@
         name = "libglew1.10.deb";
       };
     }
+    rec {
+      name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64";
+      sha256 = "0vh45a8dp2mqmkswam2rssawg0l0karbymqks3f3gj591d0d6fcv";
+      url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libglew1.6.deb";
+      };
+    }
     rec {
       name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64";
       sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333";
@@ -697,9 +715,9 @@
       };
     }
     rec {
-      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64";
-      sha256 = "1pakk71qcjdp28v5cbfvrkbknhjhnbkk7ywr6czarmhldipsyifp";
-      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64.deb";
+      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64";
+      sha256 = "1nsjgna1m6nk9j23gfgmdmy90vkb0xk06p8z9gkbkjv5h1jn36hl";
+      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libldap-2.4-2.deb";
@@ -723,6 +741,15 @@
         name = "libmikmod2.deb";
       };
     }
+    rec {
+      name = "libmpg123-0_1.25.10-1+steamrt1+srt1_amd64";
+      sha256 = "1szlchrl7vmclk80jpjj799in0fnx5263dqlh896qprl63zjnnx3";
+      url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libmpg123-0.deb";
+      };
+    }
     rec {
       name = "libncurses5_5.9-4+srt5_amd64";
       sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp";
@@ -787,9 +814,9 @@
       };
     }
     rec {
-      name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64";
-      sha256 = "1r06qcfw2hmm1lxgvndzjw24nawxc2qd2qd3lh7w8qmj2zrgp3zd";
-      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64.deb";
+      name = "libogg0_1.3.2-1+srt1_amd64";
+      sha256 = "1x8nrq4gm3n996zqgdy8msbgpflpl2gaqsm68nbfv703gxbzfi5p";
+      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libogg0.deb";
@@ -804,6 +831,24 @@
         name = "libopenal1.deb";
       };
     }
+    rec {
+      name = "libopus0_1.3-0+steamrt1.1+srt2_amd64";
+      sha256 = "1hjff7lm9vjs3rkjmqwchnrli4bwpbx46jy4ngahiywcw3n94959";
+      url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libopus0.deb";
+      };
+    }
+    rec {
+      name = "libopusfile0_0.11-0+steamrt1.1+srt2_amd64";
+      sha256 = "1iv8w2g440l760gdi17mcq6hvk093f6v9m0v0svjzjc7l6147bmp";
+      url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libopusfile0.deb";
+      };
+    }
     rec {
       name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64";
       sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18";
@@ -958,27 +1003,27 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.8+steamrt1+srt1_amd64";
-      sha256 = "1wm48pdd9sxd581jhwi2b6a4ln16wbz72p74q8l8fypq6gmvifcc";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_amd64.deb";
+      name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64";
+      sha256 = "0iahnd0z5qpdgznq1w88m9b7ham3yr0rcidxm9459qpyan7ny2yc";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.3+steamrt1+srt1_amd64";
-      sha256 = "0nngj4lvk1r780wpghm9wcg9gmv0yswp56ff53h2jhn6k3gbcqsw";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_amd64.deb";
+      name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64";
+      sha256 = "1xy9l0jzrxr0vz0kgys2g055vdzw3hxkj1xmmzd57bn8dq0yxwfx";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.2+steamrt1+srt1_amd64";
-      sha256 = "0l2l0krldx0yhdqnmj6zfsx13c1zfr8hky48gbs94rlgwl02ym6w";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_amd64.deb";
+      name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64";
+      sha256 = "06i3g17rqm729mpgkl24rlbkx4ya4mmqjlsndsznymabk5ly5pz5";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-mixer.deb";
@@ -1210,27 +1255,27 @@
       };
     }
     rec {
-      name = "libvorbis0a_1.3.2-1ubuntu3+srt5_amd64";
-      sha256 = "0sn12vpmgk6jwa97cp6m8wx4197mdgh1ggb2r09hr3p5fyk44nmc";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_amd64.deb";
+      name = "libvorbis0a_1.3.5-4.2+srt1_amd64";
+      sha256 = "1dxl9k7x3vm9zagd03z73k6v86ybp94zilsdg29nsx86g77x87gz";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbis0a.deb";
       };
     }
     rec {
-      name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64";
-      sha256 = "18zd7njnczr93q7x2dz7x3n9yqwp77bjsp52qcxvy4bm7b3pr0bi";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64.deb";
+      name = "libvorbisenc2_1.3.5-4.2+srt1_amd64";
+      sha256 = "1b49vbmc7b7113h555s4lrx8j4x2kn90x8g25744z13fbq3ac6qz";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
-      name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64";
-      sha256 = "12ninaw71p59lazzvyd3yq3sy4g30x9ywwfm760nbiijb9yq48m4";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64.deb";
+      name = "libvorbisfile3_1.3.5-4.2+srt1_amd64";
+      sha256 = "1gws44n84b3rj5pmzc58b3bfmm38nrcij39krnx2x8d10627c3cv";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisfile3.deb";
@@ -1335,15 +1380,6 @@
         name = "libxcb-damage0.deb";
       };
     }
-    rec {
-      name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all";
-      sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb";
-      source = fetchurl {
-        inherit url sha256;
-        name = "libxcb-doc.deb";
-      };
-    }
     rec {
       name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
       sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k";
@@ -1769,6 +1805,15 @@
         name = "gcc-4.6-base.deb";
       };
     }
+    rec {
+      name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386";
+      sha256 = "0zp452nqq29d57fl98n7x2vfwjxp1ngjsyfw9nnnwjlpldv41sg6";
+      url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "gcc-5-base.deb";
+      };
+    }
     rec {
       name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386";
       sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76";
@@ -1797,9 +1842,9 @@
       };
     }
     rec {
-      name = "libacl1_2.2.51-5ubuntu1+srt7_i386";
-      sha256 = "0x6959ivq4v8x9yd38c7kfvds9g3h00znim03dm5rvl7xl2k0cxn";
-      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_i386.deb";
+      name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386";
+      sha256 = "1m39sq2zv88922z3h8q8ccwk9fspslzs2rk6g67j4vc30lln6x45";
+      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libacl1.deb";
@@ -1860,9 +1905,9 @@
       };
     }
     rec {
-      name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386";
-      sha256 = "1iyy60mpc6radds5rh9i6m8bmfa168y7dqbnz3jvgps5zndri363";
-      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386.deb";
+      name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386";
+      sha256 = "0crgd6ww9z1b69g9x1acxnlxaw3nyymq1fhjpxzs1x0vrlhj8wsg";
+      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libattr1.deb";
@@ -1995,9 +2040,9 @@
       };
     }
     rec {
-      name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386";
-      sha256 = "03x40p961apv96y59dabvp50s3jryccx2yqrw9i3dbflxvja5rbz";
-      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386.deb";
+      name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386";
+      sha256 = "0swb4ykw5yh35vdj0s64jhpii7srlkkiawr110zn7y4p8ymcf82w";
+      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcups2.deb";
@@ -2165,6 +2210,15 @@
         name = "libglew1.10.deb";
       };
     }
+    rec {
+      name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_i386";
+      sha256 = "1rpxqc5a0ys26ckzgsk7725wdvq2warcfyjabl1a4r1vikqj2nsz";
+      url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libglew1.6.deb";
+      };
+    }
     rec {
       name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386";
       sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607";
@@ -2436,9 +2490,9 @@
       };
     }
     rec {
-      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386";
-      sha256 = "1147dl2h2k2xhl6xlpnamg95rkmp4nq2k01fcrv09x442hmx34xf";
-      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386.deb";
+      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386";
+      sha256 = "194vaq6g03m32cfar7s7kzk5qxqlfzy0l49hgwg8igx40r7nscqw";
+      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libldap-2.4-2.deb";
@@ -2462,6 +2516,15 @@
         name = "libmikmod2.deb";
       };
     }
+    rec {
+      name = "libmpg123-0_1.25.10-1+steamrt1+srt1_i386";
+      sha256 = "0rk7z6ps3gy6jl4v0apz8sdbfpb6xbwf9fniqii559wkhrr2hfn5";
+      url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libmpg123-0.deb";
+      };
+    }
     rec {
       name = "libncurses5_5.9-4+srt5_i386";
       sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga";
@@ -2526,9 +2589,9 @@
       };
     }
     rec {
-      name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386";
-      sha256 = "0b47v6s9x8hvhkgvgmy01rxd81i1c8icb0lpf3mldp5ss1q8fwgj";
-      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386.deb";
+      name = "libogg0_1.3.2-1+srt1_i386";
+      sha256 = "09acap6ghv0rf6cavrnqbfphz69sqs1nqacv8flh8sqnxjbrryr1";
+      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libogg0.deb";
@@ -2543,6 +2606,24 @@
         name = "libopenal1.deb";
       };
     }
+    rec {
+      name = "libopus0_1.3-0+steamrt1.1+srt2_i386";
+      sha256 = "1s4n86hjka5cxkn4znm5jvic89rqsky05bs8nlbyv3a1z4sqh83c";
+      url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libopus0.deb";
+      };
+    }
+    rec {
+      name = "libopusfile0_0.11-0+steamrt1.1+srt2_i386";
+      sha256 = "0dbhzwgjr33xbqaq9015v9h7l6lga002vzrfcyna19ff92d2xg8m";
+      url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.1+srt2_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libopusfile0.deb";
+      };
+    }
     rec {
       name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386";
       sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v";
@@ -2697,27 +2778,27 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.8+steamrt1+srt1_i386";
-      sha256 = "0ldraz2giwfhgxbc5m0sf4m1xvp21hx5n9cgqj1civa9plhwyrk7";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_i386.deb";
+      name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386";
+      sha256 = "1y5qnxyrsvzqklhdvk6wihmfsxvfd6c93r8fw192zr3f5awvksg3";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.3+steamrt1+srt1_i386";
-      sha256 = "006kbbcrzv4bdgpz2w3s0z2q28h5n37ab3995d1zlrpaxmh03i37";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_i386.deb";
+      name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386";
+      sha256 = "1l3x865fm2jf1lzj2b5n0w24jykw3vsdqhj6xz5nzp49jksffwps";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.2+steamrt1+srt1_i386";
-      sha256 = "0m27snsrpcr1d7yd9kn8z0symw2fgivx8ndvjxif45w3h8qfkmv1";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_i386.deb";
+      name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386";
+      sha256 = "0d97ggcbssd07fdan6jzd8j7cp3v6apgysbwgaz5c6bn6g61kj9k";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-mixer.deb";
@@ -2949,27 +3030,27 @@
       };
     }
     rec {
-      name = "libvorbis0a_1.3.2-1ubuntu3+srt5_i386";
-      sha256 = "01hkk2wxqx5fj7qsi00h4al8ddvymhziyzdpzr025bd0ibhgqayg";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_i386.deb";
+      name = "libvorbis0a_1.3.5-4.2+srt1_i386";
+      sha256 = "1xx0w861k72k7ksjcizm2j54wiqyvf59r82hcsii96gpx5zc2my4";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbis0a.deb";
       };
     }
     rec {
-      name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_i386";
-      sha256 = "0v26kx6b98mj2glhmd6nsk2zqh3ra6jln1c9ksrq4abxda4qqril";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_i386.deb";
+      name = "libvorbisenc2_1.3.5-4.2+srt1_i386";
+      sha256 = "02zcqm71dnsxdbgcwcs5ay73y9mp0248pvd2ma8h7rb3waiigky1";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
-      name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_i386";
-      sha256 = "0l9d7z87fpa8zkfg96709hfpx6jr0zrd5pvjz193jaj5165kamkh";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_i386.deb";
+      name = "libvorbisfile3_1.3.5-4.2+srt1_i386";
+      sha256 = "0703pgi72lrm46nmzpcn723x5m88ki0drm546ng37whs99ca9cb4";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisfile3.deb";
@@ -3074,15 +3155,6 @@
         name = "libxcb-damage0.deb";
       };
     }
-    rec {
-      name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all";
-      sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb";
-      source = fetchurl {
-        inherit url sha256;
-        name = "libxcb-doc.deb";
-      };
-    }
     rec {
       name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386";
       sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86";

From aed869999310ed0d3412f514676602fb2717c0a2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Dec 2018 09:28:20 +0100
Subject: [PATCH 1629/2793] grub: add patch for XFS sparse inode feature

xfsprogs-4.16 introduced an new on disk format feature
that is not recognized properly by grub. This patch
allows grub to access XFS filesystem created with
xfsprogs >= 4.16.
This upstream patch can be removed for grub-2.03.
---
 pkgs/tools/misc/grub/2.0x.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 71d4abd9ca4..86287779792 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, python
+{ stdenv, fetchurl, fetchpatch, flex, bison, python
 , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
 , fuse # only needed for grub-mount
 , zfs ? null
@@ -82,7 +82,16 @@ stdenv.mkDerivation rec {
       unset CPP # setting CPP intereferes with dependency calculation
     '';
 
-  patches = [ ./fix-bash-completion.patch ];
+  patches = [
+    ./fix-bash-completion.patch
+    # This patch makes grub compatible with the XFS sparse inode
+    # feature introduced by xfsprogs-4.16.
+    # to be removed in grub-2.03
+    (fetchpatch {
+      url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff;
+      sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0";
+    })
+  ];
 
   configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
     ++ optional zfsSupport "--enable-libzfs"

From a1ef7fd87750dc9ff6b422b73633da0c65e653c6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Dec 2018 17:05:22 +0300
Subject: [PATCH 1630/2793] cernlib: restrict supported arches

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

diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index 36b385828bc..f01fab74635 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     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;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     maintainers = with stdenv.lib.maintainers; [ veprbl ];
     license = stdenv.lib.licenses.gpl2;
   };

From 25de143c84861f81ad5872aba382388a33d69796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 10 Dec 2018 15:45:24 +0100
Subject: [PATCH 1631/2793] seafile-shared: 6.2.8 -> 6.2.9

---
 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 a1f69564166..4f47485e2ef 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.8";
+  version = "6.2.9";
   name = "seafile-shared-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "1sgrsj60gy4pqxjz1rxn4nyzmc67x3kx16kd2vmwbzr44hasnp46";
+    sha256 = "03hdpajhpmdxf1fdpvz2j82smqcmhvpvx2dxyaprqjg8j7b4qbj9";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

From e1a837cfb5af94df189b1563639592735fedc9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 10 Dec 2018 15:46:27 +0100
Subject: [PATCH 1632/2793] seafile-client: 6.2.8 -> 6.2.9

---
 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 5ac50da649d..e91568b2193 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.8";
+  version = "6.2.9";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "1y57cw789cmssgl39kj94q259kba08v5i1yc1cmx7qxyigrpwyv6";
+    sha256 = "0h235kdr86lfh1z10admgn2ghnn04w9rlrzf2yhqqilw1k1giavj";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From ffd47d5b16d63191abc58761115561f7268264d3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 10 Dec 2018 15:50:36 +0100
Subject: [PATCH 1633/2793] Revert "linux: inside nix-shell, allow make
 menuconfig"

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 0ce6ed769a3..6adc3a33bb0 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,5 +1,4 @@
 { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
-, pkgconfig ? null, ncurses ? null
 , libelf
 , utillinux
 , writeTextFile
@@ -266,7 +265,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
       ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
       ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
       ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
-      ++ optionals stdenv.lib.inNixShell [ pkgconfig ncurses ]
       ;
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];

From 147f9a0f96345c4953d3beff04deede65a3aa599 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Dec 2018 09:53:38 -0500
Subject: [PATCH 1634/2793] oh-my-zsh: 2018-11-02 -> 2018-11-27

---
 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 552b9b6d7c1..32a1f8a3ea6 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-11-02";
+  version = "2018-11-27";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "05b617066ba5a37ef0c533385efd6e232a387b8f";
-    sha256 = "1pcb3ca5z3nywwnlhhjl4709k69lk4p0kd36l00q37j8p0vf6zr4";
+    rev = "2614b7ecdfe8b8f0cbeafffefb5925196f4011d4";
+    sha256 = "0yfk0x7xj640xn0klyggrncvmmm3b44ldfxfrr4mcixb1scfv5lb";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 97ad321e4268caf803f81492c6914daf3029d533 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Dec 2018 10:10:19 -0500
Subject: [PATCH 1635/2793] zsh-autosuggestions: Fix module for 0.5.0

The update for zsh-autosuggestions in #51752 broke the module.
This fix reflects the required changes.
---
 nixos/modules/programs/zsh/zsh-autosuggestions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
index 416f4c9c675..ded17f38a61 100644
--- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix
+++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
@@ -18,13 +18,13 @@ in
     };
 
     strategy = mkOption {
-      type = types.enum [ "default" "match_prev_cmd" ];
-      default = "default";
+      type = types.enum [ "history" "match_prev_cmd" ];
+      default = "history";
       description = ''
         Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
         There are currently two to choose from:
 
-          * default: Chooses the most recent match.
+          * history: Chooses the most recent match.
           * match_prev_cmd: Chooses the most recent match whose preceding history item matches
             the most recently executed command (more info). Note that this strategy won't work as
             expected with ZSH options that don't preserve the history order such as
@@ -51,7 +51,7 @@ in
       source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 
       export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
-      export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}"
+      export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
 
       ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
     '';

From 1edf950fa2b1b6f4dbc90ded03d8eeaf14889414 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Sat, 8 Dec 2018 12:24:26 +0100
Subject: [PATCH 1636/2793] geckodriver: unstable-2018-02-24 -> 0.22.0

Motivation: unstable-2018-02-24 (which reports to be
0.19.1, but probably doesn't correspond to any actual
geckodriver release) isn't compatible with the currently
shipped Firefox version 63.0

closes NixOS/nixpkgs#50380
---
 pkgs/development/tools/geckodriver/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 9bc760bf112..11976e29173 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -1,24 +1,26 @@
 { lib
 , fetchFromGitHub
 , rustPlatform
+, stdenv
+, darwin
 }:
 
 with rustPlatform; 
 
 buildRustPackage rec {
-  version = "unstable-2018-02-24";
+  version = "0.22.0";
   name = "geckodriver-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
-    repo = "gecko-dev";
-    rev = "ecb86060b4c5a9808798b81a57e79e821bb47082";
-    sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl";
+    repo = "geckodriver";
+    rev = "v${version}";
+    sha256 = "12m95lfqwdxs2m5kjh3yrpm9w2li5m8n3fw46a2nkxyfw6c94l4b";
   };
 
-  sourceRoot = "${src.name}/testing/geckodriver";
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8";
+  cargoSha256 = "1a8idl6falz0n9irh1p8hv5w2pmiknzsfnxl70k1psnznrpk2y8n";
 
   meta = with lib; {
     description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";

From e21a5e60353256b437d1d215dd9b8b5bb68c9775 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 3 Dec 2018 14:08:13 +0000
Subject: [PATCH 1637/2793] coqPackages_8_9.coq-ext-lib: init at 0.10.0

---
 pkgs/development/coq-modules/coq-ext-lib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 0e9c0b93ced..28a7c1ec1f6 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -6,6 +6,7 @@ let params =
     "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
     "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
     "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
+    "8.9" = { version = "0.10.0"; sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; };
   };
   param = params."${coq.coq-version}";
 in

From 655231a612cf550c0556f6fa6bd705c9daba7d6c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 3 Dec 2018 14:45:03 +0000
Subject: [PATCH 1638/2793] coqPackages.simple-io: init at 0.2

Purely functional IO for Coq.

homepage: https://github.com/Lysxia/coq-simple-io
---
 .../coq-modules/simple-io/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/coq-modules/simple-io/default.nix

diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
new file mode 100644
index 00000000000..b945e7c9a86
--- /dev/null
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+stdenv.mkDerivation rec {
+  version = "0.2";
+  name = "coq${coq.coq-version}-simple-io-${version}";
+  src = fetchFromGitHub {
+    owner = "Lysxia";
+    repo = "coq-simple-io";
+    rev = version;
+    sha256 = "1sbcf57gn134risiicpbxsf4kbzdq7klfn4vn8525kahlr82l65f";
+  };
+
+  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
+
+  doCheck = !stdenv.lib.versionAtLeast coq.coq-version "8.9";
+  checkTarget = "test";
+
+  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+  meta = {
+    description = "Purely functional IO for Coq";
+    inherit (src.meta) homepage;
+    inherit (coq.meta) platforms;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+  };
+
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 5a392b20cae..4c7361d3517 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -36,6 +36,7 @@ let
       multinomials = callPackage ../development/coq-modules/multinomials {};
       paco = callPackage ../development/coq-modules/paco {};
       QuickChick = callPackage ../development/coq-modules/QuickChick {};
+      simple-io = callPackage ../development/coq-modules/simple-io { };
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
       stdpp = callPackage ../development/coq-modules/stdpp { };
       StructTact = callPackage ../development/coq-modules/StructTact {};

From f2332809fd5a537e1e8e9aff28aee5748f975481 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 11 Dec 2018 02:04:10 +0900
Subject: [PATCH 1639/2793] nixos/nvidia: fix inverted assertion

---
 nixos/modules/hardware/video/nvidia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 21e12395498..efc65a55af7 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -101,7 +101,7 @@ in
   config = mkIf enabled {
     assertions = [
       {
-        assertion = config.services.xserver.displayManager.gdm.wayland;
+        assertion = !config.services.xserver.displayManager.gdm.wayland;
         message = "NVIDIA drivers don't support wayland";
       }
       {

From 475d653afdbd8fe3e00ccfd22a30014b0df7aeaa Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Dec 2018 12:56:32 -0500
Subject: [PATCH 1640/2793] sbt-extras: 2018-09-27 -> 2018-12-04

---
 .../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 5cb5bbacee9..deea53c9d38 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 = "1d8ee2c0a75374afa1cb687f450aeb095180882b";
-  version = "2018-09-27";
+  rev = "33b1a535656222810572d36d10afc5711515958e";
+  version = "2018-12-04";
 in
 stdenv.mkDerivation {
   name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "1a6k1lcpd9sknzyx6niq56z1b90mz7br7y13yk98w06r7fmfchw5";
+    sha256 = "0195b47a6agzs750il1lirm2rhlz55f59sb8mdi6573fnj6f23d3";
   };
 
   dontBuild = true;

From da24df963e14eec93c695eb55ec25796ba2ef4df Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Dec 2018 13:31:47 -0500
Subject: [PATCH 1641/2793] pythonPackages.pyjet: fix for python37

---
 pkgs/development/python-modules/pyjet/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix
index 69d20863a77..ca9492cb948 100644
--- a/pkgs/development/python-modules/pyjet/default.nix
+++ b/pkgs/development/python-modules/pyjet/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, nose, numpy }:
+{ lib, buildPythonPackage, fetchPypi, cython, nose, numpy }:
 
 buildPythonPackage rec {
   pname = "pyjet";
@@ -9,6 +9,15 @@ buildPythonPackage rec {
     sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg";
   };
 
+  # fix for python37
+  # https://github.com/scikit-hep/pyjet/issues/8
+  nativeBuildInputs = [ cython ];
+  preBuild = ''
+    for f in pyjet/src/*.{pyx,pxd}; do
+      cython --cplus "$f"
+    done
+  '';
+
   propagatedBuildInputs = [ numpy ];
   checkInputs = [ nose ];
 

From abcb25bd8df9bb53af359392ac7949533ddb85b4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 14:46:13 -0500
Subject: [PATCH 1642/2793] aerospike: Disables build on aarch64

The issue with its inclusion in the manual has been side-stepped by
matching on the platforms in supports.
---
 nixos/modules/services/databases/aerospike.nix | 1 +
 pkgs/servers/nosql/aerospike/default.nix       | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/aerospike.nix b/nixos/modules/services/databases/aerospike.nix
index 5f33164998b..4b905f90529 100644
--- a/nixos/modules/services/databases/aerospike.nix
+++ b/nixos/modules/services/databases/aerospike.nix
@@ -43,6 +43,7 @@ in
 
       package = mkOption {
         default = pkgs.aerospike;
+        defaultText = "pkgs.aerospike";
         type = types.package;
         description = "Which Aerospike derivation to use";
       };
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index 124daa4a5cc..c5290709b62 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
     description = "Flash-optimized, in-memory, NoSQL database";
     homepage = http://aerospike.com/;
     license = licenses.agpl3;
-    #platforms = [ "x86_64-linux" ];  # breaks eval of nixos manual for aarch64
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kalbasit ];
   };
 }

From bb27520fa809e36b9ee8eb4f7060a34ddb1f025e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 15:03:35 -0500
Subject: [PATCH 1643/2793] aften: Disables build on aarch64-linux

It looks like it would be a trivial fix with
`-Wno-shift-negative-value`, but in the end it fails with:

```
[100%] Linking C executable aften
libaften_static.a(a52enc.o): In function `aften_encode_init':
a52enc.c:(.text+0x303c): undefined reference to `apply_simd_restrictions'
collect2: error: ld returned 1 exit status
```

So it looks like it's not simply a warning issue.
---
 pkgs/development/libraries/aften/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index fb16c71fd19..22e91ee61d7 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
 		description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
 		homepage = "http://aften.sourceforge.net/";
 		license = stdenv.lib.licenses.lgpl2;
-		platforms = stdenv.lib.platforms.unix;
+		platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
 	};
 }

From 45db900c3c710aa99e71decd2dd12d4c818b536c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 16:29:01 -0500
Subject: [PATCH 1644/2793] ams-lv2: Disables on aarch64-linux

---
 pkgs/applications/audio/ams-lv2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index 3475f62dcbb..7383623a5ff 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation  rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
+    # Build uses `-msse` and `-mfpmath=sse`
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 01e78db6b12a33767c577d150c21f2696cbc007b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 16:39:52 -0500
Subject: [PATCH 1645/2793] angelscript_2_22: Disables build on aarch64-linux.

---
 pkgs/development/interpreters/angelscript/2.22.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
index c9097bec5dc..0449572da02 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.zlib ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
+    badPlatforms = [ "aarch64-linux" ];
     downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
     homepage="http://www.angelcode.com/angelscript/";
   };

From 8a115d5de501261c7b8aedc679f15b111487dec6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 17:04:38 -0500
Subject: [PATCH 1646/2793] gsl_1: Disables build on aarch64-linux

 * https://hydra.nixos.org/build/84910540

```
Making check in eigen
make[1]: Entering directory '/build/gsl-1.16/eigen'
make  test
make[2]: Entering directory '/build/gsl-1.16/eigen'
gcc -DHAVE_CONFIG_H -I. -I.. -I..    -g -O2 -c test.c
/nix/store/bsb6596kk4fp20hyl9yl55xwv1ax4b6s-bash-4.4-p23/bin/bash ../libtool  --tag=CC   --mode=link gcc  -g -O2   -o test test.o libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -lm
libtool: link: gcc -g -O2 -o .libs/test test.o  ./.libs/libgsleigen.a ../test/.libs/libgsltest.a ../linalg/.libs/libgsllinalg.a ../permutation/.libs/libgslpermutation.a ../blas/.libs/libgslblas.a ../cblas/.libs/libgslcblas.so ../matrix/.libs/libgslmatrix.a ../vector/.libs/libgslvector.a ../block/.libs/libgslblock.a ../complex/.libs/libgslcomplex.a ../ieee-utils/.libs/libgslieeeutils.a ../sys/.libs/libgslsys.a ../err/.libs/libgslerr.a ../utils/.libs/libutils.a ../rng/.libs/libgslrng.a ../sort/.libs/libgslsort.a -lm -Wl,-rpath -Wl,/nix/store/rz7sjaxwm3qf6nk9kk90v1qf81y1s62v-gsl-1.16/lib
make[2]: Leaving directory '/build/gsl-1.16/eigen'
make  check-TESTS
make[2]: Entering directory '/build/gsl-1.16/eigen'
make[3]: Entering directory '/build/gsl-1.16/eigen'
FAIL: test
make[4]: Entering directory '/build/gsl-1.16/eigen'
make[4]: Nothing to be done for 'all'.
make[4]: Leaving directory '/build/gsl-1.16/eigen'
====================================
   gsl 1.16: eigen/test-suite.log
====================================

.. contents:: :depth: 2

FAIL: test
==========

FAIL: herm random, normalized(1), unsorted (0.999999999999999112 observed vs 1 expected) [117761]
FAIL: herm random, normalized(2), val/asc (0.999999999999999112 observed vs 1 expected) [117789]
FAIL: herm random, normalized(0), val/desc (0.999999999999999112 observed vs 1 expected) [117811]
FAIL: herm random, normalized(1), abs/asc (0.999999999999999112 observed vs 1 expected) [117836]
FAIL: herm random, normalized(1), abs/desc (0.999999999999999112 observed vs 1 expected) [117860]

```
---
 pkgs/development/libraries/gsl/gsl-1_16.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix
index f569d9c3ea1..69fe1b0db55 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -36,5 +36,7 @@ stdenv.mkDerivation rec {
       extensive test suite.
     '';
     platforms = stdenv.lib.platforms.unix;
+    # Failing "eigen" tests on aarch64.
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From fa4a6171da7e984bce3510054c2e4044cdd0c660 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 17:07:59 -0500
Subject: [PATCH 1647/2793] artyFX: Disables build on aarch64-linux

---
 pkgs/applications/audio/artyFX/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 9a9095d2fc1..91a0a1f140c 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
+    # Build uses `-msse` and `-mfpmath=sse`
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 516f4366144ad89b505ec8a01f8e2c7e0b51dc45 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 17:32:05 -0500
Subject: [PATCH 1648/2793] glucose: Disable build on aarch64-linux

---
 pkgs/applications/science/logic/glucose/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index a0035f96539..bc8d372ce42 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gebner ];
+    # Build uses _FPU_EXTENDED macro
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 7aabdea1ca24f509a88de4558f4b068cebead3f4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 17:32:14 -0500
Subject: [PATCH 1649/2793] aspino: Disable build on aarch64-linux

This is due to glucose not building.
---
 pkgs/applications/science/logic/aspino/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index d7a5e7b4c83..bf8d3cf03b8 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     license = licenses.asl20;
     homepage = http://alviano.net/software/maxino/;
+    # See pkgs/applications/science/logic/glucose/default.nix
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 5e1dfd30253f7cd05607fad66691f9caae792d95 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 18:03:07 -0500
Subject: [PATCH 1650/2793] avy: Disable build on aarch64-linux

---
 pkgs/applications/science/logic/avy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 218006e15d5..6c2d2f0a062 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -46,5 +46,8 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
     platforms   = stdenv.lib.platforms.linux;
+    # See pkgs/applications/science/logic/glucose/default.nix
+    # (The error is different due to glucose-fenv.patch, but the same)
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 448302d8e99a05560c2f1ca4857a1dddb8a2d00d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 18:43:46 -0500
Subject: [PATCH 1651/2793] b2sum: Disable for aarch64-linux

---
 pkgs/tools/security/b2sum/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 1679b7fddd0..f9d2855e739 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://blake2.net";
     license = with licenses; [ asl20 cc0 openssl ];
     maintainers = with maintainers; [ kirelagin ];
-    platforms = platforms.all;
+    # "This code requires at least SSE2."
+    platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
   };
 }

From 12fabbdb1be3861184f3f8590e3b9adafaf3b650 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 18:47:36 -0500
Subject: [PATCH 1652/2793] beignet: Disables on aarch64-linux

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

diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 02c67d7dbf8..ba6fc7cb541 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -107,5 +107,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ artuuge zimbatm ];
     platforms = platforms.linux;
+    # Requires libdrm_intel
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 38d6719cbc63db6b9346037d282748cc82be672b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 21:14:12 -0500
Subject: [PATCH 1653/2793] blastem: Disables build for aarch64-linux.

---
 pkgs/misc/emulators/blastem/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index afc555cb51e..666f953f6b5 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
+    # Makefile:140: *** aarch64 is not a supported architecture.  Stop.
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 3487ff99dacc40d8c9be3563078ab3b2cd296459 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 21:19:27 -0500
Subject: [PATCH 1654/2793] boost: Fixes disabling for aarch64-linux for <1.59

Between 2b450377bf6e51cce0d831a88e74d5f61811b74d and the current
revision, the semantics behind "platforms" changed, and removing the
"aarch64-linux" string doesn't work anymore to filter it out.

Instead, blacklist the platform using the (comparatively) new
badPlatforms.
---
 pkgs/development/libraries/boost/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index c79b874ecb6..3e488acee74 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -111,7 +111,8 @@ stdenv.mkDerivation {
     description = "Collection of C++ libraries";
     license = stdenv.lib.licenses.boost;
 
-    platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows);
+    platforms = (platforms.unix ++ platforms.windows);
+    badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux";
     maintainers = with maintainers; [ peti wkennington ];
   };
 

From 50189315f2a89011f7a5dedf54da6a57c5ac2eb0 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 21:22:10 -0500
Subject: [PATCH 1655/2793] bootil: Disable build on aarch64-linux

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

diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index 0ed223832b6..3c27281571a 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.free;
     maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
     platforms = stdenv.lib.platforms.all;
+    # Build uses `-msse` and `-mfpmath=sse`
+    badPlatforms = [ "aarch64-linux" ];
   };
 
   src = fetchFromGitHub {

From e86b1b9f56d69d692448dff25719b79ac1612362 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 21:28:30 -0500
Subject: [PATCH 1656/2793] bud: Disable build on aarch64-linux

Furthermore, this package needs to either be dropped or updated. The
version packaged is old, and the project has been abandoned by upstream.
---
 pkgs/tools/networking/bud/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index c0383b7c822..386642614bc 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     description = "A TLS terminating proxy";
     license     = licenses.mit;
     platforms   = platforms.linux;
+    # Does not build on aarch64-linux.
+    badPlatforms = [ "aarch64-linux" ];
     maintainers = with maintainers; [ cstrahan ];
   };
 }

From ea20a6898cddf9a3dcb8d0e192ac730b663ddd1f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 22:36:38 -0500
Subject: [PATCH 1657/2793] cde: Disable build on aarch64-linux

---
 pkgs/tools/package-management/cde/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index 17150c75466..e45906688ad 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -33,5 +33,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.rlupton20 ];
     platforms = platforms.linux;
+    # error: architecture aarch64 is not supported by strace
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 71fe654d5fc5d2ca093f68661d1aeb3892507eac Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 22:48:36 -0500
Subject: [PATCH 1658/2793] chez: Disable on aarch64-linux

There is no "arm64" machine, and using "arm32le" does not work.
---
 pkgs/development/compilers/chez/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 09d68084e77..5b02aed274f 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
     homepage    = https://cisco.github.io/ChezScheme/;
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.unix;
+    badPlatforms = [ "aarch64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
   };
 }

From 167076877e0c7be52fceca87f9d1c3d1b37c81da Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 18:25:16 -0500
Subject: [PATCH 1659/2793] openbabel: Fixes AArch64 build

https://github.com/openbabel/openbabel/issues/1689
---
 pkgs/development/libraries/openbabel/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index bfbf6f1212f..81754ffad4d 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
+{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "openbabel-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
   };
 
+  patches = [
+    # ARM / AArch64 fixes.
+    (fetchpatch {
+      url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch;
+      sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
+    })
+  ];
+
   # TODO : perl & python bindings;
   # TODO : wxGTK: I have no time to compile
   # TODO : separate lib and apps

From 828547556e39191eb1d8b3cb60e0cd03fd56329e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 10 Dec 2018 16:19:05 -0500
Subject: [PATCH 1660/2793] botocore: 1.12.48 -> 1.12.62 boto3: 1.9.36 ->
 1.9.62 awscli: 1.16.72

I update all three of these at a time because they rely on each other
and get annoyed when such changes are non-atomic. Also added a note to
the packages telling people that this is needed. I tested awscli and the
libraries against a real account.
---
 pkgs/development/python-modules/boto3/default.nix    |  4 ++--
 pkgs/development/python-modules/botocore/default.nix |  4 ++--
 pkgs/tools/admin/awscli/default.nix                  | 10 ++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index db505d84eea..0d78b3463cc 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.9.36";
+  version = "1.9.62"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a9f3809b480803c1b1f28a19c554f1e1ceafd8db994a4236a0843b999ee6c56";
+    sha256 = "0rf3ik4bqr0qab2648rcaahycr2sih257ngz8brizyfln0lk1sg9";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e67256b0853..699357437b9 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.12.48";
+  version = "1.12.62"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7140e51ab0a7aa3b7fa9cf5fefa663e0cd097098fcbd51b12ff8884c8d967754";
+    sha256 = "0zgq3cldrh1x65s3vy1mhp1h5nnsdxw7ig1v0di7p8yns3iazsv7";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 052f4abb8af..ee17922cb78 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.16.60";
+  version = "1.16.72"; # N.B: if you change this, change botocore to a matching version too
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "25bcc6cf2304356a78429671999857ff33f88761d81bcee63463a86a6780dcdc";
+    sha256 = "1ld4a6yxnh0v96fjjp8wjf7zvx41grl57mqg92p6zbfssr2jbqfv";
   };
 
   # No tests included
@@ -42,12 +42,6 @@ in py.pkgs.buildPythonApplication rec {
     less
   ];
 
-  postPatch = ''
-    for i in {py,cfg}; do
-      substituteInPlace setup.$i --replace "botocore==1.12.50" "botocore>=1.11,<1.13"
-    done
-  '';
-
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
     echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli

From bc51418f1add4ba47a87c9b3fd698676577a8384 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 9 Dec 2018 01:45:10 +0200
Subject: [PATCH 1661/2793] neovim-pygui: remove

---
 pkgs/applications/editors/neovim/wrapper.nix  |  7 +---
 .../python-modules/neovim_gui/default.nix     | 35 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/development/python-modules/neovim_gui/default.nix

diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 5e57fe4d141..3dd3710da77 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -16,7 +16,6 @@ let
     , withPython3 ? true,  extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */
     , withNodeJs? false
     , withRuby ? true
-    , withPyGUI ? false
     , vimAlias ? false
     , viAlias ? false
     , configure ? {}
@@ -43,7 +42,7 @@ let
 
   pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins;
   pythonEnv = pythonPackages.python.withPackages(ps:
-        (if withPyGUI then [ ps.neovim_gui ] else [ ps.pynvim ])
+        [ ps.pynvim ]
         ++ (extraPythonPackagesFun ps)
         ++ (concatMap (f: f ps) pluginPythonPackages));
 
@@ -88,10 +87,6 @@ let
         makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
     '' + optionalString withRuby ''
       ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
-    ''
-      + optionalString withPyGUI ''
-      makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \
-        --prefix PATH : "$out/bin"
     '' + optionalString vimAlias ''
       ln -s $out/bin/nvim $out/bin/vim
     '' + optionalString viAlias ''
diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix
deleted file mode 100644
index e6d36a37089..00000000000
--- a/pkgs/development/python-modules/neovim_gui/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, neovim
-, click
-, pygobject3
-, isPy27
-, pkgs
-}:
-
-buildPythonPackage rec {
-  pname = "neovim-pygui";
-  version = "0.1.3";
-  disabled = !isPy27;
-
-  src = fetchFromGitHub {
-    owner = "neovim";
-    repo = "python-gui";
-    rev = version;
-    sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
-  };
-
-  propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ];
-
-  patchPhase = ''
-    sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/pynvim \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH"
-  '';
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36113b642d..8a8122792f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19622,8 +19622,6 @@ in
 
   neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
 
-  neovim-pygui = pythonPackages.neovim_gui;
-
   neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
 
   vis = callPackage ../applications/editors/vis {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71c33965cd7..8e19f6ec6a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4629,8 +4629,6 @@ in {
 
   pynvim = callPackage ../development/python-modules/pynvim {};
 
-  neovim_gui = callPackage ../development/python-modules/neovim_gui { };
-
   typogrify = callPackage ../development/python-modules/typogrify { };
 
   smartypants = callPackage ../development/python-modules/smartypants { };

From f4ea6fd287ae124554290e12036327c51e36432f Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Mon, 10 Dec 2018 22:41:22 +0100
Subject: [PATCH 1662/2793] epsxe: add libGLU_combined to buildInputs

This fixes #51845.
---
 pkgs/misc/emulators/epsxe/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index 5de8ac46b90..5fee8b4b83d 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3,
+{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3, libGLU_combined,
   libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
 
 with stdenv.lib;
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     libX11
+    libGLU_combined
     openssl
     ncurses5
     SDL

From 7726c8b0ed73d5a22fb5f1d0408175888f71e566 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Dec 2018 17:28:08 -0500
Subject: [PATCH 1663/2793] yoda: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 664d1fa601e..6e4ffb9745d 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb";
+    sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
   };
 
   pythonPath = []; # python wrapper support

From 99d4e656c57a25709cae11d62fa7f2b605dd9a9f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Dec 2018 17:28:30 -0500
Subject: [PATCH 1664/2793] rivet: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 639da1687a7..30f8ad8e8a3 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474";
+    sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx";
   };
 
   patches = [
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
 
   preConfigure = ''
-    substituteInPlace Makefile.in \
-      --replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test"
     substituteInPlace analyses/Makefile.in \
       --replace "!(tmp)" ""
     substituteInPlace bin/rivet-buildplugin.in \

From 189fbae95b4f328287777e6e752a20f67f6d3eef Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 10 Dec 2018 16:43:24 -0600
Subject: [PATCH 1665/2793] ldns: relax platform requirements

Seems to have built OK on darwin. I only needed it to build freeswitch
though, so not sure how to test functionality. I successfully ran the
`drill` command.
---
 pkgs/development/libraries/ldns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index c4120e5bb0e..468ab90edb5 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     description = "Library with the aim of simplifying DNS programming in C";
     license = licenses.bsd3;
     homepage = http://www.nlnetlabs.nl/projects/ldns/;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ jgeerds ];
   };
 }

From 1c3079fce3cc98722b6aa0599abbdc2740a086a7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 10 Dec 2018 17:48:56 -0500
Subject: [PATCH 1666/2793] dbeaver: 5.2.5 -> 5.3.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 03d34558413..e90fccefb06 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.5";
+  version = "5.3.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 = "0xjggjq2brhi9x3i4d7hqfi18cd8czs6rzvihvspfxaqilsai0dm";
+    sha256 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m";
   };
 
   installPhase = ''

From 5234948642f5a257a44fe6a5f1f11e3e0e5e71f8 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 10 Dec 2018 16:49:26 -0600
Subject: [PATCH 1667/2793] freeswitch: build on darwin

- relax platform requirement
- include required apple framework
---
 pkgs/servers/sip/freeswitch/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix         | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 32acba433b1..ab4147230a9 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,6 +1,9 @@
 { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
 , openssl, perl, sqlite, libjpeg, speex, pcre
-, ldns, libedit, yasm, which, lua, libopus, libsndfile }:
+, ldns, libedit, yasm, which, lua, libopus, libsndfile
+
+, SystemConfiguration
+}:
 
 stdenv.mkDerivation rec {
   name = "freeswitch-1.6.20";
@@ -20,7 +23,7 @@ stdenv.mkDerivation rec {
     openssl ncurses curl gnutls readline perl libjpeg
     sqlite pcre speex ldns libedit yasm which lua libopus
     libsndfile
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
@@ -31,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = https://freeswitch.org/;
     license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d85a1ddf9a1..a157a53dc6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13435,6 +13435,7 @@ in
 
   freeswitch = callPackage ../servers/sip/freeswitch {
     openssl = openssl_1_0_2;
+    inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
   fusionInventory = callPackage ../servers/monitoring/fusion-inventory { };

From 7641a13447d077a8195e3f10404f8608d9c276c7 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Mon, 10 Dec 2018 16:58:23 +0100
Subject: [PATCH 1668/2793] railcar: init at 1.0.4

Co-authored-by: Alyssa Ross <hi@alyssa.is>
---
 .../virtualization/railcar/cargo-lock.patch   | 435 ++++++++++++++++++
 .../virtualization/railcar/default.nix        |  26 ++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 463 insertions(+)
 create mode 100644 pkgs/applications/virtualization/railcar/cargo-lock.patch
 create mode 100644 pkgs/applications/virtualization/railcar/default.nix

diff --git a/pkgs/applications/virtualization/railcar/cargo-lock.patch b/pkgs/applications/virtualization/railcar/cargo-lock.patch
new file mode 100644
index 00000000000..bb9d5420f32
--- /dev/null
+++ b/pkgs/applications/virtualization/railcar/cargo-lock.patch
@@ -0,0 +1,435 @@
+From 97e1e2ca82c20317a6de1f345d2fb0adcde0b7fd Mon Sep 17 00:00:00 2001
+From: Katharina Fey <kookie@spacekookie.de>
+Date: Mon, 10 Dec 2018 17:42:58 +0100
+Subject: [PATCH] Adding `Cargo.lock` for release `v1.0.4`
+
+---
+ Cargo.lock | 416 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 416 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..bf6aa0e
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,416 @@
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atty"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bitflags"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "caps"
++version = "0.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "clap"
++version = "2.32.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "custom_derive"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "dtoa"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "enum_derive"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "error-chain"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "error-chain"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "lazy_static"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.45"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "log"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nix"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nix"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "oci"
++version = "0.1.0"
++dependencies = [
++ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "prctl"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "railcar"
++version = "1.0.4"
++dependencies = [
++ "caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "oci 0.1.0",
++ "prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "redox_termios"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scopeguard"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "seccomp-sys"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde"
++version = "0.9.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde_codegen_internals"
++version = "0.14.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "0.9.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "0.9.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "strsim"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "0.11.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synom"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termion"
++version = "1.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "void"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
++"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
++"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
++"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
++"checksum caps 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c238ba41e8d1d354c8576228110585046ae379efd7af972932993d5c1d41c7d"
++"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
++"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
++"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
++"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
++"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
++"checksum enum_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "406ac2a8c9eedf8af9ee1489bee9e50029278a6456c740f7454cf8a158abc816"
++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
++"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
++"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
++"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
++"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
++"checksum nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f"
++"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
++"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
++"checksum prctl 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
++"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"
++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
++"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
++"checksum seccomp-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d4082b110d25cf281ddbf78dc56e1a65c929fd72ac6c2deb1a4c20a23999dfa"
++"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
++"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
++"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
++"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
++"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
++"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
++"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
++"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+-- 
+2.17.2
+
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
new file mode 100644
index 00000000000..57881a20251
--- /dev/null
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, rustPlatform, libseccomp }:
+
+rustPlatform.buildRustPackage rec {
+  name = "railcar-${version}";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "oracle";
+    repo = "railcar";
+    rev = "v${version}";
+    sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
+  };
+  
+  cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan";
+
+  buildInputs = [ libseccomp ];
+  cargoPatches = [ ./cargo-lock.patch ];
+
+  meta = with lib; {
+    description = "Rust implementation of the Open Containers Initiative oci-runtime";
+    homepage = https://github.com/oracle/railcar;
+    license = with licenses; [ asl20 /* or */ upl ];
+    maintainers = [ maintainers.spacekookie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d85a1ddf9a1..d1eb3004575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18875,6 +18875,8 @@ in
     wxGTK = wxGTK30;
   };
 
+  railcar = callPackage ../applications/virtualization/railcar {};
+
   rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
   rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };

From a9c43dd9ef088e71b9074a81fca179ba370c63cc Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 11 Dec 2018 06:06:23 +0000
Subject: [PATCH 1669/2793] jdk11_headless: fix the build on amd64

This fixes:

checking user specified JVM feature list...
configure: error: Cannot continue
configure: Unknown JVM features specified: "zgc--enable-headless-only"
configure: The available JVM features are: "aot cds cmsgc compiler1 compiler2 dtrace epsilongc g1gc graal jfr jni-check jvmci jvmti link-time-opt management minimal nmt parallelgc serialgc services static-build vm-structs zero zgc"
configure exiting with result code 1
builder for '/nix/store/1awwzd98crcgxad3srdkv8smhxgiz2qp-openjdk-11.0.1-b13.drv' failed with exit code 1
---
 pkgs/development/compilers/openjdk/11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index af383b2f05e..42208ecf8d9 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -67,8 +67,8 @@ let
         # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
         "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
     ''
-    + lib.optionalString (architecture == "amd64") "\"--with-jvm-features=zgc\""
-    + lib.optionalString minimal "\"--enable-headless-only\""
+    + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
+    + lib.optionalString minimal " \"--enable-headless-only\""
     + ");"
     # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
     # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716

From e9b43adab722bce20978f0d83099b5da0baf2162 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Nov 2018 06:49:27 +0000
Subject: [PATCH 1670/2793] ocamlPackages.optint: init at 0.0.2

This library provide one module Optint which internally uses an int if
you are in a x64 architecture or an int32 (boxed value) if you are in a
x86 architecture.

Homepage: https://github.com/mirage/optint
---
 .../ocaml-modules/optint/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/optint/default.nix

diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix
new file mode 100644
index 00000000000..613973200d2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/optint/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, ocaml, findlib, dune }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "optint is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.0.2";
+  name = "ocaml${ocaml.version}-optint-${version}";
+  src = fetchurl {
+    url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz";
+    sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1";
+  };
+
+  buildInputs = [ ocaml findlib dune ];
+
+  buildPhase = "dune build";
+
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = "https://github.com/mirage/optint";
+    description = "Abstract type of integer between x64 and x86 architecture";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 197051f3c2e..f2c0f16302e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -557,6 +557,8 @@ let
 
     opti = callPackage ../development/ocaml-modules/opti { };
 
+    optint = callPackage ../development/ocaml-modules/optint { };
+
     otfm = callPackage ../development/ocaml-modules/otfm { };
 
     otr = callPackage ../development/ocaml-modules/otr { };

From 1a04bd44145dda65720ea95c0471d5aa911caf11 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Nov 2018 06:49:33 +0000
Subject: [PATCH 1671/2793] ocamlPackages.checkseum: init at 0.0.3

Chekseum is an OCaml library which implements ADLER-32 and CRC32C Cyclic
Redundancy Check. It provides 2 implementation, the first in C and the
second in OCaml.

Homepage: https://github.com/mirage/checkseum
---
 .../ocaml-modules/checkseum/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/checkseum/default.nix

diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix
new file mode 100644
index 00000000000..0e348dd65c3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/checkseum/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, ocaml, findlib, dune, alcotest, cmdliner, fmt, optint, rresult }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "checkseum is not available for OCaml ${ocaml.version}"
+else
+
+# The C implementation is not portable: x86 only
+let hasC = stdenv.isi686 || stdenv.isx86_64; in
+
+stdenv.mkDerivation rec {
+  version = "0.0.3";
+  name = "ocaml${ocaml.version}-checkseum-${version}";
+  src = fetchurl {
+    url = "https://github.com/mirage/checkseum/releases/download/v0.0.3/checkseum-v0.0.3.tbz";
+    sha256 = "12j45zsvil1ynwx1x8fbddhqacc8r1zf7f6h576y3f3yvbg7l1fm";
+  };
+
+  postPatch = stdenv.lib.optionalString (!hasC) ''
+    rm -r bin src-c
+  '';
+
+  buildInputs = [ ocaml findlib dune alcotest cmdliner fmt rresult ];
+  propagatedBuildInputs = [ optint ];
+
+  buildPhase = "dune build";
+
+  doCheck = hasC;
+  checkPhase = "dune runtest";
+
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = "https://github.com/mirage/checkseum";
+    description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f2c0f16302e..e03cb8e8b3b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -138,6 +138,8 @@ let
 
     cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
 
+    checkseum = callPackage ../development/ocaml-modules/checkseum { };
+
     cil = callPackage ../development/ocaml-modules/cil { };
 
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };

From 796d270f531d9a3e17a2d2a6aae9d00d6505af15 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 10 Dec 2018 14:03:58 +0800
Subject: [PATCH 1672/2793] platformio: 3.6.1 -> 3.6.2

Broken on aarch64.
---
 pkgs/development/arduino/platformio/core.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 5489adc5399..bf0dd5229c6 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -44,14 +44,14 @@ let
 
 in buildPythonApplication rec {
   pname = "platformio";
-  version = "3.6.1";
+  version = "3.6.2";
 
-  # pypi tarball doesn't contain tests
+  # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
   src = fetchFromGitHub {
     owner = "platformio";
     repo = "platformio-core";
     rev = "v${version}";
-    sha256 = "01xz9figqrzb0m9467q14lg51vmgq0hbaap0xdx08n5v2ycmzj0v";
+    sha256 = "1558adr73d7mgp0z92q9vzbgarddimadyk4467z8i3yp4g8k5irk";
   };
 
   propagatedBuildInputs =  [

From 7cadf5f76c802eb585a98539a7e9727f4d21662f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 11 Dec 2018 09:49:30 +0100
Subject: [PATCH 1673/2793] libcouchbase: tests can't run in parallel

70e2b0bef065b1b turned on parallel checking for cmake
by default. This doesn't work for libcouchebase.
---
 pkgs/development/libraries/libcouchbase/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 2db78f82292..c4824bf7a05 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ libevent openssl ];
 
+  # Running tests in parallel does not work
+  enableParallelChecking = false;
+
   doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {

From 69ee0a80dc6856ba58d6af8f81a8e3bcbedebe63 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Tue, 11 Dec 2018 09:10:06 +0000
Subject: [PATCH 1674/2793] metamath: 0.167 -> 0.168

---
 pkgs/development/interpreters/metamath/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 198ee2acb50..2fb1ccb24bc 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "metamath-${version}";
-  version = "0.167";
+  version = "0.168";
 
   buildInputs = [ autoreconfHook ];
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Taneb";
     repo = "metamath";
-    rev = "579166a649c5d9ae0cdc641185e68219d2812f24";
-    sha256 = "0ly7qv3gajlaf283fsy9ak41r09sh49ygzj0s9yxyjfli6rgxdby";
+    rev = "542bfd5e53d8ce026ce5d29da9e7069ec807f5e0";
+    sha256 = "07ssgqh9ipiw1bf60snmjaxngln1an1h9q0vgszadc94wzw06zi4";
   };
 
   meta = with stdenv.lib; {

From ca8b128aa105c09af7d5ed2cc0b1c7cb9af9edc5 Mon Sep 17 00:00:00 2001
From: Ivan <ivanbrennan@users.noreply.github.com>
Date: Tue, 11 Dec 2018 04:49:27 -0500
Subject: [PATCH 1675/2793] credstash: add standalone Python application
 (#51807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

credstash was only available as a library. Provide it as a standalone
application as well.

In order for this to work, I needed to remove the copy of
the library that's placed in $out/bin and marked executable
during the install phase. Other than the patched shebang and
executable bit, it's identical to the library that's installed to
$out/lib/python3.7/site-packages.

Before the postFixup has run `wrapPythonPrograms`, $out/bin contains
two Python files -- credstash and credstash.py -- where bin/credstash
is the executable you'd expect a user to invoke from the command-line
and bin/credstash.py contains the credstash module, which bin/credstash
imports.

After `wrapPythonPrograms` has run, bin/credstash is a shell
wrapper around the bin/.credstash-wrapped python entrypoint, and
bin/credstash.py is shell wrapper around bin/.credstash.py-wrapped.
Invoking bin/credstash execs bin/.credstash-wrapped, and that python
script attempts to import the credstash module from bin/credstash.py,
the shell wrapper, rather than either bin/.credstash.py-wrapped or
lib/python3.7/site-packages/credstash.py.

This leads to an error:

    $ credstash get mykey
    Traceback (most recent call last):
      File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/.credstash-wrapped", line 8, in <module>
        from credstash import main
      File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/credstash.py", line 2
        export PATH='/nix/store/6lm4gi5iv8fbf1b1mm6g3gfnnv63f1gn-python3-3.7.1/bin:/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin:/nix/store/2n13gf1zdr39ir5dynxlkqndxgy36g08-python3.7-setuptools-40.4.3/bin:/nix/store/mhnqwpa4y1l81zi4cwx989i8h8z9g67l-python3.7-jmespath-0.9.0/bin:/nix/store/qc6q3a2nv4211wyh7q319v6zzd3ab6pc-python3.7-docutils-0.14/bin'${PATH:+':'}$PATH
                  ^
    SyntaxError: invalid syntax

If we try using `dontWrapPythonPrograms` to resolve this, runtime
dependency lookups fail:

    $ credstash get mykey
    Traceback (most recent call last):
      File "/run/current-system/sw/bin/credstash", line 7, in <module>
        from credstash import main
      File "/nix/store/8rmldlvlv1z1xl7w02dy7f5qhkzdrg8z-python3.7-credstash-1.15.0/bin/credstash.py", line 26, in <module>
        import boto3
    ModuleNotFoundError: No module named 'boto3'

I was able to resolve things by simply removing bin/credstash.py before
the postFixup phase has a chance to wrap any executables. Now the
executable imports the library correctly:

 (shell wrapper)
  bin/credstash
        │      (python executable)
        └─> bin/.credstash-wrapped
                   │                        (python library)
                   └─> lib/python3.7/site-packages/credstash.py
---
 pkgs/development/python-modules/credstash/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix                       | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index db48326535d..e761792bb99 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -9,6 +9,14 @@ buildPythonPackage rec {
     sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb";
   };
 
+  # The install phase puts an executable and a copy of the library it imports in
+  # bin/credstash and bin/credstash.py, despite the fact that the library is also
+  # installed to lib/python<version>/site-packages/credstash.py.
+  # If we apply wrapPythonPrograms to bin/credstash.py then the executable will try
+  # to import the credstash module from the resulting shell script. Removing this
+  # file ensures that Python imports the module from site-packages library.
+  postInstall = "rm $out/bin/credstash.py";
+
   nativeBuildInputs = [ nose ];
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8c269aaeee..2ddb4755c32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8439,6 +8439,8 @@ in
     llvmPackages = llvmPackages_7;
   };
 
+  credstash = with python3Packages; toPythonApplication credstash;
+
   creduce = callPackage ../development/tools/misc/creduce {
     inherit (perlPackages) perl
       ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey;

From 0023e1d0de7c0a61f884f286a1a25326f0c0a568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 10 Dec 2018 18:05:42 +0100
Subject: [PATCH 1676/2793] python.pkgs.CommonMark: correct pname

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

diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
index 63d84f3da77..93eb0327286 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }:
 
 buildPythonPackage rec {
-  pname = "CommonMark";
+  pname = "commonmark";
   version = "0.8.1";
 
   src = fetchPypi {

From f9b16e60daa083496a640a062b4b552cf185ae92 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 22:15:48 -0500
Subject: [PATCH 1677/2793] pythonPackages.protobuf: apply patch for python 3.7
 only when building with it

Change introduced in #50672.

The patch does not apply on older protobuf like protobuf3_1

```
$ nix-build -E 'with import ./. { }; python3Packages.protobuf.override { protobuf = protobuf3_1; }'
unpacking sources
unpacking source archive /nix/store/1zdyl0cxaa8ha2v1zp75zzdjd6j99d0m-source
source root is source
setting SOURCE_DATE_EPOCH to timestamp 315619200 of file source/util/python/BUILD
patching sources
applying patch /nix/store/yagx7hvylnnjq7lxbcia0y5lq1r736w3-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch
patching file google/protobuf/pyext/descriptor.cc
Hunk #1 succeeded at 55 (offset -1 lines).
patching file google/protobuf/pyext/descriptor_containers.cc
patching file google/protobuf/pyext/descriptor_pool.cc
Hunk #1 succeeded at 47 (offset -1 lines).
patching file google/protobuf/pyext/extension_dict.cc
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file google/protobuf/pyext/extension_dict.cc.rej
patching file google/protobuf/pyext/message.cc
Hunk #1 succeeded at 82 (offset 3 lines).
Hunk #2 succeeded at 1425 (offset -104 lines).
```

Since the patch isn't necessary on python versions older than 3.7, let's
only apply it for version 3.7. This means that most things using older
protobuf implementation will now be able to build when using an older
pythonPackage set (as is most probably the case anyway).

This still leaves protobuf 3.1 using packages hanging, but the errors
will be localized to those that would be breaking anyway with the
upgrade to 3.7 as default python.
---
 pkgs/development/python-modules/protobuf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index a9d20983a55..7a67ce29240 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, python, buildPythonPackage
+{ stdenv, fetchpatch, python, buildPythonPackage, isPy37
 , protobuf, google_apputils, pyext, libcxx
 , disabled, doCheck ? true }:
 
@@ -16,14 +16,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ protobuf google_apputils ];
   buildInputs = [ google_apputils pyext ];
 
-  patches = [
+  patches = optional isPy37
     # Python 3.7 compatibility (remove when protobuf 3.7 is released)
     (fetchpatch {
       url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
       sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
       stripLen = 1;
     })
-  ];
+  ;
 
   prePatch = ''
     while [ ! -d python ]; do

From 31298112f3ce56aa4a240ae2c6fd650bec98e47b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Dec 2018 22:15:29 -0500
Subject: [PATCH 1678/2793] caffe2: Use python36Packages explicitly.

Fallout from 0f38d9669ffd74991b65a9c40cdbcf2a98438d1f
---
 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 2ddb4755c32..6b63bd55e4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21800,9 +21800,9 @@ in
   };
 
   caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
-    inherit (python3Packages) python future six numpy pydot;
+    inherit (python36Packages) python future six numpy pydot;
     protobuf = protobuf3_1;
-    python-protobuf = python3Packages.protobuf.override { inherit protobuf; };
+    python-protobuf = python36Packages.protobuf.override { inherit protobuf; };
     # Used only for image loading.
     opencv3 = opencv3WithoutCuda;
   });

From e576c3b385b56a0f062953674e2b5fbd73012bab Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Tue, 11 Dec 2018 12:02:56 +0100
Subject: [PATCH 1679/2793] doc: Fix insecure nginx docs (#51840)

---
 nixos/modules/services/web-servers/nginx/vhost-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 8e2b8819e71..6a50d8ed5cd 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -69,7 +69,7 @@ with lib;
     acmeRoot = mkOption {
       type = types.str;
       default = "/var/lib/acme/acme-challenge";
-      description = "Directory to store certificates and keys managed by the ACME service.";
+      description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
     };
 
     acmeFallbackHost = mkOption {

From 8ad1ef1ea5e11e7fcd6acd0bf9e7dd0755d6f1e4 Mon Sep 17 00:00:00 2001
From: David McKay <david.andrew.mckay@gmail.com>
Date: Tue, 11 Dec 2018 11:42:51 +0000
Subject: [PATCH 1680/2793] wavebox: Update & Clean Dependencies

---
 .../instant-messengers/wavebox/default.nix        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index e3504ad3285..130db52b43c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
-, xorg, gtk2, gtk3 , gnome2, gnome3, nss, alsaLib, udev, libnotify, xdg_utils }:
+{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify,
+  makeDesktopItem, makeWrapper, nss, stdenv, udev, xdg_utils,
+  xorg }:
 
 with stdenv.lib;
 
 let
   bits = "x86_64";
 
-  version = "4.5.3";
+  version = "4.5.5";
 
   desktopItem = makeDesktopItem rec {
     name = "Wavebox";
-    exec = name;
+    exec = "wavebox";
     icon = "wavebox";
     desktopName = name;
     genericName = name;
@@ -23,7 +24,7 @@ in stdenv.mkDerivation rec {
   name = "wavebox-${version}";
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
-    sha256 = "0a89nlrd9xy853sxv7kb2bjcw209254ik15qrcnh0jhb1ckv16wm";
+    sha256 = "b392e02b3b1b4deece32311aeb69b31c2550c4251be65f408c35b0badbf3c8b6";
   };
 
   # don't remove runtime deps
@@ -32,9 +33,9 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
   buildInputs = with xorg; [
-    libXScrnSaver libXtst
+    libXdmcp libXScrnSaver libXtst
   ] ++ [
-    gtk3 nss gtk2 alsaLib gnome2.GConf
+    alsaLib gtk3 nss
   ];
 
   runtimeDependencies = [ udev.lib libnotify ];

From eb1e6bfde67d66155f7b049e3327f196a7afa4bd Mon Sep 17 00:00:00 2001
From: David McKay <rawkode@pm.me>
Date: Tue, 11 Dec 2018 12:15:33 +0000
Subject: [PATCH 1681/2793] Adhere to Styleguide

---
 .../networking/instant-messengers/wavebox/default.nix      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 130db52b43c..b85e9d3d4cb 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -1,6 +1,7 @@
-{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify,
-  makeDesktopItem, makeWrapper, nss, stdenv, udev, xdg_utils,
-  xorg }:
+{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify
+, makeDesktopItem, makeWrapper, nss, stdenv, udev, xdg_utils
+, xorg
+}:
 
 with stdenv.lib;
 

From 6153dc76f23b65411440eca2c728acbe0b5e55f9 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Tue, 11 Dec 2018 15:48:00 +0300
Subject: [PATCH 1682/2793] gitAndTools.hub: 2.6.0 -> 2.6.1

---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index e01101c6a66..acb82253406 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hub-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   goPackagePath = "github.com/github/hub";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "github";
     repo = "hub";
     rev = "v${version}";
-    sha256 = "0hxmbpyv2yjxg4v3z50x5ikgcz7mgv5prya8jcpi277vq2s0wwa1";
+    sha256 = "1gq8nmzdsqicjgam3h48l0dad46dn9mx9blr1413rc2cp9qmg7d4";
   };
 
   nativeBuildInputs = [ groff ronn utillinux ];

From d08187edcea0d9083c53732f28e262d58642a854 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 11 Dec 2018 13:59:36 +0100
Subject: [PATCH 1683/2793] minio: 2018-07-31T02-11-47Z -> 2018-12-06T01-27-43Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 06ee65b0167..5b19d6dd37e 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-07-31T02-11-47Z";
+  version = "2018-12-06T01-27-43Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0pngr2x15prn55r8xj59sqjn9yp98hhm5qgi12ybc6cfxx0wls52";
+    sha256 = "0j10rhrg98zsv62sdc9wgrh2kdpv2179szvzyg8rm9rb89rzdhd2";
   };
 
   goPackagePath = "github.com/minio/minio";

From 380fce5bc37080b90bb68bf2cd326a78cca6d17a Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 11 Dec 2018 13:59:43 +0100
Subject: [PATCH 1684/2793] minio-client: 2018-07-31T02-28-53Z ->
 2018-12-05T22-59-07Z

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

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 6720d5ae2e0..8b8991db86c 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-client-${version}";
 
-  version = "2018-07-31T02-28-53Z";
+  version = "2018-12-05T22-59-07Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "1918yl5d92y4ij9d1v738pf574rwb6a911rjpmaj9awhrz8qa2bg";
+    sha256 = "01vjgs96sb792rggc7da9fzbpam5pyr7x9zd4r8wv6jc6xnv7n3x";
   };
 
   goPackagePath = "github.com/minio/mc";

From 66958e6ac5f093f8a746be844a1326c66306a434 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Tue, 11 Dec 2018 20:10:42 +0700
Subject: [PATCH 1685/2793] luigi: 2.7.9 -> 2.8.0

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

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index 35721208a6e..3a0164edeb0 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "luigi";
-  version = "2.7.9";
+  version = "2.8.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
+    sha256 = "1869lb6flmca6s7ccws7mvyn66nvrqjky40jwf2liv9fg0lp8899";
   };
 
   # Relax version constraint

From f52cb0a6b40d8991863a53e3733ec8f94b57e1ae Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 12:55:49 -0500
Subject: [PATCH 1686/2793] pythonPackages.robotstatuschecker: init at 1.3

---
 .../robotstatuschecker/default.nix            | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/robotstatuschecker/default.nix

diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
new file mode 100644
index 00000000000..1a2ef201c50
--- /dev/null
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }:
+
+buildPythonPackage rec {
+  version = "1.3";
+  pname = "robotstatuschecker";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "robotframework";
+    repo = "statuschecker";
+    rev = version;
+    sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln";
+  };
+
+  propagatedBuildInputs = [ robotframework ];
+
+  checkPhase = ''
+    ${python.interpreter} test/run.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for checking that Robot Framework test cases have expected statuses and log messages";
+    homepage = https://github.com/robotframework/statuschecker;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f00e2b4cb0f..c8ac1a62be9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3810,6 +3810,8 @@ in {
 
   robotframework-tools = callPackage ../development/python-modules/robotframework-tools { };
 
+  robotstatuschecker = callPackage ../development/python-modules/robotstatuschecker { };
+
   robotsuite = callPackage ../development/python-modules/robotsuite { };
 
   serpent = callPackage ../development/python-modules/serpent { };

From e3a0c05a80ab8534028cb962ecb9f691042ae6a2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 13:38:56 -0500
Subject: [PATCH 1687/2793] pythonPackages.approvaltests: init at 0.2.4

---
 .../python-modules/approvaltests/default.nix  | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/approvaltests/default.nix

diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
new file mode 100644
index 00000000000..de64f86d728
--- /dev/null
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
+
+buildPythonPackage rec {
+  version = "0.2.4";
+  pname = "approvaltests";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "approvals";
+    repo = "ApprovalTests.Python";
+    rev = version;
+    sha256 = "05lj5i13zpkgw1wdc1v81wj4zqj8bpzqiwycdnwlg08azcy7k7j1";
+  };
+
+  propagatedBuildInputs = [ pyperclip ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pyperclip==1.5.27" "pyperclip>=1.5.27"
+  '';
+
+  # Tests fail on Python 3.7
+  # https://github.com/approvals/ApprovalTests.Python/issues/36
+  doCheck = !isPy37;
+
+  # Disable Linux failing test, because tries to use darwin/windows specific reporters
+  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+    substituteInPlace tests/test_genericdiffreporter.py \
+      --replace "test_find_working_reporter" "_find_working_reporter"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Assertion/verification library to aid testing";
+    homepage = https://github.com/approvals/ApprovalTests.Python;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8ac1a62be9..44db2c4cd3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -835,6 +835,8 @@ in {
 
   appnope = callPackage ../development/python-modules/appnope { };
 
+  approvaltests = callPackage ../development/python-modules/approvaltests { };
+
   apsw = callPackage ../development/python-modules/apsw {};
 
   astor = callPackage ../development/python-modules/astor {};

From 0890aa4d6af9dd32f9dba5d8bce0bf952cf4309e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 14:55:37 -0500
Subject: [PATCH 1688/2793] pythonPackages.mockito: init at 1.1.1

---
 .../python-modules/mockito/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/mockito/default.nix

diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
new file mode 100644
index 00000000000..bfef79b0f72
--- /dev/null
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
+
+buildPythonPackage rec {
+  version = "1.1.1";
+  pname = "mockito";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "142f5e8865a422ad2d67b9c67a382e3296e8f1633dbccd0e322180fba7d5303d";
+  };
+
+  # Failing tests due 2to3
+  doCheck = !isPy3k;
+
+  propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
+  checkInputs = [ pytest numpy ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Spying framework";
+    homepage = https://github.com/kaste/mockito-python;
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44db2c4cd3a..6173298d026 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2969,6 +2969,8 @@ in {
 
   mock-open = callPackage ../development/python-modules/mock-open { };
 
+  mockito = callPackage ../development/python-modules/mockito { };
+
   modestmaps = callPackage ../development/python-modules/modestmaps { };
 
   # Needed here because moinmoin is loaded as a Python library.

From 850b2592c35d048134facf94ee6ee376dd69fb59 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 09:23:36 -0500
Subject: [PATCH 1689/2793] pythonPackages.robotframework-seleniumlibrary: init
 at 3.2.0

---
 .../default.nix                               | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix

diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
new file mode 100644
index 00000000000..0affafb1f32
--- /dev/null
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
+
+buildPythonPackage rec {
+  version = "3.2.0";
+  pname = "robotframework-seleniumlibrary";
+
+  # no tests included in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "robotframework";
+    repo = "SeleniumLibrary";
+    rev = "v${version}";
+    sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";
+  };
+
+  propagatedBuildInputs = [ robotframework selenium ];
+  checkInputs = [ mockito robotstatuschecker approvaltests ];
+
+  # Only execute Unit Tests. Acceptance Tests require headlesschrome, currently
+  # not available in nixpkgs
+  checkPhase = ''
+    ${python.interpreter} utest/run.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Web testing library for Robot Framework";
+    homepage = https://github.com/robotframework/SeleniumLibrary;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6173298d026..da5fa4dd102 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3810,6 +3810,8 @@ in {
 
   robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
 
+  robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { };
+
   robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { };
 
   robotframework-tools = callPackage ../development/python-modules/robotframework-tools { };

From cf46e28f0ad90d05c1653c18ad913e74b98ab037 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Dec 2018 09:25:29 -0500
Subject: [PATCH 1690/2793] pythonPackages.robotframework-selenium2library:
 1.6.0 -> 3.0.0

---
 .../default.nix                               | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 15fd977936b..67f04f4f991 100644
--- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
@@ -1,30 +1,24 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, robotframework
-, selenium
-, docutils
-, decorator
-}:
+{ stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
 
 buildPythonPackage rec {
-  version = "1.6.0";
+  version = "3.0.0";
   pname = "robotframework-selenium2library";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1asdwrpb4s7q08bx641yrh3yicgba14n3hxmsqs58mqf86ignwly";
+    sha256 = "2a8e942b0788b16ded253039008b34d2b46199283461b294f0f41a579c70fda7";
   };
 
-  # error: invalid command 'test'
-  #doCheck = false;
+  # Neither the PyPI tarball nor the repository has tests
+  doCheck = false;
 
-  propagatedBuildInputs = [ robotframework selenium docutils decorator ];
+  propagatedBuildInputs = [ robotframework-seleniumlibrary ];
 
   meta = with stdenv.lib; {
     description = "Web testing library for Robot Framework";
-    homepage = http://robotframework.org/;
+    homepage = https://github.com/robotframework/Selenium2Library;
     license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
   };
 
 }

From df6010aa3a2af7e9d511d478032437f538bc2c33 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 7 Dec 2018 15:07:33 +0100
Subject: [PATCH 1691/2793] python3Packages.cytoolz: fix build

cytoolz has a test failure with Python 3.7 [0]. There is a debian patch
for it, which didn't make it into upstream yet [1].

[0] https://github.com/pytoolz/cytoolz/issues/122
[1] https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch
---
 .../development/python-modules/cytoolz/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index aefe250effe..2b631d053e3 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -5,6 +5,7 @@
 , nose
 , toolz
 , python
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,15 @@ buildPythonPackage rec {
     sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5";
   };
 
+  patches = [
+    # temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122
+    (fetchpatch {
+      name = "py37.patch";
+      url = https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch;
+      sha256 = "1z29y7s5n751q3f74r3bz0f48yg6izvi68hc4pkwcalxmkq5r1n9";
+    })
+  ];
+
   # Extension types
   disabled = isPyPy;
 
@@ -28,9 +38,9 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "https://github.com/pytoolz/cytoolz/";
+    homepage = https://github.com/pytoolz/cytoolz/;
     description = "Cython implementation of Toolz: High performance functional utilities";
     license = "licenses.bsd3";
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From da92eb260145934e83f8d5efa5f3bb6ab15c1e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 11 Dec 2018 16:13:53 +0100
Subject: [PATCH 1692/2793] ghostwriter: 1.7.3 -> 1.7.4

---
 pkgs/applications/editors/ghostwriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 36259593463..1ed09a1caa5 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ghostwriter";
-  version = "1.7.3";
+  version = "1.7.4";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "wereturtle";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1xkxd59rw2dn6xphgcl06zzmfgs1zna2w0pxrk0f49ywffvkvs72";
+    sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];

From 174800f2c6cd6ab6575ee7fbc533ceef06b20df1 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 11 Dec 2018 15:00:26 +0100
Subject: [PATCH 1693/2793] grafana: 5.4.0 -> 5.4.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 45bb96cd4c7..f55fe9a8d58 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.4.0";
+  version = "5.4.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "090p8j0ddgpc6pz7ax2nz5d196xfhdmgxirszcpkgx2rkidndxlv";
+    sha256 = "1bfxj2f9hid1nj3j1kqr33sdh89y7kgcj8rk9a95ldnpgkxi1n79";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "06ysq5njlnb9d5x4jchxlk6zmy2ahb9njnj6n3fblpjzdbkjlcgp";
+    sha256 = "1f3qjk58dr30xvnck6s6655qr3njvdkg1whxij9canwx17wy022a";
   };
 
   postPatch = ''

From e376aecb1ea57bdeefedeb1a10625c22c464e415 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 11 Dec 2018 17:37:18 +0200
Subject: [PATCH 1694/2793] railcar: add reference to upstream patch

---
 pkgs/applications/virtualization/railcar/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 57881a20251..517a8e39a1e 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -10,10 +10,12 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
   };
-  
+
   cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan";
 
   buildInputs = [ libseccomp ];
+
+  # Submitted upstream https://github.com/oracle/railcar/pull/44
   cargoPatches = [ ./cargo-lock.patch ];
 
   meta = with lib; {

From c89cbdcd48bf11fbb9fb9ebaeaa59aad566a8648 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Dec 2018 11:11:34 -0500
Subject: [PATCH 1695/2793] linux: 4.20-rc5 -> 4.20-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 6c06354f394..81945290bf6 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.20-rc5";
-  modDirVersion = "4.20.0-rc5";
+  version = "4.20-rc6";
+  modDirVersion = "4.20.0-rc6";
   extraMeta.branch = "4.20";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0dixig8vismk40x4a719psyi39nqcv7yrisjdnj3s2ym9rljyypz";
+    sha256 = "1hmcwlf3lcim4z265pqz6v4na6072xcqzrnq57wacznmg31m7y0c";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 643fabf8ea58f622943f6b90b43e9fb236bf35bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Tue, 11 Dec 2018 17:35:44 +0000
Subject: [PATCH 1696/2793] syncthing: fix build (#51866)

###### Motivation for this change

fixes #51825

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [x] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
   - [x] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Assured whether relevant documentation is up to date
- [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

---
---
 .../networking/syncthing/default.nix          | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 8bd21b1a6a0..16649653eb3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }:
+{ buildGoPackage, fetchpatch, stdenv, lib, procps, fetchFromGitHub }:
 
 let
-  common = { stname, target, patches ? [], postInstall ? "" }:
-    stdenv.mkDerivation rec {
+  common = { stname, target, postInstall ? "" }:
+    buildGoPackage rec {
       version = "0.14.52";
       name = "${stname}-${version}";
 
@@ -13,29 +13,36 @@ let
         sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd";
       };
 
-      inherit patches;
+      goPackagePath = "github.com/syncthing/syncthing";
 
-      buildInputs = [ go ];
-      nativeBuildInputs = [ removeReferencesTo ];
+      patches = [
+        ./add-stcli-target.patch
+        (fetchpatch {
+          url = "https://github.com/syncthing/syncthing/commit/e7072feeb7669948c3e43f55d21aec15481c33ba.patch";
+          sha256 = "1pcybww2vdx45zhd1sd53v7fp40vfgkwqgy8flv7hxw2paq8hxd4";
+        })
+      ];
+      BUILD_USER="nix";
+      BUILD_HOST="nix";
 
       buildPhase = ''
-        # Syncthing expects that it is checked out in $GOPATH, if that variable is
-        # set.  Since this isn't true when we're fetching source, we can explicitly
-        # unset it and force Syncthing to set up a temporary one for us.
-        env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target}
+        runHook preBuild
+        pushd go/src/${goPackagePath}
+        go run build.go -no-upgrade -version v${version} build ${target}
+        popd
+        runHook postBuild
       '';
 
       installPhase = ''
-        install -Dm755 ${target} $out/bin/${target}
+        pushd go/src/${goPackagePath}
+        runHook preInstall
+        install -Dm755 ${target} $bin/bin/${target}
         runHook postInstall
+        popd
       '';
 
       inherit postInstall;
 
-      preFixup = ''
-        find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
-      '';
-
       meta = with lib; {
         homepage = https://www.syncthing.net/;
         description = "Open Source Continuous File Synchronization";
@@ -79,7 +86,6 @@ in {
   syncthing-cli = common {
     stname = "syncthing-cli";
 
-    patches = [ ./add-stcli-target.patch ];
     target = "stcli";
   };
 

From 7494175f4d57d39d446024f8fff04dbf9dbafbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Dec 2018 17:56:50 +0000
Subject: [PATCH 1697/2793] curl_unix_socket: use buildGoPackage

---
 .../networking/curl-unix-socket/default.nix   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index d145e1e12c3..e6f2dec30e6 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchFromGitHub, go }:
+{ buildGoPackage, stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "curl-unix-socket-2014-09-01";
+buildGoPackage rec {
+  name = "curl-unix-socket-2015-04-10";
 
   src = fetchFromGitHub {
     owner = "Soulou";
     repo = "curl-unix-socket";
-    rev = "e926dca77ba7d4a1eeae073918fdd3db92f1a350";
+    rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307";
     sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d";
   };
 
-  buildInputs = [ go ];
-  buildPhase = "go build -o curl-unix-socket";
-  installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket";
+  goPackagePath = "github.com/Soulou/curl-unix-socket";
+
+  buildPhase = ''
+    runHook preBuild
+    (
+      cd go/src/${goPackagePath}
+      go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket
+    )
+    runHook postBuild
+  '';
 
   meta = with stdenv.lib; {
     description = "Run HTTP requests over UNIX socket";

From 8b3cacfdcf12388c9a4c66ba15cbb57fea328294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Dec 2018 17:59:52 +0000
Subject: [PATCH 1698/2793] logstash-forwarder: remove

This project was replaced by file beat:
https://github.com/elastic/logstash-forwarder#logstash-forwarder
---
 .../tools/misc/logstash-forwarder/default.nix | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/tools/misc/logstash-forwarder/default.nix

diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
deleted file mode 100644
index 44fa1cb7cfb..00000000000
--- a/pkgs/tools/misc/logstash-forwarder/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, go }:
-
-stdenv.mkDerivation rec {
-  name = "logstash-forwarder-${version}";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "elasticsearch";
-    repo = "logstash-forwarder";
-    rev = "v${version}";
-    sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l";
-  };
-
-  buildInputs = [ go ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    find . -name logstash-forwarder -type f -exec cp {} $out/bin \;
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    homepage = https://github.com/elasticsearch/logstash-forwarder;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6d4f349002..3c719f93d0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,8 +3738,6 @@ in
 
   logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };
 
-  logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
-
   lolcat = callPackage ../tools/misc/lolcat { };
 
   lsdvd = callPackage ../tools/cd-dvd/lsdvd {};

From ff7192d4d0844a3640f95880944e3bd004460b4d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 8 Dec 2018 20:10:11 +0300
Subject: [PATCH 1699/2793] php: init at 7.3.0

---
 pkgs/development/interpreters/php/default.nix | 27 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 26 ++++++++++++++++--
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 67ba470ac01..25c9dfe320f 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,9 +1,9 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, flex, bison, autoconf
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip
 }:
 
 with lib;
@@ -42,7 +42,7 @@ let
   , intlSupport ? config.php.intl or true
   , exifSupport ? config.php.exif or true
   , xslSupport ? config.php.xsl or false
-  , mcryptSupport ? config.php.mcrypt or true
+  , mcryptSupport ? (config.php.mcrypt or true) && (versionOlder version "7.2")
   , bz2Support ? config.php.bz2 or false
   , zipSupport ? config.php.zip or true
   , ftpSupport ? config.php.ftp or true
@@ -54,6 +54,7 @@ let
   , 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")
+  , libzipSupport ? (config.php.libzip or true) && (versionAtLeast version "7.3")
   }:
 
     let
@@ -68,7 +69,9 @@ let
       enableParallelBuilding = true;
 
       nativeBuildInputs = [ pkgconfig autoconf ];
-      buildInputs = [ flex bison pcre ]
+      buildInputs = [ flex bison ]
+        ++ optional (versionOlder version "7.3") pcre
+        ++ optional (versionAtLeast version "7.3") pcre2
         ++ optional withSystemd systemd
         ++ optionals imapSupport [ uwimap openssl pam ]
         ++ optionals curlSupport [ curl openssl ]
@@ -96,15 +99,16 @@ let
         ++ optional (mssqlSupport && !stdenv.isDarwin) freetds
         ++ optional sodiumSupport libsodium
         ++ optional tidySupport html-tidy
-        ++ optional argon2Support libargon2;
+        ++ optional argon2Support libargon2
+        ++ optional libzipSupport libzip;
 
       CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
 
-
       configureFlags = [
         "--with-config-file-scan-dir=/etc/php.d"
-        "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
       ]
+      ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
+      ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
       ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
       ++ optional withSystemd "--with-fpm-systemd"
       ++ optionals imapSupport [
@@ -163,8 +167,8 @@ let
       ++ optional calendarSupport "--enable-calendar"
       ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
       ++ optional tidySupport "--with-tidy=${html-tidy}"
-      ++ optional argon2Support "--with-password-argon2=${libargon2}";
-
+      ++ optional argon2Support "--with-password-argon2=${libargon2}"
+      ++ optional libzipSupport "--with-libzip=${libzip.dev}";
 
       hardeningDisable = [ "bindnow" ];
 
@@ -242,4 +246,9 @@ in {
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
+
+  php73 = generic {
+    version = "7.3.0";
+    sha256 = "0rvwx37dsmxivgrf4wfc1y778iln498c6a40biy9k6lnr6p7s9ks";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6d4f349002..d3444f4b506 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7835,18 +7835,28 @@ in
     php = php72;
   });
 
+  php73Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php73;
+  });
+
   phpPackages-unit = php72Packages-unit;
 
   php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php71-unit;
   });
-   php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
+
+  php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php72-unit;
   });
 
+   php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php73-unit;
+  });
+
   inherit (callPackages ../development/interpreters/php { })
     php71
-    php72;
+    php72
+    php73;
 
   php-embed = php72-embed;
 
@@ -7860,6 +7870,11 @@ in
     config.php.apxs2 = false;
   };
 
+  php73-embed = php73.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+  };
+
   php-unit = php72-unit;
 
   php71-unit = php71.override {
@@ -7876,6 +7891,13 @@ in
     config.php.fpm = false;
   };
 
+  php73-unit = php73.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+    config.php.systemd = false;
+    config.php.fpm = false;
+  };
+
   picoc = callPackage ../development/interpreters/picoc {};
 
   picolisp = callPackage ../development/interpreters/picolisp {};

From 6c8b7ac9310f5bed68909f13cc0d491b01c56e9a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 8 Dec 2018 20:12:06 +0300
Subject: [PATCH 1700/2793] unit: add php module 7.3

---
 pkgs/servers/http/unit/default.nix | 3 +++
 pkgs/top-level/all-packages.nix    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 68676a07bf0..d39c25bec2a 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -3,6 +3,7 @@
 , python
 , php71
 , php72
+, php73
 , perl526
 , perl
 , perldevel
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
     python
     php71
     php72
+    php73
     perl526
     perl
     perldevel
@@ -49,6 +51,7 @@ stdenv.mkDerivation rec {
     ./configure python  --module=python    --config=${python}/bin/python-config  --lib-path=${python}/lib
     ./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib
     ./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib
+    ./configure php     --module=php73     --config=${php73.dev}/bin/php-config  --lib-path=${php73}/lib
     ./configure perl    --module=perl526   --perl=${perl526}/bin/perl
     ./configure perl    --module=perl      --perl=${perl}/bin/perl
     ./configure perl    --module=perl529   --perl=${perldevel}/bin/perl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3444f4b506..888c2740822 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13573,6 +13573,7 @@ in
   unit = callPackage ../servers/http/unit {
     php71 = php71-unit;
     php72 = php72-unit;
+    php73 = php73-unit;
   };
 
   nginx = nginxStable;

From 374be65924ca5a2f6dd266b21547586f8153692a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 9 Dec 2018 23:23:53 +0300
Subject: [PATCH 1701/2793] php71: 7.1.24 -> 7.1.25

---
 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 25c9dfe320f..cc616102594 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -232,8 +232,8 @@ let
 
 in {
   php71 = generic {
-    version = "7.1.24";
-    sha256 = "02qy76krbdhlbkzs9k1sa5mgmj0qnbb8gcf1j3q0cq3z7kkj9pk6";
+    version = "7.1.25";
+    sha256 = "1b5az5vhap593ggjxirs1zdlg20hcv9h94iq5kgaxky71a4dqb00";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;

From f80e7df14319207d6fa2554a27ad8bdf7f68079a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 9 Dec 2018 23:32:14 +0300
Subject: [PATCH 1702/2793] php72: 7.2.12 -> 7.2.13

---
 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 cc616102594..d28f70d8ae2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -240,8 +240,8 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.12";
-    sha256 = "1dpnbsv4bdlc5v40ddddi971f456jp1qrn89w5di1dj70g1c895p";
+    version = "7.2.13";
+    sha256 = "0bg9nfc250p24hxn4bdjz7ngcw75h8rpf4qjxqzcs6s9fvxlcjjv";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;

From b5137de3792f20457e98e9866316178a4189f00a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 10:25:31 +0300
Subject: [PATCH 1703/2793] php: add custom options

---
 pkgs/development/interpreters/php/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index d28f70d8ae2..b773963b981 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -55,6 +55,10 @@ let
   , tidySupport ? (config.php.tidy or false)
   , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2")
   , libzipSupport ? (config.php.libzip or true) && (versionAtLeast version "7.3")
+  , phpdbgSupport ? config.php.phpdbg or true
+  , cgiSupport ? config.php.cgi or true
+  , cliSupport ? config.php.cli or true
+  , pharSupport ? config.php.phar or true
   }:
 
     let
@@ -168,7 +172,12 @@ let
       ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
       ++ optional tidySupport "--with-tidy=${html-tidy}"
       ++ optional argon2Support "--with-password-argon2=${libargon2}"
-      ++ optional libzipSupport "--with-libzip=${libzip.dev}";
+      ++ optional libzipSupport "--with-libzip=${libzip.dev}"
+      ++ optional phpdbgSupport "--enable-phpdbg"
+      ++ optional (!phpdbgSupport) "--disable-phpdbg"
+      ++ optional (!cgiSupport) "--disable-cgi"
+      ++ optional (!cliSupport) "--disable-cli"
+      ++ optional (!pharSupport) "--disable-phar";
 
       hardeningDisable = [ "bindnow" ];
 
@@ -193,6 +202,7 @@ let
       '';
 
       postInstall = ''
+        test -d $out/etc || mkdir $out/etc
         cp php.ini-production $out/etc/php.ini
       '';
 

From bfe31dfdcd8c37963be69944e50c9b3eb9025106 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 10:32:29 +0300
Subject: [PATCH 1704/2793] unit: update php module config

---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 888c2740822..64ef63f55ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7881,6 +7881,8 @@ in
     config.php.embed = true;
     config.php.apxs2 = false;
     config.php.systemd = false;
+    config.php.phpdbg = false;
+    config.php.cgi = false;
     config.php.fpm = false;
   };
 
@@ -7888,6 +7890,8 @@ in
     config.php.embed = true;
     config.php.apxs2 = false;
     config.php.systemd = false;
+    config.php.phpdbg = false;
+    config.php.cgi = false;
     config.php.fpm = false;
   };
 
@@ -7895,6 +7899,8 @@ in
     config.php.embed = true;
     config.php.apxs2 = false;
     config.php.systemd = false;
+    config.php.phpdbg = false;
+    config.php.cgi = false;
     config.php.fpm = false;
   };
 

From 45ef74cccebea79ca7e9fdb6e7495962d2bfdbc1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 12:23:56 +0300
Subject: [PATCH 1705/2793] php: fix bug 71041

---
 pkgs/development/interpreters/php/default.nix |  7 +++++-
 .../interpreters/php/fix-bug-71041.patch      | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/php/fix-bug-71041.patch

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b773963b981..0fbd6d72611 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -253,12 +253,17 @@ in {
     version = "7.2.13";
     sha256 = "0bg9nfc250p24hxn4bdjz7ngcw75h8rpf4qjxqzcs6s9fvxlcjjv";
 
+    # https://bugs.php.net/bug.php?id=71041
     # https://bugs.php.net/bug.php?id=76826
-    extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
+    extraPatches = [ ./fix-bug-71041.patch ]
+      ++ optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
   php73 = generic {
     version = "7.3.0";
     sha256 = "0rvwx37dsmxivgrf4wfc1y778iln498c6a40biy9k6lnr6p7s9ks";
+
+    # https://bugs.php.net/bug.php?id=71041
+    extraPatches = [ ./fix-bug-71041.patch ];
   };
 }
diff --git a/pkgs/development/interpreters/php/fix-bug-71041.patch b/pkgs/development/interpreters/php/fix-bug-71041.patch
new file mode 100644
index 00000000000..350b635bdf3
--- /dev/null
+++ b/pkgs/development/interpreters/php/fix-bug-71041.patch
@@ -0,0 +1,25 @@
+diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
+index 24d454d..6307620 100644
+--- a/Zend/zend_signal.c
++++ b/Zend/zend_signal.c
+@@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
+ 
+ /* {{{ zend_signal_startup
+  * alloc zend signal globals */
+-void zend_signal_startup(void)
++ZEND_API void zend_signal_startup(void)
+ {
+ 
+ #ifdef ZTS
+diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
+index e8ee7d6..462d06f 100644
+--- a/Zend/zend_signal.h
++++ b/Zend/zend_signal.h
+@@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void);
+ void zend_signal_activate(void);
+ void zend_signal_deactivate(void);
+ BEGIN_EXTERN_C()
+-void zend_signal_startup(void);
++ZEND_API void zend_signal_startup(void);
+ END_EXTERN_C()
+ void zend_signal_init(void);

From 80f4d5d56a73265ce9e57c05e8f79dad18ee8b92 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 12:34:35 +0300
Subject: [PATCH 1706/2793] php: fix build php 7.3 in Darwin

---
 pkgs/development/interpreters/php/default.nix |  4 +-
 .../php/php73-darwin-isfinite.patch           | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/php/php73-darwin-isfinite.patch

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 0fbd6d72611..ae4e9b9635d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -264,6 +264,8 @@ in {
     sha256 = "0rvwx37dsmxivgrf4wfc1y778iln498c6a40biy9k6lnr6p7s9ks";
 
     # https://bugs.php.net/bug.php?id=71041
-    extraPatches = [ ./fix-bug-71041.patch ];
+    # https://bugs.php.net/bug.php?id=76826
+    extraPatches = [ ./fix-bug-71041.patch ]
+      ++ optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
   };
 }
diff --git a/pkgs/development/interpreters/php/php73-darwin-isfinite.patch b/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
new file mode 100644
index 00000000000..7f784e0f5a9
--- /dev/null
+++ b/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
@@ -0,0 +1,60 @@
+diff -ru a/configure.ac b/configure.ac
+--- a/configure.ac      2018-12-04 19:12:20.000000000 +0300
++++ b/configure.ac      2018-12-10 12:30:37.798917520 +0300
+@@ -68,7 +68,7 @@
+ #include <math.h>
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -77,7 +77,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -88,7 +88,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff -ru a/Zend/configure.ac b/Zend/configure.ac
+--- a/Zend/configure.ac 2018-12-04 19:12:30.000000000 +0300
++++ b/Zend/configure.ac 2018-12-10 12:28:50.350929699 +0300
+@@ -59,7 +59,7 @@
+ #include <math.h>
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -68,7 +68,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -79,7 +79,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)

From c120d940717eb70ff561ac0b1ad9fcd65aea64cf Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 17:33:53 +0300
Subject: [PATCH 1707/2793] phpPackages.apcu: 5.1.11 -> 5.1.15

---
 pkgs/top-level/php-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 273592428e0..a6357a50a73 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -7,10 +7,12 @@ let
       inherit (pkgs) stdenv autoreconfHook fetchurl;
     };
 
+  isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
+
   apcu = buildPecl {
-    name = "apcu-5.1.11";
-    sha256 = "0nz9m3fbxgyc2ij63yqmxm06a1f51g8rkxk85f85ziqdin66q2f1";
-    buildInputs = [ pkgs.pcre ];
+    name = "apcu-5.1.15";
+    sha256 = "0v91fxh3z3amwicqlmz7lvnh4zfl2d7kj2zc8pvlvj2lms8ql5zc";
+    buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
     doCheck = true;
     checkTarget = "test";
     checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"];

From 23190fb3a920acc01ce439c7737deb5c71feeabd Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 17:37:18 +0300
Subject: [PATCH 1708/2793] phpPackages.apcu_bc: fix build with php73

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a6357a50a73..004c773f26c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -23,7 +23,7 @@ let
   apcu_bc = buildPecl {
     name = "apcu_bc-1.0.4";
     sha256 = "1raww7alwayg9nk0akly1mdrjypxlwg8safnmaczl773cwpw5cbw";
-    buildInputs = [ apcu pkgs.pcre ];
+    buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
   };
 
   ast = buildPecl {

From cea4312e5649c7d6af7df75426c902bba2630a32 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 17:40:37 +0300
Subject: [PATCH 1709/2793] phpPackages.imagick: fix build with php73

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 004c773f26c..edaf6342b4f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -111,7 +111,7 @@ let
     sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z";
     configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ];
     nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.pcre ];
+    buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
   };
 
   memcached = buildPecl rec {

From 6a34ad0c2e9e1747d9076adddfa6869d60c732f1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 19:16:33 +0300
Subject: [PATCH 1710/2793] phpPackages.igbinary: 2.0.4 -> 2.0.8

---
 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 edaf6342b4f..5cebfde86e6 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -89,7 +89,7 @@ let
   };
 
   igbinary = buildPecl {
-    name = "igbinary-2.0.4";
+    name = "igbinary-2.0.8";
 
     configureFlags = [ "--enable-igbinary" ];
 
@@ -97,7 +97,7 @@ let
 
     outputs = [ "out" "dev" ];
 
-    sha256 = "0a55l4f0bgbf3f6sh34njd14niwagg829gfkvb8n5fs69xqab67d";
+    sha256 = "105nyn703k9p9c7wwy6npq7xd9mczmmlhyn0gn2v2wz0f88spjxs";
   };
 
   mailparse = buildPecl {

From 6a9f31f34cae71304dddb19a909143124444ce79 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 19:23:33 +0300
Subject: [PATCH 1711/2793] phpPackages.v8js: 1.4.1 -> 2.1.0

---
 pkgs/top-level/php-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5cebfde86e6..40b773d4c57 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -199,11 +199,11 @@ let
     configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ];
   };
 
-  v8js = buildPecl rec {
-    version = "1.4.1";
+  v8js = assert !isPhp73; buildPecl rec {
+    version = "2.1.0";
     name = "v8js-${version}";
 
-    sha256 = "0k5dc395gzva4l6n9mzvkhkjq914460cwk1grfandcqy73j6m89q";
+    sha256 = "0g63dyhhicngbgqg34wl91nm3556vzdgkq19gy52gvmqj47rj6rg";
 
     buildInputs = [ pkgs.v8_6_x ];
     configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ];

From 2fb2d1f67a1ad3328ad8cadffeb598959504e5e9 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 19:47:33 +0300
Subject: [PATCH 1712/2793] phpPackages.yaml: 2.0.2 -> 2.0.4

---
 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 40b773d4c57..f8d5b1728fe 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -155,9 +155,9 @@ let
   };
 
   yaml = buildPecl {
-    name = "yaml-2.0.2";
+    name = "yaml-2.0.4";
 
-    sha256 = "0f80zy79kyy4hn6iigpgfkwppwldjfj5g7s4gddklv3vskdb1by3";
+    sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp";
 
     configureFlags = [
       "--with-yaml=${pkgs.libyaml}"

From b0b623e0348777df34d1f49e094b560f411e387b Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 19:56:34 +0300
Subject: [PATCH 1713/2793] phpPackages: disable build with php73

---
 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 f8d5b1728fe..74b6b0dc52a 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -100,7 +100,7 @@ let
     sha256 = "105nyn703k9p9c7wwy6npq7xd9mczmmlhyn0gn2v2wz0f88spjxs";
   };
 
-  mailparse = buildPecl {
+  mailparse = assert !isPhp73; buildPecl {
     name = "mailparse-3.0.2";
 
     sha256 = "0fw447ralqihsjnn0fm2hkaj8343cvb90v0d1wfclgz49256y6nq";
@@ -166,7 +166,7 @@ let
     nativeBuildInputs = [ pkgs.pkgconfig ];
   };
 
-  zmq = buildPecl {
+  zmq = assert !isPhp73; buildPecl {
     name = "zmq-1.1.3";
 
     sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4";

From 43b2734f538161ed528cb5ab1eefbdc642805626 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 21:22:32 +0300
Subject: [PATCH 1714/2793] phpPackages.xdebug: fix build with php73

---
 pkgs/top-level/php-packages.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 74b6b0dc52a..4fb2a43da8e 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -145,7 +145,9 @@ let
     sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
   };
 
-  xdebug = buildPecl {
+  xdebug =  if isPhp73 then xdebug73 else xdebug7;
+
+  xdebug7 = assert !isPhp73; buildPecl {
     name = "xdebug-2.6.1";
 
     sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns";
@@ -154,6 +156,15 @@ let
     checkTarget = "test";
   };
 
+  xdebug73 = assert isPhp73; buildPecl {
+    name = "xdebug-2.7.0beta1";
+
+    sha256 = "1ghh14z55l4jklinkgjkfhkw53lp2r7lgmyh7q8kdnf7jnpwx84h";
+
+    doCheck = true;
+    checkTarget = "test";
+  };
+
   yaml = buildPecl {
     name = "yaml-2.0.4";
 

From 72b3ceaa2fcd025b2ffd7bfcc31a2edf6334dc1a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 10 Dec 2018 21:40:50 +0300
Subject: [PATCH 1715/2793] phpPackages.memcached: fix build with php73

---
 pkgs/top-level/php-packages.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 4fb2a43da8e..88422479786 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -114,7 +114,9 @@ let
     buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
   };
 
-  memcached = buildPecl rec {
+  memcached = if isPhp73 then memcached73 else memcached7;
+
+  memcached7 = assert !isPhp73; buildPecl rec {
     name = "memcached-php7";
 
     src = fetchgit {
@@ -132,6 +134,24 @@ let
     buildInputs = with pkgs; [ cyrus_sasl zlib ];
   };
 
+  memcached73 = assert isPhp73; buildPecl rec {
+    name = "memcached-php73";
+
+    src = fetchgit {
+      url = "https://github.com/php-memcached-dev/php-memcached";
+      rev = "6d8f5d524f35e72422b9e81319b96f23af02adcc";
+      sha256 = "1s1d5r3n2h9zys8sqvv52fld6jy21ki7cl0gbbvd9dixqc0lf1jh";
+    };
+
+    configureFlags = [
+      "--with-zlib-dir=${pkgs.zlib.dev}"
+      "--with-libmemcached-dir=${pkgs.libmemcached}"
+    ];
+
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    buildInputs = with pkgs; [ cyrus_sasl zlib ];
+  };
+
   oci8 = buildPecl rec {
     name = "oci8-2.1.8";
     sha256 = "1bp6fss2f2qmd5bdk7x22j8vx5qivrdhz4x7csf29vjgj6gvchxy";

From 3c155737127392a006bf33fc24fb6cfaa7519e47 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 11 Dec 2018 11:57:43 +0300
Subject: [PATCH 1716/2793] phpPackages.couchbase: 2.3.4 -> 2.6.0

---
 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 88422479786..481bdcdf81c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -34,7 +34,7 @@ let
 
   couchbase = buildPecl rec {
     name = "couchbase-${version}";
-    version = "2.3.4";
+    version = "2.6.0";
 
     buildInputs = [ pkgs.libcouchbase pkgs.zlib igbinary pcs ];
 
@@ -42,7 +42,7 @@ let
       owner = "couchbase";
       repo = "php-couchbase";
       rev = "v${version}";
-      sha256 = "0rdlrl7vh4kbxxj9yxp54xpnnrxydpa9fab7dy4nas474j5vb2bp";
+      sha256 = "0lhcvgd4a0wvxniinxajj48p5krbp44h8932021qq14rv94r4k0b";
     };
 
     configureFlags = [ "--with-couchbase" ];

From 22acb2e3c304bc9d40c9804d1a2268d7c1290104 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <abizjak.pro@gmail.com>
Date: Tue, 11 Dec 2018 20:45:18 +0100
Subject: [PATCH 1717/2793] vboxExtpack: Fix the sha256 to be hex.

It does not work if the sha256 is not hex, it fails because VBoxExtPackHelperApp requires to be given a hex hash.
See https://github.com/NixOS/nixpkgs/issues/34846 where the same problem was fixed some time ago.
---
 pkgs/applications/virtualization/virtualbox/extpack.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 703bf813686..d2c513e899a 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -7,7 +7,11 @@ in
 fetchurl rec {
   name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
   url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
-  sha256 = "1vria59m7xr521hp2sakfihv8282xcfd5hl6dr1gbcjicmk514kp";
+  sha256 =
+    # Manually sha256sum the extensionPack file, must be hex!
+    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
+    let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef";
+    in assert (builtins.stringLength value) == 64; value;
 
   meta = {
     description = "Oracle Extension pack for VirtualBox";

From 08e7fe7cb9fb62ede1e8ba1b6064f858388d5b23 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Tue, 11 Dec 2018 21:14:40 +0100
Subject: [PATCH 1718/2793] erlangR21: 21.1.3 -> 21.2

---
 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 965845c5a33..b787f3f44f5 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "21.1.3";
-  sha256 = "0374qpafrpnfspsvjaa3sgs0h8ryi3ah8fvmr7dm7zsmgb4ihdsg";
+  version = "21.2";
+  sha256 = "0v9smdp2vxkpsz65a6ypwzl12fqdfrsi7k29f5i7af0v27r308cm";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From 79e886a61b6c239230d17339be54474b46768765 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 10 Dec 2018 17:25:35 -0600
Subject: [PATCH 1719/2793] simavr: work on macOS

---
 pkgs/development/tools/simavr/default.nix | 29 ++++++++++++-----------
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index e28aad40ef4..f2bbbef7189 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut
 , avrbinutils, avrgcc, avrlibc
-, libGLU_combined }:
+, libGLU_combined
+, GLUT }:
 
 stdenv.mkDerivation rec {
   name = "simavr-${version}";
@@ -13,29 +14,29 @@ stdenv.mkDerivation rec {
     sha256 = "0b2lh6l2niv80dmbm9xkamvnivkbmqw6v97sy29afalrwfxylxla";
   };
 
-  # ld: cannot find -lsimavr
-  enableParallelBuilding = false;
-
-  buildFlags = "AVR_ROOT=${avrlibc}/avr SIMAVR_VERSION=${version}";
-  installFlags = buildFlags + " DESTDIR=$(out)";
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+    "AVR_ROOT=${avrlibc}/avr"
+    "SIMAVR_VERSION=${version}"
+    "AVR=avr-"
+  ];
 
+  nativeBuildInputs = [ which pkgconfig avrgcc ];
+  buildInputs = [ libelf freeglut libGLU_combined ]
+    ++ stdenv.lib.optional stdenv.isDarwin GLUT;
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
-  postFixup = ''
-    target="$out/bin/simavr"
-    patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
-  '';
-
-  nativeBuildInputs = [ which git pkgconfig avrgcc avrbinutils ];
-  buildInputs = [ libelf freeglut libGLU_combined ];
+  doCheck = true;
+  checkTarget = "-C tests run_tests";
 
   meta = with stdenv.lib; {
     description = "A lean and mean Atmel AVR simulator";
     homepage    = https://github.com/buserror/simavr;
     license     = licenses.gpl3;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ goodrone ];
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3e9663756..0172cd82699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12365,6 +12365,7 @@ in
     avrgcc = pkgsCross.avr.buildPackages.gcc;
     avrbinutils = pkgsCross.avr.buildPackages.binutils;
     avrlibc = pkgsCross.avr.libcCross;
+    inherit (darwin.apple_sdk.frameworks) GLUT;
   };
 
   simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; };

From 67b1265fb3d38ead5a57fee838405a2d997777c2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Dec 2018 21:18:22 +0000
Subject: [PATCH 1720/2793] bundlerEnv: ensure dependencies always included

Suppose I have a Gemfile like this:

    source "https://rubygems.org"
    gem "actioncable"
    gem "websocket-driver", group: :test

The gemset.nix generated by Bundix 2.4.1 will set ActionCable's groups
to [ "default" ], and websocket-driver's to [ "test" ]. This means that
the generated bundlerEnv wouldn't include websocket-driver unless the
test group was included, even though it's required by the default group.

This is arguably a bug in Bundix (websocket-driver's groups should
probably be [ "default" "test" ] or just [ "default" ]), but there's no
reason bundlerEnv should omit dependencies even given such an input --
it won't necessarily come from Bundix, and it would be good for
bundlerEnv to do the right thing.

To fix this, filterGemset is now a recursive function, that adds
dependencies of gems in the group to the filtered gemset until it
stabilises on the gems that match the required groups, and all of their
recursive dependencies.
---
 lib/attrsets.nix                              |  9 +++++++++
 lib/default.nix                               |  4 ++--
 lib/fixed-points.nix                          | 10 ++++++++++
 .../ruby-modules/bundled-common/functions.nix | 20 +++++++++++++++++--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 2a1b866dbc5..d374d229f59 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -94,6 +94,15 @@ rec {
   attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs);
 
 
+  /* Given a set of attribute names, return the set of the corresponding
+     attributes from the given set.
+
+     Example:
+       getAttrs [ "a" "b" ] { a = 1; b = 2; c = 3; }
+       => { a = 1; b = 2; }
+  */
+  getAttrs = names: attrs: genAttrs names (name: attrs.${name});
+
   /* Collect each attribute named `attr' from a list of attribute
      sets.  Sets that don't contain the named attribute are ignored.
 
diff --git a/lib/default.nix b/lib/default.nix
index d7a05fec833..e4e3e7d325a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -61,10 +61,10 @@ let
       boolToString mergeAttrs flip mapNullable inNixShell min max
       importJSON warn info nixpkgsVersion version mod compare
       splitByAndCompare functionArgs setFunctionArgs isFunction;
-    inherit (fixedPoints) fix fix' extends composeExtensions
+    inherit (fixedPoints) fix fix' converge extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
     inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
-      getAttrFromPath attrVals attrValues catAttrs filterAttrs
+      getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
       filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
       mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
       genAttrs isDerivation toDerivation optionalAttrs
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index 7169c46fcbb..2f818c88de5 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -24,6 +24,16 @@ rec {
   # for a concrete example.
   fix' = f: let x = f x // { __unfix__ = f; }; in x;
 
+  # Return the fixpoint that `f` converges to when called recursively, starting
+  # with the input `x`.
+  #
+  #     nix-repl> converge (x: x / 2) 16
+  #     0
+  converge = f: x:
+    if (f x) == x
+    then x
+    else converge f (f x);
+
   # Modify the contents of an explicitly recursive attribute set in a way that
   # honors `self`-references. This is accomplished with a function
   #
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index b8e666a92f9..81e2fa35329 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -1,5 +1,9 @@
 { lib, gemConfig, ... }:
-rec {
+
+let
+  inherit (lib) attrValues concatMap converge filterAttrs getAttrs;
+
+in rec {
   bundlerFiles = {
     gemfile ? null
   , lockfile ? null
@@ -22,7 +26,19 @@ rec {
     else gemset;
   };
 
-  filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
+  filterGemset = { ruby, groups, ... }: gemset:
+    let
+      platformGems = filterAttrs (_: platformMatches ruby) gemset;
+      directlyMatchingGems = filterAttrs (_: groupMatches groups) platformGems;
+
+      expandDependencies = gems:
+        let
+          depNames = concatMap (gem: gem.dependencies or []) (attrValues gems);
+          deps = getAttrs depNames platformGems;
+        in
+          gems // deps;
+    in
+      converge expandDependencies directlyMatchingGems;
 
   platformMatches = {rubyEngine, version, ...}: attrs: (
   !(attrs ? "platforms") ||

From 83a2d993d401a65d98784df5cc9fb1ea72e2f2a2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Dec 2018 21:19:32 +0000
Subject: [PATCH 1721/2793] bundlerEnv: include all groups by default

This wasn't really an issue until the latest minor release of Bundix
(2.4), because prior to then Bundix didn't emit group attributes, and so
this functionality of bundlerEnv wasn't really used. However, it is now
apparent that a better default for bundlerEnv would be to include all
gem groups by default, not just the default group. This matches the
behavior of Bundler, and makes more sense, because the default group
alone isn't necessarily useful for anything -- consider a Rails app with
production, development, and test groups. It has the additional benefit
of being backwards compatible with how this would have worked before the
Bundix update.
---
 .../ruby-modules/bundled-common/default.nix            |  2 +-
 .../ruby-modules/bundled-common/functions.nix          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 1b64456fb20..c31dfb63b3c 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -17,7 +17,7 @@
 , postBuild ? null
 , document ? []
 , meta ? {}
-, groups ? ["default"]
+, groups ? null
 , ignoreCollisions ? false
 , buildInputs ? []
 , ...
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 81e2fa35329..f477b2bee7c 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -1,7 +1,8 @@
 { lib, gemConfig, ... }:
 
 let
-  inherit (lib) attrValues concatMap converge filterAttrs getAttrs;
+  inherit (lib) attrValues concatMap converge filterAttrs getAttrs
+                intersectLists;
 
 in rec {
   bundlerFiles = {
@@ -49,10 +50,9 @@ in rec {
     ) attrs.platforms
   );
 
-  groupMatches = groups: attrs: (
-  !(attrs ? "groups") ||
-    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
-  );
+  groupMatches = groups: attrs:
+    groups == null || !(attrs ? "groups") ||
+      (intersectLists groups attrs.groups) != [];
 
   applyGemConfigs = attrs:
     (if gemConfig ? "${attrs.gemName}"

From 26053cae74248f77bf34fb2a3f0efa0ec2af822f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Dec 2018 21:22:45 +0000
Subject: [PATCH 1722/2793] bundlerEnv: always include default gems

"default" isn't really a group, it's more the absence of one. With
Bundler, this means that a gem should be installed unconditionally,
regardless of which groups are specified. It doesn't really make sense
to allow these gems to be omitted from a bundlerEnv.
---
 pkgs/development/ruby-modules/bundled-common/functions.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index f477b2bee7c..6324f27e9fa 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -52,7 +52,7 @@ in rec {
 
   groupMatches = groups: attrs:
     groups == null || !(attrs ? "groups") ||
-      (intersectLists groups attrs.groups) != [];
+      (intersectLists (groups ++ [ "default" ]) attrs.groups) != [];
 
   applyGemConfigs = attrs:
     (if gemConfig ? "${attrs.gemName}"

From 3bde31f1409536db51102e16a0cf94a2e1ca60f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 10 Dec 2018 17:18:35 +0000
Subject: [PATCH 1723/2793] zfs: switch to python3

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index c66a5b37bb0..9d48ee01509 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -3,7 +3,7 @@
 , configFile ? "all"
 
 # Userspace dependencies
-, zlib, libuuid, python, attr, openssl
+, zlib, libuuid, python3, attr, openssl
 , libtirpc
 , nfs-utils
 , gawk, gnugrep, gnused, systemd
@@ -54,7 +54,7 @@ let
         ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
       buildInputs =
            optionals buildKernel [ spl ]
-        ++ optionals buildUser [ zlib libuuid python attr ]
+        ++ optionals buildUser [ zlib libuuid python3 attr ]
         ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]
         ++ optional stdenv.hostPlatform.isMusl [ libtirpc ];
 

From 1181d6153e3d43bdd68658358120e966037748f2 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 11 Dec 2018 16:51:16 -0500
Subject: [PATCH 1724/2793] logind: make killUserProcesses an option (#51426)

Right now it's not at all obvious that one can override this option
using `services.logind.extraConfig`; we might as well add an option
for `killUserProcesses` directly so it's clear and documented.
---
 nixos/modules/system/boot/systemd.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 89f8e815355..d1029bb5798 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -601,8 +601,27 @@ in
       type = types.lines;
       example = "IdleAction=lock";
       description = ''
-        Extra config options for systemd-logind. See man logind.conf for
-        available options.
+        Extra config options for systemd-logind. See
+        <link xlink:href="https://www.freedesktop.org/software/systemd/man/logind.conf.html">
+        logind.conf(5)</link> for available options.
+      '';
+    };
+
+    services.logind.killUserProcesses = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Specifies whether the processes of a user should be killed
+        when the user logs out.  If true, the scope unit corresponding
+        to the session and all processes inside that scope will be
+        terminated.  If false, the scope is "abandoned" (see
+        <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.scope.html#">
+        systemd.scope(5)</link>), and processes are not killed.
+        </para>
+
+        <para>
+        See <link xlink:href="https://www.freedesktop.org/software/systemd/man/logind.conf.html#KillUserProcesses=">logind.conf(5)</link>
+        for more details.
       '';
     };
 
@@ -771,7 +790,7 @@ in
 
       "systemd/logind.conf".text = ''
         [Login]
-        KillUserProcesses=no
+        KillUserProcesses=${if config.services.logind.killUserProcesses then "yes" else "no"}
         HandleLidSwitch=${config.services.logind.lidSwitch}
         HandleLidSwitchDocked=${config.services.logind.lidSwitchDocked}
         ${config.services.logind.extraConfig}

From c054af4e58536f952e8d18d2c7d5c76435c2d4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Dec 2018 18:12:55 +0000
Subject: [PATCH 1725/2793] filegive: use buildGoPackage

---
 pkgs/tools/networking/filegive/default.nix | 41 +++++-----------------
 pkgs/tools/networking/filegive/deps.nix    | 12 +++++++
 2 files changed, 20 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/tools/networking/filegive/deps.nix

diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index a76519b36b5..d8aed9ad8e0 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,16 +1,6 @@
-{ stdenv, fetchurl, fetchgit, go }:
+{ buildGoPackage, stdenv, fetchurl }:
 
-let
-
-  # Code with BSD license
-  srcNatPMP = fetchgit {
-    url = https://github.com/jackpal/go-nat-pmp;
-    rev = "e04deda90d56";
-    sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
-  };
-
-in
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "filegive-0.7.4";
 
   src = fetchurl {
@@ -18,30 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
   };
 
-  buildInputs = [ go ];
+  goDeps = ./deps.nix;
 
-  buildPhase = ''
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "export GOARM=5"}
+  goPackagePath = "viric.name/soft/filegive";
 
-    mkdir $TMPDIR/go
-    export GOPATH=$TMPDIR/go
-
-    GONATPMP=$GOPATH/src/code.google.com/p/go-nat-pmp
-    mkdir -p $GONATPMP
-    cp -R ${srcNatPMP}/* $GONATPMP/
-    go build -o filegive
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp filegive $out/bin
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://viric.name/cgi-bin/filegive;
     description = "Easy p2p file sending program";
-    license = stdenv.lib.licenses.agpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.agpl3Plus;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/filegive/deps.nix b/pkgs/tools/networking/filegive/deps.nix
new file mode 100644
index 00000000000..24c26219508
--- /dev/null
+++ b/pkgs/tools/networking/filegive/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "code.google.com/p/go-nat-pmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackpal/go-nat-pmp";
+      rev = "e04deda90d5683d6e375732740814a89eea7bafd";
+      sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
+    };
+  }
+]

From 56fdf7a29620a45049b3714cb7023b619aedea85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Dec 2018 18:14:43 +0000
Subject: [PATCH 1726/2793] acbuild: remove

Project is unmaintained. The project page propose alternatives:

https://github.com/containers/build#this-project-is-currently-unmaintained
---
 pkgs/applications/misc/acbuild/default.nix | 37 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/applications/misc/acbuild/default.nix

diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix
deleted file mode 100644
index c1b8a7eb866..00000000000
--- a/pkgs/applications/misc/acbuild/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, go, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "acbuild-${version}";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "appc";
-    repo = "acbuild";
-    rev = "v${version}";
-    sha256 = "0s81xlaw75d05b4cidxml978hnxak8parwpnk9clanwqjbj66c7x";
-  };
-
-  buildInputs = [ go ];
-
-  patchPhase = ''
-    sed -i -e 's|\git describe --dirty|echo "${version}"|' build
-  '';
-
-  buildPhase = ''
-    patchShebangs build
-    ./build
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv bin $out
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A build tool for ACIs";
-    homepage = https://github.com/appc/acbuild;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dgonyeo ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c719f93d0b..57ded3beb5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -450,8 +450,6 @@ in
 
   abduco = callPackage ../tools/misc/abduco { };
 
-  acbuild = callPackage ../applications/misc/acbuild { };
-
   acct = callPackage ../tools/system/acct { };
 
   accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };

From 26572ea27df5d665898d0b77d1938a80d57902d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Dec 2018 18:28:09 +0000
Subject: [PATCH 1727/2793] xurls: 1.1.0 -> 2.0.0

---
 pkgs/tools/text/xurls/default.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 5e3f8782852..55619b41632 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -1,30 +1,18 @@
-{ stdenv, fetchFromGitHub, go }:
+{ buildGoPackage, stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  version = "1.1.0";
+buildGoPackage rec {
+  version = "2.0.0";
   name = "xurls-${version}";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
     rev = "v${version}";
-    sha256 = "05q4nqbpgfb0a35sn22rn9mlag2ks4cgwb54dx925hipp6zgj1hx";
+    sha256 = "1jdjwlp19r8cb7vycyrjmpwf8dz2fzrqphq4lkvy9x2v7x0kksx8";
   };
 
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    mkdir -p src/github.com/mvdan
-    ln -s $(pwd) src/github.com/mvdan/xurls
-    export GOPATH=$(pwd)
-    cd cmd/xurls
-    go build -v
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv xurls $out/bin
-  '';
+  goPackagePath = "mvdan.cc/xurls/v2";
+  subPackages = [ "cmd/xurls" ];
 
   meta = with stdenv.lib; {
     description = "Extract urls from text";

From 2f08806ee6343f727f6d244eb2dcdb080c92ea14 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 11 Dec 2018 22:10:43 +0000
Subject: [PATCH 1728/2793] firefox-devedition-bin: 65.0b1 -> 65.0b3

---
 .../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 20da9410999..eb4d163d4ae 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 = "65.0b1";
+  version = "65.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ach/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ach/firefox-65.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "cda7c4c170db4b718493259e67b266851211754de4edda61957b1fd8d5491e3a0e2c17728d101e13ca03a999d2794f65b62798840103675a7e1e1ca76885f6e9";
+      sha512 = "3aa5439e7ad47441829aea92cedbd0c1752fe37a9f62c0f12c798759991968a7efbd5d0d431367d861642f069b439de5bcc8b4d14c4ddc9d92185b3caa012a12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/af/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/af/firefox-65.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "695a5ccfb932bbd6a2d2257969076ad458e21b62ca3222b6614d63543bd71459bb133e53b88366915e2f874ae7490b80efec7682ff174a3e19d4827e3b73de3e";
+      sha512 = "e0f1e577945d5fb2e7a71d94012c7a3283a2c1edd8336308790d5aa3f4a41ec8d14afc5f62f9f5d396c1946eb0fa288be59e7b14d446f90b81ed61002f28bd3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/an/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/an/firefox-65.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "457ed14f27a2a502baea9d46a7b4b7e0fbdae13d90a84549d238a4fce62486f120ca61ebb137b33fa5df72d1b86d38bc27882a2055f6fd7c2d6d48976f476153";
+      sha512 = "6aacfbe4543bacbc47d8967871e25770f21290ef1af41d2705ff5bf46cbe3d299d98e32505f9978675bd73b36ef8f6e758c57f8d99c808790d7060f57094025d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ar/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ar/firefox-65.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b859161c50a0e038912c7428cd8a0996d85dad299149caa1f97d8f9380e93395358c71f900b9dbde3061dc30f5a5dc1071e34981ea9678eb53a84a9498c5e7c6";
+      sha512 = "3c4870634f51668e21314d91995328c855bab7652cd4ad50068da258450ea7419bc0dc7cf629276aaaea379489a102068bfd3019b82ea75d321b1e2009b375ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/as/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/as/firefox-65.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "576f0ade4da85f351937cc71bd87020a917b1d6eaf82a406a5b657872e08d4b3120e42941a40b8625e248860888a2c197b0bf0a0ac97f07ea2ec7b26c302f7a1";
+      sha512 = "533996de7c7174c625beb5ac55e237f7740e2e5524a26dc58c4a1074d6bd8e5224ef972592dc00e1839286eee020c0eea6c88f007a4f4cff92b0aa50238c1991";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ast/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ast/firefox-65.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "75504d6c5c990db69e10ddc99f8b5d464eddf45adde7607d7957b3c85979cb8f30a5476eb7a5ce1cd6d13d71c77c4951dbcb047492af5c2774f303787a872006";
+      sha512 = "2ad54d678986f7d1b72e31248fe7ce466d56b32156639175d408e2dad1f880150404a0092635eb833980d53ba4bae2d5e79b5394b8ed23f4f2dd68fbc2307e68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/az/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/az/firefox-65.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d89073193e0a4ac3d34313acea7debd4a4fef6947c0f8aac2f6f27518465ea7700c9cfe4b2f8d5873e22cc8e474e3f14267863aaf005b42313ecb5e7e7bae306";
+      sha512 = "f0a2e11f7f7ccccabc31b20c4fc47e7bdee0f5c6c406080db9bcda7c782bed771f53448b0226b3314d0b5093c87cb49fdf6c08ad0365b16149ec5dd553aa9c3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/be/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/be/firefox-65.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "cec23816cb37ba0a61a82c2667bd78fc546268e1cce79a81c311676ef2c5afed56021775bb93980abbe3f2af7509320d24618dccc5fedeb6afe05966f2a5da31";
+      sha512 = "28651ba3acc73a0736e889a51b8b25a8c900eae946f1dcaf6518ae9d3335332bc0489c63e71c14d45285925f69a9fec01322fec3e9c5b27d724b02b77c4dc5c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bg/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/bg/firefox-65.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "3e791bfe134304a1dd25fffa6c4fae90bf3e8132e9a09eb15560b5a98d490cb7338c2edff625a1710339df1899122a18ab9f5154c3b9b387acae22dd4c864b86";
+      sha512 = "b632b7ecfc470ccebf913f9d94143c2252374e010f6c0c0f056cd2dd9b2ca5ea642bc222128478dd410c5d434ed412428c5ffd2dd5ee793e499c0a7442994cdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-BD/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/bn-BD/firefox-65.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "6305b0774042bd1b5e06e2aa261fe9fad21d484c79ef157d9e95b655301f4f847247006e933c090602f1bc5a5228178998f8f59fec598b44f12ff64c1689f763";
+      sha512 = "58ad674b45837ca4cafd42dabc299b017f4048f759f71b768b4485b036bd76d17ad04ea30ce9315e17abad3448cace0d212043e32c4b676ebb6a6e3ed90cb904";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/bn-IN/firefox-65.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "ba3d09a95797ea28a13366ef743eff2fc55686d507ee9f8bc73f451efc4cae00e7d53c52b1d24e83b44a7d025a9c4222bd7935143f5b47d3f7ed909775fc719b";
+      sha512 = "0a09785b10a2230a7fec2e8cc86b7e5ec7e7dd7b21e4135f8bdadc019679855c57fe2eb35677e52744c6aa0f77ac56d2d7d8574de28c1ab56f30c8d2d3279700";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/br/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/br/firefox-65.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7e4f20e12e014a842eaa9f77e701466e00af93015c27be529e69673a87df2cd0f8b22dab0e006038ddf32f2cb4bcd2f7f6c64709c252580dba22ba538db1c744";
+      sha512 = "7eb6e634114cd06e69ef6bcc6cc90620a64beb8428a817ed6af9d7e4458ec8a356e908bb7371fa8b7fba309e57af97ada2b2091ef43a82dd08b984fbfac9c445";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bs/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/bs/firefox-65.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "106e874f0127ec73a92fce3733b200bd052c4205c6698044b82d60e42a042b1c5e5b71e9352e8ce0b470cc8c9bc39c28b2166654bb0729c966e1f44b5daf7207";
+      sha512 = "0e92d50db1f7b09a72eaa9c05efe7231def8bcdba1c8bcf32d09d1c465dc7f20d0b274d54a9f5d5b8ea78cb25267efd3e40d6888d58d4400a9db6f492428c637";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ca/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ca/firefox-65.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "4615f72786085295e131437972c39382bffa4584e3829253795d9bc961df97cf87edc8e9ea1218914f444d1041819f8235b36e116abb2aa5867fd65c3284d76e";
+      sha512 = "ab5fd6fcdfb68cff391a41eb3fafc5f2441443e2e8e5885c56e6487893b87944b97534dd35bc961589f16a47dce8ca383fe5100ed4871643f46f8bfa8c429d5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cak/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/cak/firefox-65.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "acfbd95d08214f103dab546cf5087194d004e24a4163d41c82bb127d0c94375fbffc8c8ade0757f3e624fd2aac8fc9fa6519a6cf1b355c203afd5270847192f6";
+      sha512 = "919c8bd41c73730103ab32392056fe5fb2720a4d1f946b9c74cf4167e777009b002caceeab7af7fcc892f149d60a52bae3fbe7e57a16222a4e27413b4c5bdb82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cs/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/cs/firefox-65.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c60bbeb2fb880eae5115f317dc30573adb6917eff8d49364b2ed34ef821b90f17d275b77cfeb2c081a80f4cdbeb1ac0e02c920cee1aaa45ddba855861f0955d9";
+      sha512 = "e105db62289d2fb85edfa2d51084221fdeddd43b8ed74d78c427f3293b43b5babe6f994b61752578816883dd6932481a37798c58f00b1087715d150263d597d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cy/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/cy/firefox-65.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "5e5e90de26b784d81f5b68674714e8d14ff347b039e9664137ba8d94523d3f0c0fb0e0112b5961a56874aa6bbf30b4d3e7884bc46c9ab5818cd6aaac36047243";
+      sha512 = "45b0ded47574b185326a76039b40eeb99b288aba39a5621cd4ed65f9ae3fbbe362d95450cef60fccb6358fb961db61d7ebfc46652249923d99d5614d0f1bd22d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/da/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/da/firefox-65.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "66ae41f79975e00ad845b93f50fdd2d4eb8d11186ecc7dc786de856e47f44ab8fad6b5149a9ae8ca9ecc2b4020c92c07f7cae12ef0d9363184ac0e189c8650f5";
+      sha512 = "46723016e1760dbcabb43867ee85bcc3f78e1a417df73c444d2c2579ba9122ab2690c3fc96a5c563515d6f53f4f12ddca10cf0bf9868624e0b2e6248c6d3e184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/de/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/de/firefox-65.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "37697c4868bd4b8e8becdc9ad8c6385a1b46bb9a09d35c2a56d99464de2def74ebb533a5914bf1689f778164e30be836ea0c88e1361f3f4028f02294f8248e28";
+      sha512 = "543087fa053dd5f1b239034af4f74d52756c61cfa223e736cc38ba886b0df707533301330a7fed921628f82dee00d919f909fcc2c28695fa0f35c1f84793bb0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/dsb/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/dsb/firefox-65.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e40cafc2e024af7265b6ffa6a8be0f16862b1f1eb7a001f3710b501fdd92dabdff78f1f0abff3d537bf9ab266a988c7892e87dae074d00430522fb64bccdc31a";
+      sha512 = "338c36a61edbdda57477a8505cd58e9d14510c9fa52ed2dbc3ba955effeb1629648a8a2eae10419e136e861704cc592ac58f61c0c3f16c0b805cb2d5096288c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/el/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/el/firefox-65.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "0f678f8a5a34072e0530c2086e749a696a88e23c0981b2ea0664865b3b127954a1121e026dcf403aef03e3d00ad76a0f95c98677cd5a89c95216e0659fdcbbd4";
+      sha512 = "33be0fcbb337b1695f6d11ffa483cf34602cfb338f1bb1f3cee0e340b4b3368a78df45c4ce5bbb6475ba42ea0562647d8914f5981b9607734eba7622ad316d2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-CA/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/en-CA/firefox-65.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "3c60f3542444c61846d94d0116b8478269fb347b57c1cb000274988c6adab1a19c22d7e8050d005a35df16943ad3efbcdd99bd9a7bf7b767886472f110bea20f";
+      sha512 = "61d585d5c7f92eea06a2b3b4d792fa4dd7928343072972983d3a4137bf95b6567097c792597fee4eb7a6de83a7102543496b9fec29267b52fafac95a79f6a99f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-GB/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/en-GB/firefox-65.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "e623be71b1c54f833d6dce20ad2ec8a5c51d5222f67550a8e4e5811d432d710f74bb8e7e3c3b6fd7e5bc6830ceb7392b28923885b232b1d642277c06e41a3fd6";
+      sha512 = "c7ff1736b0bf2d088fb9aac2cb88ba16135189847e6b15db3854e86d4068a7e9473a5ded175e4334930e967a83af1087777540b9575051cc81c2448449ee7249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-US/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/en-US/firefox-65.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "da2205be3e9d672bf34e1055ee9a5eac461fd5172d2cb2dc9ba9eecab94e7559b6399eb904b2cc3483758cf3658f7b2554484e328491951632d81dcbfd84821a";
+      sha512 = "ef8f4546d944cec5caf53fb80cdca07f790befded785abcb38084231a396ac4fd2aaadba7a385eed6fd195036244c61265b495def25dc168a089207e2b972825";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-ZA/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/en-ZA/firefox-65.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4aeccb63a94809737155f85a9e83c15b8df49b3c28dddd7db547079b46f15b7a5eedef75881ac32337097175193b38bd7de3e47f30dd18b56f1ff31bb6d33aa7";
+      sha512 = "08e5bebb32f2d0e29700cc36588d6b684560b31a6357459aa59c51e236ddc1216c6ad2b66e2440b243119f013b8dd924b6ca0ae7747239d9d35df486c2c4de66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eo/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/eo/firefox-65.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d7984116570d78194c6820342f591ec17eebe9ba6abc6e81f34d8810a24329b236cc37a705e3df8acda8eba4d1627d4a2970e794de6bd6ef76fbf9e57028230e";
+      sha512 = "70b68785eaff8fef237cebfa817fccd6b0ede7628630cf719cbbc155860c6ae8befbc1ff0b25b47a3a3ecfed2d43510beb64dea2569ddbe3ddf5709b2602411f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-AR/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/es-AR/firefox-65.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b4e9d60707d70e94f2e4f1ed5d6a0994e431793c01c7d492afe72f5674a14bfe1524df6cc0d2a4e20897a5baf76b51e037fa96554f460a375eb281634001e518";
+      sha512 = "1597f16eef402d1eb4a04dc605bb4b5fa4a9ddfee24eff8643c3daafca13f99e84aa865311d660dd88c19927f6175679992d6572f33efe24523a13916a6fb3bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-CL/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/es-CL/firefox-65.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "2b8bc684e2f45f44f293a891b11d4d9bc0b43c55c12e6186d045ae0a6c618d1f96109680320506e913ad5425b19e22ad3004afb3b11dcadd7fe44133f4a40cec";
+      sha512 = "ee14a1ff4ebba53eab209c1bb8d140a918aa392fe91c50ece378338bb0277867ce624adcf8ee67868c654fe8421772c9e8fd0b59d1e0ffe773b57ff3e9c93850";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-ES/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/es-ES/firefox-65.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "20294f5f5f88b000ddb8c9d9016c85ab49956fa34132b85417356985f14c2e5abeea7d96bb3dc6f636ab2baf68ce55507a6b6444e5b2bf6272344c0664ecf2db";
+      sha512 = "45a7542c064a1faac52f5691e4cbee997e895b3aa102b7b485fa9f0f8e63876a646c86558c48f1c06ebc322793cc54fdffd5faec45b6a4fc731e28b08e82e644";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-MX/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/es-MX/firefox-65.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "c8b66a1198dd6975a372fc5667b2d9bf38313096dee2a5c34ccd2ce775cb09bb38f6ed6f28a9834d636745e23534f994380250ab594d6e1d366c75dc1cad1501";
+      sha512 = "6d6668a13b42ecf21a36515252024a8698585cab7053960a3c5f521d2d01bc349c03ddbc7038f5e3476ecfac94ce598d8158525f4916882faccb4a2282ddc564";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/et/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/et/firefox-65.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "51bf60f606e202e641b1bd49b34412df1c3a33139b16771748aa9a8fb1cf6a8ceb2d09f2be9abd485cfdbdb6b6aafb01c762d9a05aab442eb5f86df936a731c2";
+      sha512 = "f55e56a6091b08a953c12aab6c2c0bb00c086192081a6047d3bdac02966156e8d419acf1a1510fc4effcaae3eac52f81211627a187639ae64a8217f02a1c1ae3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eu/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/eu/firefox-65.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "92ac8a65623dbce8730627a2eb83104ecb91114db18813630aecd22144f79a3cff7e1a44910259d40006115150ccf0a64e2f300b9d7b5093c54af43fb4403953";
+      sha512 = "f06ed33998a7762a715fc1faa8ea7057b4cb0a13fe8df61170e746866dfa1eac6e0f1bdbc2c58f827287d6dd44312a378f03ed84983fd50ebbf98c3767d7975f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fa/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/fa/firefox-65.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "49201d2a1788e8a8916a8caa95bd350b6b157f410735f3ae33c6a2d3648b47590d72b6ea5a49e6080f6593687a1531d7ec2aa0dee820960be52ec56d3517aacd";
+      sha512 = "954eb387583e99e56736b760fc47ee7e7930728add9c600e1ef89c7cc3f106016116a267ca64f59138a9ce7d0945f5954588527c6d25a64da15a8cb29f5128dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ff/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ff/firefox-65.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ad097eb38f73cb79451a753ddbd2cf68a2871ecd37b16d2e2d2b58463631d6bceb5bb301c4a0cea85cd207a87e5447c3b8029e0fc8a0b0114186a562b7f4ceca";
+      sha512 = "174d87ff82c6a1320b78700a1fb22212559fb79cde45720c371bf0e4edce7a6e3eec7cc67934d29349096d30f2754e389ec3dd28611ddd0ee13cb68b9b26ea56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fi/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/fi/firefox-65.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "151d9f2bcda0e74a9a12eb27e5f550ae082a98092db4c7fd3537993783cc623149a5abcde16a9221b1c91fc968d6b84a0d0bcde1f170705cd5054a4bbe3dfb92";
+      sha512 = "b874a5b6bb31f3be67e82f120ea2895bd97792f66487f9f6bdd0b04869f6d23600f4d64a62c465b9b2e69d3e0849f92337bdbe9b5b2413ca2c99a0c3ef22677c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/fr/firefox-65.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "54ff2685bce6f1972b096c87e287ad3d612c0b7244e418344f0bedd72da2f69eceb0b913094e928668a3d750999213e2a5977a4362a6cbff7b78589cd5c9ca23";
+      sha512 = "6a3c5868a0572d4eff75cf58130cbde61145fb839c84b5d91f3487ff8127381a7fe73c8a1199e30a41e43271bf9160988689b47efccfd59c116d2c452d5d1ef6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fy-NL/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/fy-NL/firefox-65.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "c6d1e3f27a96486c0797eb1f5bf6936f6543456e31d56d0019879513e1c06511bca297ccfe76936ba0a550daca15521238c468aefe38e93a8f56d4e8f0fa049f";
+      sha512 = "2a1743e63e89afe2dd5306b2355d1846ac6fc53d430f967003b7e1563242922eff3fd6937953e8c7b3a339f005abc0167b429d118a685406d045178e9025b46b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ga-IE/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ga-IE/firefox-65.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "22454e0f678e2905c55fd312e0d3a2be18e0ce9664bf6f6b3588bd63b9ca7452e532640a631f9721fb54aaa063975ac82b4b07caed139f44db9835c521ea38c2";
+      sha512 = "19f1904a8669cb82203fd4e281213dec248739e759a0bf9d15dcd224b12f3933e46ffdd0f0ae690e690d245b19d392b24324cd5e62326711d5496572c4b82f03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gd/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/gd/firefox-65.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "7b11d439f5b8fa1bf5709d147abb3d1bb98a00a6573f4784a95ecc900b9a1a8942c9a06a227b9a3c11ef086b597ffd41314d07b7b3392a574c5d6043d1548d0d";
+      sha512 = "e21bf30311b642e1115510ce355032261576d0db4c895f96775326993d3b5091a9008a0c6c87bdc67b1ca30f2cd3c98dc911d6d1b710abbd0ca0c32c524a4793";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/gl/firefox-65.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dfba4673003970e16be3b9c3cd729969c780403955f4c16d73b3b7f1360f6b30d91e59e8f5ba5088cb557dabac3349a8a6d8dd67af50814b5968312a7b694946";
+      sha512 = "09a41973b51590c83de0b7b85ee19ab1c9c4d40e9624cbc5241a24d54299fc21da705ef085be5f2de834b2d7c81471fd697aeaad4c67cbdae7a4f4825a5e7135";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gn/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/gn/firefox-65.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "adc62b0f457a981d8bec415c3812f904bce32086289a344d6f1f66fd4d9820b7a05358c10e039a16ce7a85dbf18a437aca880b53e83380c5159c5d4339399792";
+      sha512 = "4672432bda6e1a52f2a4103f81b871b00a10ada6841162653c3fcc5d1527bc93d2aa76bce5f905b4ebebff7b2df0358cea046ef5c55ff92a9b409b8250c8001a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gu-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/gu-IN/firefox-65.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "92ef72ea19e9202d5712278ea4fcd24f1fa24fa8c9adbe7468e2205d9464fb39488c32c6ee90731cddde9fa581dbc79e31df734a05489abec0be5fc8b99f831e";
+      sha512 = "09523e6bd2933cba6fc3006d8397b3c27056f971996f71a8dd02c3b1488b9498f7810f13b72d7761866127ccf2655015e874058e1a025e418c2e4b14c6444bf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/he/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/he/firefox-65.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "1760e4810ee267ebb1105873b8a6b273cba7973537d59d82c1199a3a719c910e0b98e101bc4609dfd9b26856816ac7079d771403f51f01262672d534456e30d1";
+      sha512 = "c781597491bd387a1131f3ca77981338e3e82c98477f3c1232a1e5b036ee1a879a0cce1bebe6163ae40bc36b106db580adf593b83911b580e9370319eb1d14ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hi-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/hi-IN/firefox-65.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "51c28e5c04fe4cecd9e9f8aee5debeccb3d85cee0dc0c495e5a114c677d7c9110cfdf601be947f25b127a33caba24094bdf80fa8bbc76c659ea56271f321ceb6";
+      sha512 = "221beae00d178ce8760d50d3d574aac49054fa7f64c2d70acea604c180b9837bb46e018930075a67c492db87170070f381df1707762f2986d035715c4b128c86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/hr/firefox-65.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0b270dfec2f9a7ef6a616f14929b230d8414239d00f690ab2e6966b6b8dd7aad2af9a70e2d764d70773dc7bc7591de7fef00bf07a44d9398ac65768c84269bf3";
+      sha512 = "a5fe87e93f385a3eed5b79f4023e21edcd0f0dc8621e8806e53c12459fc433849adac3119e7be7555f30e18b0c74d6134a0458b370e01a1befd546fb94b94b49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hsb/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/hsb/firefox-65.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "0b51c0e6ebc7beb81a4fc57966e91f02accd5abe6b8ca4ab67b2d51798efb51797b26b17bcc28cd9200430c0415d9f9c506c35d2035497e4038f4ff97af7de5b";
+      sha512 = "e207628a4ddd04cf149a2cc106e5465e609fe48613fe97125d2fd976552955482d34995f831e6db59d21628acaf20725ed436d1fcf6d896536ba2dcaacbf5d4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hu/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/hu/firefox-65.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "193a5e7eb8065ce4c17cf18ef3a268b00a7d1a0394761c8c22fc88ccb20abfac20dfed8cf32c9e128cb6a67af54c5519a48b789674ee0e24f05fec50a7428b8a";
+      sha512 = "035752b88f754fce44877a696e0de7ba228d3fdb1af46e78b1616ca8c21be1d7f382985f82538b32dd36a7c50d7c01ef55c6de50ae64c87813e308953168b2b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hy-AM/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/hy-AM/firefox-65.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "78d87eb8c49b5e2df1d09ca8a31bf07f8e8e0bf0004ea0dd8d185f3412489fe66d2501e1feef51f788ae4c5c77e53255cc7adb15f0f5e20d0eb55fdf4a762fc9";
+      sha512 = "86454db0cac982948ef32434ded1c33b51496d872a5cbd2d2bb02a77e7ffc0276e2a3f2de30a1f22cb7842ff688a7292e4785c194abd791e529dfe63d1eec787";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ia/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ia/firefox-65.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "8653cafcb6b64abc2c6ed62487ad75331b236c6610bff79934d44882407fa1abd4b85fc53667ea14db4099626088cfd798aca495ec89c8a5bf14768e13ea7f81";
+      sha512 = "013ef16b3f3cee11281e86081f3e2e729d2cdaf36863e15c4e55f0c34a434791c764e0bdd3e62c81072e2694180be37af90bc9b7e3ad87f25055a9d5e05f9d36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/id/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/id/firefox-65.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "eb601d0e7aae1e322db14b9e769ee67331c2df0dba34d92693e50b6e0978e2a65c1fac06c1a28e2375d18618c0f582c45e5d9a82335e9e1d603d4dfcc7abb1e6";
+      sha512 = "ca4a6773af2bc254e363bd4502ddf288445d9a0a1b7a08b2a7a2082b14878dcbb00293d390d3e8352c384a225801ee8fa3eb13c3424fb212e6ae404641f38659";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/is/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/is/firefox-65.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "7a30389aa58df903d804916e0915179e3f19923c8e1fa153c168eacf7ea80a0321222dca15f7b65f329ee247da5d13c2f320397e4cfdc74f694ff9e2f851c9cb";
+      sha512 = "29dd0e49485d368371d451305e1204e19c3cf94e9355dba7119dc838b2701f5ac9b7f613f55b62e6f60dbec1e2b1aa02302c9153166072c008ce66a42bb6958a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/it/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/it/firefox-65.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "07559c0d26c17a16a54dbd255e7c92ab4503baf618c101de66fc3b4dc98f6ac36910bec5bde6d875c2d7d11afb213a9e2a3952a612219ae7c2a2be2b81bae597";
+      sha512 = "db5e4da51f12df493ce59a6a66ccda699e28be3356f3888202ebae6eedbf496f0ad83e3307a5d44d68015d6dbd858f4a10a32539b4b1fdc74b23d14921285162";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ja/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ja/firefox-65.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ec626a9457822197c8cf01f0376990f2e27f8beb23d25d5667234a7c891642b9a7fabb5eae6add31856a1cd52dd1d71056a05ef8991bb4ed8f84ab41aca5a308";
+      sha512 = "3369a7bbf0199323adb5a63f7c79cdbff7448c623d01be098d1ecdfd72922b9dceef4400f0c2ba56c0553f5bb26571c9f9f71baff3333a372c1063e041300272";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ka/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ka/firefox-65.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f1a8149f87b741597bc626e81ee4cab7780ad61675c967680f1826ea1bbb55609afccb337f05291544fe2b330dfdb67c3a6bc20dfe6caa32272270a646eda6a8";
+      sha512 = "26a46881d195c81dfb7e4f77b42d9de1866f08656067bda117bdf37c831d7b3c7c402adc53d4cd3804f98800d97322690a881f468181ddbf5194c6e2a7a6fda3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kab/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/kab/firefox-65.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "82ac700a061935fc14a705b859d6f7fc985141f61b79ee41860a47396197f59b96b78e15340b376eebf61f3c7d47ab4293334e05c920b72f6aa8db63dc0cca85";
+      sha512 = "eed0639bb72a7ef16207bf9c4cbc6e1db7d59a197d569014fc8a28c4962a32303eb16b1294c57312b3935ca7fc4b17f757415f8c89ec51979ea4a266c96b76b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/kk/firefox-65.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b26864a7f6734ed518709b4818ecd33318ce7bf2725e593f0dbd6fa5d8e70c70aa6828b8444fd7ab4b622540cab8296d9d10da1a8a14826201c7e878519f4514";
+      sha512 = "ac5289eba4de254ea32bc2fd0d457b50c7c2a20e8a5c23f6375000ba1f636bdbb40aa4db89aef895a375db8be7e606fdc339bf08d8b0ec56a8685bec4ecec0c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/km/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/km/firefox-65.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a3777467d2f8962b598001e62ef9044bd3a1017da6a979fc5d616b8a3da0311cceea4a5d148b32fcf05d01e3d6df4489356291c84c54a97866fc69f8daec79e5";
+      sha512 = "832d71243316f8ca38049eba22d70e889f9cc149a61a9af6a67bfb0b639452aa52b42c02360d57fa1ab6a5737b21e1d728f8c84d6a99898856546bafe8301ea3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kn/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/kn/firefox-65.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "fa92ff8ca90be448c5c8cbde5539561079a78be30826fd5b29c322dea73e94d96acdd1b3e6eb2b13f4571450dc7492f663cbc85d7334db6e2d416a8f0aacedd6";
+      sha512 = "666dac64d56e91a08c4852ba02570930b3245ea818d2621d78cc1c032d8ef6bf6fc37e8be053b86437ca218a59667df0d877b7faa7ffe91edebb78bbe5cfc73b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ko/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ko/firefox-65.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6cd537b6f0eb3447bfb61a597e5e20756fb3477eeb21234262d933369e9bec15fa2198d23fe31479f62ab4ad0c458a50394b61da35c1c3d117925c7e449c733e";
+      sha512 = "31e36b14a9f53b41df176754af57db01a06d00f028f72de8d2a75e6f020026194ba25713e0d53855677332b14a24167e1b01550c4f6a6e4ee641b28ebca070af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lij/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/lij/firefox-65.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "402eb28a107d8023ad2ce2c67e2481c246544d65f6f4a7fb83d19be35cb186e8cbd98d3a01045f74b9734488b72f8687bca5860d0f9b0d29958dcb51537a57ed";
+      sha512 = "4a2c417f4bc9d177b1363d4d694ffafdd5bf31b6736ffafbd8d3a8c53e27f21f59fb54fdcd44b1bdc80f5c04c693219b2dd43b815e3adddc2c637d7fef5c8cb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lt/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/lt/firefox-65.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "f7c0c9fbc3ad6c8f372ccee8f07e5e38e5d13829db76b502b0c373e89cce932766f6ed6efd89482b94db6e9298d2b58d31a758e0038d29a786397f593175abe3";
+      sha512 = "7c6b9734ac11bc47cfbd375c0474a991ef809653f9d96600f4473f190c4f42324dd203cb38007f4a434a2fcde4434ccca2b0de2947987a280cb827d1a3dd8bbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lv/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/lv/firefox-65.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0bb31dda168b10f78e72c9a0a93ef75df4fd0a1bcb6e541a61b196eefe794016ebd823c299d4612c6a22eff1d269dce4f5f52eda85519d7a649991ec9ef83b5f";
+      sha512 = "f11fb42d0ac7d0f7b463205cca27f558f2b3021d32df314e50b6f900d15ca56bb5d9e3014d2d34294c1340c32e9f6903e4b561d703c50c5576a22492f351270b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mai/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/mai/firefox-65.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "a18f3dbf5165bb62c43d6d11796829e4b503dc33188e6e7e765eb06eb6c66d648f4048f0a0561b0bc4e765b63736ee3ec37eb77bc90ad6c2adc73fc5013ceaa2";
+      sha512 = "d8cdd21785a93cb7b6b69ebda4727e51100ae02d7aec97792fdda09daa04daa1faa9d6beac7e2de59623af3361d4613d43cc2e8c3d95678377b64b1d25669a36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/mk/firefox-65.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "c3ff6950da399b4dab29cdf95fd9337a011cbf3da59ae5c131714c88992957aff5c7b49bbe0939b7b4c3dab342ca47573287f998d10a2f69c5174b8ce28575e2";
+      sha512 = "a79bd5974ddf5ff45a7e9504f59cee50d5f4daf3422f8cbc39f513b0c13112eb6812a634357e31617f0526c02399d07288fee677aeed5ba40af5aa66f01a7ab2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ml/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ml/firefox-65.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "80df4ae299523a64ddbc92ef5cb551884eb34b60b6650abb127aec01780c14aa34c8687fb5061d7415a70a322e3ac4b2898061c42d7b658b216e226e2ded36a2";
+      sha512 = "e62bb49de980f96b39943f186bf043eacc69eb207cacc7f5f528b16b115a2afd88a9668876d8257223797ef71d560980a3d6b9441df640d9fa67ad8238d48cf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/mr/firefox-65.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "194e9601e59652fb7150a6ed38abfe8aedd8255ce3c7619a8544ff0a8808955cb31353f2f07e5608364d5ff19ce02341dabfdf1e52ef5fdc13fecd7c47019faa";
+      sha512 = "66261f86c46d6594e12d72cacab12c193246d8d41d0bd912630cfd19cdbc71bb1369462f3e7639050f28613ba22e8fe0ff555ccbeb4163b2526970e678cdb0b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ms/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ms/firefox-65.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ec924c815278196fe447c92e149dfb6c7189da4eadae65396e5b7b7db05d0e097654383ae0d5e9e849796b828e677cf54419b1f40a65833bd2533c33cb0fb321";
+      sha512 = "4ec3c6b220789e259b1bc6a5fb997e939d38664125f6ea29bdba2d17a037a7e7c14048af026889042f3931751ba5a820e216fe3625ededde45dabd259645eae9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/my/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/my/firefox-65.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3449c107e15a518de1ba8effc31e5503ff9ba50099fc43c6d318119c4f98d8968a710dc8d66ad5e9627a52a45e2f0db24db1a1278eaecbd6bb2fed9c0e605a0b";
+      sha512 = "fad5efb344dd39700634d4a47bb2a1a3415eb779ba8bec9af9b70d852ccd8e93d5ca352e6cde3f0b8b86ad97191bba4e0b294ea5c995a1d38985188016279e5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nb-NO/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/nb-NO/firefox-65.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0d4b065236569a477a5d2fc18a910c0d6518adffa8c656a342eb1ef40a3c55dd9fed9fc42c21e955c457a9ad26592cc1795ad2bca055286d839e39de8a364912";
+      sha512 = "dde5f0e2fb7a88b3cb45055885ea9cf1086bb649644007fbd456437c8ee139fb8e0ce1def492c7cad27977651029e95fa60c7627aaa5e353b1b39c6003aae911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ne-NP/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ne-NP/firefox-65.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "6f2f63519ce28e7046337d6d75ae6acefd2081834566d9f8f7c659e4dec3b5f83e61485d12deac40ca1057f4952c6d03a86eefa6be9ef7aaea6986407343757c";
+      sha512 = "dbc44521b07a9ef296d9b858dc26a4115641d954c5fb14c403945c401fbf39b6d13419cc55d507c0e2d1ec6445174b31985dc0f5216bd0b6ec62dea8d652f88f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/nl/firefox-65.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "1a837eca4c23885a997183df9d71652b0401e283ef177b6982810443eabf9d91e2d50f5b51844f2409a028aab8091cfe79c10d45f884b15ba4f79aefe01e856f";
+      sha512 = "a79eab0fe62d723e54371b492b88696da8f06f60db726d573006352546b0127a94100ba43e46ed2e76c4da581b8013b23bb8b81eebd91e26a128d92cd72c9d90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nn-NO/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/nn-NO/firefox-65.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "1066f0ee39628d9a1dd0112300f8ea4a76d832b1a3acb74fa19a2a022d0e064e7da316ba7b236b353edd2929003c287cfd229ca7921a3bcee77a890771157af9";
+      sha512 = "14a43e2ab6f2ae1242a914f1a0812238fe6ee0e1986e14c9a3cfeda0e57b5a700c762537a3053ddcbf0b0384089c7eb6d8fde550c23bb10f84bf4728b7cad069";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/oc/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/oc/firefox-65.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "9f79b9ea86dd77bc4cf9caaa6571fab2cbe3688a25588fbcc2eecbf3857728dd7b787b8c27ced7b0df6a5750baf390f5ce0fdec7d52dc6cc51352493e8608116";
+      sha512 = "d84cd184512e3b6525e2ac3fcbee18631bd2116ba54ccbb8f52f3fc6fc93d52a69026b71525ef9627c53e5894862ad53840ff7a8f3565fdd6b8cad3b2a896148";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/or/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/or/firefox-65.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "a27ee9624c3c2997200d54e5ee51e156f654f71e802869f1063e47606d264773896b00890a882ac14481deb9558fe2f478f44cc54b333d820577b90d2a8c328c";
+      sha512 = "6d44cb74de926c8a3806254905f251b893de88de4b33f253e782ca8697355a85c5c33e95bb410923bcc9a2eb34c801d7fe404fefb183bcd0c6a57eea269e3a75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pa-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/pa-IN/firefox-65.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "156888812946409904a1b94d11c6cbf17a6a4d76b5b17ebdb70542008375c529d328e2db9a7e473ca724295717890bb88a6ceba00b717ac08d13ead53d37f58e";
+      sha512 = "a60dc4d9a1489ee6b5ddce71c06a350d494fbc4a0e5c0b04b503f2bfb81b098cd7088c68afd1ed8c8ddc559908b1ef018adbb55f2f1fce09c95c80b6aa2ddcb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/pl/firefox-65.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d0143f6995b0f7500fa603724600777006ea32946b5a43eaea8264cb0cf6a98619cb1ace100ccaa202d600d0b42ad13e3fd698312d8fe2a53abd30b37462294a";
+      sha512 = "5a65070ad3c2ad98758390bc5bb580742d8f15477367036a53052f1e630ddbe1a93050c2e6aa07f946d571ce13b41db57ceadf052c1180561846544aa8475011";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-BR/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/pt-BR/firefox-65.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c008136825a58b3af17567dc620454b95e432edace0e65bba11024eb3c6af1137dfd525cc9503aa798472d981d303c2c725c24471cd4b780c8d7db66e6917c4f";
+      sha512 = "dee79457c96e19d15784b5bad5b9c70b4df72b3d05d1f5e4314e9ec5dc8369acd529ce260b4cefe7703e49b7ecbb9551d3dd386252a5fb09d8e85790faeafdf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-PT/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/pt-PT/firefox-65.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "37009c77c56dbf63ecb86cd96861494ec34a2c30aa4c73638699ee0484c55e9ecf5bcaed7559eb0e39424abaaa178d69932b9a25a50996389105f8defe6833c9";
+      sha512 = "6752d8b8824dad84a2e3b4be8f1c171a1e242f2528b42abaf6565bcfe3244903b4e521dc746aff6f208e32cac41a261d7e58105e3963cbdc1c4124ac8c8f7fc4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/rm/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/rm/firefox-65.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "819ba5cd77f959769906d6a9e6af62db57607cb2f7ec8d1c51231e02f5ffceb82e2198b6c77f362f3a30eea15a5e3cfef6796263d3c997d4f84de1f817a230fc";
+      sha512 = "ada8f83d251c413e4867344bf0da08ec98fb95c8085e7e5165b836b594431482c5889d79746bbc45ace815b7cf07caf467fe1cce6ee4b3abdf0278607a15d0ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ro/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ro/firefox-65.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7092b0110429323a9dc8ad6a3f373267f70733d8dfe33f8f6a9e67baf4a6384d52271e5cc410948e9fce12f346eb182907cde5108f28608d8185380e867ad4de";
+      sha512 = "0cfc6985fe8c9a18a1e7697de4012662dd5a8825dd1753e26231c15492e144380390a6d58e96f1cbe441f24b87ea6b100ef4a405716bb22bcd9cdd8f08e4fe99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ru/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ru/firefox-65.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7772ed2a4496dcde8039eb2dfe950690995d66fd6beb00733df5f2043d0e399d6078268f04da6397ddd4435cbd25438ef472dbdbc51f8310b2437638fff5907a";
+      sha512 = "82ba07c65818c59ac8dcebc282d310f6ebd4449bc57d2244e5412d500c5e0ceeae627ab7c78ea4dea3e9617d674c415b586657b4db8091212529f0eafda2b49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/si/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/si/firefox-65.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "41b66c25bc405233e5f62749b2f2e41092735bed8776a4777a31363ee333d1ea6fae860c854648b775ac07385657bf712319368dbd00374dfcccbd612cd81485";
+      sha512 = "7fd14db5bd7f02633a5c761f7bd12906ee13154385f20f6d118a3428b856a519162f340016e3ca70cb406d5a7505781545c6e33b17902c5bc7b74b4a14154945";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/sk/firefox-65.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "208a550d3bd4695d9e90786cadacc7a268be00eb7ad5827693c6d14a7e755db44de5b07c1e925340a7786553972448a56ddd5f395778f86ad5784d62f9c7e48c";
+      sha512 = "481f3a49a92a2a565288a3b0ae2a619d966bf139acf81c41d3da4f17b0a8cbb30ac88e8c587b10f8d7ac9ef251d331398014c8fe73bb06438a73090123de1103";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/sl/firefox-65.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d2834ffbd907372ab3d91d19a1377a3951501817c859a0cc4c7170ec0f9e51dc819f02f68a1e80c14cae70356957c36670df836bc9552aba15f6c3197b53067e";
+      sha512 = "a05d0a6b3ff60a707fb972368742276eb1ec8e3eda3e96305a5df54026308be34a92e6b5b508b87e85f0c2d0daa8c9bc96f0a554354825da4bd83ffabd377ebd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/son/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/son/firefox-65.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "5b7f646f5a1028636326f0057be5b73a7a9eef69fbf442abc8c786f43e3b531e0d03a7abfb3939d963cd5a5e6f9c04eea763e390143796f45b9a365aed7ef62a";
+      sha512 = "e44ab3aa15480f9e375b7936692489b19e25865488d3c9e848bf0a209587fb2d38dd92c528516eee087f277627143a78f451f3848a619261614dabe74836dedc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sq/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/sq/firefox-65.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "6ff106a402b0369a2142a71a89b32b9e8d61b8bd1a9b6f07ece984bdff413e5122a5aa013da1af2be450c2aa94ba37cb6b547dcfedc298822ec1c302e14faccf";
+      sha512 = "820dc20dad5ceb6f0e5922bfe6ea2992ad8784a10ea61d230a8bdad0cca3cfbd0c15655a2d4f1ed068ffa48084af45d641b62e651af9e330580db07c6be99422";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/sr/firefox-65.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "dbc1bb7ae7b82bfefbdf524339500f24afd79910374502cae586d020fec07dcfafe52859a7d117847fd05fe48d353f56eb415227708cd7b2be8ee19840a161ae";
+      sha512 = "38cfb013518f48ff34bd268190ecc906f80fb731b96993afaaef953380b7f120ad3d17afa9f54f70a1bca506925ac2d30eeaf779f3b38465213b985c9caa0c74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sv-SE/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/sv-SE/firefox-65.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "3092c863530d31119b3ef15f12aa978d7c5ef38b1d1f363a87297fc29368ac2c2cd87a5c19d08c7dc053338f96b69cc741e1fd30324734772c190382ae2a3a12";
+      sha512 = "df8e43823fd8e818b203849f292c489c941257f6649d9a55c9c3392895c35539f75053ea0c01d9849ccf3b4f5c2d8a400a68750608cbbf3b21a3b07ce31c9d90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ta/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ta/firefox-65.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e62b1863e42c3eec15b50355d54cbb7d656f15652e3560406badc61204406fcccc4f965cd6def14730eb9d16695d1e1b58d0618ca1a2693021f6e84b51f221d2";
+      sha512 = "130d634aeb828ee0b0330237e86be3b0788a9ac5b3b78a76e6e3bdf0fff4dad131c814c979a4616472beaa2c267438b91e40c047f538450e70e53d71258839a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/te/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/te/firefox-65.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9b420f2f422b172730b167ed88d29c91b91f551cddda72de538c7682d15c36742122ae2e995b489688b95deebb7f8d8ba64662c7f4529c845ba454b79097f97e";
+      sha512 = "63cc747a190674980844f095c56065e16165bdfc1ffc823008438e76071e8eee7a0ec0e6cf328d5e85add4fcc9a1fa719fa7fd5e5b4ae0949393783c0e79ebd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/th/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/th/firefox-65.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "02349edaf181a2453832118d12764925f38db3837a06c212494a6da9d37f05efe5865a8d96f7a30ad1319a67f612ae0ee1113fd281380cab11c21be01218f13c";
+      sha512 = "1175bf3d44e60cc74817848163963ab70cb2e1327eda3f91e1a595c5ea83e2793bab257f26d7de352c2bbb060b13984de2770b1c3b8313647214e2d2b6b979c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/tr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/tr/firefox-65.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fc041e81769acd28f4004cc767fcca4f917b529f802d83b93da6a5565dc6f4257deda049883e22534fd29981271521e998f79ab70a6fe88b7ecce4a0dd660708";
+      sha512 = "a786dbc3bf3ce23ef9b28800b6629a516110a97a5ec016a31d0368e4723632638c897fb866a715f15c34302b3924ca422408b235cb1161d58f40306b2235f98e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/uk/firefox-65.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "fefb644cd87be568ccc161c99e974083241e31f42f6891f8db58a042115253c990070dd2bd12086beb2009bbd27805837126c09b72e7ad4ad2d2f1326bc70e52";
+      sha512 = "fa41614fe46908bfc930cb829314ba905fe8cca4ca42d28cd4de96942fddf51e702ff1d1e93c91a6c279b6b9e31bb61df4c1e7d628b7c0db1d73af4726a4408a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ur/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/ur/firefox-65.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f426cf7dcb4a62b17d862f9929431bc37cf6de1eeda90547ecac1b989414d1b54f86c96a3a563d123af3d5a6d8647714a28b46398e1523c30fc590822d608e23";
+      sha512 = "40654ccec7453f998a07c94881fcd75876ba9bf0688b84b05169a0278aea2cdbb8467561dbe3ffab7f9e81655501bd22d182f03e52cf12f8cab6593112dc51d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uz/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/uz/firefox-65.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "2ca8011284ff7e46273ca7943213b4cd5687d7c949159e19ca373bd88b82a46cbb1681bd7834abe5b9dbe54f1b2ac13095109e4050a33e119795a6426af608fd";
+      sha512 = "c4e6d61a417e8528a9964d9bb7de159d981b3b5fd8d0a21ebe88906a9e88966e696a5ea20bb5b49bac209646d6663ee3f6b5b1833139c286f5bcfc63d079e3eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/vi/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/vi/firefox-65.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "707d3a6872accfe300b067044a3972b56f8bf9fe71910b7e62ec51bddb19b1b6dc8f443fceb6209a09a605202a6dd170790cc3edc8f170ebbdad31e2ec193826";
+      sha512 = "f69b71a19c7e2c3ec4361281a83035ced75c4920e1a908c3a625672f515aa00f322ffbef04a7a180e28dd99e85f1ad13991cd2bd0e202756c5199614441cb0b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/xh/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/xh/firefox-65.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "6fe5e7302094c87a1a3191a1fcff7c6a33c04371104e7f1bf9a2415ce4523865d70c4d134c649ef68e56e3f1a2bd6e2acecf5cc972e01068eddb01c74344b374";
+      sha512 = "1412f0c6130abc56813a6837507295e20281d795690688100b586c3c55e2f3904cc1f6b7c2f36dad56fb352e1435f3d9038c2beec5a875151695fdacd54e5f9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-CN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/zh-CN/firefox-65.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "388120ea1215c20166e54b5dc9c56f2ec5aaa5a00181381c66e9849f8bc750c6d201c46d2f5aafdcff3135cac67298ac092e06f2c2c245befefdd5a679d592ee";
+      sha512 = "f80ed3ced90e643df92cf920da4a178dcdec9d9f71841b72d74d6d87725f04db888a7f7d7a3b0f8f924e8461a2154c3db03757d1f038d649143079fdb956ef93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-TW/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-x86_64/zh-TW/firefox-65.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "566d1569ab0ba4d209be89b19f40fbdb589d465274d7187156344115f3eba279eee694df5f69ee2c04fcf2446e008d189dc9a0affe36e4e1ed990343d2ace5b9";
+      sha512 = "0437cf6416d3c80d05dddbb3a959a0ad1a10cdda0103e2035408943d4050c35d82d77865d9ca12711c5f0aab6e3a502beab5f32c07ffd6879050ebd113ffc223";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ach/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ach/firefox-65.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "3cc0cbb120517187f2780b4845d43748c453804305b4c6e8b62fa0155c2c2d4ff158ad0758d21347ff031173e1830c08d948c0c9d41c14f9eee2985e0c59e881";
+      sha512 = "35631c33abc53fdb9e68beae5dbdfe690ce2df64a2782e8834aea623831d1df6612f16db468475f58af7d5ef9476619ec47cd4162073a43d3776b37568b7cf37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/af/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/af/firefox-65.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "eac0829a50117d7c90af59939890ffbbe7cd11f2d67f5cc30787f911598bd83b56cf667c736ec8be69fcfdd5a8c7c282f17ca57c22e1a2b9be17fae25693696b";
+      sha512 = "10b669c53733f97b5580b4a58ce8ba4103168c75452942e8a64d2f9841f136d8506578f87e39cf39f6d020c2bed10e626d63535417fcca53852bdb65724154b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/an/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/an/firefox-65.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "8b6b20ba62e12b2ce6ab5beb70c01c381fe01711a27658a27ce925e759f308d4a43d1f1744fe8a5f21477d248e4d6e393c56f33e57d808456192693efe79dbb5";
+      sha512 = "61d792aa47c688044924fa8907631be382fe69889554a41da66ee259ffb1ff4e6307ce5b65fce9bc85f3d3e948017b932d942964e18ac8ed15eeab4d0d43e6c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ar/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ar/firefox-65.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "92ea6e4e5e36e22ebed46e52827624de8ffb0bfe48f64509abb0ed7c0439c5e1b809cca97cde758d6e6d30eade6c42ba2c4c272858f816f9332ce2e05a2284d2";
+      sha512 = "86f4b1f1f1c50cdf0794562e44af09be901fe5e839493f1f9f8c51cd744ab282186f6db916bf07bfb7421a90133f0a13e2425137b48396ac2c0a2d9573485365";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/as/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/as/firefox-65.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7c39f29e805aaeed4901170bd1df52eb3db51200f152a877f7b9e50f37c0b2135b643c61c467702abdb456491be38bd209c7e8f263fe1587101c0d0b2731a493";
+      sha512 = "9a5b0d0cc356060b492da18364ee122c89067d8f133eec1b6d320ee8e0f2f7fcbc83fecdab2a93b54a19c4b23873025214092e443bb89b8b2150fe85b7424ecf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ast/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ast/firefox-65.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "9408c28407c7fb2946b43703dda3bf638f14bae6adf4cb215752e76497e8e01246095ac9989ef263152f366a9fa0c4cf7d79f7a4d86b6848331333f0e89e7ef8";
+      sha512 = "c1d0149ff3fd5e2fe046c28b4ed9bf629e7cba97b64da9864ae924b9516e3cd114bd457a163ba0d2bad8ba66ad8f631cfe5614f12506122c2c1c22dd11d6a651";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/az/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/az/firefox-65.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "4409eac53e43fe2e2233f1e7eec8f5cb50b74e15c4057b0816d0c26d8f2dbc01c3d3a578a0bc4351d0858280038bd20dbdf9943b5e9f429ff77755d8e69b67ac";
+      sha512 = "4f006d504cb5fdc68628f1fb376d6db1e0e9753fe805c0bc7857ab22a7ababf7650a10ee6fad5b5ce485749a4445ccdc0001a2041918211aee0cbeda29e44701";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/be/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/be/firefox-65.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "53739c8bcedcad5e04cc53d66efc81b8446232a60e2a4d0a3020099ad29a5a6f4ce41ed478a7b18bd8f4dc6c321d75f55f6333dde467eba97cc812be977c5bcc";
+      sha512 = "7a4117de4066be8390f335a852c400c68e522ddcf4892d669bb3168a81cceb661f695f16f334bebea22fadcc55f241af5129e7a65a435054d784719d48391d31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bg/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/bg/firefox-65.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "c94ddd32cf349c3a8ca858ce2c44fcbb1edce97449956ff7a88cf696f0acde7b9b8ece49e2f5d97d9e0096d1cb320915d72188cb08a96947938ac92773d4dea5";
+      sha512 = "f4752e7e2cace8a2b4fbd5e5b57acb967e699fe7055c5f169ce6330a1d00d55b5e1d21f78f6e42a21c68e78ffe833aa843c0237f38e61f8d5ad9496a8710a34d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-BD/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/bn-BD/firefox-65.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "afc2af989f5e645ccc021b450bf59c85e5a43797d149393c5e3405660ff2c788eac74376c6046e2eb5bdb4f95762743cb904c969c3ae8c96bea3887ad457c3ed";
+      sha512 = "6f2ed15d31bc9a4c0b53778f854ec452568eb25344f46ffe4865e74d3cd5e33240fb928a5024bbad7ee270ca0cde730056afac8c8c914df5c137e720dd2c51cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/bn-IN/firefox-65.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2c8632e3f4a4fe3ef067c2634467091b62bfb6273aa04c54bee8c390463b22403141f578bc6418249fcedcae0fe990b37afb24b04b3c453cbaed4687bb8f9266";
+      sha512 = "0c84dd59a4934f2764c80a008c6858802e6a2c9c9c0dea90c1f7bf682b986461d92d3e27ad6b3ffd80c614179df882540ba487eb599246428e89741ad2e517e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/br/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/br/firefox-65.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "d0fc413bea97d4e012619be2cbefd4ad3fc357abefa365864301d2ba81a68e9bb940c55cd03127dc0ce50b4ee9556b570e96f40063ffaa8b53055d7b2be4b6a8";
+      sha512 = "2f945808cd0b4728c315496c3eba43844ac33f4cce04cec054fd999b25e78924af88b2b6bbe933bde86d9af026f12f5b6459ec2e5c5a0a781b1651f77892ebe0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bs/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/bs/firefox-65.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "cd21a93cb26880c06d98c1ba5f4191825b45d63e4f432a99bcf956b1c144361889497d68d9e3102ede95f046926ea21e6649ab14906c183c147988914a64a705";
+      sha512 = "eed143b25aabe9eab7ee736494d36aeb68f0d48b92087d40e236a5bfabf71416fe34108ec5ccd4278e457a892f76010f41b36951c6d833bd17c56fd06cdb5b30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ca/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ca/firefox-65.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "83fbc4f4880140c63c2f73900926083e97737d991e617d37335f4636eb9478547127a0a6e28d6f499cc5263a33f266a1608d2026630b66f59fd472e9c1f5b85c";
+      sha512 = "78b30c33e94e1de22c9853942ab7f7ca004c7773b423479d7ead80024241eb623063810f8e404a1e0abb4151366e7957d9fb9c218f1e426c802de9f4620fd69f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cak/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/cak/firefox-65.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a2272d2f275b2481a12cc905e17f8602e2d2e8d2c11561fddc620dc35623f99687481e9d9ad7539644ff7de03a311a436234dcdbdd9f4c0dbc6cef4d466b9cdd";
+      sha512 = "551ec0c7b56d04b412a062c05ee4e7da693edd74597ca9a4bf1fa053ea3258ac11ba223042f8bf82156229ff1249ef4b1413030ca5a0a366c9987a3db3a25c95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cs/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/cs/firefox-65.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3835a2d1f041ea50ce8fb3437589be968842496b2b1c13631a8cf697e7d5a01da3d97a7b45fd76d29c84c1affaec72555cf66f366c260df491cfd453d273995f";
+      sha512 = "a3ad7a658ecefda2cee15ddfa6e57589eac6fb5a0e5c1012917b856fefc702128501c1c4991319d7e2565327b613377c7d260db51433223728516ba304a058cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cy/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/cy/firefox-65.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a280eb112fb65d5979c6a9f8ad04ab5c2ae7fa03edd29e9363009f42776f38da2f82523c71b680bb988a40e089c6f2d58a24552a73d01311e00020d9cb87e518";
+      sha512 = "9878923fc9caaa29867f4d15ac42c3907c1d15abf7b038d6050722800f6674d49816b1d61eb5091744e2e5c06d5e150c04974496f48c11dae9f93f24a7fb82bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/da/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/da/firefox-65.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "71e51583d018efcdf09f0472631ac2449fdfd748dd7d4467928fccd0d6e4bad6a2853b58a456ebd8e28997aa75c58bd22cf040bcab01e66d1635bc7948a93eef";
+      sha512 = "4918572d72235545b12ffc848def5264be07ddc484c9ed894a9603293bcfcccf08f8364b91acb9a5f60de4e6c9ac70fd75f1ca9cac1102564f96b21a8aa6c02a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/de/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/de/firefox-65.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "2b3204787d0423e7c967ea1c87e914719e1bf2106e8589119d9a50d447e6f0c8b1aa86e75b1ab92bc928fd4c90ea24600b4c8d2d44e5097296dcc5a494c369c5";
+      sha512 = "d8a30f5656814a6178c75558cdab0dd43fa47572f41090fcef9cd54809efbf2ffa66c16950c4cccfbd64c2271bdf22d12e99dcd4f871ef2e27f7c0dcd43c491a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/dsb/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/dsb/firefox-65.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "36e0c839d63c974bd2659c3015c5608bb4781526a983519fb3920ec125476d07acd852ac674d8306a67afd194e100a10099191283e3a948ec58b08df20107c2d";
+      sha512 = "de68c4335af973b311a0768707fe4767582996d4742e5c33e47f24b33ad657ee02d2338d09f1dcbbccc92274e9d32fa82ad22f34e3089d28ec8338d315a85f5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/el/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/el/firefox-65.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fe6277f05e013e8861bd9fa9b5e9d02f1224f0cca881159e1a5d0ac00bfa42887bcb3beda291845f716860ed9486e6ee58665895a160574772b76befb3177073";
+      sha512 = "848d0fe411e96a83f76a0796af13737fc83ac96324168eec2ce815d22d61274115e01160439db9dc2125ef80edca564aa9cde751e77a0f2e0bc2890f9e37a8b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-CA/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/en-CA/firefox-65.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "a10b55c655894d783b508f6b86c787e481e673f7b6c3df739f08ee815b89359c4101026cd2f7c063050a09e7f354cdfbaa7a450935ff0b03b7b629abeb074a98";
+      sha512 = "81c4b888a459d372154370b737aa4ca83372bbdfdd6b9e376578e63b80cc6a43e28ec35dfa1724a4a83ba5bb27347ea7b9a0c5048f994d1b0151e3af59018d3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-GB/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/en-GB/firefox-65.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "f148b9dbaf378f6a8fe5a2225128828fdc5a6a695a324cab83841665d5f93cb8d8dfd1289aed93f66ad9bad45803641102ba8ad4e9fddb063cdd36be92957f65";
+      sha512 = "add4ca507f49d0ffea8ffe66786786ea0f18a3cbdda28e145d6547a3afa3d19b20c68a6db2a9b78f6d5a781153890538963da3a4efd919ffaef6e1d864ef54ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-US/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/en-US/firefox-65.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "b99326d15fcb6450f6af9d867959d71c68bda04a75d7d1fe1a7a0fb02593a2c418c27b8797c0eb50c56d482248b308834d0fa8bc136c7086edb9081708b9dfef";
+      sha512 = "71c68e18f15bc5d4a9f285064fd066751f1475a9872c653f3aed1ce16cede4b72925378840ffd2c6c1917bb5d1e6e2238a47b37c37bab3b56e84814424f9ca55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-ZA/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/en-ZA/firefox-65.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "bb42a0c7b782bff3195d6fc128231180611ec5ac8d9e4a402c9e796b9780f0f0d16454e457761a91f1b3bd11b554b3c61e5cf586d369809981309f1d49921078";
+      sha512 = "69049234d9853eedb130fa02b0a52910bbf94d711bb1ae6a84dd79b6a8fddaaeae7a9b9ee014dc55fd97fb62c6e1b06f76f3885c4af67683136f3dda9dee16c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eo/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/eo/firefox-65.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "2d3e5babdcfd3b3b4f25e0a239103f6bbfe3da29d418eb8fa37e054cd9afd0425acf9239e05f8d1846461997fd20f56109f2f1f39b59a18f9be6cd494eba3a0a";
+      sha512 = "6c4ee23f917beb0bfe6e3d89f30322bcc6b2e8ea657236b2d7ace5a500b00ec666431ed4dc9aa21c7f680b03017d5283cac17f657d52044a6092310809a0cedb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-AR/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/es-AR/firefox-65.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "33d0aed1738cc8aa1768177cf6453afd8cba013024fad7b776a737ea1976d1319ad8b0cc76db7517230faea2367773446987fe7d1af0cde468f9ab35d37a2303";
+      sha512 = "68a44f4f540a4a9bb69906dd9b7749f210406b1bdcd619bb767c091d957b0160d8a25737f390ef3627ae9bd900e5af29a338c91868c853c3d169933555c0d09f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-CL/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/es-CL/firefox-65.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "fe2b3e41e0da6e71a219eaec0024d19801f77113a10be2fd01c4b686395753cb31363b112fd1f8fbaaff756f2a5fefada53ff99fec4b8c09fcfba2a94ea2123d";
+      sha512 = "1fa133133483fb7100463dfbf0d7569189c2a296584bcd8d1247cd2a887e7d2a675641c437bf7efa0bdfa4ef866f2fe7b96574794a1b1c230c2b1f347ce2353e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-ES/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/es-ES/firefox-65.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7cabe427b241f383352bcb3cf723df921e8a7d955ccbe61f16a7b6fbff592623d8af08b00f2242fd96e58a8905159254a2252657ca0fceeb8f4619f027d4b461";
+      sha512 = "2775cb8ce21d72b08288683e28f7bcb427adcd6dce8ac076e1b76183cd2c150729decd30756834eb87563c43dc7a360f6ea255085490c4c724e1bd3257c53294";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-MX/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/es-MX/firefox-65.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "eb27a3bfb6e38d2e03d0c51e511a7b95cb178ff41854692c561fd864db7ebdba2e6067cc3fdd9317df880b32691c0ac71377c5aa36a1b82322267e00db432b83";
+      sha512 = "070d7a5f90fb0715451dcde764827a9a15a2d3898f9f659bd4e9ed783e49b41b5f7e051b256bf3bf73ad33f149a94828ee9d0778e820ad6114b1eaf87eab8dc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/et/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/et/firefox-65.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "119eac2350a278075586a12ecaa1438001625a65955a0746c9e789eedf6165c6697b3085dc47f346d7b992e675ebe5d7341ad7729d6ad396af6c4a7473b227d8";
+      sha512 = "17b97ad64bfaffd3282cc380f2387504a1369b2ce5666e34117303e7aefe1ffe9487d44b573b7fc06772db9a61b14aabd5b7e4e59e4003aa022fbe51525284fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eu/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/eu/firefox-65.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "cca07a6932810e7c19445cc3e7a30a0fdf1b68669a82f732ee608a6542f24776c6a9ec2f2cda74c047264649b3a533c038f7ab908873a0f379fff829b92d827f";
+      sha512 = "300b1f12763eb0b62a8c949883062b745f2e06512187d726bca4cf9b317f26c40bcd95630619f060822ab1418abad91886bfdfcac21020323678dcb492d52af2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fa/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/fa/firefox-65.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "36d515f7bfc73eb2c90c16546e3c0bd596ddfde56bef6d3962f0ab178f2f7c2b34ebe07e9e7fee79fc626ba10eab9d94275e6df8564446292f7eda6be713529a";
+      sha512 = "ff70f4ae1c3d8a7557e55787a535be8a853644e7f4c47d85863f08b55244ab053f9f8a924ea13e977495dfa72d9c8557f95d75c0694da719e5e301bb87de7cac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ff/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ff/firefox-65.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "bc5f41da9ffbf41e5f9c377916572b5ece5bde37cd4416cb18c147779a9a03cbeb600961db2f3c4c43999ad3e1a12e5d7d4a54ade4f45d5c92ac1c9f1a410bac";
+      sha512 = "f886001325ce020d20821b8e604aa945319549751c00ba172d3c357f01c8a4f20ab57df928ca4e4f7e3aa6db78628d03262140200444bdd6b7a5058f8e97544d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fi/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/fi/firefox-65.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1e9a19f0bede01bf06e38fc58ede4c8c011a4548b62a131a203e0269c295cda32a4f7b225bbf95f51c43a8a78cef6497412d94e29a2a75a5fc7a5abc865d29f4";
+      sha512 = "6fa009bf937c28a184b8a1128c6ffdf152eb91034640e6c994d08066fb76384f94187d93a678fe4e89ca4b7db7cdc4d81ac007c8d4ba0c46ca908e9994f0ee65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/fr/firefox-65.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "88fa160ff11e5b1e4910ec3c6d9534d5f48758820ef2f6944a4161670f7951b0a3219e292c47044c1192ae5d1955dda5886ad3031661c4cc810e72385529f33a";
+      sha512 = "8ef2778391a2621d93427166be291e1ba9e2c8b9540c2c1c72ca6a6e21abc1ee15f833d2ec30c0184c410c99e04e9b3c4a34b6bd5ce46bdf8db61cc69684937a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fy-NL/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/fy-NL/firefox-65.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "40f208ec0ed722a097ac4e7d4abb185386ee92707e34473679bf9dbee4d7b582eeb2a46aaeaee37b0be85439a664d8f8dedd41e22aba76035d3f79695a4a092c";
+      sha512 = "29325985c5456c711669e71367c381de833a019936def1ee26fee02040672de1d0dbd98d060344e29d38efd6266ce66738237592e732609df38ebc51413bd25f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ga-IE/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ga-IE/firefox-65.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "da9a2ddb27d3207be7efdd4090adc871cd7f406dd15f6762c0026d14ecc4a9cfc1a5c9b4b85b265ed9422ff6444c13639ba3b7f8fe5585c3b475eea9e6c955a9";
+      sha512 = "d993da38e3b916c2866c50c6e97d8afd31af9b3095e240883b4800aa400b7f8c11ad7b627827cab52542511002f1f386d56d2e1cab4e1a1db4e58041ecbf4155";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gd/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/gd/firefox-65.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "205e331b4a037404311b8b1152ba2e8e0981d80a4b0bd3e82b725b6ddd5ce5672285959f550b3b116b34354c8fe770bf32d4dcf9e98c29764116160bbe140937";
+      sha512 = "84fa9bae997cce30ba08a8ded6b73f22911365303e44d3025d8d3a402f32c6fc377e577aa7f0766de1de56b2b971e7bbd7cfced23066f173ae03eac4f01d6b67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/gl/firefox-65.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b1904cf32581b444e37a10a8dae6aa4f39834b47e97b5b6e62b3bbaefe561e20f06ee69b66ba3afbc03996056fc6f3bdc62d4cd38d37e0c8cb49a52c1405a59c";
+      sha512 = "4739f90c60a288dd7df121a2f794345a7da4243900e307dda935c063dcb4068b8e59a7d6e2d8925a8c7401c5177f52203179f73c615dd92ceaa07a1e3b5f547a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gn/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/gn/firefox-65.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "17b6eb77a7e204a7e4c345004832ad1377331e7f744ec7ce463e2ef1f44dc576da8a8de20761612d51110c975779fb9fee0b87709a2b7541f124fb03cc4df060";
+      sha512 = "cca61f9bcf7000e01c77ccc59a6f8e62a4ab61f7a03d8a864b183b87f306bd08fc6a373404154301b89ef25d35de212bfc10d5a92a65dacdda04175c1f63555c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gu-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/gu-IN/firefox-65.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "14fa5291fd952d03d4beda2e71184458ecd1737996133831aa6f8f15ea5e6feefcee3db753817b02e89f4747b2c879f818fd4a7781f277491d9977e1e519bfb4";
+      sha512 = "61e74f6b728cd984492db6f38281cd298ee4d08759f656aed3c6fe89097a71d7a99c9f42f6f1c3c5ff0ed8cf9d756856e3417b36b41c3bfcac7c83fbcb1a808e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/he/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/he/firefox-65.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "1079037838057e9d85bc3cb54d29958a4e2d21767c7c93afc70433363ac7aed314f520a502d3542abd231a59b503de3b768a2ef87d3f3ca2d17ad7deb1611c74";
+      sha512 = "0e9000a64c40f63e6108142668906875f30bb0c61a42e2ad61b7055251037035c802e4c8bf3367550aef47d94089d366e557c22dc426bd5471176e6f6123dd3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hi-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/hi-IN/firefox-65.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "dd19fdf8f61fd2c4d804cb56158aca080c2faf4361585cbb93979401f024d9c1b23816c744eac3f6f788c39effe8a68f76e8d0891b97a14481bf1c68201e7a08";
+      sha512 = "1f1a7cdee25287fd1688151bd823da3d2dea9f1f509f4f66b25c326773933c45a0768f2d713f7e7dda7e6973581105672af8036c93e89f581fda30873ff3b46d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/hr/firefox-65.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f1280b55ce78be18e79a7ae504b2004c7b29eeec627f36e57891c6d1b73415ff3b5645805c5b126cc005aba1d206da76e56ca09f6649dc0f95f514a294fbad1c";
+      sha512 = "e4fb7b936ff13e048d168f3a8e8340e337b954432fd1340b5c2d8003eda47214c46167e08e19cbea90cdc6519e1ed197cc253add6d9f057073c31fb4f7360677";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hsb/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/hsb/firefox-65.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "85923f4036af41b64e3af27035fb988c8dcffa122560d10a21b78430f7f6e6fe5e05d4ec3fafab816f42957a998418d71a7514d88f738823a33fd79a238bc935";
+      sha512 = "007fc2d797080e04ea7c5e6f430ff4549476b4f9fcff8261bd10e43fa5f592cf62d730f6d48180e9e1347a0868f8de0e427b192b16c312dbc79922bfe1b8f340";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hu/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/hu/firefox-65.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "1016ef974fe2f5cedf56dd630fc495823d224e74d2de074beaa41648843a9627e572de5313d041d5df8175099b94c1936fb1b315c8c0f99bf2ce8059b452ef1c";
+      sha512 = "ee8d85071818aea552489af24403b18fcdc3edd86431bcda5f4d6e2ce6824cb067e08e5525b3f239a4e99889480e43d879c187ab88a6a236fdc126db6cf6f9cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hy-AM/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/hy-AM/firefox-65.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "3dd288e5876ded4a57c1e95eb0967737734f65f713157a0dd56191b12e7223e2bd214547ef009400ea58aede455e01822a9e0c4ea9ad55601e04bc6712f71e7a";
+      sha512 = "f1b1228257e198bd59addd4470e3fa05b46cc419e53cb6e79f6156ded3935f45e757ef02aef9fb5acdbcae268847fef23160ef11b628c5035d1d13ecd8a3d767";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ia/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ia/firefox-65.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "bc3d4c93ba501e63004478ab924fe8ac6e069a231bfe5f5234bb3ec7b5eb288d1a214bd7180802927f3a3cce08c2bd5711fc6f6c053fdbbd1daca637d5d32f1e";
+      sha512 = "38d1859fe3d4de2667e43dd1c039a933f9808568c1b85f76bc4aa56a3c16ca08fdfc44970b48d9cefad3e343865aab43934f717f6ddb5fdffd21fc019bfbe9de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/id/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/id/firefox-65.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e0f9ca54a40e01f9a7e1092e567503579b215a691907c10c7f96d2ace1524512af0abf4ff7362fa6c49dc1868dd4115a4514759707e04e5780b00dd16cbd3684";
+      sha512 = "f7a63cf9aaefcfb58ab3f464003c32e2e8dc834f734f679271f11df80cfcbabdc650f49d578ef19bd2f2555ce8a7535db03fd921bdf2aa1085d6c7fec33cb421";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/is/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/is/firefox-65.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6253ffd4a35abb04ecf1752e695278258e3450e7dd3dc335d43ae930fcc78b8ea9ff32927ff8dd8589eb491570ae050d5e36a366e95763a0421efc4703f9f2ea";
+      sha512 = "d6a17493a6060b52531fb01305b6bebfff43750d66e3846c5577b1dc8e71af34bfc8bbe2900fee1f64657bc15f9316559d96c4a1305034678616527aaad594a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/it/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/it/firefox-65.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "5ff3a302273929b7052c6c26f7007fb389867e375f104bafd0b808540b771befd3b1328bc577767ae7efd1aa58237ad86a841e07af04f298e0debb461b0fc12d";
+      sha512 = "eb38ef3de0d0a8f910674964040c362bff29434ece8384cdebb95d2ae67a4eb8895b10ce0aa764dea10ce881a6980d9665d71133d9a1b77287f18a9a83b47399";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ja/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ja/firefox-65.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f66962e71798e4df4d222a384a2ec5051c6cc30e65c90e28296412f1908f6c5ba17057ea97875e871a984d27e6f2678f011afe5e5c067340f673d45b0ab37023";
+      sha512 = "a593e8e8a5da55cd545c457e8a710c3137de2702f751e2d1076af1655a519bb787e9ff9435e072cbe6d5b631227e740209adf8834928826c2c194f1d4161ee68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ka/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ka/firefox-65.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "78f1873a745fd6627a7e6435833f687abd587421b4b711103e504fe1179406920c6bdf847d6fce5fbcd47b485baa77555d3ad25f2ff7fa4837f48308f8144d57";
+      sha512 = "41bbbfc2c6a81b1a6506a8ed52610f0297c4885ecda08536d4e0d6c218a559cbce8d90e9803c62a9ec1adc10f01691207a9be07f421b1d7ad3b51438a39233e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kab/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/kab/firefox-65.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cee493500d868909d36744b53562a455ebc4542730f97e0011ab7fc52a320478201fa41a462f28ec1ebbd8b63a77784084f52b5439e48cea5935fe71b961bc47";
+      sha512 = "07ef286419dbbb9334d48794474e3784080ab1fa60b208ddfd46c45943d5c3cdbddba2316cb47a6fe89b9607e859c0b5d7d25bd0756abaea5cd5cec4d52efa0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/kk/firefox-65.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "92d2a814bdd16f883ac46ae76a31d68fdf73bf8df409b6a54db9efa2b309d8c402be16593f314787a705d36d8a5b289d9fd4f2b950569bab4b5140711a1b6a90";
+      sha512 = "13b9cbea87cc563fb57befdb2b0edf9af57f7aa8283b3fb0dd7233e3ec13c99883b189302dafd3101c66cba065db98b97f996c068c02f8e27502b9a38f8f8d5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/km/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/km/firefox-65.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7ec953af4f564097c6586813db66c9a9d4adff946a3def098bd9ace1bb2ec5d765cbe34c5f2d4bb309283a3ea83c9a61b013257411dab2d1e6f0978761058ce7";
+      sha512 = "b45684b567e3b4cde034493ad0ff808c87ea3094bf7cc7621934e073637b30f2a812e056017e8c1d9604db7075dc36b33d7063e0dd7914a0e06559900128f8b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kn/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/kn/firefox-65.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "68d0ef81b194b16db975cc88af819a1021cb715a3ab9a24cb482e46e83219422f8db546be19667bd533835cc25caf0c8d13f7bf4cbed40cbff919bffc8b72066";
+      sha512 = "2e011eb656439285e70731bae9dc30fe9e2fc06e50657f71037c20221c8673ff31b43d9851800a084347b8340e3caec980c98840869c84369820a7b3f85fedc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ko/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ko/firefox-65.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "36f857ff7808f6a5023afd6ab8e1679c93e77dcf6a239d3ce4bd66548d22c2fdccdbefa648438a73a833d5f2683e334a6c4ae641a009330ddcdb651e2327ef2d";
+      sha512 = "354b2309da4222931786767c1297eee81eab21cf59e9d655dcf5b7ba7a5ccef754881a86a908f08c206f72af9171e548fff97cfd53a249fd3db7d20ac74aa795";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lij/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/lij/firefox-65.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2a2bc5d3d1c5f74468b8109995838c9a40c738727cb3e9d69236eb741f68de1862bcac12c4607aa65b6cac423deccf07b9d5e3f0b97ff38cb6ce90111ebe4c6f";
+      sha512 = "6664d0bd118ffaf52630e21e361d2354c480bec3774e1ef8e20a4a4e50b88d2729e6ceb4c5252c025973d699d7d8914a8fb1251590692df16fb4c7550685d907";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lt/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/lt/firefox-65.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0f3a3788acf2289732485097531817680d292662a70a3d7f5c3def8526e9bff444d0a3a7d8f7263048659f6df8a80a24744296b2f306e8b44cdbeb23e2b0f92b";
+      sha512 = "eeb4a5710ffa88f31537e39ff7f6e885f09b3064b577eb9cc34dd03703a66251aaf69dcd4b0325c31a0fcfe4e8735998224eb6fd46cdff46b91d80a70ad61f18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lv/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/lv/firefox-65.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "856aefb6989bb97f5525e0b0e2acf14a448ae8d316c9dea98513f74098d36d254057c23421a40ade7bb42a522540232920d7bd0e648857a93a58cebbbcb5ac69";
+      sha512 = "e90aacbcc6b4884996e80a038d7996cbd08a12d46ad3fcb49bd7db4e52f2d5c4b1565be82beff806ecb3b16935d281fdf84ec5c6aa731f6b75f435f8584a1f1b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mai/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/mai/firefox-65.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "e427c73b0774026d8346476b581dc84f087e7989ee1ae7c28e0155b8debf4e55f7169caae7d2cab13b6d8b46d747734ca50a6fca39f256a381349634a9d4fd13";
+      sha512 = "e9f7d43cc2d67e38fd560f765f9779c5f77e868260a05287add23bc1acadec9e57a302f84f95a3e7243a5cd960b4c4a8fdb44b6b308d09b0c3c7e515bde97aa9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/mk/firefox-65.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "f715fbdc2619fa35391aab97245a96b8d60dc4f8db90fbde1336cdfe22f5dcd4e68b6e9d3c4e8a07e5aff4a8bbf92daab3ae1df454a5111a436831120b390cd3";
+      sha512 = "90b9dec499e6d2b3d00cfcfbcbcc11a2ac8463a21f299e21847ab6376b41327a1c79e1d5bc9eedf691683083aafddd566e87ed8e38fc080442204e8cd516c771";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ml/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ml/firefox-65.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "28e98cbdbb69eae96b78586e00ad8379d0140bd02a2e9ae64bcdd2648978c63393b0139cdbebff87d703e5211709dd500b5341ad25fa3a1d3f840b6dd8358029";
+      sha512 = "f750e4b133095231ae45465d896288ad278c3ffbb8c1eb2ba3722d1995d76a7eb4c7058a26af01f52e131fe9f1dd05a907a2f1e50ea8b48613d124f293ee4a71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/mr/firefox-65.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "64c008751c310ad50624563214f14a310accc9f3d68fdc740864b5df50891beb76e580e60789a0219e862ad66248d75268a981ba25f78d6218d3107c1c911186";
+      sha512 = "db2edf0c78b251074b4fe561e69696c9c2583bdebb64c03f82d32b223439400adc046c06982af6af5dd161ad46fb7d2c73b5eca64716d8d102ba60a2eac66c58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ms/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ms/firefox-65.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d5eb1472e90ac506cb518f8cd18d9142673ee4f1289db35e7cb23df895c71a48671d17a468289c21938329a89c1dab5e23a8c1292f0a5de41c51b57091a5ea01";
+      sha512 = "049456cc866a610bfe0628f48c8b2e8973c4b7445f9be343bf94a586399788939e23d2d8c8fecd42957b597f6044581015a5b2b12cc2f81d5e070c6ec9055f08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/my/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/my/firefox-65.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "79944df3288c8df2a105e53e36e253aec6990a48bda3169de579cd1b29176cf1b52b1ab8756a19ad06e1a028421f59a835fb69dde18394da0e10906a9c9d592d";
+      sha512 = "6c5e41611c8ae6835b9d40d293f5a89d8af21fcd70cf41c6a91d5801b64c735850378456b7cd063e472ce8d53dee3ec34dd01dd06801069b7f1bba9f707d54fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nb-NO/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/nb-NO/firefox-65.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "bae4bbe321b54ebf36d1c0e978c9d18ebd8ce1b4dc82711c2504fa638eb29ee03e84935dc6a458cbda0a6ca0cb5b07f08e696b9cc2f5c035665f8636ceade660";
+      sha512 = "b3a3c105c9cda51d30cc010a70e6415160b685c4f17f7da9d2778e146ca18c85ea604013cc85116f324164641ac7e6a3870694ece1fb9d20e0f803abafd6765b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ne-NP/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ne-NP/firefox-65.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "cdf8bec99e46d07915d5c5082390f168617910f9b43f7b983741acdd7f09d9b1798a2b122e3e7fb9ba1beea7e43592d488264ef428461a4b90ba4dda42b0cd11";
+      sha512 = "877ccadeedb22df1dfde0238c06c966a351bd7f6ed3a0125728addeb6caeef1f86c495279e3c697cf42780c3798b082742dcd4893c98eaf7631336a1861e7e2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/nl/firefox-65.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "61c5d39dff518e923c5a81b4af1a1129c41bcf71d76fc8e4a4326adf8c8c486aacc6a7144e234c48b67adea7a03405848a19a65a086d12050ae1ff611a0200fb";
+      sha512 = "ca467db0ec0f7d81e1dc24a8f4a2a8d91e4e84b5bf713848896dc8ce8d6efd257747ca2e45bff2631ea7db74b52eb204f2f9e72dacf3f246086b324828274221";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nn-NO/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/nn-NO/firefox-65.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "ed4f2598b3ee286671a7dcbcafb3ac4c1babfd58221ac1d6e17ae88346124e41353a73be1eb61c458cfcf20ac4a3ee26f16dc55b05a999ec9d83a28aea4cf87b";
+      sha512 = "295515821faee96f622088cc3c09fd846705314d81349484df6ca7e8ee8b13751c851cce195da33fad99a602713468959112fc1900c72fe3bf36c23cf4500ede";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/oc/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/oc/firefox-65.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "9bd6ad8359e8c7a4999e8f931b220e10dfdf3cf147cb683c5b3d2a8de775323df47117142d75612ca73c015f6b97cea271d0728225069da0f4c8359c5f5ebb82";
+      sha512 = "a6baf7df53118c4961ed61790c6c3fca4fd1a085f1e70b1c6be1c235442d59d52e50f6cb8324c284b04ac41999da6bd4afb13b1239706784b9d5f94d546de031";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/or/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/or/firefox-65.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "926f128bd5b7fd6d6c74883517d3c54ce5f7d917785f45ee062610c3d0389371a48f971c247984ada2dd62a0e7249350b9b32349225b6cef80f2d2c10e1b35df";
+      sha512 = "a20d2bf4a07eba0c9f0d381b969fd306d24e9b0143a75ecad0c47530f4b000ad5dc02706f6b1943c01f660aeb0770037ab46331cb79634bee5e0e219e4f07052";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pa-IN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/pa-IN/firefox-65.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "91757cde47223590be15cd74e3ce8f0466eae141ccca68f38000bd59c711298222d9951df1765f68ca03d2b8d15730a8ed73d142c1086ab2cf579213429ee581";
+      sha512 = "2a2eea08c493e9b815cb1b3067e0a190a0511822612f7bf3173ab1ad63ef1eddd47a9852c759a59e2ed056ff17430ba7a981dcf7f2a4a1c2762ebb2d7db3212c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/pl/firefox-65.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "77cec103f6c2810f7cd3cdb036a590fb88007a86b1775178c64f81ed05ad92a8033bae5bcb753f3f9fbc39d10b32bf1d262599da0fd4a23f3a692c5941d23728";
+      sha512 = "9f13479337e88faeaa5ec277a434738e30898295f70d89b687d24fea044fb5f0809aea7a323ffa0bd6e5943609a2701fa22d9e40930cbc727df6d6db39c98820";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-BR/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/pt-BR/firefox-65.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0078e18b65681ba521217f589bddd7b6c507a529e30fa524e83087e4d4837b8e771cd6db1e1cfb77e107ca28ba05c052b3b5b8c96c92b2eba63636b6a23c3999";
+      sha512 = "e5eb4373fb9d549678e22d83d0d4fe80857fca3f0d1fd4df3e7fe6d6b7a87d56e5f4ae25fb678be591d79a50018c108c16272b0e100ef7e91705563bfc7f4a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-PT/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/pt-PT/firefox-65.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "aa0b1f53bb6da5b64dc8ed0da0a46e4a28c0064c1ff03dc40afdf4e2daaaf9c7cf203bf6f66d3c5fcf0fdbf0c3aec3e71819d49ca901738be6e6d343bf44179f";
+      sha512 = "18d7bb2b6514e9a057546476bd671b8fb1e5572119b7ce13837374c16fd3b0b7aa05674bceb2bd68a8abdca35e7c9f5e3962e8f4120f646e8a543014a6bc82f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/rm/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/rm/firefox-65.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "aa1ead0607661103ff8d58e84cc7b6b2fb80422cd25ed670b9403236d5a702255f56033cc9ffaf5746153f70973f9d8c711783fa2a16ae1ebb55e8ab9a669b01";
+      sha512 = "f9b170baea3b86c9473ecc0d1e0928627272d5e579ba1784fed1ab89155967fa941b1b185579bde1d064f962f312af18df0ee307da85141cdf5596bf37934224";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ro/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ro/firefox-65.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0bd2887af7ccb38d6ef931882c33c629443dbfc1204460bd41c4321bb36497083794fe7e7761484a400844194f39247b30f68c3d2d015141f472136dff3d2a53";
+      sha512 = "39f03910b2dbdff9989b422af91bc658c44c4df2c33a0c27670c4f2801b1a58f316de7121cd094adeb83ab76e59cd1b0e537f9bea51d28d812041cb28e8cbc65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ru/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ru/firefox-65.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3603a4998739e7a561f8e642ab1c41346abf5a05eb27b67fdb79f6025fca1a9868570bc1f68db6e04eaa12ff81aee6522fb2aa1bbd74aeb33e08c69b9f67fd8d";
+      sha512 = "19c6501d7f7e0d9a024c8a6959f5d8fa940ff4e86cacb0cc5c521abb4b126a3d46eb33304d13683f907e539f02b74551ad4e4b375a3be9e22905bd0e99df62ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/si/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/si/firefox-65.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "1664426cdadf570e4b1282f38015eff3436fe6c37f3aa0b9445f5099d3e4ea58d176364cf615c28f82cf37fe07134611ee405dd5dfe1df7d41f10b5aaf97251d";
+      sha512 = "5c326b2570f33772212ce362ba77117827c779c61fc7639fb2395a5ed24634e63938da4c28612cda1b15604f2b5dc6012265ded2ff1825c5f4f04e946c99f718";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/sk/firefox-65.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d2144172be9383c32d2f66328f27ee5d9585959687efaa5bce1e7a9ed1726af58714a535aadf6dc42e31684f44f065775126e4ebd177c12610e40587c1094566";
+      sha512 = "23e73244f1083248c95dbf8126388e9b04ad73f22a612f73dad31080360dd4fba307d40fc866ab6efc98b039f3d35d6c50bb972213ebcf911983bd0d0c5db0c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sl/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/sl/firefox-65.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "624becd246d58a11b1353a4838e78ed5ec8362f356279581ae1f4376da40712b6aa388d5cf02eae6040139e34995254e1ee0c08971d3666e8a867cef1be38354";
+      sha512 = "4d5c95bf2a0093858fe96b161b678bfd438a48d4f28944aa8cc9cdec2b81acc6a5e08b46b28314d8c2b050145f5c01375d5d7e4a2ca8e24bb92670378de71d82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/son/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/son/firefox-65.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0d2842e6dc3187608265c70d1b0648d8b31e5b790b734d1e09c9621f8910f015ec7c245d4be1ece26f5df171bb134afabff8af1de373185d6186cc4bead293ee";
+      sha512 = "d86957c2e439f103c893bc07a6489f287b0729f0fafb2e22dd1377e57f81c4040561026f293809b9b87358f6a8869fadc435286d29964a3493743df4b5731cc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sq/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/sq/firefox-65.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "1539962902491f03cc0e5f5c730137a6c7649b02e3816042862a37f06982760d1119fd7721e5199b94f45a4c21f76797ffba6f84981f4ddf89f1791a06e55e3c";
+      sha512 = "4de95c18336abfcf08d527c85ffa3ef1d2372e277d0396b8cca65f65dbdc2e26da9d5fd7822e085dd5276542c64dfcd9f3e9625683c794b7ddf66f7e24a28c96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/sr/firefox-65.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "0cf6b4c2db8c5fcbafdc207f38de436a25c4bf467589c69d2ef1c82cd91b8ecd19a562af8bcfdf9e867b9da2c54d1bf492a395a0e6c00712f7143cbef4b598ee";
+      sha512 = "77c58de80a2ac7e2cfd27fd456c26e8375feb22bd38ef0bf63a99a58243503252320f7b98985aa108db7f98620d24e43bc05f75262e05aa56c9496026ff169d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sv-SE/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/sv-SE/firefox-65.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ddc9bc5a3b260570c5df6995857cfae69e426b745d5577b88dd6b1cb56794e3176ade22ea78437afc5a0d2e493c8d9281266ec5691cd9cd10743e6650df48478";
+      sha512 = "f41bd371238c0b63b5f6b34db8e13d1720806b021cd1587d1a5b54b09e25a050bf76152542433cba4b654ff02174fcb0b67d582996d86c4cdb02186c02da0d02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ta/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ta/firefox-65.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ab60ae9f72751526b26b7bcd062293cecc30ec02464797788efe9610a57baa0c1deb3ecf7af6d5f2d1059e971e04e119b497e4223853047f73a924304b16ad68";
+      sha512 = "5b2260994251215cdbff0e269c866a8bf9d4919334ea89ad3bc6c917d5777455ea9033d40ea28e2d348ed7a13c9138735d9db0319d7ed2f99e9cba887ed2cbc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/te/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/te/firefox-65.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c1c31923c57ff1484dd7992a380cb812a5954dca248bc2af69ebb104cfe9f543a16b8447694a748d427f727a87dd07474cbd17d9a1eacdf0c51af0ff48e79137";
+      sha512 = "be84f90d6085fb86abcff4a27973e3396b8a85d226283f2b186b4dd2c6644f701757430119cc97e8092f77a86a40e6ec594b11379313d3bbfb02e1c970333193";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/th/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/th/firefox-65.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "060058a99916d0b851ab41e0a1c38a3ab8f15241a8f46d4fafe50d6a9dcc436e697a1e6f7ced819bfaaabff8335555afe236807877400aca1eff9749210d8d9f";
+      sha512 = "cbbb63636a3ccf8d22ee417aa2b93fc75b18e463ee808da1884b5e24e624bde194c05b9e6c42926c43bc99d3629621e6cc9678950b95f0baee998dea34a03215";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/tr/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/tr/firefox-65.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a8e6d67cb49fee893600fda43ae4abe9ea3d49edea372db2ccf51589edc1cc4762eabf641ec51d1d5117ae0424122da08c0ca3cd339f7ea6e46ffb8f33fa254d";
+      sha512 = "c047aa406bbebd370a2734ddb890db59103afce3ad2d6d1a3304fa0bf7582cfc92b1a82df254c08cee44e3813bae19cd4478e84f582b5eeea013ea905f7ce3bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uk/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/uk/firefox-65.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7000cb70414f2c7b0b3f4de5175584732acb5978aeaa77721f91016d31ec561986124a28cd8705abc57a562b1dee1b6ff0c270105ee0d1c6a3cf485b54c8184d";
+      sha512 = "f68c878fd0b2f7beaaeca9ad136a1de3f638be44cc3bcdea9e8400e53ffeaef4f8c8680461646fb43ccfad6b196f55362dc264aa6bd3a9f5f3585a7195b84bd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ur/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/ur/firefox-65.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "445ea8709ac7962cc9c2e5316453918d890fb3c6b453f97fba4a67dde6707bf509eeb3e8cff2d7789a4acbc9d138d1f7e8d4d493db55dd122c48deebb401e113";
+      sha512 = "2005fd2d144c2b27e7e337b6dd7f5f69674b26ce4efca694bcdddcd70ab7359dcc506b878107500bd925d1011b29e78722c03178dba7046205e17a4ae64efe0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uz/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/uz/firefox-65.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "acb46a2d398da472fd85f8a8d8e6498570b395445e21d4bac250146e7b68f9ae01c98747a67faceedbef3cddfdf3f12a7ba10ffbd9c5a20ba9fb8542bc310944";
+      sha512 = "691661c527dc6b1af71bbb2fdb8b4c58b145dd287124d88ed93adb55fc8b1d692ef6e09817d6beb99d77df4b12b19252d8893b15181f9b071caee72a84fcf8c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/vi/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/vi/firefox-65.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "e3541f17bc38a48453e4a3b76e7b721b56dc8a3d41f16d23d7ce9698edbcac860c5956a1ba2db5050dd490eb8faef3c8d75ace0d878b77d0d54321712e9a2c80";
+      sha512 = "68fb1ab0a828c862521d17ab83eabbaae20643ee9d51c5b44ecc558df810aa69db5126996adb9ce718dc5228e270cfdeddee67380510947ad10c2ec9426f4d2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/xh/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/xh/firefox-65.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "958064d163f58f306f66de17f0b255cae1e315c707b70a1b19e0bd37c0ce8bf61c2b5cfa23cc605c76dc77061d17647f13a93577baff167bc9acd044d26f1232";
+      sha512 = "95aa29065774170934aeef544d9307861b8cc67ef9bbbfd3a325a6e3d2b0b3b455d8e2380c034741517dd923aa4e69867a043d25ec608e0235f7d2b7d3a63537";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-CN/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/zh-CN/firefox-65.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b74a598177fcab1dc721e854135cbca2769a478a908adbfffb18d5ed7dd4d1e984a8413d11fe5b11235423962bc0adfe00fc4e3c48512909dda0c12663d01564";
+      sha512 = "24b28934b65f86c18c63846873f2199b5b9777b24049a38b1b635cb93808909e8f65b09562d9870cc93fa9e11b0116bdd87b13a38fa550cc3831eb4bad9fc0a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-TW/firefox-65.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b3/linux-i686/zh-TW/firefox-65.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c7bee751ce40b7110f0f32263dc6e928d52e5b065ce1e0ad2770a43c44dbc6f1bf372df7aaad909eeedb8e4e48f045365f181b25aa8baa5ad738025a293b7c8e";
+      sha512 = "72c10bb2f0fae9a2b5494b4ce082436a46744775c269d3ab72c5d90d28b2ca1c153e07ce0b32f1542be4c1750e40ed38af42202aad6e4222c432f431a4cb5f79";
     }
     ];
 }

From e1e1e7ce9acf94ae09b306d3c737afdb06c0beaf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 11 Dec 2018 22:10:49 +0000
Subject: [PATCH 1729/2793] firefox-beta-bin: 64.0b14 -> 65.0b3

---
 .../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 e16567809d6..c43b7a5075e 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 = "64.0b14";
+  version = "65.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ach/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ach/firefox-65.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "a2a467acf4d76b09d7f04760dda0ed2e49f31e96166c26bee8efea0cde4dce914deec16a7b6bc3cc8e06b2acc70a250c7db980b180c5ad7b363e8e0334afbfab";
+      sha512 = "c3ca8a9e6f4222b0dd25736d834fb8e64bc4e31c16fee9d972fbd8975ae8de216e3c35606b997be524e42b5dd303e732c78d55e99c7ee62dfc2577486c13c18b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/af/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/af/firefox-65.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7a271ec7e0600299fd73101ca2148a5057149deefe5ac5747213791f5cf6a2fecd54e04ee7b3b0bd8d3a5cc3ff8ed852724b602b797d6a8e43128ff2ebc83af8";
+      sha512 = "f6e060af2b549d0d7423947f3dc107fd4ab78ef0703eeeca61e344df169d1fb94d8fe8c3912b0cdf18923b0aa6521e5456972491ca719dc6bc82ed7a8078615b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/an/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/an/firefox-65.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "418f50d3b71d265d7669a7ab3d4027164dbac85a7970c6fe690fa592c08a33ffdf8feaa6a58e13b28566e8218f2988f134219608d4a1804fe7aef8a154c16f96";
+      sha512 = "a0faddfd3a781996b43d3a1fe9129a51f0619885c76f305e41e4d2689b50650ef9bc03e831d78c706d5a537814f05655cdc24c0e5b59ddd86f5b4488f96959d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ar/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ar/firefox-65.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "61439fc182462d27a03ad8d9472d96a50336a864915632f8e0c8ac3b0c5e2f7aa6a346ffedc1f0712fcfd6417063b0894e2d8b4f015f85ee1ec4d9ab0ed48c01";
+      sha512 = "dde1f0083defcbd8ee318d521720803995baeb1c249fdf4c3df0fd6b8f84187a8a6420fcf5a376103fa408f0949669b36430e157b530eb48d1ef9bd6111cf5d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/as/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/as/firefox-65.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "64f83e85f4ef5c169f4683e92224134cc260e052f2e837e2e272d052cbddb106ab6a14a985dcad7e9928a7ac17e28b9f847a22df681fc4600183606330012e16";
+      sha512 = "dc91a71fee2719fcf608f9dfbad01bb8d87e894c46e81a3baa238ea163b9f7bdcf8da4711683419d7d2d4d3bd71bddb60be568b33cd9f59ccf7392af8cc0262d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ast/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ast/firefox-65.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9a7cff9892fa4fd89bff4b4be462a949d70c6c07eaf4c2373946f8f991e1eb6656d2a7af6ba55a7a4fafeb54988add6a779c01b42861aad37a58b81adbb487fa";
+      sha512 = "9ac9ee34eb64e055c66300d6bfb0a35dae245a9f2a6a01e5fdb84a733aeab3ab7dd81eb3b459e1968d8cd235a3e5214972d0f5be93a0a9f170e7e0f9e50e6622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/az/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/az/firefox-65.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "1b635a7599459e3f270bdec64cf6d9b984fb0b2470c49a3fd3566e1da3ebd4302ae0f0b575f739f9c175a4630f45f31ec39feefc8ce2decfcd84383582171b8d";
+      sha512 = "982c140b2a0b84200079520013e36fe42c1fdd2045e841365bf46b853805bf864ee088df113b7e48acb0dceada669305bb449e2ac868f49752c82e510ff77b6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/be/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/be/firefox-65.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f9935dd0f3a9ae11812acb03bfb0166e6030872b847cf3cfc29e9b56eea5050cc1e75a898a404deff6b01d8131c112c3dd2df754c197a69fc9f0e0093bf2c128";
+      sha512 = "4531eab84b8a6908aed58a6a6b3a15fd67c1611a51683d5f67bde2fc8d39a4fbfa0e17fd51099a49b15aafb5919a8df0cd5fff7b90677c7c4e0e6aea9a2207b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bg/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/bg/firefox-65.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "13b3618c401fd41f8f199444e84eb5bbdd3b50605b30fefbc15819ca54f92c8bb8e542396c2a32d856453e1a01df98d4755fe6c840360ab16a308af1cfe0eef6";
+      sha512 = "3ee58c12814167a54e8492d6d2a7b0813d4cea3255dc7489fe40e4de1ed0e336347f2c6733c798db2480fa7f582586928cb6d3cfd62c86f3fd9bdfa045c36b52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-BD/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/bn-BD/firefox-65.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "ed5492d0f16d45d5e22f9fc5691b1672fa46b7b71389ff80d35b16de9b02320acfd416d44e6186e7fc2ee54099fcfe8a356f302bc049092d9c955f2f0e2b29f2";
+      sha512 = "230588540944371b9cff15ff18b32784afbda6f1df8aae3ecdeded5313ca22e79d125b17401ee56aea6be176919a66e4892f0f96dfe660a4ec15806083f84304";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/bn-IN/firefox-65.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "df84b6688aed1dcf4de5ff8eb8d8bf802d5062989259c2255684d329d172c1fc509c1fffbc6fbf7f045f8aeb0b4955a3c12da85140899e0a5d6e6193f2bc4170";
+      sha512 = "4f52fe5c31aedeaed4a9c9d8e5cac8292696921b27e28c5a4b4cf78ead1194ea71b43c7d86272bf398b3b209beec47034fe5de50f3af08c3444db8deb81381f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/br/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/br/firefox-65.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f8b148f8a86774a0ab8b2f7590b6d76feb9d2cef99629e76b6fb86fd1195de86aa6693c03655ec4dcc9d062978c542d13d55c2ba7573242d2793f8f71bc9b34a";
+      sha512 = "413ed5addab36e89203b685d728dbfbf53b79a1c6198eee1efd2c4127996844b50b34b18e706188abfc85ad20de4f32414dcf01c90280472e42c972750208c13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bs/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/bs/firefox-65.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "150783ad5f748514f46743b7d1bfddd63175cd8b17eedc6b4f1049ac9fdd4d4b06288411fa894f09e18c0b66c2d03dfabe769bd77f909062a36ca78af9b1b60c";
+      sha512 = "25d9c312badc08cd83f8be311f9d501239352f616400e8b433f147514fdd92146ca58aaad77eca0504119a33e1b52d4ee8a4e9fa834133f3ea6a606caaa77b0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ca/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ca/firefox-65.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3d4b5ba4f9efb0960a2e7556cb08331f4ae78cd193f065c1c2d8c9d6fdacccc1de5418bc7e9a71ba19d9de7ea78f2ef154a4a95ac58489a8f9990a3ff27c1395";
+      sha512 = "babb26ee8c76df30c166dda4bec9134d2ea807f1ba69a89c8fb10bb32ef2b9cd326a21ff8947f2461eead6fb9e1d74cadf16100aae9c9f584ca6948bc49a061d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cak/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/cak/firefox-65.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a21f14531c8e77695f49cfd8ba035dee340cec05764dd009000614eb3b1e5ea73c6c677dda6d13bce7805e1a17669749a37fe4cca9e6c10db555b6dd0f057af7";
+      sha512 = "ff0a31e6d140c7aace7fedbf3a814b33176c34e5dcb2d6e1ddb30fe3e3c90567988413eef8a77ef750b23821ba8253776672800eb67eccf5f3cd0e7433a0cfc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cs/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/cs/firefox-65.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "70421e5d7c0ae97a941b9b008afdacbc883b4d9c2672610bc08a1b9b31f90c9414aac791c4bf63443dcd8155f90777b1aa29ab8e9d56284b9da7a872d0055f0a";
+      sha512 = "f3fba0c29f5dfa2eeacd105feeb549f0e202111e4997754b2bb31282023ae1d8323490ad216869e2905fe3d9c914d0349470ab0ebef0e0408fda85a44fc8214d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cy/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/cy/firefox-65.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d4b903a0e7391080be7c3dde5d714466550d55c82354d5ce87195ea40e1bc026dd43e5529ec2749761d0578ba76254bd12bcbd127b364202dbd6dac3ec474b89";
+      sha512 = "e9ee4ade92e51b028e60ed863c92302a31ff1d4b2603f54085f0ee8aa0b691e5af87344862f4149b3ee2bed995fead659d669c3e6916411967386590a722fb08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/da/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/da/firefox-65.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ac3b7b0957c48b34b2266e46144dc20e8d24e131f86c227ccecc07fb232e02dc4e11b7019df3f0319a90ed58c837bc1f4ab520e91a6279e4e37b7fe6a02f57f0";
+      sha512 = "d5d0e5a7b20d29392291d49bffe038ac483431da852d8a279bc4450bed25a15014d65c8b1590fe3321186f4ac4a25aa7d879dc6d61f92a051e3fee9d18464d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/de/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/de/firefox-65.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "4187a9813c2a948d135f1f8e70d31dc8ee1b8ecdd3a07905e7265533e6df77fa68b5ec09ca7525a9a642758c99e91d3118d02cab23468c9e383e2bdc9389d457";
+      sha512 = "8ed2fbcecc57105715e88117dd28b413353f6c03545ea42b25a1296a79b63c735158be461319962ca34936deedccce3f0fcff546187bcad049a03d31dd375327";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/dsb/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/dsb/firefox-65.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8aee6ad9200054c3124bbc227fb3c64e4a2665ce68616c145c7ea7eb71d35aae3846068616ec39d8b80fc29adee954c4ea31fbe5491169e39a70988866e16133";
+      sha512 = "b50478eb6cf8e8c2d91ba18551cd58f58ebfe6571405285b1958bb63a5aeca3b1fd8e4394c94f6ccbb496d4544224f454d502c2dcbb1fecd4be3b52603ebee38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/el/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/el/firefox-65.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "85e9efc9615d6b1cc12af25e8a4051ef885e2f1b535ce9d2f9aee16162aee91672e6230774343991896f993dc93ff10ccc2e24d7c3ff13ed1acc93c7537dad26";
+      sha512 = "9ad7764461b9ed1551d2198a417a80da283e5ed855eed9b8171d86655571e8bc1ccd15aab3400aa7f963a2ee4c5d9a7da9e007657707e929b70fbfcafa8dcb39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-CA/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/en-CA/firefox-65.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "8776b5d1286d90522b133ec1923b5f510981d9a9a59f502a421a2e12f0e6fc46af66cb887db37326802e18dfa99ffba823143ffa60ffb03a95f62772af132126";
+      sha512 = "da400fe13e80438b133dc7d85869b92143ed1b6a30922d99eaa830a2ef3519c6ae0e1fa2b51c361cf022960c3e3e3d81bdf651b8980c1f4642e7b6b7c3ab4e20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-GB/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/en-GB/firefox-65.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "477d56e4f5b7c2c26ecde42388fac36ab1045cb52eb5d0ed5a316dcb148efa8be8eb5deaf37eccd8ea906ef702441af476c43cac795278e6a0071d46c5830861";
+      sha512 = "ee0167672af62e68688bad16c38e112e52d055c2805eb62991c6a172ed135d44c3c4184032be1bcd05c1cc9056bcc3644a3fa5cf12eded4246762418adbd4674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-US/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/en-US/firefox-65.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e6de3cee9298362fe3a93ccc23ab3ec1a4e8597224c44e2c3f31e1cecacf05270563f988156107c4d4b009a5a8e7f50ba849a94e38518fc30f986f6a73bd06aa";
+      sha512 = "35cd686e042c849bd7dca740df63b73420a8a50f01e7418b52dfc59a67070da518cac30117c956ca61907804244884c0339b360a98773b7e63600d3c2f6a12af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-ZA/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/en-ZA/firefox-65.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "03944b015f1ed1521dd79c9f3948ba280d6b52cc9655f6e884310e4032a44e4fa38b4ee7ecf8cf50c48f4bb325986835a7002cd7e7e21ae6c1c8d63764478cec";
+      sha512 = "d92945c7cdc811019cd4a228b7ca0623670a26629c0f66ed2aa289d4009b41964c64ae0a90666af767181b516ca6e5076d732103fffb7314c0f054de04f3afc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eo/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/eo/firefox-65.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "fbc1bd9143f9450c0c42356c20696890a64b333e0506ed959d3531cc4fea7b50fe379178c7fb51ef5e8449838d2749ed7f3343a3a2617afdb994784192fa8c2d";
+      sha512 = "829a7e30b4821b4440d85abeb08d270b9843cd819455ee80720443ac0c5aec39e0623730fbb93a26a13c8d0091fb93f35cc35133bfe921f0ac7c829b0f954df6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-AR/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/es-AR/firefox-65.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "3f64bb89d8311b82e93c121256232cf7420d1d8aecf2cbad62b823904f4d0cdcb6192a276e97a2004614294f7893885292736f7e3bbcef9217554f680c0fb509";
+      sha512 = "dd18cd4abdc7017fd8d2fce9e3b65f712a97efe00d6205976032ecad27f131e1003124ec8ffd18899eb98c84a239e0e1f8f4dec5788bd321048834c3dba4eeff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-CL/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/es-CL/firefox-65.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "705b55e42f4a1982712c1c76f758293e6fa8785938c5270c95285b0e31a7caca1552adeb69ecbbf5e5b5d714ef2e282d00762b147c42a0ffd50c01d56cf9cf6e";
+      sha512 = "1c260a64ed2be230ad62167bece3f92838a7876781df3763685d793ad1e516e5df0e6f4d3d15fef79a1221a8faec918e2a02943ad0b89416544fc9773d0f290b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-ES/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/es-ES/firefox-65.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "583337f9a52132f2265337892071bb88557c4bb5a8e827ff2c37c99ad45a51b516ce16a145e7e32c98bba3deadbc79fda03f0dd0f2438b8573774ba60ff61e50";
+      sha512 = "fcc3955ba9445c2ddd2c07ebbb48cb8a26dd1f83b9fa5aafafc316691e767cf7f1e7be0949836b45c441311cd34047b764eb2cbf0344f3d157b749de956ac830";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-MX/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/es-MX/firefox-65.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2178c0f13035d9050550101a090818b4c3fce5577a13389e93353db2d33b025ab8f5904660f2b1516c2356af4aabef9cd6f403fd5e70560e3f4392db7c873c22";
+      sha512 = "7864cb16e8d20bd357664601e427f0d122bb33e21e834a4a86dfd0877baaf0b4da1c5966253fea8eea2e12becc7ffcab1c5e78801755f1e2aa0924c67710493f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/et/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/et/firefox-65.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "405a1592c91e51fedcb68e526f75e9db7cc28e333fc75effa4963d4313216080d863a071b0f881e2d79c990d721503e6f2794d4a374f108aaa65a63ecd9c3346";
+      sha512 = "5b407aa63f302de0c16fe726f11fac04cb2a866908ac5ea0405949fe0063aedb383e309b351dffb9bc4383bbdc74d3859d536262c12e4d7245ed982b328ed598";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eu/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/eu/firefox-65.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ad8f627889b4c801dec0e73e4ace1e62f3d7a9e561629b2c7907554740bc74d67e9ea69bebc85d7f79e671c3bf95a3c3bad8585afe590a9d1da28acbe2bd71d5";
+      sha512 = "33600da47d3d9de6222144d738fe87f4c6f1ecadbb7a7cc41eb8caf376254705d3f86bab1cb1db204b00b213451d20923017f09535a87c39a8e9da221ce1e40f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fa/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/fa/firefox-65.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "91dfbdf6caf769bb45e168630dc028dde338fdaeb25e72a5f1fc98787a877d4c95504f4a0152fc6c7f7b347a4629aa8250c3a328607ddc6340c61f867e7d274f";
+      sha512 = "bf9de12b047855573b1bf49bd50d5146fdf7ac627d95e35e6e48185f687096ac25875aaadc8af8681588b7b7756ef5886912c4be8b6e950da0b88d8a1c49e12d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ff/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ff/firefox-65.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "5271040348c6fb046e04df8e0181b045a1bdd8ec46979324f8ce98eec6ecde148dbbcd7eb84d7b3102dd10ddabc14360487cc8735c3c3fd84a25aea79b304492";
+      sha512 = "765f65bc29b93bb7f0c393fd175f0617d8ed957206b83151076b6346d14e56e72b5de0c5285e400137dfe732fc332fb092d39159b55cd9b43916cf14af4752c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fi/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/fi/firefox-65.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "09386d83a26a8dfba3da620460026ce4bf92032dc8e35db28ad0bf9501b11b4c8108350e3823135567df03194573c69483de967d9632e4b22904fa7b2a1450b8";
+      sha512 = "bdf585c2d2cd5434e8c6c3c290a68389993ea87e9bb6b9cb77113fceb1651b705eabe5e5530e19f24db7eb570b3553cb19ff00ffb5e541af69253d3b8ea694d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/fr/firefox-65.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b14931c9146a5784dca231e9eafbee32845af405baffe2cbabd70fb2369294d797fea8a719a2679945c375f2355773cd4a54b287a823bc7e9896f41e56a2ceaf";
+      sha512 = "7031400d0c9a189bd0d11b6724f6005d6be568cef47285bfe0b4689791259b290f4b65a64388ca4038f527fad099d1784e95b5459daa0d1d1e0da343df60ed1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fy-NL/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/fy-NL/firefox-65.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7d8f480a075692d93cd03fa9aa1b1359e41782925e91cf670100101edd8e4136e52e004a80cc3f8f36332b16885e97394871fd9b0c553a6868f91a30742fe599";
+      sha512 = "4783bd67f54f0720ceb7f07589384a455fd756df320ae34e8db7ea56c2bb462d8714280e14f850f4a09c3292a5dffca850a25d01235eb8d8d22f6c9d03b41a25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ga-IE/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ga-IE/firefox-65.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "787a5ec8470f0a06a0b16c1bc3bf11f46e26dc375d0fc0d413d6bd663baa014a313b9fcd511463eb587e39dee1657a534511033d0d92842911334ad9005abe55";
+      sha512 = "575bb6c6ce3634e5427161cd121ebb2be9e4199dece27d24c8fbc03c007fb060f5c8b74e3056a1acc232ab4acc6c0c6c178d9c9ca220f288d7ffd36fc7f687df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gd/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/gd/firefox-65.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "22ba14425e3a08660562e03a89a4f7edc7e8759378f549b284bc69275f0660fc52ed87f6ca028ed361b619d33446fa7c397843095d4ca4eebdfc4edadef4651e";
+      sha512 = "9d3379022566456615b684b0efbe041791ddc7488f01aec24957749cfbb847748fd96f11517796cbfd8452e5e00aa22ec605c869851b1f4f050d3b27c742f53b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/gl/firefox-65.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "d36f2bf1b3be13d64dfc36f853d67defc8a6d08d93afe41beb7f8b63854baff198fdfee13c65a4e6f9e907f91753844dd41a5503313a1e8c364c8dc3f2de97d1";
+      sha512 = "cf1df1f6d23e0cc866d46d74f8d80cc0e625cdbcf82a148351d96faf56d2a7f85de23c1b29d0c4aea1b9f8a02a773433f114b6ea06562de8f688fc61ef16d941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gn/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/gn/firefox-65.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cef46c079c13fa606a4c5b072ae14f6ab2b578c8b6a43532b38b65547b4fd0618237e84a89d4fe3ea8bfefd8a28984af783b9beaa7478cd42b5cc42784c2f70a";
+      sha512 = "0f8c9571e6a10b73ce61657715375e374618c1c9f4354aca85e422b36279976f893d3237680a0613d1577a3727461c225f71a608e45e143fde66b9a448a72710";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gu-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/gu-IN/firefox-65.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "2bbc4c4af3f927b51c57afdb780bb1ab55357f40f7934b43468933db4ffda115b19fc95a95bbb292ac68c083b6c7ea0ea2feb3a072779fd5416bb41f7938b89a";
+      sha512 = "713664275a87a0f16dbffe14b98fadac71bfb60452cf63e9a2a5c362da51fde4436533260b8200da4dbd5473df991b3594a98d49ace8f93c5afd8a61778257dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/he/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/he/firefox-65.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "897577cf30f2b6c31f779ffeb74b221513fcea262af77e2ff8beecc53e5c1140b478b530ca1c2b88f98f5b3070509c6e06a7cdf9a1b512c455e2676cd4345c25";
+      sha512 = "6e3017247e840c148f58189319d8df7d313bc1b6f644377c1bb0d57139a80d3eeecd50db72e95bec886b0e9f6fec9904ce99cfca74ac8a65789bb2d71584a97d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hi-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/hi-IN/firefox-65.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "998cd2d0b00d372023c223541c4980ce22cff87724c57135de801aa89841db3f348f183e69d6743d3aa19a0ca0e3676a6443ec8263d7a00806f537895256623b";
+      sha512 = "620e4c490deb9a69283486c70f9b2ea05f7b22c87e1ff0d0fe403f229dcda6fff2ae693cb3e929b88974cf6c0ebb6731a4b187194c2f23fd09e9883f21cda551";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/hr/firefox-65.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "18c4a3483b1561a71dee3408ad8a26a4f16207216af25b48abc892bd5298f8cc43b03005e4f06543985c5ff3fb3b3811176cbfe349ba59b5578675ee1c7ed698";
+      sha512 = "fc89d4dd16e1df0fcb2133b102f1e027cce7a8553937c3e9fa0063f4a454f84604cffcbfc57de05f4c7b5a1d0e3e6d10bad46473eb028797f93974dca22006de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hsb/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/hsb/firefox-65.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "ef1c6a4eb5afdaeb06a6bf98ff411a3b92f86fd0143df3a8473a71a434734c688c1145f150da1db6f9d2ec943f2f6cc906de43a68853a6b0dcdd126638855946";
+      sha512 = "8cae98fcb9b55de22512b83fcc5ba6cd04565c05aaae7b0be6e656863206a10d10ce3f59e29aee3febfcbaa1f175db089b2ff3c9c602d7f1d570ac2b55ffc850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hu/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/hu/firefox-65.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "8b8bf3d8d763135e766360847163541897c44d0039b7929b24bc4c4c70187866ab2a91dcc37e1755048611f15c957bc9801734b289dc0de98aaa712f9efb1170";
+      sha512 = "49456f0930cccb7bf8d54463bd9d1bf694fd57b2f962cf4adeeea0c65816edc5f3d164b93d1f43b8f9da7e9c2531d45537c34c226d64c557da1b9a4ff18ff6e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hy-AM/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/hy-AM/firefox-65.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "91691bdff5334bf1bf51fca19bf558045b6fda537f4d4094a572c015b486def65591ce2bd6f988a3b5daca357482df3a0ba90cacd3454886d4f747d4b8fc8e8d";
+      sha512 = "702880cc7c4f1d1636ce80bd1ac0a78b2ea421d9afbc0c644c5c43a40b79e5a8a58bb537b42781bad1f19f5ef35a705be07f10485ad7f01a693f4c1c68eaaa25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ia/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ia/firefox-65.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "a8b41cfb69f44bcf37c3ea84710a4df5cf183804afc8882e3929ebcd50de23d212f53051716445c42d9eb78d13930cbfdbc46cb1c1b9df20c57815a0433b38b4";
+      sha512 = "13d5541d5cd0c198337c563d1324b83811a684fffb78d066e4bfee76ca24af1b7ae061f94197db7f1464031b387bf40a6c5ea54d1775b6f3b6397f5b1a9da9c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/id/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/id/firefox-65.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a93348f890565262294d0e45c8189b80075519bc631184de4eb5258945fe5542a9412dfc2a1eb4eef97802efce995ed53a3c3b13c5d0784e74ebe5a4aa040695";
+      sha512 = "54ca447b0a0306139cc2063c945138cc2b1dd03e35ecc471775e58b04e62219a9e7e58ede2522b498daeac5303f5918114c85916a6b122966086b0a18c81541c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/is/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/is/firefox-65.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6d9a6561f898689e20105da5ddbc4740e6af53d7f0b3df9c7a91fae241c56e3babdf6c82733249ba4433ede312792643d9da5e291b8c9fb884f3178a2670ffb9";
+      sha512 = "81534b62be2a35e7044d1de5925aa006271995f65262a352262e6d4b6e1053aeb89065f681a17a824917822588933bd8d6ca5603582597bf14722e883d4e5dcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/it/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/it/firefox-65.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "b1c404d585c245d0df17531587bccdecc8e6d548de149bfc9755539e66a8d74769e12b2af95ccbc0ac062923ee6abb259e9bac5a556c40341e2c64dcb710228d";
+      sha512 = "257f5f6a9766a0f3b92ff63f5e081e7238a5b550ae6b7fc8185453eb47cce7b420f887def458b3bc0e3b7e538bfe29d52ea13c3bf945475b50e649786d3188ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ja/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ja/firefox-65.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "4fc1d401c0ac6e991d038107b73693407f91106ac79cf67926144efbd3921aceba2eaedbf5f7aea395cdefd46c8c275fde651d1f84ef2fec607d23823a1bb271";
+      sha512 = "243746a4b844e2250839a71ff45385b9993c5bee3a62211d54feab2922281b3459105113dc7eab235c148996660c10abbbe5ec4c78a261b5d3c472a657650498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ka/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ka/firefox-65.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ae14719f16db6c8f247e47cb56ece7a099321566c192b1481f5ed24256bbb2e04c6e944e9754dc9251cc70e41766d88bb25d61ea484afa1dac8992ecfc766d6e";
+      sha512 = "1529ef53cc23ca0e27c505f3039df09b72c3612a21c7e47efcb9178993ca25ab763ddb47a6181ad20ad7036b409d8351acb7594e67b4487232705deaf859ff39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kab/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/kab/firefox-65.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "78c533f5b0ee07b3e984367bb0703ecbdef5218e697ef8a1f03c37e30dd54ed4222479b450e760f0cf079da76cbe58d4784b5dd057e035d29bd56b554d442992";
+      sha512 = "5c759e1bd4a84d3ca3c0c320367d773c6b03087603bbb0ae944ebc21f2f0b01d74e979159a227d8a2c09c8153a43281be8108f58714f55639c1edf9bfcf50af2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/kk/firefox-65.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b59c5d709944696aee587cd72ea4b38c79ad45ff89e0c0e0fbaa305adc5a47ef4a9556696ff74e833ec73d74b184efd775f21306af5313df3c0473b9a196f6a6";
+      sha512 = "0e824b8f762f9ac3d17654e2bb0e9389e4b9bbf8249011330c18b68a7948f9bea1ecd50aab748ceeb2a2c2350c512226d7b3aba788640e176691dcc119ee4957";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/km/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/km/firefox-65.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "238ef7dadf712f13037f478427fee757a28ab0b3d570d936f416a49b192ec8620275e5a5a5254e8330dea242de6e6ed2e13044f098a03d64706f4600db4a695b";
+      sha512 = "7dc8c2ff86f8c0e6022894599c08accb38cd13e8de4c0e87a4c60ba20eae762d3995245e378edebfc67a40320ab5990894617888c62d9b76df2e402037b735af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kn/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/kn/firefox-65.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "3a965a435fd652cfb73b7b002561b2ec8e47159c7a239ffa9b316595907c54ca61fe978f57556f35775aab613f134078865b25546cea251708001f30b1d09bc3";
+      sha512 = "bc1a92b84537caf6e70dc079eeb97dffb2b7b042367888c50d8f16e454b6760aea793c9e168895a5bb6cca2d32704b17a6ea9bc66917f513e56bb2df534c3cdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ko/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ko/firefox-65.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5fbb7f5611b2a335c194fa1790eb34cd56c4adfd82f298468853796b485a36c610562b7d883ad953910c80db6d771a21cc1c49c8c723de0f3109be1f0b2c66d3";
+      sha512 = "412bdbdc9505b65e2c8cc6609fc3c758764b213198c8b6b4c51b42f36e1e61013f449a67bf09bf200362ae1a8d7ff2ff3f2a70be719e66a8bf7e3097df6ee7f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lij/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/lij/firefox-65.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f957ecb83a0e47538264ec4960c120e6e71aa4d83276e6927605f224074825d4aeaa79fd5086a5f2c0d7cfc822eeed35aa177f565868f7e710a5eeea11f3d4d7";
+      sha512 = "6f85e21b41fccbd30cfd38a562b72faef4f0cfc6621cf4631c7d7d457d91636b6e742968e9ec2fc05f6fc2f77dcfc43920f52bf6277ba47c963add592f5cafb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lt/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/lt/firefox-65.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2ae0eaf4ef059bda2ecee65327410aa1f0ddd1a825879ca34821c4738fb53b2a9cdccd619aa66ba535965ac10315deadebd8d70f08026138f367751179b328d7";
+      sha512 = "b9ae0727080983c12994cfb8e42513a9bd254de4f8b5569b9f8477cc2d883404bae426c31d3a8fe3f0470cdd498c3f9a6afbee73083c73604e1047a09abf0527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lv/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/lv/firefox-65.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "ba0e7d68728ba12b435e87cf55b1435dee7a61df4ad114f1b609dfa7aa38b506725c8c492bb1e6b48069102bfc2a6211d996c76c122a7b90f58f67a738c66633";
+      sha512 = "bec7914458d188c3dc2d7fd9966eb9fca229ca28e500c6ffed264a36bbed99dc5f7e3cbcb4c9bb29891643417c5c8eeec8abfa049ee50ee4fc2e820ccbe30c01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mai/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/mai/firefox-65.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9ddd2dd8b0d0b109bdd0d552e613a74b1e1716b8ce74951b66c74968c23a679679562f4f06fae90efeb36ac7066b1da7cec2f9937f4bba476b80d412ecf91b3e";
+      sha512 = "0b75befb3b1edc40066672eabe1a621e4e07bc3defe193053bc0b269b6b29fc812ec8366db5c14aaa23ccb695c30930755fc94f89feb3376d6170af14c5eb09d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/mk/firefox-65.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0b1d34e3f27d79f3d46db0698f025d0da5e6f961ab1933b211ba8e468df766339a47d9d8e4a6c643896987078fac5c6b3aad5a605db4c7faea2b3da1c0a84232";
+      sha512 = "9641f97c18c54baf85150e0f5d9d563af44e175d192acadc9c61fa6a40902bae855b61a2b2139f15cb1c154d277661b0c8a1e7564c170f475fae8c0ccb2fd41f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ml/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ml/firefox-65.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "afa01233b121d94b3695c1fef488a70e55216ebb4c69238905bdf20d5fe594f98cf1a331afaac56514c1a75631fb75781aaece1a77570db9c384b8bcf7a08710";
+      sha512 = "205d2607d1a447bc35c4ff7cbfb3b120118acb2c98d358b128c307b186b8811c7e1b3847e4d0ab607c13bdfa6ef1fd992b0c07a20635a3d8dc9f28c439165b6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/mr/firefox-65.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "faa143b4a04f0c86d6281ca6ef7fffc99fa468c4a6e14ee39d552fca910c0133682d5ef79a13e82aa2829d5f1cb17afec16582618631c0ec57656d330e2a5596";
+      sha512 = "fc7730eb12aa5df40b3b9f16832628fb92b48c94cca4f744f3e66f02ba87d04316ae19ea3ec3290b052455f8cdd0cc40fdcfcd1eb6baf22d0158774a882d736e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ms/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ms/firefox-65.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "0be2311c606cc2031d63d2eacff2d6a30022e1d65206091dde08f4adcc7fd51cd8d82c2a532db3debe32aa0fcf8355d6ec8b16822b286b3fb81faff44a98d452";
+      sha512 = "d10798dfed04e76525df9f3783357dd275312af9bf1568ccf8c27652d3798f02aadf8715f198ab2a3a4d3097b3ae70fa3cb23680b6f885ff8b83bdb3e4d55182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/my/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/my/firefox-65.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "079fb4cc46e0e89f4b5cf645617f5ca1a6b6f8b5d6dfab305de07870593181cae996472dde9c92be66cd6be06f74ce1f1d2ce8e57cec2ea331de608e83ba33a9";
+      sha512 = "e27f792f0dd2e7244d57edfe6ff01cc45ea33789df6bd45fed84b06d10b44527431bd5189ceeae3904e1f9338b82343e9012a5a1a25f8178517492b836a2f5d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nb-NO/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/nb-NO/firefox-65.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "f76089d3bf28e96b0c99eec8533119d43beffe697f85c8ce0d70779390ac24ffe1b5d190f58bfc6dcf7cda268e5c4feec825cdab8c72cdd1d8b93853eba23d89";
+      sha512 = "628e520a2b12a1d5bd860defc30a33bcdfd950b03b4735eddf45e44f821b5689d0a173b80434b078651e4999e0acd6331f7be58bce84ff613e719937beef7d4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ne-NP/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ne-NP/firefox-65.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "3ea45dd8243eac66b08e892d2cccafa4e1e6b39f7cb11c04a2af6c77b150d0e0315d16dcc298376208df1526953e1490efae31460ca8a2f77edaef45b12a0dc1";
+      sha512 = "a6e266f9e3c0ade07db2639c278feec3a644b603c53593d9af0871e6decd2dcaea4a905769443a83c6c45ff634a96bce171a410d59b262a6ddc08816883631dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/nl/firefox-65.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cb6c6b3539bcb8e78d2e9d6ced29513c7394c7dc9b66481cde01d54afacdf16f035b5eed3a247cd70104561a429f6dd76925b4a84ed74b8e23e27393631d2629";
+      sha512 = "f0bb4979b49662c54d3cfbd08b1f030562e0f7c79e31ccf01a02a38b23d05ae6dbb783e796a0b3553760db9099e4adecc63665e764ca56f6fed6072a04fdd0f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nn-NO/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/nn-NO/firefox-65.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a8fdeab729b27235f11327e217c77568502805961b7999c239f93fa721557cdb61e5a97cd38b2d397cc248c8b93b6aa1fc547a86dba5bc7ed096391e0482ad8a";
+      sha512 = "784ec6ee3a00683c8ba039c23b22b105c7d5ac91ef8d2ea813aea7e66f59a8b838ee04a77dd51eae420310eeb4441f0286a462d0aba3035922e875e6322b494c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/oc/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/oc/firefox-65.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "e1c6951b62508bc9533b485785edaa23dfd5c2dbeba6847ae12b7fab91a46ee49ad348a6aa6a79923f6689c149c203284ee210a97fdbac4c8aed4bf55c932140";
+      sha512 = "bcd016f27d33e1bfad50f74cd40a25befc28874418edf32d0068b227b7054751ec3fd067e13dce6a128b3c1b636a5d932340b31641e2dc7c1047963ae08eac6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/or/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/or/firefox-65.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "9bc58b76ff74e3e05ea9fd525670fb3126cd01d84217b2eccfde2c5e6f8e079c9466a1dc121ec39b4b849361b033d122c78ca7babae6ec968b939c2eab0ddbc0";
+      sha512 = "ba4f0c2ae5bebeb24f373a7e62b3a9030820e39c2e6482d52fbc587903ad76b9206c14954047390d9324bd1d3df9a0b3eaee4712c507f501c313f70ccfccd5ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pa-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/pa-IN/firefox-65.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "7a4d6b8937d266463b81694e7e68c332fe443649c8c11ca24d329d95d1dc5b0c3bf4af1f430a953a274ba1e5b008096d7462e502949f8dd2238b3b2a0ec70a38";
+      sha512 = "a8a3357e4f8078fb3af234cf2fa813b5c11fccf058f5599bc7039d32fe905170dc3f397bf7e454c38b85180a8e38ccc3f44ddd3493b7d869b6d6bee8f6094b0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/pl/firefox-65.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "3e20e6322afd239402bc8ed9adc9301f24d9fe58ddc7d5ce98c4a8909af4c0fd5d3af6de9d5a66006a75aff80e1107d016efdfd0a9765dbb32cb2a9dfaa5e8a1";
+      sha512 = "d54afb1d80ca96bd536f25f658eb8b1d368af65acac5ffa09334210528dafb9366c4d438d2547930755513f8d09d7068011cc26d4ad1d7d2cd2355157fa26bce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-BR/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/pt-BR/firefox-65.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5c437f8473a6cd0f195c2c6bf9061fd1805b26f2f41af69b3bf3a49de3c78e4927966ae3a319dff2508b97681c388a44f2d7e07fca316debed978db678c79ccc";
+      sha512 = "08385f674c13e98541d56314983f5dbbc9591430a8f031ad9b44db35e355529b4a4202e1b7b95fdce134026d57abaa62b308344d44730f81b27c162c0999726a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-PT/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/pt-PT/firefox-65.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "fded195a4bec193e7cd0ddb3b75c40cad78bb518b87349d59f8efe548e1b22118bda1a078e2501a06996c981f2576604369d08a1a6457055670a7d3b44e97db0";
+      sha512 = "b5daf4827e691871e59c2f9e213ab78fed0256575ec93c7faa0f8e92676c98d306509aa81cb2116b9b0656ca08f3778a12a32de3222f705b7e0dc8fa44fd2333";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/rm/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/rm/firefox-65.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "694e50bd6007cb7a7f857e146e266217e94dc447f1ec72ff279e045f7133621dce77a67bbe126d805842bdf47021e43c1e3faa26af930690b7e2309e6449e758";
+      sha512 = "72b56a0f0d48621ad516a9ce58c0f430045bbe5700e59998dba0f73bfa51b55c77a6b68ccabb2b27a093497e1009af9bcfa68c590ab9fec895a5bea5ee612311";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ro/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ro/firefox-65.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "23f4cb17987f66b0bcbd07bb75896c3bf29ace882294b30ad8b6ef61548ea271ed55f005c6ead3d6836e3ce4024d4f77ab1de0627afefcababef0bee94bd7fdf";
+      sha512 = "2e133e10e9c59d0a31509c7be34bcda54a90c3078b3800d76ad1d3fa004ac387ea6ddf6bcba8ccb1d88195a85a1854b1e83790882bc691eb4cc006c38a391e11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ru/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ru/firefox-65.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "36b68d824ac8fc64a207ac13801612dab3bd3e2efc364c6dc54381e359edd8e022c79e1b96cbe49937ed71cdf7beccf106942cf55ba311a943be9220914c2a41";
+      sha512 = "def5e6b670e1dd0bcb0d67d17d500a204062722a52b3b3d1dca18bba9ebce193304426480ed62c32a7864c50fa5087c1d6f5d6a542f1683849bbcb1aefdaf205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/si/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/si/firefox-65.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e1f486def762c77868c6e2bfe38a3e83919f4a59e0b198f4d8ea04baaedfcfd8e3e87a70c593fd4cec587f15f57379a6ebf99fb80458a7e857c5ad19a58d5f8c";
+      sha512 = "edc45fab751736bdbbda1de5064a772a08758208e8e0174c5729f8be77a96c2f79e5ab9b9e3513eced3a6e4502e62c1903ac4bd9ed9afd8612dd246841663e22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/sk/firefox-65.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "a8cd34e876cfb491259a7ca1419a51a7ff2929defc94d16d6d582c3938be83fa30b46ec482bdea6e4589143cd7889da3b85550c2872e5fa0ce09f909ae8c62d8";
+      sha512 = "19fc814a7c599a27dc570327f8a2d54f6537c83ffcc21cd50b146fcc2f42f6e34ca2c400d91124d9be010742e2e93f1d92ee42234650071489cfe145edb2368c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/sl/firefox-65.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "558d671ab59316383760919ab673475e578e8a8a3ae0bc4c37282b3064371b8a048f5c631e64589f24f360eeca49a6a326274b45f55947ae2972e01f330efc30";
+      sha512 = "d17f4960c8a1498219ed92e9c857c4123c8ef648b95b3c09f4b0d021a37dab85ec238947c8804767a43aa13200abc95bce6da8ab1672aad75327138f5c137871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/son/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/son/firefox-65.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "8983fcf775fb1d7c975a56eccc7f821c0c9e2f4d689c601b21a748e898baaeeb46166561e368676d966f9bf8d78d89a896040ed0d5914248fdfafd1c64bc09de";
+      sha512 = "ae545a39c0b181c87cb188d278a453af1c0a944a02f5b86fab8b02a4d78e37588c4ff7971bec6e18268b8515b68b97ddabcb3e8239ef4d0c068bc7a49e10cd06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sq/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/sq/firefox-65.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "db12d81b9ec8f7f412496d1995acf28295d8d49069d2a7f982fc6a82de39550d9cdaaa005431a8ca5608df2c530d6596341567793435a0efb5854038b0532d93";
+      sha512 = "0cdd78ba4c3ed8b7c5f9ef06fdb363dd293b2db88e088af7abdc33ae0d101a378386662c802c9d48ffdde455f730d3ceff494b6b0c32c97347302fa63dcb10e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/sr/firefox-65.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c6e2b768d08623232740fe8bfc77a2bba47e415450020e0367be83629308aeb85fe9235b5e32716721b91153ba527d03d3592df9da91d6b386ff808758631244";
+      sha512 = "f3895cb4aef2f47881ff2ff73198d844cdc8b6e7e3204f2b2cbf85e42fb217b7c3e852ccbbf30999f8938d40c796d5d4d89b4cf02ccf6f4297b1d8a68f200ac7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sv-SE/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/sv-SE/firefox-65.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "202d503eeefc8e8026607fd2079c7231c4a7eaf097acac6bc1066262f05557c002a2e0da191e6bd92832baed6ae1095e04407395e9dcbb7c7b51fd204680d653";
+      sha512 = "18033c2ebdbf57300a50ab1922d16465455190bec076007f478c08a4bc3be8f3fcc3863d8fcf4b5668e8f1ddaf6865d74cecb4bdb1d4c70183096d2f2d7fa933";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ta/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ta/firefox-65.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "bc6d40ec162b760b527795aa3ed79937abecdae0cb9489b886c184a3fde732afe2ff743cf56db5d70d2d87fa7038065583811a2e6d7ff7e2de884b7d4adb463e";
+      sha512 = "b40cc87ee812e6241735ee50cca4af19b49fc7bce4ad3f7fc44f92ca843200864dbab38df8ca3b37293b688ed958bea462b9af07e1e4462435a5700476ac09b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/te/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/te/firefox-65.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f03e0e987effc10ca3fae20fa0be07ec21a8d3ad0feff77c4d2ff0a44cd048cde44e27f33fafc28fffe771c3a0582162bf7cb9704099ff3738922210e6066ade";
+      sha512 = "2b37cd97cf51db8b0c2e46609dd92717f225db51ca1bed25110e02587309fc55026e5bcdf5967ebeb35289157d274708f86a74c268db3dceb4c2d4e1e1038169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/th/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/th/firefox-65.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8fe21c9e494dc1f5ae38ca950b178d005a8adbb0fce84b80d0d427d544513b15bc41cd901fd7cdbfd816a3b716c261d81f034516bb354402ab8fe03adc963aff";
+      sha512 = "d8a8f4d6efa83cae4387eb25cc3114e86d2e97ab9c8f73f72ffced20dd066a32bcb63485caa39e766a54fc36ee8d86c57e1ecce3798cf719759278dbee2ea714";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/tr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/tr/firefox-65.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3d1bf804ac3bd65d8ab36817a03e0d51f6a439e7ec37e18a6e4bbb8f690b44c3c3c6acc88d0a2bfea5586ccf78bbec89811d7d38bed381b272546b12f2442838";
+      sha512 = "573055336b0f4e61bac4736f0727b145eb0b19b84b74a4f6f2bbe4650c1f8e3bf9125a4c387c9cee0644667a3d0baa9d9aaa1159add268191a97558364435720";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/uk/firefox-65.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b0c14a7e9ab36a5428e842370ce04c3856c7845924e42e604bba4d426b5b8ec2bbbd8ccb88f96030cd1971eafa1c40666f424122250d05f88026f2336b8f8f04";
+      sha512 = "f86f6fa2d81ac6911e91ff0d4e5b909d79d3ce22dd43ef4af630c65614b01e584b0a9bd2e9c0face4af8150d13dd3309b18f9c2d17ce7f973eafefa71c9302ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ur/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/ur/firefox-65.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "cc7a5cc3ad79dd76a50a5373dad37209f8c574bd459eadbafadb327037c6335e1b6bf28fb9aed93d29a76a00f12e5d22747c45091eca5a9ebd451c8d24d6c16a";
+      sha512 = "ff7f2523653b01bbde16229f58ad02d42ec9218a5b0118ecd1e30232b7968c29c90c135018a37eed017d87e68d57b745b542ddd891e7db98dc5c97b09f0cd68b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uz/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/uz/firefox-65.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "9f263397c4bd072935d4d484d238082f3779cc83a59bd01d2810c635d994749ff55722dafa718286456af2fd2b4b1f02622c9ded919b850aa6c6bf46913371cf";
+      sha512 = "c1d1b9ba8708f9e97a0fe8cf817eed98496f0d17973b5f30cdeea37c11ec88526c560e43ac8d18e58acc61826dbc67fa22417e80ebbcecd42fb73df86441f481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/vi/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/vi/firefox-65.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "149422236d100f5ffe064070047cfb4a6716630d75d72d31a420970002194ba883581b9793d5b16699d0e2dee1105ea849d76f0dce5b086ac606068feeaed0a7";
+      sha512 = "97f59a2619d2f28f986c0dd17bd3c2d3e9189203b797febb22bd3696b1937053530983d377fd9e0f904ab072cb38f93f59ed1a5cbc724877cb36125c58ccb428";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/xh/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/xh/firefox-65.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "cb96bf8137975343245e00662590b558d66f01aad33522932c18306ef339ddd4dc2334be9a57f14331fe6dadb9a5ae06473ac3875f515163bead1b69bd03b6ee";
+      sha512 = "76062b907b81ec7d8db5e51caee62ed69fc0e043c1e03deed88f9293807fba5a0f4f78fa5e91bbe711f18911c0cb7c8776648f7bb3c01d164d9319d05488083a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-CN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/zh-CN/firefox-65.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "33e4c94fefb32dde1b80740bb7304a4da916964466f23de19a32f447be02300f9c97b6dd5709bc469773bc7680c3a8e88f39553ccef838b439b6e5b25850e0d9";
+      sha512 = "f414e32528ee9f81d0676adb888ab8d76f14aa1c706ce8cda4f5a6399aebbafb012f4d63116f5deb12abab0be99fc8d8779e8df80c12609be7c28a4d5c080dc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-TW/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-x86_64/zh-TW/firefox-65.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "6d8deca1cc1f542d5de5137bcd6c10f7d1e70adfc67be286744224bcce3f0c1f76a9e6310c94c23842d952568293746888945c0fa89552b0550a3527b1d4067c";
+      sha512 = "3cafaaaec4c44ff52159ecf03dd355999ec721d59663abe3c0f728643b903696065cd69cb1608783a2655695f32317d84252a6f8093a73e9609e6a98f60c193d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ach/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ach/firefox-65.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "217d749356819fb06ca2208af220e176b0cd9552e9c3b540939df7f39e429121e4b3f48617fda16b9ddd4f8bfd48d88f215fc9556ed95d5191bed0b681d1cf23";
+      sha512 = "6f7a9e9c82ebdabf568e69b9ea4ac75fdcbc223b929775f0b2db52ce794611450bdb419b5d74fc32c40b8d318ea58eba55e4947b43385eff80250aeef12c925a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/af/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/af/firefox-65.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a2032bf0c3eed7d6525a0e3b3cda01797334b345732f69c4689a3e39261a53c83512d822fd55086e6df88f216e158603842f6cd7225485a993d8645d780bf10a";
+      sha512 = "cd3a417a4268e15f60ced9f7cb2e6f15452c46ede29b0e5a85ee736f478a97c5614c28a4014939c07f0fc67222349b510ac60408a6fe0a47c2484e8eb9730602";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/an/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/an/firefox-65.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "c25b2d0ced9bb95453581027f478d928ec343561a4c16f49d0f95e8e3194034c4e220f4c418f23f1e107e3f271314753b92d133073310c5c95586aec61c81850";
+      sha512 = "4cf2b1d11f0acbbb8c4b664847a4976579b5343dd6230a2e831d2f7b0807af64abcea5ffb31715bb015a84f521b6070c1ce29d2923576276f151180ca72abf36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ar/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ar/firefox-65.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "955146bea4ecde03b4b27290c54f5a633de09ec882bb2a2ffd8fb675a31b51b5a448be66d170f4f3795896f1eb3ec9e54ebdf6f5872aec7170f57c4210b58871";
+      sha512 = "641e78c0c11248f78e073d9cbf8d763b9666e13ec1c56317300b9605af55fe95a14b3266f50a01a3666e50a1bbe3eec2c00943a12991738a5becef44a64adcce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/as/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/as/firefox-65.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "85b77a481fc7a82bb1b192176928e4095db19e03c19bbe64da4e07f1498620a6e31db44074b39dfa4f77641f7a74fa98669421f82c2c6bec053878c17c8390f5";
+      sha512 = "0be7f3b427fba36bb4a03c929aa7bb657c6241e74468254dd967a85a2d4c802f771be0ee41563209c70126e466401f0deb836e2ecd29ae1529b72c15f116d5ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ast/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ast/firefox-65.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "48f56f503a0b036c4575a166a4c181d61d70d88ba6c2bfd984b0f5e392df175bf95d9eac93fde657ef1157a0ae0e727dfefc446a38a577a395c7a685e1aa09b1";
+      sha512 = "4f6041cf36681d98820ff7aa4e2da8f7a619ca918e962f1102be24a29c59a0591687ca50cc0b71c446cf9dc79e0a2e710c70a77ef9d521644ec2333e01efe9f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/az/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/az/firefox-65.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "07bce90b9ae3bbb45a93aff4cf9b645d4a700eec311463aa84cb0b08cffd2ae7b293f94b57c8f098ace91a5a949b1fabdd048d68829db16ea69f6e23b027eeed";
+      sha512 = "aeecd4090255b2585c687186df4e4aa204d9569a7aece03d880a346bc2c536aafdfa3dc69e3633aaa8ea900436a8728d1439f55bbe4a1a98204ce8a8f563df93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/be/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/be/firefox-65.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "800de070b9e722ba07831d86aab41c9fb3ed9377e796770887b71cdfb9eda9165ac752525bfdc5b7af28cd6b316863268820773741662dbc6287e5a3727e2407";
+      sha512 = "7b1eec7ffb765b2adfe544149f20fc8c865a0780b57d3e4b492e6f1e4c22ee2e3f0b68bbeda66f53d368126119f087c875a9731aaebf566d35aa6ba1932fa930";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bg/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/bg/firefox-65.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "804b72fa923fcdb6dbd5c4ce819557d71469ee797bef48fb6d51df150fe79b6d4f20612b7c2d69277facbb4164592028cbd514fa9e63ba00bbf4be4a3fe733a9";
+      sha512 = "fbede800b71409da82a4e349af50107e6640c709c6bcabc876c0abe8bd2ddfd8a947f4f6162f9622bef415d7b3a76af20de0b3587c9881d26a785faaf19a26bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-BD/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/bn-BD/firefox-65.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8ad135f5b98d792b7250c2dbb9d8616a3e2454f6cffa5850ba8ab7f8b1f1d2041fcce39e45333e8e6d08371da39dde3a8221cad6217e3264e1d32bdb7a7ce73f";
+      sha512 = "ea0132f3debd87b4e45b27974096032817aa82ca707e54a66e5ee027cbe97fb67ae67df05cb37fbf89e37361f992e2a6d7264d394da6043e50f5bfd3b7d96dcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/bn-IN/firefox-65.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "c9cf90d40dc319df43f681bd7583681548924aa04e963c1c4d6f6128db7c9402810d3747e223ec4f6e3589e2ea6cb913329b238d15d4d9771b8efec6635cefc3";
+      sha512 = "b4522cf32ec1ff6ad1b0d95071a6c503e6262a3e91796acbc69cfb6b111a5ed715f9b4a109268e8c6a7296c086e2e0a97e315bbbf273f801bde57a84e574ccd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/br/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/br/firefox-65.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9ad73b35d93aa81732f35478da526be05e6c9f66773010b718f88cfa80817f0f3ff8d537a864a9c01cb197c2c780d604d82458ed982e1089febd85042a11ebc7";
+      sha512 = "f97b6dd2469672ee3e4fedef01903e17e0806a1f4aa20a573a2469f6f5ab815253f7ac7641f069e0943054a42088663672fd66f22b080c60dfc239da9d79768f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bs/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/bs/firefox-65.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "10cb7314d0a56fc4c2b0bc7197c71c99f1693adabea53da6a1d1bc7abd17ab6d91a983030017a8cc09c759eb5d678efa4ca0dc8388b2c4c8e84ea52a0b849c80";
+      sha512 = "3f9d5dc367d537999ec3b44c85d3d07554ea9055470424d00e3965863d8abde8570398c8642888f10bad061e5b9c5bf694344b8f120132b3cb7a0d2fe6143eea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ca/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ca/firefox-65.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "efcd45c51970dc198e1019410601b8788f0071f0b98d5d341fd6e9bf2733c2ddd84e9f29cb3d3239acc691e0f7d549f0714ab9fcf4dbba8d0f5a288075d65bb5";
+      sha512 = "5f41377ed76cc675b319d335d31642bacdfb8b04a99cd9ea92c93ea252d20dbb8968281cf9d15c3e1414402c17bf0f569000569166ced9540128ed5d800586e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cak/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/cak/firefox-65.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d33062aab7ecd8975539c1188c796f23ff045a27e3f357ccd747dfc6bbec50e79bc94f5c9bd2660e86d083259f69268397b405262e106b16956f9eedd73db106";
+      sha512 = "36258bd28f8392c90810926eea55164c6410ed9375d3e12b8c59e690ae8d1c3702714caac85bdc2d183bbca9ce09c23965e55450b7941cd840f32aaae6523a9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cs/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/cs/firefox-65.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e3e5ebeba62b199c667b99abc3c06073603addd7ab76e0dbe1822d8b9c55aae69bf1f6dd6971190b52073cfbbaf66bcf01dfe5b9dcd13feaf96e5d0681aa240c";
+      sha512 = "6d7c10cb6fad9cf222c29f5787cb496f6c5dea07faf7768f4933c870ad9cc301b1ce4ed4b223a5f02010971fa0bc62b4de150bdfff0718da4fb64b4590d5a03d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cy/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/cy/firefox-65.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b1f9d3b0e9c004d8612fb3c852151c3384631f439432a766c01c1ea595095b154429ee6bb7881d3fdad0faf99674d81127be57ebb17bae1922b2d4de9f0dc699";
+      sha512 = "5e54876e06411296f4528b378e5ea2fe4b40666d062eb642b56fcc4c6293f4509bbcee7daf22f843016178ecfb0a6115507a1e152a2ff57632f77d9fcc287d2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/da/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/da/firefox-65.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "8f56d6653eb56d3f32f74c04d58014126899d3a5349f7a6c56d015aab71cac523f4f3261fc21ae0a7645a99a83e9b55198391d2606c7b8a70e2b0d3fe58d1e08";
+      sha512 = "de9dfbb3bc7d2166b2e0fa8693dc4f9b249bb2531a478c378e51f2e4e964a7e510c0c304f914a6ba13f6307294e7c45e98383a2a20d7ae233cc2cb16aea21821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/de/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/de/firefox-65.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c0b472e2080a24c5c35efff86adbb91dc5bdc89fc2c93804ec9ba35846d3d18d85022c7c2a0a0e405a14561fb635063149a4195928d1486ed8880a29c05e9904";
+      sha512 = "bba9fd9788a4406e98eab6141e89ab6ec932269007e5ddfba331b7e6e9b2177eb8f3f4ea6e07ea51b669575ca23606e150dd55fbc60805e133bbcfd870a63174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/dsb/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/dsb/firefox-65.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "fe5a95eb0c311c3131126ee92c4fc8f4e547b87871b6cf736c986a366bca60a85e5b6f593931725761417fa13d9edc275430ae1e73add67eee23fe0ff2750933";
+      sha512 = "f6386eb3ed2a71049781b1c07cf426eec1c4ea0fa277cf34a6d7b73c43e29f4b6b1cc57d644f1ca6ebae9825be0bf594c30f06b5ddffce7bf019ec396d2869ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/el/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/el/firefox-65.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "c2d34ca92cd36fe745ca66d803569a26752e4f834dea0d07b0fea24365286a2f215c25fff6833be4f0fbe6fd89313693080fece2a1490d99b08ac85f76407e53";
+      sha512 = "063ad5a297d86644eee93bcd5760a6d4951ca8abf700e7c48b97b2262320d1d25deb5674ed034d3bef47aa729cdafce1249e9fa7f60b779fc833e92f962e39d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-CA/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/en-CA/firefox-65.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "85b3d450ba292c2cc669af1d9f27821b96f0d13ad9d59fec2bd685bfc5bbf02489970337b51653108f64aa164182fdc670624a36eb07e55e8a7eafa6f16e1071";
+      sha512 = "bf0233a0c437ce01cc94ba82f44d3900c44883eeb53ea0d1b0dda146fa99ee19b2777af1dac761659b74675ed08b8e4d33f9e30dbc8007a068f4f352737522eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-GB/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/en-GB/firefox-65.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "bcd36733e157ae4e5c8580fd9deeb4e5d37084db4e7a4539ff2cdc7532bce95dfd26b4810c098d22ba89ae107f62272625a9702399ac2678c461efd7825142ae";
+      sha512 = "b23f6adb06c58c79960afe92b314c6f7b3be7b90321c05fc332fea16e0931104543d6bb9c31a76ff1679cd10552237a7a0646a4a3dc50214aee58b8396286711";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-US/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/en-US/firefox-65.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5bf5c1cdd79d6bffd7137bc19ed0fd4ed91d4c9263e1d50c128fc06def9021cf9df67fa2f3b591a512189d7a0af98e85078b69382928417dc17881edddb11985";
+      sha512 = "6caf8cecc6a4d29cef7316286361bfaa2cd01236e4dc5c1299f6f7c1ad3704a4fa465549baffbd780eeff2fb3a11e7cddfee0d635e362f58ee2ed617bc658212";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-ZA/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/en-ZA/firefox-65.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "b39a6b3b404997a2379cabe03ce8c62ad0ab85dc48bb6ef76541fe3b91b0e51996ef02ec0c84d0f418814bf216344283cdb0a5f5ff7a6b554a69fb36bff02b69";
+      sha512 = "db838770a12bd551c9b6420966685c66d5b333ae6472028a0fe599b7a2d0a240c48ee3d303f64b8b87a67f140c08e0ffa1209f8fa28fd12988f4460a757a5ac2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eo/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/eo/firefox-65.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "50a61fe7e83bd540233773f9ba2684f4a9da9dd5ebd8a34dd05f1f56df7b442494263d83ac8114dfcf0d169548c02dfad9c3df5e05082718eb9ecd645fcd5e2d";
+      sha512 = "020c9c91c1a41aad6aa0af8b135f9ddb966145ef146a722ceb4ca3eadd798b3afda34e7c69c7fcbaae357ab7084b3a8aff4b756c2cd45011a1a898610b9ca953";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-AR/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/es-AR/firefox-65.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "352493a6c32f7108239f56cb6ff49e21d06a2c9dabace1ac11032023822b6b6ef7b38c1d9b1c7cd4832d2b120b60020608b51c286ee8d12757153fcc134aea0f";
+      sha512 = "18a733fcc7a16b2ea1fa0a823b684c6c74c2337f866a64f363a7740fa26dd4253398123e153490229e15eedfe13691f8951e35bdf688564f5470aad8cbb42915";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-CL/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/es-CL/firefox-65.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "093e218a562c96b54eed599dbed1aa41c2c396f5bba58e87888dfffae5a11084eaa6d8fdcb58c8f128346234d1df78241c0f6ae741b93e3f91a4c27481227b8a";
+      sha512 = "82c6588038fa7a0ca6be588839469875adc9f2aa4e08251f1250439a4978746ef7bfe0773ad910a808242918125c4e5cd57ee821a1ad572e1dfd962b9deb6ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-ES/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/es-ES/firefox-65.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "60f46eb602026ed148e3b9d7728c9ed750e1e650e7d048b8dd4b4310ea1dcdf5d5b9b497d0a6719cfbbc8e390107d10836919ddd09cf4ee1fa156a841cc17424";
+      sha512 = "7b2b243a57add9f1a0634ecb33735fbd2f20cf67f5d81d04ebc102ec59e3fdfa107b2dbe2cb4dddce2d2db050698ee5cb5402f86949ca8994525f674fc723a77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-MX/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/es-MX/firefox-65.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "05880045040e12908f563fc7b6e0b093ebd0452ad780e166f897a36caf38438d45844d784291720d6cb341adb7c983d2077f9327b433e05f1bb737d200fdad32";
+      sha512 = "c5277ef412dcd775ca1ec19169118e6fab1814f9fdb7f5cb16bfe242ea8e045145974fc66f68815e995f62ac908225edbf4825de0501c519c9cc1071fff51142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/et/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/et/firefox-65.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4013943318b6d50be6a2f0f77bc5843915ac2d45ebf230fd69d005df4360b3e6e15b99212d32b7f48f250f6294f48604c57b325107b9e39c4934af325c21c4cf";
+      sha512 = "ac17ba466858caf07b16edad71cff9b0cfb87d3ce83d81278ca288934482d7da32737e3f963456b49cb9e0d1e8e52b8bf1206b0df9e4377e09d0dfc2dc6647e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eu/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/eu/firefox-65.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "05cb185b8de02664e16170686d59fe32c55415002c9c75631ea1d105cbe6e7a2d144aef5d185948a051ef1841f7dddb7ba093d559421a49e0b458659009d1495";
+      sha512 = "62fcaf64cbd52606cb5b0060b09d8d8d50bdda62c8573aa488529a3e5d300c4524fe0b8aa3e36f021072854bb4edb44996ffc1b1ed04d1736b9f8813dc51cf4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fa/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/fa/firefox-65.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "78dff03e7719da65e6b96deb2ef9890bca4d79f8937fd012805876dea8ff3f66d9613bd805587fb5057f0bc2bb310933748484a7bde28ff4d1fc7f8982f20867";
+      sha512 = "2989c357ec22595dbc141920dc02a10414874a5e5344bee1990767d9b5a352704a3fcf6aba61f35d6cc9899dabba64566d3e9e4633fa02e661500c948a5659e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ff/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ff/firefox-65.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "28b3e96c1ea34f3fe07c60442d3808698f9950ff818fea8a05a4b0298caf8195b602d6860837e91ec0a1129d389184ab0e2b577811b9c4e5d9b0c734c7cbe14e";
+      sha512 = "331be00eb5aff5b51e9640e56754da7ccb548e57bfe58ee25a0f049312f5b017ee13cc37f5339940ecef509cb8978d7004c56eef2efce7686b592f68dd08d99b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fi/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/fi/firefox-65.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "98825f294ad8a3c1eb8488e5600c1fa2b6b471b7a305b434775c07b8fd267656c160fa7c8d5f73c847f48714d1d5ebf108fae57e14ecff10ed7cca5cb5825c8d";
+      sha512 = "e3cfad672fb01682db26bf8c83d7e53392d2f83367efa768c02fbd8264887a63e86ad4a7a4702003710d89921d04634ba6b89301506119c52b1e30f2c6084c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/fr/firefox-65.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "889f5fc32f9e547c602011d9d5d0af411b8ed6e98830293003d28bd397aacbc1f5d61ac30e171b379c311371a6dac1dc9df3ae27c671f303d15cbd52e5363498";
+      sha512 = "226be01ca09c318ea36153f2bb77651b023a1d3b2cc9e6af92f22d9f9d875ee6a9e0c34c9c06002b7c54fdf3f9567b34f96dab4b225974f786776d938da55ed4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fy-NL/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/fy-NL/firefox-65.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "5d038c764a8eb3f07be729dc1adb5f84dd7a94d8f84521f42ee4192f5f432eb1e181871ef7be3acdbb9f158bb605eb3d99f2f788c876c6441811064672ca82eb";
+      sha512 = "0886306996a18bd8dbea6a689305b84decd8d71ce45d646d18cf883f4bac756d37f5a905c6fef072a06b8acdb3726944effd6e65e677d12ad67e5474e64bd40b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ga-IE/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ga-IE/firefox-65.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "01ab65cf6c3976aa305ade2ce5e04f5ff159289d2d808142e8dbbe537659de1d25a4da9cbafc6be839a50a63cffa6e8f3d2fd2d29feac8bfe5173ff42ddc8e9c";
+      sha512 = "177e7ae71668057cfd05e758b77f4f95ab34ec3560d6a0005c0c7155091d686a61b49e9d3ce49dad34eea125830c5216c0b02102d4373a5cbcaf81a6e2e3e034";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gd/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/gd/firefox-65.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "23f4dca508152ba7fd6b13dc20409d6b14c714fd8860ddeb66ed94b88ccd48f0b64d839a6ce852c974bbd3f142758fed42aaa817abac23bd58854e7f2c07c8bc";
+      sha512 = "d7120744d401cf7d4a073c494a200062ce4bd4a67235a7c33587060bba5b9b5d199c77a213bb13fdeb76c1f846667f4dc0a6e1010fcbdd5541b12936ceee1408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/gl/firefox-65.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ec7372f3fdd0e26f93d2251be0ded3b821dcf5927b6fc5a7a4b433d26f6900c775980b379a67a4414ba537443ce93523c2b6dec699401efcae0ab9c5d8e8bf90";
+      sha512 = "af9bcd6f404a4d0ca5d2e322b42fa532b29ed0fafbe48640ddff2408276cff41b9a3d2f699aaf9eb43e957e383c304ac220da2ecb8be3697dc6bd1b3bc7316ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gn/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/gn/firefox-65.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "4f3057757e35632ee9b108310df950b0279ca9f47562416e955112f484caf8314a80c8296c39dec71a6d7a10aac13160898b662b2528c08cee8e497803ca5bd4";
+      sha512 = "4e3dafcf312467437f61c2c04cd85ef2aefd3b0d406bbcd61c3f712137d0ba854df3e91bf39c4b6211ddbeace4edc41e048c6a0ca6401732ec17afbefb2340ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gu-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/gu-IN/firefox-65.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "4e1cb8376b86e68ebcffc42bf8b30cd78803df0e041371820db59de7eaeff8f982ff1222db88dc6f8c70f0dd2ed3491a9879c10d89ee1e4b98e9a266da538ba1";
+      sha512 = "729de77c2acf760c7f68383db7a8781443691a19eed32ffa66f20f3dc89c73beaea6fb5c25b83679ef550c50faece28c4bbd65d37f41d6bc3db83c81c4034248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/he/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/he/firefox-65.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7b617bb361bc9eadb83ee7b86e256dc0168014dc59e425effb9a2bbb765690a7ba0a2e89341f1d80ab86cd167b9a6f983ea963f06002d138dc9789445abcd79d";
+      sha512 = "a8c2180fcd6ad167b0ed6d552f13256feee590a59219c17018b13ff2068051e9378f6fd5209cbac0aea3a8e7ea43473d9bc7846d8a32a2043e6c653cb8464546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hi-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/hi-IN/firefox-65.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b42be8e9b1a9271cd445cb7c939450ac92e7ce298e819d848c19af36c0fb0188aa86ccbd63acdd5499485ff543eee8c125515105f3ac46523112710aefc245b1";
+      sha512 = "3e288185a75f93e43fcc8b29780bb09a2f5cb97e415b30ba7b8a626266aaaf8826c6be46d762306bffbd54c448ddebad86557414681756d8d3421b5c8f901c37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/hr/firefox-65.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "51952b6eae0cb140653bac6130ad04f56d9e4325b872f3ae3bbe95fd7f151f58b3c67db294a1fb4919b8b184043c474bffd686208b7095ccfb7fa1574ab769c2";
+      sha512 = "3b5aa386b3328941ae77ccff52e9d47d9205253baf9e697d33fe9625c675946d4b1da881ba2bfb2d541df55be4632726b0a291a907ff1716ff0b1d514217fc10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hsb/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/hsb/firefox-65.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "a2d414c1a227b5958571857ccd63a1a4c4a9bdb7fe73416c5040af71add3d8241d6edaf4529789961d170803463ac24c10e80da75352f8a1df77a47cf538fa8b";
+      sha512 = "4c78cd967303f8a516071d9a4f042d11a2a5637213799611382da83026a7f1eb3e6904d071b26f1e95a7d4f6eae73ff83a32269430e448494e6135a59682b3e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hu/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/hu/firefox-65.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "eea04e03d76172c840e1c41bef9a3052337e22e98077db17be869aa7f825acbff5851411ff83d38a16d2d44b445ed0ed708ee967cd1f33d2ebe45b4e50ba71a5";
+      sha512 = "8393c00d7c2d9e50b71293004d24666b2726aacbe774fa762d803a15266f950733f6b74f6fc7c062068b9c78701db5a42dc91f7028a147ea07cf3d6dd982c755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hy-AM/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/hy-AM/firefox-65.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "de09a05251e51d66aed8855779977c9b1173bd69e43744af6e36c5a24042c063e0d9a46c80080e19c37027df9603767d21fed2da90363d029388f675f06a041b";
+      sha512 = "5a049b59b5a4f3c8d23428dca6e0c3ceb0d4cbb256c2e7436dc7ce2ba6c5f8b9ff2242ec720e09e4fee77ffecfaabe16937d5a7cacd398369eab714f40541260";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ia/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ia/firefox-65.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "0dcb346cfd2cbfa7f56e787eec952ed24e4621d0f265324c445423638239d954b60a82f7581f2f0afa913d7932577f16817795235efc9f8aac929e7c289e7ef6";
+      sha512 = "614aeb76d8a2af4119c36aefd84bfe379bc39c064779649a6b8fcfd5c7819b5ac477270f849fb032a97e60d4164b690b7ad1919165d99b685cfa287499bc45d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/id/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/id/firefox-65.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "1ef2790d719d4ffd3bd9a7b8aa5202fdf3e380e7d040503890f74f29eda74405bd19c88e0440db399852330d168323ca94766b0409d33af25f6d42018531e072";
+      sha512 = "8d3e19ce0adac49c1ae8a28b459f08649fd97f8ec03c47b33cba8b5f349a03c2475bed30c43f2247420d07dfa27d667ee2b48b7007969313ffa628fecbc1c5e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/is/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/is/firefox-65.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "0e32f06993b335588ed8a27869b6b12daeaf79c2606d329ad8df94fa54abe425c694d7c7c48168123bf1bd561648654a26b8c308e50e882de328ba281d764acb";
+      sha512 = "b33e586abd24bcebf073b65d71d24a55bc8d2d3c49b3ed79a4f2e6d28b515b41e3bee0a9c2552b993fa02aa73d233d234dd243dab117306de5c404968094bfa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/it/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/it/firefox-65.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "632a2de491d1d791498c0ff1282151d42259bfa808c6fb3c05fbb8454e8e256a6b42cc4bbc4d9999b8d2303880110168be2adb872cc9c4dffd95445288b98d6a";
+      sha512 = "b00fb4668b7ed4893911230ceaabadfd2bc102aa62ef95007955422b521efa42f866cb2bec9aa22ad9dddbdf21a74dd2a16db2f0ca8a6f14bf98bf6044436fac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ja/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ja/firefox-65.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c23a99e8f1b8b895402100c00409f5ee0ea602f69c998d0d05a8358223303d9f20e33e7894b54de30ee9395ce1e484526cbbdc1e9ddc99e23902833abbe91a22";
+      sha512 = "9f52ed2a670cd2015061cab17e45ed7a573f8fc84cc3efabefddec36356c1355d459e4647a8113f17482f1409ecf17a9337a87f44b565e824e333f699fc4e890";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ka/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ka/firefox-65.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "e6d6b1b9e5e44b002ffa7cf55cccf47cfe79d3056305443e891dec87e471b6be8f2bc4cb5c13d739f40ec9284588e62347c4c4a2e5b49839a4547aca2faf8a56";
+      sha512 = "721fd201f69e7619eea9836686dd5f08a2e0fcaf137f20110e6e453ba018db8beefbae4b4cd3eb6ddda2ba25d937ae89a06420c8e14dd4a576fa9db4eece9c01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kab/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/kab/firefox-65.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "b84b2505624f5356a6544ddd8279b6a77483a8d0574406b1e0f17b136895674b311fb57fd7025a0e1b2ee53577d57bb45b0f02ffb94ec1cedd3c93298589e7d2";
+      sha512 = "66d6784a81034d404562f263b54356a456e1de3eff85cf727069444736a155a9b65a611a0e13535b0a125f765d266df667637b4a76186a3ea7742419cfd80309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/kk/firefox-65.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "82732dbfc100ffc987fba5a721d7ba2c04bde1a750e1966bf6579fb9e1e9d23f00ba5ec239b6af3198fa8f8f1dc8b7cd6fb80598b24e54ec2aee1ba488858077";
+      sha512 = "1fde1bbf36d5ea2b00d60246e588d813c6cc40be09428f92eae1f6050656f5f4c185cce887acccd16a7afab25612c0f4a5310cf4e368890c6b73ba688667798a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/km/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/km/firefox-65.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8deddc2f4559506870bcf4e5c26b7de898b48cc2544469df92ca3f617f5d8ddf86e9f9e7a77fdb9727fe5e5e166ef2257dd70c7d10105bce59734a4289b927c4";
+      sha512 = "eba4b8a6d6744be24618d4e78d6aad5c55dea4f139b052d1491c7bc6d507a27e04eabaa58a37757ab75d1c82dd4cb2d9c54fee896a085d9922f4f8669207cb4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kn/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/kn/firefox-65.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "4d0e809945c3b5a874b72343be82484b99a10aaba0d70b85dffb3e6d7e3ebf6b8304b6b4dab648bf48c5c11722138e2275744295b86e4e1c2af07fad05b6960a";
+      sha512 = "6e5b7cde50d28ab525bcfd37fe369f99d2cb1bd794d9a63739eefb2307b128c67152cdf717fa4ea6c0d89eb6aef3bb2a93f907e0dd9edf870f9f1ad7c816e1fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ko/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ko/firefox-65.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "eea6b2534ed9a368abd8dad636ea3b0d4298a9262795d694bc20c27136b325653113d077b57d361213395e916c29522daa5c8e0e8c9d151ef2243215ef97fd88";
+      sha512 = "a53be695e30b53891941a0243bfafd108ed2eaf0d6d0946d060c996f593e46b6791b789ca20789d80efb8252f9e7eccbddc836cf74bd1eb11c22ce30616bc92d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lij/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/lij/firefox-65.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "bd941e32b3517a599c7f5bac36f8a9feffbdbf93bcfcaf776d84ea9d5f0408a3973431e1b9b6feded677b48ac4af26e6b888800e5acface9da7c6cd37fd250bc";
+      sha512 = "0a3a2dbc75a4085f8fa2a7e571db500b6452763aac9352e1f5bf0145fab4a846305b1eadbe75dc60b540d6d020767dfe3d50d2fa7c9b754c48e29d39d54124c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lt/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/lt/firefox-65.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "efc4cdc50cda00b35d1f69033f76f1a9c0d4c530a08675c041423a8d0b4d5d24f3185a9d63cad594a5df6b7bde750cfa2fc13b9f7847944aa5243cc7b55f6d11";
+      sha512 = "fad914388e477853fc1367f5f851ce8c6803536c18be830ad3f32462a895158f426f6942f4fdd65579f8faad579ea1fa3a08e7b4dfb07e77c1181cc2fdf088bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lv/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/lv/firefox-65.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "8ad8ac07fa756b649a334f06f9795c3577e3e9128ca66b00541bc440711027d4ec8572eda71a0eaad38696e59031d3f23714f6372fe22e8ad38fb4029b322b28";
+      sha512 = "56d56416e786a232b1fdd438a221f122e69f8288402ddf8e8721798deb8a488b0843b79957de2085a4826211414e6ceb1bf26679b8c413d90a631342bfcc23f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mai/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/mai/firefox-65.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "8627f3afd45555cd254c571070bf5100a25770c306f63f091fe61501fa0eb6e37e7ccb5bd3b9378bc494ae6025d39c45ab6dbd20cf5f7d744eff8b3ac02e724d";
+      sha512 = "1211fabeea52a3d7f88cf8d9a7e228a20fee1917744bd114c871736f912db16c35b0ef99330b02b01b1d89d60db100bbaabc06346aeeddaf834c9e404527b91a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/mk/firefox-65.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "800cef931052b49ffe875464ec8756e96785d9d122aaf3b2dcc9397fcf524ed0375cd9cdc67681b99439e23556b0150b14bb02a5e9d7cbb6f3a806674b904030";
+      sha512 = "e8a1af648c22b404d7a123575cb59d0898cd6c2ae3413a1419c2eff8015921acfe33e7b8b4449380346818a3fb322f6029b7ecac4d73a3ae667795e2066e9848";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ml/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ml/firefox-65.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "ce8f90f83923cdfd0ed7cfcb63f4a225c7b5505f73671acdfeffe4dfd5d96dfd4b8746a6e956df22623b57f0ca2ef873f6508cd09c3335f460f8f87e5d0e4a94";
+      sha512 = "5e352473dba2aa04eabb9a08ae127a2f1e5b9273f7bb0f4bc35139208f967f775aeb22a1506b379164a44726c74f4391bf70dee3ca2a5005d6d7ba091ef844c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/mr/firefox-65.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "df86766636cdec2dbf094f9a48e6b613df4a18371bb85862623a99a5cf095281f926c5bec51bba089183db363b14abd82ba771522dd4367ccca7ddafd532ea21";
+      sha512 = "8d476c7b23e37c541ecf785e08e8a2620dbf6607a7cda5fcdf8e70915b40e47d63f45f670acb047c66e5b7be8d4dfe7d8f0fb70c4eeade62c3cd07add72c616c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ms/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ms/firefox-65.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "9e20aa9964c2036beeb4b5598f57d8f066062fc514229bff088a36bbffb46a9b6131b4ab7af77d785b98e6544a5e102e84cafae581ce7a2ac0ae8e5223dc8aee";
+      sha512 = "e98e074b9bba5a80d22ffa2679eee289ea6f49030d276f83e1d50b27dee1d1b0f86723e2dac22c4207b5aeaaa08ec0b1cb103e103fbaa68bc320514461e2cecb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/my/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/my/firefox-65.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "65c94ffa537b72cc89c09342ddeb8915a7e3cc0164bc3191e3e289e8c5217b175190465e49afbf5adf0f21864c787ccbbfd8b5eb2975ce4917e8d5cd5aefbc08";
+      sha512 = "8bf7997f77a957dd3e372c78f3b8659ceaa5ebce2553faa6895ddc25adfe63f60abff50ac0349d081f42c46f550feaa9527b32d9a7e0f3b05a2afd7cb73b2fff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nb-NO/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/nb-NO/firefox-65.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "1ea09c94a276f6ea18b4f759d46197af94bbfcf313ddc3d60bf9b0b6c406fe4bca248ce13f6c54f9f0d01f54804ce13792be998b2bdf35db1fa39d0a1a4ce688";
+      sha512 = "645f5ce73732f71aa52afd47c9aa48e95dd6cf2317c09dccf8e5dfe338e5bc3648a515bb314d6089fa8c7b236a7ab84b21867fe93b27ff1ed21a144cd605753e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ne-NP/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ne-NP/firefox-65.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "b35addebf27849b8c9b7d486d73d8273b58f706e8bb23599628b973f558aa486c793446e3a4c05389fef1664b6a261460a47b2abc482ae5c7d8cca26963fa6b1";
+      sha512 = "339baf1a95bb2a6fbf426877a7d1c8b8db49b6d8d1ba90decc6456cdaf3137c6ebed647e2b6e45814b7338f8d4859e9de1d2111d49ea4591df500bcedec2631b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/nl/firefox-65.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "e5b514b4582ee116910875887f8cd47573c6b8d63b451ce0471bc02c2f93bae7f52ad8e03eff732005eb40f4807cd2d9e5dd088045f1c3c7a0644629b9fb6968";
+      sha512 = "af442cd871f8abf576def2663998d202d43eda8fb2a2b9bbf1a045a80469d8d63c4b747bc4acfdd7c8a20207f0b32eb7bbf583b30e13d42df90dc76b994874b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nn-NO/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/nn-NO/firefox-65.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "caed8e08167575fd143679f72c4d48eac7238f168e335f56b813c2f6e55f31c781ba423cac018ccc6cb69b4b73ae5d3bf6a9af48e7e087af42286b436ec95b85";
+      sha512 = "5f87903a7ad4618b471ef48fc38da9a4ce88cea5232459eeca24ffed5dc7e75da8125f3957ae8464cd7d51e263f696d03c8cb7cd93101bc9749769e39a71f0da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/oc/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/oc/firefox-65.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "6635eaa118bbc7f8f7945456c2fb8470f2398d68ae7a00266194e23d5a56c3c28dc4accfe0cd354c0d468229669c38547bd8cf0219db61ab21083163db3688bc";
+      sha512 = "af95c64411a4ddb47fc8de18e2d673741a74ae0646a022b7afde1de2a295248d322ffcc6efee397fe07bd709262c4199d5c5cbeda45f3bf2ad7b9a0e5a937e1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/or/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/or/firefox-65.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "360b38e0c605a332cb0fbd66d6c61fd419dbedd2589655e019e62fc40bff6d6fbe8e40a59812f44b3cae1ca21dd5c69971b7e9501744d75392bc377e3d3e36a9";
+      sha512 = "7dad8c5b9fe7c8f1a8912d6348f69110998cef062703c87c43d6f200a5a5d6c46d136563f1c5d6214ce727a3566ce9ec71457f329880cad7ea7acb9ce634b7c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pa-IN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/pa-IN/firefox-65.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "5368aee673272ca741ce4589bb191f654df557d9a929091bd430d47179e8007590233cd671184efa7bdde57f4d9db20700b5828c7d39a562d421280047bf4a08";
+      sha512 = "deb0834ef70c26bcbec884a5aef99351b04bb3ce3b74d9afd4d4c36ad8ca76d3cf4b295ef4b1a851289bf34183f228d992c91a9d946f7eb1d32389c4d447032f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/pl/firefox-65.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "557199b4c193d1bc6dbd09b84aad4a7c7a863725790c05ac3978bb393fdefa6dbb088a0c7a41415ec2e16bd8e355142b9956075f60d049db7a713b4d138053b7";
+      sha512 = "bb03b34014875779cc4402b0898eccaa8be105bc1f77671017daa358952afd53d7811da81cd1d39f71726ba5227bd599440263cacd19efee0c01bfc3399a8a20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-BR/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/pt-BR/firefox-65.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "f5db4fe1ccb3ef02bbb32b180a59af92fcf124b6bfd2a8e9e95452a61fc5740ee6a1084b842383d38bd59620ee1a542df79344640e7ee5e776c58b83830f4be9";
+      sha512 = "d3d173f12de1db9f3b477fd22dbc8265b4420aabd5968d9f72846d396a51412ec9aec7e062e4e33f8d95af648ce88e806c426abbe3eb153125ba9cc548258d42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-PT/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/pt-PT/firefox-65.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f38d13ec454db404f40b2dbbebfc38c56e30f57ab586739e346d5a69da7fffb942ec2e9e1b76bf483f64c40dbd6641323fea3da3714926ca95d00b87847a5564";
+      sha512 = "75a9a5aae496955998e58d74ad4b6ba01113b6f59a4be2f175c7e58f7c0ffed59165b2c7e4a36f6788bc9909a19e4eccf1f6680ad6512c0369e191793643236b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/rm/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/rm/firefox-65.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "668790acf5664b71df38ff060a6e830cf646b685a7dcb5452eb21fd545bebac5a9533d6b424fadae7f3cb875955e7213b034d5ad0ef078a8a9ebe3372a4130a7";
+      sha512 = "dfbd24ab731bc042b391fd24938db717a6bec78678606fa54b89ccbb02a0b13b7e9720d9f6351368234e249dfff37bb8705e283a7cd6009df1184ec2cee606fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ro/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ro/firefox-65.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "bbf67517b93a28f6b5cb6ade1d0df2b6e89930ed172e56d76fff0b5d1ac0a8d30a2be46b4a7dc9300e3acb1fd69d79c2b757c79bb8746d25281970812e6bf70f";
+      sha512 = "d80954ee5b19b5adc629001a0a12a3110c3eaa459d3323407544c1ced7880ef942978155e546e6f51ef8105512cb3321c09b6ac9e4546876394068ad4d8a2f0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ru/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ru/firefox-65.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "ecf73f6633b502c6b5fde6b8dcd22a1688edd881360f87c7f399d7594474c753c7b6df2d1fde652ae9ab9938c16dff44f01c47b33a5988c00ee636291cddcbbe";
+      sha512 = "1d765367feabe6fbc4ccf9b399642da29d27ebad26fda9d269c56e5c1674daf259ad39cd56a7b7d8f6fe7edf56d2d4a8f6b4eaa0a701089d51d9376308eb4bc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/si/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/si/firefox-65.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "7f3ed166ba6e8a9d223b881a26753fe255c441034b61f8ec06b0b67d83c20c08aadd28b86befe362a475f77ccbe26e9828eb81e116831d1e1251662163eb0d70";
+      sha512 = "ddaeade085d4a162d61cfbabd299cccb0aac8642cc9734bff6e280a234fe5168f6151ace77e6e96d22d738833fbb237cdb4bb9dff293135f5c2fc77de5d4d8e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/sk/firefox-65.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e1e08ca8a53395abbc26b428d82cdc763db39dbb45fda351f3815d770f696e6629969bbc2a15053d87a589ad3755ffea29fe897004aeedfeeb166cf206f75ac6";
+      sha512 = "31ae2e80a1b1ebf997e5e9adc189319bb4edc35ba9aa79f1dfb7d70d6d2d344edcbe729cd3a076fabb34c2c98b9adc31c648e90f8dffc81ea1175cb77c12204a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sl/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/sl/firefox-65.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "5fb47da8d75472bcb36b958cdc604f8d9c5ee92ebad423c3adcfe362c7f0e2e9f2bdb08aa2bc5e8e93fc3c8a619e2ec1796fa40d0a6634fb2cc22b163d978758";
+      sha512 = "3351368e5046a527a322e7a19ba24946c56e5c73e882910c15dfde903f489aae316e95c44fd36113b67a296f3f01f42ebd2ae3dc7bf1fa3d50f8d24ef98df8cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/son/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/son/firefox-65.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "1020c0d63535096fe0c90907f5fc24753fc32d20fe53123c43ea58b4666f20486e4e1383a96f499e4b8abfa941a18d69f74d7f6fbf52f7b77201f19317bd8f2c";
+      sha512 = "952b4a7f29715a37cd19f108c01b52f2682dbd596dc2fe6a110ead84b07e078dd2efc87ac0d523668968568286d4c506a23ffba7fc052c5d593bb63a3502b9ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sq/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/sq/firefox-65.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "cbc20da6a33130b02683b8f5e3ee128f162f15728cfb40655c92ea94291dd614129e409a08d2a9d0def9557b48e8c548288ddf2d2b529855064ea17af3757844";
+      sha512 = "52c3ef9998c5ff84c79c2bbb99a09037f7359c117736b53593ea1de948b458adcc4236ded2f7ec703a026e7a4d76d8b872c7d080d0a2c38c51980f4facfe2e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/sr/firefox-65.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "7c27e12229cd86a74917f6eda2c6a43711e7e1a20610c169c0da65e4eb6b646236e5dd31be22d679d74391387aa3b375863c2f0d8875d8d9abd701fc14ed011a";
+      sha512 = "85f778bc5991b28310466e592d54bdf0d32b2bf18bd24db266e57a3887f3930525a100d48493d763980baa01b2e721842f8b3fabc3b0a7b6aaa95758f29ba1af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sv-SE/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/sv-SE/firefox-65.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c564b2af8421990b0efb90f81f226aa63224275bc0b9ca614bcdbd0a95c3f85970b783d301b122d5198478ae8e7dc3ebe5f29fed417c0d5ea63e6a9e8b62a087";
+      sha512 = "d703bdd3a955260d5710aae47cfb4b41126339cfe9b43a7f693df0bee0591d390aca8b5555af61362433f7480ed5f2eb8e5f1736d25a6986dc7ad4f15fa8b89c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ta/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ta/firefox-65.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "9f7a8321bf8333992bb3888005646cc0af4362ad447ed3024196426c43289669ae791f24c09553e275ad184625f910de8e09345ccf28d231741b5dd2ff1b280e";
+      sha512 = "d3bea278c0e995d764e842721cf7a0726932684883425b323fa3310b509eacd85b99bd7b7b76725ac2df94b89740862a84e247d0df5fe0e9189ab57a29b653be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/te/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/te/firefox-65.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "d53f9bcde30f9c884a67abe5d1d83f6fa9a33757b73fb026cc32535563a3fb4f97ad98f924054016e7102962eab3a858dd9004b171396b10b01535bc62771d4a";
+      sha512 = "83140dc032b41032e8d10ef75c9fb0b27b73598d5d795034205ded3ba969c3da5f86cd14d558f0196bf3f37f0d7f91ed2e62fb70de8756947e658c5b818e6b56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/th/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/th/firefox-65.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0d122ecbd5c22cb3c1d05156fc446ec4bceebf63675bd7d2789972bfa9acef83fb247080172f04f7341be0c59d478606bfae73a1c73f55139788b40b7851a58e";
+      sha512 = "033b20f9f81cc730b263424ee03bc10441660602d46437ca349aaf2c5295b23111a0c52e5a15ee7a88f0047b78c42f2e83ec73d5062074465f79268ca8fb3715";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/tr/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/tr/firefox-65.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ff2165f42c5916cabe416804af8e0bf8c24f4da91ff5c30731e0c05c84aec3099e15abd02c9d4d37bb42b7d749b9bb50374c24d51b2fc83c3b22476dd2eff47c";
+      sha512 = "e9d7ad31dd29353f024e49e933b3449d78623ac135de7f5229342c63755faba37638a79a09ad50ccd2113002addd73dbea166460fd35ee4c1390d68aeb9abcd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uk/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/uk/firefox-65.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "1dedde0a990ca3e32b2110d13a3c270bb615ce6609632ad6a2d014cc96a950690c795e8336b75b0c492f0577d0d4d43876d285ce1f2292fd8591d5d648a442a1";
+      sha512 = "afcb57a46a1be3bf6f6759e66eafbf7a443663bbaa77f278041bc27a49713426921846409ec539ba59eefd415d800bf04041c370d58385e8b39fc7ce5f53ff7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ur/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/ur/firefox-65.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "1d2d39cd8db329b7f717cee5cab6e56be05e93091752a1ae02e4a3fe36bbfe9391cd6117775b63821540f0de708ddaae4dd1a1b998d755269568c7810c07fe86";
+      sha512 = "fe35a351875a992b9a2f7c53c868fc59823d82cfb300cc86a9d4879cf1c8e690d54525344965a08d3871ddc198b2a4c5793be39af9e6279e979c422a06a9ab5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uz/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/uz/firefox-65.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "83b17251083ac9790ce57a7d6ed62e7df86c97770b6ed4b6b3eb4d583f1edbba9ce06c3c3b10596e237f79b4afc11483cf926225a5834f7e1c4ab7ab27abdffe";
+      sha512 = "cad3c41ccda3edbf915becaddab241cd6c4b242f869eaf2392b8d9be736affe534c98c90095152c12228e444744859347d3c2cdb43b6cff07fec58f675947654";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/vi/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/vi/firefox-65.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "3ee2013dc094b0b77533d88548fb5906f1a7ca1440a50a1585e04f09d1aa62c853f0837a6b218e1818ae93f0e838cbda1915f40b2030e10386a2642820fa9729";
+      sha512 = "d587e5c090a1cf934f592caba98dc12c139064f944376d66344bd0f23958d1a3ba75fd0d498f0b729d876cf7d425ece259391c81f119be62bfee10c0c717ee31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/xh/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/xh/firefox-65.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "2bc8af3262deb7c3ee5087921f721066ebaef6cc9c93a36b1dfe8fb2b43afcb276a78a32d959d52cafc33b0a869860c0963d6f1389cd0f3860bc0c95963a916e";
+      sha512 = "b22d3631e9eaf79301c0291700db2ebe8d45eff64783574a8a3f05a4af3ca37162f4d8fdfe783a0eefe4795513ba20717274d943a591a041161e0c283efc5f1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-CN/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/zh-CN/firefox-65.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b51a683f3a8f52c41d9ef0e8aada1007fcd3db95cff4c36b353698de3f406f232e78134e4095f3fe3f8b8b2445d095141fa2ac3a5186943db5d35027e63319a6";
+      sha512 = "d108c643313557ba00a9cd39200e21994a74b2298f72ebc8b7aa44da20697d44a5dcf9fa42e2cc58caca2467fda7849e13bd899627e35de7dbef138495e6da5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-TW/firefox-64.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/65.0b3/linux-i686/zh-TW/firefox-65.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "811498331ce6e2c9b7297069f4b5990f092b7330ffd4ef296612bc542bbad0839180753d09cfbfefde965b6ccc6a8783ec1eee891817e665675f08bb4e8e3b0a";
+      sha512 = "6ab99674dcf65af13dbe11dcf57483bbba2de20ecbd23c83cada4954cf171e05ff65f39f1689a6fa15a3ce4ffdd937851cb88e76ced01d1fa2832f95b0cc7810";
     }
     ];
 }

From 783dc61f68666118cbf6e9cc5a52abe73cb783a3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 11 Dec 2018 10:37:55 +0100
Subject: [PATCH 1730/2793] firefox: updated common.nix to support ffx64

See #51863.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4ce25531913..2a2f71d419f 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -168,6 +168,10 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
   '' + lib.optionalString (lib.versionOlder ffversion "58") ''
     cd obj-*
+  ''
+  # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+  + lib.optionalString (lib.versionAtLeast ffversion "64") ''
+    unset AS
   '';
 
   configureFlags = [
@@ -189,10 +193,10 @@ stdenv.mkDerivation rec {
     "--disable-necko-wifi" # maybe we want to enable this at some point
     "--disable-updater"
     "--enable-jemalloc"
-    "--disable-maintenance-service"
     "--disable-gconf"
     "--enable-default-toolkit=${default-toolkit}"
   ]
+  ++ lib.optional (lib.versionOlder ffversion "64") "--disable-maintenance-service"
   ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks"
   ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell"
   ++ lib.optionals (lib.versionAtLeast ffversion "56") [

From d16d0b3762a63893bccfdf37b3c7051a60bdb223 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 11 Dec 2018 10:38:54 +0100
Subject: [PATCH 1731/2793] firefox-esr-60: 60.3.0esr -> 60.4.0esr

See #51863.
---
 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 bcd4ebbd238..8bf6bb2069f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -66,10 +66,10 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    ffversion = "60.3.0esr";
+    ffversion = "60.4.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "7ded25a38835fbd73a58085e24ad83308afee1784a3bf853d75093c1500ad46988f5865c106abdae938cfbd1fb10746cc1795ece7994fd7eba8a002158cf1bcd";
+      sha512 = "3a2r2xyxqw86ihzbmzmxmj8wh3ay4mrjqrnyn73yl6ry19m1pjqbmy1fxnsmxnykfn35a1w18gmbj26kpn1yy7hif37cvy05wmza6c1";
     };
 
     patches = nixpkgsPatches ++ [

From 536d0cc3a71c61f06ae1f0a59931229a63faabe6 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 11 Dec 2018 10:43:30 +0100
Subject: [PATCH 1732/2793] firefox-bin: 63.0.3 -> 64.0

See #51863.
---
 .../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 9940e5693e2..9d4de4bb60e 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 = "63.0.3";
+  version = "64.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ach/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ach/firefox-64.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "d3b6903784c12e088e7e899c00321a6589f1cad08149cfaa169ea0c4608ef5f736c85bf6d447bcfdf3f9be28c9edc0e91dacbc77c0927a76807a6b133013f45e";
+      sha512 = "3710c5a03f3ac8a5c741c3e580d512130f961b2065f9ff5dcea0d4a9586e0c28e6521b694e3bb4d540cd34d4c44a8bfbfabec5bce986ad75abdf473bfe0580e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/af/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/af/firefox-64.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "439042bb60b1a10e9e2b8fe0d8278b9d0fc86629e37ca009bb5ada25fac3d2ec264b6f4a5c238c28278870fe9b9582f4e6d45d17e3d524a79fdac3bf4d0c001f";
+      sha512 = "e1fef7ea27463eda862cb88b16f69ca672d1f020b4b7d6f1e629df734bf5b2f320b23d18c203fe0ecaf84299450769460905600ae73b36f6c33081fd7d110cee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/an/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/an/firefox-64.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "47f76b7a5d5581b01d11671b46aad00d5b7cfd839638e17fab1776b8daa77c5331467cecf49049eb2432bf44cc4481a95edfa31dc9d7f5c06d0cf48ffd9ff58c";
+      sha512 = "09c40a75c4659ae65c6e52e17975ce96e940acecf6da47bc335cea943a810dd2be6650db2cf459301b0bba7eae683dd58a7482f21df9adf75f4cf07d158fc038";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ar/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ar/firefox-64.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "36be60b55d68baf409967fd8baee8bdfecb6d3028f9eab7f5c1f05e509346d24a7da0b02dd9432e951f9e0c68dcc8b2dd20fd706c385102b0f6c66dd4dc27274";
+      sha512 = "7c1831c1f35df13ddf6a72e858e5c8b2461975278274d078858d88dad4f7fa07030c5833f1bdb9c82d1e2aed7d85d9d0f127981488b62bf9c8277401c6ccaf56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/as/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/as/firefox-64.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4b646edb3120c5cf0cfc43f92088769283bd00b532ec3fcb6842cc1579e7929e29ff2927a2cd7466082ab439832fa7fcb3b4e47f35e004795c9922209146184d";
+      sha512 = "fe9f71632a8a5cfd01590e9e8fa2d20680f32d94265f670609609599f790f741ca0b55341f86f471962139faebbccd29db0ebdfafb900f0434c7a059297456fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ast/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ast/firefox-64.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "721bde1824cabba2a93dc87c44274c0bc2707768a6f4b6e53b78934de01ae6c49d305390df97a9d38453711ad29aadf9ba7097e7cc0a52bdb7a1d24e660ba1b5";
+      sha512 = "ee925e8e8e73e05ff3a4ca13cf461130a924c297ff72f304c35969d15dbe75cec2255b6ad9e5338d4c26b0e978f0f7769ea963b349b176c20fc506e5d76e9ad7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/az/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/az/firefox-64.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ec5379e1b265f5f37f07a078832bbffe39171056fc7df67347f7895f156434df82d9686491d353b323c15d5d012033109abd13f1ae02fb1d8d91f0123c95ae21";
+      sha512 = "d8feaf6685d7844dda3168da899cb01f9749b284c70f3d61567f7ebc62a407ed14c271001090499b3a6d86f59824438bd7c62dee745cf727e3381c71e6f5fa6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/be/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/be/firefox-64.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "b350d461721a7805906b42f1af650cb575cd6dba5d92345d2096218781328e20e2867ec712b8bc266a79e6246fae6391d698122b50abadd16c7db8edb293eedb";
+      sha512 = "a10e5e467d4709b8ad099b257b56319da95cb8990a88b82859057d93a82bdc44167ba89b25d3bd25f2c73873603fe86ac15851592f60ca3a69ea6176e13e4a83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/bg/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/bg/firefox-64.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5b31fd7bd8645b143c2728a5ccb29bd41469237ba56bd443897b8e475f3b46e549feecbfe6a4ccaaab9f3455f42d23b04aaa3cfe8d7c34543b9cc32d712dc911";
+      sha512 = "697fc3f302bfc4f68fcbc87e9a5b030599260f16375abe0b3f5c5a7617dd6a869b4d7f8f4e7e828e0080104a9e026eeb83c10f7d0a70c77fe0fd95196f2a4d86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/bn-BD/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/bn-BD/firefox-64.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a9b9ca336c633d9e24af47d9bf521a60ad5208a29721fab9fa4b2f9b91e80e8d572e4e0c0e5180e4da964db66a8cd5468a942e4b6270ba9c7a182de9aa34387c";
+      sha512 = "c91cf6e80527c714d174913e7b650f448bef8c79a413ff711094a0224717466e899f7a21dae9d4ac1abf48ba091d27f172781dfb9aa44a26d22dabd1bc125465";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/bn-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/bn-IN/firefox-64.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f9ff091a08629ab3ea91de7cee5a54b62533f776bcb4cb1765e3162d407b2151c507eaf3ab0543b08674386ca86d6669af6e13211bb9acc0ccba964cc82f932f";
+      sha512 = "fe8aa202cab31f76413f048c21bdb1d5bb38c0a8d65fdf682bde34aefc12aeaf1ee18814c17022abc6c75941fa3a983d1c4c13c89dd22a94352e950bdd37401a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/br/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/br/firefox-64.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "9812e0aa9078cbceebb43cc0413c5695499487164d18ea25cacff1cbe1a112870a833ee18f65738baa0210c7cadcda26edd7dd2ad96a423b67c4b5ad6d9000d7";
+      sha512 = "6784b2b452469f4b505028c1060bb76dd2048e9220f2aebdc38b071551a7c41406111287bb450dd2cb9a860cbc686149072d2b2e330d4420c5d0d4d30a64c10b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/bs/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/bs/firefox-64.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "5a7fa12e6aaffdd0c5f40ec10e237e66c43009340fb8223cb40becb98bc8dfa03478f9d586e25b7c4008aaed8f3be57b40b568193771aac5bea3e57eb49d7e58";
+      sha512 = "30fce8473040ef957675a0125411584047a5978ae35a897478d33dbc11b7d08fb61b25a6b4bc1f1d9e7ad729f3ae84ae27c5267684068e9e0753cecef784ba0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ca/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ca/firefox-64.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "391eeb7a5157e329ac4382d11ee5212c72721a176cfdacadea7abb65c41453e8b67b31a6f8f58e60ddb87d4b78460d10a8d4fbc64c94ce65790ead041dfdbce9";
+      sha512 = "d209b95b471871a2771e2ad8f027996fc181471b9620f6468123f5f2f35b19c1f90b28d31c9ae8ec18d3fea66df53da5618812744b4403ee12357c9fbce69249";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/cak/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/cak/firefox-64.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "5d54a2703261759948b3214498b73bfa5c56e01f2dcf29ed473c88a0e4ba1ef7e700e45d70710dbd0ad6e146538898537e11c1577e2f9a4fc03bd58f66ad9484";
+      sha512 = "313f627b01a2627e924fcdaf57030455d0b36493fefd2e7373957a6c7064b61a9b40b466f72c0d14f509c1d13771134b179954f8d8ac2986aad7da288a42e4b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/cs/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/cs/firefox-64.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "07229a1818d82890a880dd62b3e9bfa693696c78d4c2a994499d6505c5326be42cb5924ae6a00a745999e0e4537b60203991eda2ce08818c0a66c1333b13e80a";
+      sha512 = "85f17519c6c49dfcbe6f2da41aa95b20c53b6491b7a10958e0ee72b1da4b3b0f59f473ce33c72774438d96a0814c7542a5cf79159840d551abf7b3df77c31ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/cy/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/cy/firefox-64.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a076631f14cb3a03e1e2dd857d1265eda0a4c5393c18104dae32c6b80c58035d39614cdd732224c74fa3e35b292b6d1e43cb573e19263d7a5976b9d7e4faf762";
+      sha512 = "bfcdea53243eda98567e769f3662054c84c4b43a38e83639babeb72ff4bf4ccfa36390bc9b6eb247bb8a8afbe2b9c79a91b96134e0f6222c9df14921d2c14f5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/da/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/da/firefox-64.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6f8d9acb5698043f40888af0f91119f3d94177d2d0b6b3fcc476f7acb5d084559e87e6a9954dd19582fe21e08b506ded8b10bcff88d740dd07ee070c93d52455";
+      sha512 = "128e4e3f5aa74f299beb9480079f32ca093307f1f49a89873f37b824bd223f1436918734f8f171607b36c3de80b6e92a758d3175a687f5017c56448528da181e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/de/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/de/firefox-64.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "50b188ff30d83025d3f563555acca80d5aa668aabd0399767915f27a84f43aeb4c19fc880e1b56a1bf365b937634496fa07ba26159c1d90c139a26c2b057fb7b";
+      sha512 = "4dce77e64190483c25469f1a55fa80865f3030fbc1f0c2f1cdde0c023a540b96f40b85f12ba7e4ff66ca4e9cbc5dda3eed849d0480aea6c76e9e5a461534d425";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/dsb/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/dsb/firefox-64.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "00dd71e17b27d1a237d006ab12cb5e7a4e9b0d8468b2fcf971c43bfc80af4699ad0b7dd2de91eb6ece867a15ca7cfedf46131c422f25830527ca039c5f7dbd78";
+      sha512 = "a544f615cd0c79d677f669e1a62a79e685f831315a5139a3271ddca8501ecb80c6744d19faf369df41edfd11590436e5086b0696d84d2bd842482978988ed2d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/el/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/el/firefox-64.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "fb70f41a2c7a9e4ce80954b59ce7ae3c9dcff830154ec1228cd1e426e130d4cfd3455a067deecc787d086dcbd6ddf682c6ddcb6d303b5228fb5cae3058e4c543";
+      sha512 = "2d7f9da2285951320e0cd3e8317f7e8031dd229215ef8d83af90c7d158e3292588c65f29976576d4c0f70780dca739d1c1d20301dc5ea248fce46a30389cd04f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/en-CA/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/en-CA/firefox-64.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "d0b7e57956b3a68dfc6cc08e184f12319f728230facc26ab10d59d6810a415216dd68c000e0697a17f0371dc7d36286fe08dd3ddf47e13f0f87132756997cd27";
+      sha512 = "3b74adbdb2ce8bae0e488228e016fb663229b1be7c0e6808b4d80b0156d9d98c98d3afcc019c120be6dc8c07a70fc82e1b3dc6a399f2e73473e1b7b76092d922";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/en-GB/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/en-GB/firefox-64.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8c7fd388742c1a663beca3bcc84d28824a1b59d606e3ddede3e285783f3b4594633cf8fbf11b4c046ba99d74d1ca77f8bb142fa6fbb6710af00a515a87205153";
+      sha512 = "4e3e6217a8c7b0c51e5a956dade6d2b346b7ce4b802af7c2a1be7a89d4458c8e7b3fbfdc4f3c38c20d425ce7b8095b9365693a781b81932f4f4445348c5a8ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/en-US/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/en-US/firefox-64.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d91a0351d1504a184293161fc1f3dd7d1280612e63f08662ac6f95564a72dbcf6ea455f193239ca8fef014c32c024ce1765b708b427ab3c1bafb00fdd8d0a4c5";
+      sha512 = "47a6a77ad478c4c87c408657f060bf60e0a646e7083cef9d7820c03b1be4e050d83054499a79445de993d1b9f5582c3dbcc023589a5ac7fd0742ea08b8564a26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/en-ZA/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/en-ZA/firefox-64.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "32fbff149611344304e258d3c649bc26aa971c86ffe9ea6e8088a57e4e8af55643dcbc8ee662305633f2d0fa9ebaf5bef149621db39110892191d3f9b717fef6";
+      sha512 = "e9696651669db18f36bac1d06ca415946e850d6822b14ee51451cc02ea5651e8c66d2a73ba9b2b826ca6246a19bd6bd2ce00fe5111320e9365a2385accbfb480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/eo/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/eo/firefox-64.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "56a5212f84b01fe0607ec746e6fc87a855ed5b47f4db9a5326da097c0fba6c7ebadfb237f535b99b614d3c987c7b70669196394271a12335df76968e36f642ab";
+      sha512 = "1cb62e90c767171079c999c6e13916286e69c7e70c2977ce857b3c8d756d7aaa61ac1404089dbfea27b5b110f1ab51a3cb4faeb690709a933d927da1fca98dc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/es-AR/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/es-AR/firefox-64.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e010e4f110938477bee317dcd4b8351568300c3539172721736fc2c63ba2ed14d88188c1d172afa10cf39c4cad6ed71d2e1b806d0197836c5fae6c98768686f2";
+      sha512 = "4d2b5365e97d6b49847aed1e86076dd74b840c703f0d5b206d8e076934dc465155e8998af204cd78c17ea0f19d5ce51f08273d51dbed55494c1e2b405b61b753";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/es-CL/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/es-CL/firefox-64.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "7590deb6e39b5c983ed04f3bef77146153d4e2c41e6fb9d47a042a6943295588ac536f682c21adc06d2e63d6656b74bbab7a4bece22e948d26869502f5e1d89e";
+      sha512 = "23fef30ab7c2d43529be5000381c799e7cf6f72ca4fad1e06a0f94f69e995649296907c6004c4db65d939035d2cd7ae130eaa563a42df9ac5539503ce6fea9f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/es-ES/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/es-ES/firefox-64.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0acb74dd10d3d35fb175d8376d548f7546447f9328d9c47b18ba829a1b4dfdaa13798aa235212ac5d30d5f297ceb22bd63003cec43e6869ffefdd362250def1e";
+      sha512 = "6c6f8f7f6b7e7ffcc6eddccbc6513a7f024e8bf00107581088121ea8e4bf931719074ebb74f26e87a37ec92b6ea2a655156c2c67f30c505894b750d80443a9f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/es-MX/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/es-MX/firefox-64.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "c71d592ee0aeeac6e8ee4ea9ecd8626b0d2f96c82e7571c3c0983703507be68bb84e414461e064a8bbadd57f3462d9a1bed5effde1f459a5cb95e554f02a4fc7";
+      sha512 = "b0afd492026015f062b15c6442ae65815704b8b7d42e92b05c1448c381ead2adfdd171db51fcd9cf1a6b7df1ad96f92b692e0143faf7f06abb2f46fa29ede834";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/et/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/et/firefox-64.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "92675de877c8248dbf1a8bb820235a41f2daa172ea81e0124fe12ba4f31f891f027e54b9a0cec7f51e6b2f133708491474760cfc27d896e163ec1e6fc214ef4c";
+      sha512 = "76f3252c84540c159c08859652f4f70a742d015cdf80275f4cef02eff6b292b9f07babd001418fe7cdf46d357f79eaba12844c33665c8964471ffe02bdfa14ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/eu/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/eu/firefox-64.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "bf7bcb992fab3a332ac9a1b5bf965c403c676542acff0990ce8f7ae32823ee84401af0117690e390c70583debdc7070e2b3ae4055ba4bdfaa83fb3717510f3be";
+      sha512 = "40d1bdebfca7d50cf9b5ca52d330b4e57fd38d8b84788b48992be85a771dc911bb7b7ea34a6dd32c26c3ec2416e917bb4e1a19a2dcf30045a69fcfe44493246f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/fa/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/fa/firefox-64.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "76c1f2343695954da3a54c53522e5a3fcca47134419ad470f468fa14aa404bfb2065cb47bab72348b84e6b52ee36e3731eb2c724078a1e8925d62e0439ae079a";
+      sha512 = "8164523a87b88c6acd243c0835debe472f81ec14fcfe099ec4744c543415ba54466142e4245a38a759ed14230e70bf4be0d086b46cf39a32b7fa874bf1553acb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ff/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ff/firefox-64.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "fdd12b9f1dbe7836368f93ca9bc27387affafd0bb2dcb37bba66aa9610595fb8ab490f597d4ecacbc0a568d266aeebe0293704d141590b3ee49fdfea2ae703e8";
+      sha512 = "7d470198e655e78a5b48e127063d55e33e6be01a5134c98b82045f1b4bb750bce8915db151a15da0ec7b175c7b76cbb9c9d051d5ef6b61628b0325bd434d9cd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/fi/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/fi/firefox-64.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "17670fae7a12fb633d02bba4aaf204159a9149e1a7fc2819e600dddb05ddc910278e0b8f4034fc0d53ddb52a1ab76b6e65bcf612d22dbaf1fdca66125be7133d";
+      sha512 = "4010c8510ac35e35b1d9c9b79cd64316b9de2ba82fb751653713871623d49b2f5cc795ed093398a739dca2d2c7f837f83db61b49dcf34405c5d3ae0950e92375";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/fr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/fr/firefox-64.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "9607c991d0eac8b482c4c9629d6f4748abcc59d9a1b820eab0c61d6a859b517898e6071086210591a0e0a6f91df405a00ab0108748d955d2d6d559998e44365c";
+      sha512 = "65b16a2d493957ef51b6e36e2dd1bd9c5176571edbc8262b458296915be599fb5b8651114734939ce366f0c017567732f4a540ce5bc6500bc7400be6368e7c39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/fy-NL/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/fy-NL/firefox-64.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "70d2179b8dccaaf6c2047588b076bbb4e7e2f4d344795055550e26d7c02a2f387f0c123bba4ca637b2b1ed63a3a835b90253e5a4c920c808ac4d023bae89b529";
+      sha512 = "153177aa8fef00a967d09d015dbb2e03d4f73b04abda15146d9729f520fcbaac6f07eaa5fa88c723bde659c701c07f0f2de0436761a1a5c42e4a02cc5255ec9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ga-IE/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ga-IE/firefox-64.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "e7fa7d1eaadfdfc4eb889857ef2145c812f3c1bb68d6bd78981510d89f9c8fac8a8e8fb9313df6eebfc6d26433daef90a5fd009a35259d451120ef2fc7b69c55";
+      sha512 = "39f6ee1e0d55966c80a13a7a15995af68bccaf6ee8b8a067254b0cdc6ed95751c4f8125231155f327d2093fc598076f0ef6aa8d15385b70a6e0e9f0773c5b791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/gd/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/gd/firefox-64.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e8c11924dba7f56a8a5417bdaae58bce06c936038980796ccee0c4672991ecb548457358662f0ac2c78035057248458419cb56e182809d64e6ab4e3d3a6cdcde";
+      sha512 = "585830e055d7c89f53fd49a57c58879ba83707c70b3566cd5178a66e204e29525c0dee621bd9806d260e2cab440147aa7f150693af199545f6744aaa8340b93a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/gl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/gl/firefox-64.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "21bfd5ace2663d50d88e4eb2394e0dd80b407545a803febe7294e259c218cbf6f998a3ef1556e4dc53cf5ba603633f5d59ca110e5485d29c93736dafce776164";
+      sha512 = "48531324d321c466c65b094313e441d70e8c34adf3e741f3b2f133e4bf01c7a57a1f30b5851fa954bec373124692b85c452740fd927eba61f1fe7f149a5e132e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/gn/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/gn/firefox-64.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "f41048a577c432d5d0fe4ca620ed25936d838242ca6666b7c2403c14ffc5c2d882649afa7957b7af7a6e88ed625050792ca8afa063c83de78ec29f157602b36c";
+      sha512 = "2c18c606d321d889cf9618b49d284cf4c8b547a0db47f1defbc4060aa7b7620f73cb6f8eb015491d166c782c197b5c72d2c6f2fb34fbf4da3793eaeeec101185";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/gu-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/gu-IN/firefox-64.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "fa2d5c01f2d312cef2e89df9fe3a6b288d2d9de94ca04598dfb8ea8d63a7a330809d8065e1e087a511d6fd2118be661125ffdfd95624d3e6338b29da7bc2d7f7";
+      sha512 = "402aee6067b960e3f03daac299fd7377ca7e6cfa458b4d9e344d96c3b30bf6635e600be1e28663200fe699b57eafc444307768be1f004d1fe494ff8447ebe5c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/he/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/he/firefox-64.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "9996f77bf81b050ff3b74336109ba6dfd39f7ab8f552d2f83ff4a2fb4f3f34d5dbc2aa6d62aeba7fdeb076b94b443bd954aacb4aba7cc1eff734a6265ed82f32";
+      sha512 = "31a99a521b35e2e4a15ad6794fc10441969b8de79969e405438f9a30fda42ad09fe002628ee5f2a402791d889db9a557e8e651602f9513ffb834cdfe2ac215e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/hi-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/hi-IN/firefox-64.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "26a57a66d9d41c5c7d1f1e152086b7fcd667ef567a4993414f060e608434cde84b76d318a6ac8c280f08fabf5828bbc981afe1b5cb545c4aaaa90c2aa6dfaaa2";
+      sha512 = "6e31a76ba7269d963d8737478ce3228fe32e39c43432cc3ba738d3ec5b2c2c6caa77b5bb064b21ad3d354ad7a672e83e5817718c2dd51145b509c56079370473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/hr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/hr/firefox-64.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "787c8168397598e2ed07fad060ff82b5b8584e14248d2b998f28ffacbe16c9c93940fee4a0a0e7931bbed9ee9ba12c119fd52c74fa8e33f70b380ec21e3f7074";
+      sha512 = "4bde8bd44a7827a88185be243eca333bcd23d478d4f0ada062add6257da1c849d03087d1f1faa553d0e03a66667c50d3127c789ca238268345351b29181d85ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/hsb/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/hsb/firefox-64.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "a7208bf18dffaf1d8330734604254a97e5a91aafe1c972bce612f6b0c7f269c03b103de9d8ddb04e9620259d7f8c5616471c29449bf31f63e5f4f5812db1a94d";
+      sha512 = "96915b58a3867641b8412e2ae6c664dca3a6b42bce7b7a08c7647be1e30308d2e43730d21ed9c7af264a0b835d08f7fd86b10491b44d7309ccf5e88b9527231a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/hu/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/hu/firefox-64.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "6f6eb65f731fc0be11e37849c0d88aca3117832761600607b94ca3aa540599dd82d3df5a3949fd2e677d1701fc15f3f56cd1bbed1a3d0dc21f9dcd01a8e7b732";
+      sha512 = "f3e5931ef224e4e839dde1955b14ecad25f9c0a85b4c1e1f69aa37038129a0ea96807c4676a2daded45bf94448152557818de060ed8fc0f40828870fb0e5ddd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/hy-AM/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/hy-AM/firefox-64.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7b065a87d5f699d967a171f468abf579f2f8a6e14a8acd9842dcb990511eaf30ec9a840741a452455da1e5262460a997ef272cf8d27f2389d220df3d08088ba2";
+      sha512 = "f7efd18f70b525c3372dbb2f91f54b1c6ff248d87984c6d510942514e3cf57c07a1d5af9a46270f2b42c835f95a874bd085c7d131b432bd176ca72463ede4b92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ia/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ia/firefox-64.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "d4ba40f54d6eed2faf7710798f06c47381a396a72e56c54c0629cfed8a976d2364c8dd33f58a7175f6b92a97ed2e0a300af0523dd5f01d11105f7bf8e3ef2b39";
+      sha512 = "1daa9025c4efff34c968747d9799799616efb37bc313bd178b1b90c39dce3e3f7a9792648983ee44f6b65478cc35bb84343a08d7a5a68d03ce34feb5f1e9ecdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/id/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/id/firefox-64.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "0449dad064c631858f7099c5deb8297c8793d293fe7649f073d3500d6ef3da4add1d254ce40236b20a13ee0bf763bb3c90a7e5248a7180751544f4a4e6c385f6";
+      sha512 = "e1b5b5447132a03eff6c5003cd5c23c64c221f74f2510cb990e61047df47d59b1ba06751eb91ef332e930e2fd4f0ff2fcd751680684886976bae295cf8e5a168";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/is/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/is/firefox-64.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "05389a0b2804e3379c1b75db9786d43aeac91215613a4ff1f1d3f4cdbfa9587be6f2f0605e254c82c00f957e9624cf3a07ef4232eef2e882316479b5696275ce";
+      sha512 = "d18f78338dd41befe97210800208cfe0a56f394f0eaf21f8025f9b643d6cbf5370ca0c7c56539e2bdd54b96357f1c27423333824551825351b5135aaa6f4b873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/it/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/it/firefox-64.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "bdb07a16d905eaba62d521c97234d73605acbfd73729e021d74ca5b4848bb06065e30742bc9cabc986aa17b852037cc4f0e100a0276b76962035421cf977e07b";
+      sha512 = "38c49e1424e458d09437fbbb03facfe9352b48e9bbde99f7033c8bc246347b93f66f86ae7daf960a414fcf316990fb9500d06a346baf53acbf0cfc5ddb15590a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ja/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ja/firefox-64.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "11efde6d19d11e1cc9ff8746e5a1c77ee7535e52b55b372f3cdd4c416fd9a3749fcf41ca5a287b1ca4335f64f746b2bb9e4af5babd4cfa7e48baf94f6448ed7e";
+      sha512 = "9f45fa365052807b015868cb14e687a49d5843d529c3ddce22099730e172ac4d5896fe68992453a146bb35263d41f0fb9a51bd839cb8f887b469dbe055c93979";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ka/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ka/firefox-64.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4887fa901705ecc4b820545ebff2ce31f658a4254b78e07ebcf05ca849defd576b86b86b46eab42c13736249360bb058bdc2a70e7f743e654f8d87d8cdaf26c0";
+      sha512 = "c6affb4239c752497a766ddf26e1ddcd86378cbece94d41c01ed381c569d6124bf9657451598915c41517174229eb8ce33eed622685ac362cbd28a014eed9f60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/kab/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/kab/firefox-64.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "06ab67dace653368bf81f2110f69f391c7cfa3103df28805b2933ab64914b1c95a847ff16285ac0d68eb7ef4fbc2a964185e259de872a1302e9313712d2e8cf4";
+      sha512 = "759ec0854401ada26a0393ee9a8dc79edeff2f7bdd8ccfb1a68e430e5c0c4a20ebb5971048cb1ab1ea735a2ce15b477074122210363b364fb79fd44b08ccb443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/kk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/kk/firefox-64.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "e51b5f053313a541285ca2e7c1a8699544f876e8bd65dd6c144d16cd2b75cd3f8be3c7376812f343dda7a41aa3df5ccb7816c59af757ea969e96834d362c33c2";
+      sha512 = "6c0c587b62b0b68114cb7ea5eb78366cd473112602862baa16a1a374997a45a3ac1ab1a95d190fbcf0b8ae47deca4289cfedd328a4b9fbade2a64476a9bbbc61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/km/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/km/firefox-64.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "2af0aaa8e05ff566e79e97179e12cfc020f6bcd8b28946c4c9545da20cfe391b3d1e6c1db56d040244a027add1fec1835f49a8d28fa960b586f60b6d22994dc9";
+      sha512 = "47bb7c459514d8a1c7f6e02dcd2bff0d6cce4a0ec0537bc5214547ac9a8744d9c8c6a4e789999de8aaf01f4815373bd4130251cff13ff58b49254b18deb78539";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/kn/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/kn/firefox-64.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "352f95594e97ef6ee5c34fd815ce24d285be86cbc858581e2b57f5ca25bfd4bc24f998cac4f155f3501d5a1ed51173a947944908c3fc975c97c08d8d2b10cc16";
+      sha512 = "5559d5361b25fc0d9d2c5dd9bb62909d4fd3bfb79c5801fac80e5c9eeb9ea214c1e748dab78b0c54715b624d64d5f54b541f49bd2c665185adba75f46d62e145";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ko/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ko/firefox-64.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f40a6139131a11d3e7bea6e47833ad8c400b6c8acb7efb45dd2ff6b31036e24d51bcc4639272f99d9bf1b6f92794886f68292ef60a8b5eec510b1b041cfef566";
+      sha512 = "06ad114dffe1741796cdde8ec6172c1642d04a25d9ba922a74f3be5c70e7046012286ff73ba41f4543ac92df3068a7a1879f2782d934eef1ac90fbf1cdbaa9aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/lij/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/lij/firefox-64.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "02f2e102a219d07e6d5aef408959ab88204b363d73359ca86a8cac6be087e4ed46735c2c5fd605c398a2b4e3a72ed7cf4d0dbd250651074212cee99708d86376";
+      sha512 = "3be90a0864e83ffec4ca0f1e453468b79b157ca99a4937154eff24924b959ecf0abe4b80cc76f2711be8e1addcfa2df7f3036e1addeb963c9581c9bc7f966e8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/lt/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/lt/firefox-64.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "28983337150861e4edd9b279f1576719fc16fe8584bf118e719765da6fa423140c33dfc093d3ec2c66afe807cf9c5bdd8914cb214fe07199ee5d3715c0c94391";
+      sha512 = "f394a4fbf6c105a84a18342ee655d532901e1249ed0965a0513f1e8490f064c0a3be2163acd16ceabb286a1e67d9633d0a67d6b4b77d5918c9ec8a22cfaeacb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/lv/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/lv/firefox-64.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "6cbc73044bfefb8ca04a001f1b9445b043b07fd87dd72a76823cf54c8c6b214d1dc5cc94f311335bdb2383e14ab6b4b39709a3cc285a80c9cd3ba3e24458ebbc";
+      sha512 = "faa71e843c9b8bc4137edb2cf4f44bf7570f5f45c456a8cc45c5ac0b9df45f5d4080570f40f5ef29ac8697a7d79f32736a56f7fdcba8366ef531d3f67c4b5e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/mai/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/mai/firefox-64.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9b15945b08830cd3d99f8c80948f7044d22b0a5a06a9e5edfc78c216c8d5b3ebe2bcd1fea6242381550eeb63d472f682d6cf976f70879df3d52c85348a232aa8";
+      sha512 = "5f49ffe83b61c125ec9f1036244dd3e4777c4e6988547eaa8abce53fa1222f691ef2a41278be31d68c667bae2155833a214ccf15a4c64d938f89db95a2b9271a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/mk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/mk/firefox-64.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "ec07e5d57aa522b495e5a5791628a8475cf44f9ed93cb70b46747f822362807e2e14c7d6b7e5d12b432cbc3c9f8dea4e34e07e6a452c2fb6e049c1b857773fee";
+      sha512 = "2660b36cd91efd31d4e33896c204821e164bc30f1befeacb4677fc2a95332ceba0b84e4e963b501acafd3278ee7f7f0002c61ede46405cc307e3425525880252";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ml/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ml/firefox-64.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b2946c671fd6260c0d708344671e5e92aa723d3eaebd59629f8f8bcb063755b4808bc3cc2842b74866ef8207e3856f9b1c1dfd2d2a8ed621144e1ca5bb350d4b";
+      sha512 = "9b617992699691484dbe5922fc67e740b7fded722286b56a2c0da624ffc3cec7aca366437b83b67008145c0c06f7fe1c1a39a05a10ff1ce456602d8484be2a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/mr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/mr/firefox-64.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "eb690ab6e5a8199b23ea8996ca2cfb6f1407f008563bc2c82fa67a48f794ece285ae16d459bf28ea42a8f3a9cec3b196834b174de36918c2f9cd66137c3b50e4";
+      sha512 = "b173140ccbb5fb1976eb07011bd6611851ffae5629a449b9b25999c72c3bd505e6f1b57d62bb0576c4383fa034cb2a114b981fcbb0d7800e506ca814a73d5530";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ms/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ms/firefox-64.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "268bb604f40d7bd5f1897459ada7b827b8d62f6c1869474e9607be48fe7b80387eab7065f5fec49f778c6046d18d29f22d3e04497a417dade2d78b0af2ccaaf2";
+      sha512 = "475ea5fc3b594fc0c79303399ea780a95ad434980e5a76004620d2fa2062a72b31f3982b5f8649cce83ee6c74d4c9ce30b17952e2120d655eab4f43a325a571d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/my/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/my/firefox-64.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3dae4d7727ab40deb8755d501a3a2dbcf20727b38261108194416c592031bcc41a5cde98d5492d13943b5e4fb4acb5fb863d31470a09538b2561692cc450ed54";
+      sha512 = "d488d6b8d49aecc8fb390c56717b8761ac41cec26f579ca980df04b21ae0fbb0f2154d4dd7a110c7e6ca4cc460fa657071860dc02b56a8cee9ba09f031791e42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/nb-NO/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/nb-NO/firefox-64.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "73d0704ef41983289fb4005165c16e198bf665f465f533880fcc12a4ce523a1533aba2c5244f849efa963c5b9ca702385acadff3e49ba0f6d53b88fd5a0cc770";
+      sha512 = "f44745f0b7781899d0fa9640ab1a6edba97bac28c924237ed70be56b1a257f6c96cec586f931077755ecc7ac6424bd5b9b844ca451c9db66b2b453f21f201579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ne-NP/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ne-NP/firefox-64.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "0c99674cbefa358dd352458417fcb88bdf631677d14892ac011c9953e7af5431845d29a0185cd0c179fe9a37eafef8e56d064bbc4b6b5b7b0330dfdf9c8ff8d6";
+      sha512 = "9134ebf12468513fa2ca9a5975d990ad7fb9ced38f6166567875e56f429fe22c0214d901e601f5a9b0513f2ba1e3e4153f0e52b2c97ec7a5e70bc0519ba6b548";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/nl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/nl/firefox-64.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0ae4edb6189bb9e5f65e435246bfc171dfd29ec310a3ac213bd96fa62cf2caf0fe41d6a4016094720169976615ec08524793b3c0339c601063904147697d73c4";
+      sha512 = "195788d10dc728d58aa29e1272030bbf7663759f639c34e7a62472a8876f3ee2bf03b2fbe9ec14d681de5304e3e822a270a2d2f8ac55f9d3b50d9cebc8bc11c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/nn-NO/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/nn-NO/firefox-64.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d650afba6ef3d586eecc9df2db4cc7d9a9eef8cf58b903cae6162a2002933855991aa185915037af4b4b099efea244c0f9fb43eef52889ff37c9565437a74c4c";
+      sha512 = "d734daa50ef51045c5b7c3a938291d32b416a41550e0d1ecbb526f5aacc67815874cdcdfe8623588f1edb4eac4d6abf8bec7809ce6c8b963752a87035d9f9249";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/oc/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/oc/firefox-64.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "cd4843915232d3b1e4df335e05b0f4a8273339b3e2d88994ac9e7c3f33100a9eb76fc6593d53585a9b3bca096cfd29190d40e5bd25c72ef8928124c62c4a7bfb";
+      sha512 = "dfb14e36caec916aa0df46b566fd2247ee68d14e9e76745c58a51a6e947fc67d585cc2f9d77267665e7339d6c53997b757be5b807f8fe7bd5c0c3f2f6f7c975c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/or/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/or/firefox-64.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "7a82e3cb26d00d900c1624e835512ae30221f44fc4e95df653d8ff19d8bebe82fb0706a4d0739d59fa003007e5ab7dd26d97ea7b9235ede112fe2f0499ce177c";
+      sha512 = "7a094b0695b5f81630112c6a7022f316f06aeaa420b5416c4227cd949ca35efc3e542077d02f8d88b055e3f37e4d62dc5bdb8525db944cc5a51ff124502a742f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/pa-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/pa-IN/firefox-64.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "5f8e658bbcbefcd8a98a2b07151aa94c2814df1d9f6fe050d9800633f17bb0b225626a497c5355a6941828016edf61dd3e326c0fdf2950d315c2b7cb16b74e49";
+      sha512 = "8e586213da95006801244f9529a3917bef7cf5b9ffe482329135ded1411f72edcfb92b1f3d4e8699ead671b0a3161f7e4ff32f8baa6a29aad22e8bdca4e77899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/pl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/pl/firefox-64.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a33d1c92c62aface88c6c9144fd80c0d32d834e1f8071555d146c0625ef5f903cd99d03489fdd52d87a031d5cdb3d9485112b2b2ea0fdc5c90973d822ea95f28";
+      sha512 = "60132298bc587af9e122b7d6f55ef57b8a870859c2d550c3b6dcd538dc4ef32171757f5658586646386e87ea9f92a46dd434237b67d7e19beed7ebd8fb16337b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/pt-BR/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/pt-BR/firefox-64.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "66fa889e90c92bd6e07153e86c526ee0c08774a81911c1941b22d1427871ebfbba2e5a85844512883f9d67ec1d746c06612e0fa3668a95a58f6c59cea6347e2a";
+      sha512 = "4be8301b834b29834d2b6c369341e1b7a106838c79921d720d62a9d624d672dcee2ddac9d4cd1a3bf37da4fdbc9d9b80799c19f8b0cf29935b9dd304999ea33c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/pt-PT/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/pt-PT/firefox-64.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "cca4fdaa9f902efe0e80e6646c71ccc1e168c7a2a87194f191bf20b8604256675b070bf004192cca0b0b9c5146b31a56e748ed061717da350d250371c0228641";
+      sha512 = "2fbd9e199043b266903892303332396b138621606e51a460dc45f3caa4d9bf8e48c955293ddfd0a85cb5fe2294111fb155417245771c792472e3567384231902";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/rm/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/rm/firefox-64.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "991afdc42e258fd07283ac9c8c3a2bd276014d923a0ca90fcb4220fae74a35fbd0ba36406985be5d9061a6df30037e49eb16d3936a3734a0f98a2704bf62fb00";
+      sha512 = "02aaaa30bfaa6b149c304bbd82df7238073168ad49692fb03413d811d69858e738207fdd52718f10d16075ce660cd04124e4fac43f57910f52aed3006d1fa6a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ro/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ro/firefox-64.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "fcb3ad91353157564baf8a82ee700c83c3d62b8194532fea123c06e6816f6d35d747d13ee1bdc6d17e633aaf4314529532729dfa5f7cde52c2b4669c64bebd89";
+      sha512 = "63803eda091f187cb65d0e765b778a957f46bc20ed49a4ea07bb0be15c662307d2858ca9ee9797ad8c4dee97e5e63e11e8be0695a530664984652884edc75f60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ru/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ru/firefox-64.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "dc3310a41f6298bf552dd22cc416dd3a8cb098abde3da47fb6b4f1573a38382c49a698157bc9196c11bf1e9593764247b6ad8ccdb5fce4216f94fa8e3145cbeb";
+      sha512 = "0630ee2da0e981649a2cd95c940af62a1e99362a836efefab151a3d0395d2b6c1b5eb31a2ba96f24a7e4b718af5215d0d911d3967d6bbd53718c6bae0077fb13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/si/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/si/firefox-64.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "ef80b229b4008dbf7606b696400cb80cf39f81bcebf8bd424a720e93eea6fbc1c534b5e3cbef94a2b001b6117582f58b3f0a4517e7ae4aef06201d5518ac0365";
+      sha512 = "bbff1c3b7040285f5b7188f967d96f1593af7b12cc75845af1ec3ad965199a5b05890f9f70aaa30ff6f32f2a89f0b56e41bbdfd7b926630ea96303d82904fb3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/sk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/sk/firefox-64.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "524441e5dd27831b0be2a75ef6cb7a1afc1dfb77cd5d1f96cc6a024eeec3ccb661e82961c35d55008849990e97b3b94a4359c38b272522fec624b0ba1dac041f";
+      sha512 = "5ff341dcf32ff25e2cc53ddea76a6581fc4efab6e37582dcf64c8714d40269908cdf615b5435d34416bd6e027664726d34a364d2ea09f6cd5252825885812bc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/sl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/sl/firefox-64.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "351083df0a639b290fa11456ee8969bf4b49c1a2c5d199bca0dd05115fc6bdab941e41a972e249713ae249aa884cb8b1e8ced5aff7a13566537636f0266fd7ec";
+      sha512 = "c2305c0a97b1b8c62453efe2ed0a24023637202f493eda44d34a64fabcd1573866bdeb488c2795b5f9ed2372d7189b57dc8b8d9a7f8e51b53ff2d85530ac5515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/son/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/son/firefox-64.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "bfe898ecb294501388ca73dc8e1c846c9fbe0c501620da7237f5d8ce5655d1d458cbbecc0b8f6d54b4a57c779ff8533a2264f51e31cc463766b2debbc334c383";
+      sha512 = "250de55bab9ead2d7c9a24e293c69e6d1e0a06bf228c418dddf6083fccee13ed469b8c2a72c3c1cc2328706ffd54602d205347e50d6adaec34ebdae10ed0dd90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/sq/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/sq/firefox-64.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "fd4e3be2a0d11c01e040bbf770a412a6a5cebc53788999a5b446eaad9c609e179abbdb6c3322fd3ffb322b5625c68f26d696782d9335895abdc4b38771856d38";
+      sha512 = "240bbd1adb3b4415b58ee58971c5d138894b7f8590b9ac26140385c62564ceab82470fe327b36c19b19774645a9dfbc9b24f64986c906269ff0a5c538c1508a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/sr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/sr/firefox-64.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0659ac0ada51114f3bf7710441a3694f9dad1febcd2310c89fba42693cb4747545c25deb5a30c5e0eb8c03037724cd39da316d9e5d980b98e157002f5a6ebb7a";
+      sha512 = "92026ae2c63827c660231d32bf8923953e61c3f687ee6965e215b807371baa439910561a4506f9484c0a14f0ece7271b11d6d43594171c56566c6a827cf35e7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/sv-SE/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/sv-SE/firefox-64.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2d7b5b5f3ed0fc14f535a82fc2d955cc49255bfdbc197768de1cc206df594a24dfeb6cb0e4112b4bd8b747efce914eb4ce9b96b7ff629d48d045108645bce337";
+      sha512 = "cecd3fa7f9253d2b0ed368520d72d01d054e856d3a7fe7caaf8f53ca710fbd9aa5c69057a71875cdb6dbfc6b58add8ed1538b9e9e9dfb50853e25e51987642b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ta/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ta/firefox-64.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "bef25766649943bf6249a7c474e58cc5e311158aabb8364e0eb8e9570d538c542663462f0b030a446450b8c86d40b6dd291e419051135e911c6af623fd2ab264";
+      sha512 = "0ecd2d6c2bfa048b126a6a3b71b543a89a234f7088f5440d2a5b73752ddf1895fdd7ac3629619e4b2ad14443b51cd8077df7f7b1e8c816f61217ffd3383bd477";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/te/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/te/firefox-64.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "bc40367bdc0019a3de159846a4c0e2e2cb5d6c7c9a81e64f1be184427a15445673185a8e9da44705434ceee40218d10b385c0f0c5e2ce92e4ce40757467105d1";
+      sha512 = "ae919a5beb3906b7e32b9929388fe1252beed1a495af4a8708c7fe71c1278036c390f52e10eff5d2541de069df41e6114d236a75553949054ce2fa960dedd3dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/th/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/th/firefox-64.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8b6e6903da4a3b1e04fcba7f9d5c948b76fca498bcc18a60158ee65bfbe64af2e1463b7fde23b9d34b2ae9403a5d55cf09cb47bb9bb6de3d6a3a3a54c409e8d9";
+      sha512 = "b0c6758783d2873efc20cad1ae4d5ab4adb6d179e98f307d7b07763b5bcb1e8feb6f31c68b890c746574902ff408b6a7eccde2a74d9399714414c317235669ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/tr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/tr/firefox-64.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ea0e0619fd4dcbebc6392d1574f6d78605caeed066ad12c2eebd681ece04d5ebc0fa925a0c835a8750c522632575fb101ccb81d8dffb73a28b2efa3b8b8374ab";
+      sha512 = "d081a793fa41b369a640e5ba637ad377a04eb2089de9c979c564e8f09be7ccaa8dfd02eef218bf911921d1a0f97eba4da281f5504d3d971f712ab15c59e79737";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/uk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/uk/firefox-64.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4cc683b8425c8e70e7d41a2db0d94a515248b2b5a557db292dec3255b695063529d998d0b3eb1e017a143073ed0c871551d07fbdf69ffb226f1eb08bd610e780";
+      sha512 = "6fb2758391aa6995c4988ec0c04e7557137953ce0dd89429d074c99d04b5bd4283ced47f7f7c93534700f5d3a9c6b7b602f50e7729c3095a6406accf8eb1f6bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/ur/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/ur/firefox-64.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "0d453f019cd093d927951bb9e702b5b763571f40d070aab36dfaacbedb804d836dddc24ea6c9160f8607933b6fe7500673804703feea767c9abe8c5ca799302a";
+      sha512 = "a253a28cd903372d80cd5506b756fcd437c443eb638051dc1051f39366cf355c8454495633a1cdfd8b384cbc697eb654845ef97467fa06d9aa94dda26b489c28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/uz/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/uz/firefox-64.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "9d9a9de47f7fa9af563e3fd073c15246238d7d1ce61af62876b778f2bb12d0a008a65b50103f3bd8788ba10398020055050f96ef74dce623a6deade3b296bb59";
+      sha512 = "c386894ffa93a17ab7456b392a485338deb1980289f1331bab635bad60527ca764a6e7a495b192103a6ab70181433260260e76e82993e4564ca6f542d8326cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/vi/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/vi/firefox-64.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c2c278f1eb303471059bfbded55dbf71561a45ec3bb2bc21a0d113ed01a779c3c996872696802b753c3bd9c7a3fb05446bc0bdcc6ac40ded8ab8618c05ae68c1";
+      sha512 = "e15d48bc479134d2c50df8e5ef4ae356ca1e91144d16ef19c853f1da5567d60ba037c6df72c253be3a02f60e33eaa0b7fe573d1b2777bff114e770198f241f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/xh/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/xh/firefox-64.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3c0f60156d55fad88c60de9d004b73969411ea981664e7b2f8b95d116f7fa110588fc406ff1796016d3b89bec2dad1eddf3e4cd7b52cc941c70bafe23a315883";
+      sha512 = "4f2275c4761d9b8cf9caa61e89fc57bde5ab4372177b9647fbf250969d8a76dbba5640f85003c53eb7523f8dd9ef6fc46db5ca191afe8071fd08705eacc906ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/zh-CN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/zh-CN/firefox-64.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "046c929d1f764eaf434ee06ec270141c349fd0421c5a4ee3a6c0653db9f2f947569678d2e05f10f9b0a407010b87e02bcbd4310824025b620f6b36d3728f178d";
+      sha512 = "d81fb2e3e4fcedce4b6754e4d6964f95e766b7de3e917f90be2555ea6b69f11ad0e1809195221e06956e2de2aa971cf9c37b10839b42b393345e7ac472495b2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-x86_64/zh-TW/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-x86_64/zh-TW/firefox-64.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3c6055dc146482d38fbfa0265465e7a6ba9943fb5f96114873774a6c5ff85b0916661ebc6b85516bb268a7cb5b7e5130ec1a9cb68ef37f7791cde3bd5aa3ca79";
+      sha512 = "8ec43ee30d086eb663c2fe3e88479be672e2ae9eaeb555c6414d06556598e7df61189a0fa3db5379c01cc8d6fa11cd6e3fc3426145f956bb1e9b44a44ece9b43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ach/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ach/firefox-64.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "f607a7fa9d37a4b77c6135b000c95ef3108f7c9d0bed63169d980656d7109897da70485e732ff60d1b50cba4426035e253017088848f19d0c4cdb5ccbfceee83";
+      sha512 = "8b382d8356f16695c8677e1a7f93c5bcfee12ff0854a498e28eab155c9cccde49f5c7f2e877dbc2cd8af61039187604818d86afcfada106976ae3c0010d4677f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/af/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/af/firefox-64.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "247bdb69b2f09c5e15a4431971e9eab706ff3d2a05dc6b478f09d990410925bad15187e79acf6f0f1150743a47c332f4bc4ad295a38cc7e93f32fa6695c59d50";
+      sha512 = "7cbe6843ff38fc5c717f846224a34610f5bb3e9a597420eb634a28d0e84e987d162d2a96a8fcfb3fc7cb9777f4e48a8d4424783663882b89c2f46679707188f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/an/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/an/firefox-64.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "9baf182dcb8f79f50c6110e6ffec49dedc48796fd2726e200700074ca9ab3f85585689d12d9e1dc9622cd8cb30df0335efc9978bd7609512e9e85090fb9b2d73";
+      sha512 = "63ebe2dce50e884b3a7e76ea8b0a4bce8b1c2a69167f5a5ede5b51499824c620ec0d086365c312a9edd3fae2bd777eed4d44d606c1593d3227af9fd13aff3005";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ar/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ar/firefox-64.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "472bbe989fd9ef9649fd48ffb1e7224238fdd0e42b3f813d0bdc26aa7ccb32b9782f5c9e682b24c0c1bcddd3b614438def737a07a67eace58ae9ada176644c7c";
+      sha512 = "e69e50709c540ebabcae287f410063e716ad58366aab7d9773c566c97b751b3459d72825c0e9398ee8ff146429b943bd30274ceb96f4bffe3945c83af93c37c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/as/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/as/firefox-64.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b07adc65d14995f5b9ba3b6ff5df1a718f37a975ef964e8df2eb96b44b24605c963c333bd336755ee5a63384e7dd14fbfb0e139af65721fa5a9cd5640ae66995";
+      sha512 = "65dfb87c5542a3375b1af1ab0d01da7a17e3df22cd56a35198579c4fef43e8f0e5fd6a678a0650a737d01a32f0263ea71019b0f17d6d8805b3b286f1325bd04d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ast/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ast/firefox-64.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "78e8e3221ae6d57257f405e4d01721eac1bedf1bd55993574574cf86f0415ed64c133afc174d06123addd334b0ab335704ccc2709c2c7ae7173b1e2b10a49d5d";
+      sha512 = "a746102d8d5a3abe4e7fd75fa3eeeb4281e5c7fadcbc0fe59f05d33108fd37785f5ab53350307ea4bebd93c7d15e32a59148b09179482dae413125990d18de2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/az/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/az/firefox-64.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "1dfced8d0bcb66aec3cfeefc9731303626dcd72a30f07e4facf31a159e7fe55eaee18143c08f96c965e6c6ccc54027fdf421d40fbb8ca2ba08ea3d42d6687fa9";
+      sha512 = "d4b9f5f97dd3542ebdc4f971b734f4ef2987c15ea356c899cc77d3962edefedf5d1579e49e3c4a9f4428f524856fd55b3b1f55eb372f6b98faf24069b3a0337f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/be/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/be/firefox-64.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "eddd7a59348e2feddd6946d2603a37ff0b54b3df17646a4bd161546a680aabec3c6b9b0cde5fb62252239ad38c6f380b296469e100bf017944f8f75b72091af3";
+      sha512 = "d880b29a40a04ce9e89ff5edf6391c6e4cf10e70aa19916f19af6f071482f82be4484224dba91620d205d693feb5396367e73ccc99c8cdfbf856809990e1d7a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/bg/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/bg/firefox-64.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "6f5099fbf641785b4b946fdf88ca8ac297faaaa12c24ca38454a09487e8bfcbc75ff03304d77c14bed3dfb1ff06b2577b1df6a151221807aaafb08f467b8c5fe";
+      sha512 = "f294a256d1135dfb9a6a6cfa0727540cd13228c07e4a8643d585d240c6e7f2fa96991bdc2ca32e167b1efc5c6f245daa634d56e9321ec15723bf04aea783d756";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/bn-BD/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/bn-BD/firefox-64.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f280de1f55748b9ba64c415808e3027407ed42961327086fc3fffefd03f39fb6e17aecd2477b8fa5a7ddde2dbf79696ec0d8a5ec0116df4e1a88092508fc27a7";
+      sha512 = "91182fe1d7cbf24fcc189471176834d955cd929520e4ebc7b325bda58e22f8ce79313fce6b2d36bf17ad8ed447104650f8c40413e057b6605894e4148a69c2d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/bn-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/bn-IN/firefox-64.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2ce603f014777e998b968ccc305081e14b8bd7e4dc598fbf4a7d527eae26b24231b941defcd23a9d19aeac62e4ba89cb5d85719773c7734e5489634d7d18c3bc";
+      sha512 = "cfa4224f07743723af2b8a14bb48d7538c340752f9d02baf7801cdacc368bcadf5168d213a77bcd3b5b7cb25eb279ea1fc64ecbcd34e55a4a9c2e412bb6faaf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/br/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/br/firefox-64.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "098e872ebefa533b24fc1c40dcb0bf0602f0c5cf07c74fd7034103c16f34c7df55c2391f0b075dad6e757bfd64d9c3ea19bf496a85d68646424f4b9cf424423c";
+      sha512 = "b3bda92511ba516996ab2be3d7556c84c504cc11a0a1482fdaabd3afb6d997d332d65e2ce5fe915c11f268b500b972bd1e7c3a869926b2c4e6f324cdd2f485f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/bs/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/bs/firefox-64.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "df3121baa80ce8622141ef958244dbbc09226f135d19a84b9f840d37374a3b370de560e6c5588f11b6cbc150c5769ae7833b469d6724d78ff5760d8630240d0b";
+      sha512 = "a46f31956ddffe5736f0aa4ba66ac71d15a392275ceb1b87e40f369b95366f2f8939d4c6f661692775a91b4d9ba16350cd8f634ddfbe8283537e66fb007c000f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ca/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ca/firefox-64.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "84a14b1956972c6fe92673f6fe2390e3c8a100c9b512fde763b7ae7c92016c060cee5e67073285ea5641a2a11937317e0ecb3aeb88b5b6853339d09f272c60f9";
+      sha512 = "c096b01c5deb62941e430dc74ab2e130e99c6c979e4e0cf50abce96398ad1ccf7e0a5d4a5e4d40adc594ccb18b50cfe6c32eed060565878d9d84cef25d8daa98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/cak/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/cak/firefox-64.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c221c9af315c47d44be7cb0ddf88e8fbcf895b6b87d4b5df221fd09b217d7cc69e839e8d6b0898f4d8c6500ee9b2049d1f7e79b99fad03079d2d850443b09802";
+      sha512 = "94f30cd5a693186d0790c6e5ff0e39d5708a055ef95e00afc20556736ddc05d5956cdd5ca783b063714c850f392a1ee602d3d3b2fa93f5e5b43224c72ea14cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/cs/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/cs/firefox-64.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "418d32bff0321c81a09f166789be1bd63c7a51506038b6a6b16438cfcf0e6b67ceddc754c5de0a5c6fceb9bba82a1b4e89c79ad626242a1215a763830d252836";
+      sha512 = "dee18af4ef0f849742c223e136be3580acc11c1727f0360e551c39322ec59266591814dad29887ea267f16af9bace4f4cb04777b3ec18c49b979e21fb1038147";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/cy/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/cy/firefox-64.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "21faa65266c0acf840558919a56c3ad898461f04d93acd62ce05241b8577b061547c897d8bd72217f2767fa22408e3450edf8b73b82d282d636d1031f7fd714e";
+      sha512 = "044d878806797314f51e419d2641072e22ea3a94aaf9f469f0a0d23e76173345d40ca337f40eeba05c18632f7b7b78b93c39c850ecaf24f0a206f063202576ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/da/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/da/firefox-64.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "8c1d330c86fd6c95940ca5e57acc2805afc41f88c213cb68434615a7b970d7957e2acee111049e9c090260d600defbd58e3a22ffb3bde80248755cb6542da80f";
+      sha512 = "40694d162b6f156a845e853bf6ea8cb13db1da8f02ed5da2e640169986557d5521836e1a4dfe0a54ad1c822decadbc9551608001d245990c5e134ed1d8c73ff9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/de/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/de/firefox-64.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "8b5321f333e25f9fd63ff7d76426793b69e646c6bf049d8f4e485f6056820d583a1f850121dc5a73e0b6545b13f05aac467ce3016cfc1dde5ebbda0b737cd96f";
+      sha512 = "496482af47cc88149feb1f2a850cff0ec7c78292635e9b8b9ed61c966e7d1f8596364e6169c669de204c481e510473e97a70812c0afdfe13a2fa2567ed6e6746";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/dsb/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/dsb/firefox-64.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "91883ce7ecde4d52e10d95961c4fe4ce6f2f6c91460a662342529122d97e3fb87c927ce6b998920a06859c4186fad14f70f9fae28e5657929510390c8543e755";
+      sha512 = "d6b471a9629ce8c387ac195eab1fba4f255ec18b3fe0868fd32ec89604f117693b8069f8ea2b7f3b07bcbb502e38e7702ac54e7944ba1c06471701b0e6cda113";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/el/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/el/firefox-64.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d9ab8b8924938123f03dfed4a95988436e0f910fd5bcf898d69a4c26d5c09670bf7b38e86cf9dae8c65286c9ba3d4f763ed2ead306f5d62a85f963c99f5e1225";
+      sha512 = "bd2967a225cc10281368a5fa3fb42ccbed74da18f0b64fa4bfe3da8e62c883872db0da05b9271cd541a28c4c19abcf6787d7576a4ab06c840f9e8ab82c7d4b1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/en-CA/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/en-CA/firefox-64.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "36135d4f4fd1271fe1f2c1a9508b477a235bc8b76546afffebb3c313e9ae3aae2b59ef3cec39fc67031a1a3eb98d3b3ab79de27995aa6e195e190819023c9ba7";
+      sha512 = "61c3dbb80d8af02d41569a2054bc3727f14717505c6bb67769ed4de3455054b5e390107f6f7f85a4d21054c69452cf6be4cb5a6593c155354f3878139a247bb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/en-GB/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/en-GB/firefox-64.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a799f334fe5b30dc30a8649cefa3daa7390c049078db0570adcc8275beb17f96cf4907b1e7b7fb6f5775a0c31743409a1ff08d0862bd9cc442f3c9e5241cfe6f";
+      sha512 = "4c153a00edccccf1ba23194e61ec2b559155563d07d2b04465454c4ca7128026e0fb4b6b45d0173a0088671a83ee64591f441f08bdb4bc760303f29625df3e22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/en-US/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/en-US/firefox-64.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "1cf8cb7f05fbf618bfcde3a73f309dbe10fa744b4b7400be50817f3c7ff4a97897d0c9474617b50de39e28d086bc52a2bd4466162fe08d3338faf9ac9e4de3c8";
+      sha512 = "09651679e1c7966e4df1285ee6d3b5ed99b4f91e32ffe430d75122224eb303b80673aebec524b7cf27ad15699a0c4ff908e694f54689d0e4a6c0352438be4704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/en-ZA/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/en-ZA/firefox-64.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "6c238214f57304c546c41c9ecd264ef8d155ecf9d8de0d2a3d2bad3302679e486a2068e06050917b3be02aa4f3c003be1149754d832acaf79c5a7f84b52310f1";
+      sha512 = "3b6b8d16dded7bf308017fcadace078258d1e7e365a1adea676b8882161beb5f4cf7aad8e804e82f388738d1a6b2cdc192ce740342b0f79b6f6ae3c02f5b7c08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/eo/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/eo/firefox-64.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "ce1a7a296736eeee750b8162b7eda7ae3df79edd9bb5817c511f1a9c5e718e3c4d3f2420f5c1bc203afbae6ce84c22ab52daa0a2853c2a93e637fa376662252a";
+      sha512 = "2c1921f9f19f1abf9f2940f88f705664a2277dc55493f51136da1ec9efcb0bf49510d18bc4ed13e0c32e8331081156627cf18610d0b9fc909a04e63ec7834dc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/es-AR/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/es-AR/firefox-64.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b63569678b14e6b5f6aef8c2ccb7b8f5f1097b4f51112aedb80807c087b264180102f9a66443bc58fdca13993cc9b407176861e1f11db3a38f2332c391a8aa75";
+      sha512 = "be80f220a86ceaaa3045472c7e5a15b631ebd9bf55a10152164f99d151e96fc599e25f7eebb4a670f122fb6aebe5097650b12611e595fc9b749af60320d01d5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/es-CL/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/es-CL/firefox-64.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7c48cbb6b9be0dd3b13ef6e838e169afa555e36d5d0f21e825662bd89477aaaa6bc0a3f2076a56a32793b495eabe32c9a286e9103297833dc04298a682e4279b";
+      sha512 = "bc52fc5433a43b275918c45e96584e29e048a46ca0db7c2cedd851e3a763500a04f2696871aae132ac07f5a44b67b5a604b6b142d92f49e67ed33d17ff7f9d96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/es-ES/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/es-ES/firefox-64.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7ebe4ae6ef712b0b49909946ddd98461708305b1f418d8c32ca50a5e1872b9b7fbb73d322f00cdb2550701b743fcf3829f214679e5b0eb57939fedf3ff18889c";
+      sha512 = "c2e022ce5672bf1e1a825535acc8968b5a538fe3cd2cbf7d11896b6a1fd77422d92114d855dc79caeff620278e092d6c2510f82e55fd316c6dce05b1e3ffad09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/es-MX/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/es-MX/firefox-64.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a66b3569fd40f98577056134d54f5d7f8363dc88a17902472d8c33ae6bd76548e1c8e05f0d433fe3d3a82e0a527415f53722698cde7cd7b5a6a86b09dbf06d9f";
+      sha512 = "3363c5e6c198490ee2600778b931d44a0abb86baab887d8ba3bec70d4a025a7f9d840492b8644ad6ab32f24a0f9e4d403b9ba0d6349d8a99bbbdcd0e180701f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/et/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/et/firefox-64.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8df22fb76c8b5bdf19d4b9a34313afd8d90a22e28e558d1f9faf4e91ae3c6e034a40262da4fac829b50a44d549fe6d6a8aca3488bc58213c816745346c9496fc";
+      sha512 = "04f472440779ba04a6cdc1aab9e86418ce7ac6a042921e2ad8afe9a2ac7d931dfb15a771bf7120130c0fea3f894dc35a1167f8b8dc246f133f95be8deafb9e8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/eu/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/eu/firefox-64.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "682980f115c5d89e4cd5a9c5c519d8348f0ecf7a8f571cfec59015035b7a96f53d8d518ab1dfadfd7df0dbfe1ba6ca96ab0fddb36f1b86a54df588e2ea685c76";
+      sha512 = "e9db84be9fe224641ed11414c07ff6d23b583711e25253f602bdf57a5dc249151c700e65722dab103b3d9448a3930ba73c4d4ae223ef935ae38f85488a68ae86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/fa/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/fa/firefox-64.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "9e239945cccec9909ce9fd453ea66fc974f047cda704a6c56300e19fbcb456a64829032e9a207a25785a6d2ebd0d6734c1555bf0275787168bf717e01f43fd49";
+      sha512 = "06d6a28c780cd39412463cc55b5afc3c4eb29fd22a4b5a916456820a871c7f150c84beddd24d69a5ed1c2c0392a0b69a5d89771be929afbb46995499bfac24a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ff/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ff/firefox-64.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "45f592ff155f29bb3a1e59d78b93467974665a467509bb3e435de97495df9bcc466e0315ad31415ff8a2c08e46066b5c11cd2cf4eeb7889cc90b4e2d2db23597";
+      sha512 = "e8c54e872c63d0b5f814a31e9d8f98b6d53f94ca471e9728c21b8f7374b85a235ac4f6fddf7811333d71a1094cbb5b4dea20c1035b9438d4db8bd4b0ea47aa4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/fi/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/fi/firefox-64.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "8bb1e61fdf8283b6105104a8b5bc467e812c9fb9844e69ddf9b0f83315b26577b275770231f1fbe03cf9c80b4757d7208749b4014a957ca7ab37cc7c54a7f3a5";
+      sha512 = "29b90160fd55a3e7bdbb9eafd52e052a9e4138591d21ef52f4cb097496494a3dec44e359a299c358f242704437817af4e1b55771035b34e7126307ddca312f13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/fr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/fr/firefox-64.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ee89b1a7af3e3d176e8d6221bea53c86e340772f62c10ffb3631a1f584e4ae2ef6631128e609b4ba029fdca4f358af0d1eee9e60dc14123be9bab7e0755e1ed3";
+      sha512 = "7ce7f12c11ce2cd212648639f34cbc6c0b161e69b6082f41a4ba6a8609502d034b9865f542dfecb683dea9da374cbe617c28771ab8867b207fb6d31413898143";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/fy-NL/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/fy-NL/firefox-64.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cf94472b88fc2825e79658283133ef501e0a57469ecfaa787c04649865b5366776dec1c21a5c087ab588a5abbc3951ef627aa3cad510e4185f30510d12cd4ac4";
+      sha512 = "2d074fd18ddb80b18e24d1ea2868b0bbc0575e173740827ae849110f98c2467c4f401622d2099287b5f536c97dfeefa65f89b6c9601ad2ff90689a0f92c0878a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ga-IE/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ga-IE/firefox-64.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b2df9d225a9b903ecd8f2c2f3990980fdf0a16bfeaf04640d13f25eda58aada47620669ee479ef34144ee28a490c125b9e9ac5a10e961374cd3715e6d7f1e9c4";
+      sha512 = "051f416c6ca3a0a42f8da96098c17c8188af2e55d585ab5c9f2eb54fc25c1f3bb35810e39ce51968e35f528959b6249284b29ebf1aa660b26cbeebffa3d628d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/gd/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/gd/firefox-64.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a5fc5582241fdf0a0783ccf0e7c23c2e7032f12b13517d8bdeee21c64a0118b38913a28660838ecf41299ce3955020fe6dfdff25e72b6647cf82faa0bda209f7";
+      sha512 = "795f6ab4835f9e2f84277072d67ea29f9d5ce25ae913007ff04f839fd38301ea161ed825d53ac4d9d444245cd48161392ff868c162fece5e77c40c1e2330463a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/gl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/gl/firefox-64.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d748e3eb036e780278b8fbb9f3d30c319f0cc72a2fdc490abf54e6a532768d2050be0b8448b80f70db1ae573b6a618be3938d5123a5876c8fcabe8d47067f77b";
+      sha512 = "3419ff231fb3705aba5ad6d20e18fee2f271a489248644ab5da197a27d3079ea27db82c4a19e64cb7709df79e323c0b7575072321a4484a20aba88f2da9948c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/gn/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/gn/firefox-64.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "fff41e2fb5b4e394144f9620978d8fa1dea4579c20e1c9092925b68f553134e58d4635db20ecec07f5ff8a7694a1a3101c92206aaf16df00eb40fd4d3ad46402";
+      sha512 = "0d4d54c3f79b1e3cf7ea8df71067d4e2f654f2b1c1895db72476bdd55acd861a5a4bcdf60ce4d70bb21af4b3295981a086b348fcf85495dde0b1b2045e60b47d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/gu-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/gu-IN/firefox-64.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "ec754e86ba03986e454f7473bb1b38bfb47174215489348cd6c2a06accc3bb64036a497c3834787f71568abc82d56d6fbb331d4a666f036c4a11c301200980ef";
+      sha512 = "269ec2149865fca892c0e1b402af3e737c65ef4ef9db68cde4f9550a60e3e228d9ff218a920c63c03f74f66d348956f28e77e3a495d477916a9ac673afe7abc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/he/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/he/firefox-64.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b5afbce3908e6d67a9773ac1350d3e94660fd04e4be3cb46f72ec0c90fb75f1de77ab751e0086cebeaaa123baf00cc171e558a7aca7e5f7689bc5b5371671f18";
+      sha512 = "db78a15d2584d66ce27f9d0efa4d29e5329f4cfe1357623f7406105212c50e58195e492d059ab6157d9f0f37c947da77c384c0b2aeda1bd9691b2d0deb4fd330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/hi-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/hi-IN/firefox-64.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6f7510b0d390a7ca7e5a248fed08d21f60f3f59eb0e064ca837cc4a96664443d9145a1e2ab5b5f8a4d3bbcbf978b220b0271bbe883944a0b9f91dda3c75e040a";
+      sha512 = "a638a07ee771a623755bc69a352719675172f96ca86be2ac142ffe8670eb4921bbad7e2965c6464df11f7a345e965a4350457331806d2e01724791f2a419b3b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/hr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/hr/firefox-64.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "66eb45f1f232409bb134c86c5b99128cf497db845e0e4ccf8212342dac144bfa195f6c6f0b75655e05dceeec52ccee546ef8298d253a535ce8853bbbb6137e59";
+      sha512 = "2cc12574d807102e4ca7c2b37f252d132da11c891ca05e30559bcdf7c054a237e1d1a17eeb61023c33d0ac62e7fe703328db2152cfea48f880cddb90aaca5717";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/hsb/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/hsb/firefox-64.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5365d3125d0e58ed39beeb4793196fb8a7809a74165ddfa9cfcd3d4f9358b71f68e531bcd7242013b8085db17bbf2585c46e101f704af7fa668f1e6bfab10b89";
+      sha512 = "528d7131ea6379c828e2215703d210b600bb1d9ce6b25c14371ae3793c4231e34fda7f4f9132a15c8d30dc1480e53db8d4b69f9c2128ec39da4e96b6995e5409";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/hu/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/hu/firefox-64.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "1f488e2ee4a88c2f2aae4501c4b9442e750a800dff3f2b38e5ea48156be83bac7a3870b1a18860d3adc4900eec6ce9822d5558b5a1eea83017f7dbc6c19382ed";
+      sha512 = "30af286d2a5615dd5dd62de938990fc448e85450671955ba28303f52c853e47020fd95badc4b0f15a044900ac7e509c82eb2964f581311ae2a2c5c5303ef5ce4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/hy-AM/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/hy-AM/firefox-64.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "bb62de549b9c1de22dc17a0fbccc16b8d8d89f093b783c3a5976ea9594b84bb4495ca2a9522444f84e1a4b66517b59b8901b411b0fcd29477c869ad9ef664f7b";
+      sha512 = "e934ddaa4ca206213dd556454dbb1ef4f0d3b567fe15df7997bbc43b16e38e23603f06bdc69490d9e26121ec2140518d610fdd3a125b5ddee14a4556adab4bb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ia/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ia/firefox-64.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c4eeddbe81a02ae264127f0fc1437c68d13ecacae07707ecabd71ac4a1d2845cdf164767ddf85f960c7e6c3574fe1f0a4cbd6d77f1d14a0944efc75acc999bdb";
+      sha512 = "ebc92c0eb3639612feb69b281a9240c7335a4d9e792df77f0bf8b5591b37089c5994d6a0681ba90c75228dca3c7d9f9d9d292ea37692bfd761eab4d93e32db88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/id/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/id/firefox-64.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6a492b6b1e0bd3522f80e3b450c40c575ab873644705939485f6a4e42a92c6024da434d90da88e4d9ba9b85df94df358d98950f0faa3c5d20a23f49e177231cd";
+      sha512 = "dfe6b103ccdac88212d82cf26e02bf4803336a742e3dc1b6ba0c4e3efdb3efd13a743731052353eb3d7947237ad010cfa6ef1bc735e9acbd08f0668cc0ce3fd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/is/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/is/firefox-64.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "fd10450ace7b24ea214bbcedc0af6c29e4dacb3b542ff53098f414ca990b572cc18550578583fd94f4c4f9823b9e6e2a022114f883a6c2af970db9f98843f86d";
+      sha512 = "7744c9137571f3c4c9a830ae801c81651d4f979be67664fed8a503f3e8357251e37349acd323b7f6b6d843c68a499fdd544d09c02db22e64f52e057831c1e366";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/it/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/it/firefox-64.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d4793bf2afab3d1e70ca75ca7e0b516bd1615b969bb32de230956d8e720a7857b7cf5941a6b5b3d04dd491740e59e7ffd61d82f3055972c136ebc6d9d5450fe9";
+      sha512 = "7d24a74d456ef99e1c212679887c4b53703bf37b1f76827b7e7e41dc056cb46457243ad321e5ca41e73839dd6f62f1f674a1b5f5430f775a658f1a90563992f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ja/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ja/firefox-64.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "742e390b3a6d1856166d952c9154be9f9fd1439fff295a6179b13c8884ce02053fac2c5aadd411d79dee5916b8d1e86cf8675f7929afd3b78b071b17521efa44";
+      sha512 = "31696b0834306f0ddda94aa4b44e59bf570796ec50e744eaf5ac65c803a160d811e8c19df3923534bb607eb406c86262ac281dae2739c1b1a158f397dde85689";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ka/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ka/firefox-64.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "334cde60d0b9913016e5e3064943bdd703153634f73f19773cc86cc4948ad69943f668505fbfa76dba5f563eddc0f9ad2f305f283b3b5c94f4fa38d8d780c4b8";
+      sha512 = "8ae0b80f22251ea7d1da8e151d94fc8c6452ab95af89a76a461ddeae88d7bfa8801c7c37454a88097d228d404ef8362c88a4968d197bbbb6e925dd60e2d24c31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/kab/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/kab/firefox-64.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7cf9a06820e3f60028f359a354139e9241a993c2820b7fb4b5f1eda4690c80c1dc7c740f96cca8a4070290624df378f711592000a8d009d69039d432c882f75e";
+      sha512 = "401faa908365eeb8790f7895fc17bd19d9b8cb294fb18567ac3b69bf54d37acb381c992ea969e8fdc5888d165c91a757b187cf4422f6a184b2378ea189b984eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/kk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/kk/firefox-64.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "a8be8575aa1d8ae527d4aa206a9f78a7ed5904f4562a90851bd532b4293baeb9deeb4f6ca827d2fc5a4b3fe5a2c852e575729d3860c3f7197462c4bd4ae5a924";
+      sha512 = "7819b959b86c728f568c1088827e6e55c4ce4bff6d52a51540d47f014d59cff79d28bd45793d3d09b1951b8bb7690f0f1a8c5c4854500c375297d595806c9f9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/km/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/km/firefox-64.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ff55a3ddcc5c428ed1374b2e9dab78e8712c9af89be52980cc252d6c0fdc47990ee7133663db59d7fc421184d84d4c8aaa8213ce2dbb37e9073e5dce46876900";
+      sha512 = "90acc7ac9eeb55398d6624525808ad93a5cd506a363b465feb33b336bfb3c48c47d8ef9e057ff26b972534e50fca59ec14a5c7f8425f0cfd9ff6e81877d973f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/kn/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/kn/firefox-64.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "ac6c0cca9716a53485c54a11ff36a9dbba041c4b4d10dba578160e35738393e3c639ac789e09a88b849aaf7e2778bd6667d3ac421047d824b58c2d48f2dedda2";
+      sha512 = "93203bbf5ab4e41723711e13a9d0cf76a436089f15c37e8cf01c2d3afe2d7d0c0d1a5d0bb34ad5042384493a6ab5ccff2123c5cb044dcddd36156ce3b4bd6213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ko/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ko/firefox-64.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c007bfbe54c17ec9be73e78b82eda62368a32143868f4b080d33c9702e771436f6cc25751d6f41bc523b49db5975901c7eab1f788ed9dab908c5853050ecfcbc";
+      sha512 = "6cc2fa7d1ef44d99db1c011a74f394880dac2f433e93aa01d18db0d00fb1511995e0e090edda30764ad60275b345e251d2458014f63760612d515ed3a10fed60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/lij/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/lij/firefox-64.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2e61125910f090b63211dc5ee382558f2581b1cf2b5d68cc223569712e4d144af87d36e3b4315f8aa2f7c4385f379c41ba60154478f780116ba21e3a2b3b5fd1";
+      sha512 = "43b94a4571e639120a848980b7ac0edf73b840788a3f333c1200fe814ae37835d859f83c318382d3fd4e96cd010c55b542f72c6d5f46b999b526e4cef5705d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/lt/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/lt/firefox-64.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "5bdf6a74728f7e0bb65a65e4cd3c391c584afbeefb84781ff6fd1b6ed69953f45049b09e62b30c7b7e1560db04a5969ba04bef5bb52b41a773f47dbe1386ea2d";
+      sha512 = "785fc150962fa875a32830f8e71b116e4e3e734b4f4ad429ed50fb3e93e430aab6796c1f867c78d3a3b714799ca35971591a8668f3bd4421d80ac0e3c8f816ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/lv/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/lv/firefox-64.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "84849a4352f947f8db8542b9ab357f62f5fd814b8459d326475851aeb31718a253e7b73f7da399920505cd2b2a0b3aa0c7b91eb843bae1c99e330ba13445a7c6";
+      sha512 = "1877f1ffc2ee5c76db3afb47788db1a251085e594b5ce7aff4e959caf7b2bf7a292d828735937966b3ad0138046dc0055ab25186250f4c800fcdc13b6f4927da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/mai/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/mai/firefox-64.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "87cbcaff0f938faf1717e8ff1a890f8bcd098643c4aee794acb639111e40328330909596278fadc9396ac5fb6ad1b4753c7ec0b4f3d565d80eaba001070058d8";
+      sha512 = "942f8fb48f1b1086614f122596286c0ff66fedf742ff81ade4ff2c60fcd7cbdcfb18489a35c3abf0de85200905f47681e55a96905907482122b748e4360edaa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/mk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/mk/firefox-64.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "a737229c2dd055539500e8b5584f75ba9827b898f9f9ae934ed50df4313b40fe2a9fd834d731248469a3811f1afacd64f4e3af0c4611974d50e5410174f989e0";
+      sha512 = "1ed365e89a0e2f100a6b19c0060284aa6af06d9ecb57fa9d1200797f06c5613009ae466454bec794fd4ee8ca2edd0e465dcb6428b78285e77e8d2392c49da591";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ml/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ml/firefox-64.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "3fff2d733985f39c2f0db1e4528694f8b51479b2528782213ce822ba50bd65c2f56e0d3ed06676e3099474a8ebd9aca4ac539dc259dbb38308ba1500a5a45352";
+      sha512 = "bb6f35d2fd419231ec0139745fffc85ecaabd17a51915cddc286abb555538b15491b88ae099a9d2713f2902662c869597bf9c1b2622e4f3f2469c25e68cdbab0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/mr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/mr/firefox-64.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "940fc88c218cc97d41729f2ead303e972b2d811d863fa3d5e6de22e5d07eb815cfc6a8819108990b06f47a1d2dd10188bc042e13c9ff3a38af919d45942f4ab9";
+      sha512 = "40201bb8eb70feecda000a88d16a9a0f4e65518dc35b85f31f311785bf402d80babd33d940fcb6c349e46c09668d21b9c0985538975d04b06127e60a5b64ce7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ms/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ms/firefox-64.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "650f327446d64c761e4baf1b7c06757a2848622cfa1b6799a1d2d60eb39dad3298a2671b97db735f1dca169eed86e7ec2782c083451b1eb474de99bc862f1d6f";
+      sha512 = "35b9969191730e94143b28f5a0316733a9046bf4f39d3552b88b75392029bb964b1b7f963f1a770bc9afa5f6beaaeb29d04e89636d55f0e5bccb412e2f912e32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/my/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/my/firefox-64.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "9e6e1715864f6f200b01003fb27434c9d6c29b4aa4b53d5637f9c3ce429f10f2c307f776fb574ccfee88e89060e1b45905eae704ebd0a54b1332d046910addb7";
+      sha512 = "cba958f5e8055456765ad9ae8f6bf20d347e14fb20681f972e7172503151c3ed19b24c5f11c800eb73e58dd21282dd59b9e9e74869779086dc9973355dde49a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/nb-NO/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/nb-NO/firefox-64.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0c200a9f928f2c9d42d763cb90bd4d82896075f0b4398a20172ce88e31f9aaaa3f7d76bbb4c7f4b1e396ac6f4a9e71b1f51b98b34b5f562236d889fd566dc61b";
+      sha512 = "a886ab50a74c7e01c7be43937e38ad370a20465dca3cd22dfc1fecb84d71e7acc0291df1f289ee059cb546987424bfbc77ec6792dc1cb6ed3e4ad8cf10087436";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ne-NP/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ne-NP/firefox-64.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9f30351f78c2288d24bef10b99387caa88e183a59a1ce1963789912552f9a097b30ffc3e2765c6da5d22bdec4ddb1a6cffb8375f85e25eaa8fc5c742c65c6351";
+      sha512 = "300f48a200ffe2115a5e2fcea2ea995224a2a6e75c20881d9934554f077056b251dac14b19b2a6227b7c813108a6ac4614e7880ef6330c155e594894faec1074";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/nl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/nl/firefox-64.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "2053d3a73479089c260d93680d7c00666f9685502d4a47db756e4bc72ee0d63675ace48043ef3ab7161c8f7632a79136fcff551cd13ca5ae419795be02936a60";
+      sha512 = "4d0e8711022bf6aab64ba2a6d0f2381c0ee2b29282e87411ea3a2a192dfc06b6be0b304f680c1d0cae171d4bf531ef9a68dbffdd671245747d2e7b292be69234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/nn-NO/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/nn-NO/firefox-64.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "19f40aa2f87966bbfde26b0b3af1f14ae39d5eb79e8aeedd798de8ab09e94f50a2365b8ec506ffbb7fdfb97ee5b799d7d687963709fd76c388e0d8f5d5f43093";
+      sha512 = "e3fe55836442e0c6275103608d167461110357836cd0631e84ea755ecd2b46a46452d85dfbf71e669697995b30da3fd1b0cc878372525a9c0446db64cbf497fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/oc/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/oc/firefox-64.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "d022cb815fc72a5aad403652ee97a16fc56b76b8596031191620916103dda35db28df70f73f16a1c32f73654f8080c95fb5d34194be20c71847a9352ae04c54a";
+      sha512 = "a90268805c8d999bb657c79a3638b0b580ed6407a233a532cb417d7061b68c4d6cee9d6b5c3f05e9b2611180cf7649a405e2d2c631bf09adce8ebde9bbde8314";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/or/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/or/firefox-64.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "93de7611b6d1190c683e16485fb29eeefedb61ee1405b8c6028e0063d843bbf54db64eb62c543143c140345d7491467895214311bcc01bc1b80ae547c0587912";
+      sha512 = "16092e2ec183344850e32606f058cd356c26fb91703300fd2bcf36a278d2f0504370a0a619ccd35b2f1ca998c5b9b5a393fcdeab7a78295774f84e2e468e6e27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/pa-IN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/pa-IN/firefox-64.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "dbf63ddf9115783bb6131689221728db59a3cf22d6654b913ad895c42fafcd768609586f5029e958e2e4cf9e4ceba1f8a843e0a962ba9d966f6df2352619c1ac";
+      sha512 = "7ccdbcadc26d9b5c5e451ec2d3b8af913995678eab8648582593327ad7c0b726922c54ed60f44632b9aabf66845dac01b464f695f9606466c248f8d694f3a237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/pl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/pl/firefox-64.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "27bbdaf6ae09a3c572438fcdc3ab7360c522cc2ac49d81d25358531192ef443656cf6b53d53ed65f30f5fb3081157367fa87c7b7fccef1f02539b584b6b2542b";
+      sha512 = "59819654afdc622f8a82ff62bbc2347589083f847f21d100dd6e625a75dbd0eb5c15acdcb504353c2e8d3351e0021c0494e674b54e7583c3432d568252811ad5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/pt-BR/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/pt-BR/firefox-64.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "1b391caa2ea9b0f1df1894ccd843d5b5a138b2df22754c112a613757cf415c948c32ce0f98996c0527a619324346876880651893bf1c2c644f4eb9bc1268ffba";
+      sha512 = "dbda83f708aba63d5c761bb95f4d50007afe0021d8677f94995c00656370ce86a9fac6ab8afe0d8c4a5af15ff9465f8db2888c0b2ef1e08d458f356ae1a40bd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/pt-PT/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/pt-PT/firefox-64.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "df21c64905749b2fd9223164832edbf77822c961b17c5e6537acd67a9a4a31f06fed222465099e3fd53a05da8b347a9e82b217f61d397eef54b1cc068dd9ead9";
+      sha512 = "4565296177aa7046e08d4db4b60cf9cc0c93e794963d0280191c096d5239af9c719752041901e04221597359adad8dcf3171842ef085e32dc7d8c3146e4abf5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/rm/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/rm/firefox-64.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "427b2ce953a5cb43dccb82890829f02f4583370a2ad5e7f257000950fb8bf33c1c8e52656627c4bac43ed9e0c3df5e5ad378c9d42f8d50b14a7079a8fd667ea8";
+      sha512 = "67b396e074900fb233a7fcc14e975f2f774936cce4a68150f9d1e94656cf097fcd34549605ab94ab121c4aef2673367f2c7d80d54cc97597cbff3da82a5d4291";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ro/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ro/firefox-64.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f6a19326ac0c5fa214870699a8ba50e37fee551f14e089506860750afd634dda4fff262e39d2cb10aa4bb5a60bb54eaa807494d11f67c05b5eede9299d593a6d";
+      sha512 = "c5a9ad2a4f49df543d1f03569a9de5e698cc20f163131cec1892183d855c28b00a8cce7b97faafc7bafdd1bbfa2487ce294e3bf3a8cbe26162d52da5d0474398";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ru/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ru/firefox-64.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "cd9f92ac9673806094550b37f498c70f598de2f1ad0ce7f9c4f74b2e22460369ac41e65768a722a9234fd746c81b9f7ea762dd59352d4c3c849ad1ef72a8bacc";
+      sha512 = "078ea67e6d295e4d7605f09ee04992b301557444e5c195a9b29a8cb328a748d30a82bd005b1d569cc238e258402d057cc861b9dcd68ec30ad8314f108944884a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/si/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/si/firefox-64.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "29636b6005b85f51bc5656e9d5f6539120427ae92903427eb3ef86eb002544c83103ba273a3c887d228c664c54d7be8bd2903346d6915c2c6c19f734440091b9";
+      sha512 = "80e6dfd4714de9b73dc068061488980b257df1e7dd660b260251dd63993db5279c2d54007f42ba9886d3ff88416bd20aa2eec1ea107e121dcf15b80639db1c32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/sk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/sk/firefox-64.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a52cf23baffd28c0ebbab2af9a3d4f9004f43e9f9a9d0bbe60a72e9f613247bfd31c4d05a6822753ce5c2bc5bd83a2ba1fa328bcba7756354744b02d15c731be";
+      sha512 = "be8eb2f4ed1dbc3898e623ff435e6a9345287729d46633b353a8e244caee9b566be3b6ca4b3f5499626b0c931b26469ffb3ff140b8ab8c32f8ddb99db55307e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/sl/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/sl/firefox-64.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2ddc599462520f10d1e4a81c884b6090602d00ede09e984d3234b6206cd0896064f94918c7987f0d247ab21a3f8e01b37db51af8d9240c9af93d94736b8fdfb0";
+      sha512 = "99a0f9892c7af215e203a8643aa499597fab232d30d7f9a4cf00c30ba1d29f578e65db2a97a16bd3d11e7838323537cc391c07f85ee969312622b87e84f096e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/son/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/son/firefox-64.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0d5801acc43e5be55585f2a7559eedfdf745b2f421f981fe0f06bdbc1ce42304384415c00bc79de224b1772cbd7be7154b82e73c9ac4818350704feb7d0f137d";
+      sha512 = "ef0136de2033b656f715d98414e14dc19f1a36ab4b0f0dbb1bc33bbd195c50b21bc3452577f90f5104421c438d95ee7cda42e15dbfc6e2db7df723e5b803afbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/sq/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/sq/firefox-64.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "4b08fad1990903119a1d4a127955eb0bf0b92bbca825c530f77bb2a04a00817d6ad82b1f8e588c6773a7e55021f6c71396c8538757eafa8d11a0e142cd44d948";
+      sha512 = "781468c8bd431d6e5e2b56bfd4d39a014edf53b5757d5147a1d77e0d79107d2e7a71ecc7ad0e53498bd36d72e612dcea3b3453f4e0fd782eb034768ee270ffee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/sr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/sr/firefox-64.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bb778423708d853e7e1cd53cbc5dc2de6bf519edca9cda53b005718331a9f58aa94f17793f6d236ff34865c012bf411da243fecc98cc26c7c3214244ab06a936";
+      sha512 = "4bd80b0b38156865543a335bf17a847ffb7c9001547a8415836fbc52b57927dee22fa21e6f0de834bc40ecc8f2f1b518c5f7ac4dcc00b0db26a82aa7ac4a106a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/sv-SE/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/sv-SE/firefox-64.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a443a9a90cf3babbbfb0d7dd65a254a9f76906dde9765de83138345b86673251d13e6ae77cafa6283bd5fcd3431e94842b466e09e2a8fdb450aebd247dfa4e06";
+      sha512 = "260c9aa46d9323ffb4f8e9607b876a4fcb46aea5a1e62fa7d3b9d3c6158175d50b8948053df5577bdd6361fecdbc933d85051ee294b941c7c78509a6d75f4812";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ta/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ta/firefox-64.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "406262d0a7cc447b7825330f007c2a7638620931aca61c43df13b347bd0db631fc5186e7d185aadcc5cdfb160a33094a02eec67fde837b54ea368af6d74f9d0a";
+      sha512 = "bfebd565d0bd1792b40799e2bdf82b502a64c26d390103b9b4363c0785d4f1a075d364b27d3a209f6246b9a2e82c65e82ffa2c55507229d4ac2ffa905050784a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/te/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/te/firefox-64.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3c350590828689d9e7d8cf7a70c4573192d05e1df9f8c577f7613347b55b7612c0ef2e1152f0de5be1beb4f7fa8e23415bd99a2a5fd81b4d60c9e2e05b9f8f09";
+      sha512 = "2c41381d816aaf7782a6a0ff3b15a12a1f82aa6673e6d18d9685340eb0ebea20db8bf1596fe0000e8666c97b464aff76962dfa889fd0c71443147fba74ef549b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/th/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/th/firefox-64.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f9bb79c836e3fad0d29ee5f17e5753af8fd81bfc53bd29e80fbda7e6d643e913b1be3ce86eb7ec79e4547cf1512c6c58769c3c13480e78b26947a85588235b61";
+      sha512 = "532b0db2482445312d726237d44982eeb94378ce5e3e6a779f97f551b85016394b97b683feb168917eb43f987ad47d7b8249b68716cce0c8b66f8b8be644108a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/tr/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/tr/firefox-64.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "9996bef2a7aca694cb670650b84e27d593dd107293e51c392466c5d688f11cffd4511b1086d0014966d7d53849c83301d3250e021d7f95545f10ba681c01f434";
+      sha512 = "37eedff76225ccf7485516da0061b6c48e4e5696e8d6d2179718adfd2c1e4070c338773bddd176b8dc62ad8cddba2445be4b2e59bfb6c372d11d1b65d0b7a0df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/uk/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/uk/firefox-64.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "5310d6f1350a6b553f3093b2a3e8b9267bd866aabcfa43c3dde0af7f0b7e2314d49ac828c5f457a71dab93b7db3e042d9b8a662a7cc1960b992657bd0b4807da";
+      sha512 = "d3a010bbe98c8fb16d3bb89e0f7ed8f18d61c995f0fed28051de798e0f89ec864766ee75a51c1c2a3f82bf7d0c5b8f4e89c2751c4d4a96e145fb7ceef1852799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/ur/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/ur/firefox-64.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "682beaffb5f7c378ce73ed0b1d2b71977d4c4d9c676aa18e6db49d8667e614e839b51b77a70db08d2fa8f76bbf4f657459fbafdd27d571a4f499184d482a2ace";
+      sha512 = "721d2cc23eccca01fbb2ffc5dafeae516d295328785fa50c0cc279b9786914b21b68488174a6c91e1bdd906dbd08ea70d359d8130dd1559738f6c18346a8329a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/uz/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/uz/firefox-64.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "28ce6fae535c55052c8e35138f4a65d82b68538cd711afdcda87edfd741435ce259fc333015a5185a9cf4e93aeb8ffee3ff3e0a7790e69bcb25ba4d1a8c65b56";
+      sha512 = "558edf58991a72fbdbd8861a19a2d0bd3e4dcbbb2c9de6a190042d516baf38796dcceb7fcb75b87fa0d184d1a7129e645f0993ee2150527ec61cd930fc1683b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/vi/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/vi/firefox-64.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "88de4e5dfd4458984d3e5bcde90cde378fe5751358c96195260ee556f6d74f9f117933cf58ed112ab4d5967ecf1302ab446467030d87750abdc8035194a32257";
+      sha512 = "f4a119b311a55d2eb8439731b96676e5e840381e79f36ad3239fe1d4802bc61b2750447f70fbcd089e2d58c3b5bb923da38e7c0905ec5c55030b9e3be434e7ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/xh/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/xh/firefox-64.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "735c9ec6d8737ec719b2402bb19ae5c08b35ecc3ebbbfa9c329c3cb86f98abb2d556a2695ad6507b3f0d09833b5acfc1ba604b34d66f744c12c4c1bf5c6bd300";
+      sha512 = "a3b6f6d0d2e6c3f6be3defa1283a4e4857a337b2c195de5583c8ef46a73ab1c0b3a6c1619c8370aef238ebee9f0b6a817e08c8fd35affddbc0a8b657e65df413";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/zh-CN/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/zh-CN/firefox-64.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7dad35201518a38e2e438fb110b0e70f72b285dba5d2434020a1e75ad95e9e42e794cff3f2c991c640c9e19683075285ec5aec70fb7737ae2309d85a9f7e5a92";
+      sha512 = "c37d51b46139f9d5fda1cecbe6a816a7e01ea00db72df780db3b0c305a078c4525825352eb31e4fa389fc3cd98880ea1a915b96e9f11e06b04040d718dd29e39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0.3/linux-i686/zh-TW/firefox-63.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0/linux-i686/zh-TW/firefox-64.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "092c048c5cb2dc7b80db629f937095dfcfa63ebfce4b1a2a8acdddeac7b14c2b07e965d3b28a35ca9a471a8b6667eadfedba33dd3aa824cf061b94cec733191e";
+      sha512 = "b89684613a006d59b1143d6070476d99190e86b9e2ec51c575d71a3f95163978b85a9c293d736fea4654f7ba8427e2b7a1b671aba860e5f736cef7e812241a09";
     }
     ];
 }

From ad3e9191d16722ea3eec32f4cd689eea730f39f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Dec 2018 00:20:52 +0100
Subject: [PATCH 1733/2793] nixos/nvidia: improve the assertion again

/cc ac19d5e34 #51836.
---
 nixos/modules/hardware/video/nvidia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index efc65a55af7..8f1e2671ece 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -101,7 +101,7 @@ in
   config = mkIf enabled {
     assertions = [
       {
-        assertion = !config.services.xserver.displayManager.gdm.wayland;
+        assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
         message = "NVIDIA drivers don't support wayland";
       }
       {

From 328fbcff60e9d6838d16b4228ed84d94d35cc18d Mon Sep 17 00:00:00 2001
From: Etienne Laurin <etienne@atnnn.com>
Date: Tue, 11 Dec 2018 20:20:29 +0000
Subject: [PATCH 1734/2793] ikos: init at 2.1

---
 lib/licenses.nix                              |  6 ++++
 maintainers/maintainer-list.nix               |  5 +++
 .../tools/analysis/ikos/default.nix           | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/ikos/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index ed91b5adedb..5ef60b51063 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -505,6 +505,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  nasa13 = spdx {
+    spdxId = "NASA-1.3";
+    fullName = "NASA Open Source Agreement 1.3";
+    free = false;
+  };
+
   ncsa = spdx {
     spdxId = "NCSA";
     fullName  = "University of Illinois/NCSA Open Source License";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 93f035447a3..fd6d2efa7d8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -401,6 +401,11 @@
     github = "aszlig";
     name = "aszlig";
   };
+  atnnn = {
+    email = "etienne@atnnn.com";
+    github = "atnnn";
+    name = "Etienne Laurin";
+  };
   auntie = {
     email = "auntieNeo@gmail.com";
     github = "auntie";
diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix
new file mode 100644
index 00000000000..6f3df32f3c0
--- /dev/null
+++ b/pkgs/development/tools/analysis/ikos/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, cmake, boost
+, gmp, llvm, clang, sqlite, python3
+, ocamlPackages, mpfr, ppl, doxygen, graphviz
+}:
+
+let
+  python = python3.withPackages (ps: with ps; [
+    pygments
+  ]);
+in
+
+stdenv.mkDerivation rec {
+  name = "ikos";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "NASA-SW-VnV";
+    repo = name;
+    rev = "v${version}";
+    sha256 = "09nf47hpk5w5az4c0hcr5hhwvpz8zg1byyg185542cpzbq1xj8cb";
+  };
+
+  buildInputs = [ cmake boost gmp clang llvm sqlite python
+                  ocamlPackages.apron mpfr ppl doxygen graphviz ];
+
+  cmakeFlags = "-DAPRON_ROOT=${ocamlPackages.apron}";
+
+  postBuild = "make doc";
+
+  meta = with lib; {
+    homepage = https://github.com/NASA-SW-VnV/ikos;
+    description = "Static analyzer for C/C++ based on the theory of Abstract Interpretation";
+    license = licenses.nasa13;
+    maintainers = with maintainers; [ atnnn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64ef63f55ab..5300a80413d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8713,6 +8713,10 @@ in
     inherit (perlPackages) XMLSimple;
   };
 
+  ikos = callPackage ../development/tools/analysis/ikos {
+    inherit (llvmPackages_7) stdenv clang llvm;
+  };
+
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
     llvmPackages = llvmPackages_6;
   };

From aba51b8ae4687f6f6380a009fc0caa9b90e99246 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Wed, 12 Dec 2018 10:38:18 +0900
Subject: [PATCH 1735/2793] bluez: Add support for the sixaxis controller

This should add support for the Playstation Dualshock 3 and DualShock 4
controllers.
---
 pkgs/os-specific/linux/bluez/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 3882a742586..a917175b90c 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
-  python3, readline, udev, libical,
-  systemd, enableWiimote ? false, enableMidi ? false }:
+  python3, readline, udev, libical, systemd,
+  enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:
 
 stdenv.mkDerivation rec {
   name = "bluez-5.50";
@@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
     "--with-systemduserunitdir=$(out)/etc/systemd/user"
     "--with-udevdir=$(out)/lib/udev"
     ] ++ optional enableWiimote [ "--enable-wiimote" ]
-      ++ optional enableMidi    [ "--enable-midi" ]);
+      ++ optional enableMidi    [ "--enable-midi" ]
+      ++ optional enableSixaxis [ "--enable-sixaxis" ]);
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";

From da84602f616f51cb04ff9b416dc821f036b00a2b Mon Sep 17 00:00:00 2001
From: Darius Jahandarie <djahandarie@gmail.com>
Date: Tue, 11 Dec 2018 15:53:20 -0500
Subject: [PATCH 1736/2793] buildRustCrate: fix extraRustcOpts so it is not
 discarded

---
 pkgs/build-support/rust/build-rust-crate/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index ec11472bbae..dbb2f1b80cc 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -75,6 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
     ];
     extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
     buildInputs_ = buildInputs;
+    extraRustcOpts_ = extraRustcOpts;
 in
 stdenv.mkDerivation (rec {
 
@@ -141,7 +142,7 @@ stdenv.mkDerivation (rec {
               extraLinkFlags
               crateAuthors verbose colors target_os;
     };
-    extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
+    extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_;
     buildPhase = buildCrate {
       inherit crateName dependencies
               crateFeatures libName release libPath crateType

From 935810e0f3182e80be9da6241d7208f0a7fc2e2a Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 12 Dec 2018 14:47:39 +0700
Subject: [PATCH 1737/2793] luigi: include boto3

A number of luigi modules use boto3 to access AWS and will not work
without it.
---
 pkgs/applications/networking/cluster/luigi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index 35721208a6e..7e1fb6cf9c8 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
     sed -i 's/<2.2.0//' setup.py
   '';
 
-  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
+  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon boto3 ];
 
   # Requires tox, hadoop, and google cloud
   doCheck = false;

From c17ed110ebaf0ed7e4ffdc65b97decb56322c91c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Dec 2018 03:08:56 -0500
Subject: [PATCH 1738/2793] lollypop: don't use pythonPath

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

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index df43e5ed3b3..a268c155a0f 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,8 +4,8 @@
 , gobject-introspection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
+  pname = "lollypop";
   version = "0.9.611";
-  name = "lollypop-${version}";
 
   format = "other";
   doCheck = false;
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec  {
     libsoup
   ];
 
-  pythonPath = with python3.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
     beautifulsoup4
     gst-python
     pillow
@@ -56,15 +56,15 @@ python3.pkgs.buildPythonApplication rec  {
   '';
 
   preFixup = ''
-    buildPythonPath "$out/libexec/lollypop-sp $pythonPath"
+    buildPythonPath "$out $propagatedBuildInputs"
     patchPythonScript "$out/libexec/lollypop-sp"
   '';
 
   meta = with stdenv.lib; {
     description = "A modern music player for GNOME";
-    homepage    = https://wiki.gnome.org/Apps/Lollypop;
-    license     = licenses.gpl3Plus;
+    homepage = https://wiki.gnome.org/Apps/Lollypop;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }

From af2caa441fa629d221da3c45d5067113de80e686 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Dec 2018 03:12:22 -0500
Subject: [PATCH 1739/2793] eolie: don't use pythonPath

---
 .../applications/networking/browsers/eolie/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 3e6b9fce6d0..80e0f4742ec 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -4,7 +4,7 @@
 , gobject-introspection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec {
-  name = "eolie-${version}";
+  pname = "eolie";
   version = "0.9.45";
 
   format = "other";
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec {
     webkitgtk
   ];
 
-  pythonPath = with python3.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
     beautifulsoup4
     pycairo
     pygobject3
@@ -53,9 +53,9 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A new GNOME web browser";
-    homepage    = https://wiki.gnome.org/Apps/Eolie;
-    license     = licenses.gpl3Plus;
+    homepage = https://wiki.gnome.org/Apps/Eolie;
+    license  = licenses.gpl3Plus;
     maintainers = with maintainers; [ samdroid-apps worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 0c4ac2fa26a136498dd7c8f2b4061e602183b04b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Dec 2018 03:28:59 -0500
Subject: [PATCH 1740/2793] eolie: ensure search provider is wrapped properly

wrapPythonPrograms ignores libexec/
Also do it before wrapGAppsHook sets in
---
 pkgs/applications/networking/browsers/eolie/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 80e0f4742ec..12a6c64c7ae 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -51,6 +51,11 @@ python3.pkgs.buildPythonApplication rec {
     patchShebangs meson_post_install.py
   '';
 
+  preFixup = ''
+    buildPythonPath "$out $propagatedBuildInputs"
+    patchPythonScript "$out/libexec/eolie-sp"
+  '';
+
   meta = with stdenv.lib; {
     description = "A new GNOME web browser";
     homepage = https://wiki.gnome.org/Apps/Eolie;

From a84a457f62a86fdc317c9feec50e31c11309c04c Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 12 Dec 2018 16:12:54 +0700
Subject: [PATCH 1741/2793] luigi: enable local modules discovery

Currently, local module discovery is broken with luigi installed from
this derivation.

In the documentation, you can see the following command line syntax
used:

```
luigi --module module_name ...
```

However, currently this will result in an error:

```
ModuleNotFoundError: No module named 'module_name'
```

However, if the call is prepended with this:

```
PYTHONPATH=.:$PYTHONPATH
```

then it will work as expected.

This patch makes this the default behaviour.
---
 pkgs/applications/networking/cluster/luigi/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index 3a0164edeb0..eea992bc34c 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec {
   # Requires tox, hadoop, and google cloud
   doCheck = false;
 
+  # This enables accessing modules stored in cwd
+  makeWrapperArgs = ["--prefix PYTHONPATH . :"];
+
   meta = with lib; {
     homepage = https://github.com/spotify/luigi;
     description = "Python package that helps you build complex pipelines of batch jobs";

From 47c4876de6a25a0a24b9cd85fb8ac49665c9c945 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Dec 2018 09:31:29 +0000
Subject: [PATCH 1742/2793] ocamlPackages.ppx_deriving_yojson: disable tests

---
 .../ocaml-modules/ppx_deriving_yojson/default.nix          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index fb06fd7f935..26fa24d8dc0 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo
-, ppx_import, ppx_deriving, yojson, ounit
+, ppx_deriving, yojson, ounit
 }:
 
 stdenv.mkDerivation rec {
@@ -13,15 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_import ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
 
   propagatedBuildInputs = [ ppx_deriving yojson ];
 
   inherit (topkg) installPhase;
 
-  doCheck = true;
-  checkTarget = "test";
-
   meta = {
     description = "A Yojson codec generator for OCaml >= 4.02.";
     inherit (src.meta) homepage;

From ee843ee86e1f2bd3c48c81692076325cc8a37432 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Dec 2018 09:31:47 +0000
Subject: [PATCH 1743/2793] ocamlPackages.ppx_import: 1.5 -> 1.5-3

---
 .../ocaml-modules/ppx_import/default.nix      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index ffac74de4ed..bdcc6568ffe 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,34 +1,31 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline
-, cppo, ounit, ppx_deriving
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
+, ounit, ppx_deriving, ppx_tools_versioned
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.04"
 then throw "ppx_import is not available for OCaml ${ocaml.version}"
 else
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-ppx_import-${version}";
-
-  version = "1.5";
+buildDunePackage rec {
+  pname = "ppx_import";
+  version = "1.5-3";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_import";
-    rev = "v${version}";
-    sha256 = "1lf5lfp6bl5g4gdszaa6k6pkyh3qyhbarg5m1j0ai3i8zh5qg09d";
+    rev = "bd627d5afee597589761d6fee30359300b5e1d80";
+    sha256 = "1f9bphif1izhyx72hvwpkd9kxi9lfvygaicy6nbxyp6qgc87z4nm";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_deriving opaline ];
+  buildInputs = [ ounit ppx_deriving ];
+  propagatedBuildInputs = [ ppx_tools_versioned ];
 
   doCheck = true;
   checkTarget = "test";
 
-  installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
-
-  meta = with stdenv.lib; {
+  meta = {
     description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
-    license = licenses.mit;
-    inherit (ocaml.meta) platforms;
+    license = lib.licenses.mit;
     inherit (src.meta) homepage;
   };
 }

From ccd160023ca51df359e7163790d6511377d86262 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 11 Dec 2018 10:38:35 +0100
Subject: [PATCH 1744/2793] firefox: 63.0.3 -> 64.0

See #51863.
---
 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 8bf6bb2069f..31d6139f324 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -14,10 +14,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    ffversion = "63.0.3";
+    ffversion = "64.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "319bdkvk1r53i8l9ilz9ffllp2yxn02glhjsf26bqchw0c4ym8y6d62j1g7s55lddzqka3kcsmzba0k8wna1aw3pydf7v84nyhaw1bc";
+      sha512 = "10zbzwpdadj3ap2z66d0bz8l11qkgzlzd22nj7n3k2bzy7rd0m6cfznd9d4mgyl4ivxjv6wz8pasvacrala2dr0m78ysxiz2fpvrahs";
     };
 
     patches = nixpkgsPatches ++ [

From 125ad34dc8f452ca43dfbb958fbc2e686df3fb69 Mon Sep 17 00:00:00 2001
From: David McKay <rawkode@pm.me>
Date: Wed, 12 Dec 2018 11:25:45 +0000
Subject: [PATCH 1745/2793] lxrandr: init at 0.3.1

---
 pkgs/desktops/lxde/core/lxrandr/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/lxde/core/lxrandr/default.nix

diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix
new file mode 100644
index 00000000000..49a71987e75
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxrandr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "lxrandr-0.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e";
+  };
+
+  configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ];
+
+  meta = with stdenv.lib; {
+    description = "LXRandR is the standard screen manager of LXDE.";
+    homepage = https://lxde.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with maintainers; [ rawkode ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b63bd55e4c..ea349992fe4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7723,6 +7723,8 @@ in
 
   lxtask = callPackage ../desktops/lxde/core/lxtask { };
 
+  lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
+
   kona = callPackage ../development/interpreters/kona {};
 
   lolcode = callPackage ../development/interpreters/lolcode { };

From e12009f390d368c83635ccf32cf918ba1c69b099 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 1746/2793] tdesktop: 1.4.3 -> 1.5.1

tdesktopPackages.preview: 1.4.8 -> 1.5.1
---
 .../telegram/tdesktop/default.nix             | 10 ++++-----
 .../telegram/tdesktop/generic.nix             | 21 +++++--------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 6953b3bc6e8..7a9bef45b25 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,17 +4,15 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.4.3";
-    sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8";
+    version = "1.5.1";
+    sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "388730";
-    archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7";
+    archPatchesRevision = "415526";
+    archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
   };
 in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
-    version = "1.4.8";
-    sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
     stable = false;
   });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 900e0980e74..302eb975d81 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -8,15 +8,7 @@
 
 with lib;
 
-let
-  # TODO: Not optimal (maybe we should only package the stable versions)
-  previewPatches = fetchFromGitHub {
-    owner = "primeos";
-    repo = "nixpkgs-tdesktop-patches";
-    rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6";
-    sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9";
-  };
-in mkDerivation rec {
+mkDerivation rec {
   name = "telegram-desktop-${version}";
   inherit version;
 
@@ -37,10 +29,7 @@ in mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches =
-    (if stable
-      then [ "${archPatches}/tdesktop.patch" ]
-      else [ "${previewPatches}/tdesktop.patch" ])
+  patches = [ "${archPatches}/tdesktop.patch" ]
     # TODO: Only required to work around a compiler bug.
     # This should be fixed in GCC 7.3.1 (or later?)
     ++ [ ./fix-internal-compiler-error.patch ];
@@ -109,9 +98,9 @@ in mkDerivation rec {
     sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \
       -e "/-msse2/d"
 
-    gyp ${lib.optionalString (!stable) ''
-        -Dapi_id=17349 \
-        -Dapi_hash=344583e45741c457fe1862106095a5eb ''}\
+    gyp \
+      -Dapi_id=17349 \
+      -Dapi_hash=344583e45741c457fe1862106095a5eb \
       -Dbuild_defines=${GYP_DEFINES} \
       -Gconfig=Release \
       --depth=Telegram/gyp \

From 6aa42941dc921d44cd4b9f913ef65bb5adeb76e4 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 12 Dec 2018 15:04:24 +0300
Subject: [PATCH 1747/2793] mysql55: 5.5.60 -> 5.5.62

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 36f5200d43b..449872bdc7f 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -6,11 +6,11 @@
 let
 self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.60";
+  version = "5.5.62";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3";
+    sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi";
   };
 
   patches = if stdenv.isCygwin then [

From 890bee19c5e20ddfc17e2303125986a4d03a961a Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 12 Dec 2018 13:30:52 +0100
Subject: [PATCH 1748/2793] pythonPackages.gpgme: support python 3

---
 pkgs/top-level/python-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da5fa4dd102..22553b6a4da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2570,7 +2570,10 @@ in {
 
   google_resumable_media = callPackage ../development/python-modules/google_resumable_media { };
 
-  gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; });
+  gpgme = toPythonModule (pkgs.gpgme.override {
+    pythonSupport = true;
+    inherit python;
+  });
 
   gphoto2 = callPackage ../development/python-modules/gphoto2 {
     inherit (pkgs) pkgconfig;

From a9d7a31817594d0725616a32a4faabce73e31d5b Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 12 Dec 2018 13:31:32 +0100
Subject: [PATCH 1749/2793] alot: 0.7 -> 0.8

---
 pkgs/development/python-modules/alot/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 7c4e15f8568..78e924e9753 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -7,16 +7,16 @@
 
 buildPythonPackage rec {
   pname = "alot";
-  version = "0.7";
+  version = "0.8";
   outputs = [ "out" ] ++ lib.optional withManpage "man";
 
-  disabled = isPy3k;
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "alot";
     rev = "${version}";
-    sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi";
+    sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9";
   };
 
   nativeBuildInputs = lib.optional withManpage sphinx;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index add885c573c..c4dc2b5d693 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15869,7 +15869,7 @@ in
 
   alock = callPackage ../misc/screensavers/alock { };
 
-  inherit (python2Packages) alot;
+  inherit (python3Packages) alot;
 
   alpine = callPackage ../applications/networking/mailreaders/alpine {
     tcl = tcl-8_5;

From c556e6f1f401f49067eb048d133d9e2c28f50561 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 12 Dec 2018 13:31:44 +0100
Subject: [PATCH 1750/2793] notmuch: use python 3

Fixes #51822
---
 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 c4dc2b5d693..d54c9d0dd42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18444,6 +18444,7 @@ in
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     gmime = gmime3;
+    pythonPackages = python3Packages;
   };
 
   notejot = callPackage ../applications/misc/notejot { };

From f9b07819389b631f5ea2c1daa2baf84fa0d30947 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 12 Dec 2018 13:00:07 +0000
Subject: [PATCH 1751/2793] doh-proxy: stick with Python 3.6 for now

It currently breaks on Python 3.7 due to `async` becoming a reserved keyword
---
 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 d54c9d0dd42..b6e10ef78c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13395,7 +13395,9 @@ in
 
   dex-oidc = callPackage ../servers/dex { };
 
-  doh-proxy = callPackage ../servers/dns/doh-proxy { };
+  doh-proxy = callPackage ../servers/dns/doh-proxy {
+    python3Packages = python36Packages;
+  };
 
   dgraph = callPackage ../servers/dgraph { };
 

From a166bc33cc5f545f9ac098d974ad22e98d721c11 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Thu, 6 Dec 2018 15:58:27 +0000
Subject: [PATCH 1752/2793] cool-retro-term: add symlink to binary on darwin

---
 pkgs/applications/misc/cool-retro-term/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index c9cc2d6db42..deacdf4c11e 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     mv $out/usr/share $out/share
     mv $out/usr/bin $out/bin
     rmdir $out/usr
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
   '';
 
   enableParallelBuilding = true;
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/Swordfish90/cool-retro-term;
     license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
 }

From b2cbbb32ac94bc1ca44c510f1cd044325e0f92a5 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Thu, 6 Dec 2018 15:59:25 +0000
Subject: [PATCH 1753/2793] qmltermwidget: update to latest master to fix
 cool-retro-term on darwin

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

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 26386e0c42c..d73211fc486 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "qmltermwidget";
     owner = "Swordfish90";
-    rev = "v${version}";
-    sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
+    rev = "48274c75660e28d44af7c195e79accdf1bd44963";
+    sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6";
   };
 
   buildInputs = [ qtbase qtquick1 qtmultimedia ]

From 7f82302b8ee76085e6270e5f6ccb9783cb90752a Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Wed, 12 Dec 2018 09:55:06 +0000
Subject: [PATCH 1754/2793] address pr comments

---
 pkgs/applications/misc/cool-retro-term/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index deacdf4c11e..1c2045f4141 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget,
-qtquickcontrols, qtgraphicaleffects, qmake }:
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget
+, qtquickcontrols, qtgraphicaleffects, qmake }:
 
 stdenv.mkDerivation rec {
   version = "1.0.1";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       eye-candy, customizable, and reasonably lightweight.
     '';
     homepage = https://github.com/Swordfish90/cool-retro-term;
-    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };

From 5cbd18af4ea2b111fb307c120b7e81d2512dcef9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 12 Dec 2018 11:42:15 +0100
Subject: [PATCH 1755/2793] strip-nondeterminism: 0.016 -> 1.0.0

Add to toplevel as well.
---
 pkgs/top-level/all-packages.nix  |  2 ++
 pkgs/top-level/perl-packages.nix | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6e10ef78c2..f7aa9269b3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5540,6 +5540,8 @@ in
 
   sstp = callPackage ../tools/networking/sstp {};
 
+  strip-nondeterminism = perlPackages.strip-nondeterminism;
+
   structure-synth = callPackage ../tools/graphics/structure-synth { };
 
   su-exec = callPackage ../tools/security/su-exec {};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74e9e60a0f8..26f811bfb33 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14109,6 +14109,39 @@ let
     buildInputs = [ TestToolbox ];
   };
 
+  strip-nondeterminism = buildPerlPackage rec {
+    name = "strip-nondeterminism-${version}";
+    version = "1.0.0";
+
+    outputs = [ "out" "dev" ]; # no "devdoc"
+
+    src = pkgs.fetchFromGitLab {
+      owner = "reproducible-builds";
+      repo = "strip-nondeterminism";
+      domain = "salsa.debian.org";
+      rev = version;
+      sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64";
+    };
+
+    # stray test failure
+    doCheck = false;
+
+    buildInputs = [ ArchiveZip ArchiveCpio pkgs.file ];
+
+    perlPostHook = ''
+      # we don’t need the debhelper script
+      rm $out/bin/dh_strip_nondeterminism
+      rm $out/share/man/man1/dh_strip_nondeterminism.1.gz
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A Perl module for stripping bits of non-deterministic information";
+      license = licenses.gpl3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ pSub ];
+    };
+  };
+
   SubExporter = buildPerlPackage {
     name = "Sub-Exporter-0.987";
     src = fetchurl {

From e8ef485246c9ef4cf4f4d00e69d21fd9ec7f4d08 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 12 Dec 2018 14:39:50 +0100
Subject: [PATCH 1756/2793] gnomeExtensions.topicons-plus: 21 -> 22

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

diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index f9c45f45ea4..9a151a6ac8f 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-topicons-plus-${version}";
-  version = "21";
+  version = "22";
 
   src = fetchFromGitHub {
     owner = "phocean";
     repo = "TopIcons-plus";
     rev = "v${version}";
-    sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3";
+    sha256 = "196s1gdir52gbc444pzrb5l7gn5xr5vqk5ajqaiqryqlmp3i8vil";
   };
 
   buildInputs = [ glib ];

From eb880051300257cc1e465cbb8042d6e65caf67d6 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Tue, 13 Nov 2018 17:06:03 +0100
Subject: [PATCH 1757/2793] nixos/systemd: Add a regression test for #50273

---
 nixos/tests/systemd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 65aa553b314..4d470126abe 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -56,6 +56,11 @@ import ./make-test.nix {
       $machine->succeed('test -z $(ls -1 /var/log/journal)');
     };
 
+    # Regression test for https://github.com/NixOS/nixpkgs/issues/50273
+    subtest "DynamicUser actually allocates a user", sub {
+        $machine->succeed('systemd-run --pty --property=Type=oneshot --property=DynamicUser=yes --property=User=iamatest whoami | grep iamatest');
+    };
+
     # Regression test for https://github.com/NixOS/nixpkgs/issues/35268
     subtest "file system with x-initrd.mount is not unmounted", sub {
       $machine->shutdown;

From e71241793671c11498c388bde8a3de2d89fde25e Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Tue, 13 Nov 2018 16:28:37 +0100
Subject: [PATCH 1758/2793] nixos/nscd: Disable caching of group and passwd

Systemd provides an option for allocating DynamicUsers
which we want to use in NixOS to harden service configuration.
However, we discovered that the user wasn't allocated properly
for services. After some digging this turned out to be, of course,
a cache inconsistency problem.

When a DynamicUser creation is performed, Systemd check beforehand
whether the requested user already exists statically. If it does,
it bails out. If it doesn't, systemd continues with allocating the
user.

However, by checking whether the user exists,  nscd will store
the fact that the user does not exist in it's negative cache.
When the service tries to lookup what user is associated to its
uid (By calling whoami, for example), it will try to consult
libnss_systemd.so However this will read from the cache and tell
report that the user doesn't exist, and thus will return that
there is no user associated with the uid. It will continue
to do so for the cache duration time.  If the service
doesn't immediately looks up its username, this bug is not
triggered, as the cache will be invalidated around this time.
However, if the service is quick enough, it might end up
in a situation where it's incorrectly reported that the
user doesn't exist.

Preferably, we would not be using nscd at all. But we need to
use it because glibc reads  nss modules from /etc/nsswitch.conf
by looking relative to the global LD_LIBRARY_PATH.  Because LD_LIBRARY_PATH
is not set globally (as that would lead to impurities and ABI issues),
glibc will fail to find any nss modules.
Instead, as a hack, we start up nscd with LD_LIBRARY_PATH set
for only that service. Glibc will forward all nss syscalls to
nscd, which will then respect the LD_LIBRARY_PATH and only
read from locations specified in the NixOS config.
we can load nss modules in a pure fashion.

However, I think by accident, we just copied over the default
settings of nscd, which actually caches user and group lookups.
We already disable this when sssd is enabled, as this interferes
with the correct working of libnss_sss.so as it already
does its own caching of LDAP requests.
(See https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/deployment_guide/usingnscd-sssd)

Because nscd caching is now also interferring with libnss_systemd.so
and probably also with other nsss modules, lets just pre-emptively
disable caching for now for all options related to users and groups,
but keep it for caching hosts ans services lookups.

Note that we can not just put in /etc/nscd.conf:
enable-cache passwd no

As this will actually cause glibc to _not_ forward the call to nscd
at all, and thus never reach the nss modules. Instead we set
the negative and positive cache ttls  to 0 seconds as a workaround.
This way, Glibc will always forward requests to nscd, but results
will never be cached.

Fixes #50273
---
 nixos/modules/services/system/nscd.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index 6d0dcacf977..27599a08e7e 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -4,16 +4,16 @@ paranoia                no
 debug-level             0
 
 enable-cache            passwd          yes
-positive-time-to-live   passwd          600
-negative-time-to-live   passwd          20
+positive-time-to-live   passwd          0
+negative-time-to-live   passwd          0
 suggested-size          passwd          211
 check-files             passwd          yes
 persistent              passwd          no
 shared                  passwd          yes
 
 enable-cache            group           yes
-positive-time-to-live   group           3600
-negative-time-to-live   group           60
+positive-time-to-live   group           0
+negative-time-to-live   group           0
 suggested-size          group           211
 check-files             group           yes
 persistent              group           no

From 99d32799520366422b169438cd990fb133d847d4 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Wed, 14 Nov 2018 12:19:58 +0100
Subject: [PATCH 1759/2793] nixos/nscd: Disable negative caching of hosts

Hopefully fixes #50290
---
 nixos/modules/services/system/nscd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index 27599a08e7e..e860e153965 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -21,7 +21,7 @@ shared                  group           yes
 
 enable-cache            hosts           yes
 positive-time-to-live   hosts           600
-negative-time-to-live   hosts           5
+negative-time-to-live   hosts           0
 suggested-size          hosts           211
 check-files             hosts           yes
 persistent              hosts           no

From 335b41b3fbf1191e9310dc2717a68df2b0759b76 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Wed, 14 Nov 2018 13:03:13 +0100
Subject: [PATCH 1760/2793] nixos/nscd: Add release note entry about nscd
 changes

---
 nixos/doc/manual/release-notes/rl-1903.xml | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index bade93c0984..975c566411c 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -245,6 +245,66 @@
      options.
    </para>
   </listitem>
+  <listitem>
+   <para>
+     The <literal>nscd</literal> now disables all caching of
+     <literal>passwd</literal> and <literal>group</literal> databases by
+     default. This was interferring with the correct functioning of the
+     <literal>libnss_systemd.so</literal> module which is used by
+     <literal>systemd</literal> to manage uids and usernames in the presence
+     of <literal>DynamicUser=</literal> in systemd services.
+     The was already the default behaviour in presence of
+     <literal>services.sssd.enable = true</literal> because nscd caching
+     would interfere sssd in unpredictable ways as well.Because we're using nscd
+     not for caching, but for convincing glibc to find NSS modules in the
+     nix store instead of an absolute path, we have decided to disable
+     caching globally now, as it's usually not the behaviour the user wants
+     and can lead to surprising behaviour.
+     Furthermore, negative caching of host lookups is also disabled now by
+     default. This should fix the issue of dns lookups failing in the
+     presence of an unreliable network.
+   </para>
+   <para>
+     If the old behaviour is desired, this can be restored by setting
+     the <literal>services.nscd.config</literal> option
+     with the desired caching parameters.
+     <programlisting>
+     services.nscd.config =
+     ''
+     server-user             nscd
+     threads                 1
+     paranoia                no
+     debug-level             0
+
+     enable-cache            passwd          yes
+     positive-time-to-live   passwd          600
+     negative-time-to-live   passwd          20
+     suggested-size          passwd          211
+     check-files             passwd          yes
+     persistent              passwd          no
+     shared                  passwd          yes
+
+     enable-cache            group           yes
+     positive-time-to-live   group           3600
+     negative-time-to-live   group           60
+     suggested-size          group           211
+     check-files             group           yes
+     persistent              group           no
+     shared                  group           yes
+
+     enable-cache            hosts           yes
+     positive-time-to-live   hosts           600
+     negative-time-to-live   hosts           5
+     suggested-size          hosts           211
+     check-files             hosts           yes
+     persistent              hosts           no
+     shared                  hosts           yes
+     '';
+     </programlisting>
+     See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link>
+     for details.
+   </para>
+  </listitem>
   <listitem>
    <para>
      GitLab Shell previously used the nix store paths for the

From de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 16 Nov 2018 15:03:00 +0100
Subject: [PATCH 1761/2793] nixos/nscd: Merge nscd and sssd-nscd config

---
 nixos/modules/services/misc/nscd-sssd.conf | 36 ----------------------
 nixos/modules/services/misc/sssd.nix       |  1 -
 nixos/modules/services/system/nscd.conf    |  8 +++++
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 nixos/modules/services/misc/nscd-sssd.conf

diff --git a/nixos/modules/services/misc/nscd-sssd.conf b/nixos/modules/services/misc/nscd-sssd.conf
deleted file mode 100644
index 92380f3e4ba..00000000000
--- a/nixos/modules/services/misc/nscd-sssd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-server-user             nscd
-threads                 1
-paranoia                no
-debug-level             0
-
-enable-cache            passwd          yes
-positive-time-to-live   passwd          0
-negative-time-to-live   passwd          0
-suggested-size          passwd          211
-check-files             passwd          yes
-persistent              passwd          no
-shared                  passwd          yes
-
-enable-cache            group           yes
-positive-time-to-live   group           0
-negative-time-to-live   group           0
-suggested-size          group           211
-check-files             group           yes
-persistent              group           no
-shared                  group           yes
-
-enable-cache            hosts           yes
-positive-time-to-live   hosts           600
-negative-time-to-live   hosts           5
-suggested-size          hosts           211
-check-files             hosts           yes
-persistent              hosts           no
-shared                  hosts           yes
-
-enable-cache            services        yes
-positive-time-to-live   services        0
-negative-time-to-live   services        0
-suggested-size          services        211
-check-files             services        yes
-persistent              services        no
-shared                  services        yes
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index e818f4a4804..fe472a6c68e 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -75,7 +75,6 @@ in {
       };
 
       system.nssModules = optional cfg.enable pkgs.sssd;
-      services.nscd.config = builtins.readFile ./nscd-sssd.conf;
       services.dbus.packages = [ pkgs.sssd ];
     })
 
diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index e860e153965..304be0942dc 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -26,3 +26,11 @@ suggested-size          hosts           211
 check-files             hosts           yes
 persistent              hosts           no
 shared                  hosts           yes
+
+enable-cache            services        yes
+positive-time-to-live   services        0
+negative-time-to-live   services        0
+suggested-size          services        211
+check-files             services        yes
+persistent              services        no
+shared                  services        yes

From a74619c1ae5348a5b7cd0dc3b6ca6e0166086098 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 16 Nov 2018 15:08:01 +0100
Subject: [PATCH 1762/2793] nixos/nscd: also add netgroup to the config

It was the last database that wasn't listed.
---
 nixos/modules/services/system/nscd.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index 304be0942dc..ce583816e15 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -19,6 +19,14 @@ check-files             group           yes
 persistent              group           no
 shared                  group           yes
 
+enable-cache            netgroup        yes
+positive-time-to-live   netgroup        0
+negative-time-to-live   netgroup        0
+suggested-size          netgroup        211
+check-files             netgroup        yes
+persistent              netgroup        no
+shared                  netgroup        yes
+
 enable-cache            hosts           yes
 positive-time-to-live   hosts           600
 negative-time-to-live   hosts           0

From ef6ed03e2f7e757a46469077d8ef66cecccb919d Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Wed, 12 Dec 2018 14:49:19 +0100
Subject: [PATCH 1763/2793] nixos/nscd: Address doc feedback

---
 nixos/doc/manual/release-notes/rl-1903.xml | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 975c566411c..9405bf063d5 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -247,22 +247,21 @@
   </listitem>
   <listitem>
    <para>
-     The <literal>nscd</literal> now disables all caching of
+     The <literal>nscd</literal> service now disables all caching of
      <literal>passwd</literal> and <literal>group</literal> databases by
      default. This was interferring with the correct functioning of the
      <literal>libnss_systemd.so</literal> module which is used by
-     <literal>systemd</literal> to manage uids and usernames in the presence
-     of <literal>DynamicUser=</literal> in systemd services.
-     The was already the default behaviour in presence of
-     <literal>services.sssd.enable = true</literal> because nscd caching
-     would interfere sssd in unpredictable ways as well.Because we're using nscd
-     not for caching, but for convincing glibc to find NSS modules in the
-     nix store instead of an absolute path, we have decided to disable
-     caching globally now, as it's usually not the behaviour the user wants
-     and can lead to surprising behaviour.
-     Furthermore, negative caching of host lookups is also disabled now by
-     default. This should fix the issue of dns lookups failing in the
-     presence of an unreliable network.
+     <literal>systemd</literal> to manage uids and usernames in the presence of
+     <literal>DynamicUser=</literal> in systemd services.  This was already the
+     default behaviour in presence of <literal>services.sssd.enable =
+       true</literal> because nscd caching would interfere with
+     <literal>sssd</literal> in unpredictable ways as well.  Because we're
+     using nscd not for caching, but for convincing glibc to find NSS modules
+     in the nix store instead of an absolute path, we have decided to disable
+     caching globally now, as it's usually not the behaviour the user wants and
+     can lead to surprising behaviour.  Furthermore, negative caching of host
+     lookups is also disabled now by default. This should fix the issue of dns
+     lookups failing in the presence of an unreliable network.
    </para>
    <para>
      If the old behaviour is desired, this can be restored by setting

From 1d5f4cbb784904e0a6420cc62b0b24ca0873abc5 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Wed, 12 Dec 2018 15:34:05 +0100
Subject: [PATCH 1764/2793] nixos/nscd: Add a descriptive comment to the nscd
 configuration

---
 nixos/modules/services/system/nscd.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index ce583816e15..603a5d01acc 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -1,3 +1,11 @@
+# We basically use nscd as a proxy for forwarding nss requests to appropriate
+# nss modules, as we run nscd with LD_LIBRARY_PATH set to the directory
+# containing all such modules
+# Note that we can not use `enable-cache no` As this will actually cause nscd
+# to just reject the nss requests it receives, which then causes glibc to
+# fallback to trying to handle the request by itself. Which won't work as glibc
+# is not aware of the path in which the nss modules live.  As a workaround, we
+# have `enable-cache yes` with an explicit ttl of 0
 server-user             nscd
 threads                 1
 paranoia                no

From 9f66479ffcb89861c5fffe8076920e63bb8b4da7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Dec 2018 05:01:33 -0500
Subject: [PATCH 1765/2793] python3Packages.jeepney: init at 0.4

---
 .../python-modules/jeepney/default.nix        | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/jeepney/default.nix

diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix
new file mode 100644
index 00000000000..8b1100cd3f4
--- /dev/null
+++ b/pkgs/development/python-modules/jeepney/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+, testpath
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "jeepney";
+  version = "0.4";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w1w1rawl9k4lx91w16d19kbmf1349mhy8ph8x3w0qp1blm432b0";
+  };
+
+  propagatedBuildInputs = [
+    tornado
+  ];
+
+  checkInputs = [
+    pytest
+    testpath
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    homepage = https://gitlab.com/takluyver/jeepney;
+    description = "Pure Python DBus interface";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da5fa4dd102..b90ab2083e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2706,6 +2706,8 @@ in {
 
   jellyfish = callPackage ../development/python-modules/jellyfish { };
 
+  jeepney = callPackage ../development/python-modules/jeepney { };
+
   j2cli = callPackage ../development/python-modules/j2cli { };
 
   jinja2 = callPackage ../development/python-modules/jinja2 { };

From 851e2c7e212ae63e9deff0e1111283ee992dc6d3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Dec 2018 05:13:22 -0500
Subject: [PATCH 1766/2793] python3Packages.secretstorage: 2.3.1 -> 3.1.0

Changelog: https://github.com/mitya57/secretstorage/blob/master/changelog

Pertinent changes:

- ported from dbus-python to jeepney
  Thusly Python 3.5 or newer is required.
- We can use pypi
- Add pygobject3
---
 .../python-modules/secretstorage/default.nix  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
index 98bbef174ae..c0df4d4a878 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage
-, dbus-python, cryptography }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }:
 
 buildPythonPackage rec {
   pname = "secretstorage";
-  version = "2.3.1";
+  version = "3.1.0";
 
-  src = fetchFromGitHub {
-    owner = "mitya57";
-    repo = "secretstorage";
-    rev = version;
-    sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    pname = "SecretStorage";
+    inherit version;
+    sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9";
   };
 
-  propagatedBuildInputs = [ dbus-python cryptography ];
+  propagatedBuildInputs = [
+    cryptography
+    jeepney
+    pygobject3
+  ];
 
-  doCheck = false; # requires dbus session
+  # Needs a D-Bus Sesison
+  doCheck = false;
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/mitya57/secretstorage";
+  meta = with lib; {
+    homepage = https://github.com/mitya57/secretstorage;
     description = "Python bindings to FreeDesktop.org Secret Service API";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ teto ];

From 4e5b3656440b298f10022c1330f24b1d9f3ccbd1 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein@google.com>
Date: Wed, 12 Dec 2018 15:25:39 +0000
Subject: [PATCH 1767/2793] nvidia: Improve assertion documentation

---
 nixos/modules/hardware/video/nvidia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 8f1e2671ece..b680c3c1ccb 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -102,7 +102,7 @@ in
     assertions = [
       {
         assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
-        message = "NVIDIA drivers don't support wayland";
+        message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";
       }
       {
         assertion = !optimusCfg.enable ||

From cee5f2b6229226706573bf8dd6c7b7f508be1992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 12 Dec 2018 14:35:32 +0100
Subject: [PATCH 1768/2793] python.pkgs.ruamel_yaml: do not depend on typing

The dependency was removed in version 0.14.9.
---
 pkgs/development/python-modules/ruamel_yaml/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index 619b2fb5eb3..e10005fc205 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, typing
 , ruamel_ordereddict
 , isPy3k
 }:
@@ -19,7 +18,7 @@ buildPythonPackage rec {
   # Tests cannot load the module to test
   doCheck = false;
 
-  propagatedBuildInputs = [ ruamel_base typing ]
+  propagatedBuildInputs = [ ruamel_base ]
     ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict;
 
   meta = with stdenv.lib; {

From 00a9057f750ddd512311b8627913dbec61a23d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 12 Dec 2018 14:01:39 +0100
Subject: [PATCH 1769/2793] Revert "home-assistant: pin to python 3.6"

This reverts commit 2fb90e57fd8f3342d72d4176df24d9981da1bacd.
Home Assistant now builds fine with Python 3.7.
---
 pkgs/servers/home-assistant/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix         | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 88b82453063..4ab5e79fd38 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchpatch, python
+{ lib, fetchFromGitHub, fetchpatch, python3
 
 # Look up dependencies of specified components in component-packages.nix
 , extraComponents ? []
@@ -52,7 +52,7 @@ let
     (mkOverride "colorlog" "3.1.4"
       "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d")
 
-    # hass-frontend does not exist in python.pkgs
+    # hass-frontend does not exist in python3.pkgs
     (self: super: {
       hass-frontend = self.callPackage ./frontend.nix { };
     })
@@ -68,7 +68,7 @@ let
       });
     };
     
-  py = python.override {
+  py = python3.override {
     # Put packageOverrides at the start so they are applied after defaultOverrides
     packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6e10ef78c2..926fd40dcb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13498,9 +13498,7 @@ in
 
   hiawatha = callPackage ../servers/http/hiawatha {};
 
-  home-assistant = callPackage ../servers/home-assistant {
-    python = python36;
-  };
+  home-assistant = callPackage ../servers/home-assistant { };
 
   hydron = callPackage ../servers/hydron { };
 

From e01209f2c7b06fc896ba2af90f83be8b078027cc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Nov 2018 20:03:36 +0100
Subject: [PATCH 1770/2793] signal-desktop: 1.18.1 -> 1.19.0

A new dependency (at-spi2-atk) is required for libatk-bridge-2.0.so.

Also libstdc++.so.6 is now required from stdenv.cc.cc.lib (stdenv.cc.cc
doesn't offer it). The binary will only find libstdc++.so.6 via
$LD_LIBRARY_PATH (i.e. not via rpath, the run-time search path).
---
 .../instant-messengers/signal-desktop/default.nix        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 2f7f3c5836a..9dd9a0d3334 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, dpkg, wrapGAppsHook
-, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
+, gnome2, gtk3, atk, at-spi2-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, libnotify
@@ -24,6 +24,7 @@ let
   rpath = lib.makeLibraryPath [
     alsaLib
     atk
+    at-spi2-atk
     cairo
     cups
     dbus
@@ -49,18 +50,17 @@ let
     libXtst
     nspr
     nss
-    stdenv.cc.cc
     udev
     xorg.libxcb
   ];
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.18.1";
+  version = "1.19.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1gak6nhv5gk37iv1bfmjx6wf0p1vcln5y29i6fkzmvcrp3j2cmfh";
+    sha256 = "19a585mylbwrxd2m75hgp77ys1r350xkvawq2ysp0cxzr04l46z7";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
@@ -84,6 +84,7 @@ in stdenv.mkDerivation rec {
              --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
     wrapProgram $out/libexec/signal-desktop \
       --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \
       ${customLanguageWrapperArgs} \
       "''${gappsWrapperArgs[@]}"
 

From 7875e817cf9a28f83f80d3a8c3b2164e969efde4 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Wed, 12 Dec 2018 16:32:28 +0000
Subject: [PATCH 1771/2793] change qmltermwidget version to 2018-11-24 and add
 unstable to name

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

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index d73211fc486..ba62324d586 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.0";
-  name = "qmltermwidget-${version}";
+  version = "2018-11-24";
+  name = "qmltermwidget-unstable-${version}";
 
   src = fetchFromGitHub {
     repo = "qmltermwidget";

From 445863b77753d70768f2e4d741bb6f0a9d604104 Mon Sep 17 00:00:00 2001
From: Casey Ransom <casey@dailykos.com>
Date: Wed, 12 Dec 2018 11:41:25 -0500
Subject: [PATCH 1772/2793] pdsh: enable macOS

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

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 812d335e808..f5c74cfb511 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       while timeouts occur on some connections.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

From 594fc72a327562fbf8f1d75d820e0297ea404246 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 12 Dec 2018 20:05:46 +0300
Subject: [PATCH 1773/2793] mysql55: broken on aarch64

---
 pkgs/servers/sql/mysql/5.5.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 449872bdc7f..a24dee07de4 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -78,5 +78,6 @@ self = stdenv.mkDerivation rec {
       artistic1 bsd0 bsd2 bsd3 bsdOriginal
       gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib
     ];
+    broken = stdenv.isAarch64;
   };
 }; in self

From 6f7459b40b1e8a3c348cc12682129d2accfa26d4 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Wed, 12 Dec 2018 10:41:35 -0600
Subject: [PATCH 1774/2793] R: update CRAN package set

---
 pkgs/development/r-modules/cran-packages.nix | 2115 ++++++++++--------
 1 file changed, 1178 insertions(+), 937 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index e942aa83877..7d988014da4 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2018-10-29"; };
+let derive2 = derive { snapshot = "2018-12-11"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -40,7 +40,7 @@ in with self; {
   AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; };
   AGread = derive2 { name="AGread"; version="0.1.2"; sha256="17jj6g0df3cldaq4brn1abdivfg7w5bwycbrs70ynmy6iqib8piy"; depends=[data_table dplyr magrittr seewave]; };
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
-  AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
+  AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
   AID = derive2 { name="AID"; version="2.3"; sha256="0p3cjbd6kxdy5igmgzkc2bd3w0p0w1jb9jkn9n0id5lv44b5gskj"; depends=[ggplot2 MASS nortest psych tseries]; };
   AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; };
@@ -55,13 +55,13 @@ in with self; {
   ALTopt = derive2 { name="ALTopt"; version="0.1.1"; sha256="0frpnycnljz6r24cg4z99ivm3rbg9j1nxfkhw18vbrb7gcl1hqj6"; depends=[cubature lattice]; };
   AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
   AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; };
-  AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; };
+  AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="1.0.0"; sha256="1vgncc61gmqhax2a7072jb36bzkycv80xqihkr5qs8jxnqqkndxd"; depends=[]; };
   AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
   AMIAS = derive2 { name="AMIAS"; version="1.0.2"; sha256="142bp8yaa87dpxkjrbcq57pr65x8q921hb5kxrcpghg157y5byn3"; depends=[limSolve Matrix zoo]; };
-  AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; depends=[unmarked]; };
+  AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
-  AMR = derive2 { name="AMR"; version="0.4.0"; sha256="056r5z553r6amq7kdbc4rl4mqlcrzsm7aprlf733as8rrabjfh9c"; depends=[backports curl data_table dplyr hms knitr rlang rvest xml2]; };
+  AMR = derive2 { name="AMR"; version="0.5.0"; sha256="1y1fnbxmrfz04y4lfqszav0m1nr4szqrmpz1a2gbri0c1hqfwygf"; depends=[backports crayon curl data_table dplyr hms knitr rlang rvest tidyr xml2]; };
   ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; };
@@ -83,7 +83,7 @@ in with self; {
   ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; };
   ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
   ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; };
-  ARTP2 = derive2 { name="ARTP2"; version="0.9.44"; sha256="0qwjfpinvlsxswq7m2biyd78cvm14xbb09g873vhmkjds3qxdk4c"; depends=[data_table Formula]; };
+  ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; };
   ARTool = derive2 { name="ARTool"; version="0.10.5"; sha256="1l219j5zp0sck0l326fi8nfsw29d83h18ahm4gs4bknfbbv895ic"; depends=[car dplyr lme4 magrittr plyr]; };
   ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; };
   ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; };
@@ -121,7 +121,7 @@ in with self; {
   AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.5"; sha256="064mpylzpz7ngqlk637b9ykia4zn7jpcdnxdfp5j84a0fvbm8gx8"; depends=[ggplot2 pracma shiny]; };
   AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.6"; sha256="0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"; depends=[MASS Matrix Rcpp RcppArmadillo]; };
   AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; };
-  AdhereR = derive2 { name="AdhereR"; version="0.2.0"; sha256="1w42wg52ca0vdrj61dmyikvjvsndwhpyvnkzyissf3zvb69v32im"; depends=[data_table lubridate manipulate shiny]; };
+  AdhereR = derive2 { name="AdhereR"; version="0.3.1"; sha256="1yggn5bmdblr7d5gy9as1jv9vvis37rcad72w2w4dhm6clfchx79"; depends=[data_table lubridate manipulate shiny]; };
   AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; };
   AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; };
   AdvDif4 = derive2 { name="AdvDif4"; version="0.3.18"; sha256="0a7yjz9qsyacwb620pcgax9dxmr1qy7a0vypsr5dw2baxm9y4k6z"; depends=[]; };
@@ -144,7 +144,7 @@ in with self; {
   AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; };
   AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; };
   AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
-  AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.2"; sha256="0z7agi6992prfvc6y1gvy3j3dvy4x5xfgajgv5j76pns54sj3dl8"; depends=[Rcpp]; };
+  AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.2.1"; sha256="148i73syjdjzprgz4ai55c3gjz4hz7gwdwx19mhyiii1crkhf5v4"; depends=[Rcpp]; };
   AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-17"; sha256="1gqhjknqq325m0ryabcdw1r3j5b9xwxg09ndqdcyw4rknc2mdzn1"; depends=[fastICA R_matlab tkrplot]; };
   AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
@@ -154,7 +154,7 @@ in with self; {
   AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
-  AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.1"; sha256="0ria1azmxsw54h5zdfvpyw95rcvqkl3v91d80s7pqzjz6zcz7adg"; depends=[scatterplot3d shiny smacof]; };
+  AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.2"; sha256="0a34fxinjp30yvglfw3szpb9cm2f3d0wfc80snw7lng3vy2vvijj"; depends=[scatterplot3d shiny smacof]; };
   Anthropometry = derive2 { name="Anthropometry"; version="1.10"; sha256="1rny65070yrdxnny8frp5ryp811h59924z5pfwg0cmd2szxnxnz7"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
   Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; };
   ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.3"; sha256="0h4snigh1yhp34vw52h4b6qbh9c4cvwz2cx8fwvbnw6lslmg5cgv"; depends=[doParallel foreach stringr]; };
@@ -183,9 +183,11 @@ in with self; {
   AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.3"; sha256="1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc"; depends=[httr jsonlite shiny]; };
   AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; };
   AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; };
+  AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; };
   Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
   AzureML = derive2 { name="AzureML"; version="0.2.14"; sha256="1jhlbgfm3mr772hdkfi8jbv5lw8a08yb49sqaa14m1nz4ar9rckv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; };
+  AzureRMR = derive2 { name="AzureRMR"; version="1.0.0"; sha256="1ak7xjy2mwzffhyzf6x3v9lv5h1y2aqvg43wjywyqpwisni3fad7"; depends=[httr jsonlite R6]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
   BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
@@ -198,8 +200,8 @@ in with self; {
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
   BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
   BANOVA = derive2 { name="BANOVA"; version="1.1.1"; sha256="11cvf7wjip1vn5qn9hwxvdh98i8li9ijydfywf2ks2hls2430qbk"; depends=[coda rjags rstan runjags]; };
-  BART = derive2 { name="BART"; version="1.9"; sha256="16k5cn81bywm9njvfnnid0dhq7fbmf875v4z7a3a90p0jxrgr902"; depends=[Rcpp survival]; };
-  BAS = derive2 { name="BAS"; version="1.5.2"; sha256="1h8n7599svxyvmqd6mamj75w8i1li7q4fscs50a8irv9frhv5979"; depends=[]; };
+  BART = derive2 { name="BART"; version="2.1"; sha256="0x7w6kqirs61fdxq0zfyb34glfdj9qv0jhi59qv6y659xv4za4jx"; depends=[nnet Rcpp survival]; };
+  BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
   BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
@@ -221,14 +223,14 @@ in with self; {
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
   BCEA = derive2 { name="BCEA"; version="2.2-6"; sha256="1h1hgr0w6sidxfm58x6xz3i66prk5cxw6ldgfznr28pvrbgi5wsi"; depends=[MASS]; };
   BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; };
-  BCRA = derive2 { name="BCRA"; version="2.0"; sha256="1g0iix3ik2gsxpz6zp5fz2ka1y5xybs6x3r42ssnlffcmmdd9bsw"; depends=[]; };
+  BCRA = derive2 { name="BCRA"; version="2.1"; sha256="0n1f2qcwca7lb90qmim5dc3wj3hf5b31nh0xiw64k1cv8lhqc0mz"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
   BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
   BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; };
   BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; };
   BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.52"; sha256="11if4abx2y0x92qwadl34d44qg1qlhmgdbhfqabhirbng553szcv"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.53"; sha256="10ya43ywa188c1p6hkz8kpim5wjpym1qpywan7yf0860fpxywl8p"; depends=[igraph Matrix]; };
   BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; };
   BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
@@ -238,18 +240,19 @@ in with self; {
   BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; };
   BGData = derive2 { name="BGData"; version="2.0.0"; sha256="1jjzk81ipc7xidk21721pi761c7afnvf3qi91fv21q5ihkg5glvi"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; };
   BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; };
-  BGLR = derive2 { name="BGLR"; version="1.0.7"; sha256="061y08n4z6p013r0cqb9ff4myra5cchp6s2fgdhkw1sdlwy7ban7"; depends=[]; };
+  BGLR = derive2 { name="BGLR"; version="1.0.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; };
   BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
   BH = derive2 { name="BH"; version="1.66.0-1"; sha256="14kab6wp0c27d8x4jqyf065p4bj210s9b67c0bfsfjnp29aypn8p"; depends=[]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; };
+  BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.0"; sha256="03yzv481k0nsnh36abmqnigmd75x2l63h7m41xllklbwcq4xsx55"; depends=[Rcpp RcppArmadillo]; };
   BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; };
   BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; };
   BIEN = derive2 { name="BIEN"; version="1.2.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.191-12"; sha256="13my1yz7q40fg79m1klfqi0ngbfmkj0k6p8a1fvzl11xcwiszn44"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; };
-  BIGL = derive2 { name="BIGL"; version="1.2.2"; sha256="0zrp6mrsjmac2z8syh8216zcr7yy60y4yr2xfvmd4cxdnsc198hr"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BIGL = derive2 { name="BIGL"; version="1.2.3"; sha256="0r1la9bxczblpcmr09drp5740bclxzi7zp0nl7hgd2h4chc40iq4"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
   BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
   BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; };
@@ -284,6 +287,7 @@ in with self; {
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.6.4"; sha256="0p1205pxa5a9sbw88fm8lbvzgzyq3mf62lsp0l2c0sfsvcfpydkg"; depends=[Iso]; };
   BPEC = derive2 { name="BPEC"; version="1.3.0"; sha256="0chdp7g75a6hajq7h1lbl0zima22myah9a66m06zga274plakdq2"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; };
+  BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; };
   BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.0"; sha256="176z7ajyfcfljv36d2sa15cvw047rsir3gn0l4lxmcyliw93r4lv"; depends=[]; };
   BRISC = derive2 { name="BRISC"; version="0.1.0"; sha256="0fkh7wv9lf7fckh5xn4xygh6k792j8j6ax7kwqw7m4qqvl7gds44"; depends=[matrixStats pbapply RANN rdist]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
@@ -307,19 +311,20 @@ in with self; {
   BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
   BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; };
+  BaMORC = derive2 { name="BaMORC"; version="1.0"; sha256="1slwawpsqgqd1705inbzyiwx9vlr58k556lw1f952n0hz204f58i"; depends=[BMRBr data_table DEoptim devtools docopt httr jsonlite RBMRB readr stringr tidyr]; };
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
   BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; };
   BacArena = derive2 { name="BacArena"; version="1.7"; sha256="137n3nyz68v912c5nhq1qslgifb7k797f5sz567smhimzjhx842f"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; };
   BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; };
   BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.4"; sha256="01vnq8n0w9h7p5xpvfdhipdqcj82in0zhj61kvcmz7jx9grx22vi"; depends=[Rcpp SamplingBigData]; };
-  Ball = derive2 { name="Ball"; version="1.3.0"; sha256="16rb4yj08dbnk3yj1d0nhr9iw2kgzjzp5cbwy8kcwc3ndhaxwdpa"; depends=[gam mvtnorm survival]; };
+  Ball = derive2 { name="Ball"; version="1.3.6"; sha256="184jbprl497lmhwhaaw7zm21dqa3pg4ch3w07536fmcr092bx2f0"; depends=[gam mvtnorm survival]; };
   BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; };
   BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
   Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; };
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; };
-  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.2"; sha256="0xssci49wf3jg8hhlycf9jy8mdxlizxh1hwr0xacwsbf38wvnas3"; depends=[curl dplyr lubridate quantmod rvest stringr tidyr XML]; };
+  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.3"; sha256="1w9dwzh1yavp8k7zpkddkyxwi0046w4k0dbsjisyniygz4ml8zqq"; depends=[curl dplyr lubridate quantmod rvest scales stringr tidyr XML]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.7"; sha256="035658marnw57p4f38g99rwmvmb6hpbq0fhlxp3qbw22zfnnkvs9"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; };
   BatchMap = derive2 { name="BatchMap"; version="1.0.2.0"; sha256="0v3k4xrmsbyhzgmph8xna11dgpp10yxqmss95asrj6n814jxj19b"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
   BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; };
@@ -342,7 +347,7 @@ in with self; {
   BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
-  BayesMallows = derive2 { name="BayesMallows"; version="0.1.1"; sha256="0z9zc3m0qiyi731z323sfafp1bj3gwvl1ii9hvb4lsk2q8n858np"; depends=[cowplot dplyr ggplot2 HDInterval igraph purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
+  BayesMallows = derive2 { name="BayesMallows"; version="0.2.0"; sha256="19i5mb9vcvzjpqw3gi7q4p833w3kcnl27amjqayrx3abqbnf86xz"; depends=[cowplot dplyr ggplot2 HDInterval igraph purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; };
   BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline QRM R2jags]; };
   BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; };
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
@@ -364,7 +369,7 @@ in with self; {
   BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
   BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
-  BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.3"; sha256="1lli3v922cvp1kwg4sllgvm4rnb972anlpl0lklqk3aqi7ff6flw"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard]; };
+  BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; };
   BayesianTools = derive2 { name="BayesianTools"; version="0.1.5"; sha256="02mwjy19y4mvqwqyc9b56l27gq40nrjq22dj7s12bip8bzqlh9gk"; depends=[bridgesampling coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
   Bayesianbetareg = derive2 { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; };
   BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
@@ -378,6 +383,7 @@ in with self; {
   Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
   BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
+  BeyondBenford = derive2 { name="BeyondBenford"; version="1.0"; sha256="154yyi1y8dnk0nqxq7kfz9dbar3xr37a93z31firglx9fikbz4zn"; depends=[]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
   BiDAG = derive2 { name="BiDAG"; version="1.1.2"; sha256="076v7p70clk6wc20gr1cf6vi1x01nbi9pn7z51zwwg6i54a7hsr4"; depends=[pcalg Rcpp]; };
@@ -403,11 +409,11 @@ in with self; {
   BioCircos = derive2 { name="BioCircos"; version="0.3.3"; sha256="0l8kd1imb8022n631psm9na0vp502ndn2q7m3mshx9c0mnqsv8n3"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; };
   BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; };
   BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
-  BioInstaller = derive2 { name="BioInstaller"; version="0.3.6"; sha256="03fl00f7zwq4v9i09qwnbpnnnky1nf3v91sx52xqiz710gw4awx6"; depends=[configr devtools futile_logger git2r jsonlite liteq R_utils RCurl rvest shiny stringi stringr]; };
+  BioInstaller = derive2 { name="BioInstaller"; version="0.3.7"; sha256="0xbxv2ln39z70javxbx5rf77yf9zyjif3ppnr3id7cmy24hhqcab"; depends=[configr devtools futile_logger git2r jsonlite liteq R_utils RCurl rvest shiny stringi stringr]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; };
   BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
-  BiocManager = derive2 { name="BiocManager"; version="1.30.3"; sha256="0mfvx1xzsgiag9p42kdyqg8fvajyakrdy3z2smhdlaawzbi0qmax"; depends=[]; };
+  BiocManager = derive2 { name="BiocManager"; version="1.30.4"; sha256="0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah"; depends=[]; };
   Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
   BiodiversityR = derive2 { name="BiodiversityR"; version="2.10-1"; sha256="009xrfpnnplr2i7z8kcxp9q924mf7x8j9pqggczynrx5lb3dlrlj"; depends=[Rcmdr vegan]; };
@@ -417,6 +423,7 @@ in with self; {
   Bios2cor = derive2 { name="Bios2cor"; version="1.2"; sha256="00fzvj20x85gcpb9l6rfnm3qml8nnl365z1a68j90qi14wy6dfh6"; depends=[bigmemory bio3d circular igraph]; };
   BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; };
   BivGeo = derive2 { name="BivGeo"; version="1.0.1"; sha256="1vdyjlcgkzpwgzzimpqspnca58xx6spfg7xy49bhmdr0d24iy76z"; depends=[]; };
+  BivRec = derive2 { name="BivRec"; version="1.0.0"; sha256="161856bsny5jq7lmf79w9iqq5kq7c12hkxam5l746rfnrw1bzjzg"; depends=[knitr MASS Rcpp rmarkdown stringr survival]; };
   BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; };
   BivUnifBin = derive2 { name="BivUnifBin"; version="1.2"; sha256="0m4a2m7lvlm02hqqigwg3cd6sjzxnxqw1mchxj5g19whk34vwkwi"; depends=[BinOrdNonNor rootSolve]; };
   BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
@@ -429,12 +436,13 @@ in with self; {
   BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
-  BoSSA = derive2 { name="BoSSA"; version="3.5"; sha256="1z7wspp8bk2zyxjbgfyysqbddwmygxsx51320spk50pn5svg5ckh"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
+  BoSSA = derive2 { name="BoSSA"; version="3.6"; sha256="00jxml2lyw1rc0ifs111sbz30186z61zvz1qy6wz74024c6gsw89"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
   Bolstad = derive2 { name="Bolstad"; version="0.2-40"; sha256="1xz2x8gm27aqw1b3psjbpmzkxla8rvkvb974c3imgj71d1x0ykgm"; depends=[mvtnorm]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
   BoltzMM = derive2 { name="BoltzMM"; version="0.1.1"; sha256="0jb81wn8b5lhvlkpv4rs66qdmryf57n2xmxgwl1qk0n8bfzy8ayi"; depends=[BH Rcpp RcppArmadillo]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
+  BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; };
   BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; };
   BoolNet = derive2 { name="BoolNet"; version="2.1.4"; sha256="0jd7nxz09glrv8hb0rwg7xng77hqcskwdp49wsljhgh71di1y5vs"; depends=[igraph XML]; };
   Boom = derive2 { name="Boom"; version="0.8"; sha256="02930f5iw62csbvlz1d4s9nihynjipn1xi60sl5z1hrf75yvm37a"; depends=[BH MASS RcppEigen]; };
@@ -473,16 +481,16 @@ in with self; {
   CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
   CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; };
-  CARBayes = derive2 { name="CARBayes"; version="5.1"; sha256="1jq5skrpsmj9glypy1l04wjc9bvs91wjcwmrilhrhh8mkvysravh"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; };
+  CARBayes = derive2 { name="CARBayes"; version="5.1.1"; sha256="1c2lhh0aqkcg0wywsafcd2q946rh74km3hh2196fzirpl1hflpqi"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; };
   CARBayesST = derive2 { name="CARBayesST"; version="3.0"; sha256="1izz6lq56wlhwv7sbznckwrs7xpj2iz59g373ycbyjgwksx2k913"; depends=[CARBayesdata coda dplyr gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; };
   CARBayesdata = derive2 { name="CARBayesdata"; version="2.1"; sha256="09rjxdrbpnqm6gv9g1jxh91jmww345wi9vlhb4s1n6b3xnh44fhs"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
-  CARRoT = derive2 { name="CARRoT"; version="1.0.0"; sha256="1xcvyk9id3scr629n7f3b1hxzfk5947n22s1hwdwi4njf3p7s67f"; depends=[doParallel foreach nnet Rdpack]; };
-  CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; };
+  CARRoT = derive2 { name="CARRoT"; version="1.5.0"; sha256="1bqmifxw6yzas7mxgwrwg11b884165z32g94vy4vwn5awpzvjyxw"; depends=[doParallel foreach nnet Rdpack]; };
+  CARS = derive2 { name="CARS"; version="0.2.1"; sha256="0xk4zf6vvkcq21q7gn4zrl8md9lymkb8xq201gdfwqrys481c0lr"; depends=[np]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CASMAP = derive2 { name="CASMAP"; version="0.6.0"; sha256="1z321l34da5ggwmbggs9d8m96syra1jm29gj68lfhd7ikbpmw96w"; depends=[Rcpp]; };
-  CAST = derive2 { name="CAST"; version="0.3.0"; sha256="082xc2ic0kpp0rqyc3kh6mds2yv2n39szlmn1hf76bfnnkz1na8v"; depends=[caret ggplot2]; };
+  CAST = derive2 { name="CAST"; version="0.3.1"; sha256="1cqadrww0w2wkqmh4mi2bmdr572q5qpnz2c4jpvwqrk2ynhz43qn"; depends=[caret ggplot2]; };
   CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; };
   CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; };
   CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
@@ -502,14 +510,14 @@ in with self; {
   CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.2"; sha256="1p8d9rwkcd2bxma9h3ccg2k4795v3ycihwh9hblymfis8ncfhr19"; depends=[dplyr glue httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; };
   CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive2 { name="CDM"; version="6.6-5"; sha256="1gdmhpisy93672qyrbr0m2j3g5jivr3jik9405633pzq24ac8wvi"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="7.0-12"; sha256="1bykyivhkiz50gqanidjlqka13gly0i58rvh5gw8q3srm464h356"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
   CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; };
   CEGO = derive2 { name="CEGO"; version="2.2.0"; sha256="0k01fb8bciq3m2rcqcicrlhx6av46sdczgcyn8df1f3pr28l1fyf"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; };
-  CENFA = derive2 { name="CENFA"; version="0.1.0"; sha256="1bxrqvi67s93mvkbigb8l7rrn2j2ix7qw7vcxf4dbwd7xf3qqv6q"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; };
+  CENFA = derive2 { name="CENFA"; version="1.0.0"; sha256="0ah8rh0gbwwhdfxzj9sj4i8iqbybkga09vinlh0r514ayv2qq2x8"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; };
@@ -537,7 +545,7 @@ in with self; {
   CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; };
   CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
   CMatching = derive2 { name="CMatching"; version="2.2.1"; sha256="0q59k84vjvn8q75skrv31jqpjf6zqghkdk1saiwn6ys8rja03m4l"; depends=[lme4 lmtest Matching multiwayvcov]; };
-  CMplot = derive2 { name="CMplot"; version="3.3.1"; sha256="01qpy7bb3503i3b8v4psrxbx9ff5vzcv54j55mdr1bphwmnp1kzq"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.3.3"; sha256="0p96cq37jkkqgq3l5kbi74w2j2p0a2cnjqvzalf2gzsv5zsakrir"; depends=[]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
@@ -549,7 +557,7 @@ in with self; {
   COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; };
   COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; };
   COMBIA = derive2 { name="COMBIA"; version="1.0.6"; sha256="1640bfl5sn00czxnl6j2rrdrzc5arvfpy5b66viybxm2qqbiw49w"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
-  COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; };
+  COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.6.1"; sha256="1kjjvbp97035qawka1zbypr2gh28xnnsnbplflp3f660ch8rm8m6"; depends=[Rcpp]; };
   CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; };
   CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; };
   CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
@@ -582,7 +590,7 @@ in with self; {
   CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; };
   CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; };
   CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; };
-  CUB = derive2 { name="CUB"; version="1.1.2"; sha256="031jkzh6cr8gd2naqv54xs3vlrqmcbl9d2in66kd0dr2i41l3qj7"; depends=[Formula]; };
+  CUB = derive2 { name="CUB"; version="1.1.3"; sha256="1qdqqiax9yc0vzcqkkzx81nb7gix0x5pknvbqp1xv200776wsfc4"; depends=[Formula]; };
   CUFF = derive2 { name="CUFF"; version="1.5"; sha256="1cphwhimzmsljfjvfvpld4mixznlsg5azzv7dwrgnh8q4wpnaxpc"; depends=[openxlsx xtable]; };
   CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; };
   CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; };
@@ -591,7 +599,7 @@ in with self; {
   CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; };
   CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
   CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
-  CVXR = derive2 { name="CVXR"; version="0.99"; sha256="1by7jgy70wbf1bvskxi1l3lfkcl6cbigk64ncb2g8h2c974wn9pi"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
+  CVXR = derive2 { name="CVXR"; version="0.99-2"; sha256="1mr37i1cvqqhjnwwr0in0i82yinkr0z6lz0bwdjifldaxgszp2bn"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
   CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
   CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; };
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
@@ -620,7 +628,7 @@ in with self; {
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
   ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; };
-  ChainLadder = derive2 { name="ChainLadder"; version="0.2.7"; sha256="15d81hydbgz3j4cv4br35q9jiqlbiz8q27vylqg319y8z1p6wbgb"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+  ChainLadder = derive2 { name="ChainLadder"; version="0.2.9"; sha256="13qllc39gjxysqvzfli769l5igwqy1qwrsr91dsm4si1gvac8g5q"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; };
   ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
   ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.14"; sha256="1rasn1ghk4k0crdvxs9l8xjajdxvjsy7rwx9gz0nf41rw8pm16qa"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
@@ -629,13 +637,14 @@ in with self; {
   CharFun = derive2 { name="CharFun"; version="0.1.0"; sha256="0cqy1na1lh9w3nspy68yylali9y5b64jlgh4fyzas556239dnyk7"; depends=[Bessel]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-  ChemoSpec = derive2 { name="ChemoSpec"; version="5.0.88"; sha256="1c2c4fd4ajnzca82c9jkp81dxgra15bhxdhzdbnxjxzfifq1gsff"; depends=[ChemoSpecUtils plyr]; };
-  ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.1.62"; sha256="0yakbzyi1xdnydjixcp53rah8qcm7sg4j18ha2x1qapmzalpbr0y"; depends=[plyr RColorBrewer robustbase]; };
+  ChemoSpec = derive2 { name="ChemoSpec"; version="5.0.207"; sha256="1gd97qy3brnngdqwrifkcy1jfar2rmfh4i5ic7aqcy1scsqspfdn"; depends=[ChemoSpecUtils plyr]; };
+  ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.2.0"; sha256="1zhq5bg8alm9ys75x9839nvwgg1g36vckyqa5gx51by643p6wm4m"; depends=[ChemoSpecUtils matrixStats multiway plyr R_utils ThreeWay]; };
+  ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.2.163"; sha256="1sx10cxrm0mh51rxflrdpyg9w8g6abx8bm4r6hbzdwbxlh532yk2"; depends=[amap plyr RColorBrewer robustbase]; };
   ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.11"; sha256="00z09bplm5qvd31y7m4b4knsrl0n27j9635m1gdak6lg4db4nxrd"; depends=[devtools kohonen MASS pls]; };
   ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; };
   ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
-  CholWishart = derive2 { name="CholWishart"; version="0.9.2"; sha256="1dlq6a9j3ifhmw94w158czc72f31rns0xfw4zbfx4zcah678raq6"; depends=[]; };
+  CholWishart = derive2 { name="CholWishart"; version="0.9.3"; sha256="0wc04aws8xnsjcfmbb937zcx1qakd9yhvsavnnxzbbi1s2bv91ah"; depends=[]; };
   CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; depends=[circular]; };
   CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; };
   CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; };
@@ -653,9 +662,8 @@ in with self; {
   CliftLRD = derive2 { name="CliftLRD"; version="0.1-1"; sha256="0qsdv568klxg6chgw329jbfjmf6w61hly2vxp90yzdfkca03z2s4"; depends=[CNLTreg liftLRD]; };
   ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
-  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.1"; sha256="0ylw4hb8isy0ixc7ai3wda8pr67slrc5999kda688p9qi699nip4"; depends=[climdex_pcic multiApply PCICt plyr]; };
+  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.2"; sha256="178jsjhz3c2aq8bix34rs569qv6l0c8428zi10aadvzkip4xxbk7"; depends=[climdex_pcic multiApply PCICt plyr]; };
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="0.1.0"; sha256="1lqf2ksgchl1j5hfkz7r5yczvkjgi3238k8nkfkd70nyil9vjq06"; depends=[Rcpp]; };
-  CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
   ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; };
   ClusVis = derive2 { name="ClusVis"; version="1.1.0"; sha256="17cn3hm37jv10aybaidy89kch6814hdi8g44s94xa9li7nixzass"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
   ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
@@ -664,7 +672,7 @@ in with self; {
   ClustVarLV = derive2 { name="ClustVarLV"; version="1.6.0"; sha256="1425qgkr4ypbgi59phb9m0haahqc9g4jvjv5lmizaxph10r6gimi"; depends=[doParallel foreach iterators Rcpp RcppEigen]; };
   Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; };
   ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; };
-  ClusterR = derive2 { name="ClusterR"; version="1.1.5"; sha256="16jx47d1w8yshg2w537399ck3z5wfsazwqfbv0kmvi0iw8ss9bka"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.1.7"; sha256="025cfygqzz4296sfcdblw69fidjn2kd27w2p2sw2wqly1l2c67j6"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
@@ -710,16 +718,18 @@ in with self; {
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
   ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; };
   ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; };
-  Conigrave = derive2 { name="Conigrave"; version="0.4.1"; sha256="0gralyfz3vq81b34s81mjmblkpbigjqb6r4wkz53xfkd4dbqlchc"; depends=[dplyr ggplot2 magrittr miceadds mitools ppcor stringdist stringr]; };
+  Conigrave = derive2 { name="Conigrave"; version="0.4.2"; sha256="0qpvjnh5ig5p49w13lbh6z7hjm5hx9wjav94pw0wanmxs7n46w6j"; depends=[dplyr ggplot2 magrittr miceadds mitools ppcor stringdist stringr]; };
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
   ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; };
   ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.3"; sha256="16pkpgvg46xscp6z2xlhlnfzc9048jlgqxxbqa4c90z7dclcmrqk"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.0"; sha256="1hlff3wx8r1wpkhrz0n27wjnzy6z2q8s9smyb906gwwa9xga7njy"; depends=[]; };
-  ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.1"; sha256="0f74aaglby4hmg72957cj3y7jdchy5kq793skl7yidrjc1nk04ib"; depends=[lmtest sandwich]; };
+  ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.2"; sha256="14fgbz0fhaqqp55bh577bhb4gs2adbvldf52xjn663vdg99rwvaf"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
   CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-3"; sha256="1kb21a8mp3blgnvyzqcwh1zz1mkdq6c759g9dlw3dzp2gnpzl5zp"; depends=[dplyr geosphere ggplot2 raster rgdal rgeos rnaturalearth sp tidyselect]; };
+  CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="2.1"; sha256="09036bnxb0r0k6lk6sb258yrw4q458nmxinmvnishnq5bifps4v4"; depends=[]; };
+  Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.1"; sha256="044si0nwniiglrcg6mjvs4z3hk6hhhsy49c6pigy6yf1wvvqxp4m"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
@@ -746,6 +756,7 @@ in with self; {
   CoxPhLb = derive2 { name="CoxPhLb"; version="1.0.0"; sha256="1j8dvbjv4h0zdjvwvpswdlsb9pf3gxixh2rhl0m1kxm6f6h5ig0z"; depends=[survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
+  CpDyna = derive2 { name="CpDyna"; version="1.0"; sha256="0a8b58nxp0pik03kh3lb02gm6z21lqw6y62z11jjllmrycbmc68j"; depends=[igraph mclust RColorBrewer Rcpp RcppArmadillo RcppProgress]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; };
   Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; };
@@ -764,7 +775,7 @@ in with self; {
   CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
   CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; };
   Cyclops = derive2 { name="Cyclops"; version="2.0.1"; sha256="10zx49qhbzgkc18vv4yk1x63ywamxijwir92ls6zbsrdifn412pv"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; };
-  CytobankAPI = derive2 { name="CytobankAPI"; version="1.2.0"; sha256="1dg7gfxhamcnzkcdi0kyqs5vkwvmfv1wj5syay5z9j52lh6gp4ib"; depends=[curl httr jsonlite]; };
+  CytobankAPI = derive2 { name="CytobankAPI"; version="1.3.0"; sha256="1rrqhsqv5xc58dvkrbs9c83pkqz5np59shm7xjmqxdjj2rxj8zqn"; depends=[curl httr jsonlite]; };
   CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; };
   CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; };
   D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
@@ -788,7 +799,7 @@ in with self; {
   DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; };
   DBI = derive2 { name="DBI"; version="1.0.0"; sha256="1x8wy2vg2gcgd9bww04qmf0dsn3kp0rfjd8q8j1r2x9zxccg25pz"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; };
-  DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
+  DBKGrad = derive2 { name="DBKGrad"; version="1.7"; sha256="0q11kza0c1caph01f247h7qm4shqycq0g9i152739xzspprjf4i1"; depends=[lattice minpack_lm SDD TSA]; };
   DBfit = derive2 { name="DBfit"; version="1.0"; sha256="19jdf693ygwfchlqvh0kywid14v0b53p33rr2dvmaqmsc6pfxbbf"; depends=[Rfit]; };
   DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
   DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; };
@@ -828,10 +839,11 @@ in with self; {
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; };
   DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; };
   DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
+  DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; };
   DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; };
   DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; };
   DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; };
-  DJL = derive2 { name="DJL"; version="2.7"; sha256="1p0jd2hn6an3kkc85xkkj36x7iwi43k1yrnmzy0mb5qrbvx07hlj"; depends=[car lpSolveAPI]; };
+  DJL = derive2 { name="DJL"; version="2.8"; sha256="1aaq4rj33csphrmhx0a8vx7frq4dssrcb7appggmgl36dhpqklv8"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
   DLMtool = derive2 { name="DLMtool"; version="5.2.3"; sha256="1rkxpfk3pa566crl01z0nmkl44n1gxdp6idfhrc6p1jwccx9fgdv"; depends=[abind boot broom devtools dplyr fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; };
   DMMF = derive2 { name="DMMF"; version="0.5.0.2"; sha256="02sk1ykispkjdclsi5xp1m4vmf8mhcqm4q2z73xanvax1kqfb3v3"; depends=[raster rgdal sp]; };
@@ -866,7 +878,7 @@ in with self; {
   DSsim = derive2 { name="DSsim"; version="1.1.3"; sha256="1i92l29lqn7nb6zdkjydp9fvg8m8qazysnrjafknvnm5gy7mgqwb"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
-  DT = derive2 { name="DT"; version="0.4"; sha256="06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix"; depends=[crosstalk htmltools htmlwidgets magrittr]; };
+  DT = derive2 { name="DT"; version="0.5"; sha256="1s5d3sld4l8zygpkvprvlbqa0pm2cv1bm7h7p999wxlap28vnnqf"; depends=[crosstalk htmltools htmlwidgets magrittr promises]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
   DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
   DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; };
@@ -898,13 +910,13 @@ in with self; {
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
   DataPackageR = derive2 { name="DataPackageR"; version="0.15.4"; sha256="1q9n0684hi1y87zq25274s2kgdk7slsb2nchww36yy45vlzi3jsn"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; };
   DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.4"; sha256="0q6pz9j6js5q8mma6d1vl4wngk5zzmfq0hssrh2pk2brnm6958mj"; depends=[AdaptGauss ggplot2 Rcpp RcppArmadillo sp]; };
-  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.2.0"; sha256="0y6si8sci70fskkznx7xg5wk488hcpdfm4193b9i5nbsq6mnn8a6"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
+  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.2.1"; sha256="1ks8a93q9sv4s3qw753vlza50f2250n2schx49pkn12bjyf74av9"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
   DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.0.0"; sha256="1m739q9x5w2xcwx19qm633z6xfijqdgcdvfjj6c5jhn66hc401nq"; depends=[rJava]; };
   DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.0"; sha256="19in7n2fs5m965wf37mplsafiqrmgv1lcyhf7rlk4wvq4y2gvic6"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
   DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; };
   DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="0.1.0"; sha256="1pxsvwl1in822ml7spb4flln2l7kzavq0jhxxsgxcrljypvrva61"; depends=[Cairo data_tree dplyr ggplot2 gridExtra tidyr viridisLite]; };
-  DeclareDesign = derive2 { name="DeclareDesign"; version="0.10.0"; sha256="1vp9sp7sqpzdglaqiniz39wgz3ib2h45kqrxkfgdrnsiz14ksmjw"; depends=[estimatr fabricatr randomizr rlang]; };
+  DeclareDesign = derive2 { name="DeclareDesign"; version="0.12.0"; sha256="10axiy1lshqv6hh26i3ci7sqffs1vl68phcv2kxpb98m0n9l4pbm"; depends=[estimatr fabricatr generics randomizr rlang]; };
   DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
@@ -913,7 +925,7 @@ in with self; {
   DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
   DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-  Delaporte = derive2 { name="Delaporte"; version="6.2.0"; sha256="0lhi4gfps00c9psr8kk7zzh7ky4y7xi2va303darxq9j6v509qck"; depends=[]; };
+  Delaporte = derive2 { name="Delaporte"; version="6.3.0"; sha256="0c4q52n6ymldvbny48wlb9vrliqycx8jnzabi2hcbcza6ww8wxz0"; depends=[]; };
   DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; };
   Delta = derive2 { name="Delta"; version="0.2.0.2"; sha256="00yl7rildggcv5zlis6idzjkfvz6x99c29vrra1w8l11klxnjpdy"; depends=[]; };
   Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; };
@@ -925,21 +937,22 @@ in with self; {
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
   DepthProc = derive2 { name="DepthProc"; version="2.0.4"; sha256="1dh159pvvn2hbjydb9ys8ndblpzpyg72g2hfiqrdi3bkz865xvg5"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
   Deriv = derive2 { name="Deriv"; version="3.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.25"; sha256="0bk2za3zx9xfxaiz7ax2n9592v4nvb7lwxw68g4vxvxlyrmi178c"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.26"; sha256="0bzcvpabzq9glm19w3y1n8lmvabkrmm5s6c7xvy1v46qcmwb2vf0"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.1"; sha256="1hkilb034iqypq5vdxwcjvxrxgmrri89cx4fc04d8yhgd3afaq27"; depends=[DescTools rstudioapi]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.0"; sha256="1cgxnsxivsqchzqywv470q9qwxczmcvwhrr51m70mcbzmib4mxw3"; depends=[curl dplyr jsonlite magrittr RCurl reshape]; };
-  DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.1"; sha256="1ykzriq1h2i0fmbdsbscy093j4bbsxdvbx94yqcrxz9zflzzmk36"; depends=[DeclareDesign estimatr fabricatr randomizr rlang]; };
+  DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.2"; sha256="053swmnflcahrr1x3zax921ffks1gnwvri6hs04k7fzc71s9l5xf"; depends=[DeclareDesign estimatr fabricatr generics randomizr rlang]; };
   DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
   DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; };
   DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; };
   DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; };
+  DiPs = derive2 { name="DiPs"; version="0.2.0"; sha256="1npnh1iah6s3767vdl1jb6yyzkbjjprcpi9db7z9x5js97fbbq47"; depends=[liqueueR mvnfast plyr rcbalance]; };
   DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.0"; sha256="0zik8j50yfxgzdv2cf6q80kw8nb5y55l9sbrp60qc08r3fp6s61b"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
   DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; };
-  DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; };
+  DiceDesign = derive2 { name="DiceDesign"; version="1.8"; sha256="0154nsnr7g4nq4i3w1q3dlxj42a17hmir4gizr03jv7rn61vvkp4"; depends=[]; };
   DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; };
   DiceKriging = derive2 { name="DiceKriging"; version="1.5.6"; sha256="14jfwvj8vhrngcpkqdzr6klhnqwgr1g5wm5rqz8q6w7ip4nnsii5"; depends=[]; };
   DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; };
@@ -955,7 +968,7 @@ in with self; {
   DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
-  Directional = derive2 { name="Directional"; version="3.3"; sha256="17cf2nrx9kxyrmsg443bnh2dfw0351ab4g0xl5bm7ldbiffqm7sp"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="3.4"; sha256="1q3ld6nwd120h6rhf9nwaj8irqks580vgdg7n6pkdhq5q88yhw2h"; depends=[doParallel foreach MASS RcppZiggurat Rfast rgl]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
   DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; };
   DisImpact = derive2 { name="DisImpact"; version="0.0.3"; sha256="1xmbwhbhb2jyzar8am77zma7l5siyhzna6l69y2068lqrk7l5w32"; depends=[dplyr magrittr rlang]; };
@@ -967,7 +980,7 @@ in with self; {
   DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; };
   Distance = derive2 { name="Distance"; version="0.9.7"; sha256="0g2zb7im3l4043bml7akd2cbss3p7mlvds6iv1libimlpy1dr71f"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
-  DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
+  DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
@@ -1002,6 +1015,7 @@ in with self; {
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; };
+  EBPRS = derive2 { name="EBPRS"; version="1.0.1"; sha256="001nldhbdf7s8f2g5ykmnn8qy80qfif5ghd3a2iyixq3d6rjwaxd"; depends=[data_table ROCR]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
@@ -1036,7 +1050,7 @@ in with self; {
   EMAtools = derive2 { name="EMAtools"; version="0.1.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; };
   EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; };
   EMCluster = derive2 { name="EMCluster"; version="0.2-10"; sha256="1p8zy0f10383svgm2di0gmqwmn4m8ydsn16xh5rymssg831xwql6"; depends=[MASS Matrix]; };
-  EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
+  EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; };
   EML = derive2 { name="EML"; version="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; };
   EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; };
   EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; };
@@ -1066,7 +1080,7 @@ in with self; {
   ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
   ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; };
   ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; };
-  ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; };
+  ETAS = derive2 { name="ETAS"; version="0.4.5"; sha256="1gz6pzhp06j6dlayfhiyrp4kz4548wmxj1zv8harpklpws64r31a"; depends=[fields goftest lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; };
   EValue = derive2 { name="EValue"; version="1.1.5"; sha256="0lfm3458mh1rfcxhr4gm8gls9lssy277fxi5rbkysls88282j4dc"; depends=[devtools ggplot2 metafor msm]; };
@@ -1084,14 +1098,14 @@ in with self; {
   Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; };
-  EcoIndR = derive2 { name="EcoIndR"; version="1.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; };
+  EcoIndR = derive2 { name="EcoIndR"; version="1.4"; sha256="07ny5v03h75yhpi7p4nq5azdx8s6vrrjm0knhgaj6j9indnipmyx"; depends=[]; };
   EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.2"; sha256="1gz3h97i8bcd3nkkrfl5wwxwjkw0z7qvj1bjksdjplchkag0nk3x"; depends=[ggplot2 igraph]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; };
   Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; };
   EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; };
-  EdSurvey = derive2 { name="EdSurvey"; version="2.0.3"; sha256="1aw0b2i7vhfz11nr6ywk873cmgvpfvim89r3m6paqgnq01yyw8nw"; depends=[data_table Formula haven LaF lfactors magrittr MASS Matrix NAEPprimer RColorBrewer readr readxl rvest stringi stringr tibble wCorr xml2 xtable]; };
+  EdSurvey = derive2 { name="EdSurvey"; version="2.2.2"; sha256="03pnqkzl6f6cryz2gb7qlwrb8av3qcfm2ia3hr6hazxlgz541xng"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; };
   EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
   EffectStars = derive2 { name="EffectStars"; version="1.9"; sha256="15n5mrba2s0qxcg3zikfwpxqwv38h39zmvj8sz62ni4pdhrhhjh3"; depends=[VGAM]; };
   EffectStars2 = derive2 { name="EffectStars2"; version="0.1-2"; sha256="0121zb627zwkgbb84sn2dclph56dc5rkfjpci5xwd0w99vh3q66l"; depends=[miscTools VGAM]; };
@@ -1107,7 +1121,7 @@ in with self; {
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.1.1"; sha256="1fid29ipmrq2557wcva1miifgwxdcm8g27ws5wb1lq6yiaz0z4w0"; depends=[doParallel foreach lattice shiny xts zoo]; };
   EmissV = derive2 { name="EmissV"; version="0.664.9"; sha256="0y7bmkv5lwlgimc5prfib321z1wq7xvyfgrfv8wk0wb17d6kk0dp"; depends=[data_table lwgeom ncdf4 raster sf sp units]; };
-  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.3.6"; sha256="0fiwvdzcyz6ayzqfa6j2ygpab1cwbi04gd2c2g1j9qbdq95myipa"; depends=[ggplot2 gridExtra]; };
+  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.4.0"; sha256="07q8il0hn8jz1h94nic3kxh09yz7biphakbx45xy0spyv23q01m6"; depends=[ggplot2 gridExtra]; };
   EncDNA = derive2 { name="EncDNA"; version="1.0.1"; sha256="1mp9blxa29jwimgp58ligayzq3ydfa2sccs2ppn3ki2sqq01xdpp"; depends=[Biostrings]; };
   EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; };
   EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
@@ -1131,7 +1145,9 @@ in with self; {
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
   EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
   EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.2"; sha256="1rxq9z5lhcgzn02d9k6vgl2cb5x0s9gsly63byx4gg1h91bsvmp6"; depends=[coda]; };
-  EpiModel = derive2 { name="EpiModel"; version="1.6.5"; sha256="1h9490x7vna8z2dib6vgkxhpqvbybg655k88jn48i6qkda8dzv54"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.7.0"; sha256="0jg3l9bcvjxvazxzpcdmzw3ybprpvm4saka14c1mynzsg1ab70wg"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; };
+  EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; };
   EpiStats = derive2 { name="EpiStats"; version="1.2"; sha256="102s7637afm3scif20r75wcfkz9g8k4w55qxv1gqqc1kcmn2zqar"; depends=[dplyr epiR]; };
   EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; };
   Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
@@ -1170,6 +1186,7 @@ in with self; {
   FADA = derive2 { name="FADA"; version="1.3.3"; sha256="1kckksim3m6kypm3qnyijgmnrq6dwjfs5jax5dr94giwlpfcdl8q"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
+  FAMoS = derive2 { name="FAMoS"; version="0.1.0"; sha256="04q4472m03yywfv69x234msadl4pfh59fqx49asrbxn7z35v8sfb"; depends=[future R_utils]; };
   FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; };
   FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; };
   FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; };
@@ -1185,7 +1202,7 @@ in with self; {
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
   FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
-  FENmlm = derive2 { name="FENmlm"; version="2.2.2"; sha256="1k8andhpk8drdcjnwvv7hzyfj0qnp6h843naxdvhbj1qp9gs9vr0"; depends=[Formula MASS numDeriv Rcpp]; };
+  FENmlm = derive2 { name="FENmlm"; version="2.3.1"; sha256="1y94ppqifwkvd0q03dgqvk6qcw7ir2k9jsc20xq4y4navi0q9g31"; depends=[Formula MASS numDeriv Rcpp]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
   FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
@@ -1202,14 +1219,14 @@ in with self; {
   FKF = derive2 { name="FKF"; version="0.1.5"; sha256="1qzf7y3f4xfirjkm795rcxckjbw6sn7xpilhkyvayqm2vyhf7518"; depends=[RUnit]; };
   FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
-  FLSSS = derive2 { name="FLSSS"; version="7.6"; sha256="1cjhzjl8s4bnx457v4pal945j2ij75s8gdbbr9a3cambh0sc821y"; depends=[Rcpp RcppParallel]; };
+  FLSSS = derive2 { name="FLSSS"; version="7.7"; sha256="09zinc1z4k3vdk7qyrsya8l1zlwg04d1v7n3wmal6c75vdgam6x3"; depends=[Rcpp RcppParallel]; };
   FLightR = derive2 { name="FLightR"; version="0.4.7"; sha256="0qnhyn363c8yb541ngygm5jzax1csjdq0mmvvvazncirgk45q9y5"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
   FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; };
   FME = derive2 { name="FME"; version="1.3.5"; sha256="1r1mb61hylsgcryac35bz1pzfcw27gzpvfwkkf0sh754ya6xh69n"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; };
   FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; };
   FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
   FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; };
-  FNN = derive2 { name="FNN"; version="1.1.2.1"; sha256="1n61jrcmakqif8f827x4qnlhm2jqpj5fgjj65c4p0kdd8lzw8pqp"; depends=[]; };
+  FNN = derive2 { name="FNN"; version="1.1.2.2"; sha256="09k3k0h9ikbwq6225l7gd0nhimbji722680cr66c8n7zpvxn06mm"; depends=[]; };
   FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; };
   FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; };
   FPDclustering = derive2 { name="FPDclustering"; version="1.2"; sha256="1qj1dddzcy2jx4903kmzzhcwfi13c2x9kva2n4rzqh5n560nvg57"; depends=[ThreeWay]; };
@@ -1219,15 +1236,16 @@ in with self; {
   FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
   FREGAT = derive2 { name="FREGAT"; version="1.1.0"; sha256="04rcbwbwi53d8his0ss9hj4s2c28r292f4f2ayl70av7k74nnccy"; depends=[Matrix]; };
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
-  FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.0.1"; sha256="05hcds1g1hkpr3fww1i462p633xlhwv594fpbphvw8fm10mc0hns"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
+  FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
-  FRegSigCom = derive2 { name="FRegSigCom"; version="0.2.2"; sha256="1jbksgx561fc4bgsyz3d1b3amqc80bzzl96ri74rbd3lqbhgrn0y"; depends=[fda Matrix Rcpp RcppEigen]; };
-  FSA = derive2 { name="FSA"; version="0.8.20"; sha256="1vvsjwyb03wiqxlzgig3gxn9aj5lr7kx183gsjz2xysxp07rv9hf"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
+  FRegSigCom = derive2 { name="FRegSigCom"; version="0.3.0"; sha256="0w0yhch75wdx6phf5h4radipgpndv5bfxva2pzzd99fkmws4sswn"; depends=[fda Matrix Rcpp RcppEigen]; };
+  FSA = derive2 { name="FSA"; version="0.8.22"; sha256="171z8ywr31h38jpgy583hlwdrhp3k4l7blv5ji34nbwdbxbl3hx0"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
+  FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; };
   FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; };
   FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; };
-  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.2.1"; sha256="1xzb59p3byby5wbas48qpzkmsai7xk0nk1g1iz80m22b9p521n85"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
+  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.0"; sha256="1isvihpiy4bkkaxcyk9b3q2293wgs4m7r5g5pnksrw61r2f26mvl"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; };
   FUNLDA = derive2 { name="FUNLDA"; version="1.1"; sha256="1qqwpics63qab43mvpm275rk9iywawr4gap0qa832i6iy3jp1h3c"; depends=[Rcpp RcppArmadillo]; };
@@ -1238,8 +1256,8 @@ in with self; {
   FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
   FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.3"; sha256="1924f5sfadgs47ja1ljwqm3slnmqqz1pwxhh9cn1rg1hi8g7db6f"; depends=[FactoMineR rmarkdown rrcov]; };
   FactoMineR = derive2 { name="FactoMineR"; version="1.41"; sha256="1h20hydav6l2b7bngqw1av4l5rrh0wk58nhailga1f4qw9lrv259"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
-  FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; };
-  Factoshiny = derive2 { name="Factoshiny"; version="1.0.6"; sha256="1rb16g4gqq9mmwgpp94j9g5iv5p1psjqllsp9qn7ccccmgn6nnw9"; depends=[colourpicker FactoMineR shiny]; };
+  FactorsR = derive2 { name="FactorsR"; version="1.3"; sha256="1sma1v3flnazwq1vs8p5cbi2g34758w5wxwnbwxlpzprwhmr8qrn"; depends=[]; };
+  Factoshiny = derive2 { name="Factoshiny"; version="1.0.7"; sha256="1s4pnikv6n767z2x8s5gqqsj64yf9ivpdb5xw0qviizf9qwg8yvi"; depends=[colourpicker FactoMineR shiny]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
   FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
@@ -1256,11 +1274,12 @@ in with self; {
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
   FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; };
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; };
-  FateID = derive2 { name="FateID"; version="0.1.4"; sha256="1v3zgxr8qydpkxzpbxn3spqy4xadf1h0wx3nk4ia9dkmxz6qq5hy"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; };
+  FateID = derive2 { name="FateID"; version="0.1.5"; sha256="0yqg3i058852l75dqlbkb04z8flbc8wn9l9jhc1r03jqxg1vjg2p"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; };
   FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; };
   FedData = derive2 { name="FedData"; version="2.5.5"; sha256="0krfz76mxw0dybm4adqf5mg53g8gpypp5sk2z99s7b54w196cmqh"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
+  Fgmutils = derive2 { name="Fgmutils"; version="0.9.5"; sha256="05n8lvx3cs1ckliaj7ni2rbfcrdl7d0pzf9bkwlyd1779h684cxz"; depends=[data_table devEMF ggplot2 gridExtra plyr png sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
   FinAna = derive2 { name="FinAna"; version="0.1.2"; sha256="09svg5z52vv90ih85awgh6ns3pqi789qjm2wi1gb9hbg9v5g7pdv"; depends=[]; };
   FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
@@ -1280,6 +1299,8 @@ in with self; {
   FixedPoint = derive2 { name="FixedPoint"; version="0.5"; sha256="1jnkbb52g3avs0pm37g5qn4m3ssn2qc6adr8xp5z7ahsbkffkyw2"; depends=[MASS]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; };
+  FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; };
+  FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; };
   FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.5"; sha256="1kslqvxm73s8fvhf6ahmxmjgs73b78lcbcf4af1cp7axksp4bv8v"; depends=[changepoint evir zyp]; };
@@ -1294,7 +1315,7 @@ in with self; {
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
   Formula = derive2 { name="Formula"; version="1.2-3"; sha256="0wiqh8rr9d5ciy80wj8f5fnmiiw0ywanvvnhkwd622dx42dk848l"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
-  FossilSim = derive2 { name="FossilSim"; version="2.0.0"; sha256="1kv737bpq4vii2q32jljdiv3dlcvj05xkxkd5s0d5961ypgvm04d"; depends=[ape TreeSim]; };
+  FossilSim = derive2 { name="FossilSim"; version="2.1.0"; sha256="1wxkpc3h50vfvq7vwdrsgwlssr15ml08pm8dvyf0f0yvzsi5xahy"; depends=[ape TreeSim]; };
   FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; };
   FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; };
   FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
@@ -1304,10 +1325,9 @@ in with self; {
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.4.5-2"; sha256="1a5ladzpm62cap8gdz11kjlwyzkq84nx2xbnbjc36x2skzlqpcza"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.5-3"; sha256="0ic912ygjj5gm1s6cn32di5hqxdh9pdn9xhs3wngd92s8anm3axl"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; };
-  Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
   FusionLearn = derive2 { name="FusionLearn"; version="0.1.0"; sha256="03x21dpl72dkd4cmmaqdh42hwbdpp5c5ib79ig8pkv196231r5dn"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
@@ -1326,7 +1346,7 @@ in with self; {
   GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
   GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
   GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; };
-  GADMTools = derive2 { name="GADMTools"; version="2.2-2"; sha256="0y5zd3wgq98654g5r8zjwn8kcbrc5kskrfw7xhrcgmzija25qxdn"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos sp stringr]; };
+  GADMTools = derive2 { name="GADMTools"; version="3.0-1"; sha256="0s2kpkp5214cbrya97x84cb1nr5zfvfafpwfc2dkhf1a417i6qla"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools raster RColorBrewer rgdal rgeos rosm sp stringr]; };
   GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
   GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
   GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; };
@@ -1337,21 +1357,24 @@ in with self; {
   GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; };
   GAparsimony = derive2 { name="GAparsimony"; version="0.9.2"; sha256="0c8al4kw1fd9krninpxijg99lhfmlw4mf2623md2and25r6ixlld"; depends=[foreach iterators]; };
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
+  GB2group = derive2 { name="GB2group"; version="0.1.0"; sha256="07s6s30qipdjkvicl0qpvcfs52mwqxz9m8c3b9h62lflb7z38viq"; depends=[GB2 ineq minpack_lm numDeriv]; };
   GBJ = derive2 { name="GBJ"; version="0.5.2"; sha256="1zfddk1gn1hh67x9n5zrav5gmmrfdbnf29cz72kd3g64z2f78fgw"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="4.0.3"; sha256="0c1l1xz0jjjib5cqszq6rg3rh19441npjgy6xnvlrhddjyihhrs4"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.4"; sha256="05kraj4k4dxljgm8b6f66grad2chd51ify12zns62kx1h3lj1qin"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
   GD = derive2 { name="GD"; version="1.6"; sha256="1rlgr4z4ibz5m8m18mw11bqcbbvfjxw2mljg78jp0lb294zh1kbb"; depends=[BAMMtools ggplot2 reshape2]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  GDINA = derive2 { name="GDINA"; version="2.1.15"; sha256="1cndib7frd40199l8zijspnidwig9jvhhk3s5dbbhlgxswq6idsz"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
+  GDINA = derive2 { name="GDINA"; version="2.2.0"; sha256="0i59ghzhwd9yz0kvb0c7m7rir99qlv5sizp6fzxk0q3rvnfm0syc"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; };
-  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.14"; sha256="0z2lf0pgkwhrqq6a8gpjga3k3kf1iv8zkwma3g6kghqp1sjr9yr7"; depends=[changepoint GENEAread MASS rpart signal]; };
-  GENEAread = derive2 { name="GENEAread"; version="2.0.5"; sha256="0xm4cf0a5nfdj8qxb9ylzgk2dals9rwggk2w6aaryn8r8v4fl9vp"; depends=[bitops GGIR mmap]; };
+  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.16"; sha256="19j06q2igd261qmnwc35mprpr4ljcwia14wvj9rky9rj6fhklfr2"; depends=[changepoint GENEAread MASS rpart signal]; };
+  GENEAread = derive2 { name="GENEAread"; version="2.0.6"; sha256="1idqfg1ma8sy48j8v875j29p72slfqaj8cix6l9gpwlry6lnhg4g"; depends=[bitops mmap]; };
+  GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.0"; sha256="1lzfdpv3nnniaar016q2732hyydyf4c38i0ha5n1jy069npgaaqs"; depends=[GENEAread ggplot2 MASS misc3d rgl]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
+  GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; };
   GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; };
   GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
   GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; };
@@ -1367,25 +1390,27 @@ in with self; {
   GFORCE = derive2 { name="GFORCE"; version="0.1.2"; sha256="1bxc0id3vivva4d62h468vv4zrvjgzh91mlm97ga9qnlhd1r20wr"; depends=[lpSolve MASS]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
-  GGIR = derive2 { name="GGIR"; version="1.6-7"; sha256="1kwrynyb0r6y9vdsdv1s75pg1v2q4lj10dvvwbdk4sy3m8z7dhsv"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.7-1"; sha256="07y8h9lqr5i6h8mvwnzlpswi5sd9zx1vc5xpn37rzxbqs1acrp6z"; depends=[data_table Rcpp]; };
   GGMM = derive2 { name="GGMM"; version="1.0.0"; sha256="18haggjagp0bwy451ghz18nbjgp8zdw1m9iavjj38s57igs611n4"; depends=[equSA huge mvtnorm]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; };
   GGUM = derive2 { name="GGUM"; version="0.3.3"; sha256="1ndqm4wal2xp9sdhj0aj8828ygm2g4fx23cpnlmg3vjz4m2mjc1r"; depends=[abind psych Rdpack viridis xlsx]; };
   GGally = derive2 { name="GGally"; version="1.4.0"; sha256="1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
+  GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; };
   GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
-  GJRM = derive2 { name="GJRM"; version="0.1-4"; sha256="1bx2amhrrsghh6s6115z3qajkvnrrk1kjscx4x05ybw1b4pqyy28"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; };
+  GJRM = derive2 { name="GJRM"; version="0.1-5"; sha256="08b58q2fhh8j45b9vr7by7sps8z5qp64lv30bbz6p84m648mr04r"; depends=[copula distrEx gamlss_dist ggplot2 magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust VGAM VineCopula]; };
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
   GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; };
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
-  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.3-0"; sha256="0447j35a5nq3v6fkcynmrxvxqlry51b6fx05dwrdncbnq3sm5f6j"; depends=[MASS nlme]; };
+  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.4-0"; sha256="0ny3sj87cwgsx1ipvs6jnsa7cjb1yq6fjkcd5pzfvgi0bsqra65y"; depends=[MASS nlme]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
   GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
+  GLSE = derive2 { name="GLSE"; version="0.1.0"; sha256="1snzcz637ppz3lkg1575ln3shfidkrnynqh1d8b5rk0z0974bpm1"; depends=[gRbase igraph mvtnorm]; };
   GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; };
   GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; };
   GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; };
@@ -1393,7 +1418,7 @@ in with self; {
   GMDH2 = derive2 { name="GMDH2"; version="1.4"; sha256="13vbzqxmqvp39rbxw41nqfrmk0w6w8qc9nzgfbfpc07h3gcwva41"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   GMSE = derive2 { name="GMSE"; version="0.4.0.7"; sha256="00fws183mndi2zdfkcsdki3nbd983y9g35fgxkacjck9mpn48an3"; depends=[shiny shinydashboard shinyjs]; };
-  GNAR = derive2 { name="GNAR"; version="0.2.7"; sha256="1rxx13a3yzl8g4024d3vwxf86ssjjsa3dh6bqzxqyv0fxd85aiaj"; depends=[igraph]; };
+  GNAR = derive2 { name="GNAR"; version="0.2.9"; sha256="05pf0n1sxdyv9gc833igcrl1ms2rqdxfhg2w4kb0jiy0v4b8yafp"; depends=[igraph wordcloud]; };
   GNE = derive2 { name="GNE"; version="0.99-2"; sha256="16mivsa4r8d2cg5qsh5rpg2244f74zk2ln3vbys7ivjgnjpjn7z8"; depends=[alabama BB nleqslv SQUAREM]; };
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
   GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; };
@@ -1405,15 +1430,15 @@ in with self; {
   GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
   GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; };
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
-  GPM = derive2 { name="GPM"; version="1.0.2"; sha256="0b7431fapg09xad8rc3b9vwrs55ja24yv12kfxb2y65gij940ms7"; depends=[lattice lhs randtoolbox]; };
+  GPM = derive2 { name="GPM"; version="2.0.0"; sha256="0pnjhqcn9gjy4vi98lilvjrpg0qfslz36ywv50cv0ndbqqcl8mv9"; depends=[lattice lhs randtoolbox Rcpp RcppArmadillo]; };
   GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; };
-  GPareto = derive2 { name="GPareto"; version="1.1.1"; sha256="100r7v7vdkd8i8asb8fnz86rgmkd9kd5bnrc7kdzndfg6jsyycrg"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
+  GPareto = derive2 { name="GPareto"; version="1.1.2"; sha256="0vwnn2hm8k6bdds91id1fri2pda7apqfmad0yrk0i2arfm8krzfp"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
   GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
   GPoM = derive2 { name="GPoM"; version="1.2"; sha256="1hhwdpish8j3j9y5q6r5pdsl1kpbwp1hjhcq24iiz4lfssib4k9f"; depends=[deSolve rgl]; };
   GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
   GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   GRANBase = derive2 { name="GRANBase"; version="2.5.0"; sha256="1sc7f47dnrwww89v4n8y41zvc9z8i8lv7qgya6nwf98vh9b6ifmi"; depends=[covr dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; };
-  GRANCore = derive2 { name="GRANCore"; version="0.2.2"; sha256="0f4w5nyqnfq20apqrc7harg4capxrr648wfbgghdg18j3gh3spdc"; depends=[switchr]; };
+  GRANCore = derive2 { name="GRANCore"; version="0.2.3"; sha256="1f3f34pk0y12yv9cl84ggg40p0bam0x48avrk5f56jskfr475kqk"; depends=[switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
   GREP2 = derive2 { name="GREP2"; version="1.0.1"; sha256="0sr7r6c4xnhwdq4j1v3frzc063hhghinx8dl952li5cy8rqk8ga5"; depends=[AnnotationDbi Biobase EnsDb_Hsapiens_v86 EnsDb_Mmusculus_v79 EnsDb_Rnorvegicus_v79 GenomicFeatures GEOquery org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db RCurl rentrez tximport XML]; };
@@ -1425,11 +1450,11 @@ in with self; {
   GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="1.10"; sha256="1i3xrf01620m7vwa9kpzl620kxh60yhsbxyshna4kkv6d68i9fzy"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="2.0"; sha256="1kf94ywr4c1c65aa2yhr0jngn5v1jql3wfs6hxzxpnsrsr04krcf"; depends=[memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
-  GSODR = derive2 { name="GSODR"; version="1.2.3"; sha256="12fa4grgar7b8pxr1jjqrjbzmil0dwn04mq5dawj86v6g65xnky9"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; };
+  GSODR = derive2 { name="GSODR"; version="1.3.0"; sha256="1iwa7s5qwv4bjccsi03h2dpwfcj2ky8n68ppzhhq2zbbwxiyqrq0"; depends=[curl dplyr future_apply magrittr purrr R_utils readr rlang tibble]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; };
@@ -1456,6 +1481,7 @@ in with self; {
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
   GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
+  GenEst = derive2 { name="GenEst"; version="1.2.0"; sha256="0ida037y2bzykr2s1569gwr0c46cfmkkyywd41jfx586kqchlska"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival zip]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
@@ -1500,7 +1526,7 @@ in with self; {
   GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.0"; sha256="1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"; depends=[]; };
   GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
-  Gmisc = derive2 { name="Gmisc"; version="1.6.4"; sha256="1hqpxrff0nhbgin8x69ip3lnsj13g3alm4y8l2hv0rnxibxd4x4z"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
+  Gmisc = derive2 { name="Gmisc"; version="1.7"; sha256="09cdr5nwzxp7gl50mlpjxsj7nbi4rbj3hf7hgahskx50qnla1cc3"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; };
   GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; };
@@ -1517,7 +1543,6 @@ in with self; {
   GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
   Greg = derive2 { name="Greg"; version="1.2.2"; sha256="0drp9qf7yid88vcd2q2qdw23l1jynircffqnylznz8xzyh4qv7ik"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
-  Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
   GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; };
   GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; };
@@ -1533,12 +1558,11 @@ in with self; {
   HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
   HARModel = derive2 { name="HARModel"; version="0.1"; sha256="182ibz3xhq7wz444rsf1q8rsz1fm8ma8n3wvvb76n12ydc6hx7cr"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
   HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; };
-  HBP = derive2 { name="HBP"; version="0.1.2"; sha256="0khw15xj3k40bsdbbs1m5ad1ykji3fx0549697c1svhkm7zrrny4"; depends=[BiocInstaller coin flexclust ggplot2 gplots HiTC igraph lattice multcomp OmicCircos pgirmess reshape2 rtracklayer]; };
   HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
   HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
   HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; };
   HCT = derive2 { name="HCT"; version="0.1.0"; sha256="0p1bj0spqff8m27lvxdfhk8z1r1z04v1dsv7mqbjyzl07w005hk3"; depends=[rstan]; };
-  HCmodelSets = derive2 { name="HCmodelSets"; version="0.1.1"; sha256="0xyaap718x01g2w5gk6yz3s87zvxfymhfn5klazn16jh8v446m4f"; depends=[ggplot2 mvtnorm survival]; };
+  HCmodelSets = derive2 { name="HCmodelSets"; version="0.2.1"; sha256="18996hvhwnf1w9kslprr18x78r9ldi09yxg5adi1s9y2nykv3l18"; depends=[ggplot2 mvtnorm survival]; };
   HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; };
   HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; };
   HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; };
@@ -1565,14 +1589,16 @@ in with self; {
   HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; };
   HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
   HLSM = derive2 { name="HLSM"; version="0.8"; sha256="1503n1qb91ca2m37g4lfzgzh1kh5l74g7z1r9s5grsj2s9by0ayh"; depends=[coda igraph MASS]; };
+  HMB = derive2 { name="HMB"; version="1.0"; sha256="1a4h2d82hglv13q9mq98i67k1x9mkaf4bm2hr9dl3z0q6x0piwqr"; depends=[Rcpp RcppArmadillo]; };
   HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.1"; sha256="0gqaagzzspw3a40dqsqhxhjb8kii6xsc62p9b464rkhrwrm5i4z8"; depends=[httr RCurl XML]; };
   HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
   HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
   HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.1"; sha256="16wiy9dlfbhn20mqq3qa5hbhaxkaqxw5wbdwcj4is5pd6zl0501p"; depends=[Rcpp RcppArmadillo Rdpack]; };
-  HMMcopula = derive2 { name="HMMcopula"; version="1.0.1"; sha256="1dylgfbsij9xjkslh42vp37fbgvpafpyvjbyb234pgrynjgi1kr2"; depends=[copula doParallel foreach matrixcalc mvtnorm]; };
+  HMMcopula = derive2 { name="HMMcopula"; version="1.0.3"; sha256="192d0mg0smpdvxvlmha8h3pzfjmzf729ndijc0xngp9yq8syf882"; depends=[copula doParallel foreach matrixcalc mvtnorm]; };
   HMMextra0s = derive2 { name="HMMextra0s"; version="1.0.0"; sha256="15y5q92x69sn80pc2x7xwbnsfrqpf7cjdja4hkq861jshkksbmg1"; depends=[ellipse mvtnorm]; };
   HMMoce = derive2 { name="HMMoce"; version="1.0.0"; sha256="0w2hrqjz75j9l6wimz9rsr8bwa5rvag0pavmyqkcb8jgqdgka8hx"; depends=[curl doParallel dplyr fields foreach imager locfit lubridate maptools raster RColorBrewer rgeos RNetCDF sp]; };
-  HMP = derive2 { name="HMP"; version="1.5.1"; sha256="0v32pkgr9rhpz77y18z356lc68hcncbszawwqsldwhwc8dvb3rwn"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; };
+  HMMpa = derive2 { name="HMMpa"; version="1.0.1"; sha256="0c3jmvcklywqsjmskx7zbw4d3l8i6bzr5h741v8iwgyw67mjn37g"; depends=[]; };
+  HMP = derive2 { name="HMP"; version="1.6"; sha256="0dz46f4wr3paar42hyidjvm5b4w0hz49gs7678b6kv3kb330ymll"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; };
   HMPTrees = derive2 { name="HMPTrees"; version="1.4"; sha256="1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb"; depends=[ape dirmult doParallel foreach HMP]; };
   HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
@@ -1605,11 +1631,12 @@ in with self; {
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.1"; sha256="16n8qanxx0p5ny5zqxafn8hwb1xv94y1wig1iql8as5a5qh8lwcz"; depends=[mice Rcpp Rsolnp]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
+  HellCor = derive2 { name="HellCor"; version="1.0.1"; sha256="02yaama6y2vv4pv93xrlsqz18f6vf7gbi6pn08pmrb2lbs6cdbcf"; depends=[energy]; };
   HelpersMG = derive2 { name="HelpersMG"; version="3.3"; sha256="10czlshajg20k0ipq1nqawm4wad5a3pvyf4ibg47jwhlqzfxmd7f"; depends=[coda]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
   HextractoR = derive2 { name="HextractoR"; version="1.3"; sha256="09x1zjpkm091yr7by83ksddka8ldczb0dg09yr1gb6j68rhlbigp"; depends=[doParallel foreach seqinr]; };
   HiCblock = derive2 { name="HiCblock"; version="1.4"; sha256="07f94j9y5g6f09yi7iwag020ddfhpvrj5idfxwbr900hj3vgm1gm"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
-  HiCfeat = derive2 { name="HiCfeat"; version="1.3"; sha256="1hf24g4cph13s0cbicll3dxvxycdzwbsy6cv297vlkw4sc574ixw"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
+  HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
   HiCglmi = derive2 { name="HiCglmi"; version="1.3"; sha256="17vwdhnf36cg56vidq7d85s4vgk2pnn5py1y2wsl2dm41vdl0847"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
   HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
@@ -1644,7 +1671,7 @@ in with self; {
   IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; };
   IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; };
   IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
-  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.4-2"; sha256="07qs8jwyxl03mslgdpnxscg67js6a6lp9sdn2gp3ahyckbb0ni74"; depends=[dplyr lsa tidyr]; };
+  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.5-1"; sha256="0isy9pcb0gf5mpzil4kqaspi99rx40vzbjvf4rx66ad4vmy6iqys"; depends=[dplyr lsa tidyr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
   IBDsim = derive2 { name="IBDsim"; version="0.9-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; };
@@ -1706,12 +1733,13 @@ in with self; {
   IPtoCountry = derive2 { name="IPtoCountry"; version="0.0.1"; sha256="1b10z93mc31cr1c5wxp9xz9cr3jm4n4g5kav09dyallpgw60rskp"; depends=[data_table devtools dtables ggplot2 install_load maps scales]; };
   IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
-  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.2"; sha256="02ikg1ahz0yanq92mby00s9s1njph410mqalpzfv2pbppipw26dh"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
+  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.3"; sha256="0n50sn3q0rx59arj5baknhh63qq2xmzjy6gz3asx8fjilqfv1jvd"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
   IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.9"; sha256="1732056jcq06wb65648vx4h80dfk0brd8igm6ssk5hgfjxzy221n"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
   IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRTpp = derive2 { name="IRTpp"; version="0.2.6.1"; sha256="10shzyiawk65pikawvhg58kx6fpvs1dazqmfjf3rfvly1lc0px1q"; depends=[FactoMineR MASS mvtnorm numDeriv Rcpp]; };
-  IRdisplay = derive2 { name="IRdisplay"; version="0.6"; sha256="1w49gbdf9gj66r9kx1s0gckl9lymmz864f8x9f96mrcwxkkchdc7"; depends=[repr]; };
+  IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; };
+  IRkernel = derive2 { name="IRkernel"; version="0.8.14"; sha256="0p0fkclvcgcgswn030nclsl28g2waakgixqzfvy6326ji5li6mvr"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; };
   ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; };
   ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
   ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
@@ -1722,7 +1750,9 @@ in with self; {
   ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
   ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; };
   ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
+  ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; };
   ITNr = derive2 { name="ITNr"; version="0.3.0"; sha256="1aiqkpxnam13r4q8q03yzd6a1wvl2gf40kqncbrpfvcaiv5zsq68"; depends=[blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI xergm_common]; };
+  ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; };
   ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; };
   IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
   IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; };
@@ -1734,9 +1764,9 @@ in with self; {
   Immigrate = derive2 { name="Immigrate"; version="0.0.1"; sha256="087hzamxb61dfsi73iv3i5i95i63ichl360h3sk18s8j217h0y3g"; depends=[pROC Rcpp]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
-  ImputeRobust = derive2 { name="ImputeRobust"; version="1.3"; sha256="1mpccld9dw2v5rifla5g4qydcqkfagspnnq7r8if5lfm8mji33k3"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
+  ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
-  InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.4"; sha256="0118xmywm0dxia8pn807njb67fcag54ysz0679kwvjyfwkb47sra"; depends=[coda ggplot2 InterVA5 rJava]; };
+  InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.5"; sha256="1irbfdrab9mz50py8h3gnjj14swh7b1pbrqf2fj04ym206rsca02"; depends=[coda ggplot2 InterVA5 rJava]; };
   IncDTW = derive2 { name="IncDTW"; version="1.0.4"; sha256="14l13kzmf3cbhh115afxcx6diwbdfx45bvfqdv68rlzhx3dbdiwm"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; };
   IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
   IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
@@ -1782,17 +1812,17 @@ in with self; {
   Iso = derive2 { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
-  IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="2.1"; sha256="03fwa4agyrk5l5n42i083j36k22752vb4r87qpcw7l68h87jnbv7"; depends=[MASS]; };
+  IsoSpecR = derive2 { name="IsoSpecR"; version="1.9.1"; sha256="1r9r497d01ylivw5wfl8s0jbhib98a035z97k9nz0ws167isw5p1"; depends=[Rcpp]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="2.3"; sha256="0qxj6bx4kslzrkh1pqfqay65kaaqcs084sa0kzc7dhvhi01gvh4x"; depends=[MASS]; };
   IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
   JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
   JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
   JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
-  JFE = derive2 { name="JFE"; version="1.2"; sha256="1jfdphn9435f9nmwnb4x2wj8fv7c2i432n9wyvrlqcm424ql0cml"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
+  JFE = derive2 { name="JFE"; version="1.3"; sha256="0i4xzqyfpk9bl0nhbhm1yldslqcly4xm8l8l4lrk5h9srap3f58x"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod tcltk2 timeDate timeSeries xts]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
-  JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
+  JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; depends=[JavaGD rJava]; };
   JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; };
   JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; };
@@ -1810,7 +1840,7 @@ in with self; {
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
-  JointAI = derive2 { name="JointAI"; version="0.3.0"; sha256="1xav3ngg4jfxbji1wqqwazywx9fhxm8snkssv8rbqvnmyc0nj49x"; depends=[coda MASS mcmcse rjags]; };
+  JointAI = derive2 { name="JointAI"; version="0.4.0"; sha256="0nl6zgzmdw3wg9r3xqwh93hlyg379r8apc25k4k0fjgv446cl39l"; depends=[coda MASS mcmcse rjags]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   JuliaCall = derive2 { name="JuliaCall"; version="0.16.1"; sha256="11ganlkc65i4vljdjzhr419p1rw3dr4pw2jk6gvb8jk8pasfs36h"; depends=[Rcpp]; };
@@ -1838,7 +1868,7 @@ in with self; {
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
-  KarsTS = derive2 { name="KarsTS"; version="2.1"; sha256="1kpqp1icrinh8lr72ffcbnbgcxs8865nbmnjfcz5r7lyvhd4lbh9"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
+  KarsTS = derive2 { name="KarsTS"; version="2.2"; sha256="0ay9qi3wws0vi7lygkljaz6xhskc0mzl6r8wsaia2f5f399ya1hp"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
   KenSyn = derive2 { name="KenSyn"; version="0.2"; sha256="19xbdgxafrgxwz7swg7gzrkxszxy7ksgnmz96sar8ysmwrp7dz9i"; depends=[lme4 metafor nlme]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
@@ -1847,7 +1877,7 @@ in with self; {
   Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.0"; sha256="06vb8zpdf5brjsfiyd1s3gmhlfprpkw7fmjr594p4lw354lvhb4m"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
   Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
-  KnowBR = derive2 { name="KnowBR"; version="1.8"; sha256="1krkaxwx8qqlnlwc9fc663qx5y9c9lcws69fnqjdcfgim54pl3xz"; depends=[fossil mgcv plotrix sp vegan]; };
+  KnowBR = derive2 { name="KnowBR"; version="1.9"; sha256="12yj7grvaayxrj8fvy8z0hanzmrf2fl645cyy85df5jcq4hjr871"; depends=[fossil mgcv plotrix sp vegan]; };
   KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; };
   Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; };
@@ -1888,12 +1918,12 @@ in with self; {
   LINselect = derive2 { name="LINselect"; version="1.1"; sha256="1dx97pnfwlv6w00qp8b2ah8jl1arfh39x1vzry8zrxgxisq407wq"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; };
   LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
   LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; };
-  LLSR = derive2 { name="LLSR"; version="0.0.2.1"; sha256="0sspsj12ccaxbs37dlwa2y3dnq47xdhbxskx4qj81nxb9il7151d"; depends=[digest ggplot2 rootSolve svDialogs XLConnect]; };
+  LLSR = derive2 { name="LLSR"; version="0.0.2.4"; sha256="0r3d3cr86ilx0vm8xxqlmmsix1zivm4g11xsg2n7gyg8bcg8qf86"; depends=[digest dplyr ggplot2 minpack_lm rootSolve svDialogs svglite XLConnect]; };
   LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
   LMest = derive2 { name="LMest"; version="2.4.3"; sha256="0ynkm4f1ri80h5fraywyvwhrm6f6sa7hp95rzl29zc91904yycx1"; depends=[MASS mmm MultiLCIRT mvtnorm]; };
   LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; };
   LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; };
-  LNIRT = derive2 { name="LNIRT"; version="0.3.0"; sha256="1xlfk3a0x8abs6xwsm9s50nvi53s1a7nhnskhvjbi3rdzkvkrwxl"; depends=[MASS]; };
+  LNIRT = derive2 { name="LNIRT"; version="0.3.5"; sha256="0gbdai9kfl31wrh5smf8gvzs5g5abwbnnfkszdsz6h9qcqf7l75a"; depends=[MASS]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; };
   LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; };
@@ -1904,19 +1934,19 @@ in with self; {
   LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
   LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
   LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
-  LPWC = derive2 { name="LPWC"; version="0.99.3"; sha256="1kbm3anba39q4fn1yxaljrk93d2asp63dalhynymlcqr9p9grhzn"; depends=[ggplot2 knitr]; };
+  LPWC = derive2 { name="LPWC"; version="0.99.4"; sha256="0sra41xm6s7qsw2rd0bclm885lairln4jirv3s0ss8maxrfi4g0k"; depends=[devtools ggplot2 knitr]; };
   LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; };
   LPower = derive2 { name="LPower"; version="0.1.0"; sha256="0g9y5s4k3l4zw97qh6c9jj6ysl39y4fprvqw1ybykirvgflisi8x"; depends=[MASS nlme]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
   LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; };
   LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-1"; sha256="0y9di5n8ls4xzw0yrh0kx8c73s4wf1kzdyy8ssk6garvjln9dn9v"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
-  LSAfun = derive2 { name="LSAfun"; version="0.5.2"; sha256="114qhnx4dr7ywh3fzkjd35xygpnn74g5nv66ahj7hf5w0gg13ws9"; depends=[lsa rgl]; };
+  LSAfun = derive2 { name="LSAfun"; version="0.5.3"; sha256="1599rw4f2nar1lc92zgwpc4hmh25phpfz2qrjj8nb1rvcwpmzqdw"; depends=[lsa rgl]; };
   LSAmitR = derive2 { name="LSAmitR"; version="1.0-2"; sha256="15qyij193scrvc1ghcssr6qdzxc4l4qh199s09bz5hvr62zwfdgb"; depends=[Hmisc lme4]; };
   LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
   LSD = derive2 { name="LSD"; version="4.0-0"; sha256="0fsp3pwrnnic9mzkd6yxa4bnxbvg68712lb20vd42wf6jb39r2h3"; depends=[]; };
   LSDinterface = derive2 { name="LSDinterface"; version="0.4.0"; sha256="0nj4m924cj7x2djalrfyrrmycq2ha6s52m34kjgs7fc9f548lhx0"; depends=[abind]; };
-  LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.3.0"; sha256="07sjb02wx28a1zvzvapvraq9wzhn3yh111amkns3j62yrznj29hz"; depends=[abind car DiceKriging diptest kSamples lawstat LSDinterface randtoolbox rgenoud sensitivity tseries]; };
+  LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.3.2"; sha256="1d7fmmkgppgpkxmkvdnm6r7ncb527hqq47aaa8ck2wsbby6ngygb"; depends=[abind car DiceKriging diptest kSamples lawstat LSDinterface randtoolbox rgenoud sensitivity tseries]; };
   LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
   LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; };
   LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; };
@@ -1924,7 +1954,7 @@ in with self; {
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
   LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; };
-  LVGP = derive2 { name="LVGP"; version="2.1.3"; sha256="0lw053jgfq20lnr3cq8r8ca579a2bcksdivdpa7gy589yphrksgs"; depends=[lattice lhs randtoolbox]; };
+  LVGP = derive2 { name="LVGP"; version="2.1.4"; sha256="05krn48q0zz578862jjb4x5wma86blzlpf8cbqdimgkzbysryyy2"; depends=[lhs randtoolbox]; };
   LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; };
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; };
   LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; };
@@ -1948,6 +1978,7 @@ in with self; {
   LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; };
   LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; };
+  LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; };
   LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; };
   LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.2.0"; sha256="0va8fq80133cjw37ndfwgndpim8hhk4m1i29gr1lc7phivr8dfvm"; depends=[data_table pbapply quanteda reshape2 scales stringdist stringi tibble]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
@@ -1960,9 +1991,11 @@ in with self; {
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; };
+  LindleyPowerSeries = derive2 { name="LindleyPowerSeries"; version="0.1.0"; sha256="1nylsmxx1s6g5dzz69kaqccx3c7hzb49jan22b94816pnzd0k7zp"; depends=[lamW]; };
   LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; };
   LinearRegressionMDE = derive2 { name="LinearRegressionMDE"; version="1.0"; sha256="0nl29l10y5kpds1i4sv7jwizq61fmh5c0zpj8x64qfif4l6y4v0d"; depends=[]; };
   LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.2"; sha256="101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716"; depends=[plotrix qtl RColorBrewer]; };
+  LinkedGASP = derive2 { name="LinkedGASP"; version="1.0"; sha256="1win1yd8y677rmic531dyd29f49p7pr1r3kbjysvv9syi5nkydyj"; depends=[nloptr spBayes]; };
   LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.3.1"; sha256="01rsgk2v1r1jhpkvvhgqqa5lf6qncxy56f7jwfgxfig3dvgjf96r"; depends=[crochet]; };
   LipidMS = derive2 { name="LipidMS"; version="1.0.0"; sha256="0pr41rdpwxmq67k94vm91dddf6gj6r46l9jy0lwqp63f8s0dij3a"; depends=[CAMERA CHNOSZ enviPick purrr]; };
   Lmoments = derive2 { name="Lmoments"; version="1.2-3"; sha256="13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79"; depends=[]; };
@@ -1988,12 +2021,12 @@ in with self; {
   Luminescence = derive2 { name="Luminescence"; version="0.8.6"; sha256="08pgy0pdvafssxmzhnazqvxi4f03qsjidvzv6vrk6r4rfkld5244"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M2SMF = derive2 { name="M2SMF"; version="1.0"; sha256="0hf5ckpridi70yv15h0771q1grhqr9c592r87hgba7yh55dqqcq1"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
-  MADPop = derive2 { name="MADPop"; version="1.1.1"; sha256="07fwzpdkh2ayvx4wkmdr93jql11rf8b31abp0gghmlbysaqnv8gp"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
+  MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
   MAINT_Data = derive2 { name="MAINT.Data"; version="2.0.0"; sha256="0kp5z0jg266w4mhy1hx52h14dnyhy1fjllw7z473gj4fskikp5gg"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.18"; sha256="18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.5"; sha256="0qyqvmdhk1a7qz6c5jsbf274xahi9zjn2faw0jyk4wbnmfj2shii"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
-  MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1"; sha256="1y2nr65cvqkvzzjsr3lmpk58lqd5rqvmzjdakhwhw4s6ymggd9hf"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
+  MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1-2"; sha256="1jl26ndi0zvyq29qjkmdxg9psgwyv8wapd7f0cv4w88d9gk257az"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
   MAMS = derive2 { name="MAMS"; version="1.2"; sha256="19w6ydsbr60p1cmizhhmsajzasg76r23x29qcaa7mibcb5gh1yzs"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
@@ -2001,9 +2034,9 @@ in with self; {
   MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
-  MARSS = derive2 { name="MARSS"; version="3.10.8"; sha256="1cmkish5rbv7lpm8fnv6d33plkfvxis4r4p48bx10fll1ba11m7h"; depends=[KFAS mvtnorm nlme]; };
+  MARSS = derive2 { name="MARSS"; version="3.10.10"; sha256="03kkg6slq3z12saw0vf6z9wqadzpy4yjh9bm47zl4av4pj03y6lr"; depends=[KFAS mvtnorm nlme]; };
   MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-51"; sha256="0yp5ssfm9mahrp30y1hkqgjg70mzs6w065ba8h7j5ky1z6msdsdy"; depends=[]; };
+  MASS = derive2 { name="MASS"; version="7.3-51.1"; sha256="14907ia8418mp3p1rs1i2f1x5b6kk5z998dk353a29j3xqf3ybyq"; depends=[]; };
   MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; };
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
@@ -2022,12 +2055,14 @@ in with self; {
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
   MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
   MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; };
+  MBTAr = derive2 { name="MBTAr"; version="2.0.0"; sha256="12545rzdxnk34192d445ahz80q3k8fn51xgzha7z27jh4ja78abx"; depends=[jsonlite]; };
   MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
   MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
   MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; };
   MCDA = derive2 { name="MCDA"; version="0.0.19"; sha256="0r8l6q5aisjfk0xpv4pyccnngjlkm3978lba62rspd9kyhjlz64n"; depends=[combinat glpkAPI RColorBrewer Rglpk]; };
   MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
   MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; };
+  MCI2 = derive2 { name="MCI2"; version="1.1.0"; sha256="05jdxkvc2m8fcwzzn60dc5rix7l6f793w9ninsik8jlvmraf0z37"; depends=[MCI osrm REAT reshape tmaptools]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
@@ -2043,7 +2078,7 @@ in with self; {
   MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
   MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
-  MDFS = derive2 { name="MDFS"; version="1.0.1"; sha256="17b9lphdgp90vcldlz4p8g1a87pf1d1vg1b8vz8xhn95cb0vr4ci"; depends=[]; };
+  MDFS = derive2 { name="MDFS"; version="1.0.3"; sha256="09lmwvysyy34l51mda01cjr4579i3v16vsj2kf3066dyhjik1zl4"; depends=[]; };
   MDM = derive2 { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
   MDMR = derive2 { name="MDMR"; version="0.5.1"; sha256="1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x"; depends=[car CompQuadForm lme4]; };
   MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; };
@@ -2055,7 +2090,7 @@ in with self; {
   MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
   MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; };
-  MESS = derive2 { name="MESS"; version="0.5.2"; sha256="159vnyyab31s871j5hcqwn1g1zp18ym08jz6jcgiamwn0aprbzny"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  MESS = derive2 { name="MESS"; version="0.5.3"; sha256="0m2pb1n7nhwhpygxqhxhi9qyiqjqspz607anli1qrhhwymhhis2i"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
   MEclustnet = derive2 { name="MEclustnet"; version="1.2.1"; sha256="1pznisvvgshqbixyj8jya35yhmmpxxa1ivh48c9iafgapwc4yn4s"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; };
   MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
@@ -2075,14 +2110,14 @@ in with self; {
   MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; };
   MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; };
   MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-  MIAmaxent = derive2 { name="MIAmaxent"; version="0.4.0"; sha256="0i2bw9s9zm2bfi121aafaqf86zvimf4gzix50wdh2q96bn61bb2s"; depends=[dplyr e1071 raster]; };
+  MIAmaxent = derive2 { name="MIAmaxent"; version="1.0.0"; sha256="0sjhzai54g7849a39vx902xik3k4my8sx2b47am2147nv8xz8ydi"; depends=[dplyr e1071 raster]; };
   MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; };
   MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; };
   MIIVsem = derive2 { name="MIIVsem"; version="0.5.2"; sha256="0i144v2qjqb26vjym1lh3hbikm882hrwx6kz2ajrica59gyryr37"; depends=[boot car lavaan Matrix numDeriv]; };
   MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
   MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
   MIRL = derive2 { name="MIRL"; version="1.0"; sha256="1l52zpd00rm77vlk4lgnlviz18f7079a4n1gvlmr5syib7cvhfxs"; depends=[boot glmnet MASS mice]; };
-  MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; };
+  MIXFIM = derive2 { name="MIXFIM"; version="1.1"; sha256="1xx25b7hfyzynfh3vsqrkriqnqnn173gn8j1vwqmc434c1vy4nx2"; depends=[ggplot2 mvtnorm rstan]; };
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
@@ -2093,13 +2128,11 @@ in with self; {
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
   MLGL = derive2 { name="MLGL"; version="0.5"; sha256="020z18x5hlc1v975a7wi6vlairl8w7prjsfsvdiydl6xh56pdrr9"; depends=[FactoMineR fastcluster gglasso MASS Matrix]; };
   MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
-  MLML2R = derive2 { name="MLML2R"; version="0.3.0"; sha256="0dwhxb20f6y8daaq5684dzwcl5qpvmbqzlmwa6nkbbchpdcphjhz"; depends=[]; };
+  MLML2R = derive2 { name="MLML2R"; version="0.3.1"; sha256="1s4d4w9hlvllngdm0l1g9qlxzz8g8r4rl08k3ivjwpy46ay7lyqr"; depends=[]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
   MLZ = derive2 { name="MLZ"; version="0.1.1"; sha256="1x2mmd7rb6rk2qb84i7k71w8l14m5dvkwg1xpjqgy9lzqnwhxi45"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; };
   MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; };
   MM = derive2 { name="MM"; version="1.6-5"; sha256="0vi6wp6p48jjfmnspdsnmw0yqz39sjk6nrkxdw7kan5h17h4rwd7"; depends=[abind emulator magic Oarray partitions]; };
-  MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; };
-  MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
   MM4LMM = derive2 { name="MM4LMM"; version="1.0.5"; sha256="1kj0kq98fqsfaj2gahn16jnfj86jq1v6jnmcs5ml944yvhmwx5n3"; depends=[Matrix Rcpp RcppEigen]; };
   MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; };
   MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; depends=[DirichletReg]; };
@@ -2115,7 +2148,7 @@ in with self; {
   MODIS = derive2 { name="MODIS"; version="1.1.4"; sha256="0pyg59z17xmsxiilsamjpxickcp22lwqafqjcahsflg9gm0f0abk"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; };
   MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; };
   MODISTools = derive2 { name="MODISTools"; version="1.0.0"; sha256="0b3hdj26f1s07c9k67az3xl82wixzniqaidxz8269grx7vndjmsz"; depends=[httr jsonlite tidyr]; };
-  MODIStsp = derive2 { name="MODIStsp"; version="1.3.6"; sha256="1kilv20pknyrgxikcf5jbah2q95g1wdsvld6a9wy41vb4as743z6"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; };
+  MODIStsp = derive2 { name="MODIStsp"; version="1.3.7"; sha256="1rh6ll4jmpr013y9c571z4lj660449pwa0rz9ki6n1nghh96rnbi"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; };
   MOEADr = derive2 { name="MOEADr"; version="1.1.0"; sha256="0q0bm13v85raq5hdfpzg4v5kj12zjh31fr1x0zv9g5blxy10dqgy"; depends=[assertthat FNN]; };
   MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
   MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; };
@@ -2131,13 +2164,14 @@ in with self; {
   MPS = derive2 { name="MPS"; version="2.3.0"; sha256="0rr66f3ijzvqzj6b0hl7i065r5ndzcb2r5sjhx32rihgjdg60lr3"; depends=[]; };
   MPSEM = derive2 { name="MPSEM"; version="0.3-4"; sha256="0pj3gv2waxg5v1xv0qcwscq2c0g5w4w2b9ip3b761gs75mdy07g0"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+  MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.1"; sha256="1pvmrrh48q5kbk79gcv0cxy2l3cg65x0r3fy242kq3dfy13jb54d"; depends=[broom coda dplyr ggplot2 magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
   MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; };
   MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
   MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRFA = derive2 { name="MRFA"; version="0.2"; sha256="1ld9bchldx4y8g0zp2nr6r439f9vqy5xcr9bkv4g4vphm2c5zq72"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; };
-  MRFcov = derive2 { name="MRFcov"; version="1.0.35"; sha256="05x69gh21jxh49l2pbjkw4i30psf4wx3vpi0m0bi9vsaq7qjczrr"; depends=[caret dplyr ggplot2 glmnet gridExtra igraph magrittr Matrix mgcv pbapply plyr purrr reshape2 sfsmisc]; };
+  MRFcov = derive2 { name="MRFcov"; version="1.0.36"; sha256="19hqshxvkh2lsiv28wklb4b3khjsnpxdnq6w2ayvcqfqrbdwmpp9"; depends=[caret dplyr ggplot2 glmnet gridExtra igraph magrittr Matrix mgcv pbapply plyr purrr reshape2 sfsmisc]; };
   MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; };
   MRHawkes = derive2 { name="MRHawkes"; version="1.0"; sha256="0qhwm708jijv1w6iml18bg7fc2igdcmydwpb9dzpa4gwwads8b78"; depends=[IHSEP]; };
   MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
@@ -2184,9 +2218,9 @@ in with self; {
   MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
-  MXM = derive2 { name="MXM"; version="1.4.0"; sha256="1zbmysr2krkyzhnj46lc4grp1ram8axr2lkmwjsk5rv6mc1v2dfn"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
+  MXM = derive2 { name="MXM"; version="1.4.1"; sha256="0vcw518h80i49csrg5n5s35w8gsc7lxcsf85b9rdmmq277s2qzvy"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
-  MachineShop = derive2 { name="MachineShop"; version="0.1-1"; sha256="1clina395wf9xfnfql38wmcd2m8mqg8llgraw152flqgq04k9dh4"; depends=[abind foreach ggplot2 Hmisc irr kernlab magrittr MLmetrics ModelMetrics party recipes rsample survival survivalROC]; };
+  MachineShop = derive2 { name="MachineShop"; version="0.3.0"; sha256="190ivyq3c04lz08dq6pv57cs9p21f3h7wrg1hb0j03x5m9mjia2p"; depends=[abind foreach ggplot2 Hmisc irr kernlab magrittr MLmetrics ModelMetrics party recipes rsample Rsolnp survival survivalROC]; };
   Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
   MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; };
   Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; };
@@ -2198,6 +2232,7 @@ in with self; {
   MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; };
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.5.1"; sha256="1v7ly1yaglyh257b1q4vc7sfrk41lb4ar9dpwf5ppap581pgpz3f"; depends=[boot magrittr purrr]; };
+  MarketMatching = derive2 { name="MarketMatching"; version="1.1.1"; sha256="1rdrw4p48lfgl4mzyxvz8f4dgpsc2gszl2c1m9a6vi3k0z4z4qkv"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; };
   MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.1"; sha256="1dz5ig16yz5n8i1dqrbg5xjigryznk61br80fj20prq4qhsdsqi6"; depends=[gtools matrixcalc sandwich]; };
   MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; };
   Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; };
@@ -2208,7 +2243,7 @@ in with self; {
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-3"; sha256="00mw02379dg6da19glfz9bbbhz902b0ppp9p66rgayd0fmnk9gqz"; depends=[MASS]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-14"; sha256="15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9"; depends=[lattice]; };
+  Matrix = derive2 { name="Matrix"; version="1.2-15"; sha256="1mshhyia6imh939p8labxi0wv21lal7csmccxi42klpgdh1j89kv"; depends=[lattice]; };
   Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; };
   MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; depends=[]; };
@@ -2217,7 +2252,7 @@ in with self; {
   MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; };
-  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.1.1"; sha256="007m6irbkmgzaraghwg9gq5rv0vhn19dlg2vi02bs1b6h3s63wix"; depends=[dplyr futile_logger lubridate stringr]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.1.3"; sha256="1s4hjj7kn2zbyf7b59ywmbs494spz19s9bbxdzkv7bx684lwqvqw"; depends=[dplyr futile_logger lubridate stringr]; };
   MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.4"; sha256="0kwwnki9f67ma6dislf0h17c0jrlqm0n8qhfi0w7g129k820i33s"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; };
   MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
@@ -2241,18 +2276,19 @@ in with self; {
   MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.0.0"; sha256="1hsv1ci0a4gjwbfs1h0lxw5sczpk7hl5ws5016zry26cyvf75gzl"; depends=[AnnotationDbi Biobase boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper magrittr manhattanly Metrics multtest pheatmap plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite snplist stringr zoo]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.4"; sha256="1dflmm59p4dkrs8iad4b4sc9qcv0x8707irf62mznczlg4mrni4z"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
+  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.5"; sha256="0098flarh91mvc2ry6903fwxbk2r4193mmh6m7mldisfg9w6igfw"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
   MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.0"; sha256="0pmbq6f5dqq29h56wsrnq3nyk5s281jc8vh89h2wkbj9djay4bw0"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
   MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
   MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; };
-  MetaStan = derive2 { name="MetaStan"; version="0.0.1"; sha256="1byxgap5ky8z7mi7cpgv1lkm3xpc9g3pgkhcdcazx5sv4dj6rimf"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  MetaStan = derive2 { name="MetaStan"; version="0.0.2"; sha256="0vkyi5jy533swcgrml46jry0n4kclp59dkwm69g808ppl3lrjcif"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
   MetaSubtract = derive2 { name="MetaSubtract"; version="1.43"; sha256="15xjlzzjyx581kfr33jkn7gw6pnwrd1j7ic28425wzdigm8ym6h4"; depends=[]; };
   MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; };
+  MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
-  MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.0"; sha256="0crgdi7h8gl219lrb7i4f9jisgs7mkz45imwzh69acly4d2332ni"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rattle rpart]; };
+  MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.1"; sha256="13q8s96s71g7nyr6mi5q7jwmf4vx3pcr8l9ixqlc8hglnkd0y6rk"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
   MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; };
   Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
@@ -2299,11 +2335,11 @@ in with self; {
   MmgraphR = derive2 { name="MmgraphR"; version="0.3-1"; sha256="0nfv2cax2v2zhsbprwykngq5n6i5qcf8189rci9d48d5k9qm4a5r"; depends=[colorspace march msm TraMineR]; };
   MoEClust = derive2 { name="MoEClust"; version="1.2.0"; sha256="1is0k96czjqfr9z9kajz1qfqpa7b38pi1lyngzrj6y1hhgfrxywk"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
-  MoTBFs = derive2 { name="MoTBFs"; version="1.0"; sha256="09ymfgw6psc1y0dczvsrsw5cki58wn0d8vj56ydfylrxn24g3jfq"; depends=[bnlearn lpSolve quadprog]; };
   Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
+  Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.4.0.1"; sha256="1279k5hznxrb6fq4zd1baw1pm5dj5437g5awkgb8kp7ll8raa2ql"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
-  ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.0"; sha256="1sgdyrf6fbsn18gk8slir4a1yhv133kfhyg2crfs759nff4aw89h"; depends=[data_table Rcpp]; };
+  ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2"; sha256="158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6"; depends=[data_table Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.3"; sha256="1k2zwky0i15kypa9mdqc51qipah6pf1zgkrb6xc76xsavjyacfjm"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
   MomTrunc = derive2 { name="MomTrunc"; version="1.41"; sha256="0az499xzvnczqnbh4g3h5jyz8isq0zdw0x654haac6v6045f5xav"; depends=[matrixcalc mvtnorm]; };
@@ -2319,11 +2355,11 @@ in with self; {
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortCast = derive2 { name="MortCast"; version="1.2-1"; sha256="13g78q9165b6528pflrfrcay5fl151jy13497g9xcr7dxkjr8ms9"; depends=[wpp2017]; };
   MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; };
-  MortalityLaws = derive2 { name="MortalityLaws"; version="1.6.0"; sha256="0jn9gs17a5l83w5plwmiqssffjag470xx98ff1sq7ijn9ra513ih"; depends=[minpack_lm pbapply RCurl tidyr]; };
+  MortalityLaws = derive2 { name="MortalityLaws"; version="1.7.0"; sha256="1h3ihsgn8fyi7442k9pvnxpxscnsywp3f6hvasy6n9w2gq1ppfh3"; depends=[minpack_lm pbapply RCurl tidyr]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
   MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; };
   MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; };
-  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-2"; sha256="0hy6g0fgidjpz7mn1qwwdnhyxjm0v2g9r3fl32zmkvix3852qx1r"; depends=[boot coda digest ggplot2 gsubfn lattice pander plyr texreg xtable]; };
+  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; };
   Mqrcm = derive2 { name="Mqrcm"; version="1.0"; sha256="1z8zyjvjz1izaal5y6dnlm86pvydab45d9qnhcnibi2l9r1ladkc"; depends=[Hmisc pch]; };
   MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; };
   MtreeRing = derive2 { name="MtreeRing"; version="1.1"; sha256="1linz553ffmi1qhamxnj5znffpqxm8g0wgliwggjvkwrp3lqwgqx"; depends=[bmp dplR imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; };
@@ -2339,6 +2375,7 @@ in with self; {
   MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
   MultiFit = derive2 { name="MultiFit"; version="0.1.2"; sha256="0nyjyjznpl902mv9f05xzgh2y3ckv28zlp1wf87hpigly7491nyz"; depends=[data_table Rcpp RcppArmadillo]; };
   MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; };
+  MultiJoin = derive2 { name="MultiJoin"; version="0.1.1"; sha256="0cfk6yc5jagj9y8xybw6yg0yph4zah2vzaxv0384ad6r0r3x3nm8"; depends=[]; };
   MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; };
   MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; };
   MultiOrd = derive2 { name="MultiOrd"; version="2.3"; sha256="157bsd5x3cw2yyv5y1hccpn7v42lqf99w09m6kdm0rxnhgjm8k1v"; depends=[corpcor Matrix mvtnorm psych]; };
@@ -2364,11 +2401,12 @@ in with self; {
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; };
   NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; };
+  NBDesign = derive2 { name="NBDesign"; version="1.0.0"; sha256="15iwrhwpx2c72xg2jk743qgm85vfv4yhyi5i6pm84ya8drsij70p"; depends=[MASS PWEALL]; };
   NBLDA = derive2 { name="NBLDA"; version="0.99.0"; sha256="1fd6f43yhwvdb81r0b9hpmna5bphhqcgwiwjkpdyqz4h9cdmsj21"; depends=[ggplot2 sSeq]; };
   NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
   NCA = derive2 { name="NCA"; version="3.0.1"; sha256="11ajnhx840z5122ir2ijxcwqyr535acq4dnp7mah4h1y45krfdms"; depends=[ggplot2 gplots KernSmooth lpSolve progress quantreg sfa]; };
   NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; };
-  NCmisc = derive2 { name="NCmisc"; version="1.1.5"; sha256="1dq38ac97l8b6ys3yxqnndbrp8fa8zfw0lr4nq2421sn91769w22"; depends=[proftools]; };
+  NCmisc = derive2 { name="NCmisc"; version="1.1.6"; sha256="0ycc7b7z26a922hdjq8p4hjljjh09il24h3023k248pcsnbmka1a"; depends=[proftools]; };
   NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; };
   NEArender = derive2 { name="NEArender"; version="1.5"; sha256="006128psqxbyw3z4wqflc4xsir3d641r4flwkxmv836lp7fc2d9a"; depends=[hexbin MASS RColorBrewer ROCR]; };
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
@@ -2385,7 +2423,7 @@ in with self; {
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
   NITPicker = derive2 { name="NITPicker"; version="1.0.0"; sha256="0dls638mjkl8qnfx6gnzfa2ba8w6wcnq7np8lmvp9kw7fkqxnslb"; depends=[fda fda_usc fdasrvf]; };
-  NLMR = derive2 { name="NLMR"; version="0.3.2"; sha256="09z0spxr8wh06qmbnypqll87fhv9i0vyamqv26dcdhhrhgmidg56"; depends=[checkmate dplyr fasterize RandomFields raster sf spatstat tibble]; };
+  NLMR = derive2 { name="NLMR"; version="0.4"; sha256="08iy2niqfjijs2s0zkd5247rzslkmlk7969ag8y21mck190qqjs9"; depends=[checkmate dplyr fasterize RandomFields raster Rcpp sf spatstat tibble]; };
   NLP = derive2 { name="NLP"; version="0.2-0"; sha256="0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w"; depends=[]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
@@ -2402,10 +2440,12 @@ in with self; {
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
   NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
+  NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.1"; sha256="1bqhzzi0c0xw5piq5jng239wing01lsyn3s24hv3rfx3qxy0s0f0"; depends=[Rcpp]; };
   NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; };
   NPCD = derive2 { name="NPCD"; version="1.0-10"; sha256="1ag7j1r9j3piisg706hyhq8vaqfqvm1blxpkfxx7r1impjyqzyai"; depends=[BB R_methodsS3 R_oo]; };
   NPCirc = derive2 { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
   NPHMC = derive2 { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[smcure survival]; };
+  NPHazardRate = derive2 { name="NPHazardRate"; version="0.1"; sha256="0na4iphva1dadz457ii8kxrhnki2asaxpbwr824rljyrldj9rcgg"; depends=[survival]; };
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; };
   NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
@@ -2417,6 +2457,7 @@ in with self; {
   NSM3 = derive2 { name="NSM3"; version="1.12"; sha256="0spkzx2zm8q85h7ij9r52bsqlwgw2fsc7zw3aaz8644q0xlnjnvj"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.2.0"; sha256="04mn9lh4cl1hkz27z7ldqnfwmrvqi7m1zrvscpywdcilpjmcryv0"; depends=[]; };
+  NTS = derive2 { name="NTS"; version="1.0.0"; sha256="0xpaay5141bnlhsa8n4y61v1jbnckj3x6024bdryabq397ncs1nl"; depends=[dlm MASS MSwM Rdpack tensor]; };
   NTsets = derive2 { name="NTsets"; version="1.0"; sha256="08qzrfd8yp6w8ysp2nvqpnc9y7zxws90gplm2y5ajpv0vjjg66gm"; depends=[fBasics gWidgets gWidgetsRGtk2 nortest RGtk2 RGtk2Extras tseries]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; };
   NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; };
@@ -2443,7 +2484,7 @@ in with self; {
   NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.0"; sha256="1scza639kf3zzz2yd9q31wsvxpvpq8hbx82a206jkxlxb4dq6vxr"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; };
   NetworkInference = derive2 { name="NetworkInference"; version="1.2.3"; sha256="1l30xs7342cyczk7vnnhrz8ngbl1j7y9icvyfabvi9zj87rw788q"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.1"; sha256="08a2kk8gmgawr18n38z95imaf82lp453b8dam3nn1hsa3abl5c95"; depends=[corrplot doParallel fdrtool foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.2"; sha256="0rdpq6wxh220lc46ww6bkf6fcc8izlq4k8d0svhc6gmgnscp80gz"; depends=[corrplot doParallel fdrtool foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
@@ -2453,7 +2494,7 @@ in with self; {
   NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; };
   NlinTS = derive2 { name="NlinTS"; version="1.3.5"; sha256="0ihpkyzzd2k5izm84kynj211n8p3qym9hka86bzs3gm256j54q01"; depends=[Rcpp Rdpack timeSeries]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
-  Nmisc = derive2 { name="Nmisc"; version="0.3.3"; sha256="1dy9m8sfrns6mnk8j79ma71dmgvanl6jsj7sykyn7pijjfazw1zq"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble]; };
+  Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
   NonCompart = derive2 { name="NonCompart"; version="0.4.4"; sha256="0m62jwp572z7gn4rykyr47b6cfi4sy9hxxghhlkjdclkxw7bjxx9"; depends=[]; };
@@ -2463,11 +2504,11 @@ in with self; {
   NormPsy = derive2 { name="NormPsy"; version="1.0.8"; sha256="13w4xjdjjg9mzmfaflc0gp306kazyvxshpj4vnl6gym3vpi9qax8"; depends=[lcmm]; };
   NormalBetaPrime = derive2 { name="NormalBetaPrime"; version="1.1"; sha256="1sik3iqwqy3wgvxip6nz4gsxh27zpmgfzvpd2251bvc870j09a9w"; depends=[GIGrvg glmnet MASS Matrix pracma pscl]; };
   NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
-  NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
+  NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; };
+  Numero = derive2 { name="Numero"; version="1.1.1"; sha256="1mswi1069r9cvi0271qkj1zcm4gd0r9f79gchj7vsz6i9xas8l1b"; depends=[Rcpp]; };
   NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; };
   OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
   OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; };
@@ -2477,6 +2518,7 @@ in with self; {
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.1"; sha256="0j6kw32hq9gfiwmyh4zxx7ibfxplhass7q309y8r656lkhvr9nin"; depends=[checkmate deSolve]; };
   ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.1"; sha256="06s561450fimn1fvky56nvz9j0nzmbh1hm5x9p1zygsxvzgrks36"; depends=[checkmate deSolve ODEnetwork sensitivity]; };
+  ODS = derive2 { name="ODS"; version="0.2.0"; sha256="0i7giibass7hadvv6mb7k9xrykgfss57jmm6gpbym8qcywhzq4ny"; depends=[cubature survival]; };
   OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; };
   OECD = derive2 { name="OECD"; version="0.2.3.999"; sha256="02bldn2c5cnjx171ckqrrb06v50m7zps20sb6k1crmx550vmgajc"; depends=[httr rsdmx xml2]; };
   OGI = derive2 { name="OGI"; version="1.0.0"; sha256="0qw55jamkvdf3vfa5c0ygbymbs4d9q15dihiqz691hdfnyjvc2mk"; depends=[lpSolve]; };
@@ -2495,20 +2537,21 @@ in with self; {
   ORIClust = derive2 { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
   ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
   OSCV = derive2 { name="OSCV"; version="1.0"; sha256="17wrfak6b6m2l3iqbhdwcfh0rlqb14rkvrbari7v46gya9v7hq20"; depends=[mc2d]; };
-  OSDR = derive2 { name="OSDR"; version="1.1"; sha256="0wwyqsvni3szbmq953bhxld4172jp1knr2farw06b0bbdglx3q7w"; depends=[]; };
+  OSDR = derive2 { name="OSDR"; version="1.1.2"; sha256="0p7kfmby9fbg3x61khfxf0381830gph82yadl2f9da494ysc1l0l"; depends=[]; };
   OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; };
   OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; };
   OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; };
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
   OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; };
   OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
+  OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; };
   Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="3.0.0"; sha256="0dk8asv5v0qiqqf45r3hhh67sa03qdkpgsss649mp2pxzm8chv1y"; depends=[measurements outliers rgdal rgeos seg spdep]; };
   Observation = derive2 { name="Observation"; version="0.2.0"; sha256="0v81manzcvv8x9hbf75c8klslzdabha53rasyba91vvcbrshhq6j"; depends=[AGread svDialogs]; };
   OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; };
   Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; };
   Ohmage = derive2 { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
-  OjaNP = derive2 { name="OjaNP"; version="0.9-10"; sha256="1kljbnwky6b9d6sakarhw6ckrjbrpw117d81ykgl5z7l4p6cvvsh"; depends=[ICS ICSNP Rcpp]; };
+  OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; };
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
   OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; };
   OmicsPLS = derive2 { name="OmicsPLS"; version="1.1.0"; sha256="16q226y8wshjdry538w6zk116rip97hr5bfjyz8g960gy40pjn6j"; depends=[ggplot2]; };
@@ -2521,7 +2564,7 @@ in with self; {
   OpVaR = derive2 { name="OpVaR"; version="1.0.5"; sha256="14kq95i8n0g1wy3s32llw3803qzkxlyz9307clc1bwzi0wp22x5f"; depends=[actuar evmix goftest MASS pracma ReIns tea truncnorm vcd VineCopula]; };
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
-  OpenImageR = derive2 { name="OpenImageR"; version="1.1.1"; sha256="0g2s3qgzbfmz89qiybflzqxsx60n9rr3718vg155hg117xnchr5c"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; };
+  OpenImageR = derive2 { name="OpenImageR"; version="1.1.3"; sha256="0hg0vzmvxnsbamxnfk1n9smvnfyc7xq0zgd6znk3bfid8y0xrxix"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; };
   OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
   OpenMx = derive2 { name="OpenMx"; version="2.11.5"; sha256="19vsy1dc25jix0jxysdwbgsv0d8yv1p62jzvv8zvrwapk0rfyy0z"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
@@ -2548,6 +2591,7 @@ in with self; {
   OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; };
   OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; };
   OscillatorGenerator = derive2 { name="OscillatorGenerator"; version="0.1.0"; sha256="0zqw8l955msxkdviw5vd493749zwc22qby9mfmyqnqqmq0pyjw4w"; depends=[]; };
+  OsteoBioR = derive2 { name="OsteoBioR"; version="0.1.1"; sha256="010l1xhsns1mmc6x6w1kpvzlxms5b92yg379ym2shldyy9dkaj3r"; depends=[BH ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
   OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-16"; sha256="1ffqfr1pwlf53ahbh01ygv3d2d8fl47k9kk61l2h0g4h601swadi"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
   OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; };
   OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; };
@@ -2589,17 +2633,18 @@ in with self; {
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
   PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
+  PCMBase = derive2 { name="PCMBase"; version="1.2.7"; sha256="1siahn1l22lb0lihvkpbmvii17p6sfhg9i74bsg4yk58r4vrh87f"; depends=[ape data_table expm ggplot2 mvtnorm]; };
   PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; };
   PCPS = derive2 { name="PCPS"; version="1.0.6"; sha256="0mihkivlpycqbzc3z8clsmiqg3c6hqnapk29h794lf99had03hp8"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; };
   PCRedux = derive2 { name="PCRedux"; version="0.2.6-4"; sha256="0nya5fx06mic7knfkzddny9lxqwk039kz0d3mf32rixwlbhrdlr5"; depends=[bcp caret changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR randomForest robustbase testthat visdat zoo]; };
   PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
   PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; };
   PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; };
-  PDFEstimator = derive2 { name="PDFEstimator"; version="0.1-0"; sha256="1apw4q8x6x2hv0s5b57s667xv1k51lgqlb61xvvkfgzawvwc6x4p"; depends=[]; };
   PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; };
   PDN = derive2 { name="PDN"; version="0.1.0"; sha256="082ydvwcjc2rs7hlakrkgbbm9c419m408a14a9dgfdwm16yif3jd"; depends=[ggplot2 glmnet network survival]; };
   PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; };
   PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
+  PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; };
   PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; };
   PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
   PELVIS = derive2 { name="PELVIS"; version="1.0.4"; sha256="0gw4bxck9fvkpbqls3rj0lwjcnw7i2x3f5whiglhd712j2m63ayq"; depends=[MASS shiny]; };
@@ -2621,6 +2666,7 @@ in with self; {
   PKNCA = derive2 { name="PKNCA"; version="0.8.5"; sha256="0lklg2w1rcas70rj72q390n6lkxq557731a90b7plh2g32xsp32k"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; };
   PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
+  PKconverter = derive2 { name="PKconverter"; version="1.3"; sha256="1ddhj1qwdwr6g89q55l9njm1ms1wr80d56klz50ai9xvb91qzn89"; depends=[shiny shinydashboard shinythemes]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
@@ -2631,8 +2677,8 @@ in with self; {
   PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.0.11"; sha256="1v8h66l602zd74mw73ygsy667nqg8p0k0wqhbsjl1imafl207s5d"; depends=[impute]; };
   PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; };
-  PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.0"; sha256="1x3x2fhbihjfipkwdykqfb1i70dgj1wy785wb5w98ddwzfknkjrq"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
-  PMmisc = derive2 { name="PMmisc"; version="0.1.1"; sha256="1wyafrq9j212bbmpp6lnspxib6ca9860vp3xm9ndn8b374hv7s6r"; depends=[robust]; };
+  PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.1"; sha256="076nzcnky3c3rp88b9vkqxsvws8jy81yb2aw8sa1ddz6b9hx0f4i"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
+  PMmisc = derive2 { name="PMmisc"; version="0.1.2"; sha256="03bavk7ylmrrcc49zy9fb2q08w6138b3srxa4x038syr115k3l6k"; depends=[ggplot2 robust]; };
   PMwR = derive2 { name="PMwR"; version="0.10-1"; sha256="0z32cfa46mhmwnvlqpw6md9dyyy2hn5mwlrf2v4lx1b1gxqskjpd"; depends=[crayon datetimeutils fastmatch NMOF orgutils textutils zoo]; };
   PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.3"; sha256="1mckjb6q7ffvzsifjwc411p9r1vykvczk6v7lcsmpzliifgc0ys4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
   POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; };
@@ -2640,6 +2686,7 @@ in with self; {
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
   POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; };
+  POUMM = derive2 { name="POUMM"; version="2.1.2"; sha256="0pspx3xsixn98diw8sklzgr3lfvxmxn9fnn6m1lcf5byw1i9xhan"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; };
   PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; };
@@ -2653,13 +2700,15 @@ in with self; {
   PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; };
   PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.4"; sha256="0rsffbmaaqa6zkgh7bg1l91xfk8ri7b1w6ghid44xvj3k22y0kj6"; depends=[DiagrammeR]; };
+  PROMETHEE = derive2 { name="PROMETHEE"; version="1.0"; sha256="1dh3k7di9n818kzmvsjpypq9wr9df2fviww7h84wazjhkbrkfl9a"; depends=[]; };
+  PROSPER = derive2 { name="PROSPER"; version="0.3.0"; sha256="1xrzsayrkna1njz77kwikzyyinfsny2jahv829w789698azr1ms4"; depends=[data_table]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
   PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; };
   PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; };
   PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; };
   PReMiuM = derive2 { name="PReMiuM"; version="3.2.1"; sha256="0cn08w7kw0j0z8nqv380m7xs35f4mlhzx0jyzyqk811v9jzk0jii"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen rgdal spdep]; };
-  PResiduals = derive2 { name="PResiduals"; version="0.2-5"; sha256="05jk543lv8isbxv24cbzqh80l6xs05lx2k9xzz7s0121vb2yd3v4"; depends=[Formula MASS rms SparseM]; };
+  PResiduals = derive2 { name="PResiduals"; version="0.2-6"; sha256="11r0zn626s701hprjy634a7d3v3sq6lmlzpamv02609fg8wjhy9h"; depends=[Formula MASS rms SparseM]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   PSCBS = derive2 { name="PSCBS"; version="0.64.0"; sha256="02970zk7gkwi1d6mp82z1mbg8pjxf1pdwwv8j9wiqyfdily935i1"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; };
@@ -2668,7 +2717,7 @@ in with self; {
   PSM = derive2 { name="PSM"; version="0.8-12"; sha256="0h83b7bhslgnrq4442464i9iil6gjhw3pwxvgz5313pfk2km30vg"; depends=[deSolve MASS numDeriv ucminf]; };
   PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.1"; sha256="1vc13klv1iwyxb4srv4hi88v62hxbm244fg1lj8k5z11kmyii80n"; depends=[pkgbuild]; };
   PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; };
-  PSTR = derive2 { name="PSTR"; version="1.2.1"; sha256="0vydm3s7m6fkwfnrfs29hwq7z5zfhrxx1ryvr3wrw1481ir29nc2"; depends=[ggplot2 magrittr plotly snowfall tibble]; };
+  PSTR = derive2 { name="PSTR"; version="1.2.3"; sha256="16iipz8j1v2wxwg90bhvafbb8hsnfmxbq067gg4kabmpla0gnqp5"; depends=[ggplot2 magrittr plotly snowfall tibble]; };
   PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; };
   PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.6"; sha256="0y2zqvm2d9minpc22ndq6mar3brbv9k6s1apl19zwpc8h5g3jx5l"; depends=[doParallel foreach survival]; };
@@ -2692,6 +2741,7 @@ in with self; {
   PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
+  ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.0.1"; sha256="0m6pz9cv1ifj6xc6a216ky5vs9g4dwdwn3gbqrlqkg42n1ndkwnc"; depends=[data_table dbscan foreach GauPro]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
   ParallelForest = derive2 { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
   ParallelLogger = derive2 { name="ParallelLogger"; version="1.0.1"; sha256="01wb7rqlyp07ahcr4gs0jh92z56v9dsgkbp18y2xdnl7z533fjbh"; depends=[jsonlite snow XML]; };
@@ -2701,13 +2751,14 @@ in with self; {
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
   PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; };
-  Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.0"; sha256="1wwfq0zwf2b2wlq4pwhw92d02f715l7bkc0si7gndk0mp2pibcrx"; depends=[]; };
+  Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.1"; sha256="1js7rfzy3qiv2prp398rw7b4mv6n8dk7n2chvc1mc3fgwfgz1c3x"; depends=[]; };
   PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; };
   PatternClass = derive2 { name="PatternClass"; version="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; };
   PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; };
   Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; };
   PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; };
   PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; };
+  PeakSegDisk = derive2 { name="PeakSegDisk"; version="2018.11.28"; sha256="153305pfih4yz33hj15ffnwyx3mhr67f6v68rxdkwdqzchy4jgv9"; depends=[data_table]; };
   PeakSegJoint = derive2 { name="PeakSegJoint"; version="2018.10.3"; sha256="0f0dw6swhhf301j4ci3rs8cmzd39dcjlb0kqxpdh7f00gp3qn7da"; depends=[PeakError penaltyLearning]; };
   PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; };
   Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
@@ -2726,11 +2777,12 @@ in with self; {
   PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.2"; sha256="01bgm57z079g6r505w3bj293zkbd49fwa8sg55z87vizwavipml6"; depends=[quadprog xts zoo]; };
   PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; };
   PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
+  PerseusR = derive2 { name="PerseusR"; version="0.3.4"; sha256="1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p"; depends=[Biobase plyr stringr XML]; };
   PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
   PetfindeR = derive2 { name="PetfindeR"; version="1.1.3"; sha256="1dkiawadfsb8akssnhddd64bn6dq6r95c7j4g3mkbq6fs9106h8x"; depends=[dplyr httr jsonlite plyr]; };
   PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
-  Phase123 = derive2 { name="Phase123"; version="1.8"; sha256="0n3prfbsav36an13q5bkxprchqf7i8m1mv1nivkcqxngiah8z1md"; depends=[Rcpp RcppArmadillo survival]; };
+  Phase123 = derive2 { name="Phase123"; version="2.0"; sha256="1sir9b1zqmbzirsc4fwkc7jmhjzrz37qlidldry6q46p4p9fpwga"; depends=[Rcpp RcppArmadillo survival]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.1"; sha256="08bchanqs5ljihzxqy77vvq4kzqwn733jkppjdk4w6g65mq211bl"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
@@ -2798,8 +2850,8 @@ in with self; {
   PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
-  ProFit = derive2 { name="ProFit"; version="1.2.3"; sha256="00363b2in0lnspn5krwyvzpllyg249pq1vpy1sf51js45yhzw14f"; depends=[celestial cubature FITSio LaplacesDemon magicaxis RColorBrewer]; };
-  ProFound = derive2 { name="ProFound"; version="1.1.0"; sha256="1rnzzvwdkcjmcij32s9lc0i6dgc8y8lmkyf7226wdqxpcr4cz0kz"; depends=[celestial data_table FITSio magicaxis RColorBrewer]; };
+  ProFit = derive2 { name="ProFit"; version="1.2.4"; sha256="1frcr40qlraysb5v0cwffbdys4658b4x8kshpmk2z9363z9arc0d"; depends=[celestial cubature FITSio LaplacesDemon magicaxis RColorBrewer]; };
+  ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.5"; sha256="19ilj03w5jpc1hw5avyb780iy3rdbby3kliym0si2zv6gyi9k541"; depends=[audio lattice signal tuneR XML]; };
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
   ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; };
@@ -2807,6 +2859,7 @@ in with self; {
   ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
+  ProjectManagement = derive2 { name="ProjectManagement"; version="1.0"; sha256="06vly1pbg1mcx97d0x7ph3fxjbyap4l108cpchaglx1lk6m378k2"; depends=[cooptrees plotly triangle]; };
   ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.8.2"; sha256="1yxfx7vi1vvwlk5wzjlkv7q591hq6a5jdv4brzb6v670fmw21kvd"; depends=[]; };
   ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.7"; sha256="1nammbm9hjsgb46cqvhwx45lfaaxw13d12q43fgwk411a91rblm1"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; };
@@ -2834,10 +2887,10 @@ in with self; {
   QCGWAS = derive2 { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
   QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; };
   QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; };
-  QDComparison = derive2 { name="QDComparison"; version="1.0"; sha256="1gn9r4vylwg483diafc5qy6wx5xhrr8nrxliwc32m6b6psblkvwz"; depends=[]; };
+  QDComparison = derive2 { name="QDComparison"; version="2.0"; sha256="1mvhhq6f8cipqrxj97v2n9a08qvmfka527cax4m0nsrkciijjxq9"; depends=[]; };
   QFASA = derive2 { name="QFASA"; version="1.0.2"; sha256="1gfclbalcfcfmb8bq7rp8kpnaqblai9y7n7n7zh4a3qmia5vrz2b"; depends=[Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
-  QGglmm = derive2 { name="QGglmm"; version="0.7.1"; sha256="0hgs99vfan2nsz5i98an5z65lyw3a3ddhwzl0ffvlngw7gnshzqd"; depends=[cubature]; };
+  QGglmm = derive2 { name="QGglmm"; version="0.7.2"; sha256="0w1lqknvap3x1kkhx780sfgps3aqiwhl488lk13zz4yji7fcklx3"; depends=[cubature]; };
   QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; };
   QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
@@ -2865,6 +2918,7 @@ in with self; {
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
+  QuantumOps = derive2 { name="QuantumOps"; version="1.0"; sha256="0jhq8kr3dpwi2dm4n44ljyzr6bd0n7wjg3b2mcbaid8r1dpn87pa"; depends=[]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; };
   R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.16.0"; sha256="1f4jsa7b425rm1a0d00njx0pgvrvnhzf0xz2asq4yjhm4rhz0pbz"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
@@ -2874,6 +2928,7 @@ in with self; {
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; };
   R_oo = derive2 { name="R.oo"; version="1.22.0"; sha256="0k6xwy93fpb2p7bs76lzk52br9rv5xnd9524xj8qyazv1132x1n0"; depends=[R_methodsS3]; };
   R_rsp = derive2 { name="R.rsp"; version="0.43.0"; sha256="0ax6781kfylx0acz0i3sqnpkxmrq73x29wwfic59ng7vj0ws0gyd"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
+  R_temis = derive2 { name="R.temis"; version="0.1.0"; sha256="046x4r5a3w87a7fk3iyx9x4c7h2bfz0raxwk8vhslf6ql8y7skan"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; };
   R_utils = derive2 { name="R.utils"; version="2.7.0"; sha256="0cxhn14a57x4gcyrwpfz1d6dw4xh0jcpqkb33hx8imnr340blh7n"; depends=[R_methodsS3 R_oo]; };
   R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
   R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
@@ -2883,6 +2938,7 @@ in with self; {
   R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; };
   R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-5"; sha256="09p8xrxhcf6biy1mffv31p2hlr19s51f3n67az52f3xv5lyp9wm8"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; };
   R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; };
+  R2STATS = derive2 { name="R2STATS"; version="0.68-39"; sha256="09gnccadbrk4zv809vij8b1yj2p4iv27swbm2v9y5045q54jwl37"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
   R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; };
   R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
   R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; depends=[coda lattice]; };
@@ -2902,11 +2958,11 @@ in with self; {
   RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; };
   RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; };
   RANN = derive2 { name="RANN"; version="2.6"; sha256="1r6rivh9ba4gwnzryip0aiwsbm46zma7nvd9z5y456p2dgzp9lii"; depends=[]; };
-  RANN_L1 = derive2 { name="RANN.L1"; version="2.5.1"; sha256="0npkbphdk5m8lpga874yv8vld38ikn2rk8r5ysg0n4vcd1jxr1ac"; depends=[]; };
+  RANN_L1 = derive2 { name="RANN.L1"; version="2.5.2"; sha256="1hanh3my84mdr5wy6b89fawqzfc184vff1y65wy4l5ld9qza1n44"; depends=[]; };
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
-  RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; };
+  RATest = derive2 { name="RATest"; version="0.1.4"; sha256="1r5r10nkdcwrk13hfpv5b7apb0zq6hwxwg22i6smig447s4gk5h3"; depends=[ggplot2 gridExtra quantreg]; };
   RAdwords = derive2 { name="RAdwords"; version="0.1.17"; sha256="1w6fkg7a5dp6s80fzcgs65f0d7qp43l4yawh00ly0b750f2fnxvp"; depends=[RCurl rjson]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
@@ -2914,26 +2970,29 @@ in with self; {
   RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
   RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
-  RBesT = derive2 { name="RBesT"; version="1.3-4"; sha256="1p74vn1651vyc9ydrp80fimj13p5bwmc56paxbh91liqsw0sd4b2"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
+  RBesT = derive2 { name="RBesT"; version="1.3-7"; sha256="0ndm97x453bzchi9skrwp2a40kmxd927l5pyy0kshyhl4jckvqj2"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
   RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; };
   RCMIP5 = derive2 { name="RCMIP5"; version="1.2.0"; sha256="0bwp1ln0y48g2d0bj9b47y0rlwffzv0pi6gjfzv4sg5anhswc9x7"; depends=[abind assertthat digest dplyr Matrix]; };
   RCPmod = derive2 { name="RCPmod"; version="2.186"; sha256="0qxk6236xq391czyr043wn8rfml70gkc0xa6vz24s768gxmdk46l"; depends=[fishMod glmnet gtools MASS]; };
   RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; };
+  RCSF = derive2 { name="RCSF"; version="1.0.1"; sha256="0mqrv0bk17mm8ywicmns90n8g9h161hw1l77ji7hvadiv0y7vznq"; depends=[Rcpp]; };
+  RCarb = derive2 { name="RCarb"; version="0.1.2"; sha256="0yyg2b7hr0qnqwy6lia7vcznl06qavdplbnn0byvv8938v64ifvi"; depends=[interp matrixStats]; };
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
   RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; };
   RCircos = derive2 { name="RCircos"; version="1.2.0"; sha256="0jj4jj9qnj7pils99hzw9yx5bwi182q4afdsqh7w7d9kzhp6xl3z"; depends=[]; };
   RClickhouse = derive2 { name="RClickhouse"; version="0.4.0"; sha256="0lb0sgs2f78y2z5ip2wqml88vykrwkdhn3i36y9hyrm34ackis6h"; depends=[DBI dbplyr dplyr Rcpp yaml]; };
   RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
   RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; };
-  RColetum = derive2 { name="RColetum"; version="0.1.2"; sha256="1c5p3g2bcijp3pgq5jyh1w5r6ni0rnw5kqdz72misx4mapjf7apl"; depends=[dplyr httr jsonlite]; };
+  RColetum = derive2 { name="RColetum"; version="0.2.0"; sha256="0d0938vvlffqkbl7ild745j1x99dx04vsi18zm8m20waiqmv35q9"; depends=[dplyr httr jsonlite]; };
   RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
   RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.11"; sha256="1gwpikvd5r0fjxp4cbn3mz80d52xmlfgx07dk06lc35qylf0jakr"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.3.0"; sha256="0c002x07qgnn3vfrvyr12a2vk3dbrabi2qq9a3acnff7isk3hq1m"; depends=[httr lwgeom magrittr sf]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.3.1"; sha256="0zrsjq1mpbw9c0zd0mghy2yx5gjg472mm9gigz4sdx5w5lmabssq"; depends=[curl httr lwgeom magrittr sf]; };
+  RDFTensor = derive2 { name="RDFTensor"; version="1.0"; sha256="1yb57hcp161kx33rqfl4vqwcib72byxkxgn9j925bsmrw8ia4sdv"; depends=[Matrix pracma]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
   RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; };
@@ -2943,14 +3002,14 @@ in with self; {
   RDieHarder = derive2 { name="RDieHarder"; version="0.1.4"; sha256="0p37r45fy75a0is2mycvhrz705707acdb2858yd9qx70n6sg3jph"; depends=[]; };
   RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; };
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
-  REAT = derive2 { name="REAT"; version="2.1.0"; sha256="16yrpdvy33arjcdn6zq674vhkm4m819a6i6ls1scwd8ag9fv3zxj"; depends=[]; };
+  REAT = derive2 { name="REAT"; version="2.2.0"; sha256="1i6pj76k497wvl3a0x0klilyplnnqgizfbqxlyrdyhs5qyh5qq4c"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="1.3"; sha256="0byd7587vddffplzp8kc2aakab61pck2r25rajxfn0rsvl5yvxyx"; depends=[Matrix reliaR Rmosek]; };
   RECA = derive2 { name="RECA"; version="1.6"; sha256="0bb6phd7f8rrz7754bn6sp53jrvcl6xg6lkj330945xwia1dhpxi"; depends=[]; };
   REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
   REIDS = derive2 { name="REIDS"; version="0.1.0"; sha256="10mznsba9bmv9754zg6pzrwlrgkcki7zfr995nrlsg5fjphqyqg9"; depends=[aroma_affymetrix aroma_core biomaRt data_table GenomeGraphs lmtest MCMCpack RColorBrewer]; };
-  REPLesentR = derive2 { name="REPLesentR"; version="0.2.0"; sha256="0j3zlbmx5mfnp3cr9cf02f2yl8g2lji4smpzjhffx0hac2ina9y8"; depends=[dat knitr modules]; };
+  REPLesentR = derive2 { name="REPLesentR"; version="0.3.0"; sha256="1cfbf6r9p09ccia2f3pc2fz178zvrm3rwa6affyqr3gygpd1smb4"; depends=[dat knitr modules]; };
   REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
   REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
@@ -2960,12 +3019,13 @@ in with self; {
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
   REddyProc = derive2 { name="REddyProc"; version="1.1.5"; sha256="1f0r8pdyghqbgrncar83pj935crf80yqms48sj9yf1jal5px068b"; depends=[dplyr mlegp purrr Rcpp rlang tibble]; };
   REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; };
-  REndo = derive2 { name="REndo"; version="1.3"; sha256="02hk2azmhdbr28vf8fglljiccij0284ypjzkk9yh23rw7pnbdk4g"; depends=[AER corpcor data_table e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; };
+  REndo = derive2 { name="REndo"; version="2.0.0"; sha256="1ly7r9x650vhszb0wylzwhs36bqilnxhyaq8virbw4a9x1aapajh"; depends=[AER corpcor Formula mvtnorm optimx]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
   RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; };
   RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
+  RFishBC = derive2 { name="RFishBC"; version="0.1.1"; sha256="0fc8b5wiyj8gxvzvak9p2vj5whfw0m64aj8yfq24gb7704iv8m89"; depends=[clisymbols crayon readbitmap rlang settings stringr tidyr withr]; };
   RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
   RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; };
   RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; };
@@ -2978,6 +3038,7 @@ in with self; {
   RGF = derive2 { name="RGF"; version="1.0.5"; sha256="0dd3ziaprarvg2bmm1vci5fpqp2xfa6rk60zx2cagkqgnly152zn"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; };
+  RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; };
   RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.6"; sha256="05wbcdksx5g6y7x4r1pvc9is3afxbpdxdbmc6b4jhn46rg4228z4"; depends=[digest httr lubridate]; };
@@ -2999,15 +3060,16 @@ in with self; {
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
+  RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; };
   RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; };
   RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-16"; sha256="0rs5gzlpsn8ci4s2pqaarzwd6y41vv6l4188p93x0vl2jcpd77vl"; depends=[abind SparseM survival svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; };
   RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; };
-  RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
+  RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.1"; sha256="19ijpcics3pqh452w28d3x4badnnj1qy8l3rx5w433b4p0cc6rll"; depends=[]; };
   RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
-  RJafroc = derive2 { name="RJafroc"; version="1.0.2"; sha256="099q1ajngj147szdnnyx2yi8samc7vbjbvygafgwr20dbvp07wzg"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; };
+  RJafroc = derive2 { name="RJafroc"; version="1.1.0"; sha256="0qqilj5fpqjx6m6xc5xg0mhqvl801n40vmsccxal7h5wp7c3aazl"; depends=[bbmle binom ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; };
   RKEEL = derive2 { name="RKEEL"; version="1.2.3"; sha256="0w4ahialryzazla0xdfy6ci9v60sn57rmafhcpjp6vdjsy2r27r2"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
@@ -3048,13 +3110,13 @@ in with self; {
   RNOmni = derive2 { name="RNOmni"; version="0.5.0"; sha256="1vfyri5mpc67295kmqg1vxc1brg6piyljgv3k62f6k0ynvddyd9x"; depends=[abind foreach plyr Rcpp RcppEigen]; };
   RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
-  RNeXML = derive2 { name="RNeXML"; version="2.1.2"; sha256="0ax5mm8fa4rh1lqnhr9jspwnb6a098yja7ycssjj1lac0z7cs3c6"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr tidyr uuid XML xml2]; };
+  RNeXML = derive2 { name="RNeXML"; version="2.2.0"; sha256="0hi8dc1va1nvbzh66n76kfv5dzb6lla52nvwwvm80pz3kh80h88q"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr tidyr uuid XML xml2]; };
   RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
   RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; };
   RNifti = derive2 { name="RNifti"; version="0.10.0"; sha256="07sfzps4yg5zdhbxh6i4rbjvbjvvf2d8i9jcf64ywbmi557sw1zv"; depends=[Rcpp]; };
-  RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.1"; sha256="07ibpdh2z01jh9nmhs7lcz630fdq6lwal6w58np3axgcd91ch1mj"; depends=[ore Rcpp RcppEigen RNifti]; };
+  RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.4"; sha256="15sgp008pk7sqdziv62r0kcg9hsgi1zi04ap8b6y8l1r19pcryb3"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
   ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; };
@@ -3073,7 +3135,7 @@ in with self; {
   ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[clpAPI Matrix ROI slam]; };
   ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; };
   ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-0"; sha256="15b5151xmwmmqgiwj4sy1agc9abk8dd2q95lva3ilkjj2j8y0zrh"; depends=[DEoptim DEoptimR ROI]; };
-  ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-0"; sha256="1b5lbnynzkfj9wys8v8ly6g0fijk9vs6kk4pzgfp6pladdq3y35v"; depends=[ECOSolveR Matrix ROI slam]; };
+  ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-1"; sha256="1d409hc4cnd1q9d5ldylygis82a4ha1hfbqq36vn7n4xx89wf0k3"; depends=[ECOSolveR Matrix ROI slam]; };
   ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.3-0"; sha256="1a1vag47lfhiqmplrbkp95k36angpi9nvh0jd4cgy5y2416w22hn"; depends=[Rglpk ROI]; };
   ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-5"; sha256="0xampxba8s9kigxv4xj6nb8a7a02w1aj4ansj99z8m7qg0bg2ivv"; depends=[kernlab ROI slam]; };
   ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-1"; sha256="0i1skxk88s8cgxbr2hl5z8h88aqchrfs3206dfb92libw3yi1vas"; depends=[lpSolveAPI ROI]; };
@@ -3110,14 +3172,16 @@ in with self; {
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
   RPostgres = derive2 { name="RPostgres"; version="1.1.1"; sha256="1s25lkb69dkc5zk5ikbqa325jw5kfavghsq7s26mrcng4va9dz6i"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
   RPresto = derive2 { name="RPresto"; version="1.3.2"; sha256="14cwdm1r7x97l086hczrkaskx21agi7d8isklnkplchq5gnqs9ir"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
-  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.12"; sha256="0slyrlywvxg6m0yqarv3d2g7fmwbbhvgcd408hccp3klppl4dfsq"; depends=[Rcpp RCurl]; };
+  RProbSup = derive2 { name="RProbSup"; version="1.0"; sha256="1x4rnq49sh3if5fq863ymncya87yqxgwwpqfjghz8s4winfaf10y"; depends=[]; };
+  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.13"; sha256="0kq8y0jkjq3ggxr86yj7666n6pvhidhrrh2kjw9c7nij6phay9km"; depends=[Rcpp RCurl]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
+  RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; };
   RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
   RQEntangle = derive2 { name="RQEntangle"; version="0.1.2"; sha256="098s9wxcdxcarvrpn2r88kd9lyshiv9z42k6d2mlqkbcwxpz82vn"; depends=[iterators itertools]; };
   RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
-  RQuantLib = derive2 { name="RQuantLib"; version="0.4.5"; sha256="1q0i6dcyyfkdzpgp6s5izj3wa0280n7a0fv2gvlff9xlrmr3j27x"; depends=[Rcpp zoo]; };
+  RQuantLib = derive2 { name="RQuantLib"; version="0.4.7"; sha256="0km42yxkwrfapf0vrwjdyxvnbpfz9dyxbfpqcjy4cw0icgchzj6p"; depends=[Rcpp zoo]; };
   RRF = derive2 { name="RRF"; version="1.9"; sha256="1j8s07h0bn8imi0g1lkdwismisd6m4v454nldjp5jl11lffyiiaq"; depends=[]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
   RRPP = derive2 { name="RRPP"; version="0.3.0"; sha256="0f9p6z8lx63d3d34x6lbpiqq26mipa2rbffkk21z7r3qgb7adzil"; depends=[]; };
@@ -3128,11 +3192,11 @@ in with self; {
   RRreg = derive2 { name="RRreg"; version="0.7.0"; sha256="023yfx5mvpzdhns897ibijc7hbr1771c2k6h1yhiy4b7pnaxl0n6"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.12"; sha256="0ii7isrk6c1wb3clbwqzr37v2kypwszi4rjf4caip96bmh7jg3kq"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
-  RSAGA = derive2 { name="RSAGA"; version="1.2.0"; sha256="1fkwgjicw8yrnkq1r925c22nn8khz6afksba6jpvm1jbwlkmhpzw"; depends=[gstat plyr rgdal shapefiles]; };
+  RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; };
   RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
   RSCABS = derive2 { name="RSCABS"; version="0.9.3"; sha256="08ykkqx9rdx5s6wg2idxz35ddpsz1lir22vrjs92k51zq0jrkhv9"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
   RSDA = derive2 { name="RSDA"; version="2.0.8"; sha256="1lnqncjmqci6lbdm2pph6ankwb9vhwi7mvgjip2qvc2ydgyv6gy9"; depends=[abind dplyr FactoMineR ggplot2 ggpolypath glmnet lazyeval nloptr pander princurve purrr randomcoloR reshape RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; };
-  RSE = derive2 { name="RSE"; version="1.2"; sha256="0ypz24vag0ipkg04fl2gzqh77kmwryzml6sdsj0l27cczz1yzagw"; depends=[]; };
+  RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; };
   RSEIS = derive2 { name="RSEIS"; version="3.8-3"; sha256="1qrv41r17svz7dyzz1sik5zyqck29mzzxrjhj5q6mvrwag3x7fi5"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.2.0"; sha256="0rzmpx95ac8z625rz3sa9hgzv269q0fdq0crl8hdf1yyzrhrjr3d"; depends=[MCMCpack]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
@@ -3159,7 +3223,7 @@ in with self; {
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
   RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; };
   RStoolbox = derive2 { name="RStoolbox"; version="0.2.3"; sha256="06b54g186bwgl5g8wkbj6q05bdy6sqvx433xwwvj7az1qxpa5kwr"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
-  RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
+  RStorm = derive2 { name="RStorm"; version="1.0"; sha256="1n2kiy9b8w6rnv2zmzbl22grwibf619hadf2cjq1ch7rmbr7qb65"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSuite = derive2 { name="RSuite"; version="0.33-246"; sha256="0npaafcz4afpcyvwp7bjyc7vlsypid03rspwb00sf0z3v8k6k1r9"; depends=[devtools git2r httr jsonlite logging processx roxygen2]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; };
@@ -3176,7 +3240,7 @@ in with self; {
   RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.7"; sha256="16mrhbjg0s09vqxwllsm1q7wzx0kma7gfzyh0szhcf62z5y0a2x1"; depends=[future future_apply Rcpp]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-69-3"; sha256="18m4f1h0jnc8k03vpmyr8gcr4l6k0anjy660qrz8sqcaasp3ikj1"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-70"; sha256="1cxg5pc95sf3yiaglqis9qh7inzwqryk4z9nlxd4i06ys592wnp9"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
   RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.7"; sha256="08mhn6732sb284y4garx0nvhad4r42pk39p3r82fad4c1c3rxkhg"; depends=[]; };
@@ -3192,19 +3256,20 @@ in with self; {
   RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; };
   RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
-  RXshrink = derive2 { name="RXshrink"; version="1.0-9"; sha256="0lzh2asgxk7vjvb8zkshnhh49ybvj1rgca1mspg7hj3012rw6kjn"; depends=[lars]; };
+  RXshrink = derive2 { name="RXshrink"; version="1.1"; sha256="0m8fjcpiv4dp3p9819i3qwfrly5153jpn9v3d2yr674334s1drm5"; depends=[lars]; };
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
   RZigZag = derive2 { name="RZigZag"; version="0.1.6"; sha256="1sb1lmm5vnzkbzqxbmipkm2zb01zg2x15jgyrsplardyy8kpqxn7"; depends=[Rcpp RcppEigen]; };
-  RZooRoH = derive2 { name="RZooRoH"; version="0.1.1"; sha256="10l7i4fdjvq921ngbcd5kmbaq9zvl44p5clyd6zyq8d7598ffz77"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
+  RZooRoH = derive2 { name="RZooRoH"; version="0.2.2"; sha256="1y525363hd307nrllh1k7dnaiyfz3rslxjayqhxmlawknq0pbg6p"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
   RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
-  RaceID = derive2 { name="RaceID"; version="0.1.1"; sha256="0aw6jkjval1wm210i32znwjw1vsff8b95bam9fnss5rg1adha2j1"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne vegan]; };
+  RaceID = derive2 { name="RaceID"; version="0.1.2"; sha256="0587dy2hyq1mp7cbi0715pnl2874v9lkqj022nxqmck48p5gnl9v"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne vegan]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
   RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
   Radviz = derive2 { name="Radviz"; version="0.7.0"; sha256="0x1b3s3i3f775m7ragvzpdswljry8adbkjb6aq35aqasnkvvnysq"; depends=[gridBase hexbin KernSmooth MASS]; };
   RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; };
+  RainfallErosivityFactor = derive2 { name="RainfallErosivityFactor"; version="0.1.0"; sha256="16yrr2bl62m1nr81nzvmdq7s78f7fg50dah5dg5q4j4j7z8qfsqz"; depends=[]; };
   Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; };
   Rambo = derive2 { name="Rambo"; version="1.1.1"; sha256="036rvjj6gcnf2gg5xl55n5p8j1pzifb9wmlpwnymz1csxgkl477i"; depends=[sna]; };
   RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; };
@@ -3227,14 +3292,14 @@ in with self; {
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.8"; sha256="1d1b3rdp9zqz9x6xb7zmbs4yrz339qjvlhif7s8ifcz1zdpzzhal"; depends=[BH Rcpp]; };
   Rborist = derive2 { name="Rborist"; version="0.1-8"; sha256="0zr8vfbv11ascng7n2zv5xbqv7h0r0bycwn8bqlq8q10y2lyxg70"; depends=[Rcpp RcppArmadillo]; };
-  Rcan = derive2 { name="Rcan"; version="1.3.61"; sha256="1fbs72f5q5c9sn0m14izna2dpppjy4bgm4sfbhpybbkfkj567mqq"; depends=[data_table ggplot2 scales]; };
+  Rcan = derive2 { name="Rcan"; version="1.3.62"; sha256="1kvi2ks6y493qxrrlgzyh8az6d5iv820sblybn8k78ixvdam2iv4"; depends=[data_table ggplot2 scales]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
   RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
   RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; };
-  Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; };
+  Rchoice = derive2 { name="Rchoice"; version="0.3-1.1"; sha256="0nmbb6wfgz164fncljnsr11j2w1hi235hysxn1p2mgc6l301rqhm"; depends=[Formula maxLik msm plm plotrix]; };
   Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; };
   Rcmdr = derive2 { name="Rcmdr"; version="2.5-1"; sha256="0jw4bvv6wjznra6n9ad3hqvgfi5m9i8axyhms1kgqrcd5n4zcfcf"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
   RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.5-1"; sha256="10cnvk541cx8lzapra2104dn1kh780phzz29dwvfwrx4k9vfbh7i"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
@@ -3268,7 +3333,7 @@ in with self; {
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.3"; sha256="1rcr43dqyb9zw9av3awkz0640vmvhxrafal5brnhqnpg4hfbpma3"; depends=[lfstat Rcmdr]; };
   RcmdrPlugin_mosaic = derive2 { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc Hmisc Rcmdr vcd]; };
-  RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.6"; sha256="1n48yckr76j3wrspwyji0jvfn65cmpxplczx403x61sd0b4836xi"; depends=[orloca orloca_es Rcmdr]; };
+  RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.7"; sha256="01yd1a7l9r8mb3gqhx7rq9cr3clpjfzzsq7pply6xhv9g77gs88z"; depends=[orloca orloca_es Rcmdr]; };
   RcmdrPlugin_plotByGroup = derive2 { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; };
   RcmdrPlugin_pointG = derive2 { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
   RcmdrPlugin_qual = derive2 { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
@@ -3280,12 +3345,12 @@ in with self; {
   RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.19"; sha256="10mmiaawv9iwglc6z4y51mdpsfb1sivqmwr6xnfqkllcnpabdbk3"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="1.0.0"; sha256="1hlbw4k79q9ich4w27b01gsvwrsnrflii8zjlcmgfzm1vpq8ndxp"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; };
   RcppAlgos = derive2 { name="RcppAlgos"; version="2.2.0"; sha256="0sq482qzg3xa52ny2xfvj4vrrfnk0qng4fqmw5jfaqr806r7sbrp"; depends=[gmp Rcpp]; };
-  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.10"; sha256="08s86ak26zybawry6l6l30k1lakc71k2j58539h70dnrmsd15jna"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.100.5.0"; sha256="1iyjqhfjip1nxrkllzh7r1m01jjnx7cahqkf3s557w34p987f2l1"; depends=[Rcpp]; };
+  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.11"; sha256="1ik50ancfgcvh03n4jsqwjk8lf056rbgd70q4l4didmvh5kcyjd1"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.200.5.0"; sha256="09041jnalh7352kj6lv4d0xr9c0mvf8p860q5c8m13mp214x5x7k"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.5"; sha256="03r7qfhxmn20925yjvqs5cbm255yk4kbrvw16dl2r98argblcmmk"; depends=[Rcpp]; };
@@ -3296,18 +3361,19 @@ in with self; {
   RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
   RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; };
-  RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.4.0"; sha256="1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi"; depends=[Matrix Rcpp]; };
+  RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.5.0"; sha256="01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5"; depends=[Matrix Rcpp]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
+  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.1.11.1.1"; sha256="0rqw9rzfslld1hqwdrwpavcawgla8wwsfaidiqrv7xpgfbcv5hlf"; depends=[Rcpp RcppArmadillo]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
   RcppGSL = derive2 { name="RcppGSL"; version="0.3.6"; sha256="16pdapq31729db53agnb48jkvdm97167n3bigy5zazc3q3isis1m"; depends=[Rcpp]; };
-  RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; };
+  RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; };
   RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; };
   RcppHoney = derive2 { name="RcppHoney"; version="0.1.7"; sha256="1jnng6271i2a564y115mr2bq324xffcjpq0ysy8yar2cgljxgspr"; depends=[Rcpp]; };
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
   RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; };
-  RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.2"; sha256="0118ajmgl8gdc1cd47x0pnp4qglszc3j3izw98m6y2gkm3rnkzad"; depends=[BH Rcpp]; };
+  RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; };
   RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; };
   RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-2"; sha256="0j0hvwsbidahk2zx3zk7fhc6m9cca27iq3ivx7vdvggz8iqzszrz"; depends=[Rcpp RcppEigen]; };
   RcppParallel = derive2 { name="RcppParallel"; version="4.4.1"; sha256="1y37bpn6ifvlh8ilp78qx518dmal6s0lc16gk029hvy1rdlkr2ga"; depends=[BH]; };
@@ -3318,22 +3384,22 @@ in with self; {
   RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; };
   RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; };
-  RcppTOML = derive2 { name="RcppTOML"; version="0.1.4"; sha256="0pr941ljn5wc2cjinw8qbqv0x7aw1ssglfidy030v2rhnnv8s762"; depends=[Rcpp]; };
-  RcppThread = derive2 { name="RcppThread"; version="0.4.0"; sha256="0snrs66r19zha43xqkgcz1r15f7x8ifg1vyi0d7j175bkmin2jlb"; depends=[Rcpp]; };
+  RcppTOML = derive2 { name="RcppTOML"; version="0.1.5"; sha256="0d3rdrm0kl8kw98xlw13wpb0yx24hvin3yaq6i319gfkfz30pqzp"; depends=[Rcpp]; };
+  RcppThread = derive2 { name="RcppThread"; version="0.5.3"; sha256="1ndidhzzwxcg01kl867a1mm64zgxf4hiaf858zr7dfkr3gzdd3lp"; depends=[]; };
   RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.0"; sha256="0833j7hy7dpdxkj1m5cfyxzpp7j0n7mxjc5kx32mdn5s43iaf7yh"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; };
-  Rcrawler = derive2 { name="Rcrawler"; version="0.1.8-0"; sha256="03fp1yi8363zwzbzbw1v763r0d65352pp2wzfk6yq8f5h6jhiaxr"; depends=[data_table doParallel foreach httr selectr xml2]; };
+  Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; };
   Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
   Rcssplot = derive2 { name="Rcssplot"; version="0.3.0"; sha256="1qwrwzyqbwwwjf2zx6712q6wj629vf9rjrgscf0fim10fa6k5grn"; depends=[]; };
   Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; };
   Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.7"; sha256="0rfhhqibgxapbc9jrv08fnm3p5fqkhj7s9yj7kbcck0lygy1kpx4"; depends=[formatR roxygen2]; };
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
-  Rdimtools = derive2 { name="Rdimtools"; version="0.4.0"; sha256="0wlzzhs9a154r2p06zwn6pgvpall7gp56z6a2ish9gyb9152gsij"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; };
+  Rdimtools = derive2 { name="Rdimtools"; version="0.4.1"; sha256="1yjcplr79f6d6pr5cypkmsjrkazj648l48iigz9i37ldlxygw2qw"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; };
   Rdistance = derive2 { name="Rdistance"; version="2.1.2"; sha256="1c9vil4pjd49jmcv7vib98dv31gh794zcxhm30nbv8kx8n16xi0f"; depends=[]; };
   Rdpack = derive2 { name="Rdpack"; version="0.10-1"; sha256="0bbjnw88h54v40hzim00i8yd3p4rk9i84zfdmgcbnylscwvsf0av"; depends=[bibtex gbRd]; };
-  Rdrools = derive2 { name="Rdrools"; version="1.1.0"; sha256="0my2x5cwfnds0hjc03363l1ydfk5kch9bv8mj0hgwkjs4b7szw8r"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; };
+  Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
   Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
@@ -3371,7 +3437,7 @@ in with self; {
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.9.1"; sha256="1kd0ifiw5dd2rl6n5dq9i3bfr0f5r8pxfz8j1sxazf3xsq0zpini"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.9.2"; sha256="0bms39z69b91lcz53arc8sjilnbi3484hj20n6b2km5bfd3gl032"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfmtool = derive2 { name="Rfmtool"; version="3.0.0"; sha256="0hjy66b7d9xp4d8fzhs5zizvwlrdrmlmba2wf9fjraz5ysg0vnxv"; depends=[]; };
   Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; };
@@ -3380,13 +3446,14 @@ in with self; {
   Rgbp = derive2 { name="Rgbp"; version="1.1.3"; sha256="1340h5rzb4631h6aanrdjl4x4l0h6l5x61qqmckrdf08fw2625lp"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
-  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.2"; sha256="112mdm53qx92n2m4ms02sbppckp44l1z19vy99j6gw3jrdprjydl"; depends=[png]; };
+  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.3"; sha256="06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4"; depends=[png]; };
   Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; };
   Rhpc = derive2 { name="Rhpc"; version="0.18-204"; sha256="0ja2cx6sa8ihxnq96qhxfp43z5zd45b8jfb0y2rzzklnd7kj9kl1"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-205"; sha256="1ls2286fvrp1g7p8v4l6axznychh3qndranfpzqz806cm9ml1cdp"; depends=[]; };
   Ricetl = derive2 { name="Ricetl"; version="0.2.5"; sha256="0q87cxzqkkp2bk92q3wnxxsqlkafkd37lp5pki7f87a5vcxlcrak"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
   Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
+  RiemBase = derive2 { name="RiemBase"; version="0.2.1"; sha256="1k4xijs5qpdfw8kf1a0sbhl32lnblaakywwhzidns0srd7zs38k0"; depends=[pracma Rcpp RcppArmadillo Rdpack]; };
   Rilostat = derive2 { name="Rilostat"; version="0.2.1"; sha256="058qz5kn7p8wn3lvw92c11cqpkz9brgf1igmawfkb0lqvj366vyd"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; };
   Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; };
   Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; };
@@ -3398,13 +3465,13 @@ in with self; {
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.2.3"; sha256="02srz4726qkc0700fzdk4mk88dl8m84b0ysyrim19jq7yyhx3da0"; depends=[httr jsonlite Rcpp]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.2.4"; sha256="003qr7j38wlr1lwd4cpqxrkd3s7bdiy2da59b9024abs4y43g14n"; depends=[httr jsonlite Rcpp]; };
   Rlda = derive2 { name="Rlda"; version="0.2.5"; sha256="1wv5n1r7m9jimmv4dcih967hy6lmmgmywvch716rqdpayngp399h"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
   Rlinsolve = derive2 { name="Rlinsolve"; version="0.3.0"; sha256="1kvlpfrw4w2dykpdym9sg6h2ghavnm7lwxn6bzqldwg53wlinvxk"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
-  Rmagic = derive2 { name="Rmagic"; version="1.3.0"; sha256="13ai04py36lzppa4jswxvmsmm5j83afv17viiik5yglwjr9rbinj"; depends=[ggplot2 Matrix reticulate]; };
+  Rmagic = derive2 { name="Rmagic"; version="1.4.0"; sha256="0xf2zc9p0y9z2a26w79p3b7hggk78zyiszbyq269s0v6i3h29gy0"; depends=[ggplot2 Matrix reticulate]; };
   Rmalschains = derive2 { name="Rmalschains"; version="0.2-4"; sha256="1rzslwwp6ikp3zky2zlqylsd8nmhv13iz2h87kwxfkh3611x28yk"; depends=[Rcpp]; };
   RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.17.0"; sha256="09lrrxnkkfnbidnmag1czx2xzssdl09348nkc6pqgq6xz36a3mqc"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; };
   RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; };
@@ -3413,7 +3480,7 @@ in with self; {
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
   Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
   Rmpfr = derive2 { name="Rmpfr"; version="0.7-1"; sha256="0172px5ryi7i0gyyin9z2bzif8vnj292gk0s1w5p3c12g9hj2c4v"; depends=[gmp]; };
-  Rmpi = derive2 { name="Rmpi"; version="0.6-7"; sha256="1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"; depends=[]; };
+  Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; };
   Rnets = derive2 { name="Rnets"; version="1.0.2"; sha256="1mym5zd7717mq6dlnv9b3qry7cfa5ylp3h596dbnnq5b1rhbbfis"; depends=[data_table glasso igraph rlang stringr]; };
@@ -3435,7 +3502,7 @@ in with self; {
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
   Rodam = derive2 { name="Rodam"; version="0.1.4"; sha256="0vqhzy6gajkqh0pdckyc6cpxm97jb6bmw2vpcd0fi622fh63r0nl"; depends=[RCurl]; };
-  RonFHIR = derive2 { name="RonFHIR"; version="0.3.0"; sha256="1fxcaf1zzaahbywvkvafillyqi41ldfa0jdfn6m8hz0wls7b7mz1"; depends=[httr jsonlite R6 stringr]; };
+  RonFHIR = derive2 { name="RonFHIR"; version="0.3.1"; sha256="06sgjcm45cl1nqdglpqnfdzpiglipg5yq8rr7n3f2qnf4251q3j3"; depends=[httr jsonlite R6 stringr]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; };
   Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; };
@@ -3446,7 +3513,7 @@ in with self; {
   Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
   Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
   Rpoet = derive2 { name="Rpoet"; version="1.0.1"; sha256="1a1km5fbzvqwjgky0n31gpafi75s6afyqn0ivh15ikq40a3adir5"; depends=[httr jsonlite stringr]; };
-  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.8"; sha256="02zgmhcgawkqmc51m9cmkrawx96d2zqinnif13pqy0hibn94aibb"; depends=[digest futile_logger R6 rgl stringr testthat XML]; };
+  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.3.0"; sha256="1gpa3axbms7q1160xizkzsdj3kfyg3h28vz9vaac5hhwa7jzjir3"; depends=[digest futile_logger git2r R6 rgl stringr testthat XML]; };
   Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
   Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; };
   Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
@@ -3459,7 +3526,7 @@ in with self; {
   RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; };
   Rsmlx = derive2 { name="Rsmlx"; version="1.1.0"; sha256="1ljw8xnzr9asv1vxim86prm8wana6gy72388f273hv36vpr2h3w5"; depends=[ggplot2 gridExtra MASS RJSONIO]; };
   Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; };
-  Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.1"; sha256="09dsiic9bfy1yq7bwspidn6w21vff3jay8812abydz1l1fz4qv5i"; depends=[kohonen Rcpp]; };
+  Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.2"; sha256="11lnln0ll8yhq9v6s4snqyx97kb8ngg8r76p17217znb0f62zni0"; depends=[kohonen Rcpp]; };
   Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; };
   Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; };
   Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; };
@@ -3468,12 +3535,12 @@ in with self; {
   Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; };
   Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; };
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
-  Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; };
+  Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; };
   Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.7"; sha256="12hf9r3mhjr9sawdvf7qhjf1zph2q64f77i81jwvy7awidbm0kja"; depends=[]; };
   Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; };
   RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
-  Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
+  Ruchardet = derive2 { name="Ruchardet"; version="0.0-3.1"; sha256="1z4gzp12dh4mbx8f0rrdfj43r54wx7nizcmz3cn20rf166i423ls"; depends=[Rcpp]; };
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
   Runuran = derive2 { name="Runuran"; version="0.24"; sha256="1528jzpg0m4gya63xjf7ya4x1c96anm6bpzjgsa1vq1a4dz9m4y9"; depends=[]; };
   RunuranGUI = derive2 { name="RunuranGUI"; version="0.3"; sha256="1h2bcc443z8vp4hjf4vss4ds5n6zc6x70kmw13b2431f56jq12fa"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; };
@@ -3484,7 +3551,7 @@ in with self; {
   Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.8.0-8"; sha256="1kwgy39dl8vpg2g7ldalz0i54lcw8568x1rfnvflqk69zz11rdpj"; depends=[brew cli crayon digest dparser inline magrittr Matrix memoise mvnfast n1qn1 PreciseSums R_utils Rcpp RcppArmadillo rex]; };
+  RxODE = derive2 { name="RxODE"; version="0.8.0-9"; sha256="0km96arcyzzwv88fhvqaccmrsmll790k9rjqvnrqwsmmar86kn2z"; depends=[brew cli crayon digest dparser inline magrittr Matrix memoise mvnfast n1qn1 PreciseSums R_utils Rcpp RcppArmadillo rex]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.3-4"; sha256="05y7q6d69nmkgwy1ycw0kqv7hmif5yqsrly3p3psrfsbfvvjl3fj"; depends=[Rcpp xml2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
@@ -3497,11 +3564,11 @@ in with self; {
   SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; };
   SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
   SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; };
-  SAMM = derive2 { name="SAMM"; version="0.0.1"; sha256="1yyqci1c0xk5pqi09v3b7p5y0dwbrg1wlsyscfnw6qxwr707y23j"; depends=[Rcpp RcppArmadillo]; };
+  SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; };
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; };
-  SARP_compo = derive2 { name="SARP.compo"; version="0.0.7"; sha256="1z4md8qbk4k6akaxakf8njvn5mqpfzjclizvigyw41hwi03rxry3"; depends=[car igraph]; };
+  SARP_compo = derive2 { name="SARP.compo"; version="0.0.8"; sha256="04j93a61a7qg6vxv0l1p2574d2r9211mxswp5a677vavmgsrfhri"; depends=[car igraph]; };
   SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
@@ -3510,6 +3577,7 @@ in with self; {
   SASxport = derive2 { name="SASxport"; version="1.6.0"; sha256="1g8sfi61im9i04whybwqq4rl6glisbziqaag1mdfqykxryakjf04"; depends=[Hmisc stringi]; };
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SAVER = derive2 { name="SAVER"; version="1.1.1"; sha256="1jkyxnpvbm6zrhf2q9i98gchv786wh83mx0i1vnz2hqa766jk2nj"; depends=[doParallel foreach glmnet iterators Matrix]; };
+  SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; };
   SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
   SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; };
@@ -3548,6 +3616,7 @@ in with self; {
   SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; };
   SEMID = derive2 { name="SEMID"; version="0.3.1"; sha256="0q2lbcfl5yq2kihdfyql5n74bpf4d8z8vjkqwnpwxzmpg5qa5q32"; depends=[igraph R_methodsS3 R_oo R_utils]; };
   SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
+  SEMrushR = derive2 { name="SEMrushR"; version="0.1.0"; sha256="19prwbh429ra69nz3nx4vzqmb46xssci74rk9mhpnzbi52ycg5gd"; depends=[]; };
   SETPath = derive2 { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; };
   SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
   SFS = derive2 { name="SFS"; version="0.1.2"; sha256="119dh1pyvjna4k0m7nk601kyvm57jijqsr5aphzvgywhkmk9yzh9"; depends=[Rcpp RcppArmadillo]; };
@@ -3563,7 +3632,7 @@ in with self; {
   SIBERG = derive2 { name="SIBERG"; version="2.0.2"; sha256="0wfx1dpjd09gb736sm2xhrkba26nwnzn5x575h39n2g33jwqqy2r"; depends=[mclust]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.13"; sha256="10759nx2x3gy6zacn37fpr2dgx8j8ap8ic4infljfk0048f9in8w"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
-  SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
+  SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; };
   SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; };
   SIMMS = derive2 { name="SIMMS"; version="1.1.1"; sha256="1wgqz8zgijv5psz5r5zj9k63ikq5sr1dxqxvh48n2041slj6jdap"; depends=[doParallel foreach glmnet MASS survival xtable]; };
   SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
@@ -3571,6 +3640,7 @@ in with self; {
   SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.4"; sha256="1hyhjwkv26fpplzqrdh41r8j91la5j0jidbwnh2vla6s3wf7jg47"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; };
   SIS = derive2 { name="SIS"; version="0.8-6"; sha256="1749ks5iqlj6lrn0hglifj1iy86dcpqz2pcnf1l798pa05rq8ngd"; depends=[glmnet ncvreg survival]; };
   SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; };
+  SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; };
   SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; };
   SKAT = derive2 { name="SKAT"; version="1.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; };
   SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
@@ -3583,6 +3653,7 @@ in with self; {
   SMCP = derive2 { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
   SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
   SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
+  SMFilter = derive2 { name="SMFilter"; version="1.0.2"; sha256="0a2fj7l46n90ws95xg9y84n336s1n2pzl0gqvf87frr97f3g7vrc"; depends=[]; };
   SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; };
   SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; };
   SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; };
@@ -3596,7 +3667,6 @@ in with self; {
   SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
   SNPknock = derive2 { name="SNPknock"; version="0.7.1"; sha256="0pfgmwn28bcfc45bx66gwhl5l7jsqhl3a9562rijrbjfjy4f4sln"; depends=[Rcpp RcppProgress]; };
   SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
-  SNSequate = derive2 { name="SNSequate"; version="1.3.1"; sha256="1w6yai79996pgg98skfb63kha8rqjzn751nmxg961rc4id1g8ysn"; depends=[emdbook knitr magic plyr progress statmod]; };
   SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; };
   SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
   SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; };
@@ -3616,7 +3686,7 @@ in with self; {
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
   SPCAvRP = derive2 { name="SPCAvRP"; version="0.3"; sha256="1j4469ny70xsyaf9qa403yg0n63c1as6mkw7a6ql4h7aa53bz5sz"; depends=[MASS]; };
   SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
-  SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.6"; sha256="1py7vw1jfn9pf0xj1syyk7xv5593bilmzrb0p3iy85bks8iijlgx"; depends=[]; };
+  SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.7"; sha256="1ifbpbvmrwc9jn2sxhnbffxn6hn21is6ipm1zr1qawnxp3jsdcbr"; depends=[]; };
   SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; };
   SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; };
   SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; };
@@ -3625,7 +3695,7 @@ in with self; {
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
   SPOT = derive2 { name="SPOT"; version="2.0.3"; sha256="0xh2321611dyp8za5ydb92bx2kcrij0ah40lcx42s5ai31mackyl"; depends=[DEoptim MASS nloptr plotly randomForest rgenoud rsm]; };
   SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; };
-  SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
+  SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
   SPUTNIK = derive2 { name="SPUTNIK"; version="1.1.1"; sha256="1spzl3dhxf0715xibl9ny2v4xgikd8chwdzb3ari1sj82jx1544p"; depends=[e1071 ggplot2 imager infotheo reshape SDMTools spatstat viridis]; };
@@ -3652,14 +3722,14 @@ in with self; {
   SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
-  STARTS = derive2 { name="STARTS"; version="0.4-24"; sha256="0ghyan879i7jbzj228b604gfr91m5ybdszi3v8s7ix9yiqq518rw"; depends=[CDM LAM sirt]; };
+  STARTS = derive2 { name="STARTS"; version="0.5-28"; sha256="14iby34ngn6i6dj7rhg5ykkd4kg06966qpn31lakqpxj41lnxfvy"; depends=[CDM LAM Rcpp RcppArmadillo sirt]; };
   STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; };
   STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; };
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
-  STMotif = derive2 { name="STMotif"; version="1.0.0"; sha256="13qcayqvf60akk6y3gyhll1cz5mdllfn848i2241pz9appdgdsvy"; depends=[ggplot2 reshape2 scales shiny]; };
-  STPGA = derive2 { name="STPGA"; version="5.2"; sha256="1pllwr6x9nagf7l6w3m021bkhhp8l0l5zlc1jqrvj0irv6r2r7vp"; depends=[AlgDesign emoa scales scatterplot3d]; };
+  STMotif = derive2 { name="STMotif"; version="1.0.1"; sha256="008sgz4fd6cc38v0063s2i8vh93ghk43kg966pxxmpg4wjh4wvrc"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; };
+  STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; };
   STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; };
   STV = derive2 { name="STV"; version="1.0.0"; sha256="034d9qnvgmk97ah7r9w2hvnw39f7mxs2ml6y8dad94p8phl52gfw"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
@@ -3691,6 +3761,7 @@ in with self; {
   ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
   SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
   SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; };
+  SeedCalc = derive2 { name="SeedCalc"; version="1.0.0"; sha256="1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk"; depends=[]; };
   SeerMapper = derive2 { name="SeerMapper"; version="1.2.0"; sha256="1w1gpwf7n7y2czgj5ilmfljas9mps1ygbvvdrz9hjx9rcixrx594"; depends=[maptools RColorBrewer rgdal SeerMapper2010East SeerMapper2010Regs SeerMapper2010West SeerMapperEast SeerMapperRegs SeerMapperWest sp stringr]; };
   SeerMapper2010East = derive2 { name="SeerMapper2010East"; version="1.2.0"; sha256="1lgjxixdgmgxy79s34pz7k4khhw5x4hs8m6yg8qiq813w4byqkls"; depends=[sp]; };
   SeerMapper2010Regs = derive2 { name="SeerMapper2010Regs"; version="1.2.0"; sha256="0sb0l539cwh76559znvgbi1wcbs7h53pmk1m8jz853wc266f8ibx"; depends=[sp]; };
@@ -3707,7 +3778,7 @@ in with self; {
   SemNetCleaner = derive2 { name="SemNetCleaner"; version="0.9.9"; sha256="1pbp1h3kqgrdwr28psbrnd8i67rbff8hyldry46511zjmc8c7zaq"; depends=[qdap]; };
   Semblance = derive2 { name="Semblance"; version="0.1.0"; sha256="11mpqfpv7i5nqyn9s63bfphj35sh4gx4hjy0gc22sfqn0lmvl132"; depends=[fields]; };
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.1"; sha256="0m0primbkpjw4pmmabdgvp5l21aqfifnryga1rp2ng9cm5ncxxqg"; depends=[Formula MASS survival]; };
-  SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.4"; sha256="1dj8gj04yfn0lj83b90b4p0ilgphmzcalz95xw7xgvivww8yj1dg"; depends=[MASS numDeriv Rsolnp]; };
+  SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.5"; sha256="18ma6098zng3ckf082qhjl837g8ppn3gli8l8nfnxirg5ra8zflp"; depends=[MASS numDeriv Rsolnp]; };
   SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; };
   SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
@@ -3717,13 +3788,13 @@ in with self; {
   SensusR = derive2 { name="SensusR"; version="2.3.0"; sha256="1gzww80p11zqs90psfx3yl7ncdkq3l55bcs4dxzikrnf5maqa193"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
   SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-2"; sha256="18vycj9vpb32610sn321sbwdnjldyjm9idjw9spggdzj7gsiwwk3"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
   SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
-  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.7"; sha256="0qg1zpamcbjia2q8900yzihahb0y7kc48smxipncf8bb68256pyv"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
+  SeqFeatR = derive2 { name="SeqFeatR"; version="0.3"; sha256="1pj8pr2jfr7rvbnjgryg733201ixbbddmy3ljls44jbbizcrg271"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
   SeqKat = derive2 { name="SeqKat"; version="0.0.6"; sha256="0idxyn84rqsg26y6ml218g037qxrx9755ikasyn212qacc36in39"; depends=[doParallel foreach Rcpp]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   Sequential = derive2 { name="Sequential"; version="2.3.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
-  SetMethods = derive2 { name="SetMethods"; version="2.3.1"; sha256="0a8d476slmq1dpimmr1l97k2icjwr907rw463c9dqba82a3p8k7g"; depends=[betareg fmsb lattice QCA]; };
+  SetMethods = derive2 { name="SetMethods"; version="2.4"; sha256="06fcin03mvqbg4mk09ygn54li0wdyp57mv902c49zs9v4y8r88cs"; depends=[betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
   Seurat = derive2 { name="Seurat"; version="2.3.4"; sha256="0l8bv4i9nzz26mirnva10mq6pimibj24vk7vpvfypgn7xk4942hd"; depends=[ape cluster cowplot doSNOW dplyr dtw fitdistrplus foreach fpc ggplot2 ggridges gplots hdf5r Hmisc httr ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 reticulate ROCR Rtsne SDMTools tidyr tsne]; };
@@ -3732,7 +3803,7 @@ in with self; {
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.2.0"; sha256="1gw8wwdqbra4bccbcamqn2j7d853rga1vcvk1p6naih6vbnfqn2s"; depends=[matrixcalc sadists]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
-  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.8"; sha256="1ly2jzaziy0jipng3ahk1vm4lfrwqnjpmgrbrzm2k6rgpxrwjjn4"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr xtable]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.9"; sha256="0kc7503p3q0i5hv5yvvqmlh2dc0zarywyhcb700a01h29rgibi2q"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
   ShortForm = derive2 { name="ShortForm"; version="0.4.2"; sha256="0lfnafkkwfhqv984mrbd13inck1sdzn7rq1qdklfjwks89dx9ql9"; depends=[ggplot2 lavaan stringr tidyr]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
@@ -3743,7 +3814,7 @@ in with self; {
   SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
   SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
   SignifReg = derive2 { name="SignifReg"; version="1.0"; sha256="1360892wy0qc6dch3753s4a17l3pcijjmxd34zqvzl9534arlsxd"; depends=[]; };
-  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.2"; sha256="0166m9z2iir7qmfmjd3q7sbkdp0znlynqd2d3smb3yykcf312jbs"; depends=[Deriv MASS]; };
+  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.3"; sha256="1cffkqrk75p7a8p6hfbz3vz85cj75l5q2rw4cym5qqa1bni9911z"; depends=[Deriv MASS]; };
   Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; };
   SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
@@ -3752,7 +3823,7 @@ in with self; {
   SimDesign = derive2 { name="SimDesign"; version="1.11"; sha256="0ifn5ma8rh42d75cx2qmv6fbqrw8f6h7kaa1l04648xnplcx7bcz"; depends=[foreach pbapply plyr]; };
   SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
-  SimInf = derive2 { name="SimInf"; version="6.1.0"; sha256="1y9vk71k7rw7vk91nb25rf1vgnf6cqxw7b9lklrs41x6lk9ar0ps"; depends=[Matrix]; };
+  SimInf = derive2 { name="SimInf"; version="6.2.0"; sha256="11pmkjc56n1k2m1p6fyzv403h1wd557yhk9ymhg7vdc7jibpzplf"; depends=[Matrix]; };
   SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
   SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
@@ -3775,7 +3846,7 @@ in with self; {
   SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; };
   SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
-  SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+  SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.4-0"; sha256="1blxibjrgb738q2ybavp4q3d6yn7hayhg851ysghp118wpl32nwr"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; };
   Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; };
   SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; };
@@ -3795,25 +3866,25 @@ in with self; {
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
   SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; };
-  SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.4"; sha256="0hd05rm7qn2w8rqx7pw996wpgb2rymcwzmns8xyczcyn81vjx8z8"; depends=[httr jsonlite RCurl]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
   SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
   Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; };
   SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
-  SoilHyP = derive2 { name="SoilHyP"; version="0.1.1"; sha256="10lwfmhiavfyzypdb2rpc0rjsphy84vzg8mrdkncircss45cbvyp"; depends=[]; };
+  SoilHyP = derive2 { name="SoilHyP"; version="0.1.2"; sha256="12fplk632r5pakzyjarhwa7hhqp20n7nd8bzxkknfn0p0ffr0w4j"; depends=[]; };
   SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
+  SolveRationalMatrixEquation = derive2 { name="SolveRationalMatrixEquation"; version="0.1.0"; sha256="1m0b4sb247k6mlagvs4nj42ga9p48g9736lmhar7v1c5qhi7pw3v"; depends=[]; };
   SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
   SourceSet = derive2 { name="SourceSet"; version="0.1.1"; sha256="1326p28mngvi77b98n62cg6rln1qscyxz0616h7apc23ppdl7ybz"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; };
   SoyNAM = derive2 { name="SoyNAM"; version="1.5"; sha256="12qji7bdj0frf6ngwg1wybb29yxpv6cbyhiq2gayafdl48sm8his"; depends=[lme4 NAM reshape2]; };
-  SpATS = derive2 { name="SpATS"; version="1.0-8"; sha256="0j7yllnw9r8zhlh6jpkp5nsmzj0z3rzq0w6rkc36vp88a0giv15n"; depends=[data_table fields plot3Drgl spam]; };
+  SpATS = derive2 { name="SpATS"; version="1.0-9"; sha256="1q49n4snvrfhw0774q83vjxrip5la28jmbl3vijhf15ycbq0kwrf"; depends=[data_table fields plot3Drgl spam]; };
   SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; };
   SpNetPrep = derive2 { name="SpNetPrep"; version="1.1"; sha256="1y3j7mwjxv69lrgqvi8kxvhlmdyr8v7gbg17741008xb32kgma8h"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat]; };
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
   SpaDES = derive2 { name="SpaDES"; version="2.0.2"; sha256="14l6rhaid4022c9gza6iy7kb6zr1844v16kn3hlgynf3zqv0mkr4"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.1"; sha256="0sipgq00lacy7yk81crr8h7xfm4vs4h66w6rqsll8i7di19g13cj"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; };
-  SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.2"; sha256="17p4fvyax5zxvw1h79n7ybx5vhq1gawyk0dib3y055kr1vv95h0s"; depends=[codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare googledrive httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; };
+  SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.3"; sha256="1dj0mjd902ll01vis947vdlwc3fn5j58yvpzipmvr7lmyk5476f5"; depends=[codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare googledrive httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; };
   SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.0"; sha256="110c8y6v6pig6bpzn82kzaxr4c2jlq83v1a9ml1n9af591mpw4gp"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp velox]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
@@ -3833,11 +3904,12 @@ in with self; {
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-7"; sha256="1y0h1pcfqp9ynxsr3yrfbihlwm25ypyb88jmm5k2g7xvm8h9g050"; depends=[fields maps]; };
   SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; };
+  SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-3"; sha256="1azymigqychsydqvy2n5fplv971i1gzxfhfnclm5r5rqh0xcdp3k"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVS = derive2 { name="SpatialVS"; version="1.0"; sha256="0f0ps462g3v1h50fa9sznzvjdasb4lcs57ccsc02l39jlkwp7z56"; depends=[fields MASS nlme]; };
+  SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; };
   SpatialVx = derive2 { name="SpatialVx"; version="0.6-3"; sha256="0shh8b4l42h93ja6mshj2bwfz1g5j6wjwf3n3ql4yx7kc0n1y7sv"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9"; sha256="1k674xb6q64w9izjb2mdippp6sfjnlqlq6ynmzmyi8m3pv3spga6"; depends=[MASS Matrix]; };
   Spbsampling = derive2 { name="Spbsampling"; version="1.0.0"; sha256="19ci3199hwqzh82phxr4m4d1n7y3vpn5338m20qisr7plwqv7wp5"; depends=[Rcpp Rdpack]; };
@@ -3850,11 +3922,11 @@ in with self; {
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
   SplitSoftening = derive2 { name="SplitSoftening"; version="1.0-0"; sha256="1nng2rbldpxflnn7kqdp4r334lcjyznwbc50sfrd4rxyhcmmy36n"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-  SqlRender = derive2 { name="SqlRender"; version="1.5.2"; sha256="07x9jrrr7j6vi8blnl0byry0yh11fnf0zy9137zc4nmnp240fawv"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.5.3"; sha256="0dh1khdha5rn4lv63y51d52qqzs94bb3ykjci9r704cibgy725z8"; depends=[rJava]; };
   Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; };
   StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; };
   StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
-  StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
+  StMoSim = derive2 { name="StMoSim"; version="3.1.1"; sha256="1y4lnbpgdza6r6w3q161nlmg8775g3zv323amcwxcj41r4v41p96"; depends=[Rcpp RcppParallel]; };
   StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; };
   StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
@@ -3864,7 +3936,7 @@ in with self; {
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
   StatCharrms = derive2 { name="StatCharrms"; version="0.90.91"; sha256="0gjxp6jz8j2kz87g17gax1pyrd498vcswrmv9az5dj52dvyxbwxf"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
-  StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
+  StatDA = derive2 { name="StatDA"; version="1.7"; sha256="1hsy4aivd5ga2zj65hr2c5cn9qgjnhs123qqyg6q959vsjxzp0i0"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; };
   StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
@@ -3927,11 +3999,12 @@ in with self; {
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="2.13-15"; sha256="0c13327dp2whnmns0k53f5rc2cz60kjhdh6nq4q021yhm2j4xd81"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="3.0-21"; sha256="0f89ns99z284ihr33fhiqqjhrvmk29spbjspgc14gb1h1ql5k906"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
   TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
+  TAShiny = derive2 { name="TAShiny"; version="0.1.0"; sha256="1h8k8py7myrj7c18cbp4q7bmgmck64jagw9s9j1jaqzl9qf8cbgq"; depends=[dplyr igraph shiny SnowballC tm wordcloud2]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
   TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.3"; sha256="0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv"; depends=[nnet plotrix stringr VGAM]; };
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
@@ -3940,7 +4013,7 @@ in with self; {
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; };
   TDA = derive2 { name="TDA"; version="1.6.4"; sha256="0ni8lmdsf2q36rrgq3ay382m12834agfcw5rlqfa7fbqgmy4c9xs"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
-  TDAstats = derive2 { name="TDAstats"; version="0.3.0"; sha256="11g9yfgimkyl9z8kvzlvgkwc61vhdgvp6zy2izdbj18fxyqmcn3s"; depends=[ggplot2 Rcpp]; };
+  TDAstats = derive2 { name="TDAstats"; version="0.4.0"; sha256="091fx0qla7jr5h7a84rp5mdsrafzdk87gk5xdflf62dk7qghb9kr"; depends=[ggplot2 Rcpp]; };
   TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; };
   TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; };
   TDMR = derive2 { name="TDMR"; version="2.0"; sha256="1dqyi7i4spacg0n6f3zdhyb84crlbqvkb8xdmvdjr1jd1zx5gc32"; depends=[adabag SPOT testit twiddler]; };
@@ -3957,6 +4030,7 @@ in with self; {
   TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.8"; sha256="0h9qkl15k8v17v3g9bdnfwvh2s04ywjgg5y0xn2077dmywlja1bd"; depends=[Rcpp]; };
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
   TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; };
+  TGS = derive2 { name="TGS"; version="1.0.0"; sha256="0x3a8c02zibqh57sr79gk792m6dsxgzmqpk73lflvg1l2s3r6zf8"; depends=[bnstruct doParallel foreach ggm minet rjson]; };
   TH_data = derive2 { name="TH.data"; version="1.0-9"; sha256="03xfvww0krw0fn76qmmvrj7dx4shin57qafwhkrggfg25hbqlcfq"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
   TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; };
@@ -3965,7 +4039,7 @@ in with self; {
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
   TLMoments = derive2 { name="TLMoments"; version="0.7.4"; sha256="0p3d4ydz22k5ardk8qr7sgfhg9qw655bjlbjckvzwps8cbxgnag3"; depends=[ggplot2 hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.14"; sha256="0bpc504nz8xfwr8ack52dj4hpjcykn6zyf8n228z32dw9d5n96dl"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.15"; sha256="1r2d8c5iazihba42sn33yarv0dcfiy989sx64zcf14zr8k6cgjzs"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
@@ -3973,21 +4047,24 @@ in with self; {
   TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; };
   TPD = derive2 { name="TPD"; version="1.0.0"; sha256="1fwj5l519mwsffm2pw2nbpm1mnlxkxzl53i7sqy810fccw47hgag"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
-  TPMplt = derive2 { name="TPMplt"; version="0.1.0"; sha256="15jr2ww5vk6ac3h5bqdbsnch7fdn9c3vy5k3gdc271vf4cvghw93"; depends=[e1071 ggplot2 qpcR rgl rowr VBTree]; };
+  TPMplt = derive2 { name="TPMplt"; version="0.1.1"; sha256="0acxig6b77d7d4slmd27wxvi17q0hkdcifxx90pdxgll068b4kx2"; depends=[directlabels e1071 ggplot2 RColorBrewer rgl rowr VBTree]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
-  TR8 = derive2 { name="TR8"; version="0.9.18"; sha256="14nfyqwqv1l5lr5zvywd5pxrv4qz0g5v5x8sdxkjbkxi9s7xrlaw"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
+  TR8 = derive2 { name="TR8"; version="0.9.19"; sha256="1vqjjhyx7igrkdmxbgypds6qq7al6hznv4s5mhspg833mzjhz92c"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; };
   TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; };
+  TRES = derive2 { name="TRES"; version="0.1.0"; sha256="0vlf0z4za2l4cllvl35cck2xgh2gfna2c3w92szw73vi4q0kflqn"; depends=[ManifoldOptim MASS mvtnorm pracma rTensor]; };
   TROM = derive2 { name="TROM"; version="1.3"; sha256="1glbpbq8qhlxhcscgsqivmncsmadfhlsin47r9jxxd2s087cdh2f"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
   TRSbook = derive2 { name="TRSbook"; version="1.0.2"; sha256="0lj20i6gybinc196nzjfi6ayzmm970s9vp43lj60v96g5dl7qv1b"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   TSA = derive2 { name="TSA"; version="1.2"; sha256="0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q"; depends=[leaps locfit mgcv]; };
   TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; };
+  TSDT = derive2 { name="TSDT"; version="1.0.0"; sha256="0cscy8g6qab09lgzdpz9s85l7m7v5gnjf0n3h82730xzd50r4za7"; depends=[hash mlbench modeltools party rpart survival survRM2]; };
   TSEntropies = derive2 { name="TSEntropies"; version="0.9"; sha256="1bwb3kyhzc6sxhvpagf4vjmh8ghx44lpc9ms4jwrsrzdhcvnfc7l"; depends=[]; };
   TSEtools = derive2 { name="TSEtools"; version="0.1.1"; sha256="1s39j41s5d9zakvr536l7m9f72yjh3cbfpd6pijvcr3n3dznmra9"; depends=[xts]; };
   TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; };
   TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; };
   TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; };
+  TSMCP = derive2 { name="TSMCP"; version="1.0"; sha256="1wzi6wzd8l5bkm0qc1mfvj067xywm208xl6r87a4svcn1ydr4vl4"; depends=[lars plus]; };
   TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; };
   TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; };
   TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
@@ -4008,10 +4085,10 @@ in with self; {
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
   TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; };
   TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
-  TSrepr = derive2 { name="TSrepr"; version="1.0.1"; sha256="07gxsp4cfzpjmm6l9wpcdxar3sngm0ih0gp4c8gb6kyzm7pb780n"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; };
+  TSrepr = derive2 { name="TSrepr"; version="1.0.2"; sha256="068bgfq8y8h23n4vb5qjimzbyd5majp4bmngpi02gwihdkbaw4fc"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; };
   TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; };
-  TSstudio = derive2 { name="TSstudio"; version="0.1.2"; sha256="1wl902mmddcbd8xk35n4gcdy8gk7vrb3ii110mkvwkbxw463b40l"; depends=[bsts colormap data_table dplyr forecast forecastHybrid lubridate magrittr plotly RColorBrewer reshape2 scales viridis xts zoo]; };
+  TSstudio = derive2 { name="TSstudio"; version="0.1.3"; sha256="0p08kvvzpm2n7dq2sfifgcycpl97535adkpn4ln0s41zcb99hdla"; depends=[bsts colormap data_table dplyr forecast forecastHybrid lubridate magrittr plotly RColorBrewer reshape2 scales viridis xts zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt tcltk2 zoo]; };
   TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
   TTR = derive2 { name="TTR"; version="0.23-4"; sha256="18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb"; depends=[curl xts zoo]; };
@@ -4027,7 +4104,7 @@ in with self; {
   TangPoemR = derive2 { name="TangPoemR"; version="0.1.0"; sha256="06w5gg36mx0vdagkhy7rskgjv2d3irr0d3nkjw26vxp25x1py4sf"; depends=[jiebaR]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
-  Tariff = derive2 { name="Tariff"; version="1.0.4"; sha256="1sf7qzv6cdx1k0h5cc2w1jbcpg07j02r5h31xcbsnsgd7wj3h3q1"; depends=[]; };
+  Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; };
   TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; };
   TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; };
   TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.0"; sha256="0mkw7d2pksj98kyg2951achmvsr0x7f4snq0kk1s5158b5yi5npn"; depends=[]; };
@@ -4036,12 +4113,13 @@ in with self; {
   Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; };
   TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
   TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
-  TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
+  TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
   TeachingSampling = derive2 { name="TeachingSampling"; version="3.4.2"; sha256="1r06if6ljlr9i3y5ri7akris97dsjy3n3n6sgz2dvy9szm4zsadp"; depends=[]; };
+  Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; };
   TempleMetrics = derive2 { name="TempleMetrics"; version="1.2.0"; sha256="0g8a799grsjqyq55pnlgixyq2qxhvl5k01jcjwc08q54w2dg0xf0"; depends=[BMisc pbapply]; };
   Temporal = derive2 { name="Temporal"; version="0.1.1"; sha256="0x001apiph67cyh2ckx2k9mi6jb86agnmfvn94i27q9lpy4cn1sh"; depends=[expint numDeriv plyr Rcpp RcppEigen]; };
-  Ternary = derive2 { name="Ternary"; version="1.0.1"; sha256="0myppwcb4qvz9nkig641zrlf8yhy96qyg1yzh5nnli8a8xg0hjpk"; depends=[]; };
+  Ternary = derive2 { name="Ternary"; version="1.0.2"; sha256="19mbll6kjhkv46glaakhnhfsmbvxslxnmf9kaw8p5plhg2ngybiy"; depends=[]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
@@ -4049,7 +4127,7 @@ in with self; {
   TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; };
   ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; };
   ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; };
-  Thermimage = derive2 { name="Thermimage"; version="3.1.1"; sha256="10jffqhqvy2is41cgzmkzrncqd65yjsyag8qli114s799qd9g3bm"; depends=[png roxygen2 tiff]; };
+  Thermimage = derive2 { name="Thermimage"; version="3.1.2"; sha256="1lncbj8ww6sdbcd5g96h54vvnxkrvi27ky2fwa7cdbqphrlwmr35"; depends=[png tiff]; };
   Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
@@ -4076,7 +4154,7 @@ in with self; {
   ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.0"; sha256="1w8irl49cxg0rsbk57cl443gmy4i3vrh3ialx9c9d08wc7d2zisa"; depends=[]; };
-  TraMineR = derive2 { name="TraMineR"; version="2.0-9"; sha256="01sbf5dmy1bp0kqhn9xmf6kwjk3h6cgys28hzr61q4qxq5x0373f"; depends=[boot cluster Hmisc RColorBrewer]; };
+  TraMineR = derive2 { name="TraMineR"; version="2.0-10"; sha256="1zzszc6hnqwlqdmbpg6yphpqd5dflx384hd0dpwdgcy50r04xjgg"; depends=[boot cluster Hmisc RColorBrewer]; };
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.3"; sha256="1dmhq5fk2a7vj8s1cvmm7p9pc77z6m46hh7nqp0vkvm811l16v02"; depends=[cluster RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
@@ -4087,9 +4165,9 @@ in with self; {
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
   TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.0"; sha256="0xcipsfwghnf2x2x0i77vr79xs646v354skwxxw6m72ff6arbfz4"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
-  TreeDep = derive2 { name="TreeDep"; version="0.1.2"; sha256="1li5h44crg7gb8589w6g2c1ms7jpk3x3nq378f66ihwhfdak3zn9"; depends=[ggplot2 lubridate]; };
+  TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
-  TreeSearch = derive2 { name="TreeSearch"; version="0.2.0"; sha256="1zn2ig3iq5mfqs5gd31g1smm9vv1q68j1w9wpx4x4yxrwib35ghh"; depends=[ape colorspace gmp memoise phangorn R_cache Rdpack]; };
+  TreeSearch = derive2 { name="TreeSearch"; version="0.2.1"; sha256="13ii1192qc2b3kn3l6mpfmrpw5g4bfm30ic79kc1a32wph26z27g"; depends=[ape colorspace gmp memoise phangorn R_cache Rcpp Rdpack]; };
   TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; };
@@ -4105,15 +4183,16 @@ in with self; {
   TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; };
   TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; };
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
-  Tushare = derive2 { name="Tushare"; version="0.1.0"; sha256="0dcqj1jd9qslr1vn8s6s14nfrxjaxxcl53n87m1wzlqj94czmijq"; depends=[httr]; };
+  Tushare = derive2 { name="Tushare"; version="0.1.1"; sha256="0iz3wa11i8k4ss9iayab0vn80aq1ll8darmpkw0qpia8j50kcb2s"; depends=[data_table forecast httr tidyverse]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; };
+  TwoSampleTest_HD = derive2 { name="TwoSampleTest.HD"; version="1.0"; sha256="0xdib7hwbpy549pxihai8dpy91h94wwl3b76jn7p0m15ky7z18df"; depends=[]; };
   TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; };
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
   UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
-  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="0.2.5"; sha256="0vgjrmlscq4gcgccbabrcplbi1jyv5nd6zh1j57ys85f0w8mmvrl"; depends=[dplyr DT httr readr shiny shinydashboard]; };
+  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="0.2.6"; sha256="0p5s4prrskqkx9fi3y78gir4gm47y2xkccg4bap5b1x50gsg1j6d"; depends=[dplyr DT httr readr shiny shinydashboard]; };
   UKgrid = derive2 { name="UKgrid"; version="0.1.0"; sha256="1xfg2v82264wlvv6x0xppz7g7jka1y0d615g9rwcb236y64h2xrk"; depends=[data_table dplyr lubridate magrittr rlang xts zoo]; };
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; };
@@ -4132,6 +4211,7 @@ in with self; {
   Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
   Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; };
   Umpire = derive2 { name="Umpire"; version="1.3.5"; sha256="1l0mpx66vgn282hc1c75bgxh471fbmyh3y0ldxb0h4pj55db93xq"; depends=[]; };
+  UncDecomp = derive2 { name="UncDecomp"; version="0.0.4"; sha256="1v29y64jm3axllwy0cgmyki6ii3ph2zyvcgbzv1pdrgxgj14qhck"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
   UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; };
   UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
@@ -4143,9 +4223,9 @@ in with self; {
   UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; };
   V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-  VARSEDIG = derive2 { name="VARSEDIG"; version="1.8"; sha256="10qkhi749z2hsywzdri6ari02x3ninprg1hj41fslvr7bjq2hn4z"; depends=[]; };
+  VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
-  VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; };
+  VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.5"; sha256="1q5n87zzakdv0mflgsy6a5lc25ryjm7h90i3nr0dvccd0l8d4wpm"; depends=[ergm mclust network sna]; };
   VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; };
   VCA = derive2 { name="VCA"; version="1.3.4"; sha256="1qyf20i6bgjg3lxivhx4kgr66m63wkzw8r26aqhz0cs1j0w741dk"; depends=[lme4 Matrix numDeriv]; };
@@ -4158,7 +4238,7 @@ in with self; {
   VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
   VGAMextra = derive2 { name="VGAMextra"; version="0.0-1"; sha256="0rlj4q6ry6v3fnpmg4s33ynn7qzs5m98csap55nyn6r9ynrh5gk5"; depends=[VGAM]; };
   VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
-  VICmodel = derive2 { name="VICmodel"; version="0.1.1"; sha256="1236llbmrsgb7aiwdmdv2iq203avcsl68dkk652gfm69dwyxv111"; depends=[foreach Rcpp]; };
+  VICmodel = derive2 { name="VICmodel"; version="0.1.2"; sha256="0hrnj8jl31pbzz9rji5g5bc53da5mg75bf1lqgp8igqvhgy0a08k"; depends=[foreach Rcpp]; };
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
   VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; };
   VIGoR = derive2 { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; };
@@ -4180,7 +4260,7 @@ in with self; {
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.10"; sha256="09j8y6n0bwsj3n620nbni6b7f4pmb91q41770sfpc5v3l5i3jc7c"; depends=[curl RISmed stringi stringr XML XML2R]; };
   VariableScreening = derive2 { name="VariableScreening"; version="0.2.0"; sha256="04j75081g88g5hjydcnl3jcf99zzbrhlbjmmzcprvrlm5i5i3k93"; depends=[energy expm gee MASS]; };
-  VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+  VarianceGamma = derive2 { name="VarianceGamma"; version="0.4-0"; sha256="0n3vmyxfn0sid6zax4n8508li7gnfdd4gghpf3i296dm3w8wn8ip"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
   Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
   VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; };
@@ -4190,6 +4270,7 @@ in with self; {
   VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; };
   VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; };
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
+  ViSiElse = derive2 { name="ViSiElse"; version="1.2.1"; sha256="14vv25wnqcplf7k0ybfdlcvyhnja0h0kvz39yzlh2qkavjvdaf2y"; depends=[chron colorspace Matrix stringr]; };
   VineCopula = derive2 { name="VineCopula"; version="2.1.8"; sha256="1sdj6561ya7px4bp4kq23ggjf1bmis465zpnwn0i650z3q6y7al7"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
   VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
   VizOR = derive2 { name="VizOR"; version="0.8-5"; sha256="1v76m67xdlg06w3dmp27mh3mv3lfqy6bd1iq907dynp2g4qf4ww0"; depends=[lattice rms]; };
@@ -4201,7 +4282,7 @@ in with self; {
   WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; };
   WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; };
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
-  WDI = derive2 { name="WDI"; version="2.5"; sha256="0wm3b844pn33047wfd8yp22c6ysdsi8qx71fm1h5rq5vm9mcg9cp"; depends=[RJSONIO]; };
+  WDI = derive2 { name="WDI"; version="2.5.1"; sha256="1wwlmq8zri9wm9ssn17f6qzs2xbj9f53475kg0wi3y6mgy5dk9ba"; depends=[RJSONIO]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
   WGCNA = derive2 { name="WGCNA"; version="1.66"; sha256="0rhnyhzfn93yp24jz9v6dzrmyizwzdw070a7idm0k33w1cm8sjqv"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
   WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; };
@@ -4212,9 +4293,9 @@ in with self; {
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.10-0"; sha256="17iriwkng75iy93mp99ihzmvgpgbrg0sgwxs2yx1d3ss7h0k1x3j"; depends=[MASS mc2d plyr reshape]; };
-  WRSS = derive2 { name="WRSS"; version="1.4"; sha256="1fkbrk9s3jn7qfv5jvzcgjf0jwbxi8dr7485msxj3najbhqd2qy5"; depends=[GGally ggplot2 Hmisc network]; };
+  WRSS = derive2 { name="WRSS"; version="2.0"; sha256="0a6k6c9xpxglw2ph90i8kb1d1kpai82caqkkdy2si6zihs3ih87i"; depends=[GGally ggplot2 Hmisc network nloptr]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.1"; sha256="0q2rdzbz3cbgr19sh9j3fqdn0lvwrq93qq2rjmnhx6ia9avkywa8"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.0.5"; sha256="0fp298n1dmsy5hs90aki7aprvybpikp3v8niwlnz7k3f2k2g9dl7"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.0.6"; sha256="13ps401z1c9qyhqh18qkc7isnq4kjc928h001dkhsrd684a0lkly"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
@@ -4226,9 +4307,9 @@ in with self; {
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
   WeMix = derive2 { name="WeMix"; version="2.1.0"; sha256="0bnj4iziclmvqxzb51sjvs0mlk9glkg5yvcvh349m8cvv2634dsb"; depends=[lme4 NPflow numDeriv Rcpp RcppArmadillo Rmpfr statmod]; };
   WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; };
-  WebPower = derive2 { name="WebPower"; version="0.5"; sha256="184wig66bcg7vsppaijq5jpq2hffl3bhshdx4ilz5hw98mimxg13"; depends=[lavaan lme4 MASS PearsonDS]; };
+  WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; };
   WeibullR = derive2 { name="WeibullR"; version="1.0.10"; sha256="1h2w1rgap9yjns7cby0559jwzzwhzjq1h6lwsawrfnni7c36iliq"; depends=[Rcpp RcppArmadillo]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.4.0"; sha256="1y0910wa1lx2jrbnzk9099v64skh7sm8cx85g62ikgcj291z6c8c"; depends=[cobalt]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.5.0"; sha256="06cqbnbha46pk042m47zqvgwjslic5zc0lpv13dssb1nz2xy3q0f"; depends=[cobalt]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
@@ -4267,17 +4348,18 @@ in with self; {
   XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; };
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
   Xplortext = derive2 { name="Xplortext"; version="1.1.1"; sha256="18a8qqpakwgv60gm89cmil18q35mlir3xl4yl5j5fswcj5qpdkdx"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; };
-  YPInterimTesting = derive2 { name="YPInterimTesting"; version="0.1.0"; sha256="0jfvj08acldigd9q25dv2cqyp5a5wjzcb5wa0640y4kc5ga8p08s"; depends=[Rcpp]; };
+  YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.0"; sha256="1ah58dqz277sc99932wln9jqhm63dqg9f7xakaiwh7fhgbq3mpax"; depends=[MASS Rcpp]; };
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
   YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
   YuGene = derive2 { name="YuGene"; version="1.1.6"; sha256="1kv9n82wrms0c4y5fz9ckzhm1a609mnqp0pwvd0fpyscp8krmlpp"; depends=[mixOmics]; };
+  Z10 = derive2 { name="Z10"; version="0.1.0"; sha256="02kxlzplmss68zj1z97fvpcjyhhpic9hlx8f5j3gqn3m1mqm1dja"; depends=[dplyr lubridate magrittr rjson stringr]; };
   ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; };
   ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; };
   ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; };
   ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
-  ZeBook = derive2 { name="ZeBook"; version="1.0"; sha256="06dg3jk37y64mdcb8hpxgj8rclgxqm96dalm7y5zjb7nrj9jfydk"; depends=[deSolve triangle]; };
+  ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; };
   Zelig = derive2 { name="Zelig"; version="5.1.6"; sha256="142kjmgma25pvr525y0mjiwivnmq8y8s1abw4kyqipcmphmgh3an"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; };
@@ -4285,6 +4367,7 @@ in with self; {
   ZipRadius = derive2 { name="ZipRadius"; version="1.0.1"; sha256="00q4a2bsajs5ns4vdm289iaj9mczxjn3ssyrnmg2z4wicr2ljizv"; depends=[dplyr geosphere ggplot2 magrittr rlang testthat]; };
   Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
+  aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; };
   aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
   aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
@@ -4304,7 +4387,7 @@ in with self; {
   abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
   abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; };
   abjutils = derive2 { name="abjutils"; version="0.2.1"; sha256="0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b"; depends=[devtools dplyr glue httr magrittr plyr progress purrr rstudioapi scales stringi stringr tibble tidyr]; };
-  abn = derive2 { name="abn"; version="1.2"; sha256="00k0razgdb5y5f62622fm7rxkcxrxg470nyyb02dvpfp60254kvs"; depends=[Cairo lme4 MASS nnet Rcpp RcppArmadillo rjags]; };
+  abn = derive2 { name="abn"; version="1.3"; sha256="1q9hzpxwg835711kxwygd0l2awal6f015f8s6fprwz7graz1wbbm"; depends=[Cairo lme4 MASS nnet Rcpp RcppArmadillo rjags]; };
   abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; };
@@ -4314,13 +4397,13 @@ in with self; {
   accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; };
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
-  acebayes = derive2 { name="acebayes"; version="1.5.1"; sha256="1rhc8vib7y1nf4m5i21bsvfqmccfqv2ghlfa8vhx8dik6m733zn9"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.5.2"; sha256="0xdakqh9f0vazyqr044w4gcn1qbv4a5yjdfxpf1ys2nscyky6z7w"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
   acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
   acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; };
   acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; };
-  acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
+  acopula = derive2 { name="acopula"; version="0.9.3"; sha256="0vvbbw8pfs9jwfz5c57lw48pr0qj661r0ys007q6zf9jmlrhx1ln"; depends=[]; };
   acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; };
   acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; };
   acs = derive2 { name="acs"; version="2.1.3"; sha256="1r6lywjhdi53873c2hl670hbaycrlycaps5pll2i9czr1phlv0rj"; depends=[httr plyr stringr XML]; };
@@ -4333,6 +4416,7 @@ in with self; {
   ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; };
   adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; };
+  adamethods = derive2 { name="adamethods"; version="1.1"; sha256="1fmirxyv3dfyrq6wqrp60phl2bx84iq3s08a553283h5qr50qj5v"; depends=[Anthropometry archetypes FNN foreach nnls tolerance univOutl]; };
   adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; };
   adaptMT = derive2 { name="adaptMT"; version="1.0.0"; sha256="1yllz1zd4cryf5bj8b2lcrj6zl79yjkllyh9p02ikryy5qmg419b"; depends=[]; };
@@ -4399,7 +4483,7 @@ in with self; {
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
   airGR = derive2 { name="airGR"; version="1.0.15.2"; sha256="1lnqmf2rcj7hynlxnhb52jizx2c8b5bw04apgldg0bnr1jscn7pi"; depends=[]; };
   airGRteaching = derive2 { name="airGRteaching"; version="0.2.3.2"; sha256="1i3pkpf6h958m0jw90q6767svy7waikwqxiq6spqg02lmfw88swp"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; };
-  aire_zmvm = derive2 { name="aire.zmvm"; version="0.6.1"; sha256="1a6aq1fkjj053mi36ibykncd1hmcl0f5c0l2fi0cbx6hcysc28ic"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
+  aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.0"; sha256="1hipp3yqhhifxv30a92ycdzqi3ldry4hi761w0mb43rndpp5lziz"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
   airportr = derive2 { name="airportr"; version="0.1.2"; sha256="06jk4dhr4qj6fpmlvslnbqj67qy78spcb7yhqa4qn2im4kpmb73q"; depends=[dplyr]; };
   airr = derive2 { name="airr"; version="1.2.0"; sha256="1vswbjmyhygmyqymkfxad9nwsbcgaggian1fyrx63w0y9c4dfv1h"; depends=[readr stringi yaml]; };
   ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; };
@@ -4407,7 +4491,7 @@ in with self; {
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   alakazam = derive2 { name="alakazam"; version="0.2.11"; sha256="0p6rg09cxphp6mcbllwrvps4l9y2qssxhgxy6ryr4958gc1may16"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi tidyr]; };
-  albopictus = derive2 { name="albopictus"; version="0.4"; sha256="13njv26lbymfkir5wkbnr0nkbi65n15d96bqin27lzd5rj576bqr"; depends=[]; };
+  albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
   alfred = derive2 { name="alfred"; version="0.1.6"; sha256="07x012lj33m0pmxdwk39ywrlvlfkp7mb203dwv8v88cxplhbaiq3"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; };
@@ -4429,7 +4513,7 @@ in with self; {
   alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; };
   alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; };
-  alterryx = derive2 { name="alterryx"; version="0.3.1"; sha256="0vpgvh0rgrw4kckdvp4kqmmgcdgcgcdlqlzq3381jq495wcp207b"; depends=[base64enc digest httr jsonlite]; };
+  alterryx = derive2 { name="alterryx"; version="0.4.0"; sha256="0c2id24hjlzmdc8xxr5i8314nkrn9x6vvjzkwbasw7g85rsvh6ff"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
   amap = derive2 { name="amap"; version="0.8-16"; sha256="1qnl2x98x64iaipkx5126rsddq2sx5ml43h75xyiyn30yvbmlxyk"; depends=[]; };
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
@@ -4438,7 +4522,7 @@ in with self; {
   amelie = derive2 { name="amelie"; version="0.2.0"; sha256="01v93dswr9nk0kvq50jri4568w17pwkcn64xbpzn2p4c7w6gqkhh"; depends=[]; };
   amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
-  ammistability = derive2 { name="ammistability"; version="0.1.0"; sha256="00wcc84i9p8fmjjhhpi8435min5m749gsmvnh98zci9qk8glx4pl"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; };
+  ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
   amt = derive2 { name="amt"; version="0.0.5.0"; sha256="0p7k9g9wkd6kmf5pid8kgni1ilb6vrn7gb38l8g47zpwx5wg4zhf"; depends=[broom circular dplyr fitdistrplus FNN geosphere KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; };
   anMC = derive2 { name="anMC"; version="0.2.1"; sha256="02mzmaxjjbjqarfwdv6465p5hvnnpsqfkb1wkm68bx64cimgldki"; depends=[mvtnorm Rcpp RcppArmadillo]; };
@@ -4466,14 +4550,14 @@ in with self; {
   anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
-  antaresProcessing = derive2 { name="antaresProcessing"; version="0.16.0"; sha256="1wbrp07j8518p53yismij5mylxz34r3n8k4f7k8aj43armavkmxk"; depends=[antaresRead data_table]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; };
   antaresRead = derive2 { name="antaresRead"; version="2.2.1"; sha256="0j94waw0pq9fni4kpmcry354fwpqg64k9si5p3zgcrxhx3ah2dp5"; depends=[bit64 data_table lubridate plyr shiny stringr]; };
   antaresViz = derive2 { name="antaresViz"; version="0.15.0"; sha256="16gf5spgx56rgf2d25zv5dihhbbgvfxryswfqa4gjlpjc2827zar"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; };
   antitrust = derive2 { name="antitrust"; version="0.99.10"; sha256="1xgkbsnsn39s37my7sj917kvq67gxwai7k7lym2i18m60cnz0ilb"; depends=[BB evd MASS numDeriv]; };
-  antiword = derive2 { name="antiword"; version="1.2"; sha256="0715ykn1ik6x8qgmdw39adkxark4i5p9wpk7cirk8hz1g2qx6kij"; depends=[sys]; };
-  anyLib = derive2 { name="anyLib"; version="1.0.4"; sha256="11x9af3j008kxxsy151894ph0lwrkzxq78z6bvwzwqzdqlsvnv3f"; depends=[BiocInstaller curl devtools httr withr]; };
+  antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; };
+  anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; };
   anyflights = derive2 { name="anyflights"; version="0.1.0"; sha256="14mmzyhm8nz2xjs7bfyihgvy0an01lpv6hn9dxcqvbcsc7vfmigs"; depends=[dplyr httr lubridate RCurl readr tibble]; };
-  anytime = derive2 { name="anytime"; version="0.3.1"; sha256="1ibpmdq8i9ch06484ql0sdwfrs6smz40qnnw523pb0ryly6q9h16"; depends=[BH RApiDatetime Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.3.3"; sha256="1ns2c8lnvn31yw0ll4h4isfl1k3jic43c6wa0x7xgnxhmznq7abm"; depends=[BH RApiDatetime Rcpp]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; };
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
@@ -4489,7 +4573,7 @@ in with self; {
   ape = derive2 { name="ape"; version="5.2"; sha256="05b4yka5cirdgxd4d7iiaqvr428pk3j6n9q6dvg5j38kdj2h5sr7"; depends=[lattice nlme Rcpp]; };
   apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
-  aphid = derive2 { name="aphid"; version="1.3.0"; sha256="13h5vwxrw74drw8ai8y0i3c20kdhbybaa3zyplrnlsa2yzzdhqa2"; depends=[kmer openssl Rcpp]; };
+  aphid = derive2 { name="aphid"; version="1.3.1"; sha256="0vhp1qnfc28qfav98j6wmnqfjv7q47p43lx9qrlvfnn89vg56ynh"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.2"; sha256="14vwzzshsgkw6gxwnnf6h9fixnwp3g8pd3rv6qjr0y8gis1lmjbg"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
@@ -4509,6 +4593,7 @@ in with self; {
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
   aqp = derive2 { name="aqp"; version="1.16-3"; sha256="16b7yshsi5cwd8spvjmlnnnyvcvkxjcsjkwxizpxjwzy3fdkc4g6"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
+  ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
   arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
@@ -4519,14 +4604,16 @@ in with self; {
   areaplot = derive2 { name="areaplot"; version="1.2-0"; sha256="0xzfgbnzqsvnq46nsxwyqrwldbaqns3h5np0f5wxpjda9cy2rna1"; depends=[]; };
   arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; };
   arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
-  arfima = derive2 { name="arfima"; version="1.6-8"; sha256="0ym86wzwdlxrx987ibaspqmjq6i3j5cx3w04dlia5js1siyq9clp"; depends=[ltsa]; };
+  arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; };
   argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; };
+  argonDash = derive2 { name="argonDash"; version="0.1.0"; sha256="002q766mhwasq44yr39k8rhdxgbz4l1zxg26i3r2gbc260if4jbd"; depends=[argonR htmltools shiny]; };
+  argonR = derive2 { name="argonR"; version="0.1.0"; sha256="053cwvaacddixr84y05qaffykvk6bymhisdgafs24zcirdqzpl0a"; depends=[htmltools]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
-  argparse = derive2 { name="argparse"; version="1.1.1"; sha256="0fzrbj87b274vf96azdnsjxk2nf45d5wy58vzmlah4b4h7q4j524"; depends=[findpython getopt jsonlite proto]; };
+  argparse = derive2 { name="argparse"; version="2.0.0"; sha256="1qrp7hc8sm6ryw0zws76al865ansig1xbx8ljxz4wabh60msrz3i"; depends=[findpython getopt jsonlite R6]; };
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
   ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; };
   aricode = derive2 { name="aricode"; version="0.1.1"; sha256="0c9k6bp0zdm4l28ga19x8v30x3zw0fbcf7wicnn15xc516glfb2j"; depends=[Matrix Rcpp]; };
-  arkdb = derive2 { name="arkdb"; version="0.0.4"; sha256="0flcpka5s26gnf7kh1c76ak832h4iyh0012a1w0d805j5dhf67z6"; depends=[DBI progress]; };
+  arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; };
   arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
   arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
   aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.1"; sha256="1x2lwdabvh7cjdy57jrnbdb7s9vxs18zyvfzwavi2pgldqz6v2aw"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
@@ -4534,16 +4621,16 @@ in with self; {
   aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; };
   aroma_core = derive2 { name="aroma.core"; version="3.1.3"; sha256="0zikic3hqfn00kgb0078paikz4bdcqq0qygvl4xbvq48868wcz1q"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; };
-  arrangements = derive2 { name="arrangements"; version="1.1.4"; sha256="04l63br7a93qgiaglzmxpjw03y5p05jihlbbshy9cb7lg3rdld6m"; depends=[gmp R6]; };
+  arrangements = derive2 { name="arrangements"; version="1.1.5"; sha256="05frcgk9jxjbbkrj2mmv5vwj8zfbg3pvkysi1fjd9sbbimlzvjn7"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
   ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
-  arsenal = derive2 { name="arsenal"; version="1.4.0"; sha256="1hd1nx5nzpswi5903vkkhf4ap4pk5gjxj45xc8z0wngp4xrjv4a4"; depends=[testthat]; };
+  arsenal = derive2 { name="arsenal"; version="1.5.0"; sha256="0yljqa643maa64zq2jig6yiqn1pwhn8sjpmynqfrq5r8pv7xggb3"; depends=[testthat]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.6-1"; sha256="0glfqgxr87900kigmkby2ff7qrjvd6aq595q85y056i5ckjcp615"; depends=[Matrix]; };
+  arules = derive2 { name="arules"; version="1.6-2"; sha256="0vnss6akk3564kbci3h5rq8ylpckz77cgmflly3gn6fki66f7g96"; depends=[Matrix]; };
   arulesCBA = derive2 { name="arulesCBA"; version="1.1.3-1"; sha256="0k41m966m2x8xjzvpy6xn4whn9l2dpvidyh39kmhyvya87ibhyg8"; depends=[arules discretization Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-20"; sha256="0qgsf1wbdw4yqcnbczi2kcvb6vg9f4gy403qds1qh4129yrjyvy9"; depends=[arules]; };
-  arulesViz = derive2 { name="arulesViz"; version="1.3-1"; sha256="0lz6dl7ywzbyviib97s48namr6cjjn98anblfpigzaq16zkf2pxl"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
+  arulesViz = derive2 { name="arulesViz"; version="1.3-2"; sha256="14cv63kgxjks789gjlxsag5ih146wx0g1pgfgnv12pax022kmwxw"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
   asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
   asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; };
   asbio = derive2 { name="asbio"; version="1.5-3"; sha256="0k4cyivh08p9psp0z07nqa04i7xcqf4gh7x0vfk17rvycywksbhy"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
@@ -4556,7 +4643,7 @@ in with self; {
   ashr = derive2 { name="ashr"; version="2.2-7"; sha256="1bgkzab7f7fqi259vxrpkxq8yzhh1sl3mqdzc73dk54c5849b2pz"; depends=[assertthat doParallel etrunct foreach Matrix pscl Rcpp SQUAREM truncnorm]; };
   asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
-  asnipe = derive2 { name="asnipe"; version="1.1.10"; sha256="1n53aqajra3rp202jz1xciw7nppicxkpiq4ybay768n3mxlvlhjr"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.11"; sha256="06bjw99rssna1pgxq8yrsp3mbwgs2x3wxf86him1766gvcs9yawq"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
@@ -4565,12 +4652,12 @@ in with self; {
   assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; };
   assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; };
   assertive_code = derive2 { name="assertive.code"; version="0.0-3"; sha256="1qhbp668zfvhqs8avkhg9amp4zyazz6dsy4fc6kpdmw3sv8yi07g"; depends=[assertive_base assertive_properties assertive_types]; };
-  assertive_data = derive2 { name="assertive.data"; version="0.0-1"; sha256="0pjw7rf76d99awd8i4krmhbyks39lx89c9pb4j49nmz3w6x3z233"; depends=[assertive_base assertive_strings]; };
+  assertive_data = derive2 { name="assertive.data"; version="0.0-3"; sha256="00cvg2g36mdl8plrzx40m63qd55742mddqrchwy9n3c7mm4gn02s"; depends=[assertive_base assertive_strings]; };
   assertive_data_uk = derive2 { name="assertive.data.uk"; version="0.0-2"; sha256="1fzjvhwp7mwkqqix29khvs6zcrc82n6j4czvzzb473vyjyvdlj5b"; depends=[assertive_base assertive_strings]; };
   assertive_data_us = derive2 { name="assertive.data.us"; version="0.0-2"; sha256="1bgspn0sccmp9z7s7djvdvprgxlyc5vrxznp4zfjb79kwvgn83hq"; depends=[assertive_base assertive_strings]; };
   assertive_datetimes = derive2 { name="assertive.datetimes"; version="0.0-2"; sha256="00a98fx8p3pr3ckayh8wmxmm4rz01s67wah9697m92yci6pv3m78"; depends=[assertive_base assertive_types]; };
   assertive_files = derive2 { name="assertive.files"; version="0.0-2"; sha256="02pfz8j5vwcj5kl6zca46894li7lxwnlrr29j922f14ay6kdssmy"; depends=[assertive_base assertive_numbers]; };
-  assertive_matrices = derive2 { name="assertive.matrices"; version="0.0-1"; sha256="1vk0i860r87rc5x0navai8xx9ixqyp96waxlk6j5p8y8hrpiyyif"; depends=[assertive_base]; };
+  assertive_matrices = derive2 { name="assertive.matrices"; version="0.0-2"; sha256="16sykzcndv6y2d43x6v9n7m95kv76364h39kh10w4z0xw6ksfqil"; depends=[assertive_base]; };
   assertive_models = derive2 { name="assertive.models"; version="0.0-2"; sha256="0bn4j4v5qvb2d672cgri61p8d9v258pmz35y3lvm6b9mdxwdi9mr"; depends=[assertive_base]; };
   assertive_numbers = derive2 { name="assertive.numbers"; version="0.0-2"; sha256="0jc3ss64j4m7bjydhagwwmka5n7c72vpw4kfcch0m5jvkq5qrqds"; depends=[assertive_base]; };
   assertive_properties = derive2 { name="assertive.properties"; version="0.0-4"; sha256="0sqs54acs9qk9kvm32rxzfbzxz1l8mjahpfnw7r30z2brgz661jw"; depends=[assertive_base]; };
@@ -4614,10 +4701,11 @@ in with self; {
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
   auditor = derive2 { name="auditor"; version="0.3.1"; sha256="1ndd5a5264b91qaw0qj9rwjvhn9lgw7y5dirjqlzkib6q9mcyanq"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel gridExtra hnp plotROC ROCR tseries]; };
-  augSIMEX = derive2 { name="augSIMEX"; version="3.0"; sha256="0fjs77v6hrrzw683v6bmgiz787jfcn84nfjlkfp3vad8v2fqa84c"; depends=[Formula MASS Rcpp rootSolve]; };
+  augSIMEX = derive2 { name="augSIMEX"; version="3.1"; sha256="1k71dh5bqcqcjj7f816ww5pgckyq02s9w7qds69ny1zarfzh827w"; depends=[Formula MASS Rcpp rootSolve]; };
   augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.0"; sha256="0kxhrz6s2njfj9b20mqmlgs7hy2227vrj00048cf8447l3y2a9lj"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; };
-  auk = derive2 { name="auk"; version="0.3.0"; sha256="0sxc18w377f86f096g06xw8a8iwfpzxc5xwn4337wycns3xwd8r4"; depends=[assertthat countrycode dplyr httr rlang stringi stringr tidyr]; };
+  auk = derive2 { name="auk"; version="0.3.1"; sha256="0890bqp7zh8pjjy4pnprgkmcjpap60wa9ysm6hvqd7phb0ijgda4"; depends=[assertthat countrycode dplyr httr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
+  auth0 = derive2 { name="auth0"; version="0.1.0"; sha256="0i1hfi7956nsd2jz554pzj3l21jypd3ys53ran01m0nqlwmpld6p"; depends=[htmltools httr shiny yaml]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
   autoFRK = derive2 { name="autoFRK"; version="1.0.0"; sha256="10vmgcpj2n5w9g4bjq2g3bz3n3x9b6h35w4qfr13v2sdzp3gz5da"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS Rcpp RcppEigen RcppParallel RSpectra spam]; };
@@ -4626,15 +4714,15 @@ in with self; {
   autoimage = derive2 { name="autoimage"; version="2.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; };
   automagic = derive2 { name="automagic"; version="0.3"; sha256="0yzv0ianfq217jvz7rba86bcmxh09p513khvq6jk5k7isblvn0qd"; depends=[devtools dplyr formatR githubinstall knitr magrittr pacman purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
-  automl = derive2 { name="automl"; version="1.0.6"; sha256="0g7yki465syazji93z0jx39gg99dynhbm1b18blg493grphk0r7h"; depends=[]; };
-  automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
+  automl = derive2 { name="automl"; version="1.2.6"; sha256="1cwk09fyx1c50nrsq0xvy3289013yczqwwwnlvd5vz656hrq3nwk"; depends=[]; };
+  automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; };
   autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
   autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; };
-  autothresholdr = derive2 { name="autothresholdr"; version="1.2.1"; sha256="0jbqadhpmd3fq8i7ncwv98s12wcsrvvgk0dw2qgpg9f2d2k2gnb1"; depends=[checkmate filesstrings ijtiff lattice magrittr Rcpp]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="1.3.0"; sha256="13sw2zk7bywcv5cnjfpk4b7pgq4gw3lq69a12lk1ldsswg7x874y"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang stringr]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; };
   av = derive2 { name="av"; version="0.2"; sha256="0vw6136sh1rgsah10xrcrgrpb6rpf5l8vixs950yq51syxc1y2qc"; depends=[]; };
-  available = derive2 { name="available"; version="1.0.1"; sha256="0bijr3prl1bqkc34yn6g39gh9ig4xxynyglmw7di2l5ivp62rskl"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
+  available = derive2 { name="available"; version="1.0.2"; sha256="0fhynbw75f7adw3168a4mkaqkpb910bi0rym8imbpasgnqrr6smc"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="2.2-0"; sha256="0kf79jnr3zn02b3bsq68mhhgxm2j10l6z14idvcbh3xiyyfaig5b"; depends=[awsMethods gsl]; };
   aws_alexa = derive2 { name="aws.alexa"; version="0.1.6"; sha256="0c2yl023g2m4kqhhv4nbysjmp103aj3pk17dwyb9nrkpj9qm8zsh"; depends=[aws_signature dplyr httr xml2]; };
@@ -4657,9 +4745,9 @@ in with self; {
   awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; };
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
-  bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; };
+  bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; };
   bWGR = derive2 { name="bWGR"; version="1.5.6"; sha256="1c0f3y30gynvlf70fakhspp91q5fdq9b4hii18i1qq89162qgnd8"; depends=[Rcpp]; };
-  baRcodeR = derive2 { name="baRcodeR"; version="0.1.0"; sha256="0csg696zkbnfryzaayq7vf7zvsfixxqm4mc12f553igza9yyg7vk"; depends=[DT ggplot2 miniUI qrcode shiny]; };
+  baRcodeR = derive2 { name="baRcodeR"; version="0.1.1"; sha256="0lxdb62kpqlric9jdkfz7ff9m5cfjgw3qgcrxmjfbw5nm8dkfp7l"; depends=[DT miniUI qrcode shiny]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; };
@@ -4675,11 +4763,12 @@ in with self; {
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
   bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
-  balance = derive2 { name="balance"; version="0.1.6"; sha256="12m4kqmdix9x42lgi6pm75hw3sphj7hn7shkfa9v53074dgajyjh"; depends=[ggplot2]; };
-  ballr = derive2 { name="ballr"; version="0.2.2"; sha256="0iragzlw3fp02nj9l9smzxykgkd9vsq4g1lpkj88bs3wkynj112j"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
+  balance = derive2 { name="balance"; version="0.1.9"; sha256="1nr6v0m98rx30ij4q80w5i1f9rss7w4k9yk074y9xp2dpaxh36s6"; depends=[ggplot2]; };
+  ballr = derive2 { name="ballr"; version="0.2.3"; sha256="1bfbdzn4q3i5m87vbxymxha54vgxjfckzpxk52m54fkwpz6yw9cl"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
   bamboo = derive2 { name="bamboo"; version="0.9.23"; sha256="02mvj78kkcpa0bszf8jd0s7nvjwhgbxhgazqssw0fjifs2iqr2zn"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.2.1"; sha256="18l9kd3a0d4y6z38k9nm18j32g6dxmwylv8cv1wp3fzffv51lm1s"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
   bamlss = derive2 { name="bamlss"; version="1.0-1"; sha256="1nxy8a075dhdwz9jhyicqj1naz95w0mns64c6j59gpzwp03nvml4"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
+  bamp = derive2 { name="bamp"; version="2.0.4"; sha256="02nlz4yqrz6alhf0np1l9kaqmjsh8ni2inbzbf6m37h45sq5ix4c"; depends=[abind coda]; };
   banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
   bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; };
@@ -4699,7 +4788,7 @@ in with self; {
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
   basefun = derive2 { name="basefun"; version="1.0-2"; sha256="16j7lzpyiw9iw3zb1cw2l685303dljv93kdxgfdzajzgcmmmpr6m"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
-  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.1.0"; sha256="033m0z7xj5lvzfw7g54ls99ii2wj5hwk5lhids124ax8ckqzspii"; depends=[]; };
+  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.1.1"; sha256="08z5bhjk2iiksz62xz6133lsmczkqvza9iyvilq6mrvw5wwy0i7a"; depends=[]; };
   basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; };
   basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; };
   basictabler = derive2 { name="basictabler"; version="0.1.0"; sha256="1m4cgghfh3aixsnwjlbaj3prnnqxhij60bakz9vdr5dvnqg92an9"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
@@ -4719,7 +4808,6 @@ in with self; {
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; };
   bayesImageS = derive2 { name="bayesImageS"; version="0.5-3"; sha256="0whb3am92v95rhxnlpjl212jsy2r6pv35svj4lgl7p74300b25ra"; depends=[Rcpp RcppArmadillo]; };
   bayesLife = derive2 { name="bayesLife"; version="3.2-0"; sha256="1a3x3y77542hgndvymhnyg6dys0s5rimkgprl8psflsgsrxnbmcv"; depends=[bayesTFR car coda hett wpp2017]; };
-  bayesLopod = derive2 { name="bayesLopod"; version="1.0.1"; sha256="0v9yy75mvr74jc0fz10qj1acwxjy0lbqkdqaj1hn88v294r9dw3q"; depends=[BH inline raster Rcpp RcppEigen rgeos rstan rstantools slam sp StanHeaders]; };
   bayesPop = derive2 { name="bayesPop"; version="7.0-0"; sha256="1ydr0hds09xa17117y9dvk2sym2jfk0yjip79dig9c2vsykns0cm"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; };
   bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; };
   bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; };
@@ -4728,7 +4816,7 @@ in with self; {
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
   bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
-  bayesdfa = derive2 { name="bayesdfa"; version="0.1.0"; sha256="1ikladsmjw5y3hpjwmvn00wlg3fzgyzvwlrvkahdc5ni1mggh0fj"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan StanHeaders]; };
+  bayesdfa = derive2 { name="bayesdfa"; version="0.1.1"; sha256="0d08kx4qykfd7vyik0ac9w9sd5cflwbslq8gi7l64pwwil1hysk1"; depends=[BH dplyr ggplot2 loo Rcpp RcppEigen reshape2 rlang rstan StanHeaders]; };
   bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
   bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
@@ -4777,10 +4865,10 @@ in with self; {
   bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; };
   beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
-  beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; };
+  beadplexr = derive2 { name="beadplexr"; version="0.2.0"; sha256="0ci19jai28hizcfdgj3a69vw20yk25xg6vp6fk1xhkkp0hh9wnd2"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; };
   beam = derive2 { name="beam"; version="1.0.2"; sha256="1gxgw4gcrlbxmlv5scddr6qh4df9xaj6zbs48k660qqn02gjxy9b"; depends=[fdrtool igraph knitr Matrix]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-  beanz = derive2 { name="beanz"; version="2.3"; sha256="1jxm1xspmyxsvmsgh5q3rykaxzqqw294pvv4vkq1p1qg1y6l1dnb"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
+  beanz = derive2 { name="beanz"; version="2.4"; sha256="18i4ygz83l60fdfkl4yg9kp5n2vmqn6yd7qkpkiplq0mzg5s4nk9"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
   beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; };
   bedr = derive2 { name="bedr"; version="1.0.4"; sha256="052sn90gjr34hjgyndzvcl66pv22q0kjqbx95y1pdydiwhwmhpa3"; depends=[data_table R_utils testthat VennDiagram yaml]; };
   beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; };
@@ -4813,25 +4901,24 @@ in with self; {
   betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
   betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; };
   bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
-  beyondWhittle = derive2 { name="beyondWhittle"; version="1.0"; sha256="15q3dp5aw7csr3sp12vxhjvhazryk9b67x1spp0kv7qxy1v2jl95"; depends=[ltsa MASS Rcpp]; };
+  beyondWhittle = derive2 { name="beyondWhittle"; version="1.1"; sha256="178bhy2plkahklgwyhk2rlamjzyi8md612z58wi1mrbryzv4lsy1"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; };
   bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
   bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
   bfp = derive2 { name="bfp"; version="0.0-39"; sha256="1g3sbmi1yl7ai8v6a2ri54jqv64wzfy580s8i1w9xwbqjcrpj77m"; depends=[Rcpp]; };
-  bfw = derive2 { name="bfw"; version="0.2.0"; sha256="05h4i3mpwgdn3w1163qhzzhzrcxzsw3y35pjzj0w4kjc28nkp354"; depends=[coda MASS runjags]; };
+  bfw = derive2 { name="bfw"; version="0.3.0"; sha256="0kmyr77hp5vs41f8w7arcyxvhwhkbhdiq4v88ch7h822byfiwlzq"; depends=[coda MASS runjags]; };
   bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; };
   bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; };
   bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.2"; sha256="05d4bd350parb3nfwb2arb1z2g24l6pr81z9m5q76rhhsxp6rzn8"; depends=[coda EDISON inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod TargetScore]; };
   bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; };
-  bhrcr = derive2 { name="bhrcr"; version="1.0.1"; sha256="1frkzngrxy65nzdz3aylpj4kfikd1giwpwsy0bbhr5a9zbpr405v"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; };
+  bhrcr = derive2 { name="bhrcr"; version="1.0.2"; sha256="15c04vknhm8350xylixapb8nw5va0i02a5s5832fsfcndlqr4cpj"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
   bib2df = derive2 { name="bib2df"; version="1.0.1"; sha256="1rprcnqvs4nicd26h34kpgzlpl22430dikxs2q1sjf861qachi10"; depends=[dplyr httr humaniformat stringr]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="2.0.1"; sha256="1j7gf3r7z622m3gyaf8mw16gspnj59ad97h9zn9wk1kmy02bmwnp"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="2.0.2"; sha256="12588054l6hsn8091559v42apc66g9zpfnhnk96ai56whglfjx5s"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; };
   bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
   biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; };
   bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; };
-  bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; };
   bigKRLS = derive2 { name="bigKRLS"; version="3.0.0"; sha256="043lm32cams2hc0fg1mvq08r4ippy4s5z62n1616vndfmqsn41v8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
@@ -4839,14 +4926,14 @@ in with self; {
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
   bigalgebra = derive2 { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; };
   biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; };
-  bigchess = derive2 { name="bigchess"; version="1.1.0"; sha256="0w6zhlljnza16xb1zsw4lan9al4pynbvk4d830yvqpd3bnb6aidk"; depends=[ff ffbase]; };
+  bigchess = derive2 { name="bigchess"; version="1.2.0"; sha256="0c5g4hd5wm51w4grdhl6jhd3lm4m3x4jndhwnlvnnfmpsl0y3902"; depends=[ff ffbase]; };
   bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; };
   biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
   biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
   bigleaf = derive2 { name="bigleaf"; version="0.6.5"; sha256="0l2a4xi9jyx9sd79fvva9rqqxb4mld99k0gycn07fb81m8lkf690"; depends=[robustbase]; };
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
   biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; };
-  bigmatch = derive2 { name="bigmatch"; version="0.4.1"; sha256="13sdvjik3x35csjs5cwbymgkkvsj26j7fp25xijs41sfa4kcri53"; depends=[liqueueR mvnfast plyr rcbalance]; };
+  bigmatch = derive2 { name="bigmatch"; version="0.5.1"; sha256="00v60cy0j9h8r69b8r2xrarqa5y9sn170m1550g27pxgmyn3y371"; depends=[liqueueR mvnfast plyr rcbalance]; };
   bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
@@ -4874,7 +4961,7 @@ in with self; {
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
   bindr = derive2 { name="bindr"; version="0.1.1"; sha256="1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w"; depends=[]; };
   bindrcpp = derive2 { name="bindrcpp"; version="0.2.2"; sha256="0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8"; depends=[bindr plogr Rcpp]; };
-  binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
+  binequality = derive2 { name="binequality"; version="1.0.4"; sha256="19sm4gk7pnp0aq0bil3acm2jc6w26pkj11vvxzysgs1xlmsra7vg"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
   binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
   bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
   binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; };
@@ -4883,7 +4970,6 @@ in with self; {
   binnednp = derive2 { name="binnednp"; version="0.2.0"; sha256="1dklymwsz0l0xklmvq34mf11chd2hm91r5qa031zjf1hsm3gplh8"; depends=[fitdistrplus kedd mclust nor1mix Rcpp Rdpack]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
   binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; };
-  binomen = derive2 { name="binomen"; version="0.1.2"; sha256="0w1m5b2qvq3g28hahfgkq7wrrjqy43x1x4kvrrrf284s5ka90531"; depends=[dplyr jsonlite lazyeval]; };
   binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
   binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
   binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; };
@@ -4894,7 +4980,7 @@ in with self; {
   bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; };
   bioOED = derive2 { name="bioOED"; version="0.1.4"; sha256="1rjcqrni5xag97pxfsf40isr2c8pkqsvihf86phak8ngwl7qdgmc"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  bioacoustics = derive2 { name="bioacoustics"; version="0.1.5"; sha256="159dyqj5r5s4673nkcvv432gcc17f0qygnyjjd6mq6l7a38zb017"; depends=[htmltools moments Rcpp stringr tuneR]; };
+  bioacoustics = derive2 { name="bioacoustics"; version="0.1.6"; sha256="1q3sddqbx75hwncrzl3bfx6kagmcf3kqki5k8dig1gj3zk9bmqyl"; depends=[htmltools moments Rcpp stringr tuneR]; };
   biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; };
   biogas = derive2 { name="biogas"; version="1.10.3"; sha256="1qfidjwhaxg5zplzkldhj4zqg81xrcqmvh9x5km5yhyymzr6y4vs"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
@@ -4907,11 +4993,14 @@ in with self; {
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-  bioset = derive2 { name="bioset"; version="0.2.2"; sha256="1l2iss3rbzc69360r9i9j7nf0nn4fkj3j7bgc1hdabr32i19jkhh"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; };
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; };
+  biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
+  biostat3 = derive2 { name="biostat3"; version="0.1.3"; sha256="1m9fk8il3hrq4npba44c6x55p1dsjf6cijzris2ffgdq9wrb7l22"; depends=[car MASS muhaz survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
   biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
   bipartite = derive2 { name="bipartite"; version="2.11"; sha256="1ahn696g881dc9mnf67pglf0kskfk2zqkj2afvinqxmwal827f72"; depends=[fields igraph MASS permute sna vegan]; };
+  bipartiteD3 = derive2 { name="bipartiteD3"; version="0.1.0"; sha256="0jjf1xvgncgj9jwvfxrzcjxp8n3a26nw3c0r3yzf6nrw43gkwr7s"; depends=[bipartite dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
   birdnik = derive2 { name="birdnik"; version="0.1.1"; sha256="17szs4yh3gmf6glwldbk9bhk6f40si2zv53zvgqmg3lbl3z09dv1"; depends=[httr]; };
   birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
@@ -4924,8 +5013,9 @@ in with self; {
   bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; };
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
   bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; };
+  biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
-  bivariate = derive2 { name="bivariate"; version="0.2.2"; sha256="1kf34gdhi0cnngwp3xgk3qmiqxav8qldign93mxygxx8as2za00x"; depends=[KernSmooth mvtnorm]; };
+  bivariate = derive2 { name="bivariate"; version="0.3.0"; sha256="0g574raxzh2l6p8zf4mv8qdsbl0r10x2d6zsbjc79xggizlc1j9d"; depends=[barsurf KernSmooth mvtnorm]; };
   bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; };
   bivrp = derive2 { name="bivrp"; version="1.1"; sha256="0ycb3ppz8j6wd8ha52wy8xw0n5a5w4f46j6gk4hy151yslr00qay"; depends=[MASS]; };
   biwavelet = derive2 { name="biwavelet"; version="0.20.17"; sha256="183h9mdlpizikg1xnrnd03hbij4fnf5ibsad4jcfmh6d73qcgn9b"; depends=[fields foreach Rcpp]; };
@@ -4936,7 +5026,7 @@ in with self; {
   blackbox = derive2 { name="blackbox"; version="1.1.25"; sha256="1xjljxvh8jg5gnfwdb6f8ifn5s30dxjlnbal97kinq0ad33lvs48"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; };
   blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; };
   blastula = derive2 { name="blastula"; version="0.2.1"; sha256="1w9g858c6p7qzv86pfndycvpgv6k63r85wlq11249mi2zqzvh7rl"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr magrittr stringr tidyr]; };
-  blavaan = derive2 { name="blavaan"; version="0.3-2"; sha256="0rbwdxajrzr43wmqjmxw2hh390inba6nj15yfwqr25ipw0l2mwl3"; depends=[coda lavaan loo MCMCpack mnormt nonnest2]; };
+  blavaan = derive2 { name="blavaan"; version="0.3-3"; sha256="1n3f8qh0ircsm0qdz3ifdri048vhpy1mkacrsx0iqrilq557v6k7"; depends=[coda lavaan loo MCMCpack mnormt nonnest2]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; };
@@ -4944,7 +5034,7 @@ in with self; {
   blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; };
   blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
   blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
-  blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
+  blmeco = derive2 { name="blmeco"; version="1.2"; sha256="1kc9sf3j12kwzq58x07nfrxxg0hcxhgms7ddm97dnlmwxpjns9jm"; depends=[arm lme4 MASS MuMIn]; };
   blob = derive2 { name="blob"; version="1.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.3.2"; sha256="15xp4navipxcr2pqxnxc47b0ifdazcsdkn5kmay883vzqj8c1nrb"; depends=[Rcpp rtkore]; };
@@ -4963,7 +5053,7 @@ in with self; {
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
   bmixture = derive2 { name="bmixture"; version="1.2"; sha256="1qyxjjhwd82a4y53nj9ww4c74hrp1v2p4ii71pa59n0pq9xkqj01"; depends=[BDgraph]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
-  bmlm = derive2 { name="bmlm"; version="1.3.8"; sha256="05h69pp9m0lsm3047y1l6r2h9v55kfb4flc60l7y6hh9ahh65h52"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
+  bmlm = derive2 { name="bmlm"; version="1.3.9"; sha256="0vdkzy6jygrl02mzhax4fakayb8yziwhj80dxx6k61k5pb6qhja4"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
   bmotif = derive2 { name="bmotif"; version="1.0.0"; sha256="1zjwlsimihszg8gg7mvvi8xmzvlsdph9x6524gb28jmd24xb4gwj"; depends=[tensor]; };
   bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; };
@@ -4976,13 +5066,13 @@ in with self; {
   bnpsd = derive2 { name="bnpsd"; version="1.0.1"; sha256="0f9w3qcdmf6qx5k01vddmxj1vadx6d9zcgw6prpbmcf3cdy3fwg0"; depends=[]; };
   bnspatial = derive2 { name="bnspatial"; version="1.0.3"; sha256="018rb5wacjk8igyc0qbp9rk3vjz3lffx81awlba8d2npiaxq6jbv"; depends=[doParallel foreach gRain gRbase raster]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.4"; sha256="0xlq5y2pa7d36pj316idh84hkbgn0c8jjp0d2x1p92zfvd8xpxnw"; depends=[bitops igraph Matrix]; };
-  bnviewer = derive2 { name="bnviewer"; version="0.1.0"; sha256="1f941l5j29my8zfb3dnwwpqkf1hw92ljis8jfgaq93b4ic8g7z5p"; depends=[bnlearn igraph visNetwork]; };
+  bnviewer = derive2 { name="bnviewer"; version="0.1.1"; sha256="0p4a0agfj8cymyk8lz5raa59k0x97ph3fl3fs0c41plm2am9pxnm"; depends=[bnlearn igraph visNetwork]; };
   boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="0.8.0"; sha256="16w623k83xydgj2m0qyxc2s08226nvqrlfj242ix4lb51kghxy3j"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
   bomrang = derive2 { name="bomrang"; version="0.4.0"; sha256="16rc60pzphbxmijff5rk3vp8ara9vy1bk48m55drpqqdc3sbc0g3"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; };
-  bookdown = derive2 { name="bookdown"; version="0.7"; sha256="1b3fw1f41zph5yw3kynb47aijq53vhaa6mnnvxly72zamyzdf95q"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; };
+  bookdown = derive2 { name="bookdown"; version="0.8"; sha256="08485nb6ncymxs502rsxs8l92fi481isiqnwzhanyyimxxgy06ss"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.5.2"; sha256="09h45h9dry7ask3pg15c7zc9pghd8rdcp1cnaqgcrs6q6jgscld4"; depends=[bookdown]; };
   boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
   boostmtree = derive2 { name="boostmtree"; version="1.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; };
@@ -5009,6 +5099,7 @@ in with self; {
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
   bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; };
+  bpbounds = derive2 { name="bpbounds"; version="0.1.0"; sha256="1ydx0sbxcgrqpwvbjx88radsqiyv6vyzbqv7fyyvbaf1655h9244"; depends=[]; };
   bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; };
   bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; };
   bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
@@ -5032,7 +5123,7 @@ in with self; {
   breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; };
   breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; };
   breathtestcore = derive2 { name="breathtestcore"; version="0.4.5"; sha256="121s88q4gfc576gixilgahhv0dqwzwa0k5drwh344vgi033x1nhm"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; };
-  breathteststan = derive2 { name="breathteststan"; version="0.4.6"; sha256="0mwrr65hkk2l3mq8fdddfnxd44av426v384gn7cx1sqdd2rbi7a7"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; };
+  breathteststan = derive2 { name="breathteststan"; version="0.4.7"; sha256="0lvyp3524cha6ckfx2c25829ys1g97xhjc3mi5cmdbfg8zfgcy58"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; };
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; };
   brglm2 = derive2 { name="brglm2"; version="0.1.8"; sha256="017m7nlh29p271dhvx19l6042qfs48hqs947kjmpc7ykzv5461y3"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
@@ -5045,11 +5136,11 @@ in with self; {
   brms = derive2 { name="brms"; version="2.6.0"; sha256="0zahc6p5k6sji172a148j8bcz8bzg7wbdzmaard4wr07dxqpinhj"; depends=[abind backports bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.7"; sha256="1bfqr21szlpn1izjwlzih9j7f34x31zrapckk184rvynbsbgg7g6"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.68-2"; sha256="0h6lrxrcjggrkv1dnbqsancjj69072nacaaazibl1v99rawanghi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.5.0"; sha256="1r3831vq0fd5sh5841xr844sghg88z7ws91hg4jgnzbbkxfjp4ag"; depends=[backports dplyr nlme purrr reshape2 stringr tibble tidyr]; };
+  broom = derive2 { name="broom"; version="0.5.1"; sha256="0bmf38yvwalqf5j5yrr48nsk5k3n75s0gwcw621hp5lgrgvnp7ns"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; };
   broom_mixed = derive2 { name="broom.mixed"; version="0.2.3"; sha256="0f25wjhvvc5rw5sc8ya9agx9y7sm3sq67jj3z5503kdgksk2d1br"; depends=[broom coda dplyr glmmTMB nlme plyr purrr reshape2 stringr tibble tidyr TMB]; };
   brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
-  brranching = derive2 { name="brranching"; version="0.3.0"; sha256="1mpjcp4x3gcc38irflldv0szznp7jazdn62niwvifinzhq4k7pkb"; depends=[ape crul curl phytools taxize]; };
+  brranching = derive2 { name="brranching"; version="0.4.0"; sha256="0jzwk7mn5wan0qg12zfk99s445r7gwsdb9xvih929q1xvmk19k48"; depends=[ape crul curl phylocomr phytools taxize]; };
   brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; };
   bs4Dash = derive2 { name="bs4Dash"; version="0.2.0"; sha256="0s893mkhkr0zvarbyzl9k5033rjxwr42k74sx2qwjgwh0indypfb"; depends=[htmltools shiny]; };
   bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
@@ -5060,13 +5151,13 @@ in with self; {
   bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="0.1.5"; sha256="07bhngqwm2qknsk9910273wgkl1f3c564ab1p90kvyi8syc64mqg"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="0.1.6-1"; sha256="0q0928pqbwz4yrh23mri04xncp0q4jz765scc7mm4jjdda3wq50r"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
   bst = derive2 { name="bst"; version="0.3-15"; sha256="02378s18g0asmx00rghmqm5gb4dml530aln8r141f6wxgn9711fh"; depends=[doParallel foreach gbm rpart]; };
   bsts = derive2 { name="bsts"; version="0.8.0"; sha256="06v8x2wgasbh00vvwn859y6rqp7z5ib43vvhh9qdkkrmdz4gw6sr"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
   btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; };
   btergm = derive2 { name="btergm"; version="1.9.3"; sha256="0nailhw4n9rqqv1i2l41qz4gx0mr7viycdmd4kc00gm3nk4721gp"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm texreg xergm_common]; };
-  bucky = derive2 { name="bucky"; version="1.0.4"; sha256="1irzv1ib40h0ijlpawp0lac572nik3x77xcdi1vyncvinc9pcmr8"; depends=[lmtest sandwich]; };
+  bucky = derive2 { name="bucky"; version="1.0.5"; sha256="0xn92dnhrs8810f8kvn2dnig0icd1k4dkxljmldij6dn8xb7c85q"; depends=[lmtest sandwich]; };
   bujar = derive2 { name="bujar"; version="0.2-3"; sha256="0gc5wrnhark1gawl4qqjh179xaxjal5r7qq4ilx30yn3qhzrqdaz"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; };
   bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; };
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
@@ -5086,8 +5177,9 @@ in with self; {
   c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; };
   c3 = derive2 { name="c3"; version="0.2.0"; sha256="1af4lrgck1bff8jjp9vwyw2rpq54d1ng13rpcqlf58asdja29s9h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
-  cAIC4 = derive2 { name="cAIC4"; version="0.5"; sha256="1xbij45ds0f64nj8y50dpsxvngxm004bcbs31zwicqlhf3mabf8y"; depends=[lme4 Matrix]; };
+  cAIC4 = derive2 { name="cAIC4"; version="0.6"; sha256="0najx0gpi31rzkg3qdhmwwg8797nazmkdrv56b12a1cndlbb70x2"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; };
+  cNORM = derive2 { name="cNORM"; version="1.1.2"; sha256="0al0kbl8ncb41jlqqfj6i0fq3ll0clpks1m81hihkcj16rbrx03z"; depends=[lattice latticeExtra leaps rmarkdown]; };
   cOde = derive2 { name="cOde"; version="0.4.1"; sha256="1hvanmbnmkrly2s3c57r2xc0w56a4jxspc15ncfzdx94k6mvnhxq"; depends=[Rcpp RcppArmadillo]; };
   cRegulome = derive2 { name="cRegulome"; version="0.2.0"; sha256="1i5f5c2mc66gjh5dh883x9ghpnam6zva8s6y5vdy6wyih0x2r9yn"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; };
   ca = derive2 { name="ca"; version="0.71"; sha256="1ywqvj0rc9ss7yim4x09yf6l80xz4y6ggl56m0c1hc9x6wxna7h2"; depends=[]; };
@@ -5105,21 +5197,21 @@ in with self; {
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; };
   calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
-  callr = derive2 { name="callr"; version="3.0.0"; sha256="1rxbxy6kn7dj90z9hpppr9cnpvnxzknba2dwrdp0lrk5dh462qz3"; depends=[base64enc processx R6]; };
+  callr = derive2 { name="callr"; version="3.1.0"; sha256="1srsm6dndnxjvzb8xz4m90j2sw2yrkhyn1a7iiiarxybmihmz4xd"; depends=[processx R6]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
   camtrapR = derive2 { name="camtrapR"; version="1.0"; sha256="1raxxki2xkmb7mjlfsxn2fr1dvwc86n88cbkk08bwjzsizrvsz0z"; depends=[overlap rgdal ritis secr sp taxize]; };
-  cancensus = derive2 { name="cancensus"; version="0.1.7"; sha256="0v3wbmdqg36zn30kgj5xbndz69x3vvr0i6ag57gz8sbbgc4nyqbr"; depends=[digest dplyr httr jsonlite rlang]; };
+  cancensus = derive2 { name="cancensus"; version="0.1.8"; sha256="12mhnx9bx8wdhz7cb3lz0r0i6hgq6v401hl9v3bng27pz3va2fad"; depends=[digest dplyr httr jsonlite rlang]; };
   cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; };
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; };
   canprot = derive2 { name="canprot"; version="0.1.1"; sha256="14g7wl4p9bgwf5jm48mp676z0pwlsd2xgxjwzixri7mxxh0ivfh1"; depends=[CHNOSZ xtable]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="1.20.5"; sha256="00hf905ypaclxhf11fkg5kdfllq9ljdziw8xbyj9lw7kq3xn5h22"; depends=[htmlwidgets]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.21.6"; sha256="1sv3vz08nfn69iymr99gsyn9si8w701s0qwqhh3bv4f4kyd9vmby"; depends=[htmlwidgets httr]; };
   cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; };
   cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
   caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; };
-  capm = derive2 { name="capm"; version="0.13.5"; sha256="01jl1xqlycy726jbkkq39n3j8yia7i5x2lmkg285c4zlp350vnbg"; depends=[circlize deSolve dplyr FME ggplot2 magrittr sf survey tidyr]; };
+  capm = derive2 { name="capm"; version="0.13.9"; sha256="11d018fpmc22qmqs34bbdxyrs48dylvsx7z3sr3c364j59hvrbaq"; depends=[circlize deSolve dplyr FME ggplot2 magrittr sf survey tidyr]; };
   capn = derive2 { name="capn"; version="1.0.0"; sha256="14vfk00xyx0az3whmxjpcv1785lf0gx81w7qc54i3wcfp3i22kcr"; depends=[]; };
   captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
   captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; };
@@ -5134,14 +5226,14 @@ in with self; {
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
   care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
   careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; };
-  caret = derive2 { name="caret"; version="6.0-80"; sha256="0xhdhazzfh0hiqv2hgxglj9ffd2p4ls8acqn2sjn0ndx6158f187"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
+  caret = derive2 { name="caret"; version="6.0-81"; sha256="1fibrskjzq2f06b8gbrfp3263svfc5s5apsjwaqdg9qzs7sy7fpc"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
   caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
-  carfima = derive2 { name="carfima"; version="1.0.0"; sha256="0bxk254q916w5h5zyyp2bs6nvbmbzqfx3jr4a80fkgbmr49chzzp"; depends=[DEoptim invgamma MASS numDeriv truncnorm]; };
+  carfima = derive2 { name="carfima"; version="2.0.0"; sha256="1h1i1g2ii3803z9i7ki50ahm7k8m92z3653sd4nz24xmr73w5xr5"; depends=[cubature DEoptim MASS numDeriv Rcpp RcppArmadillo Rdpack]; };
   caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
   caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
   carpenter = derive2 { name="carpenter"; version="0.2.1"; sha256="1f6g85qgd53wzha8kfq8x29lb5wilgxm6bj49znzd1qj03nlnpna"; depends=[dplyr lazyeval magrittr pander tidyr]; };
   carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; };
-  cartogram = derive2 { name="cartogram"; version="0.1.0"; sha256="01ixcn6fy38r6nazch9dqlg19znssrx4d4fahvx9z7f4clnh0k80"; depends=[packcircles rgeos sf sp]; };
+  cartogram = derive2 { name="cartogram"; version="0.1.1"; sha256="171zw3h38iyxy70wz7yqhnivjx6kf1srj97dfmlkxyhz1ppyk38w"; depends=[packcircles rgeos sf sp]; };
   cartography = derive2 { name="cartography"; version="2.1.2"; sha256="0rh97byxrmnd8wkq190zjql41zkvhzmhjg1s0nscrwjassmp4sqp"; depends=[classInt raster Rcpp rgeos rosm sf sp]; };
   cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; };
   carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
@@ -5167,9 +5259,9 @@ in with self; {
   cattonum = derive2 { name="cattonum"; version="0.0.2"; sha256="0flsfyiymg8p1wik6yldas0ai1bq973rhhh4s3dblf1il4fdl4bv"; depends=[dplyr tidyselect]; };
   causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
-  causaleffect = derive2 { name="causaleffect"; version="1.3.8"; sha256="1z7dnfq469wa263xcxfixrn5q4vcd6xl62lahnc5gc8wzvxnxz8g"; depends=[ggm igraph XML]; };
+  causaleffect = derive2 { name="causaleffect"; version="1.3.9"; sha256="1zmj9m38ya7r7pqkqb87pgs4gfw0cq1ssa4dxn35mrqnf9gldba0"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
-  causalweight = derive2 { name="causalweight"; version="0.1.1"; sha256="0np9dzl5nq4rkxy8br1pvgkl5sxmihwgjxn0b1gn5cisiv6q2106"; depends=[mvtnorm np]; };
+  causalweight = derive2 { name="causalweight"; version="0.1.2"; sha256="0xl49r2dgcns3162b651bn9bbc4gr7cd97jbdwzg21bjzp6v4ic1"; depends=[mvtnorm np]; };
   cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; };
   cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
@@ -5203,7 +5295,7 @@ in with self; {
   cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
   cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
   ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; };
-  celestial = derive2 { name="celestial"; version="1.4.1"; sha256="0cvfka5lj0sj9cd7xs68szhckzfm6cgxwxim1nd530s6gxh0l7kz"; depends=[NISTunits pracma RANN]; };
+  celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; };
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
   cellWise = derive2 { name="cellWise"; version="2.0.10"; sha256="0cf6yri24ijlph3m7gkgcjdna87z2kz748ffgh35ai8lvwxkrg8w"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; };
   cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; };
@@ -5232,15 +5324,17 @@ in with self; {
   cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; };
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
-  cgam = derive2 { name="cgam"; version="1.11"; sha256="02iw1ljqqw3h57jkjd6f071lzny225ixkw1v0zmrg0wknrizbm7g"; depends=[coneproj lme4 Matrix svDialogs]; };
+  cgam = derive2 { name="cgam"; version="1.12"; sha256="1i75gynpkil6y7k4xzx5k3k60az3d0wr2pngjdr7n7vsbqg39yqs"; depends=[coneproj lme4 Matrix svDialogs]; };
   cgdsr = derive2 { name="cgdsr"; version="1.2.10"; sha256="1xyhw7mhmjichr1l6f9y1qvfj9wm87kfbm87ji7lcwf36gxh5g23"; depends=[R_methodsS3 R_oo]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
   cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cglasso = derive2 { name="cglasso"; version="1.1.0"; sha256="0qr6y06aablncj4ja4xjp4dhykqy15qmbigi4px9snpwssrqhwl2"; depends=[igraph MASS]; };
+  cglm = derive2 { name="cglm"; version="1.0"; sha256="1539n1q1zz1888d143w6vva9465viwcnb49frcsb74j3zvk6j4zp"; depends=[data_table nleqslv Rcpp RcppArmadillo]; };
   cgmanalysis = derive2 { name="cgmanalysis"; version="2.0"; sha256="0j8nl0r69hm5niq7bhjc4rh9sjy5x6pd2dxrsqifj9zv7kz4w4yq"; depends=[gdata ggplot2 lubridate pastecs pracma readr zoo]; };
-  cgraph = derive2 { name="cgraph"; version="2.0.3"; sha256="1ag7ajva1af08bgn99ib8ryqwdwcw6nfy4yzfpr19831jgq1hsg9"; depends=[R6]; };
-  chandwich = derive2 { name="chandwich"; version="1.1.0"; sha256="0m3fw416kf41sb21xdf1qkj7cj24xagzf31g4mryzwags2xlbzyv"; depends=[numDeriv]; };
+  cgraph = derive2 { name="cgraph"; version="3.0.1"; sha256="0il92x41ifjrl6v9k719xcawdz7zw6bzi326pkzbhw79n2as9jmi"; depends=[R6]; };
+  chandwich = derive2 { name="chandwich"; version="1.1.1"; sha256="0dpd1b9bq9i8a9wlmid6rvhpmvxj8dilv9xppmzr0jrh0nrcj9yx"; depends=[numDeriv]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
+  changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; };
   changepoint_np = derive2 { name="changepoint.np"; version="0.0.2"; sha256="03i4l59h8cr6bizbqn288x9r85kvaz1dyhkv5fsj1189qpdi9m88"; depends=[changepoint zoo]; };
   changepointsHD = derive2 { name="changepointsHD"; version="0.3.0"; sha256="05zmypz2jz55m9avzg63dmp7fpcgi7jpc9vf2fv0kywcvf2wz5ym"; depends=[Rcpp RcppArmadillo]; };
   changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; };
@@ -5252,7 +5346,7 @@ in with self; {
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; };
   checkpoint = derive2 { name="checkpoint"; version="0.4.5"; sha256="0ml6lr8vmnrj2d073mr6dxsy0sqf50vyc956j9pnmzan2k7qv2wc"; depends=[]; };
-  checkr = derive2 { name="checkr"; version="0.3.0"; sha256="168grrzl17k43fdrh9ps4hvhiyinldlmdq8bwdpj5b5cvvhh22lp"; depends=[]; };
+  checkr = derive2 { name="checkr"; version="0.4.0"; sha256="15dlclg567dfr6v7irc6hnhjfzn0w43wrw48md6b9mlswkk8lhmd"; depends=[err]; };
   cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.2.1"; sha256="1kq82x57qm68im6lyqjqmh4p34s4y7fn5v6ymclxjr47mdv8npb5"; depends=[]; };
   chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
@@ -5267,7 +5361,7 @@ in with self; {
   chillR = derive2 { name="chillR"; version="0.70.6"; sha256="0vkw9r2k8xdshwb3v90bp93mgbp3vj04c7hjxcmaxpsqkhxwda04"; depends=[fields httr jsonlite Kendall pls R_utils raster RCurl readxl RMAWGEN sp XML]; };
   chinese_misc = derive2 { name="chinese.misc"; version="0.1.9"; sha256="1rs16a5rqp0yq1c5j4yl6yji7hf9x76v6x7qmxppshjii5r8055h"; depends=[jiebaR Matrix NLP purrr Ruchardet slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
-  chngpt = derive2 { name="chngpt"; version="2018.7-25"; sha256="0c9vxlhrcyrbrp8cj0xvm2z4hy1m2rs538i4kzhrw8xlfiwb8ydd"; depends=[boot kyotil MASS survival]; };
+  chngpt = derive2 { name="chngpt"; version="2018.10-17"; sha256="0vj6n3q96li9agh2axq5nd5ybgi504nyavcigmgmglbhcjv25zbz"; depends=[boot kyotil MASS rgl survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
   cholera = derive2 { name="cholera"; version="0.5.1"; sha256="0v59pzsi8wg1b7f18zkhxmqldvpan296sw079a58krgcfinjm4ss"; depends=[deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
@@ -5288,9 +5382,9 @@ in with self; {
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
   cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
   circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; };
-  circlize = derive2 { name="circlize"; version="0.4.4"; sha256="1l28maiqi549z191srncxgabx5fnvf0lld7smzwfd3vr5cx8nqww"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.4.5"; sha256="0qhn9jzw7gd0jp9rmqrlbmy5ql6hjsa68pkp0acfz1h215dl8ah9"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
-  circumplex = derive2 { name="circumplex"; version="0.2.0"; sha256="1i86b4bqv9s8as5r0y4ldiwikvpx3srn6fy8gd9g098m4khc7kl9"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr MASS purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
+  circumplex = derive2 { name="circumplex"; version="0.2.1"; sha256="0123dnzm8kxbj9k2h0mwcmbmj442dyjwh23zq9yaps2531prsrr2"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
@@ -5301,7 +5395,7 @@ in with self; {
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
-  cladoRcpp = derive2 { name="cladoRcpp"; version="0.15"; sha256="0glx3gn2pvisrhplwd89j6l0qs3cfy4qigmncl4n631ic93y3dz4"; depends=[Rcpp RcppArmadillo]; };
+  cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; };
   clam = derive2 { name="clam"; version="2.3.1"; sha256="1n30fvx4macyawhzv17bzvc1s4qdn51p9mx28apfjbf80qck24g9"; depends=[]; };
   clampSeg = derive2 { name="clampSeg"; version="1.0-4"; sha256="0clmv53wz7shawg6mp4q3qp0z0gmd8jmd6flgzn2q1m8j2i62vq0"; depends=[Rcpp stepR]; };
   clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
@@ -5313,12 +5407,12 @@ in with self; {
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; };
   classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
-  classyfireR = derive2 { name="classyfireR"; version="0.1.1"; sha256="0r48xxiqhdgq1mx08ijhr21zj6gihadxajm7w7106xkpkz5diilj"; depends=[clisymbols crayon httr jsonlite magrittr tibble]; };
+  classyfireR = derive2 { name="classyfireR"; version="0.1.2"; sha256="13jw1qfc4qqyil67b8ck6fvic72v7i72rkbarj4ffhfdw15c8p5c"; depends=[clisymbols crayon httr jsonlite magrittr tibble]; };
   cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; };
   cld3 = derive2 { name="cld3"; version="1.1"; sha256="00jbncap8h0s26iw5i0891rag5gpf1n3s9imn6n0zbwdn1791ayr"; depends=[Rcpp]; };
   cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
-  cleanNLP = derive2 { name="cleanNLP"; version="2.0.3"; sha256="0hmivb2yhj47alxc9z1hlk23hfan9vz938m6xyp639xf58l97scz"; depends=[dplyr Matrix stringi]; };
-  cleandata = derive2 { name="cleandata"; version="0.2.0"; sha256="0mwn016czp1qpc8g5h3l6njcbdbzhm5fm89d6x0jqyxm4v6rgxnr"; depends=[]; };
+  cleanNLP = derive2 { name="cleanNLP"; version="2.3.0"; sha256="0d3v87ylp5vxkg6x5wfc1v482a3wcy02bb5xl3k2s8jpsawf2vxd"; depends=[dplyr Matrix stringi]; };
+  cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; };
   cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; };
   cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; };
   clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; };
@@ -5341,14 +5435,15 @@ in with self; {
   clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
   clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
   clipr = derive2 { name="clipr"; version="0.4.1"; sha256="061x84ildc7g1p91yw5iyj8lpqdf4hqv36as85lw8c6qv9ywbsqv"; depends=[]; };
-  cliqueMS = derive2 { name="cliqueMS"; version="0.2.1"; sha256="19vv5v4hi10nbm069nqrw3mrindj2bpv2hlmcs8g086cm4wl8ny3"; depends=[BH CAMERA igraph Matrix qlcMatrix Rcpp RcppArmadillo xcms]; };
+  cliqueMS = derive2 { name="cliqueMS"; version="0.2.3"; sha256="1mhdjws2y30z1rq48fgn9ym0p9fz85gzjm5x7gks3fsbbhjgg1cj"; depends=[BH CAMERA igraph Matrix qlcMatrix Rcpp RcppArmadillo xcms]; };
   clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; };
   clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
-  clordr = derive2 { name="clordr"; version="1.3.0"; sha256="16cw6i91azi3xw9slzy2v8vpdkqik8k02mvgvcl9a3irbl7wgz10"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; };
+  clordr = derive2 { name="clordr"; version="1.5.0"; sha256="0yzkkzp60gnap96hlfpjncxfkfvvma15yxpwf5pv5fgffacb8281"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   cloudml = derive2 { name="cloudml"; version="0.6.0"; sha256="0p34wrrs06c17lbjlkjhm04ffg3l3zfkxb7swikjbim0j5aww2kh"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.9"; sha256="1dgfs124lcarcwh75f5mi5z9y723s2ik5kz2g9fxgcama7r01a1x"; depends=[]; };
+  clr = derive2 { name="clr"; version="0.1.0"; sha256="08rzparhligxz86hzzrff5jsqijrdklg9h6j8syiajb1jmv3dqsn"; depends=[dplyr lubridate magrittr]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
   clubSandwich = derive2 { name="clubSandwich"; version="0.3.2"; sha256="1q4kidxcarlazh9zaav6vdc7ixb3hdg3zh5kr6mwkm087gi05nw5"; depends=[sandwich]; };
   clue = derive2 { name="clue"; version="0.3-56"; sha256="1gc7galavhivs2102vvc8c51555hghkawiv8vzciwwpscr19zxg9"; depends=[cluster]; };
@@ -5366,8 +5461,8 @@ in with self; {
   clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; };
-  clusterSEs = derive2 { name="clusterSEs"; version="2.5"; sha256="0m7vlcjs6zmfaxi1kn68fgcvfrb1gpky2fcg8jhrwc3yxzg23m74"; depends=[AER Formula lmtest mlogit plm sandwich]; };
-  clusterSim = derive2 { name="clusterSim"; version="0.47-2"; sha256="151cg89ac8b66bgcgpl3w9wvbvxs9g3v9vh8f3z6vg6fklrf5x2d"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
+  clusterSEs = derive2 { name="clusterSEs"; version="2.5.1"; sha256="0xg33m22vbhdgngidk8hfyd5avkn5lqn463bqxjyzgwnm5mz6yxx"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+  clusterSim = derive2 { name="clusterSim"; version="0.47-3"; sha256="050x4jasnclj4vm27cjgsspcrvb0lijnkpyavcysvbz8psllx629"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
   clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.0"; sha256="1dnbymivxkrhx39maannhvm8ynlgjxsiavd2d9ych5nq4mjvhnjg"; depends=[cubature Formula lme4 numDeriv rootSolve]; };
   clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
   clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; };
@@ -5380,7 +5475,7 @@ in with self; {
   clustrd = derive2 { name="clustrd"; version="1.2.2"; sha256="0jcx6afns87wyrc7j2rmc57q4447caxwrkq0j7fys5jbkcidw7bh"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
   clustree = derive2 { name="clustree"; version="0.2.2"; sha256="14n4h7200r66k74jljkgrihz9znv96d2lr2jp878rq07sszjy90h"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.3.2"; sha256="11xd3pgr4i15q9rcim8y6ybi1iijv59k7f8wh0b2368kz3kz54cj"; depends=[BMA foreach iterators Matrix mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3.3"; sha256="1dw9iniy2vw4yz1jip4jja6fsp03kbr86mm5knbhhyc0l24i0wrz"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
@@ -5402,7 +5497,7 @@ in with self; {
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coalitions = derive2 { name="coalitions"; version="0.6.5"; sha256="0s91yg60cpnn2fd185m7bww93kls4qlcq6bcy5nr5kmgiscril3p"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="3.5.0"; sha256="0vczislwy92a7p91ip0mwhh6v5n4wgk7fy9dqc1r746ivx8h13yv"; depends=[crayon ggplot2 ggstance]; };
+  cobalt = derive2 { name="cobalt"; version="3.6.0"; sha256="10l989f59faw5pr8gm2gfp66vg6y16837m9vp470xnwsim7mxa0r"; depends=[crayon ggplot2 ggstance]; };
   cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
   cocktailApp = derive2 { name="cocktailApp"; version="0.2.0"; sha256="05jw72v7gayyfflyy5g249d4sl689a55bf7ycijiks2s5gbj68b6"; depends=[dplyr DT forcats ggplot2 magrittr shiny shinythemes Ternary tibble tidyr]; };
@@ -5413,7 +5508,7 @@ in with self; {
   coda = derive2 { name="coda"; version="0.19-2"; sha256="03fs3sdrrym3is92dgpa6ydk3m63gaihwy7bva4k0wm2hxm7x2k7"; depends=[lattice]; };
   coda_base = derive2 { name="coda.base"; version="0.1.10"; sha256="14qpvwxymgph1zc5f7bskkizq4zilwrl40mjl2j718bpmzk0v4za"; depends=[MASS Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codebook = derive2 { name="codebook"; version="0.6.3"; sha256="1ki22x2ngaxg3p7g8jm7d70r17amwgis9ib1nbbfhkp9c6ki6jx9"; depends=[dplyr DT future ggplot2 haven htmltools knitr labeling labelled likert mice miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr]; };
+  codebook = derive2 { name="codebook"; version="0.7.5"; sha256="02mh4g82v56x13wk28ddvwqcibf2dymha7db3f2a7k9297vxlbfz"; depends=[dplyr DT future ggplot2 glue haven htmltools knitr labeling labelled likert miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr]; };
   codemetar = derive2 { name="codemetar"; version="0.1.6"; sha256="1jjm1c7fkrzyhb57ckdf3d808im5j6c20ykkjsnddh220jy4sgss"; depends=[crul curl desc devtools gh git2r jsonld jsonlite memoise purrr readr sessioninfo stringi stringr tibble usethis whisker]; };
   codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
@@ -5435,14 +5530,15 @@ in with self; {
   colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; };
   collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; };
   collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; };
+  collateral = derive2 { name="collateral"; version="0.4.2"; sha256="1i1fzvm838s2cfmxw654vwmp9rl9f9985vjildkxyx2f6571sjfm"; depends=[crayon pillar purrr]; };
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
-  collections = derive2 { name="collections"; version="0.1.2"; sha256="10crxbbxihcln58j6rlw1kh9qf1njpi0njb7sary80rcfhxwc4w4"; depends=[R6]; };
+  collections = derive2 { name="collections"; version="0.1.3"; sha256="06mllkqb319311wl4c3x0jqmy2jmqas2ykisb71mx6isrmm52jar"; depends=[R6]; };
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; };
   colocalization = derive2 { name="colocalization"; version="1.0.0"; sha256="0szdxjj5nbb3ncxsg0b7jphlqqxnizs2lymcafk42sdgvlfkx8sr"; depends=[ggplot2]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
-  colorSpec = derive2 { name="colorSpec"; version="0.7-3"; sha256="1gg55872ap3h15h5ris1qhjgyq4q55x702z9v0xsigz87fcr300s"; depends=[MASS minpack_lm]; };
+  colorSpec = derive2 { name="colorSpec"; version="0.7-5"; sha256="1qswd0f8knzrv5di4lq2vknsbijbz6zlh6ay09nnkh127wrzc76s"; depends=[MASS minpack_lm rootSolve]; };
   colordistance = derive2 { name="colordistance"; version="1.0.0"; sha256="1z4pa5byk1ag6pqdqi6sn5z6caak4733399gk6zp4wi4kfd9p64a"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
   colorednoise = derive2 { name="colorednoise"; version="1.0.3"; sha256="1idwb4w1r7jpjvrlly8326i4d9lw6bjlmlb591hgwl5xdf4599gi"; depends=[dplyr purrr Rcpp RcppArmadillo tidyr]; };
@@ -5457,7 +5553,7 @@ in with self; {
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
   colourlovers = derive2 { name="colourlovers"; version="0.2.2"; sha256="0fgxs73l4g1lnmc2q613ykxxrbmvq6w66zpidccqg64wa9cy5yhm"; depends=[jsonlite png XML]; };
   colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; };
-  colourvalues = derive2 { name="colourvalues"; version="0.1.1"; sha256="1ip1linid749h5lv0x1jlndwx57n8qidglcghspdpnvsccl8cm03"; depends=[BH Rcpp]; };
+  colourvalues = derive2 { name="colourvalues"; version="0.2.0"; sha256="18qvmingga3n8s4mz0mlx1nl4nswhjl44hivnb9p228qxw43j77j"; depends=[BH Rcpp]; };
   colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; };
@@ -5469,7 +5565,7 @@ in with self; {
   comf = derive2 { name="comf"; version="0.1.7"; sha256="1waxapw870fssmy9mzzpslypbal7vanlajzv9ffnsh5w2yzjdpfi"; depends=[plyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="1.6"; sha256="1xymqncf8byqxzpx64zlp6vbx7gry572jkr2ax0zlavr8bli861x"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.2"; sha256="1j914f4fqrzp4wwis7i14krsxbdwb2dznzrjdnimy1irs1macyw3"; depends=[]; };
   comorbidity = derive2 { name="comorbidity"; version="0.2.0"; sha256="0imdnd9fxbl0d5vy1ia7844har8k689mvwbqa7pdy3rz9wmp2q3z"; depends=[checkmate stringi]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
@@ -5477,10 +5573,11 @@ in with self; {
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
   compareDF = derive2 { name="compareDF"; version="1.7.0"; sha256="0gcvhw4rsf9rrx1xb4mv8d5bjvrs51fqgl6vdd8c8jpvdy01q2i5"; depends=[dplyr htmlTable magrittr stringr tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="3.4.0"; sha256="057578433ms4q2xs62zbv36gwx67ihwdlxl243p10y1y7ps335kg"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
+  compareGroups = derive2 { name="compareGroups"; version="4.0.0"; sha256="1akg12kgxhxvdsaydqxb28s96nw3xnwdygi8apa6f67r3m6824i3"; depends=[chron epitools gdata HardyWeinberg Hmisc kableExtra knitr rmarkdown SNPassoc survival xtable]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
+  compas = derive2 { name="compas"; version="0.1"; sha256="1ckryllwd8avz6456970qhfa3wpcsmhkicnibnv7gl4crzf44xgx"; depends=[bio3d Rcpp RcppEigen]; };
   compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; };
   compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
@@ -5496,7 +5593,7 @@ in with self; {
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
   comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; };
   con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; };
-  conStruct = derive2 { name="conStruct"; version="1.0.1"; sha256="1b20r2a2xn3fwa131sk6gdhpxw79g6316fws12iph2vw0lp0gyka"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  conStruct = derive2 { name="conStruct"; version="1.0.2"; sha256="039cv1gl39jb8w5mbhyj96d1x0b9rximqfd3315cidqf8ykli038"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
   concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; };
   conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; };
@@ -5507,24 +5604,23 @@ in with self; {
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
   condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; };
-  condformat = derive2 { name="condformat"; version="0.7.0"; sha256="04q78ghahwdy8q58fd80b45fm129zmiscwn146r741ld5gr9m82z"; depends=[dplyr gplots htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; };
+  condformat = derive2 { name="condformat"; version="0.8.0"; sha256="1x3sm3fn5lb07gmxvfaa0xnhk5mjnim90p7mwail8dmi9nygrb9d"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; };
   condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; };
   conditions = derive2 { name="conditions"; version="0.1"; sha256="0vhqkbsil3qfvrz7924i3wvjknw69cp27g7ayapf6w94bbggx4x8"; depends=[]; };
   condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; };
   coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; };
-  conf = derive2 { name="conf"; version="1.3.3"; sha256="0hankl9grc149r82v93iwrk6hf19n5ipay80cc9zv034wv2249w1"; depends=[SDMTools STAR statmod]; };
+  conf = derive2 { name="conf"; version="1.4.0"; sha256="1xhnil3cm3a72hngpxp7kxvh98l2017yidk7qp7lgb5aggcslc9c"; depends=[fitdistrplus SDMTools STAR statmod]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
   config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; };
-  configr = derive2 { name="configr"; version="0.3.3"; sha256="08fa04sjh2k6mbv998bp6cd7rh47j0ic3bcqdhr7zqlbd1g670x2"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
+  configr = derive2 { name="configr"; version="0.3.4"; sha256="0wsw5kbmkbc95ds4m311m25fn9wrc5wq06jvzjsnnh86ax2w43is"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
   conflicted = derive2 { name="conflicted"; version="1.0.1"; sha256="0hj9dvyi59y917cac1d3g1bgaghs40nr71z3y2msr29q01d1sqkp"; depends=[memoise rlang]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
   confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; };
-  congressbr = derive2 { name="congressbr"; version="0.1.3"; sha256="1c29nqnhiyr9y2hs5lwpqa7c54qcqfr74l5mzh13dlccz3zsm2p1"; depends=[dplyr httr lubridate magrittr pscl purrr stringi stringr tibble tidyr xml2]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; };
@@ -5532,7 +5628,8 @@ in with self; {
   constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; };
   constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
-  container = derive2 { name="container"; version="0.2.1"; sha256="0vy77hhxmrai71y3ivs69ijdsk50lgrayij2mbvb0415kxv9ifs9"; depends=[R6]; };
+  container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; };
+  contextual = derive2 { name="contextual"; version="0.9.1"; sha256="1dsb55v35n253z7fkzmwh0jsym8g7m444l84bkgb65jggw3jydsa"; depends=[checkmate data_table doParallel foreach iterators itertools nleqslv R_devices R6]; };
   contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; };
   conting = derive2 { name="conting"; version="1.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
@@ -5541,7 +5638,7 @@ in with self; {
   controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; };
   convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; };
   convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; };
-  convevol = derive2 { name="convevol"; version="1.2"; sha256="106x3qj5m8flcq4ixrvh0fv0kkcc7595ym4bg9dxjhdx4v0zhnbg"; depends=[ape cluster geiger MASS phytools]; };
+  convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; };
   convexjlr = derive2 { name="convexjlr"; version="0.7.0"; sha256="1dxvz5jnflswqh7iqc4fw7gbp8s6qn7rfy2b5qx4jklrvfj696yj"; depends=[JuliaCall magrittr XRJulia]; };
   convey = derive2 { name="convey"; version="0.2.1"; sha256="1fcfzcpiy35xr2i81q002h07zf8gvbv1m5is7j475bi13666ynzh"; depends=[survey]; };
   convoSPAT = derive2 { name="convoSPAT"; version="1.2.4"; sha256="0by1z2z7gzycwrll1agkqnpn5h5cjr6b62gpwy11wl4lh48p4213"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
@@ -5550,7 +5647,7 @@ in with self; {
   coop = derive2 { name="coop"; version="0.6-1"; sha256="1hr78w7qlslpwnrz9mk6w4p5qa8sxhkzans5givy5hf9qkykn0dp"; depends=[]; };
   coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.1.0"; sha256="16iax25jzm9613i2ml5d4xjknhycallrbcxhrsrsp8znlclbglqs"; depends=[lmomco randtoolbox]; };
+  copBasic = derive2 { name="copBasic"; version="2.1.1"; sha256="012fzdhxwgmg4l02kd5dw98wpia1mskc1csagblga5dplv5jdc7h"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
   coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; };
@@ -5575,7 +5672,7 @@ in with self; {
   corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; };
   corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; };
   corpustools = derive2 { name="corpustools"; version="0.3.3"; sha256="1hgcwnjhqfyylvqcy2j5f2k6chwyybnx38vzzvq62s6qf6p9p7by"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi udpipe wordcloud]; };
-  corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; };
+  corr2D = derive2 { name="corr2D"; version="0.3.0"; sha256="1dx3mjcbpwmq9iy7rwxn3fghaw9g1m8ksa9gj4yqkagw6k4hjnin"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; };
   corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
   corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; };
@@ -5593,6 +5690,7 @@ in with self; {
   costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; };
   cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; };
   couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; };
+  countcolors = derive2 { name="countcolors"; version="0.9.0"; sha256="1wv3l6g7kzkxj8cpldf96ckqsw47wx5gch5jb8l876ngxjxbvwjx"; depends=[colordistance jpeg png]; };
   countgmifs = derive2 { name="countgmifs"; version="0.0.1"; sha256="19d8xr7ipqp16w46c3mrg15jfcvpj7n4pds8zw6mgw4g81bcxamf"; depends=[MASS]; };
   countrycode = derive2 { name="countrycode"; version="1.1.0"; sha256="1pmv2jxr1ydgv8r5n20s5z80hdmzgvhm4cxdqhbkf7nfyipwl8xl"; depends=[]; };
   countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; };
@@ -5604,7 +5702,8 @@ in with self; {
   covTest = derive2 { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; };
   covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; };
   covafillr = derive2 { name="covafillr"; version="0.4.3"; sha256="0mqq4hm3nhzrvdai9blb0ycgm6j5klfd8y4ib5pl99plffs6r7pl"; depends=[RcppEigen]; };
-  covatest = derive2 { name="covatest"; version="1.0.1"; sha256="01dn2jbfiy7fwlm6zg44cvb2475kaa4l8snl1xara3qp0xiikhvr"; depends=[gstat matrixcalc sp spacetime]; };
+  covatest = derive2 { name="covatest"; version="1.1.1"; sha256="0fnm3ljk4my3xinv0qswi57l51z0j6cva7by00p8f5992hhk3sn9"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; };
+  coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.1"; sha256="0bjhyxd3qdy8idpq76ld9bdyhyqhzl7kkl9g2zcfs0hiw94mv1fd"; depends=[colourpicker dplyr egg ggplot2 ggstance markdown shiny shinyjs tidyr]; };
   covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; };
   covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; };
   covr = derive2 { name="covr"; version="3.2.1"; sha256="187hvqp7mvxy3hl00fgw56sm93yrz81fwixf652arr0ih2jdm47a"; depends=[crayon digest httr jsonlite rex withr]; };
@@ -5633,7 +5732,7 @@ in with self; {
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; };
-  cpt = derive2 { name="cpt"; version="1.0"; sha256="0cfjsni8m3sx2vh5cxiwqh50gl65nag5zp757jy75sx44rky63m8"; depends=[glmnet MASS nnet randomForest]; };
+  cpt = derive2 { name="cpt"; version="1.0.2"; sha256="0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7"; depends=[glmnet MASS nnet randomForest]; };
   cptcity = derive2 { name="cptcity"; version="1.0.3"; sha256="1axysyarmf68cmwadqwz9106zs5jj1bvrwhkg86maixj5aaqpim5"; depends=[]; };
   cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
@@ -5641,7 +5740,7 @@ in with self; {
   cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; };
   cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
-  cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; };
+  cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
   cranly = derive2 { name="cranly"; version="0.2"; sha256="0h6yfj805kbprgj28x43iz6lcjsv39vxdf33j9gg2gnmgr5zja67"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
@@ -5674,8 +5773,9 @@ in with self; {
   crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; };
   crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; };
   crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
-  crosswalkr = derive2 { name="crosswalkr"; version="0.1.1"; sha256="0yk5yxxsd1alfbfjg5bzjc5b07jfj5s551bzrv3dg57hxnqw9b2z"; depends=[dplyr haven labelled readr readxl tibble]; };
+  crosswalkr = derive2 { name="crosswalkr"; version="0.2.2"; sha256="0jmdzw1p2gya45nzxwri91mndq9kk8wlskraqmi68b6p17d8i2fa"; depends=[dplyr haven labelled readr readxl tibble]; };
   crossword_r = derive2 { name="crossword.r"; version="0.3.5"; sha256="1h6r5rrmla3jsdfnkxsv4drvp3nrkqkygqv9ak0pn37zlbms99z9"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; };
+  crov = derive2 { name="crov"; version="0.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; };
   crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
   crplyr = derive2 { name="crplyr"; version="0.2.0"; sha256="14j0cn3ci6vbmimcinzp25ym0h264405jn8gw7w0gk3rcamgh50s"; depends=[crunch dplyr lazyeval purrr rlang stringr tibble]; };
   crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
@@ -5684,6 +5784,7 @@ in with self; {
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
   crs = derive2 { name="crs"; version="0.15-31"; sha256="0h8hhxnyy8lf7jpnvriaa5dn3zgp1yqhfrnc5rpjlzsx2lnyyv9r"; depends=[boot np quantreg rgl]; };
+  crseEventStudy = derive2 { name="crseEventStudy"; version="1.0"; sha256="1hwfghhiwwiid50dqpi592kyc4cwqm4bipnzfl0j0fc3b0d4h5n8"; depends=[sandwich]; };
   crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; };
@@ -5705,7 +5806,7 @@ in with self; {
   cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; };
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
   csv = derive2 { name="csv"; version="0.5.2"; sha256="1gwib79fysmiwaw48ghsygyqgc00j5zwy7lfgcziw1kp6nxkdk19"; depends=[]; };
-  csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
+  csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; };
   csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
   ctl = derive2 { name="ctl"; version="1.0.0-2"; sha256="1gpb43zn411l476dby2g38qkcvh2fsdcvbkr9jb274l1154km1xm"; depends=[MASS qtl]; };
@@ -5716,13 +5817,11 @@ in with self; {
   ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; };
   ctrlGene = derive2 { name="ctrlGene"; version="1.0.0"; sha256="0gz2js2n990sfwxwigp4dxqcf94f9bzcinyzjign5yvyr53fakvk"; depends=[psych]; };
   cts = derive2 { name="cts"; version="1.0-21"; sha256="0wagxqb8msjc8z33qp7sc92l53f56d9bzz9160bmgpjxlj6cnqcj"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="2.6.5"; sha256="0dk1q18sd4s5ynxq8sdhxc7p35qqc6z87d001pykbr0kzszyf9c2"; depends=[BH corrplot MASS Matrix mvtnorm OpenMx plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders]; };
+  ctsem = derive2 { name="ctsem"; version="2.7.6"; sha256="1k435f2miq44m95wwbz4r9zxz20mgyynkkbdjwfxkbz15srci9f5"; depends=[BH corrplot data_table DEoptim KernSmooth MASS Matrix mvtnorm OpenMx plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders]; };
   ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="1.4-1"; sha256="10jl5l3xnigiq95829ssq69xbim97k851187dghc30awszcx4clh"; depends=[Rcpp]; };
+  cubature = derive2 { name="cubature"; version="2.0.1"; sha256="01zc7n3xqnqp9ll1spixaadjzw604nvn3vf1m89ydd870kswybf6"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
   cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; };
-  cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
-  cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
   cultevo = derive2 { name="cultevo"; version="1.0.2"; sha256="0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy"; depends=[combinat Hmisc pspearman stringi]; };
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
@@ -5734,8 +5833,10 @@ in with self; {
   curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curvecomp = derive2 { name="curvecomp"; version="0.1.0"; sha256="0ykgbwnh32w61cjcg1nyqak42hx0jrsrpbra2wh3pgj9clg1qad2"; depends=[multcomp]; };
   cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; };
-  customLayout = derive2 { name="customLayout"; version="0.2.0"; sha256="0mr5s6arjm97bdgr6r8w1d33spiwnqw4spbl7smivpw7h8asi94m"; depends=[flextable gridExtra officer RColorBrewer]; };
+  customLayout = derive2 { name="customLayout"; version="0.3.0"; sha256="0zarqsdcjy8cymwrb6648nil509q9rhmp4633sidmmjclpyjca2q"; depends=[assertthat flextable gridExtra officer RColorBrewer rvg]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
+  customsteps = derive2 { name="customsteps"; version="0.7.1.0"; sha256="1v6ks8j1mj623yai515xnrpx60hvilbrsn59r3zw30n68555cvw8"; depends=[dplyr generics magrittr purrr recipes rlang tibble tidyselect]; };
+  cusum = derive2 { name="cusum"; version="0.1.0"; sha256="1vl2mpasbv87jwzikiik2vdnzy517gknskjpl2iacwfjl63gnzi1"; depends=[checkmate]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
   cutpointr = derive2 { name="cutpointr"; version="0.7.4"; sha256="0d9g0xrypfh382zpil16yh65bl3rlygj7vgzkqblwad8ladbd27s"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
   cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
@@ -5744,6 +5845,7 @@ in with self; {
   cvar = derive2 { name="cvar"; version="0.3-0"; sha256="164k8b40w1npbq3r9i6n9m0hkia3wavsid88zyc63j56lxxk8zmm"; depends=[fGarch gbutils Rdpack]; };
   cvcrand = derive2 { name="cvcrand"; version="0.0.2"; sha256="1gclzn6qqjylxg3v263x5cfg1wjkqviqb3fzzb7w0ckpld2his0v"; depends=[tableone]; };
   cvequality = derive2 { name="cvequality"; version="0.1.3"; sha256="19mpf2vjj2hfgdr3mx5y1i0ldb0byvv2ii7lyanhc6c2a3mirs38"; depends=[]; };
+  cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; };
   cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
   cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
   cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
@@ -5775,6 +5877,7 @@ in with self; {
   dMod = derive2 { name="dMod"; version="0.4.2"; sha256="0zxan4q3xlmk441yzl8jq53qh966njjy9hdprk96pvqf8pa3ca40"; depends=[cOde deSolve digest dplyr ggplot2 plyr rlang rootSolve stringr]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
   daarem = derive2 { name="daarem"; version="0.2"; sha256="1lh7p8nsn984v3p2fis0ipv4vd2wli60l730i47ij0g38swrs58x"; depends=[]; };
+  dabestr = derive2 { name="dabestr"; version="0.1.0"; sha256="1ds6mb535h91fvnfl6rhv12z0qpkpk85bijdnb19k5h8rfljx6qf"; depends=[boot cowplot dplyr forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; };
   dad = derive2 { name="dad"; version="3.1.1"; sha256="120f7asg3hbr0c5n821jdr8c7cz67dbv1v646v6xgnyy4n6ym2qa"; depends=[e1071 lattice]; };
   dae = derive2 { name="dae"; version="3.0-23"; sha256="0rsvnxvfbvcfwm544lwvp4ivwv2nndgscc3c5ap99br7c5jm4xym"; depends=[ggplot2]; };
   daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
@@ -5787,7 +5890,7 @@ in with self; {
   damr = derive2 { name="damr"; version="0.3.1"; sha256="1hxsbs2kfv1js4mbllk7fkv3h0gkmw6cymakwj426hk7p8ppb586"; depends=[behavr data_table readr]; };
   dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; };
   darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; };
-  dartR = derive2 { name="dartR"; version="1.0.5"; sha256="1xdkkxwarmspakiabds6j6zr5fmm6s7rz2f5c87c4ai2xx1mcazw"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgdal rgl seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
+  dartR = derive2 { name="dartR"; version="1.1.6"; sha256="1vyfmrpgha00zib7zclfp3773hww6ak7w3ngwfhia3ya3pdkj5h2"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plotly plyr PopGenReport qvalue reshape2 rgdal rgl rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
@@ -5814,7 +5917,7 @@ in with self; {
   dataone = derive2 { name="dataone"; version="2.1.1"; sha256="17x1v1v13v06qyjb5mvxcdnlp7ln73rhgaib1w1sc44385m33hxs"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
   datapack = derive2 { name="datapack"; version="1.3.1"; sha256="0hzc68vgjvpm235zg8k2642c3jzh3ls9kp6lpz720y1b56q8k3n7"; depends=[digest hash redland uuid XML]; };
   datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; };
-  datarobot = derive2 { name="datarobot"; version="2.9.0"; sha256="0z49dyr0gpgasnf1igyjivpjr2116rvkdirxxvq2nlb6q7i5smjd"; depends=[curl httr jsonlite yaml]; };
+  datarobot = derive2 { name="datarobot"; version="2.10.0"; sha256="0z16njqxjp0n6avkxknvb2mk5w1mg4y0kan06cqxq2kg0ry0ky91"; depends=[curl httr jsonlite yaml]; };
   datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; };
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.3.0"; sha256="13ywnqln831i5hlf1cpqcyc77blg99w8jvy8jic17z86fjxh4gim"; depends=[DT miniUI shiny]; };
@@ -5843,9 +5946,9 @@ in with self; {
   dbmss = derive2 { name="dbmss"; version="2.6-3"; sha256="0b3vbsb01rz46mspfk8v9dgwqkxnjkv5d6152zg1zsvyv0z9wvqd"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
   dbplot = derive2 { name="dbplot"; version="0.3.0"; sha256="1sdhw73a518pj81p4xzfkyk5qnfvv7pmizqgwypmkmr3j87klkdx"; depends=[dplyr ggplot2 purrr rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.2.2"; sha256="0j5w6a1qim972kv4vmvinp3j50yr4idmm9cd3w7y3zsz0nq0nhcx"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
-  dbscan = derive2 { name="dbscan"; version="1.1-2"; sha256="08s73i1pnyfsm10sf15rnn58lj1pzrca6i38dq5ivr5xghb3pksy"; depends=[Rcpp]; };
+  dbscan = derive2 { name="dbscan"; version="1.1-3"; sha256="1q0vlrp0abzci2zsjgh7jp3sk1wflcvwjmy9fp0gsay8sgdcixgk"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
-  dbx = derive2 { name="dbx"; version="0.2.2"; sha256="1n6r2plq718xwxw2q2dxc3vql0brnin7dm3lsv1nh41rwk9ypsp8"; depends=[DBI]; };
+  dbx = derive2 { name="dbx"; version="0.2.3"; sha256="083h3mlmmpmpr887akl7wg31xc5kap5il8nghzd8g9mlba9n43zn"; depends=[DBI]; };
   dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
@@ -5855,11 +5958,11 @@ in with self; {
   dcmodify = derive2 { name="dcmodify"; version="0.1.2"; sha256="093rh3r3n0wjdpx861xiqd1zqd5v1v9rzxgcynz4awr7jbm5xszi"; depends=[settings validate yaml]; };
   dcurver = derive2 { name="dcurver"; version="0.9.1"; sha256="1cfy0j3rmi3laszrgd3i59cfy4xfs2p6h9dcwbkwq6wnshrpypfn"; depends=[Rcpp RcppArmadillo]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-  ddalpha = derive2 { name="ddalpha"; version="1.3.4"; sha256="16cn0bhbaz9l9k4y79sv2d4f7pvs7dyka273y89igs5jvr99kfj1"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
+  ddalpha = derive2 { name="ddalpha"; version="1.3.7"; sha256="1fjxky9wdy2f3qch3z97gd930mpialilish2jwhffz2n2c32hlk4"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
   ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; };
   ddpcr = derive2 { name="ddpcr"; version="1.9"; sha256="0xdy36wdl972xgzs3chzs7x1n4z1xvj1vahcz2pxa1wrr4sd9z8q"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
-  ddsPLS = derive2 { name="ddsPLS"; version="1.0.1"; sha256="08kkjs50zn9z6mvjiz9ic09w01h7w088plgnbcg10vc7cbjgr05a"; depends=[doParallel foreach MASS RColorBrewer Rdpack]; };
+  ddsPLS = derive2 { name="ddsPLS"; version="1.0.5"; sha256="00pcpdqkihcvqj6w52kr00rf6m19dh3ql6xhazk865gk9g5phgy5"; depends=[doParallel foreach MASS RColorBrewer Rdpack]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
   deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
   deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; };
@@ -5873,6 +5976,7 @@ in with self; {
   decido = derive2 { name="decido"; version="0.2.0"; sha256="17myg67qry1sbd1scv9bbvdh67fpcnqcb6r8n0kajdxb96vnlqk0"; depends=[Rcpp]; };
   decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
   decisionSupport = derive2 { name="decisionSupport"; version="1.103.8"; sha256="1xp97v22ar4nsv2q4di6rqfin7pa7a6zqw5d1zmm5aqxfi07nc4x"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
+  deckgl = derive2 { name="deckgl"; version="0.1.8"; sha256="0nm9jf166343sd01mchw2v6qpsfjgdhf6zd2p92rqyhp9k0hq5lv"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
   decoder = derive2 { name="decoder"; version="1.1.12"; sha256="0jacp5fqi3l87a86kzhivwd7bl9ndcpymw1vkzmr9r5my8d119pk"; depends=[backports]; };
   decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; };
@@ -5898,13 +6002,13 @@ in with self; {
   deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; };
   deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; };
   demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; };
-  deming = derive2 { name="deming"; version="1.3"; sha256="0r5wx0cj6ym97jplvfyz36iig7zczdd6fiqf8g3vc4f53mqlhx9b"; depends=[boot]; };
+  deming = derive2 { name="deming"; version="1.4"; sha256="1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421"; depends=[boot]; };
   demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; };
   demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; };
   demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
   demu = derive2 { name="demu"; version="0.2.0"; sha256="0prfl2i3q2n5f4qpvkksyi8qvwj2fd9v82cr6val7abvcvbn9276"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; };
   dendextend = derive2 { name="dendextend"; version="1.9.0"; sha256="1jiani6zwfajky2vafvay2hq158nh99rdrk3j00lycspds9v35fd"; depends=[fpc ggplot2 magrittr viridis whisker]; };
-  dendroTools = derive2 { name="dendroTools"; version="1.0.1"; sha256="1ym8vkvi4b6wv6iygzbj1kiv54cayfixlmx1ilvs2cv794rbfmck"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; };
+  dendroTools = derive2 { name="dendroTools"; version="1.0.2"; sha256="156iylz62mps24d0lnxwal5nsl4qnysx7m0bb070b45v6x4cp9in"; depends=[brnn Cubist dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly randomForest reshape2 scales]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
@@ -5917,7 +6021,7 @@ in with self; {
   densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; };
   depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
-  depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; };
+  depmix = derive2 { name="depmix"; version="0.9.15"; sha256="1dnps6s5bfa834akjgx4zbg49danpy54mhiz1kjb4nmrnlb0zq7q"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-5"; sha256="155bxfyhkmwz3asx1q8myvn3qjb3i2aq7pnw0r7kxygxzn071hkq"; depends=[MASS nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; };
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
@@ -5944,15 +6048,15 @@ in with self; {
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detpack = derive2 { name="detpack"; version="1.1.1"; sha256="0q7c01bjrvrlbrhb8vhkjw2f43jp46ny3jdyay0j760cfdaqb5zk"; depends=[]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  detrendr = derive2 { name="detrendr"; version="0.5.1"; sha256="0xcr6nk4fzcwf2k3js2619dyw9if0453cwfdna4fcjqp7pifq30a"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr]; };
+  detrendr = derive2 { name="detrendr"; version="0.6.0"; sha256="0dlkhyxdxzxlbnw3wa05rykfczmkm45ymfhz1qgad7vzikzd4472"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr]; };
   detzrcr = derive2 { name="detzrcr"; version="0.2.3"; sha256="09a8x7zphsk06n64qqbh840vrp89sza9vfnz08il6jdy77j02974"; depends=[ggplot2 MASS shiny]; };
   devEMF = derive2 { name="devEMF"; version="3.6-1"; sha256="0lhf11bdgizhm2im13d0mc0ca834kg2cyabz92jp4mmhjvglrgf3"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
   devRate = derive2 { name="devRate"; version="0.1.9"; sha256="1dy9hfhhlxj5sim69870dkwrarrl5pvmfvls8ys43h300my331gp"; depends=[]; };
   devtools = derive2 { name="devtools"; version="2.0.1"; sha256="1nyspqicn9zd1rgq3k07b3179i8w5ys6jbd65g9q8qczrb7z3x8f"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rstudioapi sessioninfo usethis withr]; };
-  dexter = derive2 { name="dexter"; version="0.8.1"; sha256="0lkx1prngds2jcqw9b504as1q80ghgncms0sldw2pdgmklncha6l"; depends=[colorspace DBI dbplyr dplyr DT fastmatch purrr RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
-  dexterMST = derive2 { name="dexterMST"; version="0.1.0"; sha256="0c9djz8n38x9ff9yh8ah77a4nnhanyqxnbzhi5i77si0zk8p7505"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
-  dextergui = derive2 { name="dextergui"; version="0.1.4"; sha256="0im7ych6wypjrywmzwk5d40ak87rbaqqql4rq8zf10ysai4j9gwm"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
+  dexter = derive2 { name="dexter"; version="0.8.3"; sha256="0zlqybm27cimyhfys878p2rsk9x5kyxmnjf61c6bbda9fy9mn3x0"; depends=[colorspace DBI dbplyr dplyr DT fastmatch RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
+  dexterMST = derive2 { name="dexterMST"; version="0.1.1"; sha256="0i9y5qngg85x6h9zm4rf8p7fydl3s72rmc2bh3qpb9vc8js99m35"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
+  dextergui = derive2 { name="dextergui"; version="0.1.5"; sha256="0k6m977jkhapcdy9gyrq2gx3lynr5796ka9pd4yjna89v45cz6qc"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
   df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
   dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; };
   dfcomb = derive2 { name="dfcomb"; version="2.5-0"; sha256="16wa7shc5rw8sax0x94i0lvg1h4wnq51mqdvsc5z8a5ki84jxlra"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
@@ -5963,7 +6067,7 @@ in with self; {
   dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; };
   dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
-  dfpk = derive2 { name="dfpk"; version="3.5.0"; sha256="1jl1ddi7kq1w95gvz3j4a4yxvnjk3ml7vqvb83lqzkb1ms8wlxw3"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
+  dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
   dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
   dglars = derive2 { name="dglars"; version="2.1.0"; sha256="1miqrsb1k36mcfvwf4i94z7sn3qq6wkikwv3fiyzyd2q7ny9a068"; depends=[Matrix]; };
@@ -5980,7 +6084,7 @@ in with self; {
   diagmeta = derive2 { name="diagmeta"; version="0.2-0"; sha256="1qdpsn0c4g459p8p90p2a9fghiwjqqmmanz3zsa5a3lv7zxmk496"; depends=[lme4 meta]; };
   diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
-  dials = derive2 { name="dials"; version="0.0.1"; sha256="09bi7smr1cfhnm42n31bjpxni74nay34a1vkvqcfc587g5i5x5bq"; depends=[dplyr glue purrr rlang scales tibble]; };
+  dials = derive2 { name="dials"; version="0.0.2"; sha256="1ip8hdv293lcj0jiycinc66fib1q1vsnb3px26zsmlw49nb32q5h"; depends=[dplyr glue purrr rlang scales tibble withr]; };
   diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
   diceR = derive2 { name="diceR"; version="0.5.1"; sha256="0r3sj6qkkj6yqz21jcbjylqsr8n6yhghix2568gffckcijzgppar"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
@@ -6016,7 +6120,7 @@ in with self; {
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
   digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
   dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
-  dimRed = derive2 { name="dimRed"; version="0.1.0"; sha256="0fasca5fsbrxdwv30hch7vb9snb844l7l8p5fjf239dq45xfy37v"; depends=[DRR]; };
+  dimRed = derive2 { name="dimRed"; version="0.2.2"; sha256="0ssy2qriiy6zdawriqcbl67qiq68ipml3frq7aqlq70r2fqyyw48"; depends=[DRR magrittr]; };
   dina = derive2 { name="dina"; version="1.0.2"; sha256="1dgjny7ik2g15zbi3ywl0xbab6vnv5qkxfrb4x79w7lic5m90ldc"; depends=[Rcpp RcppArmadillo]; };
   dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
   dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; };
@@ -6025,7 +6129,7 @@ in with self; {
   directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
   directlabels = derive2 { name="directlabels"; version="2018.05.22"; sha256="0xcpc56ssb9430b0xcdhayk3qaak2qcakyss2pz14y5w2027hblv"; depends=[quadprog]; };
   directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; };
-  dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.1"; sha256="0ip7mcjddqg7z9hqrvbxixvkqp9j4d92zgpk6hn6acd4fxhb17r6"; depends=[ggplot2 gtools mvtnorm]; };
+  dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.2"; sha256="06m16261zyppy0b2bl857s55fdqaqpx7ablzdah8lfjg2cdfdhs5"; depends=[ggplot2 gtools mvtnorm]; };
   dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
   discSurv = derive2 { name="discSurv"; version="1.3.4"; sha256="0xawvadgy5lkzhk60kb4ga1gh4niqpr9p6wxgrp88mbwp7q600kl"; depends=[functional mgcv mvtnorm]; };
@@ -6068,6 +6172,7 @@ in with self; {
   distrSim = derive2 { name="distrSim"; version="2.7.0"; sha256="1fihq54kng7icqs6z27rdrykql00c33f0d8cznbizjsz6ipm94d6"; depends=[distr setRNG startupmsg]; };
   distrTEst = derive2 { name="distrTEst"; version="2.7.0"; sha256="19w92php04fp3c4ip7zz2zs210h4dp9nj3g3ddq26hlh7ng9kk85"; depends=[distrSim setRNG startupmsg]; };
   distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; };
+  distreg_vis = derive2 { name="distreg.vis"; version="1.0.1"; sha256="1pyqj3dl5yaj2dq0fja7rrsrdpaxjvg28lzk3jhgy0i3ryr6x37k"; depends=[bamlss formatR gamlss gamlss_dist ggplot2 magrittr mvtnorm RColorBrewer rhandsontable shiny viridis]; };
   distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; };
   distrr = derive2 { name="distrr"; version="0.0.4"; sha256="0nywvgcbk2i2n2qa80yk68zikl2fs7nybhq540808rjksldh9pvy"; depends=[dplyr lazyeval magrittr tidyr]; };
   divDyn = derive2 { name="divDyn"; version="0.6.1"; sha256="04l342jz34q3fcmibdj0zr53w6zp65p3al0w1qd8diq09z1388gc"; depends=[Rcpp]; };
@@ -6076,11 +6181,12 @@ in with self; {
   diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; };
   diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; };
   diversitree = derive2 { name="diversitree"; version="0.9-10"; sha256="0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"; depends=[ape deSolve Rcpp subplex]; };
-  divest = derive2 { name="divest"; version="0.7.1"; sha256="0ih61l7lncs6lzszwshxnnn9wvpac5zfdaamax9hqkz171zq2gnw"; depends=[Rcpp RNifti]; };
+  divest = derive2 { name="divest"; version="0.7.2"; sha256="1zzc7nik78g8ca4zbkx5618npf1kg362km4lpvc7ympi8ysf81zg"; depends=[Rcpp RNifti]; };
   divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; };
   dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
   dkanr = derive2 { name="dkanr"; version="0.1.2"; sha256="1936jhj95cqsa6n8yw7zg8hh8m4ld5ajgwb94r5w5w8lfwdficli"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
+  dlbayes = derive2 { name="dlbayes"; version="0.1.0"; sha256="058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0"; depends=[expm GIGrvg glmnet LaplacesDemon MASS]; };
   dlib = derive2 { name="dlib"; version="1.0.3"; sha256="1is8j1gwf22n7yixg40rb6p4mrnbzijwfjl6vsniq8qkyy7z8k32"; depends=[Rcpp]; };
   dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; };
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
@@ -6089,6 +6195,7 @@ in with self; {
   dlsem = derive2 { name="dlsem"; version="2.4"; sha256="1q4acqlnirr5mk1k4ljzkhmx23a76w7gj98qd3c2s3qlqrsf6xvw"; depends=[graph Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
   dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; };
+  dmai = derive2 { name="dmai"; version="0.1.0"; sha256="0k5c5jb98195mr1gcra6mg887faj8f2g303rzk0izsi4yzw6rm7n"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
   dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
@@ -6105,7 +6212,7 @@ in with self; {
   doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; };
   doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
   doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; };
-  dobson = derive2 { name="dobson"; version="0.3"; sha256="1vhakkg0276vq0haww5cmm8dbp20bc4874mihqasxkfylqpp6hz2"; depends=[]; };
+  dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; };
   docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.1"; sha256="17r8az17vkj46cljp0pa15xh9x2p5w85csm2hickfk2lyg2pbjnx"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; };
@@ -6113,7 +6220,7 @@ in with self; {
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
   docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  document = derive2 { name="document"; version="3.0.2"; sha256="0p5brpqbgcn1v1i51cvkqq3pg6v256d70zpsc48jj5x7f2mfz3jb"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
+  document = derive2 { name="document"; version="3.1.0"; sha256="05cks0yrjwkbpdcx0llh2p7fi4xybmrrqflw21sq8w0pivjkpwc6"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
   docxtools = derive2 { name="docxtools"; version="0.2.0"; sha256="0mz71d4hppnp7i67a202x19hcgs99lbslkkfqa2k7npzl4dxj5sr"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.5.0"; sha256="079lm7dbhnwx0aj4df777ws7dmhag2n9f4w17v146rkp2z2l4ym1"; depends=[dplyr httr purrr tibble xml2]; };
   dodgr = derive2 { name="dodgr"; version="0.1.1"; sha256="187530rrz8ij1wy21zf8drppqh1yml6q01q40b60pzkf1mqp3w5m"; depends=[igraph magrittr osmdata rbenchmark Rcpp RcppParallel sp]; };
@@ -6126,28 +6233,29 @@ in with self; {
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
   dotwhisker = derive2 { name="dotwhisker"; version="0.5.0"; sha256="034pvkc59jdjl27wirgb2cv84ajw5y2if20njzzp87nd4f9bb6br"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; };
   doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; };
-  double_truncation = derive2 { name="double.truncation"; version="1.1"; sha256="03h1km4n8sasc3jdz9gal7yw170b47hgfziz35g9x3qw96lvanpg"; depends=[]; };
+  double_truncation = derive2 { name="double.truncation"; version="1.3"; sha256="0afb3q4ing0a8v2hh7gcmpxx7varw7v6nkf06a32chgzxbr3qmqc"; depends=[]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="3.0-1"; sha256="0kmv4d5fa6mmhmbfqfxzk1gv55j15d7madsdqi8470bwh0kkya4y"; depends=[cubature minpack_lm raster Rmpfr sp]; };
   downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
   dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; };
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-  dplR = derive2 { name="dplR"; version="1.6.8"; sha256="0rgdshkkvij177y7d432wx23ch6f54ns3w93a6fayb1pl936rh7f"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
+  dplR = derive2 { name="dplR"; version="1.6.9"; sha256="0pb2f0f09qwi6az7c0pp28jhv5cgdfy4wqwfsqgkq5nlzlbkbnri"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.7.7"; sha256="196lwck3i3m25jnn1f1nrda9svnjqqi89s0is79gbrphamddnlq5"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
+  dplyr = derive2 { name="dplyr"; version="0.7.8"; sha256="06p59nhli8c1sarghzxq0y4pk6lyyz3xwkarp55b252dfg2rly9p"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
   dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.0"; sha256="1yvz1hbczqvvmgkhbvvwkjx56ljqsxry86qk9bn62rdzdvhhpwhx"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; };
   dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-9"; sha256="064i122j8vkpjxzfrhp25kb6nv5j3a7s8qk0202x7vnvj9caqjvx"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
   dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; };
   dqrng = derive2 { name="dqrng"; version="0.0.4"; sha256="0qkpyr7gc3m704znfv011l19s8qsnq42rn8p43qsakvndfyqynbb"; depends=[BH Rcpp]; };
+  dqshiny = derive2 { name="dqshiny"; version="0.0.1"; sha256="1dsi0n7r8gpjq1wvs22vk31w1javh1ikc52h36b9jy58h9x24gsa"; depends=[htmltools shiny]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
-  dr4pl = derive2 { name="dr4pl"; version="1.1.7.1"; sha256="17w3ls3g57zs0ibgwsh12f7l47yc4sh13b02n61wf7k5yjaql8yr"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
+  dr4pl = derive2 { name="dr4pl"; version="1.1.7.4"; sha256="1vxfvnc04ia9zk328qnv7n0m7libxnhb6rfvadi6w09ww49dqpmb"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
   dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; };
   dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; };
-  drake = derive2 { name="drake"; version="6.1.0"; sha256="102k3r5c2qdg2avz2frjb1z5i1vwpsr6mx9zcl0n7hiwixn2rxfv"; depends=[codetools digest dplyr evaluate formatR fs future igraph magrittr pkgconfig purrr R_utils R6 rlang storr stringi tibble tidyselect withr]; };
+  drake = derive2 { name="drake"; version="6.2.1"; sha256="1g6dhcrls5zyxlqp3155k9cjh25zbnq02fv654z48pid6bbsni7n"; depends=[codetools digest formatR igraph pkgconfig rlang storr tibble]; };
   drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; depends=[]; };
   draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
@@ -6160,20 +6268,20 @@ in with self; {
   droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; };
   drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; };
   drtmle = derive2 { name="drtmle"; version="1.0.3"; sha256="1b2nlkmx7park79pkmnjnkckli89zh3klfamxkqndgd1s5p0aa11"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; };
-  drugCombo = derive2 { name="drugCombo"; version="1.0.2"; sha256="0akb0lszqr9qci9aqwrahhhza1qzdai4w15drccjm399v0csqi0w"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
+  drugCombo = derive2 { name="drugCombo"; version="1.0.3"; sha256="03hlv6alhjd84liixb7nqcfgyhcr59bjni049h71jpicqzci2qk9"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
   ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
-  dsa = derive2 { name="dsa"; version="0.60.24"; sha256="0jraxggygsdhsrq98wb88vzfsr60s7i8bnhpz7wirvx2nv3813pg"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; };
+  dsa = derive2 { name="dsa"; version="0.60.32"; sha256="0jl21a81i047igmwxxalflfcvkmsl6gh61balkyj50vxv4v4l8x8"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
   dslabs = derive2 { name="dslabs"; version="0.5.1"; sha256="1pzpvgwzgnr3hi9idkkx6ik80bralg5bgnz4b5p24ab5fcr45gy5"; depends=[ggplot2]; };
-  dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; };
+  dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; };
   dsm = derive2 { name="dsm"; version="2.2.16"; sha256="1glw3pwgar9qadjya615n5n10lg7xvclcnr3k9vn8y3fgid22f80"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; };
   dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; };
   dsr = derive2 { name="dsr"; version="0.1.0"; sha256="0iyy0axjbxbhy9hriwgnz96ryb1qvjm1gj62rmi27386ag2knf43"; depends=[dplyr rlang]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
-  dst = derive2 { name="dst"; version="1.0.0"; sha256="0xlrczyw0i3c5hnzflrlw463x9dlmv89m7xlq9xq3krxfsx3qv4z"; depends=[]; };
+  dst = derive2 { name="dst"; version="1.3.0"; sha256="1pck09g2430d08x2f72zc2zxx6yaybcpzramjvjldwj1kmz32l1w"; depends=[]; };
   dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
-  dtangle = derive2 { name="dtangle"; version="0.3.0"; sha256="0jvn7g3d2wspdhiahmn88iv9cdh9h3qj15540j39vws5jhl1dgsb"; depends=[]; };
+  dtangle = derive2 { name="dtangle"; version="0.3.1"; sha256="0kvds49gx850rmrcja0xr3j9nja5zqnsg1q2zjb07qp425jc3j46"; depends=[]; };
   dti = derive2 { name="dti"; version="1.2-6.1"; sha256="1p88k7qkmas49niq618jhddc0h4mwh5gd267v6rlzzpmv5f98fkb"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
   dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; };
   dtplyr = derive2 { name="dtplyr"; version="0.0.2"; sha256="1q75xnk52zfxnphj095dppcqdmk9v1n32069rffpnvr39nnik565"; depends=[data_table dplyr lazyeval]; };
@@ -6199,7 +6307,7 @@ in with self; {
   dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; };
   dynRB = derive2 { name="dynRB"; version="0.13"; sha256="04axc6hzwaclgdyl5lplihgbg6ip8irpiyanghfhhid3c4jm03r7"; depends=[corrplot ggplot2 RColorBrewer reshape2 vegan]; };
   dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
-  dynamac = derive2 { name="dynamac"; version="0.1.4"; sha256="1gsqgwqamfa8zvl01zsjmbsn7q73m4aii6gzb5khppw244qjgw8y"; depends=[lmtest MASS]; };
+  dynamac = derive2 { name="dynamac"; version="0.1.5"; sha256="1s44lk8qbcb3gndik3fbl897mmaxqzp8bl0c8slq8avib80jyb9i"; depends=[lmtest MASS]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
   dynamichazard = derive2 { name="dynamichazard"; version="0.6.1"; sha256="0xwvfpw0djnzi4igim8g32s233f5xf53pskg5w4xwnqja7x6w8v2"; depends=[boot Rcpp RcppArmadillo survival]; };
@@ -6219,7 +6327,7 @@ in with self; {
   dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
   dynutils = derive2 { name="dynutils"; version="1.0.0"; sha256="182k67zkn1gq91h405f0csw71qs5apf92ddrbh8274nmar8hnha4"; depends=[crayon desc devtools dplyr glue magrittr processx purrr Rcpp stringr testthat tibble tidyr]; };
   e1071 = derive2 { name="e1071"; version="1.7-0"; sha256="0fk4pw67cw1663d0n9rf1qfdqzz8k5nqkjgp3hi5jr422qp9lsck"; depends=[class]; };
-  eAnalytics = derive2 { name="eAnalytics"; version="0.1.3"; sha256="1lrkmfs2sq9p2n7g528jf6wxixqk08w468nckkij2mprhrccjjj6"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard]; };
+  eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; };
   eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
   eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; };
   eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
@@ -6234,14 +6342,14 @@ in with self; {
   earth = derive2 { name="earth"; version="4.6.3"; sha256="0af02qi3np40p90v0npnwqa5dg2zszky6kjx9zjw7id7jw5kx1m6"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
   easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; };
-  easyCODA = derive2 { name="easyCODA"; version="0.25"; sha256="079vj7gxbpqcx7jjk6vfv13ng23jglsq1x88i71qvqlqp9vkvs87"; depends=[ca vegan]; };
+  easyCODA = derive2 { name="easyCODA"; version="0.28"; sha256="1qw5kw8qx210f7n7395cs2bh7jl204wr69f99qs6x9ssg8n4g68q"; depends=[ca vegan]; };
   easyDes = derive2 { name="easyDes"; version="4.0"; sha256="1lfkkkwlj444md7xp2zzx0ai976yxq6xp3v2a42pwgzs1fcafwal"; depends=[multcomp PMCMRplus]; };
   easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; };
   easyPubMed = derive2 { name="easyPubMed"; version="2.5"; sha256="08b94pcya9bmnsipd1jn95dpadw2aqb0fnvm68n11mwg40hd272j"; depends=[XML]; };
   easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.3.1"; sha256="0z0fq73m7vjc8wry633lvz58r2c6a6zz6w867hij1627c74mjhs4"; depends=[sdcTable shiny SSBtools]; };
   easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; };
-  easyanova = derive2 { name="easyanova"; version="5.0"; sha256="13m4ddvl3nbh610y00nnihmag62g39v4ds7rx6lmifx4zq86mylp"; depends=[car nlme]; };
+  easyanova = derive2 { name="easyanova"; version="6.0"; sha256="16cypapzrsf70wrpd0rq00kks96rx3kiqnxswd410l6ss2gnni7h"; depends=[car emmeans lme4 lmerTest]; };
   easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; };
   easyformatr = derive2 { name="easyformatr"; version="0.1.2"; sha256="0mrpd21hyafn82apclxmhs2jbd87sdw0g6lwc3h6gl5cbm213nxb"; depends=[dplyr knitr lazyeval magrittr stringi tibble tidyr]; };
   easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; };
@@ -6259,8 +6367,8 @@ in with self; {
   ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; };
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; };
-  echarts4r = derive2 { name="echarts4r"; version="0.1.1"; sha256="0vknh2s5ifk3nk66v7klgwkmlhk0aji7vrl18vad0x0jgkzayyvv"; depends=[base64enc broom countrycode crosstalk d3r data_tree dplyr htmlwidgets magrittr purrr]; };
-  echo_find = derive2 { name="echo.find"; version="1.3.1"; sha256="1z21pcl8kfxrikcghkgwa7flqv3jh3sgdaips64m26i9r9lp5kc5"; depends=[minpack_lm]; };
+  echarts4r = derive2 { name="echarts4r"; version="0.2.0"; sha256="075iqrgynmnxp73ylhzynz4j4ibiq12d66dpcwmhzcw6cn6idk6f"; depends=[broom countrycode d3r dplyr htmlwidgets magrittr purrr scales shiny]; };
+  echo_find = derive2 { name="echo.find"; version="2.0"; sha256="02cvm2ivga8bllkmdj7fljxvrmlpckqf03pl31z2r1zzjpwxx7cy"; depends=[minpack_lm]; };
   echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
   echor = derive2 { name="echor"; version="0.1.1"; sha256="1mc0qng9nqkvbpyklhf0a0fpgww8x88cgb29gmf1v7zycs1ch1m9"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr tibble tidyr]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
@@ -6271,19 +6379,20 @@ in with self; {
   ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
   ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
   ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; };
-  econet = derive2 { name="econet"; version="0.1.7"; sha256="0pvr9bv4ix5xvr0hg61j1iizdi2n5vs8widl91cj1ci90g52dvrk"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
+  econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
   econullnetr = derive2 { name="econullnetr"; version="0.1.0"; sha256="0l4qy7x8f8sjc3s1bhz3kadfqifw0x9jl7dvcjwkh9q14h093cz5"; depends=[bipartite gtools reshape2]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; };
-  ecotox = derive2 { name="ecotox"; version="1.3.2"; sha256="12nng1v73lshcy99hqrp5a1qy052z0cz5n97bq7fla7zc4is69y5"; depends=[ggplot2 magrittr]; };
+  ecotox = derive2 { name="ecotox"; version="1.3.3"; sha256="0hd99s77x4k5q54p4xi2b68jninw7ss6s2za5rizw9w2cpngxxf4"; depends=[ggplot2 tibble]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
   ecoval = derive2 { name="ecoval"; version="1.2.1"; sha256="0dm2vqk5hgs4dh9ms10srjjblk09sidn7m06r714h1vswcd7bphs"; depends=[jpeg rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; };
   ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
-  ectotemp = derive2 { name="ectotemp"; version="0.1.1"; sha256="1gnlbd7h1jf5mryi9mdpbj521vbsj00jd4bc26rqj70wm54nn3p9"; depends=[dplyr psych]; };
+  ectotemp = derive2 { name="ectotemp"; version="0.1.2"; sha256="0dy6n2gaz6qgfj2gvavlgl4ic15wq1lb9ykynihi77nyxnz67i46"; depends=[dplyr psych]; };
+  ed50 = derive2 { name="ed50"; version="0.1.0"; sha256="1j3n79slf5s9g4cwz0dj6gc63bcvmfgg787d88csh9l91k8kpbbw"; depends=[boot]; };
   eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; };
   edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; };
   edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
@@ -6307,7 +6416,7 @@ in with self; {
   educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; };
   eechidna = derive2 { name="eechidna"; version="1.1"; sha256="01c1b41fzkq1hgg7705n96m1ji74gbfy9fisdj5pl0kgjhjiq24w"; depends=[dplyr ggplot2 ggthemes plotly rgdal rmapshaper rvest shiny shinyjs tidyr xml2]; };
   eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; };
-  eegkit = derive2 { name="eegkit"; version="1.0-3"; sha256="15ycx7141sfsja5s94w30cf3rpykh00cjcdhr5923525hi1bavn1"; depends=[bigsplines eegkitdata ica rgl]; };
+  eegkit = derive2 { name="eegkit"; version="1.0-4"; sha256="1r1lack4ps9hwqq56rq37431rcxf3x79zgvda6vrmh4s0ziy6v4x"; depends=[bigsplines eegkitdata ica rgl signal]; };
   eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
   eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; };
   eemR = derive2 { name="eemR"; version="0.1.5"; sha256="13c5k2si8aq2461iz9413hlqzgkb25zrdfvizzk8s2nn60npyaw9"; depends=[dplyr pracma R_matlab readr rlist stringr viridis]; };
@@ -6315,7 +6424,7 @@ in with self; {
   eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; };
   effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; };
   effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; };
-  effects = derive2 { name="effects"; version="4.0-3"; sha256="1riwc3z7h1h08nfkiv2fymllnbqqsdgaq7asla77ygm5hiqd435y"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
+  effects = derive2 { name="effects"; version="4.1-0"; sha256="01c970619y27w4w8bq7i8f7sb324rk2jds229x0vb5r5827bpqb3"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
   effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
   effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; };
@@ -6323,15 +6432,15 @@ in with self; {
   efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; };
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; };
-  egg = derive2 { name="egg"; version="0.4.0"; sha256="11zi42wvjd5x68xrxsqwzwdr9mb3iw9pm02mgy3z6m21mgyvgnmn"; depends=[ggplot2 gridExtra gtable]; };
-  eggCounts = derive2 { name="eggCounts"; version="2.1-1"; sha256="121hmqav8x0d6aqzbz96dv0rdc6mv070v5rvaz13rj17ix5y92yi"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders testthat]; };
+  egg = derive2 { name="egg"; version="0.4.2"; sha256="0ihq8r2hfxj59mswrxb296shz9981wwmywhbnpxrpkmbia701nny"; depends=[ggplot2 gridExtra gtable]; };
+  eggCounts = derive2 { name="eggCounts"; version="2.1-2"; sha256="042asp2gb3pz47mri5cnh5xsy80j67djll7494cwkbbcwrv6w3wp"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders testthat]; };
   egoTERGM = derive2 { name="egoTERGM"; version="2.0.1"; sha256="06yq951cgb1qkily13a3n3kjzpydcbzr8kdsg4mbp1z66nk40izd"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; };
   egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
   egor = derive2 { name="egor"; version="0.18.08-02"; sha256="14jhj1lj5bdsf64zq9gia63h0p3i9211dnla9g7r0dmlbbygwqgf"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; };
   eha = derive2 { name="eha"; version="2.6.0"; sha256="0nw72jcwcx2rzlzsrmdvg7pymyzf5icynidlr1m9b70v6rnqr84b"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
   eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
-  eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; };
+  eiPack = derive2 { name="eiPack"; version="0.1-8"; sha256="18mil21gv83p2s16j084b3w45pp9zj4fnw03i02f7jdqqrcpygcr"; depends=[coda MASS msm]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.10"; sha256="1x613ipqpsq5yj4bb68g7yfwavd75n02xajr2cpbzsa2vyipvpsa"; depends=[]; };
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
@@ -6344,7 +6453,7 @@ in with self; {
   elastic = derive2 { name="elastic"; version="0.8.4"; sha256="0s0nz8j4f1qxjlgzllnfsirbpcggmb5f41zwdrb9xgwpnpn68jz9"; depends=[curl httr jsonlite]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
   elasticnet = derive2 { name="elasticnet"; version="1.1.1"; sha256="0p9dplnsp28z4s2fl6afbwrgd0aj339fak8mmndicmrh7bb7rpmb"; depends=[lars]; };
-  elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.2"; sha256="0jawypqlk8374izh3gq9k6fwc2gwn74xa9lbmx4ww3rq2xp90xw6"; depends=[httr jsonlite]; };
+  elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.3"; sha256="0rsg4h8sz18hgwc77g6krx67izr562jjgl4m68pg1saqafmmg3zp"; depends=[httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
   elect = derive2 { name="elect"; version="1.1.2"; sha256="1m79z697abzrddy849kshwqfygji3n56xz0flwa7xrqhx3nqrj3b"; depends=[msm nnet]; };
@@ -6352,7 +6461,7 @@ in with self; {
   electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
   electoral = derive2 { name="electoral"; version="0.1.1"; sha256="0lmw9kwr189dzfxzlns9fmhrdy93ja8jl2s4jir07lichyiavs03"; depends=[dplyr ineq tibble]; };
   elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
-  elevatr = derive2 { name="elevatr"; version="0.1.4"; sha256="0gxwlcfn271p8gf2iqwqbi61kcaahfdghsc0rwm3xxxysjb5a2b2"; depends=[httr jsonlite progress raster ratelimitr sp]; };
+  elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
   elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; };
   elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; };
@@ -6362,7 +6471,7 @@ in with self; {
   elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; };
   elo = derive2 { name="elo"; version="1.0.1"; sha256="0dhlac5l68a3jps2hx0bc7qjj8hsr1ha137hcwxnrfdwnki6chlp"; depends=[pROC Rcpp]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
-  embed = derive2 { name="embed"; version="0.0.1"; sha256="1xfk0zvs3bw10bipkqzjdgpz20kyrczk7lhsx6wyg6zrc7i3kk9f"; depends=[broom dplyr keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr]; };
+  embed = derive2 { name="embed"; version="0.0.2"; sha256="0d53cv2c9rpmvvflbdf099r378yvrlvrfpczlmygc7jcd5ijja3v"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr]; };
   embryogrowth = derive2 { name="embryogrowth"; version="7.4.1"; sha256="1qha6l7q0565fn9yfvp04dmlpf21hr754gh6fpzhqnrh58h371v1"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.10"; sha256="0880cx6rqm9vgd2zxnd2k0igfl80gy7ak15w36clwlzavab59hmv"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="1.1.4"; sha256="0ghsxayv6d6bx9wfj6iafhaw5c6si2mqcpngj763pblnxjix8ag5"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
@@ -6377,22 +6486,23 @@ in with self; {
   emojifont = derive2 { name="emojifont"; version="0.5.2"; sha256="0s1as6i5dz2rbd1aashn99fji2iksjzrkdkfi7wqnnxxpmkha3yx"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
   emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; };
-  empirical = derive2 { name="empirical"; version="0.1.0"; sha256="0flzb9nps0a5v5yc0jym2kyn20vpjm38a64vj7bda2bbxgdnqgbm"; depends=[]; };
+  empirical = derive2 { name="empirical"; version="0.2.0"; sha256="0kjkrsk9yf7dmpr6y04z43j5jy54q3vg6blyqphapp5fxq0pdhs4"; depends=[barsurf]; };
   empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; };
   emplik = derive2 { name="emplik"; version="1.0-4.3"; sha256="1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; };
-  ems = derive2 { name="ems"; version="1.2.0"; sha256="1ni18bq26hilszv1caslms7z63p9mfph3497nvyshiqvfw17nas8"; depends=[]; };
-  emuR = derive2 { name="emuR"; version="1.1.0"; sha256="0677piygsyffrfba2cay74iymkhz3qvbin09v3pz3y0s0s3jxq1c"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr rlang RSQLite shiny stringr tibble uuid wrassp]; };
+  ems = derive2 { name="ems"; version="1.2.1"; sha256="17q59r032r2dzsf2y90im4441b90zy5lnj3xrjax3ly85n1h5ngb"; depends=[]; };
+  emstreeR = derive2 { name="emstreeR"; version="2.1.0"; sha256="1s1iszdf8rxvwprpi5x9n4nx7mg2cv7jm356dhxg94y33apiky8y"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; };
+  emuR = derive2 { name="emuR"; version="1.1.1"; sha256="1kl08lwrblk0gr4nc9flrd2k81r350l1lr6wbidyfg5l60j44d1n"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr rlang RSQLite shiny stringr tibble uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-17"; sha256="150yg99qzankcqs74jvp35al9gla5vnfylwaswcw6yryi239mgi8"; depends=[mvtnorm]; };
   enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; };
   enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; };
   encode = derive2 { name="encode"; version="0.3.4"; sha256="1ibrxa0lzni8c1nm3x061vj55faz8fvfgbl7c7b2wfanh5qnny9j"; depends=[]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
-  endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; };
+  endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; };
   endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; };
   energy = derive2 { name="energy"; version="1.7-5"; sha256="15k9dg0a82cs9ypm0wpcsff3il1hzhnnv86dv5ngby1r144czhi4"; depends=[boot Rcpp]; };
-  energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; };
+  energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; };
   enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; };
   english = derive2 { name="english"; version="1.1-4"; sha256="0bl2aqirnfb18zd8xmxcil62q38j6xjxs18gzkvg6vdjdajd2y0k"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
@@ -6410,7 +6520,7 @@ in with self; {
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; };
   envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; };
-  enveomics_R = derive2 { name="enveomics.R"; version="1.4.1"; sha256="1clq688whspmn4z1rdrhfnjc68p1yphw0myllps3gh148hqxh8mp"; depends=[fitdistrplus investr modeest sn]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.4.2"; sha256="0dv6f7jqc5lwa0wgr9xl82vn47fgxgzfqx1pm59lzz75pls4ygfx"; depends=[fitdistrplus investr modeest sn]; };
   enviGCMS = derive2 { name="enviGCMS"; version="0.5.0"; sha256="0q7kyygfwphd553lgnv8pa0zghcjj4wvq2qyh8lx2plj9fp5am3n"; depends=[animation BiocParallel broom genefilter mixtools MSnbase rcdk RColorBrewer reshape2 rmarkdown shiny xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
@@ -6422,8 +6532,8 @@ in with self; {
   epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.3.2"; sha256="0j64riiy7b2v1m8ki6d43jm61s7yjwlx4kxxdvlz3fx1xw7qf522"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; };
-  epiR = derive2 { name="epiR"; version="0.9-97"; sha256="06x502f8pyyigafjb1cyc3d0qbvfk1qj5vy7n30lvz9hvp1rgph2"; depends=[BiasedUrn survival]; };
-  epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
+  epiR = derive2 { name="epiR"; version="0.9-99"; sha256="1x7r8nm636x1innbzhpihyi43b2dqlys9qw7b621jnqni3shlv9j"; depends=[BiasedUrn survival]; };
+  epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
   epidata = derive2 { name="epidata"; version="0.2.0"; sha256="0n0100fy65kgw3c7gdmb5z5hmla5ch51b7872snf525a2r581i28"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
   epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; };
@@ -6431,7 +6541,7 @@ in with self; {
   epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; };
   epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; };
   episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; };
-  episensr = derive2 { name="episensr"; version="0.9.2"; sha256="1w1228q8q2ysi3xi3m8a9z0c7japj97dssjkzpjcrng094cy82is"; depends=[actuar boot ggplot2 gridExtra llogistic logitnorm plyr reshape trapezoid triangle]; };
+  episensr = derive2 { name="episensr"; version="0.9.3"; sha256="0c7sk0bff0sssh0k92k213n6w4im9d8jnr0dkr8417mah5x16ahb"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; };
   episheet = derive2 { name="episheet"; version="0.3.0"; sha256="0lp0hd2xyiyrb9z46fjifcirv1wxfh3dkn5chlkhkzr2s5xvbl76"; depends=[assertthat dplyr ggplot2 magrittr rlang tidyr]; };
   episode = derive2 { name="episode"; version="1.0.0"; sha256="1djk36jkvr8xvhfddqg6xsmhxc3yrgivkm8g2hr4n1qixsk1ad8m"; depends=[glmnet Matrix nnls Rcpp RcppArmadillo]; };
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
@@ -6439,9 +6549,9 @@ in with self; {
   epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; };
   epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; };
   epitrix = derive2 { name="epitrix"; version="0.2.1"; sha256="13nk31h4rdpla5m0fskv8s1fwx0r2qh4d0j4cf8vnlbl12rwyh57"; depends=[digest distcrete stringi]; };
-  eplusr = derive2 { name="eplusr"; version="0.9.3"; sha256="0rwshvgsrrcc21ladkmq2zj5vyzkijn5bcj9aiyqpzrwnpmz5iv4"; depends=[assertthat callr cli crayon data_table fasttime later lubridate processx progress R6 readr RSQLite stringr units uuid]; };
+  eplusr = derive2 { name="eplusr"; version="0.9.4"; sha256="0af57hgl2jbfx34565wff21np35y9pqafyr0rncd94gf68wvxaal"; depends=[assertthat callr cli crayon data_table fasttime later lubridate processx progress R6 readr RSQLite stringr units uuid]; };
   eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
-  epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; };
+  epoc = derive2 { name="epoc"; version="0.2.6-1"; sha256="0q17sf2q3yj9sia9m1d23q6li6fkvgmj2a73kl1im8aiaxwcq2m1"; depends=[elasticnet irr lassoshooting Matrix survival]; };
   epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
   epubr = derive2 { name="epubr"; version="0.5.0"; sha256="01ggkwv6l7j7zs70s53vjajfh9i0i7zvajmbqq1ij48b3mrc6y05"; depends=[dplyr magrittr purrr tidyr xml2 xslt]; };
@@ -6465,7 +6575,7 @@ in with self; {
   ergm_rank = derive2 { name="ergm.rank"; version="1.1.0"; sha256="0mzwi5a3mf46nw8m1yychqnvysrps46dn8pp0xliyhcs4h0c3y0l"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.9.0"; sha256="0nccz7qwrn20xd78dlnq2dfb8167s9jglvk40wa0lmcjlz8x62n3"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
-  erhcv = derive2 { name="erhcv"; version="0.1.3"; sha256="01wrjrcvpavw0yd4vhhyiyjda3m4mrh4dirh1a48bwy10nvfb4x0"; depends=[igraph Rdpack stringi stringr]; };
+  erhcv = derive2 { name="erhcv"; version="0.1.4"; sha256="0dai1pd9cly8k7k3ygw10hhzz9vs889hab8zf5j1av033lm3cw2j"; depends=[data_tree Rdpack stringi stringr]; };
   erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   err = derive2 { name="err"; version="0.0.1"; sha256="0mkd5hr5pd7zqqbs205whcjm0gsg6sn5nd5abw7i46v0rq4xxvfp"; depends=[]; };
@@ -6473,8 +6583,8 @@ in with self; {
   errorist = derive2 { name="errorist"; version="0.0.1"; sha256="1569yvncc9rdzchs7cvx44dhy8xf10g2hwkiy3kp68h47qghxlbd"; depends=[searcher]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
   errorlocate = derive2 { name="errorlocate"; version="0.1.3"; sha256="0hfm0nad1bfh7a37zpn4aljrf69yc6dddz9iq46c1mzyrw116a9f"; depends=[lpSolveAPI validate]; };
-  errors = derive2 { name="errors"; version="0.3.0"; sha256="1mdsqnsrrrx0fqpasllv05j2m1ykv6qj8il0647i9sxfqmsijjhk"; depends=[uuid]; };
-  esDesign = derive2 { name="esDesign"; version="1.0.0"; sha256="0d56zg9wvkds4jqrw3gdyz2hgyrhsghky3cbjfkgfba4lzing8zn"; depends=[]; };
+  errors = derive2 { name="errors"; version="0.3.1"; sha256="0nxam3bkl8r79b8v6h80mjpap8nbqp6qrpnzbcyzfwz6fwyi8ikq"; depends=[]; };
+  esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; };
   esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
   esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
   esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; };
@@ -6483,13 +6593,13 @@ in with self; {
   eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; };
-  esquisse = derive2 { name="esquisse"; version="0.1.6"; sha256="0s9qp87n741wsg8sazpyzx4br7pd2p3wmipiig4bj71n7wy3wvwa"; depends=[ggplot2 ggthemes htmltools jsonlite miniUI RColorBrewer rstudioapi scales shiny shinyWidgets stringi]; };
+  esquisse = derive2 { name="esquisse"; version="0.1.7"; sha256="1mvwyc8l8hcqyk06sbcfr5bjnky4jdc262izsjwscsnni8rbxcan"; depends=[ggplot2 ggthemes htmltools jsonlite miniUI RColorBrewer rstudioapi scales shiny shinyWidgets stringi viridisLite]; };
   esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
   essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; };
   essurvey = derive2 { name="essurvey"; version="1.0.2"; sha256="0r1hkdksidx974pi08hg25qlzfxazqmzamwqg2njks2r9xk299p8"; depends=[haven httr rvest stringr xml2]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
-  estimatr = derive2 { name="estimatr"; version="0.12"; sha256="1xqhbr8dp86vli1da47whl130ljdn8l6h8j1lgsa12dfkz5amj6d"; depends=[Formula Rcpp RcppEigen rlang]; };
+  estimatr = derive2 { name="estimatr"; version="0.14"; sha256="1ylhxs7rf608as5yd3wsvhl8q5y9g89ry0ndcqanj95vll51m11c"; depends=[Formula generics Rcpp RcppEigen rlang]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
   estprod = derive2 { name="estprod"; version="1.1"; sha256="15grcpyhaazd1sl8544gx4zpjqi9p17d6siyb6a1ykzzyy1v1fln"; depends=[boot Formula gmm lazyeval minpack_lm]; };
   estudy2 = derive2 { name="estudy2"; version="0.8.5"; sha256="0aqvlgzp98965xmjmmg2dxj79bjcvgv0qa89h5l1lp0i0c23p908"; depends=[matrixStats quantmod Rcpp zoo]; };
@@ -6503,10 +6613,11 @@ in with self; {
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
   etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
-  eulerr = derive2 { name="eulerr"; version="4.1.0"; sha256="1y4s4g49sy7bkkbadj7a8la86h9yy9lzra5jawy2ig1aa3k81d98"; depends=[GenSA lattice polyclip Rcpp RcppArmadillo]; };
+  eulerr = derive2 { name="eulerr"; version="5.0.0"; sha256="023m78nprdrh41bfwqs6gkd2wfwskl0147wb343kybhicqc9asjn"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; };
   europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="3.2.9"; sha256="0nwsjyhyflsq48kf8w6x3fv2qscqq0pz0dl93s221nbgd94qlyad"; depends=[broom classInt dplyr httr jsonlite RColorBrewer readr sf sp stringi stringr tibble tidyr]; };
+  eurostat = derive2 { name="eurostat"; version="3.3.1"; sha256="169b76bws9dl67bbsbbpykkvp21ngyrhdwgqc7w5vif8jaf8ls5c"; depends=[broom classInt countrycode dplyr httr jsonlite RColorBrewer readr sf sp stringi stringr tibble tidyr]; };
+  ev_trawl = derive2 { name="ev.trawl"; version="0.1.0"; sha256="14yhnhqq1gz2rfy13v1dybnf55pyyimajbarxyp7gaqnd66nfq3p"; depends=[eva evir fExtremes ghyp hypergeo testthat]; };
   eva = derive2 { name="eva"; version="0.2.5"; sha256="03hyzbqi2mgdrmzrjnwzvy0ndf7ha5959b63sgd1g0b998fibbmd"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.12"; sha256="11rpn40153kcvqqrfhg2ldqfs68frg6yzsl0k3rxnlnv4c0v008g"; depends=[]; };
   evaluator = derive2 { name="evaluator"; version="0.3.1"; sha256="1xyj8nc74dg2si6j4j9d35wa0qsymskpkpfd89acl0dcs07sg62j"; depends=[dplyr extrafont furrr ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; };
@@ -6528,6 +6639,7 @@ in with self; {
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
   evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
+  evtclass = derive2 { name="evtclass"; version="1.0"; sha256="1ny43sry257cxlg56f0lj1szv9ci3ymskj6l5sn43l5a2pq62g4l"; depends=[evd fitdistrplus RANN]; };
   evtree = derive2 { name="evtree"; version="1.0-7"; sha256="1swq4cmx7hvsagn1nfavay5rg5r5axjxpcckvd3sy6lgvwvflcnq"; depends=[partykit]; };
   ewoc = derive2 { name="ewoc"; version="0.2.0"; sha256="0kanx14fhcbqz6gpyj7628vgy9fwz3ji5mkd4107b8pgpz2hkg00"; depends=[coda doParallel foreach Formula ggplot2 rjags]; };
   exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; };
@@ -6536,8 +6648,8 @@ in with self; {
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exampletestr = derive2 { name="exampletestr"; version="1.4.0"; sha256="1k3qq0cqg1ksll3xa26cyr3yf1wcpl6sy013rs8lcid30cgn1pqp"; depends=[checkmate clisymbols crayon devtools filesstrings fs glue magrittr ore purrr readr rlang roxygen2 rprojroot stringr styler usethis]; };
-  exams = derive2 { name="exams"; version="2.3-1"; sha256="0xg2rvfw61q5g9aj828219fqdnrwhy698xy7mkrcaly9mq95zs8b"; depends=[]; };
+  exampletestr = derive2 { name="exampletestr"; version="1.4.1"; sha256="1mc54clscdav19jmq943i8j826b13jr6zgrhwhzissbb2n7pcc7g"; depends=[checkmate clisymbols crayon filesstrings fs glue magrittr ore purrr readr rlang roxygen2 rprojroot stringr styler usethis]; };
+  exams = derive2 { name="exams"; version="2.3-2"; sha256="1x69vnzfipibfpflp22m3win8017abmmlikykb6kpc71bfwdq0jn"; depends=[]; };
   excerptr = derive2 { name="excerptr"; version="1.4.1"; sha256="0z5gayf7kkhdg7ad2w4ycar5dd42jdjybrhzfmkqb3xr9pdrnijg"; depends=[git2r rprojroot rPython]; };
   excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
@@ -6554,10 +6666,11 @@ in with self; {
   expm = derive2 { name="expm"; version="0.999-3"; sha256="04k4a6g071jkjc0d30ncmf713dj16brcs9m6pj43hnycc1caq6si"; depends=[Matrix]; };
   expoRkit = derive2 { name="expoRkit"; version="0.9.2"; sha256="0qlzz86cyfz2yyynz8bj28086d1pc93gvjy1idip80m7z6vsrsxq"; depends=[Matrix SparseM]; };
   expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
+  export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; };
   expp = derive2 { name="expp"; version="1.2.2"; sha256="0xr24xzplgamj8dkjk9n9jmrbyw056z57hkm9h4j43g63vxrinlj"; depends=[deldir rgeos sp spatstat spdep]; };
   exprso = derive2 { name="exprso"; version="0.4.0"; sha256="122bh96hhn2wbwjlrnrb9s9bkfd2wp43vsyr8glxrd47mdvm2i9v"; depends=[cluster e1071 frbs kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.8.7"; sha256="1p0jzqbjagx00qwjhsjyvmqijlp33qjhj7k9b8rddibvg9ysmcji"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.8.8"; sha256="1swq1wgbv28624rjbmpl4176cyhngr0bgmgv6d1j1fhj8r1aa2n6"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
@@ -6574,18 +6687,19 @@ in with self; {
   extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
   extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
   extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; };
-  extremefit = derive2 { name="extremefit"; version="0.2.3"; sha256="1m2960qbs2qha4975sq5awsvlk10s1mgb3cm91fyrm6lh50plv5m"; depends=[]; };
+  extremefit = derive2 { name="extremefit"; version="0.2.4"; sha256="0r21qx4kl6mcjp8mx9pcrmwhchyd7jggkm8bqid2czhd3y29j8yh"; depends=[]; };
   extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; };
   extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
   exuber = derive2 { name="exuber"; version="0.1.0"; sha256="0jm0kxw7f4pzy162alp0q9kxgyrg2qllhxl7ijaq5qx4wnyhab3m"; depends=[doParallel dplyr foreach ggplot2 purrr Rcpp rlang]; };
   eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
-  eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.7"; sha256="1an39l4bkbw7s75y1pjgdwhixshdaawpy4kwyaqk7jkhhy7nl1nh"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
+  eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
   ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
   ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
   ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
+  ezpickr = derive2 { name="ezpickr"; version="0.1.3"; sha256="1rdq51pdwv60z7bxbxcyimw993c5j8v4mdpf0swq6i0c28qqi5v0"; depends=[haven jsonlite magrittr readr readxl textreadr tibble]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
   ezsummary = derive2 { name="ezsummary"; version="0.2.1"; sha256="16rwg1h7gs7mnkmbwfb273fy1pwdq9ng6l4ad00anpmilqcck5ng"; depends=[dplyr tidyr]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
@@ -6594,7 +6708,7 @@ in with self; {
   fBasics = derive2 { name="fBasics"; version="3042.89"; sha256="0x6s6js52sz0rv3y66ax1bkf4mn9ihjmkyrm5clf7ymw5hvd5f5q"; depends=[gss MASS spatial stabledist timeDate timeSeries]; };
   fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; };
   fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; };
-  fChange = derive2 { name="fChange"; version="0.1.0"; sha256="1pj4q9dsqqgv198kfv410qkpgynhd580bcsigmak598m5jx3rf7l"; depends=[fda lattice reshape2 sandwich sde]; };
+  fChange = derive2 { name="fChange"; version="0.2.0"; sha256="0aw6krc5nz0ihhwc7ijn3nzsgbva9ji3dqa3gpr068jysnnlxkra"; depends=[fda lattice reshape2 sandwich sde]; };
   fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; };
   fDMA = derive2 { name="fDMA"; version="2.2.4"; sha256="0lpp6gyynfziyn5ar3wlq628b5lvw5dhxzw6wr5xwwfaarqf7qfx"; depends=[doParallel foreach forecast gplots iterators itertools MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; };
   fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; };
@@ -6612,6 +6726,7 @@ in with self; {
   fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; };
   fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
+  fabMix = derive2 { name="fabMix"; version="4.4"; sha256="0ma0ggdnb6jz43na5xn05nxrqns4iqi3hysw5h98d3baaxxiq7mh"; depends=[coda corrplot doParallel doRNG foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; };
   fabricatr = derive2 { name="fabricatr"; version="0.6.0"; sha256="11vl2gabri7pb2ka7aqq3w7rxsi26qcdyqdhca9jpxm2m0swm2ms"; depends=[rlang]; };
   face = derive2 { name="face"; version="0.1-4"; sha256="0kkgblxzhjzifxnym6g5psiwvfgydk1scqbxraldklm8c4a12zc3"; depends=[Matrix matrixcalc mgcv refund]; };
   facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; };
@@ -6628,7 +6743,7 @@ in with self; {
   fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; };
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
   fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; };
-  fakemake = derive2 { name="fakemake"; version="1.3.0"; sha256="1w2zrx5imkmcd9aikis2r54k2g9g6l0q7n3d18vjbk02js3f4jv4"; depends=[callr igraph MakefileR withr]; };
+  fakemake = derive2 { name="fakemake"; version="1.4.0"; sha256="0ncwdy66975argnghp8kkd9f571pphk6wj572wp8nhl5qkrfi7rk"; depends=[callr igraph MakefileR pkgbuild withr]; };
   falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; };
   falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; };
   fam2r = derive2 { name="fam2r"; version="1.2"; sha256="0pq5cmzwk3s8cz5x8dsfb2d6qfpapkrwbzvkqmqkhcwhwryy40mm"; depends=[Familias paramlink]; };
@@ -6643,7 +6758,7 @@ in with self; {
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
   farff = derive2 { name="farff"; version="1.0"; sha256="1w3mi0vsw7mpqznaf3rnzf7va7ax07n5rrpm2hnjh0q25lsv55hk"; depends=[BBmisc checkmate readr stringi]; };
-  farver = derive2 { name="farver"; version="1.0"; sha256="18r98j9n2l6zjjx6gqvrjj6j19r52k0mrn72p4vyy97ag8fs8hb1"; depends=[Rcpp]; };
+  farver = derive2 { name="farver"; version="1.1.0"; sha256="1dllgx121al374gyp9pjv1m8ip4imm8zhbgyh1970dsz2c4z71i0"; depends=[Rcpp]; };
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
@@ -6653,7 +6768,7 @@ in with self; {
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
   fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; };
-  fastLink = derive2 { name="fastLink"; version="0.4.0"; sha256="0cqrg6fj7ylxf5brwmdsv7wrak8b395yszdy1cz3q87r3ayi02cq"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
+  fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
   fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; };
   fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; };
   fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
@@ -6672,7 +6787,7 @@ in with self; {
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
   fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
-  fastqcr = derive2 { name="fastqcr"; version="0.1.0"; sha256="0hzlp66as7k0bh3biqkngacpkq1hi3y3gp6wg4c5476ywzm83gra"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
+  fastqcr = derive2 { name="fastqcr"; version="0.1.1"; sha256="03051wclbfw9qz2jxr58231sgbqm15jnqz7wj8h68x970dwp7rrb"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
   fastrtext = derive2 { name="fastrtext"; version="0.2.5"; sha256="0zbd2sxzarxic90d2pkbn7fak5gyb81b180m91f784smb3sx1p1j"; depends=[assertthat Rcpp]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.3"; sha256="00pnzr3v7vm965b3cvgplasw00akmixybvm6l9bn609c2kqbf5p3"; depends=[kinship2 multgee]; };
@@ -6680,7 +6795,7 @@ in with self; {
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
-  fbar = derive2 { name="fbar"; version="0.4.3"; sha256="1raq8ak01gcnmcsaa3fdfqi40d67v7nfjr212jzvq7wp2qk3j10i"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
+  fbar = derive2 { name="fbar"; version="0.5.2"; sha256="0scfcr5k71fl0b0sibxchhcwpwk7ll68ks4nrpvsqgv5z48hlvsl"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
   fbati = derive2 { name="fbati"; version="1.0-3"; sha256="03a48sndphxrm4bmk0qx0lxnk4akkdpbvldq9dcnf9hxxmrfivh4"; depends=[fgui pbatR rootSolve]; };
   fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; };
   fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; };
@@ -6701,17 +6816,18 @@ in with self; {
   fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat viridisLite]; };
   fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
   fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; };
+  fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
   fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; };
   fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; };
   fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
-  fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
+  fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
   feather = derive2 { name="feather"; version="0.3.1"; sha256="1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"; depends=[hms Rcpp tibble]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
-  featurefinder = derive2 { name="featurefinder"; version="1.0"; sha256="1hhfhc1gjmi770yljqhqrp9a5z5rrbd7bavznb758c26hpk7xilf"; depends=[plyr rpart rpart_plot]; };
+  featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
   featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; };
-  febr = derive2 { name="febr"; version="1.0-0"; sha256="0c0kgj31n2z2qqbga9waqrrm6xxksi27c6riyp1c57z4wjais860"; depends=[cellranger dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; };
+  febr = derive2 { name="febr"; version="1.0.1"; sha256="0wlanldcz8xdr1hng7ixhssvihdymv91icxn3qjcpm5cajnpnr7a"; depends=[dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; };
   fecR = derive2 { name="fecR"; version="0.0.2"; sha256="1p4166cxajapm158aqbz9p7m8c8dqga1infl6y6wazjnayaib3cb"; depends=[lubridate plyr]; };
   fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
@@ -6723,8 +6839,9 @@ in with self; {
   fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; };
   fetchR = derive2 { name="fetchR"; version="2.1-1"; sha256="0i5k40i7ryfbk1l4nn0k5hnmzhhp6970ns1j82hnih7kmdl4rlwj"; depends=[plotKML rgdal rgeos sp]; };
   ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; };
-  ffbase = derive2 { name="ffbase"; version="0.12.5"; sha256="1h5x6rbb1nrpzf4ywkizn8ij0bz3mlz46byh46ylxhicg1ribi24"; depends=[bit fastmatch ff]; };
-  ffmanova = derive2 { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
+  ffbase = derive2 { name="ffbase"; version="0.12.7"; sha256="04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw"; depends=[bit fastmatch ff]; };
+  ffmanova = derive2 { name="ffmanova"; version="0.9.1"; sha256="1zvqcdd08kyljxlakgfx5hm541yjqafxv3rgz6f8d8yjn8p1alvn"; depends=[]; };
+  ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; };
   ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; };
   fftw = derive2 { name="fftw"; version="1.0-4"; sha256="0172kpxzjx8239r2jbcqqbpcpqygrxk36a2kmh00f73mrq0kjhc0"; depends=[]; };
   fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; };
@@ -6742,16 +6859,16 @@ in with self; {
   filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="2.7.0"; sha256="02v565in9sw1j01wyqmi3y42l1rgqqrkmfis808nh2lsgf6l1a0f"; depends=[checkmate magrittr matrixStats ore purrr Rcpp rlang strex stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="3.0.0"; sha256="1r32z9xlid9pj8sapb73iwzq6cczz96f1ipdbszwb6x9vlq2nw7l"; depends=[checkmate magrittr matrixStats ore purrr Rcpp rlang strex stringr tibble]; };
   filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
-  finalfit = derive2 { name="finalfit"; version="0.8.7"; sha256="1xs5q8hfvs84qjkgrbsi6xxlj1bycrnrryqfbr7306l42lp1k7mf"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 mice plyr pROC purrr scales stringr survival survminer tidyr]; };
+  finalfit = derive2 { name="finalfit"; version="0.8.8"; sha256="0km8qh7dx54msn48sgr4x7f22alk2wdpxjv5dvb1r4lxz0fhdq6y"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 mice plyr pROC purrr scales stringr survival survminer tidyr]; };
   finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; };
   findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; };
-  findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; };
+  findpython = derive2 { name="findpython"; version="1.0.4"; sha256="1zfcdcp4d48d2pzf5n59kqrfk2z9nnyzkx5j00gfmgfkadnv93x5"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
-  fingertipsR = derive2 { name="fingertipsR"; version="0.1.9"; sha256="1sg2rsk41nxvwy7brikh685gqg5i5d9x2jralgap69qcpmy30gpv"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="0.2.0"; sha256="1zgazqa7mxajgcf9pfq3kvr9qmfy0pncwdlq9g9vi5qasm2ix6g1"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
   fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.2"; sha256="12izvrmjdwy212zxgl54cbry53fv351g3vxmjw5vimqmdd991fxw"; depends=[dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
   finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; };
@@ -6760,8 +6877,9 @@ in with self; {
   fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
   fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; };
-  fishmethods = derive2 { name="fishmethods"; version="1.10-4"; sha256="1ir9r0bnp4klmm0i2iqqg03jd2qm19q885mqwpgcnl2mv8d45dwn"; depends=[boot bootstrap lme4 MASS numDeriv]; };
+  fishmethods = derive2 { name="fishmethods"; version="1.11-0"; sha256="0ikxvq0mkw0s382ias04il06sbqfiq8phx69f5pdzvbm5xskzmxs"; depends=[boot bootstrap lme4 MASS numDeriv]; };
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
+  fishtree = derive2 { name="fishtree"; version="0.1.0"; sha256="1fmh5vm5bln6gx1b9ihfp018y1ghvyrja87rdfb9js6iyh5c5xc3"; depends=[ape jsonlite rlang]; };
   fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; };
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
   fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; };
@@ -6771,7 +6889,7 @@ in with self; {
   fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
   fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-11"; sha256="12hckg3y5j3zh9q1gwxkc27q813p2r42iqp7wdfiq6nj55jrh6w6"; depends=[MASS npsurv survival]; };
-  fitplc = derive2 { name="fitplc"; version="1.1-7"; sha256="1dffgqsml6cj6ayqdpr0330kj8v57jwi3pgchb8v98rainygsyfw"; depends=[car nlme]; };
+  fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; };
   fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; };
   fitur = derive2 { name="fitur"; version="0.6.1"; sha256="04lr717lsbb4731nlzgscraj30knik4q68jzrl4i5f27912159r9"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; };
@@ -6780,7 +6898,6 @@ in with self; {
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; };
   flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
-  flan = derive2 { name="flan"; version="0.6"; sha256="0idlvi4xlfr5l0csj75xmn94856y71j92im6dwv0rcawkwh8ghqh"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
   flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
@@ -6795,12 +6912,13 @@ in with self; {
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; };
   flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; };
-  flextable = derive2 { name="flextable"; version="0.4.5"; sha256="09j2y0z7rkc0w1cl9pp1cpk6fnzzfr6245mxa3ca42z9k2cy2jfl"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr xml2]; };
+  flextable = derive2 { name="flextable"; version="0.4.6"; sha256="0fa42dvf0wyl91w4v0rywm3xgw9n03cfyl28ficrv8iabz4k4382"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr xml2]; };
   flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; };
   flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; };
   flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; };
   flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; };
-  float = derive2 { name="float"; version="0.2-0"; sha256="14kkd724knd7v1wdl6qy88izk94qa1rb9cfd8myqa3va582fc5zj"; depends=[]; };
+  float = derive2 { name="float"; version="0.2-1"; sha256="14v5c54g93pggai6dyj9461516p0h8548028rvkqwvmc3l597lz8"; depends=[]; };
+  flobr = derive2 { name="flobr"; version="0.1.0"; sha256="0i4n5mqpg0i0ysncm8b99a8lnqph01yfiwiw1nar7qpxszai0399"; depends=[blob checkr err]; };
   flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; };
   flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; };
   flora = derive2 { name="flora"; version="0.3.0"; sha256="1nsc2q6y02shpk70p44rr7nl7pnj6as7jgdyakxqs64imwais8x2"; depends=[dplyr httr jsonlite stringdist]; };
@@ -6846,6 +6964,7 @@ in with self; {
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
   forestControl = derive2 { name="forestControl"; version="0.2.0"; sha256="1w1x7i57dqlrm6zzgx4k0p1zs83nrg2w2jhhvjjk9s6y1ba3whyg"; depends=[dplyr magrittr purrr Rcpp tibble]; };
   forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; };
+  forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; };
   forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; };
   forestmangr = derive2 { name="forestmangr"; version="0.9.0"; sha256="1k3n6k7jf1b5pd1vp51z47hbln3cfwdb1nl2dv28jv1ba5lb7ja6"; depends=[broom car covr curl dplyr ggplot2 ggpmisc ggthemes htmltools magrittr minpack_lm plyr psych purrr rlang rmarkdown scales systemfit tibble tidyr]; };
   forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; };
@@ -6883,7 +7002,7 @@ in with self; {
   frailtyEM = derive2 { name="frailtyEM"; version="0.8.8"; sha256="0mfhhb025wzwvch5bcvvfsljki34xahdkqli7lvqbhhihba00r1p"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
   frailtyHL = derive2 { name="frailtyHL"; version="2.2"; sha256="0i6r889i4f07w6992nfsfr439psz6k3q79nkkk3zwf5fv5r6bcky"; depends=[cmprsk Matrix survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.5"; sha256="0hkl62srfm26z48nsg0s6yssrwdmpv17qzyd9fjkxir6ghhvxvzy"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.13.2"; sha256="0vchpw94qn6nymx4wi991bd6v1y0r9b6d7lmwdhc7ipn8gv0sllf"; depends=[boot MASS nlme statmod survC1 survival]; };
+  frailtypack = derive2 { name="frailtypack"; version="3.0.2"; sha256="08x44gs9g0k4mh6h480iq5idlcwljdcmlznlvc9f9bv1xllmb92i"; depends=[boot doBy MASS nlme statmod survC1 survival]; };
   frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; };
   frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; };
   franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; };
@@ -6893,7 +7012,7 @@ in with self; {
   freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; };
   freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
   freesurfer = derive2 { name="freesurfer"; version="1.6.1"; sha256="1ibhl5sbz85skkawmfdr9df6wdq6b3bl6cdvykx0gcszmd3fiabh"; depends=[neurobase R_utils reshape2]; };
-  freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.4"; sha256="1wilz554dx4glgm8nzd5gzbi6ja6gynmj3fx61s1sqas1jnby1gh"; depends=[fontquiver]; };
+  freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; };
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
   freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; };
   freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; };
@@ -6913,22 +7032,22 @@ in with self; {
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
   fs = derive2 { name="fs"; version="1.2.6"; sha256="0kqqaqqml8x3r1mdld40iwns0ylj2f52qsdh1vcn39f7w7c2ka8j"; depends=[Rcpp]; };
   fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; };
-  fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; };
+  fsdaR = derive2 { name="fsdaR"; version="0.4-4"; sha256="0wya7wjpr095lm914i8dhagkmk48f5ksgmpliy5ximxbjrn3jcwr"; depends=[ggplot2 reshape2 rJava rrcov]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
-  fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; depends=[matrixStats neurobase oro_nifti R_utils]; };
+  fslr = derive2 { name="fslr"; version="2.22.0"; sha256="1a3sclwhmalp4g05yr8gw80zgcbqvgpbppj1pyw4x846ahk1wikd"; depends=[neurobase oro_nifti R_utils]; };
   fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; };
   fst = derive2 { name="fst"; version="0.8.8"; sha256="0yhkpq54msr0620456gzyg5c47n8cjvnpc3iyvj24cvyar2l9vwp"; depends=[Rcpp]; };
   fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; };
   ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
   fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; };
-  ftsa = derive2 { name="ftsa"; version="5.1"; sha256="1j8cq0fa2lkiyvaj4xcg60qz158fphakd9l2wgdv0qv1d1wsnp6g"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
+  ftsa = derive2 { name="ftsa"; version="5.2"; sha256="16lzlzjm4ifpqww5yix8l9q5xs1cl5aqi7vjn74nnls6wkgvp4rw"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
   ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; };
   fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
   fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; };
   fulltext = derive2 { name="fulltext"; version="1.1.0"; sha256="195281yyjim7giim326lmk69xayw6n4xdkkym3azi6nj6a3g6f0v"; depends=[aRxiv crminer crul data_table digest hoardr httr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
-  fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
+  fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; };
   funData = derive2 { name="funData"; version="1.3-2"; sha256="0qifkrw4a6hrm8msxcy1dxrfiw88xmxw8avg5ls7bginq4bfsk51"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="2.2.0"; sha256="1s4k6wvs6x88c7whw0bkb3pfhp8wqcmzlsv8div9df0i2fisf3zr"; depends=[fda MASS]; };
@@ -6938,14 +7057,14 @@ in with self; {
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
-  funcy = derive2 { name="funcy"; version="1.0.0"; sha256="13r3n28fpzg4siqsdgwklgm7y38mjpd6dglwdpn8fyiirh1xmas0"; depends=[calibrate car cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
+  fungible = derive2 { name="fungible"; version="1.75"; sha256="158s5m2xbc520kmb0zgckydfffff0zlb0b6ama0g9r07fv06rmyx"; depends=[clue e1071 GPArotation lattice MASS mvtnorm nleqslv psych Rcsdp RSpectra stringr]; };
   funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; };
   funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; };
-  furniture = derive2 { name="furniture"; version="1.8.0"; sha256="1f1s0zwishm73rgdj93z1975manc3a7v51mzz1478h0jp5kd2pql"; depends=[cli crayon dplyr knitr magrittr rstudioapi tibble]; };
+  furniture = derive2 { name="furniture"; version="1.8.7"; sha256="1mdv7wzp2wi9qikclaq3zcj11g33r8zf9n5z19ib9rasi4naa6v7"; depends=[cli crayon dplyr forcats knitr magrittr rstudioapi tibble]; };
   furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; };
   fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
   fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; };
@@ -6966,7 +7085,7 @@ in with self; {
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.5"; sha256="1ifhvdzn0rs8gxqmpz8w1prxg3pxs5jqx5lh0r4i5rai49qjy3sb"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; };
   fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.4"; sha256="06r103hshc6xcjllv5qfiw3i1ddz4c8svy0i4j0avnffaarlc2wa"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
-  fuzzyreg = derive2 { name="fuzzyreg"; version="0.4"; sha256="1m6vfagd5qnxdmdh2ya0vmz8jvbf0fwn95zgqcjwgvmwyafkw5m8"; depends=[limSolve quadprog]; };
+  fuzzyreg = derive2 { name="fuzzyreg"; version="0.4.1"; sha256="1n1hc9br70rpg6r7cchgyj9xg1fm0fi8jnfj74yyvkpf39b0cj25"; depends=[limSolve quadprog]; };
   fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; };
   fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
@@ -7019,9 +7138,10 @@ in with self; {
   gamlss = derive2 { name="gamlss"; version="5.1-2"; sha256="0sq1gvsj4ydmyz3xip5565c15022rz98p979lp39i3wafrs4wh0d"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
   gamlss_add = derive2 { name="gamlss.add"; version="5.0-1"; sha256="1agk6pfm04hf9dp5r6dvxqkj1hykx23a16q7vch2sg752z0dadgk"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
   gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; };
+  gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; };
   gamlss_data = derive2 { name="gamlss.data"; version="5.1-0"; sha256="1hg63z4pybmlihnckv9r5nxckx7rjss2rkajgrkraqxal6747b8a"; depends=[]; };
   gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
-  gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-0"; sha256="0cfp7l1sw4q1n0f5zvb3gzp5q94w3f2ylvvi1fgdlyzbrjmf5fdc"; depends=[MASS]; };
+  gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-1"; sha256="1cd0vl9klcb849i8xwyjm8ihb1da92631j1rxdbnflgffkzrkya4"; depends=[MASS]; };
   gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; };
   gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
   gamlss_spatial = derive2 { name="gamlss.spatial"; version="2.0.0"; sha256="1pgmlc6i7p5mjb1pc7b861yjl2gwr37bbzj3j2dl0qzybrs742mx"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
@@ -7039,10 +7159,10 @@ in with self; {
   gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
   gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
   gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; };
-  garray = derive2 { name="garray"; version="1.0.2"; sha256="07z5rdzk3bg4w31pdaarb0lmq26caqrn7mj396rmxrfq1l3l0bfm"; depends=[]; };
+  garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
   gasfluxes = derive2 { name="gasfluxes"; version="0.4"; sha256="1shjyksnqq2sjv8k2qidx9k1s6clh3lfvffdwxqbm3lp7wqzlmg6"; depends=[AICcmodavg data_table MASS sfsmisc]; };
-  gastempt = derive2 { name="gastempt"; version="0.4.01"; sha256="0jfk82yw7a95ih1s8ir432j79ix8vjbprwzr5fkzgykk07lfwm68"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan shiny StanHeaders stringr tibble]; };
+  gastempt = derive2 { name="gastempt"; version="0.4.3"; sha256="009g6w22yjybjhdpphc2gqn3lqng6vqr0n2myp3y02s6zxl9h7qj"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan rstantools shiny StanHeaders stringr tibble]; };
   gaston = derive2 { name="gaston"; version="1.5.4"; sha256="1yjl100z6cakpfd1gqryigpclyslygzvhps7w6gyrp85yipj5i0r"; depends=[Rcpp RcppEigen RcppParallel]; };
   gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; };
   gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
@@ -7063,11 +7183,11 @@ in with self; {
   gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; };
   gcdnet = derive2 { name="gcdnet"; version="1.0.5"; sha256="159dl8v1n7s9wnfrjb6f0b3ssblkqgbfzs15vjxhc8xkz0jp9z1c"; depends=[Matrix]; };
   gcerisk = derive2 { name="gcerisk"; version="18.02.22"; sha256="1wy9l4s17ji5xj1cxjnb59qz3242yjs4zp76fy3rg1m0k7ib52vg"; depends=[cmprsk ggplot2 survival]; };
-  gcite = derive2 { name="gcite"; version="0.9.2"; sha256="1xwnf8hsakzqg5nm5c14zw239scd2dl9rfd02mj5xp6548qwxrz9"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; };
+  gcite = derive2 { name="gcite"; version="0.9.3"; sha256="19yz3hkbazcjwh2vpl05l5i5li6wa1x6b7wkajlxvwbj2kb5bwdy"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; };
   gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
   gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
-  gcookbook = derive2 { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
+  gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; };
   gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.14"; sha256="0dvp1qzxxp6rjqfxpxckbfhdqanksnm4rfgsalvb5wdm5qmm02l9"; depends=[foreach R_utils raster rgdal sp]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
@@ -7115,7 +7235,7 @@ in with self; {
   generalCorr = derive2 { name="generalCorr"; version="1.1.2"; sha256="19kr8gs41lxfn2k6azz3200p3c98fhq63skx9ga3glas8cmxph0i"; depends=[meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.3.3"; sha256="1pg8ff2c061rx1b698v2kva16rzydqrn935vb1pwbr63h8lgkv7x"; depends=[MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
-  generics = derive2 { name="generics"; version="0.0.1"; sha256="02y0d6iafrw70mxdgg99cb720dlfqdr4mhpda0frp8315257c69f"; depends=[]; };
+  generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; };
   genesysr = derive2 { name="genesysr"; version="0.9.1"; sha256="0cwx00bikhr32h2mxnd9v5z80zjy3y9i7b30achhlrjzvylh6q4j"; depends=[httr jsonlite]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
   genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; };
@@ -7150,7 +7270,7 @@ in with self; {
   geojsonR = derive2 { name="geojsonR"; version="1.0.6"; sha256="17zcrkazcnn1507m5cpphzp14m40w1wzrhrb77rl5hn1jrxqvhh5"; depends=[R6 Rcpp RcppArmadillo]; };
   geojsonio = derive2 { name="geojsonio"; version="0.6.0"; sha256="10vi40ppy65yg655xy0j8zl6icn7d7icwfj4a84wpp28pd1bwic8"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
-  geojsonsf = derive2 { name="geojsonsf"; version="1.2"; sha256="08db4rx9m8q2cz2vzp48421r2whb7bwlls35l893zfqni9yhib89"; depends=[curl jsonify rapidjsonr Rcpp]; };
+  geojsonsf = derive2 { name="geojsonsf"; version="1.2.1"; sha256="1npa2d33g33ys9w6jankjqmm38mvhfs32flrbpph0nk3fdrmlapm"; depends=[curl jsonify rapidjsonr Rcpp]; };
   geoknife = derive2 { name="geoknife"; version="1.6.1"; sha256="128y2m9aggcrfz2ynw2rzbq76rp61db1glzwhhc3n4rh25j974ic"; depends=[curl httr progress sp whisker xml2]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; };
@@ -7179,15 +7299,15 @@ in with self; {
   geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; };
   geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
   gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; };
-  germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.1.1"; sha256="1za2vkprdl2hdpww3p4x5l1ddkcrq6jxj1chhbbq4w31blpvg5hm"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; };
+  germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.2"; sha256="06s6zfx46c5rylhqpb09agyb681rls8x3a1dqnxql16xgaq5gn74"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
-  gestalt = derive2 { name="gestalt"; version="0.1.4"; sha256="1krmn19cxmbd4l0x5nzhypkr04dv7s82rnnk97szni4wdy2ih892"; depends=[rlang]; };
+  gestalt = derive2 { name="gestalt"; version="0.1.5"; sha256="1j5cg6473x9v7i67wcl0r09vi25dnrd94flccimwh8ns8cd6869c"; depends=[rlang]; };
   getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.5"; sha256="0wg1b92wmqccskkihq1qj4i1yrih4kb1c2b6wvl13bhz1p4xi7vn"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
   getProxy = derive2 { name="getProxy"; version="1.12"; sha256="0qcxihgwy3h2b98z2hwjszwqbz117d89xjys7fy0f8m9hv7rf6ph"; depends=[bitops data_table dplyr httr jsonlite RCurl]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.5.5"; sha256="0plpymf74j4q76mp5pi6692zs3vz7r466pracphb49bpl3a3nvqp"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble tidyr viridis]; };
+  getTBinR = derive2 { name="getTBinR"; version="0.5.6"; sha256="1dj4ay4mrgqy2dasvcfawmdp4byfyhhz8a788bb6636gdyf6a8ac"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble tidyr viridis]; };
   getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; };
@@ -7198,7 +7318,7 @@ in with self; {
   gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
   ggExtra = derive2 { name="ggExtra"; version="0.8"; sha256="1m5zpn3l3p1y3d2692gyz50m63d58m2a3b7zb595kvcffdx2qr5b"; depends=[colourpicker ggplot2 gtable miniUI scales shiny shinyjs]; };
-  ggQC = derive2 { name="ggQC"; version="0.0.2"; sha256="1wi9hb5ihix2vfpzbhpq2clbs7c0qh84qbmdfcxw4lknb0ha9ai1"; depends=[dplyr ggplot2 tidyr]; };
+  ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; };
   ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
   ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; };
@@ -7213,11 +7333,11 @@ in with self; {
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.2"; sha256="12sxvd9kjgszpbk35m7fj1wv7x40bp79c0g0by1xax70r3495h93"; depends=[ggplot2 reshape2]; };
   ggdag = derive2 { name="ggdag"; version="0.1.0"; sha256="0ja3v8pmlzl55n8y8n9zcg5n17w8w4vdq42bqf6h8hgyqj63rcg9"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr plyr purrr stringr tibble tidygraph]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
-  ggdistribute = derive2 { name="ggdistribute"; version="1.0.2"; sha256="1cwm2fmpx5dvmg4jnydfp8d584dhhprb589p5ia9zf1fblc4jvvw"; depends=[data_table dplyr ggplot2 magrittr tibble]; };
+  ggdistribute = derive2 { name="ggdistribute"; version="1.0.3"; sha256="07bsnfp1chf52gprw7g5kyqf6l6yzmnlv13x9dj1wa6rjwq1342i"; depends=[data_table dplyr ggplot2 magrittr tibble]; };
   ggdmc = derive2 { name="ggdmc"; version="0.2.5.2"; sha256="0gswv1f1g24z34wza6fsnj1408yjvc2na1y3wnk2xi8ccqf6rj8g"; depends=[BH coda data_table ggmcmc ggplot2 matrixStats Rcpp RcppArmadillo rtdists tmvtnorm]; };
   gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; };
   ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.6.0"; sha256="00l02g7yssqxmcmbrzk2wsj3i9ywd0xsy0rmbfh57q1qi76a1wq1"; depends=[crayon dplyr ggplot2 lme4 magrittr MASS prediction purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.7.0"; sha256="070c3fxmzajq2fy816s5pfqdyjlnzkabj97z7fcsva4h5rnqi9d6"; depends=[crayon dplyr ggplot2 lme4 magrittr MASS prediction purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
   ggfan = derive2 { name="ggfan"; version="0.1.2"; sha256="0agk9r2g8gh5ixg25rix362c7hj8b255w3ff7iawinsndf0dmwpy"; depends=[colorspace dplyr ggplot2 rstan]; };
@@ -7226,14 +7346,15 @@ in with self; {
   ggforce = derive2 { name="ggforce"; version="0.1.3"; sha256="0wydxmy6sfl84q94dd27m7cpg9iy6vgwzy3nr3m3cf3rfjk87sn4"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
   ggformula = derive2 { name="ggformula"; version="0.9.0"; sha256="1pmpdfjfbrc6kcpq70cr1kbj2qy711hw940g2aiis6l443z706kh"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; };
   ggfortify = derive2 { name="ggfortify"; version="0.4.5"; sha256="1mqgikpg34czz0zj4q3yh4xq9iw2x9zkz00ss27r6pmi6zipb6rm"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
-  gggenes = derive2 { name="gggenes"; version="0.3.1"; sha256="14a3j4cjv6b4na4j1wasm3cc566armgqc81s1yy756xc9k9sp4a9"; depends=[ggfittext ggplot2 rlang]; };
+  gggenes = derive2 { name="gggenes"; version="0.3.2"; sha256="19hpb8mi690482w6syqhyzrykipym0l92prcqvqc0x7szsvp26g9"; depends=[ggfittext ggplot2 rlang]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
   gghighlight = derive2 { name="gghighlight"; version="0.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; };
-  ggimage = derive2 { name="ggimage"; version="0.1.7"; sha256="08xipid3n1ab2k2xs1ip3wgbdhw2ccsm49s62ygyqjp3z0cvbn2s"; depends=[ggplot2 ggplotify gridGraphics magick rvcheck scales tibble]; };
+  ggimage = derive2 { name="ggimage"; version="0.2.0"; sha256="0kaa6s1zp1cn5xwjpm31kzlmzaw2pd008ldjv34ab11z6yyw4k22"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
+  gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; };
   gginnards = derive2 { name="gginnards"; version="0.0.1"; sha256="1yn5qfzih4caba8ilb1pkxzrrxcb0gia4kan7ch2yqdgi1jxqyhq"; depends=[ggplot2 magrittr rlang stringr tibble]; };
-  ggiraph = derive2 { name="ggiraph"; version="0.5.0"; sha256="0rwi2ch7jjgmf2lba40nd0mpfvwiqlx245hadsshn0km18rdn750"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; };
+  ggiraph = derive2 { name="ggiraph"; version="0.6.0"; sha256="1scz1c2272k1988qfnnd2dp90q7cah916007n9r7id2anc8fvavv"; depends=[gdtools ggplot2 htmltools htmlwidgets Rcpp xml2]; };
   ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.2.9"; sha256="1qmw7z10h1x6xnlpq7shafg6w2bal8ni02c07fyy9f7hm02xfnzs"; depends=[dplyr ggforce ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr webshot ztable]; };
   ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; };
   gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; };
@@ -7246,6 +7367,7 @@ in with self; {
   ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; };
   ggmuller = derive2 { name="ggmuller"; version="0.5.1"; sha256="1wa4gcyzbwy1s200w57phahh6rwaf62qn3i400xywkf34fsi1il8"; depends=[ape dplyr ggplot2]; };
   ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; };
+  ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.1"; sha256="0fv6v41i3xlnxyjlv1vw22fl7y98xa1afr6smcxp7hfy29qgyrk1"; depends=[dplyr ggplot2 magrittr scales]; };
   ggpage = derive2 { name="ggpage"; version="0.2.2"; sha256="0azf19dhc8zawm7hgsf866j3s028ybcfpmpmna86ly6z8d4j09xf"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; };
   ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
   ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; };
@@ -7258,7 +7380,7 @@ in with self; {
   ggpmisc = derive2 { name="ggpmisc"; version="0.3.0"; sha256="1mmqz3qb9j77rlxlcrki21l0s4qr2h10bk810a40jxadiv2lqbcz"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang splus2R tibble xts zoo]; };
   ggpol = derive2 { name="ggpol"; version="0.0.4"; sha256="163rhms5hclp3hp2vwamvkmngv81rgg6w4l4hw10jrv5pcs3ybyy"; depends=[dplyr ggplot2 gtable plyr rlang]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
-  ggpubr = derive2 { name="ggpubr"; version="0.1.8"; sha256="0psl2zndm4wk6nnj1nv305islpxfvfgd87gjh2ph8yqn4mxpnfi1"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.2"; sha256="0rkpcjb1x7lvhj68aam5airbi534jqyiq12x5xk40a25iifhghq6"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; };
   ggpval = derive2 { name="ggpval"; version="0.2.1"; sha256="1akhndl08nq97nvz2gzblfqsrjpxx1m632f3469mab9z1jcvaz57"; depends=[data_table ggplot2]; };
   ggquickeda = derive2 { name="ggquickeda"; version="0.1.1"; sha256="06jj9z6hd1v21r4bxsl3lshqabcc3sfqaj731j9pimrs63z0vsf8"; depends=[colourpicker dplyr DT Formula ggplot2 ggpmisc ggrepel gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival table1 tidyr]; };
   ggquiver = derive2 { name="ggquiver"; version="0.1.0"; sha256="0p6li7cxjy54qrmaf9ja6aknnlxwq4sl0z1yip1mznb5rhv6lpxw"; depends=[dplyr ggplot2]; };
@@ -7272,31 +7394,31 @@ in with self; {
   ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; };
   ggsignif = derive2 { name="ggsignif"; version="0.4.0"; sha256="1rn58d7pb3axk6chiihryykrzw76adaa2yiafq4d0j6qbhax78f7"; depends=[ggplot2]; };
   ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; };
-  ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.0"; sha256="0qg2qlgnbndrjsri0n628niin2m4g7mhz59szr1cid88kakj33n9"; depends=[dplyr ggplot2 magrittr tidyr]; };
+  ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.1"; sha256="0qk1219waymg8czr7vgdr0i31gzfr46zr0qjv8zgx5ba7ngdq12b"; depends=[dplyr ggplot2 magrittr tidyr]; };
   ggsom = derive2 { name="ggsom"; version="0.2.1"; sha256="0gycd3yzdy58m22r62my5v0s00mr7ga7mcfa6i300arp47lzdwq1"; depends=[dplyr ggplot2 ggthemes kohonen tidyr tidyverse]; };
   ggspatial = derive2 { name="ggspatial"; version="1.0.2"; sha256="0j22s3icqxd1qv38cbznnrdfsprma9mbakfb49hfqbf9m22f2lkn"; depends=[abind ggplot2 plyr raster reshape2 rosm scales sf tibble tidyr]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.3.0"; sha256="1kqi555s4hib3npv09xlfbfa1kpp91p09sri5wx8ccc06l8ya9dz"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.3.1"; sha256="0w9hrqxyrcds47g46bfccprrv0gykrmgqklmlig50zbnzssd3ac8"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3.1"; sha256="0v7f3xdaaridw6d4jvnsfwxmpjrasvx5vl555wsrn50aah17fkvh"; depends=[ggplot2 plyr rlang withr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.6"; sha256="0qnsy3a4laph9a5yb1lx5a2fbyxa3swv9x20ailnwanpwc09f71l"; depends=[boot broom broom_mixed coin cowplot crayon dplyr effsize exact2x2 ggcorrplot ggExtra ggplot2 ggrepel glue jmv magrittr paletteer psych purrr purrrlyr rlang scales sjstats tibble tidyr WRS2]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.7"; sha256="0rg38yhmaya18zl24scpdhzkla13z6r4526m6afmy6pnkfiplyrc"; depends=[BayesFactor boot broom broom_mixed coin cowplot crayon dplyr effsize exact2x2 ggcorrplot ggExtra ggplot2 ggrepel ggsignif glmmTMB glue groupedstats jmv magrittr paletteer PMCMRplus psych purrr purrrlyr rlang scales sjstats tibble tidyr WRS2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
-  ggtern = derive2 { name="ggtern"; version="3.0.0"; sha256="1qfgxid4bpzfmjz4jg9rg2sc12xzymadi06ryf4kwb06z4krd1k3"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
+  ggtern = derive2 { name="ggtern"; version="3.0.0.1"; sha256="12b5swg55d4f9iwr5cf3fvdazrgd2jvm187w3gx9n84h26i5jnlp"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="4.0.1"; sha256="0y6570wv135sf7pv57l7bqilzw47rziaqx4vsk45pf1w4lmj0w8b"; depends=[ggplot2 purrr scales stringr tibble]; };
   ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; };
   ggvis = derive2 { name="ggvis"; version="0.4.4"; sha256="1bxggjr2313kfy895j0fvrv4bg7yh2z87907lk48i1kn5c9flchk"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
-  ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.1"; sha256="1258y0w5jn2jg3gf7pvar1im8vlmifjj28z5syl9iyqa2hvlnrw8"; depends=[deldir ggplot2 raster rgeos sp]; };
+  ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.2"; sha256="0v65axj7v2cngbggyma2bypwj2wzhi0nn4l3acmn87vnqzlxfq3a"; depends=[deldir ggplot2 raster rgeos sp]; };
   ggwordcloud = derive2 { name="ggwordcloud"; version="0.3.0"; sha256="0bndv4vfan0cx2lpa0qhkfaz4dmp6rda1mgc3vz0vhkg9v3x96k6"; depends=[Cairo colorspace ggplot2 png Rcpp scales]; };
   gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; };
   ghibli = derive2 { name="ghibli"; version="0.1.2"; sha256="1cp1kdfya11qrm5wy1mr9a98dwkkw3ssjzj2ycgna0rrsml6cawk"; depends=[ggplot2]; };
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
-  gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; depends=[dplyr tibble]; };
+  gibble = derive2 { name="gibble"; version="0.1.2"; sha256="0nkpjgb9paj35z4088rfvirs6z5ky7pkgnjpqqz5shgrz0ycimlh"; depends=[dplyr tibble]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; };
   gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; };
   gim = derive2 { name="gim"; version="0.11.0"; sha256="1psmziq03k1nbdl64sy152ih4g625qkbp5l7msfibrcbpgz0hg7y"; depends=[numDeriv]; };
   gimme = derive2 { name="gimme"; version="0.4-2"; sha256="0vr9f0c2gxchxivxwhcqp2q5fs5a6j2w9lp0p0qrqha8b5gyqj8h"; depends=[igraph lavaan qgraph]; };
   gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; };
-  gimms = derive2 { name="gimms"; version="1.1.0"; sha256="0mqffqvaapb0m0d50vg4kvdp67yq99qf54f5anwq4md0rf3x8lid"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
-  giphyr = derive2 { name="giphyr"; version="0.1.2"; sha256="1id3r291xyj1ylxgmw2cbazaz0jq4bksj8bijwagcawimfxibz45"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
+  gimms = derive2 { name="gimms"; version="1.1.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
+  giphyr = derive2 { name="giphyr"; version="0.1.3"; sha256="0q83my4l90873d1vbv42rqyajcnr0rjgp4jcxy77cha0l5rxjsyg"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
   gistr = derive2 { name="gistr"; version="0.4.2"; sha256="0bh325pf37v307isdlvdglripfki8xr6gh7n8mgi4cjparzhrh23"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.23.0"; sha256="01250jz255fnyy2ap90nskvzhd8nhlmbhwgpvb43mk1fax077lrz"; depends=[]; };
   gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; };
@@ -7310,7 +7432,7 @@ in with self; {
   glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; };
   glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; };
   glarma = derive2 { name="glarma"; version="1.6-0"; sha256="0n0mv4xvh5q3y383cs224x6r608ciw4822pkanvmcjsc9zl0z1ar"; depends=[MASS]; };
-  glassdoor = derive2 { name="glassdoor"; version="0.7.6"; sha256="0zgkz32vp71fyy25lx4kaa5gj5aj7glhxa0yqnawl1j1a4klj3v3"; depends=[httr xml2]; };
+  glassdoor = derive2 { name="glassdoor"; version="0.8.1"; sha256="0r85k1fyk8979ahfmd4vmzkhyvrlnpkgjwg1yi7092kpx8877lj0"; depends=[httr]; };
   glasso = derive2 { name="glasso"; version="1.10"; sha256="0nshpx14v2yny7lr8ll6nnz71n0f02sddh2c2dglfprbk89p9yp6"; depends=[]; };
   glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; };
   glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
@@ -7318,8 +7440,8 @@ in with self; {
   gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.8"; sha256="06ak80j01cbrr6s8hmcc734z476rrqzib0xqjgv7c3jbw0api71y"; depends=[]; };
-  gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
-  gllvm = derive2 { name="gllvm"; version="1.0"; sha256="1bhxwv4nggl2pbbr3c53j8jk02l4kwzkdhg4wmv9xlpd3mc2qb07"; depends=[fishMod MASS Matrix mvabund mvtnorm RcppEigen statmod TMB]; };
+  gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; };
+  gllvm = derive2 { name="gllvm"; version="1.1.0"; sha256="06djkb46c4r2fjzgz7zpjdj9irmxy50k8b2zpx1d7g33n29pw6km"; depends=[fishMod MASS Matrix mvabund mvtnorm RcppEigen statmod TMB]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
   glm_predict = derive2 { name="glm.predict"; version="3.0-1"; sha256="0miba0xha99rmriqs7ifriq86ykn04j04f3ywk29bpph4iwc5faq"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; };
@@ -7336,8 +7458,8 @@ in with self; {
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.0.3"; sha256="1svawi74rfir9czqyf194wmh4fw053n81j7prnanyfskrchkd94k"; depends=[]; };
   glmmTMB = derive2 { name="glmmTMB"; version="0.2.2.0"; sha256="1clpkjlmsjmn3m1z5jqv8cgw6bvpqsy4nx6k947r0jya017ny5y5"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
-  glmmboot = derive2 { name="glmmboot"; version="0.2.0"; sha256="1gc04pgii1i7804mmcwgni3w0j1i9cwr7rmdm4rixnx2kxrdq9h3"; depends=[]; };
-  glmmfields = derive2 { name="glmmfields"; version="0.1.0"; sha256="1b7p1srwavpqm2468n4sxhbm988pxz7zvj76h86fig1jdqf9hlix"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstanarm StanHeaders]; };
+  glmmboot = derive2 { name="glmmboot"; version="0.3.0"; sha256="145sz9gs2rncc9bygzjh24drmg8qgi1b02vxld5apmp3kayw5dby"; depends=[]; };
+  glmmfields = derive2 { name="glmmfields"; version="0.1.1"; sha256="0jma7mkd4gaad9i14pxvizln3sgbw1m7asvcc8fnflkhcyjb1lm8"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders]; };
   glmmsr = derive2 { name="glmmsr"; version="0.2.2"; sha256="05psf6yjsp3zgh7lfdh2pk1zycp7rgdk61ccm7059f60dzg182b9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="2.0-16"; sha256="1brr51z1fzbpyj6myyir4g6dhbp6xwl7nx4xnvrjarnf5y0csk55"; depends=[foreach Matrix]; };
   glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; };
@@ -7362,12 +7484,12 @@ in with self; {
   gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; };
   gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; };
   gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; };
-  gmat = derive2 { name="gmat"; version="0.1.0"; sha256="1fpkx91fwr6cj6jn9a4lsj5f3nhvg8lyxandqbv9z5imb73d1gci"; depends=[igraph]; };
+  gmat = derive2 { name="gmat"; version="0.2.0"; sha256="1zrzxjgyw1izxcisvq1p2zpn2zs280ch4pm0g88g4413hb5kbsmr"; depends=[igraph]; };
   gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; };
   gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; };
   gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; };
   gmm = derive2 { name="gmm"; version="1.6-2"; sha256="0pbimp4g5hpi949m6dpwwds3a9dv2m4iwwg2gbqq1m62fs18hbxi"; depends=[sandwich]; };
-  gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
+  gmnl = derive2 { name="gmnl"; version="1.1-3.1"; sha256="01mman2nh7wzlhh89iwaskz9n15v3p5llid5557dwmqn8ybzsdvx"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.2"; sha256="1xd6jjra4niqv1kps91y348lwgvy73p2faxaia4gfzdnrpw7wsxf"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
@@ -7379,7 +7501,7 @@ in with self; {
   gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; };
   gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
   goalprog = derive2 { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
-  goeveg = derive2 { name="goeveg"; version="0.3.3"; sha256="1p66fc1vr09zxp1h81b8by2cldxn0q8vivcc5g3pggb65d9wj846"; depends=[fields mgcv vegan]; };
+  goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; };
   gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
   gofCopula = derive2 { name="gofCopula"; version="0.2-4"; sha256="1v54vhjhavz74bmnppp2cda4qsd57s2vh2j2d3ilwzbycva7kmkl"; depends=[copula doParallel foreach MASS numDeriv R_utils SparseGrid VineCopula]; };
   gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; };
@@ -7392,14 +7514,14 @@ in with self; {
   gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; };
   goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; };
   googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.5.0"; sha256="183wywvsfq58yn8hj6kz83c3by36w8knckndwbih2xhxqqqj3cf0"; depends=[assertthat dplyr googleAuthR httr magrittr memoise purrr rlang tidyr]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.6.3"; sha256="035xdqkkf1lcklq3whwld1lnxz830p1kplia7jbb1ay656zknb8x"; depends=[assertthat digest httr jsonlite memoise R6]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.7.0"; sha256="05y2y4z09in7af4lffpjlcvz51qbyzh93fhcjwdjmh80n1f4q8h9"; depends=[assertthat digest httr jsonlite memoise R6]; };
   googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.4.0"; sha256="1iwn0qjyxyg1xr1s492h7z2g5yzcfw8kasd4ghxmghnqvhzzf7vn"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.2.0"; sha256="1kslsi7gc4na8pm8dyizswf9pfpdq1rprn08rd7kbxsisclbzc7y"; depends=[assertthat future googleAuthR httr jsonlite]; };
   googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
-  googlePolylines = derive2 { name="googlePolylines"; version="0.7.1"; sha256="194wh92z65g1f4b1a5pdv2jlwkmdr3fjkj9kai993kn7zkpbkpa0"; depends=[BH Rcpp]; };
+  googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; };
   googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; };
-  googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; };
+  googleVis = derive2 { name="googleVis"; version="0.6.3"; sha256="1vxnq3jgccqsqv3zwyh74r3iws0rpr8wsagj9nc7paz6sk2h9l8p"; depends=[jsonlite]; };
   googledrive = derive2 { name="googledrive"; version="0.1.2"; sha256="04167xqdfj99jp5i1029caah1wy9dpbwm7n543x7fmsik7czc2g5"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; };
   googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; };
   googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; };
@@ -7433,24 +7555,25 @@ in with self; {
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
   graphTweets = derive2 { name="graphTweets"; version="0.5.0"; sha256="1j85kvnp9qgs3r1bczcxb2havykalzr444r7a1qbc8swkp4f8llb"; depends=[combinat dplyr igraph magrittr purrr rtweet tidyr zeallot]; };
   grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; };
-  graphframes = derive2 { name="graphframes"; version="0.1.1"; sha256="1qharg73aaw5xdvkngsxb9wzsgb4xc067cxm20d9yiz4qm7a9050"; depends=[sparklyr tibble]; };
+  graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; };
   graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
   graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; };
   graphon = derive2 { name="graphon"; version="0.3.0"; sha256="0w5xgfhshdinwyyb3qc2rhz37w6n0p1clp83dz1vx67n2vbj7wha"; depends=[Rdpack ROptSpace]; };
-  graphql = derive2 { name="graphql"; version="1.4"; sha256="103vggx9273dg4fkrhik4p1vj8qh7gxavyh933qxhajpmhnfhksh"; depends=[jsonlite Rcpp]; };
+  graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
   grattan = derive2 { name="grattan"; version="1.7.0.0"; sha256="1jy3yafymznb2bnjy9njh3sn422vsmmdlzs2is941y3syzji6l84"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; };
-  gravity = derive2 { name="gravity"; version="0.8.5"; sha256="0qsa93sd9vqnkhnd8jgypv48fcaba9hwnpbkpgr5cr57dj1vwxzh"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; };
+  gravity = derive2 { name="gravity"; version="0.9.0"; sha256="1jp4mr4jnb9bqbjv2bs40qnag2l77nylg8y94yv6p4gwh6l6l9dm"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; };
   grec = derive2 { name="grec"; version="1.2.2"; sha256="0xr17xq4hvl6zaajj04cwymmpzfnbwb86z0ziarj5bc5wjfw0yb2"; depends=[imagine raster]; };
+  gremlin = derive2 { name="gremlin"; version="0.1.0.0"; sha256="04s770rwb0qmh394r8m9dwziwvy7famagcaargpj18qclkgnjh95"; depends=[Matrix]; };
   gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
-  greta = derive2 { name="greta"; version="0.2.3"; sha256="10vli747b5a1m53qszxk91wppg9511la9yc823qrr51s92z8i222"; depends=[coda progress R6 reticulate tensorflow]; };
+  greta = derive2 { name="greta"; version="0.3.0"; sha256="03yjf8cs4z2y1pjl7qvv2icp16f5xykd725mf1vs4zk04asq4xna"; depends=[coda future progress R6 reticulate tensorflow]; };
   grex = derive2 { name="grex"; version="1.8"; sha256="0z81dlzk5vv51nwhfiijzpxgf71m4fsrfqzrbxx2kyf3f8c9xg1r"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.3.2"; sha256="1vqkq015qzlqqajhxswiqikaw4ykjs5rasdwyjxj2ggq1ks78px8"; depends=[forecast lamW nloptr numDeriv]; };
+  greybox = derive2 { name="greybox"; version="0.3.3"; sha256="15kba0srhv182a9vnb7sfm9k8084g6jkdah17pi4n486awam009c"; depends=[forecast lamW nloptr numDeriv]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
-  grf = derive2 { name="grf"; version="0.10.1"; sha256="03i6gidz4jrwqcc60c4gv0l83d5ckm5pg5vm8bgbxc6dbg1636z3"; depends=[DiagrammeR DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
+  grf = derive2 { name="grf"; version="0.10.2"; sha256="1p3h32hw8wcafyxgdmk21d71j74kfksf6nsilfgir1j8rf37zkmp"; depends=[DiagrammeR DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; };
@@ -7467,7 +7590,7 @@ in with self; {
   groupdata2 = derive2 { name="groupdata2"; version="1.0.0"; sha256="11j5p3afr5qc227ljdwwwp17jzaylqlhc7g0gr3jvgrhjnijs2a0"; depends=[dplyr numbers plyr]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
   groupedSurv = derive2 { name="groupedSurv"; version="1.0.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; };
-  groupedstats = derive2 { name="groupedstats"; version="0.0.3"; sha256="026z5gj1ghnc1y38k4s33b3m2wmm9kdxf62aa90rg0xgq6gc9061"; depends=[broom broom_mixed crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
+  groupedstats = derive2 { name="groupedstats"; version="0.0.4"; sha256="1yzlrpvbkijqahil8njbffzfcjzc3zqndz2q2dyaf8ihdhlnzad1"; depends=[broom broom_mixed crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
@@ -7536,11 +7659,12 @@ in with self; {
   hBayesDM = derive2 { name="hBayesDM"; version="0.6.0"; sha256="0il3w1vlw8p02lq5svymv5qafmal784c037dbjk1f6j96lg7i69f"; depends=[ggplot2 loo Rcpp rstan rstantools]; };
   hIRT = derive2 { name="hIRT"; version="0.1.3"; sha256="12rg4srh9s6a72gvb5f7qn9zar6yaqa7p0mfmazfqj353icrannd"; depends=[pryr rms]; };
   hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
-  hR = derive2 { name="hR"; version="0.1.3"; sha256="0s7c2aiq58c2zmv25m42cxp5chzkp5grz5bjqrknfkwjy21679h1"; depends=[data_tree reshape2]; };
+  hR = derive2 { name="hR"; version="0.1.4"; sha256="0ylqn7fv8dbhiqa6q41ajvh59yjmw18gpwvnm4fsna67q5wj98ql"; depends=[data_table data_tree]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hablar = derive2 { name="hablar"; version="0.1.0"; sha256="0l7xb2z41ddm1dlq3f0k00wdskai17wcwfkia1y1k88vqjcakpzg"; depends=[dplyr]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
+  halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; };
   hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; };
   hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
@@ -7562,9 +7686,9 @@ in with self; {
   hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
-  haven = derive2 { name="haven"; version="1.1.2"; sha256="0pp8xjf5lzqg1wr8cwxj4njx99vxwlflwjrd7jvyzwlfpwh7n1qa"; depends=[forcats hms Rcpp readr tibble]; };
+  haven = derive2 { name="haven"; version="2.0.0"; sha256="12qh8nba1dxlsmcihrx126wmjyj8n511k17vqj10lfgvpwq2sydy"; depends=[forcats hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
-  hazer = derive2 { name="hazer"; version="1.0.1"; sha256="1k108i65rwkbq4nz9b5rqi7a9cclbvjf1afzxb1kk6jx28kzkawg"; depends=[]; };
+  hazer = derive2 { name="hazer"; version="1.1.1"; sha256="1d1qj6mamgxlvxq2hjik69zfzackjz5819iss98jf5gdbdngw41x"; depends=[]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
   hbdct = derive2 { name="hbdct"; version="1.0.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; };
   hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
@@ -7597,9 +7721,8 @@ in with self; {
   heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; };
   hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; };
   heemod = derive2 { name="heemod"; version="0.9.2"; sha256="0qln5c4m11vxpsa0l07qrzs006b05hsl342pc5dgz0hwdpn5dd9j"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; };
-  hei = derive2 { name="hei"; version="0.1.0"; sha256="1cvwdkm5c9p3cfgpgdj0r7222mzz1jghq2i5f20xh3786gx05sqd"; depends=[nhanesA]; };
   heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; };
-  helixvis = derive2 { name="helixvis"; version="0.9.1"; sha256="1xc55wyky3gnbs4gkmn1v74vgj4azriwlyd4psmc644w0rnajfjc"; depends=[plotrix]; };
+  helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; };
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helminthR = derive2 { name="helminthR"; version="1.0.6"; sha256="0h4r0f6aaxh0bgcmrvbsh7vkw2jhw1xqnnx9bzqai0s842697m88"; depends=[ggmap httr knitr magrittr plyr rmarkdown rvest xml2]; };
@@ -7609,6 +7732,7 @@ in with self; {
   hergm = derive2 { name="hergm"; version="3.2-1"; sha256="0r59qkbcqvsw7pcpas636crrj710j61swjknyr5vm22da90wzj1v"; depends=[ergm latentnet mcgibbsit network sna]; };
   heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
+  hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; };
   hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; };
   het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
   hetGP = derive2 { name="hetGP"; version="1.1.0"; sha256="1m752a250msayqz8kwdi1r6lrww9pmc6qb6l9hlnfl2ds3qiks83"; depends=[DiceDesign MASS Rcpp]; };
@@ -7625,7 +7749,7 @@ in with self; {
   hglm = derive2 { name="hglm"; version="2.2-0"; sha256="0gb61yb1kk4dsb4i6sdh0r2ba7byl7hm5fqy8f12v1l4q40ymwq7"; depends=[hglm_data MASS Matrix]; };
   hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; };
   hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; };
-  hgutils = derive2 { name="hgutils"; version="0.2.3"; sha256="12y2wxyvd4kjc548baha5mfn3r4ci4a0cyr7d8wh5hldsz6vkg08"; depends=[crayon limSolve magrittr stringr XML]; };
+  hgutils = derive2 { name="hgutils"; version="0.2.5"; sha256="1wj2h1k1sfji5aph8r4pg94zlgq4rvxwilqhnp5q0pfvw8j656zh"; depends=[crayon limSolve magrittr stringr]; };
   hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; };
   hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; };
   hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; };
@@ -7650,15 +7774,16 @@ in with self; {
   highr = derive2 { name="highr"; version="0.7"; sha256="1dzknqk4x7iiiq1jkh9bqm5qcvs7mbqxbkn5955050payavabfya"; depends=[]; };
   highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; };
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
+  hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
   hipread = derive2 { name="hipread"; version="0.1.1"; sha256="1x3h52qjjv44ssifhz73xc55vv1wjrsmc021f9ida14m2dy3nwfv"; depends=[BH R6 Rcpp rlang tibble]; };
-  hisse = derive2 { name="hisse"; version="1.8.8"; sha256="1r389916gmcgmg6xjm4mmqf18k0p90wdlcifwv4qjdf2c39xqjwp"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
+  hisse = derive2 { name="hisse"; version="1.8.9"; sha256="0vzmi6854iil2p9vw8h8jpgf4pqqnnss8vj5kvqyw8c13205r14p"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
   histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-24"; sha256="1jihw92zi5a4dj6lzm1qvkynv9fp6j5iy83g8rzikp276x63nb62"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-  histry = derive2 { name="histry"; version="0.2.2"; sha256="0l8rf0l8rq28z1afrkywf4j9q2i2i3x1njs3h42f6b7jc0rnj8vm"; depends=[CodeDepends evaluate fastdigest roprov]; };
+  histry = derive2 { name="histry"; version="0.2.4"; sha256="01rdpzkfq7nyiq1gh0cm89dn3466cmhgfj9x19lhl2yvh8xsdz8x"; depends=[CodeDepends evaluate fastdigest roprov]; };
   hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; };
   hitandrun = derive2 { name="hitandrun"; version="0.5-4"; sha256="1cw6ya690ls7i07zbdjr27vlhww2d3c3ws3z7m20bfmwxb1pm3vz"; depends=[rcdd]; };
   hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
@@ -7667,18 +7792,18 @@ in with self; {
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
   hmi = derive2 { name="hmi"; version="0.9.13"; sha256="0rxxrx5ckjzj2wqdx05mihj86v0npj99q2n7zz9d44wncvnzz9g9"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
-  hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; };
+  hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-5"; sha256="1nawdj5rxh54gxyrr9xw1zw1k1b20ds397mz07x6n7nyjmj4lak2"; depends=[nnet]; };
   hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
   hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; };
   hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
   hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; };
-  hoardr = derive2 { name="hoardr"; version="0.5.0"; sha256="15s0803cgh0gxxrz4ipicyzgy528sj6g9pc453cdcg079vd8dw12"; depends=[digest R6 rappdirs]; };
+  hoardr = derive2 { name="hoardr"; version="0.5.2"; sha256="0m6wfs78jpxk2jnlqdbg5x7i993j70bvaxm643qhb8axwbq174c1"; depends=[digest R6 rappdirs]; };
   hogsvdR = derive2 { name="hogsvdR"; version="0.1"; sha256="0ji4j9fzwnacdqbzrj5zphak5nsin7vcja15w48fik8hv5w6qs46"; depends=[MASS Rcpp RcppArmadillo]; };
   holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; depends=[]; };
   homals = derive2 { name="homals"; version="1.0-8"; sha256="0gad0jmflw5zmzf9hk5qqmxxpbncm9gngsi24i3rgiz7565kli1r"; depends=[ape rgl scatterplot3d]; };
   homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; };
-  hommel = derive2 { name="hommel"; version="1.1"; sha256="1vrfw3zxj6hlfr5czrhmx67bjbd94whfgdmsdzlmdpmj0w5r0naz"; depends=[Rcpp]; };
+  hommel = derive2 { name="hommel"; version="1.2"; sha256="006m28kfpzsz02nz8mhwjcn5b761fcpvhaw63c91x08ka89x4frl"; depends=[Rcpp]; };
   homologene = derive2 { name="homologene"; version="1.1.68"; sha256="0i2ywr3rxryakp7qskgjc0pll9nskwngk5m2d2jikxxq2biqf5zj"; depends=[dplyr magrittr]; };
   homomorpheR = derive2 { name="homomorpheR"; version="0.2-1"; sha256="0qs4yimyfqx6rpxgh6h4z7vyb3qdxljnyvw1g8pxm4y75i0v6vz5"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
@@ -7699,11 +7824,11 @@ in with self; {
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
   hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; };
   hrbrthemes = derive2 { name="hrbrthemes"; version="0.5.0.1"; sha256="14nqv809i5cdmbzdpvcppf2r1qsjv0f4lk5w6s4sjinaf68rzpzg"; depends=[extrafont ggplot2 htmltools knitr magrittr rmarkdown scales]; };
-  hsdar = derive2 { name="hsdar"; version="0.7.1"; sha256="1bjcgkqhjcrysyh0l1w3r1zzmv3sdlb7xzxdc504z1viy1ayh6ly"; depends=[caret raster rgdal signal]; };
+  hsdar = derive2 { name="hsdar"; version="0.7.2"; sha256="02sapg0gq2sxqr9kasczsghpam5w1ibrzcw2l17mk3kjgj88y3nb"; depends=[caret raster rgdal signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
-  hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
+  hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
   htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; };
   htmlTable = derive2 { name="htmlTable"; version="1.12"; sha256="1n5136vb7mi4rxl5jgwdmdhn4mwv2pcqyw2mrj406ih4hy6hpxa2"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
@@ -7718,7 +7843,7 @@ in with self; {
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; };
-  httptest = derive2 { name="httptest"; version="3.1.0"; sha256="1r0grzlblyri526a3pp2n8v9zf23kf41i6kl64qmkrq1bamr0m17"; depends=[digest httr jsonlite testthat]; };
+  httptest = derive2 { name="httptest"; version="3.2.2"; sha256="1q2lhqi5lhdc15wjrcr4z2yxjrfhjkgn0wwxr0mawsfz8cy3703q"; depends=[digest httr jsonlite testthat]; };
   httpuv = derive2 { name="httpuv"; version="1.4.5"; sha256="1ddpcarzf694h0gy5pdz7l5glqfv4hr9dmxb4vw7yqd0bga174gi"; depends=[BH later promises Rcpp]; };
   httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; };
   hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; };
@@ -7726,13 +7851,13 @@ in with self; {
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
   humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
   humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; };
-  humanleague = derive2 { name="humanleague"; version="2.0.2"; sha256="1svsqfqisywf0iqf3mrh4xnssvjmml6wn7l8iq5shvpmw71l4nnl"; depends=[curl Rcpp]; };
+  humanleague = derive2 { name="humanleague"; version="2.1.0"; sha256="1mp7lqwx97r60amllz9cjsixw21zspgs4zkp0nc63z315vgfzwrx"; depends=[Rcpp]; };
   humidity = derive2 { name="humidity"; version="0.1.4"; sha256="1nnrjk9wjvp28s615xd9wllnwv4js3kg7rj2f6al3sk3vhiqljsk"; depends=[]; };
   hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; };
   hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
-  hutils = derive2 { name="hutils"; version="1.2.0"; sha256="0yfy5mydy0il7jlm2ddn2cmja5advshazxjrfa5kgqpc4aqx0avs"; depends=[data_table fastmatch magrittr]; };
-  huxtable = derive2 { name="huxtable"; version="4.2.1"; sha256="1x6w773jaxj8d2ijdpd15lci7z8i8hhc1ch9af5vb9ysps4p07j6"; depends=[assertthat glue memoise stringr tibble tidyselect]; };
+  hutils = derive2 { name="hutils"; version="1.3.0"; sha256="03czrdrwpqjvghh8396fx9884l24ag1wrkfkvvr6n743qb60k1p8"; depends=[data_table fastmatch magrittr]; };
+  huxtable = derive2 { name="huxtable"; version="4.3.0"; sha256="0qh4i769vn99h58l21xhf2bk45giancyfyc7cdhy711izxlfp2y1"; depends=[assertthat broom glue memoise rlang stringr tibble tidyselect]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; };
@@ -7746,7 +7871,7 @@ in with self; {
   hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; };
   hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; };
   hydroscoper = derive2 { name="hydroscoper"; version="1.1.1"; sha256="0fykbn3ri9ypyxcrsbwi5pmyzbfp5dvrzg4klhjp0f88yfz80nbm"; depends=[jsonlite pingr plyr readr stringi stringr tibble]; };
-  hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; };
+  hydrostats = derive2 { name="hydrostats"; version="0.2.6"; sha256="0xfl1r5ikx3lqfrrapig9k93ifl794psm798kis10psg8cqrxmkb"; depends=[]; };
   hyfo = derive2 { name="hyfo"; version="1.4.0"; sha256="03xd4nm8zmc8gw8rml8svfim64xcslvpmdcldlri9cf89s8v35br"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-4"; sha256="00999k891s5l2wcnn6ych1v60ckqd2qxyckrfxh4kxnq9891hqcx"; depends=[magrittr partitions Rcpp]; };
@@ -7767,7 +7892,7 @@ in with self; {
   iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
   iC10 = derive2 { name="iC10"; version="1.4.2"; sha256="0p7xqshybfqm3basvph7x718yppk4kbg8agpvpq0kmkq5db5n1w6"; depends=[iC10TrainingData pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; };
-  iClick = derive2 { name="iClick"; version="1.4"; sha256="1j1mk4w1m90f90ijxdiw67sycxms4mqljcmsic81m2pq228l8zd5"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
+  iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
   iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
   iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
@@ -7798,37 +7923,41 @@ in with self; {
   ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; };
   ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; };
   ibmdbR = derive2 { name="ibmdbR"; version="1.50.0"; sha256="151gg05gcy5wpyvyflr4mc0jq1npxzq9pc4spjc81x2igd14c370"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
+  ibmsunburst = derive2 { name="ibmsunburst"; version="0.1.0"; sha256="17wqg8iyh7sz3vks7mpr8i2pffxzsi3s0f2f69ima4x12w0zcdhn"; depends=[htmlwidgets jsonlite]; };
   ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; };
+  ibs = derive2 { name="ibs"; version="1.4"; sha256="06zyg6c083437nhilqfhcf6yzlvazkpxhi3dh5d3dqv2zhxixlz4"; depends=[Rcpp]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-6"; sha256="14vcwx5592br4zky9mq82akwk8pfiz7p1rx2jvyb48prrs2mm9gy"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
   icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; };
   ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; };
+  ical = derive2 { name="ical"; version="0.1.5"; sha256="1fav17iqhb2pmb3rgf3a586h87hj5sd7gpabwaiccxk28sqhldzz"; depends=[V8]; };
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.1.0"; sha256="1xw0mz3ipkfz1jsjzwjnrm0af1gs31js7nvgy79cxqz31955zjww"; depends=[Rcpp RcppArmadillo]; };
-  icd = derive2 { name="icd"; version="3.2.1"; sha256="0knhiy18jckdyxvhp80hif1wnfg6r8fvl7h6ixb0q3lgqdc79749"; depends=[checkmate icd_data magrittr Rcpp RcppEigen testthat]; };
+  icd = derive2 { name="icd"; version="3.3"; sha256="03b8dc98pk9i0brjqasav00kpvhwz0qkqgch0ynfjq0xifxnvrgq"; depends=[checkmate icd_data magrittr Rcpp RcppEigen testthat]; };
   icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icenReg = derive2 { name="icenReg"; version="2.0.9"; sha256="0jfizdahdnvq6a476j25acvahrh68anihimk26nl98sad1gf9zzk"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
-  icesAdvice = derive2 { name="icesAdvice"; version="1.4-2"; sha256="10f1ss949gi7s5fhfbygqaf05pshalw6sa266v4gnxqwqynf4qbj"; depends=[]; };
+  icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
   icesSAG = derive2 { name="icesSAG"; version="1.3-4"; sha256="1s330691an1m5h1i342ls6igqcqrlrwyhapa82x5h2krdia0nmnp"; depends=[httr icesVocab openssl png xml2]; };
-  icesTAF = derive2 { name="icesTAF"; version="1.6-2"; sha256="1r8dsc3dm6ziscgl7xr84b07myflwkdnpqjf0wjd3d0h5x8xdkdh"; depends=[]; };
+  icesTAF = derive2 { name="icesTAF"; version="2.0-0"; sha256="05jqrc8l96fhlz3wv1wsvrwy6wh5a0gigylzqc01zm2v0nl25vk9"; depends=[]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
   icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; };
   icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; };
   icr = derive2 { name="icr"; version="0.5.8"; sha256="1grakn7c7slm2msdm8r059ky0s77apl80xhy65isxwj7ica64i9k"; depends=[ggplot2 Rcpp]; };
+  icsurvROC = derive2 { name="icsurvROC"; version="0.1.0"; sha256="0nz2f5fg9v3bck6vpi123r160nscqn6ai5xj9bc3r958p6a5m85h"; depends=[icenReg Iso survival]; };
   icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; };
   idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; };
-  idealstan = derive2 { name="idealstan"; version="0.2.7"; sha256="1818vwlv5cr6qyg7p6kgyb996n89d2xr4cy6ys9pdhrp7lip9prr"; depends=[bayesplot BH dplyr ggplot2 lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; };
-  idefix = derive2 { name="idefix"; version="0.3.1"; sha256="18anykh7y8437ivjyc43x2fwkqni082w2aahmq3ml6i9f21w48ci"; depends=[dplyr gtools MASS maxLik mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
-  idem = derive2 { name="idem"; version="3.5"; sha256="1fr456drfnla917byw0c8ppqrhq4i7gsd4idfasx6xx5fqhv7ypc"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; };
+  idealstan = derive2 { name="idealstan"; version="0.5.1"; sha256="13vcr1pn1n8cvbn8rgsi9ghqfch8r4wxg3kl6qkw0q67czhkpghs"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; };
+  idefix = derive2 { name="idefix"; version="0.3.3"; sha256="0apgz4c0377y5w88pgv3x4mck1fjkq7xy577w925iish0hqpvni7"; depends=[dplyr gtools MASS maxLik mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
+  idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
@@ -7855,12 +7984,12 @@ in with self; {
   iheatmapr = derive2 { name="iheatmapr"; version="0.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; };
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; };
-  ijtiff = derive2 { name="ijtiff"; version="1.4.2"; sha256="1wqh8cwcpzfnkcm2ljabbkfaddmd9dxvaqsc3vp1ivnmq426fh99"; depends=[BBmisc checkmate dplyr fields filesstrings glue magrittr purrr Rcpp readr rlang stringr]; };
+  ijtiff = derive2 { name="ijtiff"; version="1.5.0"; sha256="1zam6rph6fl5z10c3inzl8lajsg7wn1z5mr0wbk8dpbx2zgygkm1"; depends=[BBmisc checkmate dplyr fields filesstrings glue magrittr purrr Rcpp readr rlang stringr]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
   imageData = derive2 { name="imageData"; version="0.1-50"; sha256="0i56sksyxa50bhp3pimgag2bg37y1gfadky6i0xgg484wf1xw148"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
   imager = derive2 { name="imager"; version="0.41.1"; sha256="0ja8pi8l44llq75af4y8blb6vby43ikmy87sx83i1i327zfjzd5g"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
-  imagerExtra = derive2 { name="imagerExtra"; version="1.2.0"; sha256="1r94zcnfvd92qqls76ma3vgc8bnhah5jlminnbp9knr0jar8r0xp"; depends=[fftwtools imager magrittr Rcpp tesseract]; };
+  imagerExtra = derive2 { name="imagerExtra"; version="1.3.0"; sha256="0ps5cgv7axx51d0114wz2sg0wgw2ihf5a9zqaw95wx5miyq1ib3r"; depends=[fftwtools imager magrittr Rcpp]; };
   imaginator = derive2 { name="imaginator"; version="0.1.1"; sha256="1xp5wsv570f1qy2fn99d8ijydmlapb6h6kinj07pilvv215dg93w"; depends=[assertthat dplyr lubridate magrittr stringi]; };
   imagine = derive2 { name="imagine"; version="1.4.0"; sha256="1v0rds64i0f3xgg7ca14ncw4nrcc80gvjf1fbp498idq38z79qzc"; depends=[Rcpp]; };
   imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; };
@@ -7868,9 +7997,9 @@ in with self; {
   imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
   iml = derive2 { name="iml"; version="0.7.1"; sha256="1wiylfd83p4wzccp0r3ydxy14zvw81q368h61gimrcm7110fdpx9"; depends=[checkmate data_table foreach ggplot2 glmnet Metrics partykit R6 yaImpute]; };
-  immer = derive2 { name="immer"; version="1.0-138"; sha256="0jpjrvr3mpgqfyl56i95grb3jmrzzs00ciafsw9rd7fpbxnskkjf"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
+  immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
   imp4p = derive2 { name="imp4p"; version="0.7"; sha256="1hpxx1jpwd4v19xnpjjbwcvfzvb63jfd0jq3vcq000w7am9pwwba"; depends=[Iso norm Rcpp truncnorm]; };
-  impimp = derive2 { name="impimp"; version="0.2.0"; sha256="0qaf7spcgjvg8s8nm4b535gx63vp6fy7r084xfxd94ygr8vb3lww"; depends=[]; };
+  impimp = derive2 { name="impimp"; version="0.3.0"; sha256="0zv4rs5c80rvwwr4gk6zlphvyf0drkfrdqpcw0p2i7kig8ynq4qx"; depends=[]; };
   implyr = derive2 { name="implyr"; version="0.2.4"; sha256="1xc5c8wpq1bdvfm4rkqmvykgkil9fm9n1q9ndjv701jbdr4rnisd"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
   r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
   importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
@@ -7895,14 +8024,14 @@ in with self; {
   inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.6.4"; sha256="1aj07zhf82wwg80jp461xapw8x9caa7daa59n4mxl8nqryrs77q0"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; };
   incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; };
-  incidence = derive2 { name="incidence"; version="1.4.1"; sha256="13c518hlhpmdl4vw4xbb593arw2pvzsj18dpvdzg7n2f8lslbyr8"; depends=[ggplot2 ISOweek]; };
+  incidence = derive2 { name="incidence"; version="1.5.2"; sha256="1vmp4qy9pahcfmk9k5s39qbg2n24xjpz0szfh2ixyfhpf946af2v"; depends=[ggplot2 ISOweek]; };
   inctools = derive2 { name="inctools"; version="1.0.14"; sha256="0ial852b96x310wzvla9lahxz3mwbqqv0l0lafs0bnmyaiiwycxv"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; depends=[ape numDeriv phangorn Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; };
   indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
   inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
-  infer = derive2 { name="infer"; version="0.3.1"; sha256="0yzminwsndx1aizb91palzvlmg9pp7hnx0zfpifbj1vv00jz6d1c"; depends=[dplyr ggplot2 glue magrittr rlang tibble]; };
+  infer = derive2 { name="infer"; version="0.4.0"; sha256="01zrlirxdkysgrlflvvxgksbjcd4sr3ri6q61ws5bfbwwqklk7n2"; depends=[dplyr ggplot2 glue magrittr rlang tibble]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
   inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; };
   inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; };
@@ -7923,28 +8052,29 @@ in with self; {
   inlabru = derive2 { name="inlabru"; version="2.1.9"; sha256="0jbqk8hcsfgzwr35icqwc6ch0n9v7s812hqwmn3q13l2a4lznm91"; depends=[ggplot2 Matrix rgdal rgeos sp]; };
   inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.4.3"; sha256="0y13mxibdnn1397wbxx52gvk213mgslqg40ymcrzgvwb4c7rp8sn"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos sp xtable]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.4.4"; sha256="13li6625kjadxqlyjbgkfvh8fz62yyd7rd7j5p371qfm6gragwzh"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos scales sp xtable]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.8"; sha256="1xscrqkwl15l5r1sik6mnhzl868s9yxscm74sp740n3107md92hx"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
   inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; };
-  insect = derive2 { name="insect"; version="1.1.1"; sha256="0gvjml5f7c8k6vsp1s5l85avmh7j6asy2ljkhcrwy6hybf8z1dj5"; depends=[ape aphid kmer openssl phylogram xml2]; };
+  insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
   inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
   instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; };
   install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; };
+  instruments = derive2 { name="instruments"; version="0.1.0"; sha256="1m8hic2j5j9b2yaraz096176y9igf59zv4zzgkkdz4yb7jzfhprx"; depends=[]; };
   insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
   intReg = derive2 { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; };
   intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; };
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
   intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
   intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; };
-  intccr = derive2 { name="intccr"; version="1.0.3"; sha256="0sk43k8zw2ssa6cc8ljxd51q7489kq1bb2r1j5rp18895kq3c8wc"; depends=[alabama doParallel foreach numDeriv]; };
+  intccr = derive2 { name="intccr"; version="1.0.4"; sha256="1ivv5y863ykiksfnxa4dy9842lm83gd68hb5f6l9v5la6i3bwfin"; depends=[alabama doParallel foreach numDeriv]; };
   intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; };
   integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
-  interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; };
+  interactionTest = derive2 { name="interactionTest"; version="1.1"; sha256="0kr1v6wsmri8hlczfnb19s51i4fv4xphmgld35my1ic6f1jyk5p4"; depends=[]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
-  interep = derive2 { name="interep"; version="0.1.0"; sha256="1k1pp44sjjdyrbbyv5rlr1whrhmrk2nbn51jrgxxy5i0gwg2jza0"; depends=[glmnet MASS]; };
+  interep = derive2 { name="interep"; version="0.2.0"; sha256="18f5qkfq3rcr4n2vpdp4xp56cbg5z30cpk6wdchh64gly6g28bi0"; depends=[Rcpp RcppArmadillo]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
   interflex = derive2 { name="interflex"; version="1.0.4"; sha256="1w92h0ay0rx8gy9jcj179206lz9irg8g0ryl31p3ijqip73v55rm"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
   interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; };
@@ -7958,6 +8088,7 @@ in with self; {
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
   intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
+  intoo = derive2 { name="intoo"; version="0.1.0"; sha256="06c7g5kvsvgj4lbb8iz8kl4q0mfgd572glv3kr3mqvdn5lz8c8wd"; depends=[]; };
   intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.1.0"; sha256="0mxg9dvhn5rr1rchpqzf5i1p37kvabcb9jyqbn49zgzcwdvm6cbs"; depends=[yaImpute]; };
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
   intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
@@ -7975,21 +8106,21 @@ in with self; {
   ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; };
   iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; };
   iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; };
-  iotables = derive2 { name="iotables"; version="0.3.4"; sha256="08hw05samkkdvpbhjqr653brmciszah5faydiqvrdgl02yvjmdw4"; depends=[dplyr eurostat forcats lubridate magrittr plyr tidyr]; };
+  iotables = derive2 { name="iotables"; version="0.3.5"; sha256="12wak8vwd5hvm09s3cjw2pjfzb0a4pi5x85vm8shmxdx83h7m20p"; depends=[dplyr eurostat forcats lubridate magrittr plyr tidyr]; };
   iotools = derive2 { name="iotools"; version="0.2-5"; sha256="0rn6kvlcijnhlwajh6nmi80qlamxgz0x3pn09yp4hyfpl3zxg1fz"; depends=[]; };
-  ipc = derive2 { name="ipc"; version="0.1.0"; sha256="1y2py1ihh414vsjppy2qw9b4m0yn5mrbi5y69p9d6akj5bm61833"; depends=[R6 redux shiny txtq]; };
+  ipc = derive2 { name="ipc"; version="0.1.1"; sha256="19r48glsmv4x6dm4drgg2y7g32w7hf89rfb2jl2n4fhdjw3339fr"; depends=[R6 shiny txtq]; };
+  ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.1"; sha256="1jx8r0a5qj4dh2ghsd8xrqy12ff85yjwqzwg5hksag9hiyjbgkrh"; depends=[survival]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
-  ipdw = derive2 { name="ipdw"; version="0.2-6"; sha256="1jfixvywxdhnpqz62ld2c8n6yacg88q3y1n1aisqqb7szz0zf23z"; depends=[gdistance raster sp]; };
-  ipeaData = derive2 { name="ipeaData"; version="0.0.2"; sha256="1nggkcb8rrnc3d14nhzpf48f2dpf6jcsw54i40jcp7656jqv1jnb"; depends=[data_table dplyr httr jsonlite RCurl]; };
+  ipdw = derive2 { name="ipdw"; version="0.2-7"; sha256="1g4chjzl0xcxf7mfhazy8h2dvzz73sljdbl1w79sx0pjcjagvs3l"; depends=[gdistance raster rgeos sp]; };
   ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
   ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
   iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; };
-  ipred = derive2 { name="ipred"; version="0.9-7"; sha256="0q53cqs46501wsd4cmfsmr78l8nv1hkbamk9m0ns5qy02df5r254"; depends=[class MASS nnet prodlim rpart survival]; };
+  ipred = derive2 { name="ipred"; version="0.9-8"; sha256="01xcg3c121ndfpz9dirqxszknh4yb1p222p7f1wbwwhdrg1i27cw"; depends=[class MASS nnet prodlim rpart survival]; };
   iprior = derive2 { name="iprior"; version="0.7.2"; sha256="1wc7f6gh0qas197jf78pb8wmazhddbny3l0w47f3v6fqwa581ls0"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; };
   ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
   iptmnetr = derive2 { name="iptmnetr"; version="0.1.5"; sha256="02lljbbr2sm90sgyjv6a17mbh758n93qqxfr900g0m557nsv35i8"; depends=[httr jsonlite]; };
-  iptools = derive2 { name="iptools"; version="0.6.0"; sha256="1k58czfq8g2q1gjxnhkxhr0znqmmyyaz45vffd57pdq1199wcdm1"; depends=[AsioHeaders BH Rcpp stringi triebeard]; };
+  iptools = derive2 { name="iptools"; version="0.6.1"; sha256="143gawwp3aja5vycl43n6x5hzg3yvagi8x10v9y92hkif9v075qq"; depends=[AsioHeaders BH Rcpp readr stringi triebeard]; };
   ipumsr = derive2 { name="ipumsr"; version="0.3.0"; sha256="114q2j6sadzg4s1jc66sxasj86hsipmf874dbhk1z238wj948py8"; depends=[cli crayon dplyr haven hipread pillar purrr R6 raster Rcpp readr rlang stringr tibble tidyr xml2 zeallot]; };
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; };
@@ -8002,6 +8133,7 @@ in with self; {
   irregulAR1 = derive2 { name="irregulAR1"; version="1.0.0"; sha256="0pccasqcya99j4n0qdcjjnvmigj53axji9ddxbpmrgvzsyamb8ja"; depends=[Matrix Rcpp RcppArmadillo]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
+  irteQ = derive2 { name="irteQ"; version="1.0.0"; sha256="0d1xfgk0spdkfbvwyqi99hwsj9p46q71b8v79rr51bw88rx17shp"; depends=[dplyr ggplot2 ggrepel purrr reshape2 rlang statmod tidyr]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
   irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; };
@@ -8016,7 +8148,7 @@ in with self; {
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
   isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
-  isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; depends=[Iso survival]; };
+  isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
   isqg = derive2 { name="isqg"; version="1.1"; sha256="0vl3x498xzixhnxwwd52pwv79ym4hzj1c7f7mv8p3966281xhkfc"; depends=[BH R6 Rcpp]; };
@@ -8035,7 +8167,6 @@ in with self; {
   itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; };
   itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; };
   itunesr = derive2 { name="itunesr"; version="0.1.3"; sha256="1czwkrqy3jqw1x0z5zj2kvp4p11s5zdiswwhx9jfxdcsg86zhr45"; depends=[curl jsonlite lubridate xml2]; };
-  ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
   ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
   ivlewbel = derive2 { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
   ivmodel = derive2 { name="ivmodel"; version="1.7.1"; sha256="0v8alqn141s9rymk29xqmdx7gpp8ivz4525afvarxmp9sm2rqq0q"; depends=[Formula ggplot2 Matrix reshape2]; };
@@ -8043,12 +8174,12 @@ in with self; {
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; };
   ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
-  ivtools = derive2 { name="ivtools"; version="1.0.0"; sha256="06g99wcm5hhn4avahcq9ldk4riwrz7q90yvc8f5fal70d3ca8x73"; depends=[data_table numDeriv]; };
+  ivtools = derive2 { name="ivtools"; version="2.0.0"; sha256="0nslq40q5vdsfn1p2y85q1f9gpc2ziixilvgrwkq6vcwl2bwl0kp"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
   jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
-  jackstraw = derive2 { name="jackstraw"; version="1.2"; sha256="1aciv0km63nqhiakqvy3v8bz31mjlknfdz2lkcv2g3pfhwi3fxh7"; depends=[cluster ClusterR corpcor lfa qvalue]; };
+  jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; };
   jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; };
   jagsUI = derive2 { name="jagsUI"; version="1.5.0"; sha256="0cfixhv4fabka13xvnglwacgpadhdr12w6lk563zfz83192r7h8g"; depends=[coda lattice rjags]; };
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
@@ -8060,21 +8191,21 @@ in with self; {
   jcolors = derive2 { name="jcolors"; version="0.0.3"; sha256="1mzpvm5mhmr2ahwz1lnqvp1cs805jh0zlfwspvqwr0sfbzmmkrib"; depends=[ggplot2 scales]; };
   jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; };
   jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; };
-  jetpack = derive2 { name="jetpack"; version="0.3.1"; sha256="13m555bdx4f57wy3lxgllhrbd2x7vwvblvms6yajsdpv0x6g7n1x"; depends=[crayon desc devtools docopt httr packrat]; };
+  jetpack = derive2 { name="jetpack"; version="0.4.1"; sha256="1f8zj1shyy4vywwma6vdlvbkcfwhqw5hwk5grpv11mamp48iydjx"; depends=[crayon desc docopt packrat remotes]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   jiebaR = derive2 { name="jiebaR"; version="0.9.99"; sha256="1g39z9ms975ig2j9nd6nqja1l8gy50fa9pwlz563xk6p2z6v058j"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
   jipApprox = derive2 { name="jipApprox"; version="0.1.1"; sha256="0kgx7v8fyfdh8kdz8jnh6y6zrf7ivgqjgagpddxnynldzcrc2ml7"; depends=[sampling]; };
   jjb = derive2 { name="jjb"; version="0.1.0"; sha256="0izpvban8v85g6w2mnmimhdh4yg6kcaf046v3jjba368nsj67q9n"; depends=[]; };
-  jmcm = derive2 { name="jmcm"; version="0.1.8.0"; sha256="0nv30shwd1219cvs9kaql0n7ppwqngj3avf2qd7nzrnbqp2gl23h"; depends=[Formula Rcpp RcppArmadillo]; };
+  jmcm = derive2 { name="jmcm"; version="0.2.1"; sha256="1giyd0agjz1qpgj7q55maxk7jjmpwc3mrj02ailvwl44rdvhl90v"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; };
   jmdem = derive2 { name="jmdem"; version="1.0"; sha256="1qz2l02m4gnxrm1ankr5qqlskl8amphzj8r763yas218fvzfa34q"; depends=[statmod VGAM]; };
   jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; };
   jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; };
-  jmv = derive2 { name="jmv"; version="0.9.4"; sha256="141k86skmkfl3pxgay5mginpishnwy3k40cxrj2qbkrzlnx1b9yk"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
-  jmvconnect = derive2 { name="jmvconnect"; version="1.0.4"; sha256="1zbhinnd8ngq1824lj3610s1v0vzxjbsvgb7p0q0bjdr3gdpc4n9"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.9.4"; sha256="1m47yn81y2g3kba16dn7s3jfw8pp4rzbrlqr3nmdrivp093fqcn3"; depends=[base64enc R6 rjson stringi]; };
+  jmv = derive2 { name="jmv"; version="0.9.5"; sha256="0xk3lsddpxwynviarcwisbbwy04jlrj9pwlwp06l7n9g0kxkcpxs"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
+  jmvconnect = derive2 { name="jmvconnect"; version="1.0.7"; sha256="1sy7xa2k1ilbl0gmxgqkgyhigmzngk03nrk5p7b3dxw9vr867wdi"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
+  jmvcore = derive2 { name="jmvcore"; version="0.9.5.2"; sha256="0npzy2qmyxsjkkxwz08d6w42npfn0aryycwq6xaw3ldncjakk1yr"; depends=[base64enc R6 rjson rlang stringi]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
   joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; };
@@ -8085,7 +8216,7 @@ in with self; {
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
   jointseg = derive2 { name="jointseg"; version="1.0.1"; sha256="0wa531b5shrxhnzflfjqn2wypfb565qc2c8wngysgrgyj1kjq1pl"; depends=[acnr DNAcopy matrixStats]; };
-  jomo = derive2 { name="jomo"; version="2.6-4"; sha256="05g2rj9g7rgyb22b0gybw042nydyqsqsb31v05hifzavri8ij01x"; depends=[lme4 MASS ordinal survival]; };
+  jomo = derive2 { name="jomo"; version="2.6-5"; sha256="109q5m69clrvvialxdxznd0wdb54ajhx84nj8slx8bf909a427mj"; depends=[lme4 MASS ordinal survival]; };
   jose = derive2 { name="jose"; version="0.2"; sha256="0vgmr5kmps6yk10bbzrxz2d3y7jk0w1rxpm9gx510kpnqbj325xz"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   jpmesh = derive2 { name="jpmesh"; version="1.1.1"; sha256="0smfv7wh0441aqx0c0km0kr54lsvqixn2chqvqn5sd3758k5id95"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; };
@@ -8095,13 +8226,13 @@ in with self; {
   jrvFinance = derive2 { name="jrvFinance"; version="1.4.0"; sha256="09gr8w3y0cjlwjhr72ml05y22m868hnvxwa3mwxdcvfb7nb1dmxz"; depends=[]; };
   js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; };
   jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; };
-  jsonify = derive2 { name="jsonify"; version="0.1.1"; sha256="0z6af6sxzybm6jy350pn0g16mm3kzwb6vkf3qa6r20ca2rb2kynh"; depends=[rapidjsonr Rcpp]; };
+  jsonify = derive2 { name="jsonify"; version="0.1.2"; sha256="1vzdrb50cv1028a243rv0j55zwxps625rxv2km6nf11kc47l5rk6"; depends=[rapidjsonr Rcpp]; };
   jsonld = derive2 { name="jsonld"; version="2.0"; sha256="0mplsx2fq7pvxli1rd851cqhkaxk3y93aa46x57yf4z5rgjy34vm"; depends=[curl jsonlite V8]; };
-  jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.6"; sha256="0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8"; depends=[]; };
   jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
   jsr223 = derive2 { name="jsr223"; version="0.3.2"; sha256="00i90b37811sva8f9bd50xxvjcn7rag9hq5ya953v6whm370r737"; depends=[curl jdx R6 rJava]; };
-  jstor = derive2 { name="jstor"; version="0.3.4"; sha256="1fqnvhisv4kf3anck2zfrkg2g46y78hh3y47xhg79p6gcc2cxx2i"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; };
+  jstor = derive2 { name="jstor"; version="0.3.5"; sha256="0h8llh9kgmix5yicq1vmphcmn3mrbp4lw9zasvdj6f0fgnd4jn3g"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
   jtools = derive2 { name="jtools"; version="1.1.1"; sha256="0c7ygllgq5vyb4w188l44f5q8bn1jn2kw3yvc1f1zi0ni1ngsf7g"; depends=[cli crayon ggplot2 magrittr]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
@@ -8118,7 +8249,7 @@ in with self; {
   kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
   kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
   kaphom = derive2 { name="kaphom"; version="0.2"; sha256="09rxvg37nbjs78l9yh86a2kd428dnfws2wz82mx9frys3ys6zhfl"; depends=[]; };
-  kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
+  kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; };
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
   kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
   karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; };
@@ -8137,7 +8268,7 @@ in with self; {
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
   kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; };
   kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
-  keras = derive2 { name="keras"; version="2.2.0"; sha256="0h6rx44c7w0d8gvnchbqfblqmayh47v14vg6ilnfkcb35djws3la"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
+  keras = derive2 { name="keras"; version="2.2.4"; sha256="0qnpzpnvs2jhf6sjg0giv88xfim8b5nv95nrgqs73cb74cyr4f9r"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
   kerasformula = derive2 { name="kerasformula"; version="1.5.1"; sha256="1b4mq1y41lz8maszlrm7w907vcz7in8napfnhas7dgal1kid4mcf"; depends=[dplyr ggplot2 keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
@@ -8150,7 +8281,7 @@ in with self; {
   kernplus = derive2 { name="kernplus"; version="0.1.1"; sha256="1dxw1qk5gx7g05kgsbh5436r7mbv77631zjs0c4ibpscaw77g475"; depends=[circular KernSmooth mixtools]; };
   kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
   kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; };
-  keyholder = derive2 { name="keyholder"; version="0.1.2"; sha256="157k39acn8732g0ha9m402v5hhqnc34qpghvhg430dga2r5g3cxh"; depends=[dplyr rlang]; };
+  keyholder = derive2 { name="keyholder"; version="0.1.3"; sha256="0r45wd36bf3ir3j3llcy40w6l8440ncvx3c1f6qvb8zgl4bl6z22"; depends=[dplyr rlang tibble]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
   keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
   keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; };
@@ -8178,6 +8309,7 @@ in with self; {
   km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
   kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
   kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; };
+  kmeRs = derive2 { name="kmeRs"; version="1.1.0"; sha256="1wafa9wgqlwrk6jwmbn34n3rmvbc9s6s235z8mscbqgw67snwcq6"; depends=[Biostrings rDNAse tcR]; };
   kmed = derive2 { name="kmed"; version="0.1.0"; sha256="1sqcrl75hjxpvaz1m40h7z3xzxkda8mnmq90jd6igvpbznixq2yc"; depends=[ggplot2]; };
   kmer = derive2 { name="kmer"; version="1.1.0"; sha256="0c96rz75qggqfb0zccn0v92jx9ws2nlw8pk6j5jghllcgm99qbdc"; depends=[openssl phylogram Rcpp]; };
   kmi = derive2 { name="kmi"; version="0.5.4"; sha256="07h4gn69r4zxm00alj74fd0qdyp7g9x38gpi1v7yzy806wlg93fr"; depends=[mitools survival]; };
@@ -8188,7 +8320,7 @@ in with self; {
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.20"; sha256="1408dm25cxahk2clff8hlajaqdj5v1gs40nm3q6rf0ghd82hj93v"; depends=[evaluate highr markdown stringr yaml]; };
+  knitr = derive2 { name="knitr"; version="1.21"; sha256="0xzymi4gkilqaa5b2ay9zk1advavzkwxf7mb064bqfb09y8rak0j"; depends=[evaluate highr markdown stringr xfun yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; };
   knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
@@ -8202,8 +8334,8 @@ in with self; {
   koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; };
   koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-2"; sha256="0v3cjzcpa24n479xi2lkj3yhjrgbd14iq9rz1bvywbj3shixs0bn"; depends=[koRpus sylly_en]; };
   kofdata = derive2 { name="kofdata"; version="0.1.3.2"; sha256="0s7y1djmiz598bx0ppabb5pc1cssaavr67yf4zk9aai90xs2p2v1"; depends=[httr jsonlite xts zoo]; };
-  kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
-  kohonen = derive2 { name="kohonen"; version="3.0.6"; sha256="0b1039j69v43ppyczwpagriiv669gnxh3s40dhjq0mb3a6fxrpcb"; depends=[MASS Rcpp]; };
+  kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; };
+  kohonen = derive2 { name="kohonen"; version="3.0.7"; sha256="1rxx5ssfpmjvy1a5a57ikp97gbkq134yyagwl5qm78yzfmnnhplr"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   komadown = derive2 { name="komadown"; version="0.2.0"; sha256="0mw1bcrg10yy1y844lpik70979420h0nsar48v5p3qk783pymbdp"; depends=[bookdown rmarkdown]; };
@@ -8221,7 +8353,7 @@ in with self; {
   kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
   ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; };
-  kst = derive2 { name="kst"; version="0.5-0"; sha256="05vq23j9q4q1nh9s92z303pwma0mh0b7h64aha3xvilfs3sbhvwq"; depends=[proxy relations sets]; };
+  kst = derive2 { name="kst"; version="0.5-1"; sha256="0p0v4kwnd793rjvdq00pyvnjyzqp4n5hazxjc55am6is71ihwann"; depends=[proxy relations sets]; };
   kstIO = derive2 { name="kstIO"; version="0.2-0"; sha256="01p6krb945m5jy57k479szic4yb7bap020mz1imlnsnmbnrycpx6"; depends=[MASS pks sets stringr]; };
   kstMatrix = derive2 { name="kstMatrix"; version="0.1-0"; sha256="0c8nb6cc4ng6gc21bhnj8in7rcjnsbncb3c8k70q3w340apwv2pm"; depends=[]; };
   ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
@@ -8238,13 +8370,13 @@ in with self; {
   l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; };
   l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; };
   l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; };
-  laGP = derive2 { name="laGP"; version="1.5-2"; sha256="1gpvp07m3ixhsvvcx0px9wx2f603zbsj4cqrx8w1azwrms5y2qj4"; depends=[tgp]; };
+  laGP = derive2 { name="laGP"; version="1.5-3"; sha256="1bn7mj42kjgqa350ikkk7dlvash3l1fw9wdzrbjb2y41mnv8ipav"; depends=[tgp]; };
   labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; };
   label_switching = derive2 { name="label.switching"; version="1.7"; sha256="1p4cgqf79zppvzrhh5gcxnm7f8qj03fzfmjx43mjhsr1vqig4c78"; depends=[combinat lpSolve]; };
   labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; };
   labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
   labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
-  labelled = derive2 { name="labelled"; version="1.1.0"; sha256="0w1zc4w2lkhyldwqyc0drfdn251kjz94jv9p0sn6b034vcifq7ia"; depends=[dplyr haven]; };
+  labelled = derive2 { name="labelled"; version="2.0.1"; sha256="01y4h92h89chymhihm409rnpibfl9mcvsjsz2d242zyqlg8m38h5"; depends=[dplyr haven]; };
   labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; };
   labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
@@ -8264,9 +8396,9 @@ in with self; {
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
-  landscapemetrics = derive2 { name="landscapemetrics"; version="0.2"; sha256="1blriglh2kplcndcrgyxw6llhffxy2lbra8brpji6ma7552nb4xl"; depends=[dplyr ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="0.3"; sha256="025dk1k60jzvw2naar2h64vj92vn32lwzgdifzy16z5xf3b6qx2q"; depends=[cli crayon dplyr ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
   landscapetools = derive2 { name="landscapetools"; version="0.4.0"; sha256="191fgb0in2vz8drfm59g5cddka1yxi4l37zpiprj9ay1hdg8rc0s"; depends=[checkmate dplyr extrafont ggplot2 magrittr purrr raster rasterVis tibble tidyr viridis]; };
-  landsepi = derive2 { name="landsepi"; version="0.0.4"; sha256="0b162vdgrd1v93bm5dc5r4nzpcm3cq5iy8v3f2axpx1fk378aaar"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
+  landsepi = derive2 { name="landsepi"; version="0.0.5"; sha256="13f3jzggkyd3hnzy3ydg6dhfgfjbs04nbpjxqy5b6dwikk9w9hvi"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; };
   languageserver = derive2 { name="languageserver"; version="0.2.5"; sha256="07j0s5s689szasvh4h5hn2250yfly35gjv88g7ggzy71i9vw0cdv"; depends=[callr collections desc jsonlite lintr R6 repr stringr styler]; };
@@ -8274,7 +8406,8 @@ in with self; {
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
-  lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
+  lass0 = derive2 { name="lass0"; version="1.0.0"; sha256="05q3d14rxkz9cbavkrnnw09nd5vsf9n5j295dnifhqr9il27npmn"; depends=[foreach ismev lpSolve]; };
+  lasso2 = derive2 { name="lasso2"; version="1.2-20"; sha256="0wgby86i5jphl1nxhzf6733lknry843qrqiyp4km10s2nlpbls0c"; depends=[]; };
   lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
@@ -8283,12 +8416,12 @@ in with self; {
   later = derive2 { name="later"; version="0.7.5"; sha256="0xhwn37makzm85zb6w5acc7svzibxcnz69rks0kxw22vapkxwz1i"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; };
-  lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
+  lattice = derive2 { name="lattice"; version="0.20-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.6.3"; sha256="0cayjspry3r2lcbvl77v5v52b2zarri3b8xsf87pw5a3jn9anxcf"; depends=[numDeriv SQUAREM survival]; };
+  lava = derive2 { name="lava"; version="1.6.4"; sha256="0627cjlg55kzbzcy82w6wykmw2i57qhgfcabn2zy3ydfdswyxij1"; depends=[numDeriv SQUAREM survival]; };
   lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
-  lavaSearch2 = derive2 { name="lavaSearch2"; version="1.4"; sha256="0mr3vranmsrd9acr16gryib89dn2x19wwwd4wx3dgwwby18mc5j3"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
+  lavaSearch2 = derive2 { name="lavaSearch2"; version="1.4.1"; sha256="0c3b3827axwhgnnicvr4y0cxpxsqhizfywxylw4d76zkm4alk3ds"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
   lavaan = derive2 { name="lavaan"; version="0.6-3"; sha256="0hw856kv11zqn6nd4216rh19i6xbnc1rh044r7jvvxkhzgbqkyxz"; depends=[MASS mnormt numDeriv pbivnorm]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
@@ -8304,9 +8437,10 @@ in with self; {
   lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
   lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
   lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
-  lbfgsb3c = derive2 { name="lbfgsb3c"; version="2018-2.13"; sha256="01pdzh1wfj5xpxl08c13rrf2iyf616s2fav7pznlgha7bpkdc2j4"; depends=[numDeriv Rcpp RcppArmadillo]; };
+  lbfgsb3c = derive2 { name="lbfgsb3c"; version="2018-2.13-1"; sha256="1avk1srkp61dbjpgjhxq0w6q14y3jydmrywkab6kf1y6r3f4z20g"; depends=[numDeriv Rcpp RcppArmadillo]; };
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
   lbreg = derive2 { name="lbreg"; version="1.2"; sha256="0wcw5w07fgmxwzmamf380l8vxw9fnxhbrhcwwfy6x87xby3bzr1b"; depends=[MASS]; };
+  lcc = derive2 { name="lcc"; version="1.0"; sha256="1lzpx9vxqs4nl9wwm6zvqj8brf6izvp45jqvb94sdmv3zpjxddj5"; depends=[gdata ggplot2 nlme]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
   lcmm = derive2 { name="lcmm"; version="1.7.9"; sha256="15x8i7cvifbrb64cqjng0hvk6ajnla0yakj4pfd8d4s20nzivij4"; depends=[survival]; };
@@ -8328,6 +8462,7 @@ in with self; {
   leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; };
   leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; };
   leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.4"; sha256="17lrchpry3in36jdkinsxs9lzqnx65xyk9g939knc8nmjw6z2j2r"; depends=[htmltools leaflet]; };
+  leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leanpubr = derive2 { name="leanpubr"; version="0.3.1"; sha256="0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx"; depends=[httr jsonlite xml2]; };
@@ -8344,9 +8479,9 @@ in with self; {
   leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-  lemon = derive2 { name="lemon"; version="0.4.1"; sha256="16zr2xg72vxplrvsrrz2fp0akqs4am1k2ymk4mdn2yzzby41dn40"; depends=[ggplot2 gridExtra gtable knitr lattice plyr]; };
+  lemon = derive2 { name="lemon"; version="0.4.2"; sha256="1i828vix6r0a5sa0nn5klnf5phl80ckwq9azz093qzz1c6lhcvm2"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; };
   lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.7.6"; sha256="04gwdfbj5ix6zpwazl2f83x7jhdyrhhkz4s0dz1609c10m8zjpm1"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; };
+  lessR = derive2 { name="lessR"; version="3.7.9"; sha256="168myzjrk2iclx0r76ikrar3n6qvchi5ap9sk5ph7alw5ck4q3ca"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png randomcoloR robustbase sas7bdat triangle viridisLite wesanderson]; };
   lest = derive2 { name="lest"; version="1.0.0"; sha256="06ng0dpj37bhhwc34ilpks2ics97m9yjdpj4q993h3s2fn8kdgxw"; depends=[]; };
   lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
@@ -8359,7 +8494,7 @@ in with self; {
   lfe = derive2 { name="lfe"; version="2.8-2"; sha256="1j06mnp3jii427dqbdy5hqw6f254nr5is91y24vacmxwk2m44pzd"; depends=[Formula Matrix sandwich xtable]; };
   lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
-  lg = derive2 { name="lg"; version="0.2.0"; sha256="0127dprv1zdr9m3m84lak4998d0mjfv9809ylzhr7r8a6zy1qdv8"; depends=[ggplot2 ks localgauss logspline mvtnorm]; };
+  lg = derive2 { name="lg"; version="0.3.0"; sha256="1kbsfkv8py627l2zm96l05r19d2yx7zajf3nqy67rclcj869jg1n"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
   lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
   lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; };
   lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
@@ -8388,7 +8523,7 @@ in with self; {
   likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
   lilikoi = derive2 { name="lilikoi"; version="0.1.0"; sha256="1v7xrkv8xxmq6cdww4z1p9vlvy71cqgd3yb5mal4v9w2wrfaps6z"; depends=[caret corrplot devtools dplyr e1071 gbm ggplot2 glmnet hash Hmisc infotheo Matrix pamr princurve pROC R_oo randomForest reshape2 RWeka stringr]; };
   limSolve = derive2 { name="limSolve"; version="1.5.5.3"; sha256="1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg"; depends=[lpSolve MASS quadprog]; };
-  lime = derive2 { name="lime"; version="0.4.0"; sha256="0hml1f3fq21s45h1cg3qi4w7vdfdxcsz8q4h1429gbppbdanz9i1"; depends=[assertthat ggplot2 glmnet gower htmlwidgets magick Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; };
+  lime = derive2 { name="lime"; version="0.4.1"; sha256="1qwyqrpjr837syb7f7f1gk6i5fvagrq51fjns6p617xpls3hryil"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
   linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; };
   linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
@@ -8400,7 +8535,7 @@ in with self; {
   lineqGPR = derive2 { name="lineqGPR"; version="0.0.3"; sha256="0adrjsfqwy9wrw4hf48p7jgn985bbpv6jyhhkab19fabc84iy1jg"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr quadprog restrictedMVN tmg TruncatedNormal]; };
   lineup = derive2 { name="lineup"; version="0.37-10"; sha256="1w45ll6phynn03ala0wadmp06rrgg8rcqnhz7hqy4w6q7khbkk6r"; depends=[class qtl]; };
   lingtypology = derive2 { name="lingtypology"; version="1.0.13"; sha256="1v6n2wdz5zkkc1k88jpjrh6nwias496dg2vvglrjd7g4bymb7715"; depends=[leaflet leaflet_minicharts magrittr MASS rgeos rowr sp stringdist]; };
-  linguisticsdown = derive2 { name="linguisticsdown"; version="1.0.1"; sha256="1y0iwbdkm37h6777p409ac7w8xqp70g2jjcfhxpvnrvvk4v0hrrk"; depends=[dplyr DT knitr magrittr miniUI rstudioapi shiny stringr tidyr]; };
+  linguisticsdown = derive2 { name="linguisticsdown"; version="1.1.0"; sha256="17cnyi58482nwv54kyga1bhgpkgw97ajppv87snqnmwks59g3adq"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr tidyr]; };
   link2GI = derive2 { name="link2GI"; version="0.3-5"; sha256="1mxbahxn5kfkvqdyg5mr4gqpbw90ik1xmxvl6a7d4dcacpsqzkl8"; depends=[devtools gdalUtils raster rgdal rgrass7 roxygen2 RSAGA sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
@@ -8411,13 +8546,13 @@ in with self; {
   linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
   lintools = derive2 { name="lintools"; version="0.1.2"; sha256="18layj6a202p0sy9rs022fp0a6fwvixwwmwlyzn7h9kh4y9gvxjz"; depends=[]; };
-  lintr = derive2 { name="lintr"; version="1.0.2"; sha256="14l6fi2mdc2swi4xw865q63yngk2b5k553qbyvnhmwq2w4pv07pn"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
+  lintr = derive2 { name="lintr"; version="1.0.3"; sha256="0vlsgq13g2ddv3wqcxaaf7yki9yjj3j1agkh91vqlvbi90i6s8mx"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   liquidSVM = derive2 { name="liquidSVM"; version="1.2.1"; sha256="0nw8n4qg2jijbnlza15ifzqsl4pj7gjzi4nd71zp7h0aw5mnp80x"; depends=[]; };
   lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
-  list = derive2 { name="list"; version="8.3"; sha256="1wffh7xmhdf4hqbpz4ij0759zk0y0zsm160kzfcr2n8s9wdgm5gj"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
+  list = derive2 { name="list"; version="9.0"; sha256="0wyrlrlsh1j7lza82zlbymd25wvl7ypzfc8cz3x2az88rhzmnpzq"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
   listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; };
   listarrays = derive2 { name="listarrays"; version="0.1.0"; sha256="06siz7ph9ihjv9y97bd02xibkw4qr548cv3yqjqzqw245jzxvhv7"; depends=[]; };
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
@@ -8427,7 +8562,7 @@ in with self; {
   liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; };
   littler = derive2 { name="littler"; version="0.3.5"; sha256="0zv6yr23swiw7w21qdw26jrw882wh0si7wz73fwl8d554rbhqinw"; depends=[]; };
   liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
-  live = derive2 { name="live"; version="1.5.8"; sha256="0idnavgmvhq2w6fa46ssaxhj5v8p3x1q8zcgmknp47s9c2h8yfrc"; depends=[breakDown data_table dplyr forestmodel ggplot2 gower lubridate MASS mlr shiny]; };
+  live = derive2 { name="live"; version="1.5.9"; sha256="1xs0iwxw1fp6sqxf9f3r0i70s0fjraslqq4mzlv852wv2h3g0hrn"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower lubridate MASS mlr shiny]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
@@ -8440,7 +8575,7 @@ in with self; {
   lmQCM = derive2 { name="lmQCM"; version="0.1.2"; sha256="0flir861pnvg6kkkccv7f162gd9ml4mks7pjs0041jrs7bijbh68"; depends=[Biobase genefilter nnet]; };
   lmSubsets = derive2 { name="lmSubsets"; version="0.3"; sha256="1d78gbmxybxb98lapy5m7nyxc7slyxlj50xdh6a4nyckixmf9plp"; depends=[]; };
   lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
-  lme4 = derive2 { name="lme4"; version="1.1-18-1"; sha256="01ar4fak8zj7c1vmh9m576wchxj5qzpfqn637s7fh3fl6cpz0alq"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+  lme4 = derive2 { name="lme4"; version="1.1-19"; sha256="0j8xhkkcdv45ilab960s9jrcjk6jbzvd7w7myswv5fmalrpq52pf"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
   lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
@@ -8466,7 +8601,9 @@ in with self; {
   lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-36"; sha256="0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"; depends=[zoo]; };
   lmvar = derive2 { name="lmvar"; version="1.5.0"; sha256="068ib0abpvds0ibb0d6m71svv7d3l0is4kdin1wzsn633kk3zcfy"; depends=[Matrix matrixcalc maxLik]; };
+  lmviz = derive2 { name="lmviz"; version="0.1.1"; sha256="0wgq93pr54pc4vxzqlhc1i67zf4lrn8yzpvlqsv8byh2qb0dd4sv"; depends=[lmtest mgcv shiny shinyjs]; };
   loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
+  lobstr = derive2 { name="lobstr"; version="1.0.0"; sha256="0gabjlb2175v218h1cx59f49x4rvcazilsh6g6n3n6y534axw94x"; depends=[crayon Rcpp rlang]; };
   localIV = derive2 { name="localIV"; version="0.1.0"; sha256="0q2vjiwj301g0lqaafpk6i1cxdwgaanz9ckwj2zkzk4h3gx2afw3"; depends=[KernSmooth mgcv sampleSelection]; };
   localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
   localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
@@ -8486,7 +8623,7 @@ in with self; {
   logcondens = derive2 { name="logcondens"; version="2.1.5"; sha256="1sq27klnphp74hq0l0460m9bb7lrl06mpgkg4qq8iciy3yy1mrkj"; depends=[ks]; };
   logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
   logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
-  logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
+  logging = derive2 { name="logging"; version="0.8-104"; sha256="1grx44yhn8lm71ksyq9z369ylawngm69bv7dg1c660378c5b0iix"; depends=[]; };
   loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; };
   loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; };
   logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; };
@@ -8494,17 +8631,17 @@ in with self; {
   logistf = derive2 { name="logistf"; version="1.23"; sha256="0f1qn7q3h0qg2qdiz69ab03qvl4xhizqg304vjak72390nj25nss"; depends=[mgcv mice]; };
   logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; };
   logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; };
-  logisticRR = derive2 { name="logisticRR"; version="0.1.0"; sha256="1bk3dj3pn0rprcypwwal96xfszx3nfzfypyr8l7lp4h3v5mqbrxw"; depends=[]; };
+  logisticRR = derive2 { name="logisticRR"; version="0.2.0"; sha256="1ammq50p26hyjgqwhpza4225zk813r1vfs42r9lqv7pf0gkl4zid"; depends=[nnet]; };
   logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
   logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; };
   loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
   logmult = derive2 { name="logmult"; version="0.7.0"; sha256="05asjafpairgvix8gs9n5bwiwxv857wzbmni67clm2dzkh7vsn22"; depends=[gnm qvcalc]; };
-  lognorm = derive2 { name="lognorm"; version="0.1.3"; sha256="02f3z7m11lnwndlahw03936l95lrhjil3ygrhi40qk5ihnq27d9z"; depends=[Matrix]; };
+  lognorm = derive2 { name="lognorm"; version="0.1.4"; sha256="1jyi8j9s5rd0arg750hddkpv92a9pzhifxjivnl8v5j9mz6v7z6r"; depends=[Matrix]; };
   logspline = derive2 { name="logspline"; version="2.1.11"; sha256="0747xl0p6kigc936kyqxqgmwxsh01lb9913w7wq0q05766pnw7kq"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; };
   lolR = derive2 { name="lolR"; version="2.0"; sha256="0ygxm5qym1s64pa8a04jf44y786svrkhscda2x781jx8gpil753v"; depends=[abind ggplot2 irlba MASS pls]; };
   lolog = derive2 { name="lolog"; version="1.1"; sha256="03bhmzd7qw6hq82lymy183x4q2lzm5f9ish2fy7dqif1iqvkq3fq"; depends=[BH ggplot2 intergraph Matrix network Rcpp reshape2]; };
-  lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
+  lomb = derive2 { name="lomb"; version="1.1"; sha256="08gzmrxl149p4wy8q3vs9impxqdf429q7lrg8j7g2r0k2yzm4rp7"; depends=[]; };
   longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; };
   longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; };
   longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; };
@@ -8516,14 +8653,14 @@ in with self; {
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
   loo = derive2 { name="loo"; version="2.0.0"; sha256="1k2qhma7gm4l3h9wf5gh1gm09map2jqcdzz3pba4gf039n8h3gsl"; depends=[matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
-  loon = derive2 { name="loon"; version="1.2.0"; sha256="1ch5hzpyvq0vil8fwpkpjh8yxyq876shy9kyr6svs2x7jc132qvr"; depends=[gridExtra]; };
+  loon = derive2 { name="loon"; version="1.2.1"; sha256="10yw83qaddfb6pb43dxsmlg9ix177l8msyvjpn09wajna1vwm6z8"; depends=[gridExtra]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   loose_rock = derive2 { name="loose.rock"; version="1.0.9"; sha256="03713ac7farwgjidnx46j6mzm6if10b33lrpzban9lis713s8qqm"; depends=[biomaRt digest dplyr futile_options ggfortify ggplot2 MASS reshape2 rlang]; };
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
   lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
   lorentz = derive2 { name="lorentz"; version="1.0-0"; sha256="0irnmzsvp4jdych2j68y68yvly1w3c0fxkply7lqhw2h1hbxhlgx"; depends=[emulator magrittr]; };
-  lori = derive2 { name="lori"; version="0.2.1"; sha256="0440hnb05lmvww9w7nf568j2azh4bk28z2r2fjba1mx3c2wk8h63"; depends=[ade4 FactoMineR glmnet gridExtra lars lattice NLRoot pdist psych svd]; };
+  lori = derive2 { name="lori"; version="1.0.0"; sha256="190ij4swfl9pw8cd7ky3jzyp2cirjfjnnm6hv2mpvjw7m0w0lyfv"; depends=[ade4 FactoMineR glmnet gridExtra lars lattice NLRoot pdist psych svd]; };
   lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
   lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; };
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; };
@@ -8549,10 +8686,10 @@ in with self; {
   lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
-  lslx = derive2 { name="lslx"; version="0.6.3"; sha256="1a6s1a2g87h1fd0w5ckjgmanqpvwfp6hh8mshc61917w3g8y1rdg"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
+  lslx = derive2 { name="lslx"; version="0.6.4"; sha256="06xz219vcaw0k80n6xwr29i9mb43y3yra97c6xlfgac4ipgm6z1v"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
   lsm = derive2 { name="lsm"; version="0.1.8"; sha256="0h7gyc4wb0y3hvs21h22l57czdd3xfycg400ncz5c9s63r47wzx3"; depends=[]; };
-  lsmeans = derive2 { name="lsmeans"; version="2.27-62"; sha256="1db9ldk8maj8qr2ha3aa5bz01wv4irkiw561fzjcm9slb0iz1k7z"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
-  lspartition = derive2 { name="lspartition"; version="0.1"; sha256="1c2wp9yl0jzvbh181flzywwqmm6xr5jg9qbfibw4ja9wf6xnfx8w"; depends=[combinat ggplot2 MASS matrixStats mgcv pracma]; };
+  lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; };
+  lspartition = derive2 { name="lspartition"; version="0.2"; sha256="049njdjk6q834cjsqh7960alpygbswaamwrmlify1ywdz8nqvxrn"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-2"; sha256="1cmffkyc881659l9m1miwhr3jfpwb0xb9n5chg317vcm8l9r4wcn"; depends=[pls]; };
   lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; };
@@ -8578,9 +8715,9 @@ in with self; {
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
   lvec = derive2 { name="lvec"; version="0.2.2"; sha256="0n1l26n4khlalqd0b9bi7vc3kr5jh6mr56ca0rmnnl6bl9742nr5"; depends=[BH Rcpp]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2.1"; sha256="0syl3bzrmpm960b2fx893xw79d7lvlhr94r5kdq9z6jayvcyq66c"; depends=[ellipse ergm igraph MASS network]; };
-  lvnet = derive2 { name="lvnet"; version="0.3.3"; sha256="14jik7kxljlpk0fp3gmy0i6by78higmqz1n88dy8wczcvms66ci0"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
+  lvnet = derive2 { name="lvnet"; version="0.3.4"; sha256="0pn3iwxl8aj605s9hvvsysdq6i8yidzg992xczc1m95hbk5i0pkr"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
   lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; };
-  lwgeom = derive2 { name="lwgeom"; version="0.1-4"; sha256="0x58a04sklrr6vr38hbd2900b3bigdfj7zyk6pzj9y7yy5mr2cjg"; depends=[Rcpp sf units]; };
+  lwgeom = derive2 { name="lwgeom"; version="0.1-5"; sha256="1sqpd2r15nlg210249vpxqzk04ylhlqypfd1p86hriykd86x6idv"; depends=[Rcpp sf units]; };
   lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; };
   lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; };
   m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; };
@@ -8596,7 +8733,6 @@ in with self; {
   mRMRe = derive2 { name="mRMRe"; version="2.0.7"; sha256="1njapjphy4b8nvrsnzrf2nbfp7mjizb7wlxgx1igfqncfhbskqfn"; depends=[igraph survival]; };
   mRchmadness = derive2 { name="mRchmadness"; version="1.0.0"; sha256="0f6cb3d5dhp6b0dd0fshplp75jjbhx3v9r53pa8gmcfd10hvbqba"; depends=[dplyr glmnet Matrix rvest shiny xml2]; };
   mRm = derive2 { name="mRm"; version="1.1.6"; sha256="1d897c5xflbkkj25hw15rd62nggv000cv2j481x0lhdgmgldjhrh"; depends=[]; };
-  maGUI = derive2 { name="maGUI"; version="2.2"; sha256="0b0iprpb4mnaj4lpaismr0f1rnq4m0b61imcx8mrffw9mx45qapv"; depends=[affy amap annotate beadarray Biobase BiocInstaller Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
   maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
   maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; };
   mable = derive2 { name="mable"; version="1.0"; sha256="1ny8nfnyqj9c1n4b0m34kadpmnb4k2d81nd66cqxnz8dm9129vqj"; depends=[]; };
@@ -8617,19 +8753,20 @@ in with self; {
   magclass = derive2 { name="magclass"; version="4.51.1"; sha256="1p4pbwjkn9ic3vqjh9m4b18s78f8wx0815n4dyg9pin8p14klzil"; depends=[abind maptools ncdf4 reshape2 sp]; };
   magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; };
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
-  magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; };
+  magicaxis = derive2 { name="magicaxis"; version="2.0.4"; sha256="1ap5bahzkg8yffcbdlwry4wqxppapqz32nsb3pvj5x47ynmnynyb"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
   magick = derive2 { name="magick"; version="2.0"; sha256="18y465325mhf48x2jn3jz9khwq1z2aj13wfbdkv8k3hln1sd572m"; depends=[curl magrittr Rcpp]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
+  majesticR = derive2 { name="majesticR"; version="0.1.0"; sha256="0f6mxxjsrvv6pcimmmgvpfvpwqg8cn28pimxzcm8k00aqy4mg9h3"; depends=[jsonlite]; };
   makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; };
   makeParallel = derive2 { name="makeParallel"; version="0.1.1"; sha256="1zm8k3gzxcirq221lh1vbxsjym68vc5s58lxd03s194pgixbwydr"; depends=[CodeDepends codetools whisker]; };
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
   makedummies = derive2 { name="makedummies"; version="1.1.2"; sha256="122s8cizycbnqc00d1njhnn3xbz9vg42f8vjqgzc9k5dhxx4v8n1"; depends=[]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
-  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.2"; sha256="07hmnaacqkywalsajx5mzql7sil0196k930faaha0ync09idz7kz"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; };
+  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.3"; sha256="1vvralhrh4sk742f4yb05lfchxwmpl7n0yqw7hhfga4fc1qxnd9l"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
   mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; };
@@ -8646,6 +8783,7 @@ in with self; {
   mapedit = derive2 { name="mapedit"; version="0.4.3"; sha256="0ybd9vbdpr3i3wfpcn36dqj3n9i885xycris2nwgxzc9dxb5ad7a"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; };
+  mapi = derive2 { name="mapi"; version="1.0.0-62"; sha256="1czg2lqrlmp7fsm7908bwd4f9klq8d90z79zb1g80w2dlh5hb0nc"; depends=[data_table pbapply Rcpp sf]; };
   mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; };
@@ -8665,7 +8803,7 @@ in with self; {
   margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
-  markdown = derive2 { name="markdown"; version="0.8"; sha256="1vcgsh2m2f5kfgappgg71nbf04ff0j1sbk668krjs3r2n89dk3sk"; depends=[mime]; };
+  markdown = derive2 { name="markdown"; version="0.9"; sha256="08xzs4bcf12jxp0276m6xqvq8kcgg5qp6fxrvsz6r9x73jjccs1h"; depends=[mime]; };
   marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
@@ -8678,7 +8816,7 @@ in with self; {
   matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; };
   matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
   matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; };
-  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-6"; sha256="1vl9gmz155l6qrz0sqpirwhbd99j15zxp7gj8q6m88y5dpnhpkqs"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
+  matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-0"; sha256="1w1f4qvz2086h37fh10vwx2kqsshhciz5b9isxcbmay3a4xfc0a0"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
   matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; };
   matconv = derive2 { name="matconv"; version="0.3.2"; sha256="0vnmqz5vzv5n0cfpgr30gkl0pv8p2b5cp3ap6mn01sxd671lx38z"; depends=[]; };
   mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; };
@@ -8690,6 +8828,7 @@ in with self; {
   matlib = derive2 { name="matlib"; version="0.9.1"; sha256="03991ckrfk663pdi9q2a4sms9csr1dkr075dsycqggr96yp1cwh8"; depends=[car MASS rgl xtable]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
+  matrixNormal = derive2 { name="matrixNormal"; version="0.0.0"; sha256="1m3qvvw02fqisjjsvlpz4dpy71cmn0ds6pajdmzj2shfvyyh6q4d"; depends=[mvtnorm]; };
   matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; };
   matrixStats = derive2 { name="matrixStats"; version="0.54.0"; sha256="0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"; depends=[]; };
   matrixTests = derive2 { name="matrixTests"; version="0.1.0"; sha256="0784wfp14z7lh6ylzgh9kvzs5gwapfs7ksx63jf3qwb95zfwyixx"; depends=[matrixStats]; };
@@ -8738,11 +8877,11 @@ in with self; {
   mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
   mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; };
-  mclust = derive2 { name="mclust"; version="5.4.1"; sha256="1vcl4nl8by2vj2k9k84imy5m850khkgd8q02a8ica1h8vz9ijgn4"; depends=[]; };
+  mclust = derive2 { name="mclust"; version="5.4.2"; sha256="09152swfpa3fzhmrq5cwb5kxgvrxvigv1m4v6rhcibrdhfd1x8x4"; depends=[]; };
   mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; };
   mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; };
-  mcmcr = derive2 { name="mcmcr"; version="0.0.1"; sha256="0g64df8v6snbcmk0kynfppq1mqaz9z8apfsm1zn3ch5q2afg0kqy"; depends=[abind checkr coda tibble]; };
+  mcmcr = derive2 { name="mcmcr"; version="0.0.3"; sha256="1pcf303wkxx8621nwlzrcx5m6z1wjbgnfbfk4dk24nddf82fyjgr"; depends=[abind checkr coda err]; };
   mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
   mcompanion = derive2 { name="mcompanion"; version="0.4-5"; sha256="18l29cbggf5mdab8vdzmbsnc0p77llaq3ylp07a7gsq44bys8zq0"; depends=[gbutils MASS Matrix Rdpack]; };
@@ -8756,24 +8895,24 @@ in with self; {
   mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; };
   mdatools = derive2 { name="mdatools"; version="0.9.1"; sha256="14q4565l7xghwrizc7qn2c6x1wq337h68gww3gxgc9jxs74axzz2"; depends=[]; };
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
-  mdendro = derive2 { name="mdendro"; version="1.0.0"; sha256="0pxw4zkv38syajcsbcp5f5wn8bw0ah4ay950iyhql044hlmav99j"; depends=[rJava]; };
+  mdendro = derive2 { name="mdendro"; version="1.0.1"; sha256="0pk7b7zn9afc947parkj1qa4d85gq16lalg07fjfripxjnmvjahw"; depends=[rJava]; };
   mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; };
   mdhglm = derive2 { name="mdhglm"; version="1.8"; sha256="1myky8d2ilwdliqrzd2i5qvja82iz7w6qbigl7h4znpk8pdgrjb3"; depends=[boot Matrix mvtnorm]; };
   mdir_logrank = derive2 { name="mdir.logrank"; version="0.0.4"; sha256="0bhsr005dq9v85sjm2g9xlpksxwzsmsk14g0q5v3hkjvm5wk6xmv"; depends=[MASS]; };
-  mdmb = derive2 { name="mdmb"; version="0.11-7"; sha256="15czj7vfghaipppv41ma6ysq1zcfx9v5v33ivvlrzg7cv0dqf6jp"; depends=[CDM coda MASS miceadds Rcpp RcppArmadillo sirt TAM]; };
+  mdmb = derive2 { name="mdmb"; version="1.0-18"; sha256="104dbsrajcv0n83rnx9fhhjclffh7qr5kkswzlxqrcydrim2i5dq"; depends=[CDM coda MASS miceadds Rcpp RcppArmadillo sirt]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
-  mds = derive2 { name="mds"; version="0.2.0"; sha256="1z98lz6nfh4x8zg906glj3jfq005hh8h0gzmzmdf7n6fx613p4x2"; depends=[lubridate parsedate]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.3-2"; sha256="1cdsg4adxy3x1ml68i47v0bgyyrsha2wghc504pski1df1nxz2kg"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
+  mds = derive2 { name="mds"; version="0.2.1"; sha256="01md6h3va2pvgx2yx30rmildn529zhqr8ars6k2kjr8q1wq92jar"; depends=[lubridate parsedate]; };
+  mdsOpt = derive2 { name="mdsOpt"; version="0.3-3"; sha256="040jg995drghr85qjis640dzakxlh82773bn4378wcpnnk3h343s"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
   mdsr = derive2 { name="mdsr"; version="0.1.6"; sha256="1z0sjrvnvm1bgifapmaay57lr5dgj84xzppwn579g8kammaav89x"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL]; };
   mdsstat = derive2 { name="mdsstat"; version="0.2.0"; sha256="12gr54lpxzs682mln21899gb3ma202a20j87p030p99fp71vbw42"; depends=[lubridate mds]; };
   mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; };
   meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
-  meanShiftR = derive2 { name="meanShiftR"; version="0.52"; sha256="0mignhiz6vjpjbxg4dkc4g5mnf5mr7ifdpj7ickhspallj6l8508"; depends=[]; };
+  meanShiftR = derive2 { name="meanShiftR"; version="0.53"; sha256="1pla9hr9nbbnc3hcmk0ywfh6129zng5lp3dmjqb3cgdrmwkdrx9i"; depends=[]; };
   meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; };
-  measurements = derive2 { name="measurements"; version="1.2.0"; sha256="1k47xmydgd9lhc6phr40zphnibiq817f5nf8619ibla2pridjn1l"; depends=[]; };
+  measurements = derive2 { name="measurements"; version="1.3.0"; sha256="0zzm411l5jmxm0lw2l4j3r0rlfyw73a4wmfxp6cx7yqjhwrzgmmq"; depends=[]; };
   measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; };
   meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
@@ -8790,24 +8929,26 @@ in with self; {
   mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; };
   meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
-  mem = derive2 { name="mem"; version="2.13"; sha256="1k8nda479k7w9jll2wxiasx06nz39vdcz8mssfj33amb6bk874kp"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll reshape2 sm stringr tidyr]; };
-  memapp = derive2 { name="memapp"; version="2.10"; sha256="0kkim1mrajpc7b20snsrmwcki2mc2winha4lq4ybb22s16isw4p0"; depends=[dplyr DT foreign formattable ggplot2 haven magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
+  mem = derive2 { name="mem"; version="2.14"; sha256="03yiarxvxm61cf1gxbzk2criw3cfpwsb6qj1rc9aglk9ywsni5x5"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; };
+  memapp = derive2 { name="memapp"; version="2.11"; sha256="0f8xyxz8sbqdghgxhbr5khcfs58wq748w4n7jilxfphl55n4bhgr"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinydashboardPlus shinyjs shinythemes stringi stringr tidyr]; };
   meme = derive2 { name="meme"; version="0.2.1"; sha256="0ddrm82190f8yahnann1l5fwn55msfhhcizbr0vkb098x6m2l251"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.5.0"; sha256="0bin1rmna5z0y568jbnga7pcrkgjy04av3bzcyf3fpvqqmn36r8f"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
   memisc = derive2 { name="memisc"; version="0.99.14.12"; sha256="0n8gl031n33r4iymlp3mnfilm9qwahxssrk4wlxfyp08w4mjlhjl"; depends=[lattice MASS repr]; };
+  memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memor = derive2 { name="memor"; version="0.1.1"; sha256="1l54hrbrccl6imfjj6lmb0rsfl5f5f87vaap43i4j0nbbm0y3jsb"; depends=[knitr rmarkdown yaml]; };
   memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; };
-  merDeriv = derive2 { name="merDeriv"; version="0.1-5"; sha256="1mnrjppn4gw5rikmdxpdx8xd31wj9f3mvjkfznvhig869wzr6p4z"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.1-6"; sha256="1wjhzqg3riwf32lb775amm49azl5v1xg2hahigg6jkbg8zq0h92g"; depends=[lme4 Matrix nonnest2 sandwich]; };
   merTools = derive2 { name="merTools"; version="0.4.1"; sha256="1224cmkxbkd3r10z73ww0s1nyzg00x55fv91pn1gp8p7cmpp0ni2"; depends=[abind arm blme broom dplyr DT foreach ggplot2 lme4 mvtnorm shiny]; };
   merlin = derive2 { name="merlin"; version="0.0.1"; sha256="14k8kz8icj3wgd3li83v0wfl61pdc97r7qjcsmmc5srp36kbw1i9"; depends=[MASS randtoolbox statmod survival]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; };
+  metR = derive2 { name="metR"; version="0.2.0"; sha256="0lp8462izsy0jhgm2kak85sdnnz75r6h0rjxkpx852lls6g3ibgl"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr RCurl scales sp stringr]; };
   metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.2.0"; sha256="1x32f23w5f3s7sc5gbbqzq9s83clarskj9vpnfnwryrx87dg1jjc"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; };
-  meta = derive2 { name="meta"; version="4.9-2"; sha256="1hzf6jphgz61d3rq8dqbyw3iddyv2x5a3xik3b606p8si19b66sh"; depends=[]; };
+  meta = derive2 { name="meta"; version="4.9-3"; sha256="0a891hxkf42jvmycljvsdpqg8acsx8p87arg95idccnrfq9y4ply"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; };
   metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; };
   metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; };
@@ -8817,13 +8958,13 @@ in with self; {
   metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
   metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
   metaSEM = derive2 { name="metaSEM"; version="1.2.0"; sha256="0b10as2bb5f31r59548v1j8saxd16icrsg915j2yv3nxzyi5iq7f"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
-  metaboGSE = derive2 { name="metaboGSE"; version="1.1.0"; sha256="0idx3vsn2jdxyii6y3h5is7rh084brng1dvalqjjqbbhwjcg51vc"; depends=[AnnotationDbi ape Matrix sybil topGO]; };
+  metaboGSE = derive2 { name="metaboGSE"; version="1.2.0"; sha256="024kb30j1r2223x1pp1226i7awd4di4gkppwrqc5d36l3clf7qbj"; depends=[AnnotationDbi ape Matrix sybil sys topGO]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
-  metacart = derive2 { name="metacart"; version="1.0-0"; sha256="13dp9yz6yjd2jc7lf3w3ac3vk69ry7zygf6xnvzrcwsdmxd0258n"; depends=[ggplot2 gridExtra rpart rpart_plot]; };
-  metacoder = derive2 { name="metacoder"; version="0.3.0"; sha256="10gg7kqp512xdfhkpjk48xcfiwc04967lxkhxhfblm6y5fmgwjba"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phyloseq phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize traits vegan zoo]; };
+  metacart = derive2 { name="metacart"; version="2.0-0"; sha256="011incw57n11g5fmn4k8vcpqww8nn5xqsbh65p9gx2nad1kg3g35"; depends=[ggplot2 gridExtra Rcpp rpart]; };
+  metacoder = derive2 { name="metacoder"; version="0.3.0.1"; sha256="1mih4h90xfshzcc0hl65mpqwkm90n9j3n1ccxl13b6b3mn1bvdds"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 igraph lazyeval magrittr phyloseq phylotate RColorBrewer Rcpp RCurl readr reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; };
   metacom = derive2 { name="metacom"; version="1.5.1"; sha256="18n3mbmjna3db44gscsdgv1j8f11jhikiw7yg3vbw2a9v5w3ypkv"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
-  metadynminer = derive2 { name="metadynminer"; version="0.1.2"; sha256="1py7m8l4fjswap0h41svgg8r1vhsvzxc2g3631php93k1fnpz0v7"; depends=[Rcpp]; };
+  metadynminer = derive2 { name="metadynminer"; version="0.1.3"; sha256="1i3m8a9f97ypgfrych4180q1qqx0ld4icypiq019gppdwpfny5b9"; depends=[Rcpp]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; };
   metaforest = derive2 { name="metaforest"; version="0.1.2"; sha256="0ppv9vdwxggccn2202snl13vid3v2kx5ps81cadghg2kcd8axfbs"; depends=[ggplot2 gtable metafor mmpf ranger]; };
@@ -8832,25 +8973,26 @@ in with self; {
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
   metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="1.0.0"; sha256="1wzy5dnmrdfdj1386snjyisrbzbq8v4qsnq57l3wvkg1pgnz1vh2"; depends=[]; };
-  metamedian = derive2 { name="metamedian"; version="0.1.0"; sha256="0xs967cy7z04ry90h8q38znd6idg960g5dq4dy5a8ff5qb34kflc"; depends=[Hmisc metafor]; };
+  metamedian = derive2 { name="metamedian"; version="0.1.1"; sha256="1radc0hm357jq31ns83z25b7n1fp6vsg4pag4f8q0f5lyravn13a"; depends=[Hmisc metafor]; };
   metamisc = derive2 { name="metamisc"; version="0.1.9"; sha256="0wjwx7ncplpchwbz0l4xmsmy0faj2wnqjxvxyi05992v3rjv4j8k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
-  metansue = derive2 { name="metansue"; version="2.2"; sha256="0qawsgskvsaj0h6igb4phajs5wwjrr1j07dpn86b6r0fdc2y2xzj"; depends=[]; };
+  metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; };
   metap = derive2 { name="metap"; version="1.0"; sha256="18rzvqfzyk8fn54gjvy2qd21nk9w69j7ihww477ma3f3ab6i982h"; depends=[lattice Rdpack]; };
   metaplot = derive2 { name="metaplot"; version="0.8.0"; sha256="10nb3xiy2dqxk51dpyg435r99hmj23agi2kly7y7vy2404142bq6"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
   metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; };
-  metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
+  metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.2.0"; sha256="1a4qwhg3lb5jxnddmi7zf2sc2yjzjap3rh6hfm3965bydpf1q57c"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
-  meteoForecast = derive2 { name="meteoForecast"; version="0.52"; sha256="1v9p2l45jzzim10pmy4y1hzc68sxawd996sri6dw7hnalfqfiyxj"; depends=[ncdf4 raster sp XML zoo]; };
+  meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
   meteoland = derive2 { name="meteoland"; version="0.7.7"; sha256="0gsj44kigfiq92qg7aiw6ln0i421zf4vjs4w298ci0c9hd1lmphl"; depends=[httr jsonlite knitr ncdf4 ncdf4_helpers Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
-  mets = derive2 { name="mets"; version="1.2.4"; sha256="1xchww1y9zf2h5qfqa1j0vhzzccrh9qj4xzgr23p5svjgcqx8r1b"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.5"; sha256="00vib9a7y031parj1yw5v3c9skz1bp1a0j104vprr40phbqlh9rm"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; };
   mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mexhaz = derive2 { name="mexhaz"; version="1.5"; sha256="0my53dg321xfbbkxawxcggnh5gw9qkliji5gsdb8m1fi37djd67w"; depends=[MASS numDeriv statmod survival]; };
@@ -8861,7 +9003,7 @@ in with self; {
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
   mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; };
   mgcViz = derive2 { name="mgcViz"; version="0.1.1"; sha256="1vv76cmfva1lsi921i337m44m9vykfp4rb9xidxww8dk3i9agg97"; depends=[colourpicker data_table dplyr GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI mvnfast plotly plyr qgam rgl rstudioapi shiny viridis]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-25"; sha256="1y2rq6v45pr2wcxihhgmingcdvcsilim2cvskrlb7k2n00qg6v2q"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-26"; sha256="02bsz455fr5hyhpmgcrd266qafs2wbz3ygdipxg9gfazbdvq2v4q"; depends=[Matrix nlme]; };
   mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
   mgm = derive2 { name="mgm"; version="1.2-4"; sha256="0fyg9dxvrl3biamqc908z1vc7pji1n4l2bwxjfdkwjb5cf6snd3f"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
@@ -8890,7 +9032,7 @@ in with self; {
   miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; };
   miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
   miceadds = derive2 { name="miceadds"; version="2.15-22"; sha256="0069qijlk1nvk1rgm5ki5d3914sgxszk1d9hlnpipq0qwrn99kmy"; depends=[CDM coda lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
-  micemd = derive2 { name="micemd"; version="1.4.0"; sha256="0annxirq2klldbx5fkfkzmf2gqy7zk1mpwmyhqr8halagmwa12k6"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
+  micemd = derive2 { name="micemd"; version="1.5.0"; sha256="1bzy9lxgdvfrq3mhhx734aykpcr3klnwns70whz54y6afmcz7ghp"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
   microPop = derive2 { name="microPop"; version="1.4"; sha256="0dfqn7g445w4nydklvsq5vlkiin6kcz8kkazj7jfbm98ikdywzm8"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
@@ -8935,6 +9077,7 @@ in with self; {
   mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; };
   mirt = derive2 { name="mirt"; version="1.29"; sha256="0rmnzs39x4b6v5sb8v23cxnsndnck4mb9757987r8wdnhbdx0hkr"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.8"; sha256="1syv0j4gcdx5860kxshmr0m2d1klmxfi4bwcsc7lc5ss5kw63yi1"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  misaem = derive2 { name="misaem"; version="0.9.0"; sha256="0ylapcsxdwb4h17k2n6frrxvirmvbs4x4psscjij8vmvrb2qh3pw"; depends=[magrittr MASS mvtnorm]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
@@ -8950,23 +9093,26 @@ in with self; {
   missMDA = derive2 { name="missMDA"; version="1.13"; sha256="1jzhl7j506wm2s71mn3kp0ij22z0h3pra4q552s30kv48gdk8h0w"; depends=[FactoMineR mice mvtnorm]; };
   missRanger = derive2 { name="missRanger"; version="1.0.3"; sha256="00gcnpvvy65v6k5qjk6xavdis02l8s9a56vwi39kw0rw8yhkla73"; depends=[FNN ranger]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
+  mistr = derive2 { name="mistr"; version="0.0.1"; sha256="06y01kd11gyysyh57gi6gxamacwxwjpdj83xn63wa9az8ncl3y8s"; depends=[bbmle]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
   mitml = derive2 { name="mitml"; version="0.3-6"; sha256="1pkqv4qazih3byws5z6629pp232n8ra56lip7502727b0b4bsndw"; depends=[haven jomo pan]; };
   mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
   mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; };
   mixAK = derive2 { name="mixAK"; version="5.1"; sha256="0i9gp66d1mzskiif0bk0w88cinc923fsj4vi7pv0im2cwmxksiiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
   mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; };
-  mixKernel = derive2 { name="mixKernel"; version="0.2"; sha256="0jhgyipy4635inzm0lsbi8inlbiahyfffn2ccnhyil6kaw3ky2pr"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog vegan]; };
+  mixKernel = derive2 { name="mixKernel"; version="0.3"; sha256="1kf8niplqf97n10zi6hkp9gmyyd15v6vsy741c089iwiazmixhdf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog vegan]; };
   mixOmics = derive2 { name="mixOmics"; version="6.3.2"; sha256="1lqhrgsfdlv1ji965zf9ndg6ngylbmqahcslwirwd5vrjvlbzjb2"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 rgl tidyr]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
   mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
+  mixRaschTools = derive2 { name="mixRaschTools"; version="1.1"; sha256="17idr4gyc2pv4zdwk6rgm15z32cn4271lf4hf64n8dgi0rbjlpxh"; depends=[]; };
   mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; };
   mixdir = derive2 { name="mixdir"; version="0.1.0"; sha256="0kr82g7s9vp3i1vyqfpn30avdxg86xh0hgngbqmm5l2brd5sa4wx"; depends=[extraDistr Rcpp]; };
   mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
   mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
+  mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; };
   mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; };
@@ -8974,6 +9120,7 @@ in with self; {
   mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
   mixsmsn = derive2 { name="mixsmsn"; version="1.1-5"; sha256="0y1ysh75xqsqk87717akiqi8p6varry8n92hanl4qwy7la0ksy7w"; depends=[mvtnorm]; };
+  mixsqp = derive2 { name="mixsqp"; version="0.1-79"; sha256="17lcgpvy6z4fyxipf5s3p5d0xz7d0f8cppa5rp16mx76y9vxvl8f"; depends=[Rcpp RcppArmadillo]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
@@ -8994,12 +9141,13 @@ in with self; {
   mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; };
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
-  mleap = derive2 { name="mleap"; version="0.1.2"; sha256="1622pnbdkx5dig87srir2bxqk99lvnm2qln2wcsmhpf9jvp2vqf9"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
+  mleap = derive2 { name="mleap"; version="0.1.3"; sha256="17i6rjbrf14g6857jpkpjwcac028861m1nn073wzf2kmznd2rfkk"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
+  mlergm = derive2 { name="mlergm"; version="0.1"; sha256="09wmgiirjky7kyli51bi2i7h8iazwmpcsjvmr3pc7v1larkkqyp4"; depends=[cowplot ergm GGally ggplot2 Matrix network plyr reshape2 sna stringr]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
-  mlflow = derive2 { name="mlflow"; version="0.7.0"; sha256="1dx6g4656y6z90dmsfpb0l9wb1yf8g40m62x8fwny51ld3d3cfxm"; depends=[aws_s3 forge fs git2r httpuv httr jsonlite openssl packrat processx pryr purrr reticulate rlang swagger withr xml2 yaml]; };
+  mlflow = derive2 { name="mlflow"; version="0.8.0"; sha256="1phy1q0v54mwmmip3z3kpwzi9zr21qs7kaa7c8mfp7s722mzj0aa"; depends=[aws_s3 forge fs git2r httpuv httr jsonlite openssl packrat processx pryr purrr reticulate rlang swagger withr xml2 yaml]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; };
@@ -9014,11 +9162,12 @@ in with self; {
   mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-1"; sha256="1kq8y24vvzxp1jbn52cddh0gq183pbfqs0gpi17my5xh892aszi9"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.2"; sha256="1ziyiycgwr4vgilji8dkf1c0kyqjnbmqi3qj35q3si2xbnmcm14f"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
-  mlt = derive2 { name="mlt"; version="1.0-3"; sha256="067j6gp5xh30ad46lp7x2n7kd8asbnchzlvsdgm8gq8gkd19icxx"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
+  mlt = derive2 { name="mlt"; version="1.0-4"; sha256="1brgfs4dyiwil0i1xm88xw6p8vbgp8fy7vmr7rh6q035dl1axf87"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
   mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-2"; sha256="1dk27iq7ix7j06m34c8wi9433f7kd36499x24bswy89y10lqqsn9"; depends=[mlt numDeriv]; };
+  mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; };
   mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; };
-  mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
+  mma = derive2 { name="mma"; version="7.0-0"; sha256="0g0nln1sdv0rmvgasmvs8xq28inq6h50h6xdpw0zhxk8s946k4d9"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
   mmabig = derive2 { name="mmabig"; version="1.0-0"; sha256="1srrfk6dqqfc504w8rhrfag3lzsc55sw3ckkmgph6k8ss99zn285"; depends=[car glmnet gplots mma survival]; };
   mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; };
   mmap = derive2 { name="mmap"; version="0.6-17"; sha256="1dh1i2v2pzhag8brc9c0z8vfs858rpbkg1xqqi4fi866w7g4lhxy"; depends=[]; };
@@ -9030,7 +9179,7 @@ in with self; {
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
   mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
-  mmmgee = derive2 { name="mmmgee"; version="1.12"; sha256="083hv7g2cy2r9qkwc2fihglf4avsl1dsjyy74mj39gk1pss8mh6j"; depends=[Matrix mvtnorm]; };
+  mmmgee = derive2 { name="mmmgee"; version="1.13"; sha256="1hg640rcj591dyjd9b1w8iw73hv65v1m2kgxg96q2wzavwr3q275"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
   mmpf = derive2 { name="mmpf"; version="0.0.5"; sha256="1w1ll1l7yzwb1wmlrcfpgqyzni7yb20kxy422y867hx2ndxlfwpz"; depends=[checkmate data_table]; };
   mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; };
@@ -9041,7 +9190,7 @@ in with self; {
   mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
   mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
-  mnreadR = derive2 { name="mnreadR"; version="2.1.0"; sha256="1299jc72rr8c14kl5510jc5pj2l7l2xwi593a9zg853j4bmx3nim"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
+  mnreadR = derive2 { name="mnreadR"; version="2.1.1"; sha256="1grmcjv3k54w8gilpwf7msgvfgfdgmxqmjykh8hjd9ny63w04s8x"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
   mobForest = derive2 { name="mobForest"; version="1.3.0"; sha256="0gzn3lyi9ph5dcrfbw4xs4rkf5ngf28abf1n8vap96fdhc6nmg88"; depends=[modeltools party sandwich strucchange zoo]; };
   mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; };
   mockery = derive2 { name="mockery"; version="0.4.1.1"; sha256="1vfmjcjjyw2v5y64hmpfib6v0f6ms4k5ycvc9pmj9l4nkzq2al6b"; depends=[testthat]; };
@@ -9053,20 +9202,22 @@ in with self; {
   modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
   modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; };
   modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; };
-  modeest = derive2 { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
+  modeest = derive2 { name="modeest"; version="2.3.2"; sha256="0l8g23da8fwcsv314h33ny938657kr6bw0c4kx6v938xr92hfar7"; depends=[bazar fBasics genefilter stable stabledist statip]; };
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
-  model4you = derive2 { name="model4you"; version="0.9-2"; sha256="0bi69s4bxdqfkjg7ldg41a72vsvqi6ipzqhfbk5jhj7avfa990b9"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
+  model4you = derive2 { name="model4you"; version="0.9-3"; sha256="03s87dklil69znflny9vcl934yisfb13d0gdk94279cb4hb693c0"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
   modelObj = derive2 { name="modelObj"; version="3.0"; sha256="0wc67zsh26zyr7x9s229g2mppfk6g6z12j74zj2bdhk2m7i2x3zq"; depends=[]; };
   modeldb = derive2 { name="modeldb"; version="0.1.0"; sha256="1pb9vnviz0sy9cz2jns34j7fwadi0j250smixr840hjjvvgxyzwf"; depends=[dplyr ggplot2 progress purrr readr rlang tibble tidyr]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
-  modelgrid = derive2 { name="modelgrid"; version="1.1.0.0"; sha256="0ljqdr479rv0glpf5grmx23f9g6dmc62pps47wdr89ja0iv7abp9"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; };
+  modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; };
   modelr = derive2 { name="modelr"; version="0.1.2"; sha256="09whg3q5xq6csbqwgwfwav09vda8vgady5j70sk52xcn232k363a"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; };
   modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; };
   moderndive = derive2 { name="moderndive"; version="0.2.0"; sha256="165dll1bkjmd949mwy165hrz22ajbkn3ap5l8f8pqwksw78rsgqb"; depends=[assertive broom dplyr formula_tools infer janitor knitr magrittr rlang stringr tibble]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
   modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; };
-  modifiedmk = derive2 { name="modifiedmk"; version="1.1.0"; sha256="08nyn1rh28rs9wpz9jvi4pyrhrlh4qaklkx4za0h027lv3086ja3"; depends=[boot]; };
+  modesto = derive2 { name="modesto"; version="0.1.1"; sha256="13vvncimrjcypghd02jx8wjrhgvdw2nr1gmdyayqj2n4y2vn60fb"; depends=[markovchain]; };
+  modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; };
+  modifiedmk = derive2 { name="modifiedmk"; version="1.2.0"; sha256="1cwflvfcihl5i5w6f31llnsyrffzwf4s31yqsrdwp7mzg5xi0liw"; depends=[boot]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
   modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; };
   modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; };
@@ -9081,7 +9232,7 @@ in with self; {
   mombf = derive2 { name="mombf"; version="2.1.2"; sha256="1lbg91ih8djxv8brwzwpxwzpbnhl7p3rj585kagykknknq5r6csj"; depends=[mclust mgcv mvtnorm ncvreg survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
-  momentuHMM = derive2 { name="momentuHMM"; version="1.4.2"; sha256="02ia80h78msgb4c474h47cbd8n0j3bfrjcq4wl2937licdzfl43s"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel dplyr foreach geosphere ggmap ggplot2 gstat LaplacesDemon magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
+  momentuHMM = derive2 { name="momentuHMM"; version="1.4.3"; sha256="0kknqlmdq1xnjfgzm0qmx5ka37ga3cg3njd0h4flpvkc9bc9x36p"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel doRNG dplyr foreach geosphere ggmap ggplot2 gstat LaplacesDemon magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
   mongolite = derive2 { name="mongolite"; version="2.0"; sha256="1icbxsnrah9dxcn1rf678853g8whdj41pj3zwv8kl61vjrg8r6rn"; depends=[jsonlite mime openssl]; };
@@ -9099,7 +9250,7 @@ in with self; {
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
   morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; };
-  morse = derive2 { name="morse"; version="3.1.1"; sha256="0j0h8jx3mx20dfdzzkn48amq5fc6mdfkb06fznqbyxrahdgwj5wg"; depends=[coda dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
+  morse = derive2 { name="morse"; version="3.2.0"; sha256="18rr17p2r1b2w2vah77kv3v4fj1awm9d4pzywp633h6qi1fk5ivc"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
   mortAAR = derive2 { name="mortAAR"; version="1.0.1"; sha256="1dgxx5sh0nskzbigr8yq389lsnalp45d6m92q6g07jpqm7nzbazd"; depends=[magrittr Rdpack reshape2]; };
   mosaic = derive2 { name="mosaic"; version="1.4.0"; sha256="10jbrg8kli00kfgbh2f67bymm5cnlancc9dplb1j7fl552yjddn2"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; };
   mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; };
@@ -9115,7 +9266,7 @@ in with self; {
   movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; };
   move = derive2 { name="move"; version="3.1.0"; sha256="0f5h5apwhp2z4ya8mkiflqfp46kmhfdr4zssi3rpkyl615d3dz9z"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
   moveHMM = derive2 { name="moveHMM"; version="1.6"; sha256="1wz8yg87rxkq70hnahv1jd027938vl9g4wr9zvnq24vwc7hzdafz"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; };
-  moveVis = derive2 { name="moveVis"; version="0.9.8"; sha256="0dvspbivmw7h9safhwl5cm435617ir9xig07vng57lmiwkjlfm3v"; depends=[dismo geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis RStoolbox simecol sp zoo]; };
+  moveVis = derive2 { name="moveVis"; version="0.9.9"; sha256="1kq42swcm3gb7aiyw8j1rfk2mbgwiz5c44rcz2mbxgs6mac1fj1f"; depends=[geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis rosm RStoolbox simecol sp zoo]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; };
   movecost = derive2 { name="movecost"; version="0.1"; sha256="0h1xc5985r696lvwqncxd6blvzxzrgsw27wcw8cllg92yfzjnwks"; depends=[gdistance raster rgdal rgeos sp]; };
   mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; };
@@ -9158,7 +9309,7 @@ in with self; {
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
   mschart = derive2 { name="mschart"; version="0.2.3"; sha256="0lq2hhbwy3hycbvzhrhny7jk5cc4iq89a4mff5q2jjfff13vmm6g"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
-  mscstts = derive2 { name="mscstts"; version="0.3.0"; sha256="1fl3s5hhqkh7paaafm2dy4066g3p3rqcjmbxlsq4v60l3x448p5p"; depends=[httr jsonlite]; };
+  mscstts = derive2 { name="mscstts"; version="0.4.0"; sha256="1gcykwnc9m3cjd0jwxmjlb4nxasaz70il2xfkr5hyxr73qkl2q7r"; depends=[httr jsonlite]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
   msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; };
@@ -9189,8 +9340,9 @@ in with self; {
   muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
-  mudata2 = derive2 { name="mudata2"; version="1.0.3"; sha256="14nzi90gglq2dzwdq2bkpnwiz5fdfsf987ailii0c77xkd6j98jm"; depends=[dplyr ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; };
-  mudfold = derive2 { name="mudfold"; version="1.1.0"; sha256="0mp25lad79dx2101srarx26my172jbkd6a0bzr87hjdgqr1pys5b"; depends=[ggplot2 gtools reshape2 yesno zoo]; };
+  mudata2 = derive2 { name="mudata2"; version="1.0.4"; sha256="1lln2kc163bnwkslr6mhjjp14f92ml50558xxlmdkf8839azlra3"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; };
+  mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; };
+  mudfold = derive2 { name="mudfold"; version="1.1.1"; sha256="1lxlzzjvjqyivc8g8z6f8s0zkxf0k6mi76y5zm36r1kalhxyhkdy"; depends=[boot ggplot2 gtools reshape2 zoo]; };
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
@@ -9200,11 +9352,12 @@ in with self; {
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; };
   multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; };
-  multiApply = derive2 { name="multiApply"; version="1.0.0"; sha256="1hlrh5v52ym226dg4by0hxbkbpv4qsmmbaraxiyywsmwh3nx2fw8"; depends=[abind doParallel foreach plyr]; };
+  multiApply = derive2 { name="multiApply"; version="2.0.1"; sha256="0kdbv76kp03cwh1fhgf2llkql8z0zlqqzwb6khywclm6y9dwd7n6"; depends=[doParallel foreach plyr]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
   multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
   multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
+  multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; };
   multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; };
   multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
   multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
@@ -9222,9 +9375,9 @@ in with self; {
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
   multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
-  multimode = derive2 { name="multimode"; version="1.3"; sha256="130sh1r92z7415j4liz7ka1lpq0b5dxwqdh8s2lnd0wyjz8ysh3k"; depends=[diptest ks rootSolve]; };
+  multimode = derive2 { name="multimode"; version="1.4"; sha256="142k2jbi6y9aaqz9cwl4wk2m1y1n1fgvk873nk3psdv2h6r77slx"; depends=[diptest ks rootSolve]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-  multinet = derive2 { name="multinet"; version="1.1.5"; sha256="15zwwksyfacvlkwrbslr2rz108xb1qmq37r6zxk022hi9gkh4mnz"; depends=[igraph Rcpp]; };
+  multinet = derive2 { name="multinet"; version="2.0.0"; sha256="1v1m7aaqiqam9yzi3w9q49962d831bj4wyl5klsch47i4dar541r"; depends=[igraph Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.1"; sha256="00h1nqi49mix5rxp39i46pimmr3rl0c2869g7ss8cy0kl8hl41hz"; depends=[igraph igraphdata Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
   multipanelfigure = derive2 { name="multipanelfigure"; version="2.0.0"; sha256="0p9dipwkqfrfdd50s002byhwrdbzwp7nj1bswf8anpzvqnd8iz1a"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; };
@@ -9284,7 +9437,7 @@ in with self; {
   mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
   mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-  mvord = derive2 { name="mvord"; version="0.3.2"; sha256="0gpm7biwmvimsv7zcc8h8gmzl6f1n52gx68cmz2ppz0d1fv0w8sb"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
+  mvord = derive2 { name="mvord"; version="0.3.3"; sha256="1bpm9fic5adl86c9vbix0vpyjqbd871zhl0ccaydlw2wsrx79ynq"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; };
   mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; };
   mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
   mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
@@ -9305,6 +9458,7 @@ in with self; {
   n1qn1 = derive2 { name="n1qn1"; version="6.0.1-3"; sha256="1k13x4h2rbcra3b8873ymvn4bgj6psaw05ba0hac0spymbp01fzi"; depends=[Rcpp RcppArmadillo]; };
   nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; };
   nCal = derive2 { name="nCal"; version="2018.8-20"; sha256="1idgpzivw5wa423z86rf60ri50cyh8p38p4r493i9b2m9qzzqf1x"; depends=[drc gdata gWidgets kyotil]; };
+  nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
   nLTT = derive2 { name="nLTT"; version="1.4"; sha256="0718r93xw8hw639xpa5w6lax7agr2k3avqx9dcdybqdp19x9qia0"; depends=[ape coda deSolve testit]; };
@@ -9315,9 +9469,10 @@ in with self; {
   naivebayes = derive2 { name="naivebayes"; version="0.9.2"; sha256="0xmgcvvhfh7v8afi8fywaldawbx3s5hwgpvyyp2c9m6nrhw1kknl"; depends=[]; };
   naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; };
   namedCapture = derive2 { name="namedCapture"; version="2017.06.01"; sha256="14zimn3wbavbkwra8vfmqdm1q5bmlmsbg0b29cjly5dd4zlfzzb0"; depends=[]; };
+  namer = derive2 { name="namer"; version="0.1.3"; sha256="1wsv5g50vamcz5fnbycmsjak64iyy62wl3cx8b1fjlxzlmczxfcn"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nandb = derive2 { name="nandb"; version="1.0.1"; sha256="1hg6j8sv2fhaqwp2hzkgdwfymr2f3j6506vz2kshj3h3387nfhm4"; depends=[autothresholdr checkmate detrendr dplyr filesstrings ijtiff magrittr MASS purrr Rcpp rlang stringr]; };
-  naniar = derive2 { name="naniar"; version="0.4.0.0"; sha256="0b8hi00x6anlkkpw7mr6hiizpw6ljv3m5h9w6c4rj05psv5nm3w2"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
+  nandb = derive2 { name="nandb"; version="2.0.0"; sha256="0kdgljdgy84hhzrn8vab8bga2k5yg7fsy669sw5dhnsz4yjs8c0f"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr MASS purrr Rcpp reshape2 rlang stringr viridis]; };
+  naniar = derive2 { name="naniar"; version="0.4.1"; sha256="18s0yf1zsv89a22z4dyf08bh75s910ryc0s2l5jpc4rlfr72zdlk"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanotime = derive2 { name="nanotime"; version="0.2.3"; sha256="0pcz49rm9l97xj5s7pvff2mf9373xhj0wr8bc57ibbi38adgcvbx"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
@@ -9347,7 +9502,7 @@ in with self; {
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   ncmeta = derive2 { name="ncmeta"; version="0.0.3"; sha256="14gbl7ln5ylplj12rsksyw0wlimh1gjnjm1c26mc8yg2h1cv3667"; depends=[dplyr rlang RNetCDF tibble]; };
   ncodeR = derive2 { name="ncodeR"; version="0.1.2"; sha256="1wa87shdcngf6x22gcysylkxvj8h2k6f88r867wiagz0c01mq9bf"; depends=[cli R6 rhoR]; };
-  ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; };
+  ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; };
   ncvreg = derive2 { name="ncvreg"; version="3.11-0"; sha256="0348xngd9357x3nzhpqbcxcp1vgb5ycz8wjv023lm9lmzyj8frzc"; depends=[]; };
   ndjson = derive2 { name="ndjson"; version="0.7.0"; sha256="1hqbp5aii3x2yygsy4zfv3j2zl78fzrydqj3ycfl3k3nnrkrf8h5"; depends=[data_table dplyr dtplyr Rcpp]; };
   ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; };
@@ -9361,6 +9516,7 @@ in with self; {
   negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; };
   neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; };
+  neonUtilities = derive2 { name="neonUtilities"; version="1.0.1"; sha256="1qgyv96xna84fxh6cplz160xrnrca15nvj8rz1i7zdxm8g4gcxjp"; depends=[data_table devtools downloader dplyr gdata httr jsonlite]; };
   neotoma = derive2 { name="neotoma"; version="1.7.2"; sha256="0kxx1ymdy2grjmi7wb2lrk5hwrfgrlxpvhwwwkwxaqrpxmx6sk7v"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
   nesRdata = derive2 { name="nesRdata"; version="0.2.0"; sha256="1cr5d600bnslxbm2kknzwivvb4zyfsrf8rbrk3kk0j6dpclx5x6s"; depends=[dataone dplyr purrr rappdirs readr]; };
@@ -9368,7 +9524,7 @@ in with self; {
   nestfs = derive2 { name="nestfs"; version="0.9"; sha256="0vx6bvm4wpx4hnyxnldvkj0il7j7hlrmlpiza1dawqr3kx08c86l"; depends=[dgof foreach pROC]; };
   net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; };
   netCoin = derive2 { name="netCoin"; version="0.3.0"; sha256="1lzzl28q3ald01yaxiiwqj716cpslya8i2m89nydpylh0c1pgs52"; depends=[haven igraph Matrix]; };
-  netSEM = derive2 { name="netSEM"; version="0.5.0"; sha256="0gcs38r3xwwcxhgs1xfbkccz9k0y7dk5kky48fvmys8v1p4rsjpp"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
+  netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
   netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; };
   netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; };
@@ -9395,7 +9551,7 @@ in with self; {
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; };
-  neurobase = derive2 { name="neurobase"; version="1.26.1"; sha256="0fb2cvh3j650zjx7b60jfrvm5i7n3l98wis91bmyr9hx3qz24rj5"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
+  neurobase = derive2 { name="neurobase"; version="1.27.6"; sha256="1m52yk1wdn65cbxbd2cbn38px0qh4z3cl8h6r63k2jd4asvk4wvf"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
   neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
@@ -9407,7 +9563,7 @@ in with self; {
   ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; };
   ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; };
   ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; };
-  ngstk = derive2 { name="ngstk"; version="0.2.1"; sha256="12zpl20i07d1f9navs9jjrialfh798wrfn1241j7s9h3rd6xi40l"; depends=[configr data_table stringr]; };
+  ngstk = derive2 { name="ngstk"; version="0.2.3"; sha256="0196hnbqw9bji3bl2phjs9z5n84x5fs7iiirfd6gjyqv9xlfwd2p"; depends=[configr data_table future optparse stringi stringr]; };
   nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; };
   nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; };
@@ -9457,17 +9613,16 @@ in with self; {
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
   nnTensor = derive2 { name="nnTensor"; version="0.99.4"; sha256="1z5dafcnj9cnslxljij5ycmzagvvp27z8b7p6i3hz134z4vbx5jb"; depends=[fields plot3D rTensor tagcloud]; };
   nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; };
-  nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnfor = derive2 { name="nnfor"; version="0.9.2"; sha256="1wxv8s5547spw155rj7nlilsfn5d7m40xpfy87mady93n25pwm3d"; depends=[forecast glmnet MASS neuralnet plotrix]; };
-  nngeo = derive2 { name="nngeo"; version="0.2.2"; sha256="0wjbw1b0ldsl28k3k8i6x0f9msv4a2wwgbvb0wshq0kk0yamanpz"; depends=[geosphere lwgeom RANN Rcpp sf sp units]; };
+  nngeo = derive2 { name="nngeo"; version="0.2.4"; sha256="0yfspirrrcz50ry0k66a6icmvsv07rdgxz8s8cp9zsxxqj0jad6g"; depends=[lwgeom RANN Rcpp sf sp units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; };
   nodbi = derive2 { name="nodbi"; version="0.1.0"; sha256="0i82713yhasl5n5zdncpsfplvfm77dvxjvhb4vvlsnfwk364gadf"; depends=[data_table jsonlite]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.2.0"; sha256="0bdhlq5nd169hbwnik4z843xzh5bbmahrvyxj54626zxyvf1fmfb"; depends=[ape picante raster sp vegan]; };
+  nodiv = derive2 { name="nodiv"; version="1.3.0"; sha256="1z0xqdfplg5rz94qcnks435md3q7jpd5f32jfm0pqnyr3536gs03"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
@@ -9505,9 +9660,10 @@ in with self; {
   not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
-  nowcasting = derive2 { name="nowcasting"; version="0.1.3"; sha256="1b74rqz7y4g5zyrbmns27v60jpv13s5aax9dyiyvnk2y7ng1kp5x"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; };
+  nowcasting = derive2 { name="nowcasting"; version="1.0.0"; sha256="19hg0vczzx2d7sd36sbxgl4i3p1i0f43l84viz7chkvj3wr8n99k"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; };
+  npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; };
   npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
   npROCRegression = derive2 { name="npROCRegression"; version="1.0-5"; sha256="09ngfj0bd9cp19lpwsbknp2y71x36k03ph84bmf67wm1q2na7f93"; depends=[lattice]; };
   nparACT = derive2 { name="nparACT"; version="0.8"; sha256="0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b"; depends=[ggplot2 stringr zoo]; };
@@ -9524,11 +9680,12 @@ in with self; {
   npmlreg = derive2 { name="npmlreg"; version="0.46-5"; sha256="1f0bzccmral2y56aih37gmi6mjww6wmp2a8z6yxm501fgj2lgzfc"; depends=[statmod]; };
   npmr = derive2 { name="npmr"; version="1.1"; sha256="1ss8ypvv6qcdxv7l3szivliwmhidmzi3572p3nz96ysndf56akl4"; depends=[]; };
   npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; };
+  npordtests = derive2 { name="npordtests"; version="1.1"; sha256="1g8s9nmqqawq65hvpg82c78l3ffsih057665hw98mkipqb9r0vs5"; depends=[]; };
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
   npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
   nprobust = derive2 { name="nprobust"; version="0.1.3"; sha256="1zr89myhamcxzk7j04rxcc4mbi86pf09kl70p8niklm0b3wmsjzj"; depends=[ggplot2 Rcpp RcppArmadillo]; };
-  nproc = derive2 { name="nproc"; version="2.1.1"; sha256="0wpny7c1n9mmv1yywlws8gjbidkrikvcqcckrxpba9avjw2c5df8"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
+  nproc = derive2 { name="nproc"; version="2.1.4"; sha256="1gj38yppip0ygxcgp0x9ba9kpr12ahmz2k0956x3h7py2rl8b098"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; };
   npsf = derive2 { name="npsf"; version="0.4.1"; sha256="0vl02ysfmbxfzzbrjhiz8j129waz9cnpmds978fmv08l6wsjr3mi"; depends=[Formula Rcpp]; };
   npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; };
@@ -9556,7 +9713,7 @@ in with self; {
   numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; };
   numbers = derive2 { name="numbers"; version="0.7-1"; sha256="1k5a24pnjhn3h330q0s7ivk2v5dsjmg2xwlhfinzixihnwhc12xy"; depends=[]; };
   numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; };
-  numform = derive2 { name="numform"; version="0.4.0"; sha256="09vim4ajnnkdf27ag5j8pj7p8qyfakfh3ar1dki8bqzms2d7bkcm"; depends=[]; };
+  numform = derive2 { name="numform"; version="0.5.0"; sha256="1c9vhzm4rjh8b5bkzkv1r9j2y1iqndq9ndandix28wdgn2v6lzv6"; depends=[glue]; };
   nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
@@ -9569,6 +9726,7 @@ in with self; {
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; };
+  oak = derive2 { name="oak"; version="0.2.1"; sha256="0h8whlnbb8d2hnf6cyy5am0wrf48xhkbm71fqqqsc412iycl181q"; depends=[bazar foreach purrr R6 rlist rstudioapi]; };
   oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; };
   oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; };
@@ -9577,6 +9735,7 @@ in with self; {
   objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
   obliclus = derive2 { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; };
   obliqueRF = derive2 { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; };
+  obliqueRSF = derive2 { name="obliqueRSF"; version="0.1.0"; sha256="0i19xg13py9h9dpj74c5l4kz38x0cjni577al4x3w689nsddya44"; depends=[data_table dplyr ggplot2 ggthemes glmnet missForest pec prodlim purrr Rcpp RcppArmadillo rlang scales survival tidyr]; };
   obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; };
   obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
@@ -9595,17 +9754,16 @@ in with self; {
   odpc = derive2 { name="odpc"; version="2.0.0"; sha256="1lpd7x2vq8qdgf0nag0sqzf1jpbig52zr3glk17n7cl50v2m19ii"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; };
   odr = derive2 { name="odr"; version="1.0.0"; sha256="0niadinljx5pph329dgixivdc9s1l27ik9755fbfhmplhj92ihi2"; depends=[]; };
   oec = derive2 { name="oec"; version="2.7.8"; sha256="0qi5xkyh5xgwcivihnc9wv96lzhdzlcz4zv08pvpxf7dx1qhafrj"; depends=[curl dplyr jsonlite magrittr purrr readr rlang stringr]; };
-  oem = derive2 { name="oem"; version="2.0.8"; sha256="08j9y9vq31skvdpg0kyqj50d77aijd2d95vcwm92df5vcvw9bpwz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
+  oem = derive2 { name="oem"; version="2.0.9"; sha256="1ffv71cwf58wrba3zhyp443kfl0j3z451mgxsxl8ig5fn9y9i9ca"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
   ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; };
   officer = derive2 { name="officer"; version="0.3.2"; sha256="14b6ii9h3fi5g8ja929mfhxps9r7x78flqjdy437y9aygkhmiz2i"; depends=[base64enc digest htmltools magrittr R6 Rcpp uuid xml2 zip]; };
   oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; };
   ohtadstats = derive2 { name="ohtadstats"; version="2.0.0"; sha256="0vi0hi90l8p80kf0769iidlaq9j11myhxrj41lvxr70q4h4slr8j"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
-  ojUtils = derive2 { name="ojUtils"; version="0.1.0"; sha256="0q1w99wfahi8n2278njbxk3qn3xd6q2rhqr7afc904x9xpxadazc"; depends=[Rcpp testthat]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
   olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; };
-  olsrr = derive2 { name="olsrr"; version="0.5.1"; sha256="1kwscd1gxh1r3bsjmaanrm8jsi9gjggqmg629nmmlkx2ql5qcgja"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
+  olsrr = derive2 { name="olsrr"; version="0.5.2"; sha256="13qampcc07qfjj4r3ira0m1j2wgnrkf5p1wswr9g814azhm52haz"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
   ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; };
@@ -9625,20 +9783,20 @@ in with self; {
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
   oompaBase = derive2 { name="oompaBase"; version="3.2.6"; sha256="0lighs2546nyhpgbjsn4k53c7jw6xyla5b82v8jp3l1sqxj68a3s"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  openCR = derive2 { name="openCR"; version="1.2.0"; sha256="1wz31rnvdz1s253krf423ipkmfsxia66d5adnbyp3r59mc48yh1k"; depends=[abind MASS nlme plyr R2ucare Rcpp RcppParallel secr stringr]; };
+  openCR = derive2 { name="openCR"; version="1.3.2"; sha256="0f5m3gnx0x8vqcdzvjrmlv2f1vcq7c760bv7xkcxksjqhwwgjisa"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; };
   openEBGM = derive2 { name="openEBGM"; version="0.7.0"; sha256="1a4jcc15995id2fh22v18f1wrwlknfx3mlh6chjl0b93z60aad6k"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; };
   openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; };
   openVA = derive2 { name="openVA"; version="1.0.7"; sha256="1hv0i2h9vw2l4gzsz31apc1w7k8rkrr5szxzfxhznchyv0sr9625"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 purrr Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.5-0"; sha256="1zsgqzp5rpyg4jr0vqk5jn1p0lba2lagsvw6idnwb1kjw82y82fd"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
+  openair = derive2 { name="openair"; version="2.6-1"; sha256="0axym9jssh3fdb83mny54ry76z778sjmyvi851g3pg346fpfcxql"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
-  opencpu = derive2 { name="opencpu"; version="2.0.8"; sha256="1x5z1galq8m45fr2jnik4gx28gn2cdwaj2871c7cx5rang6rv1jp"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
+  opencpu = derive2 { name="opencpu"; version="2.1"; sha256="1w4lqvzn05v3qkxzd22mcsmkk5n1472yc58vyvlfg6vxml0nykry"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sendmailR sys webutils zip]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
   openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; };
   opensensmapr = derive2 { name="opensensmapr"; version="0.5.0"; sha256="0bv03p2fprgkqg2vm6ydqi5wjswkjlxwwmkk3r6lq2m4xq909d4r"; depends=[digest dplyr httr lazyeval magrittr purrr readr]; };
-  openssl = derive2 { name="openssl"; version="1.0.2"; sha256="1djfpnphkcxx8idk5rjfzg8r8dnqsgc0shh2pw8lns5hap2wc5rc"; depends=[]; };
+  openssl = derive2 { name="openssl"; version="1.1"; sha256="0ldxgcr33lawwr8wp14kdk2678gpkvqkzv6g333bhck1hn6qspzv"; depends=[]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
   openxlsx = derive2 { name="openxlsx"; version="4.1.0"; sha256="1n7z22pm78xa77fvn77kdn68az6xzxk36y11sqf0w6h6adri4yxb"; depends=[Rcpp zip]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
@@ -9668,7 +9826,8 @@ in with self; {
   optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; };
   optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; };
   optimx = derive2 { name="optimx"; version="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; };
-  optional = derive2 { name="optional"; version="1.1"; sha256="13ajzybylw0q0x6yy6i8qr6l1ar53cyl708zgqaqaj0lkj183zhz"; depends=[magrittr]; };
+  optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; };
+  optionstrat = derive2 { name="optionstrat"; version="1.0.0"; sha256="062mb1d0gy0sglmz6gabhx78d9drbg4j5aj4fs4q0gnzqjrbgaaf"; depends=[]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
   optmatch = derive2 { name="optmatch"; version="0.9-10"; sha256="1jnvk9r7jc8w5rg8xvhbhj0wmy0l1hhjm8iwyf703939p4xc5z71"; depends=[digest Rcpp RItools survival]; };
@@ -9691,11 +9850,12 @@ in with self; {
   orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
   orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
   orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
+  ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; };
   orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; };
   ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
   ordinal = derive2 { name="ordinal"; version="2018.8-25"; sha256="03cv9hcrw8j3lhamzhz8sk2p3ns4cw9z41x49h301k2b3pajv43h"; depends=[MASS Matrix numDeriv ucminf]; };
   ordinalClust = derive2 { name="ordinalClust"; version="1.3.1"; sha256="10wk2brp8a3k1pjsl7wify4ki59ad4vbpqgmbi5va99hfnywz5ml"; depends=[Rcpp RcppArmadillo RcppProgress]; };
-  ordinalCont = derive2 { name="ordinalCont"; version="1.3.0"; sha256="0zi9cfvkb811hhcplp159zpnmmk4rs0nid19gi4g9g3dgn9pa296"; depends=[boot]; };
+  ordinalCont = derive2 { name="ordinalCont"; version="2.0.0"; sha256="17n04v182nxzkhvlgyasl7lfy8ggwkijsvyykdsdd9ii1vaw3l7s"; depends=[boot Deriv]; };
   ordinalForest = derive2 { name="ordinalForest"; version="2.2"; sha256="1cfcdk7nndw7z1shq966pdk6448hdvfqc6c1z4fwrrlkp75gnjr5"; depends=[combinat ggplot2 nnet Rcpp]; };
   ordinalNet = derive2 { name="ordinalNet"; version="2.5"; sha256="1lx8jacidb6irwb2mwsc75dy90fnvrpgwcg8s2wzkvql1lasc6wy"; depends=[]; };
   ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; };
@@ -9740,9 +9900,9 @@ in with self; {
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
   overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; };
-  overlapping = derive2 { name="overlapping"; version="1.5.0"; sha256="1xqpkyxpdzcvq7s2hzkbnfddffjfs1xrxhrkvl5i4qv1czdsphjn"; depends=[ggplot2]; };
+  overlapping = derive2 { name="overlapping"; version="1.5.1"; sha256="1any3f910c0aj4h19iam2qmzds6hfq619bdx1q5vhycmz9xragib"; depends=[ggplot2 testthat]; };
   overlapptest = derive2 { name="overlapptest"; version="1.0"; sha256="1p5xbqbl1kpvx7rjb335k7hfc8i9b13p2r2rr6rrjfa8zs74smml"; depends=[spatstat]; };
-  owmr = derive2 { name="owmr"; version="0.7.2"; sha256="0206i5zzmfjdd43qziis6kqc0zsvn0l7v5sspjrywjxw2gyjfmwb"; depends=[httr jsonlite magrittr]; };
+  owmr = derive2 { name="owmr"; version="0.8.1"; sha256="11krzrkr1ga41nv9c2fb8cb2mgy3ias7qx85d4cdv4k68lsksv18"; depends=[httr jsonlite magrittr plyr tibble tidyr]; };
   ows4R = derive2 { name="ows4R"; version="0.1-0"; sha256="1a27h63spy46ms7fgh2vl659znp5g55d1hsk6py6lgfa6hc2f1dx"; depends=[geometa httr openssl R6 rgdal sf XML]; };
   oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; };
   oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
@@ -9770,7 +9930,7 @@ in with self; {
   packagefinder = derive2 { name="packagefinder"; version="0.0.7"; sha256="030s8r2k0q3vls6vndmdz8a45kqrqx9whqvrcbh3f6xgy1vhs1hs"; depends=[formattable httr jsonlite pander stringr]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
   packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; };
-  packrat = derive2 { name="packrat"; version="0.4.9-3"; sha256="0d42x4qvz9hs7s5sl2lhklsdc8imrnp2k800xdagrpjilww9jac7"; depends=[]; };
+  packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.5.0"; sha256="0gb0fsm8rm81j22q93fqx8q6zgjq3w1pv791ac0smc1a45blfab1"; depends=[remotes]; };
   paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; };
   pacotest = derive2 { name="pacotest"; version="0.3"; sha256="135637bidfx71xay6c69lfjvr4i0v3ckgkg0fi838p24is6icbix"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
@@ -9798,16 +9958,17 @@ in with self; {
   paletteer = derive2 { name="paletteer"; version="0.1.0"; sha256="02d0k74bxdjphw34v4vvnc2dd04cvm9y6m0x8ngfhqmgv4nfsjx9"; depends=[ggthemes jcolors oompaBase palr pals rlang scico viridisLite]; };
   palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; };
   palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; };
-  palm = derive2 { name="palm"; version="1.1.1"; sha256="1fbc5ri5k152ww3cajjjclcas22mfvypfn3hdpkkmf307lvjaja3"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; };
+  palm = derive2 { name="palm"; version="1.1.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; };
   palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; };
   palr = derive2 { name="palr"; version="0.0.6"; sha256="163c0kcsl0k3fp5q9afv3pb8246j2b3jzmd6g2vcgxb8nhs8wr2f"; depends=[]; };
   pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; depends=[colorspace dichromat mapproj maps rgl]; };
   pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; };
   pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
+  pammtools = derive2 { name="pammtools"; version="0.1.7"; sha256="145s29gv3f0y9lp3pma2bbpfwq5rhamz79spcbg193l1m7q7ch55"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; };
-  pander = derive2 { name="pander"; version="0.6.2"; sha256="0gd7rqkpbraznip8jmri9lqa8ajg1sryyplhd6m633wg91whiipi"; depends=[digest Rcpp]; };
+  pander = derive2 { name="pander"; version="0.6.3"; sha256="1bd9sdghlsppmff18k5fg3i0visq9f4wc82rlhwq5m82bmgdgnyi"; depends=[digest Rcpp]; };
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelView = derive2 { name="panelView"; version="1.0.5"; sha256="1hmb311qimm60l9zvk0nkgh4qy2givm8a8rdmmpfb9bfbbg6clks"; depends=[ggplot2 gridExtra]; };
@@ -9831,15 +9992,17 @@ in with self; {
   paran = derive2 { name="paran"; version="1.5.2"; sha256="0d9la83mxfpfgdfrqa40ck5fcp3j2b70d8c8nl9wmdsgvgqrl23s"; depends=[MASS]; };
   parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
-  parfm = derive2 { name="parfm"; version="2.7.5"; sha256="1wnklksqybhaqwsfifwv8gmqjl6g9dm9s4z131mbjn4dm7bj1bra"; depends=[msm optimx sn survival]; };
+  parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; };
   parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
+  parglm = derive2 { name="parglm"; version="0.1.0"; sha256="1igj89izhn115r18gprbhr00lzyi7a7164mqs8378gh6ch5mlv5n"; depends=[Matrix Rcpp RcppArmadillo]; };
   parlitools = derive2 { name="parlitools"; version="0.2.1"; sha256="14nzcbjddwnsiwwksl7bf2qk1kzzcnjc0b47ilqiq4nc4c386im3"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; };
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
-  parmsurvfit = derive2 { name="parmsurvfit"; version="0.0.1"; sha256="0sgs2gk2592ly2jkvfnhjcwfxhhwk7758hfnxi6id83aca6l52wm"; depends=[fitdistrplus flexsurv ggplot2]; };
-  parsec = derive2 { name="parsec"; version="1.2.0"; sha256="0ilc9d6kv7zb0kwhpqqi3bjx3r1cihyfamphrw83p6zy3xhfmfs6"; depends=[igraph]; };
+  parmsurvfit = derive2 { name="parmsurvfit"; version="0.1.0"; sha256="0d3614q76dw3f7y9p8378hdny7bz5fymma5l0zpygr1cfnacdhh6"; depends=[fitdistrplus flexsurv ggplot2]; };
+  parsec = derive2 { name="parsec"; version="1.2.1"; sha256="0bdhpq5xx0318yyk1c0a5bi32ylvq7wr0d7gdf0z0czl2060r0na"; depends=[igraph]; };
   parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
+  parsnip = derive2 { name="parsnip"; version="0.0.1"; sha256="00ddfv5lqkk5klb7p0xxna0l02rc4ibir5z82i0b6n6n9smv8f3h"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
   partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; };
   partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
@@ -9865,13 +10028,13 @@ in with self; {
   patentsview = derive2 { name="patentsview"; version="0.2.1"; sha256="104qq6cqvfk5m2yynpg5iwlp89y5qx18m20qp343mknxjbvqpjdg"; depends=[httr jsonlite]; };
   pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
-  pathfindR = derive2 { name="pathfindR"; version="1.2.3"; sha256="13n8jjzffhr0w7m0h23c16ayd8069ficsx6z98z459805ikzwv9y"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 knitr org_Hs_eg_db pathview rmarkdown shiny]; };
+  pathfindR = derive2 { name="pathfindR"; version="1.3.0"; sha256="1pljw5pz6g1jpk92smbmzwgwx7p3jvjyvr7fciajay39gfvj7fd5"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 igraph knitr org_Hs_eg_db pathview rmarkdown]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
   pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
   pathological = derive2 { name="pathological"; version="0.1-2"; sha256="07g7ps6zfxi98y98kwas95rr5ybfd4bpih5mhkjafc7bn99254n2"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_reflection assertive_strings assertive_types magrittr plyr stringi]; };
   patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; };
   patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; };
-  patternize = derive2 { name="patternize"; version="0.0.1"; sha256="0xmz7ca555275a4x89vdmyk9x3m3sk964iwspv0dnxsmx5s1xmz7"; depends=[abind Morpho raster rgdal RNiftyReg sp]; };
+  patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; };
   patternplot = derive2 { name="patternplot"; version="0.2.1"; sha256="0ixb9x32fciwxwxnna47z9jb6s1zf3d9jqfiwvv4slaygi2cgydr"; depends=[dplyr ggplot2 gtable jpeg png R6 Rcpp RcppParallel]; };
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
   pavo = derive2 { name="pavo"; version="2.0.0"; sha256="1mcrx26lbhldmf1wlkpbpa4ld85wjbvr2kjidzb1hb78lqbv05ad"; depends=[geometry imager mapproj pbmcapply plot3D rcdd sp]; };
@@ -9879,7 +10042,7 @@ in with self; {
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
   pbapply = derive2 { name="pbapply"; version="1.3-4"; sha256="0lk5kxac09xzdv6vf7ix6r5bfrm7cnpyr2l5mkd4igpciadszzfd"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; };
-  pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; depends=[pbdMPI pbdSLAP]; };
+  pbdBASE = derive2 { name="pbdBASE"; version="0.5-0"; sha256="11jlfr0pswldd5h06swfrc8bm785dv09iqgg3kfnc53yvrs0d7qv"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
   pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; };
   pbdMPI = derive2 { name="pbdMPI"; version="0.3-8"; sha256="0yxzldgvjzzw4adsdv6sh3m3n6xlwfh2rmzn6pgppk8s1brbbjli"; depends=[rlecuyer]; };
@@ -9891,9 +10054,10 @@ in with self; {
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
   pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; };
-  pbmcapply = derive2 { name="pbmcapply"; version="1.2.5"; sha256="0bnw1x6p4rq7ckl1i1yqi317dfy24gbd56y1v7m0ycvld6srjh5n"; depends=[future]; };
+  pbmcapply = derive2 { name="pbmcapply"; version="1.3.0"; sha256="1vah4gcayl0ggzfz17b588s4f5fwxb8wrcq07y267kc6prmq1z35"; depends=[future]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
+  pbv = derive2 { name="pbv"; version="0.2-16"; sha256="1jr0xvk56d7qqpj7azw64lidwc3604iw87k7cccswv4yvbihvzzk"; depends=[Rcpp RcppArmadillo]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.3"; sha256="1gr4rij7anvfzbs4pvzhvfl0msbm83qs5n588l4jbraxqynvmkaw"; depends=[combinat Rcpp]; };
   pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
@@ -9915,11 +10079,11 @@ in with self; {
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
   pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; };
-  pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
+  pdR = derive2 { name="pdR"; version="1.6"; sha256="0rdsffbi9fnrrm0vf5mms19rsfxfv177mp1fql0nmmcqjpjn39z8"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.3"; sha256="0kqph8134g1fyzc9b06nighkqsh6jjpckvwxhpslihj5sj3kapdd"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pder = derive2 { name="pder"; version="1.0-0"; sha256="097klk334bjhlss8x73f27l7jcp7d7vh10jr5sazm5kcvi95619i"; depends=[]; };
-  pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
+  pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; };
   pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.2.3"; sha256="1x6ymj6fk7bf2jx1lqryyzksg049ijdvb9syz244y43i7632ls59"; depends=[pdftools tibble tokenizers]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
@@ -9939,10 +10103,11 @@ in with self; {
   pedantics = derive2 { name="pedantics"; version="1.7"; sha256="14hphziwqrq4fkxlvp94j564q19k9fabvhmdz7zhb6cvak6xv1n6"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; };
   pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
+  pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
   pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; };
   pegas = derive2 { name="pegas"; version="0.11"; sha256="0l21bapzbjcvblbvks3jh9rpy9hng1ccd7f0glhqw695lc737bpx"; depends=[adegenet ape]; };
-  pems_utils = derive2 { name="pems.utils"; version="0.2.17.8"; sha256="1qxsjzxb8gdw1hyxgd923s609k98pjdaxs6wm3pg4bl1w8sxqi8d"; depends=[ggplot2 lattice latticeExtra loa plyr RColorBrewer]; };
+  pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
   penalized = derive2 { name="penalized"; version="0.9-51"; sha256="1zcrwa93mc27qj3g4ayc2k895r6g8q0g6qb2azmvj7wqk750va7a"; depends=[Rcpp RcppArmadillo survival]; };
@@ -9973,7 +10138,7 @@ in with self; {
   permutes = derive2 { name="permutes"; version="0.1"; sha256="1m5596l80nyyzassiwb6zd2fnp2jglj5vkp9xsbp28swd0q2wd90"; depends=[ggplot2 lmPerm plyr viridis]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
-  personalized = derive2 { name="personalized"; version="0.2.1"; sha256="0qdbnra2ghz3i5xl4gw8ivalci1mqw0qblxvw3mfp0sbj4hvsssy"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
+  personalized = derive2 { name="personalized"; version="0.2.2"; sha256="094shd28947kfl8p2ckbqn4x4f72b8ni83zjgqk29xrr3rmj5jm6"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
   personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; };
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
   perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
@@ -9984,7 +10149,7 @@ in with self; {
   pez = derive2 { name="pez"; version="1.1-1"; sha256="14n9s604wwh07kjir5kw6sra6bbmnpg00h3zvli3zqd8lx892hm8"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; };
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; };
-  pgbart = derive2 { name="pgbart"; version="0.6.12"; sha256="0ykxdrjwswh6kwrs5f83ifqyf23hgq6q73aidmsh1p9iwaxg429r"; depends=[BayesTree]; };
+  pgbart = derive2 { name="pgbart"; version="0.6.15"; sha256="0nvj541kyj2qdaxjim47ic1bj1xk056cg68bjf3q74qlwvj78rqx"; depends=[BayesTree]; };
   pgdraw = derive2 { name="pgdraw"; version="1.0"; sha256="1ips7wxksk69rgirgmd7aqqdf34qis6692wvn7npyzq9y24gwkmb"; depends=[Rcpp]; };
   pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; };
   pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
@@ -10010,6 +10175,7 @@ in with self; {
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; };
   phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; };
+  phenocamapi = derive2 { name="phenocamapi"; version="0.1.2"; sha256="1244dm8vm291mbx9di32nivmflr97dym9f4wh0ar4ps8g639j6bn"; depends=[data_table RCurl rjson]; };
   phenocamr = derive2 { name="phenocamr"; version="1.1.1"; sha256="1ic0w9rfh0s50b9kzwmcqam51vibq9ji19vkcscz10grdbwjc502"; depends=[changepoint daymetr httr jsonlite shiny zoo]; };
   phenology = derive2 { name="phenology"; version="7.2"; sha256="0p39xihqlcapgsb6j90g9hal1jjrd9fra639hxc5gw4kl8nhlndq"; depends=[HelpersMG lmf numDeriv optimx]; };
   phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
@@ -10023,7 +10189,7 @@ in with self; {
   phonics = derive2 { name="phonics"; version="1.1.0"; sha256="02h26dlhw0hisr2ifa1rkrzw0350pk32mrba7h1rwsh41vxv9sji"; depends=[BH Rcpp]; };
   photobiology = derive2 { name="photobiology"; version="0.9.24"; sha256="10z9bplknis5zp6m5ayggr7pilv0pkbgyl2hs4qfmddby7cfmbsj"; depends=[dplyr lubridate plyr polynom rlang splus2R tibble zoo]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; };
-  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.17-1"; sha256="1m2hjpjciqc1r53qflv7ci2n7jnng11aij8wz91nzi0y0ypics60"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
+  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.18"; sha256="049gfyrhzhy493yhw4nww78fky982k683dlvgk99ya8hlkmwx935"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
   photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; };
@@ -10043,6 +10209,7 @@ in with self; {
   phylobase = derive2 { name="phylobase"; version="0.8.4"; sha256="00hh53ibr7ddck4rl1rz9bpjsvjym040c5f78l1yizv6q9rakhfp"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; };
+  phylocomr = derive2 { name="phylocomr"; version="0.1.2"; sha256="1x5ygzd4rkgxk0pczpjp2g7n98jl48rx560jqyjv0bdvlafy3l83"; depends=[sys tibble]; };
   phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
   phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
@@ -10056,19 +10223,19 @@ in with self; {
   phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; };
   phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; };
   phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; };
-  physiology = derive2 { name="physiology"; version="1.0.1"; sha256="01vza10gfcab8xxq5xszg7yxnsg3cg1x9yhz05jdy34xir7p1jvf"; depends=[Rcpp]; };
+  physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; };
   phytools = derive2 { name="phytools"; version="0.6-60"; sha256="0xxk2r2x81nxsvyggk44fpw3ppfsmmna8lrsy2xpw90da5cxgjjm"; depends=[animation ape clusterGeneration coda combinat expm maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
   picante = derive2 { name="picante"; version="1.7"; sha256="0qhaxxmab3c3qw06kx4swfyiqiiqail5h79aarvffryvh0qdgr3m"; depends=[ape nlme vegan]; };
   picasso = derive2 { name="picasso"; version="1.3.0"; sha256="1s8whczkrxayw6syb4ffgfrxmcflxn31d53bdy9gxzndjd9rpd50"; depends=[MASS Matrix]; };
-  pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
+  pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.0.2"; sha256="07vz90cghkbmcar9ps94wydvg4r7mj32pa7vjdmgm5j8dhxq8max"; depends=[car lme4 MASS nlme pbkrtest]; };
   pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
   piggyback = derive2 { name="piggyback"; version="0.0.8"; sha256="1c17yjqpaj6r6spbhm901dilqpsa2s9jc029vdfmrxdk18fzaf1f"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; };
   pillar = derive2 { name="pillar"; version="1.3.0"; sha256="1q6arybmfqxhp5zqj1fri5pb8v7ywcv7bmgf81rrmgl892p4bn5f"; depends=[cli crayon fansi rlang utf8]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
   pimeta = derive2 { name="pimeta"; version="1.1.1"; sha256="0ylna31x8491q6hppz827ngri0did0bfwy3nlifpagccb2m4psi3"; depends=[Rcpp RcppEigen]; };
-  pinbasic = derive2 { name="pinbasic"; version="1.2.1"; sha256="0ciqqjhbhj1kvf4lkswqi5fc8m32lk2mwhyc96afvjvaig1xv5q8"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
+  pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingers = derive2 { name="pingers"; version="0.1.1"; sha256="09np6aph6rhvdh6mwky8a57i38bi2amwi7x91p9kfb2mzkql8k8w"; depends=[data_table dplyr lubridate plotly reshape2 stringr tibble tictoc tidyselect]; };
   pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
@@ -10084,6 +10251,7 @@ in with self; {
   pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; };
   pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
   piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; };
+  pivmet = derive2 { name="pivmet"; version="0.1.0"; sha256="1911ds6mfw3lp4921g9i6kk27nvj07h770xazr7f40jcmmg6lz69"; depends=[bayesmix cluster MASS mclust mvtnorm RcmdrMisc rjags runjags]; };
   pivot = derive2 { name="pivot"; version="18.4.17"; sha256="0nhf76f2g35cx5f1m00wsy29n6xm2x5wajs5myaasks7hbkk0w3y"; depends=[assertthat colorspace DBI dbplyr dplyr lubridate magrittr purrr rlang tidyr tidyselect]; };
   pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; };
   pivottabler = derive2 { name="pivottabler"; version="1.0.0"; sha256="106q62bfnkmh328kdzshwz8v01pz2qiyxcgmfbn3rc0cd9ml6wyj"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
@@ -10092,16 +10260,20 @@ in with self; {
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; };
   pkgbuild = derive2 { name="pkgbuild"; version="1.0.2"; sha256="1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
+  pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; };
   pkgconfig = derive2 { name="pkgconfig"; version="2.0.2"; sha256="1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"; depends=[]; };
   pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; };
-  pkgdown = derive2 { name="pkgdown"; version="1.1.0"; sha256="0w1f23d600j9s8sa5xq63j2p6pvch8nndcxc63s14szlfjlvmddd"; depends=[callr cli crayon desc devtools digest evaluate fs highlight httr magrittr MASS memoise purrr R6 rematch rlang rmarkdown roxygen2 rsconnect rstudioapi tibble whisker xml2 yaml]; };
-  pkggraph = derive2 { name="pkggraph"; version="0.2.2"; sha256="0pzqlim84b22ahq5yr50ybffqa0f5k5ch372v37nw1ndzci211d8"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
-  pkgload = derive2 { name="pkgload"; version="1.0.1"; sha256="0mm0avvan528zbrcrxigl5fkd7za01fb0qhlqrqvm3ar0115cqa8"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; };
+  pkgdown = derive2 { name="pkgdown"; version="1.3.0"; sha256="1avjd93hnnh1yicx46gnbv8ps0cifg8rrjgvhw03k674gw11mgb7"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl pkgload processx purrr R6 rematch2 rlang rmarkdown roxygen2 rsconnect rstudioapi tibble whisker withr xml2 yaml]; };
+  pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
+  pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; };
-  pkgnet = derive2 { name="pkgnet"; version="0.2.0"; sha256="0rbwpmkphsy51zncy2pv2cnf7v2dpk8gf8qwmbz4iyiq94kqri6f"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; };
+  pkgnet = derive2 { name="pkgnet"; version="0.2.1"; sha256="06a2nyl4cy02k1jnlprxsrkv29ivlnwwswkb2nigrsd5m72isrwf"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; };
+  pkgsearch = derive2 { name="pkgsearch"; version="2.0.1"; sha256="00wi4lym0zjb29qdalgwlbcdxi4k39pxxm6a2qhllfcbgc099mlb"; depends=[httr jsonlite magrittr parsedate prettyunits]; };
+  pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; };
   pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; };
   pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; };
   pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; };
+  pksensi = derive2 { name="pksensi"; version="1.0.0"; sha256="1jysfdd50d1sgnhn31mrcpr5brx0qb97cb6c3kls3jca66i4a6l0"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; };
   plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; };
@@ -10116,15 +10288,17 @@ in with self; {
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
   plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; };
   pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; };
-  pleio = derive2 { name="pleio"; version="1.5"; sha256="1y9nkv5bzfkzbl373405v3xq54nz37wjz9zkxfzl8ggr5i9lcbqy"; depends=[Matrix rms]; };
+  pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; };
   plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; };
   plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; };
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
   plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; };
+  plinkQC = derive2 { name="plinkQC"; version="0.2.0"; sha256="1ydrd6m25rmaii7n1d1p052kmiy3kf7871q838mzb425kxyyyfxv"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel optparse R_utils sys UpSetR]; };
   plm = derive2 { name="plm"; version="1.6-6"; sha256="1a14a8zbqzm2a6z44haa0c23ax9j1jk72dhrkca8q0abbd5lkx85"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme sandwich zoo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
+  plot_matrix = derive2 { name="plot.matrix"; version="1.0"; sha256="1p2xrmwghrl9lirnch5fqlrwiipga96ppbih0sg8939g4szxnbji"; depends=[]; };
   plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
@@ -10137,7 +10311,7 @@ in with self; {
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
   plotly = derive2 { name="plotly"; version="4.8.0"; sha256="19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; };
   plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.1"; sha256="0if4cahihxm0b2k3r0w6qj91mwwsjy5zm289zk6myg65i7ijqly4"; depends=[]; };
-  plotmo = derive2 { name="plotmo"; version="3.5.0"; sha256="14v703ky45sw34iwbqna7f8hylzbnlqm2gnml7avdp2i8ycli8wb"; depends=[plotrix TeachingDemos]; };
+  plotmo = derive2 { name="plotmo"; version="3.5.1"; sha256="0anrhci6l27k32c7gh1flwsnvdq062p2kcak0mr5dm7jaisl7a1a"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
   plotrix = derive2 { name="plotrix"; version="3.7-4"; sha256="1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"; depends=[]; };
@@ -10160,12 +10334,14 @@ in with self; {
   plumber = derive2 { name="plumber"; version="0.4.6"; sha256="1c5pryslly2ibbfc65qlavbnnaksp3p18xr1cghwbw00kz4ig147"; depends=[crayon httpuv jsonlite R6 stringi]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
+  pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
   plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
   pmatch = derive2 { name="pmatch"; version="0.1.4"; sha256="1d04q3kh46pha4yn5xy6ax7qkw9bwrxfkh5x6y4nwsby5j3xw2c0"; depends=[dplyr foolbox glue magrittr purrr rlang tibble]; };
   pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
+  pmd = derive2 { name="pmd"; version="0.1.1"; sha256="07s5b2izsqzryrcasdpa9z7cva03afl2zkb7cpxqgs4bjrd6vprw"; depends=[RColorBrewer rmarkdown shiny]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.3"; sha256="1acrqjannyhg608g8ap3hj2r6krl0js44q8gsyk7lw0s0xr1k67v"; depends=[mvtnorm Quandl]; };
   pmml = derive2 { name="pmml"; version="1.5.6"; sha256="0w12gnjf7l59qws9cn87ay5xglixbpiir53ms6y4r0y3vn7xb8yn"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.2"; sha256="1s222r0zj630gjsvi28wb5mbz9fky967m9jnpaj8nsqv3k9sgkcc"; depends=[]; };
@@ -10194,15 +10370,15 @@ in with self; {
   poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; };
   polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
   poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  politeness = derive2 { name="politeness"; version="0.2.5"; sha256="01lj7zxcijlibzjjvh70xq0qmjf8habqslxwj34h2chvffkakngg"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
+  politeness = derive2 { name="politeness"; version="0.2.6"; sha256="0rkh3bpq5a84gqlby8csi9a7c3vlc09clhng883q875jffnsbn2n"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
   pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; };
-  pollimetry = derive2 { name="pollimetry"; version="1.0.0"; sha256="11a1ksbf9mgdp0yn823kiwka7vi5d93ivv7zsmhvjinmh3pxn1zb"; depends=[brms repmis]; };
+  pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; };
   pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
   polmineR = derive2 { name="polmineR"; version="0.7.10"; sha256="0ynb9gpphwm1inyagxj5kfn15jbl0paydfy6hcjm4912ncf5bvri"; depends=[data_table DT jsonlite knitr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; };
   polspline = derive2 { name="polspline"; version="1.1.13"; sha256="08hz6wlaipjss3cfk0dvr7yy6fc7cd4hqv9finj40kkm5n262xck"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.7.0"; sha256="0cigzpdas6alr3fc6w7dhn2pf4n5qc1jmvdjlqw4mvpajn034hid"; depends=[sp]; };
   polyPK = derive2 { name="polyPK"; version="3.1.0"; sha256="0cb83sq8iz4swr73vwhh8n4k62p6321nsy1sz5fba0wiicycxf55"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls sqldf xlsx]; };
-  polyRAD = derive2 { name="polyRAD"; version="0.5-0"; sha256="1g3s12x6m6v3mqz82xssyxh0kzjq2kx6p1bw2z5px06px4d8m7dx"; depends=[fastmatch pcaMethods Rcpp]; };
+  polyRAD = derive2 { name="polyRAD"; version="1.0"; sha256="0ryaxpj1396nfl73j2czs12p4cayy5a5izayjdxza0f18r93c96z"; depends=[fastmatch pcaMethods Rcpp]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; };
   polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; };
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
@@ -10211,8 +10387,9 @@ in with self; {
   polyclip = derive2 { name="polyclip"; version="1.9-1"; sha256="0r5izja3ns39as40al04vl4jz17d6cgbsb4sj16c9z9l3fzpimf5"; depends=[]; };
   polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
-  polyglot = derive2 { name="polyglot"; version="0.1.2"; sha256="01sb3ilr58252yw0b2669vjdf8574br0n2n0ffwd86gc9f3islb3"; depends=[]; };
-  polymapR = derive2 { name="polymapR"; version="1.0.17"; sha256="148mnkarrc9k15vy82f2wma6was8p41hg7wlv2kc50sn30v5gkwa"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
+  polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; };
+  polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; };
+  polymapR = derive2 { name="polymapR"; version="1.0.18"; sha256="0frb5s3w8jsk10wscmlpjnkqrij0c99pag0wxysgj5cbr8b9d0gh"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
   polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
   polysat = derive2 { name="polysat"; version="1.7-3"; sha256="155zcrjvpnqdzakmxqds17wmn5kl4rrkv9bqlxq8hrrly3nf6ynz"; depends=[Rcpp]; };
@@ -10241,6 +10418,7 @@ in with self; {
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
   population = derive2 { name="population"; version="0.2"; sha256="1k0hwh17dyfbbyw8gprsz1klx6l2ncq5mxkmnjmknlnrkpah0bbl"; depends=[abind]; };
   populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
+  portalr = derive2 { name="portalr"; version="0.1.4"; sha256="0fpzi6vqsr95jkaw3xcgs4m1z0i131vn0vma4l6b71xyp2h4s98h"; depends=[dplyr forecast ggplot2 httr jsonlite lubridate lunar magrittr rlang tidyr zoo]; };
   portes = derive2 { name="portes"; version="3.0"; sha256="144fipskh6yb6xcz3m5bgh2kwjwa58zaw24y88hzzrdvh9glvyrc"; depends=[forecast]; };
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; };
@@ -10249,8 +10427,9 @@ in with self; {
   postGIStools = derive2 { name="postGIStools"; version="0.2.2"; sha256="1d1igv17bj17d0nmavvn5814nqb7k0hs2cjbaqgjd6ip1wcclfxz"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
   postal = derive2 { name="postal"; version="0.1.0"; sha256="1cg9fyiraawxmmfm15lzxwv7pqizjbyrr5aqm8aqrg928ynjy3q9"; depends=[curl dplyr glue janitor jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; };
   postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
+  postlogic = derive2 { name="postlogic"; version="0.1.0"; sha256="1m4z92y9kjjgz5xh0x74i1sgsybm8gv36l25fbbcwlg1jazwgrwn"; depends=[]; };
   potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; };
-  powdR = derive2 { name="powdR"; version="0.1.0"; sha256="0a2n33x16920v3z909hcnkdi6hp2id3j89svn2qp9g57f9md0hi1"; depends=[ggplot2 ggpubr plotly reshape shiny]; };
+  powdR = derive2 { name="powdR"; version="0.2.0"; sha256="13jaq3hzj0nfzwrdwilazr7xcp41ahc9i2ysm5irwn356z3xf2xd"; depends=[baseline ggplot2 ggpubr nnls plotly reshape shiny shinyWidgets]; };
   powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.1"; sha256="04sr0nhdd1v915m0zf5gasznzgi08ykcy20kkwdw0l5mvvdbic8m"; depends=[VGAM]; };
   powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
@@ -10265,11 +10444,11 @@ in with self; {
   powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
   powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; };
   ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; };
-  ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; };
+  ppcc = derive2 { name="ppcc"; version="1.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; };
   ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppgmmga = derive2 { name="ppgmmga"; version="1.0.1"; sha256="16pvpfx353wjn317d3gxfgv6g20prnzwyqrmk0n4pz646mxq9i19"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; };
-  ppitables = derive2 { name="ppitables"; version="0.2.0"; sha256="097rrkgv1xvn00gcmv9mfy4qwx4f4wjaj4j0c2az6smkhnzyr37n"; depends=[tibble tidyr]; };
+  ppitables = derive2 { name="ppitables"; version="0.3.0"; sha256="0g92lsjbjvpsy3lgn8f0miwj1gi4ylfg19chzpwqbqq62h17sb3h"; depends=[tibble tidyr]; };
   ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
@@ -10277,7 +10456,7 @@ in with self; {
   pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
   prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
   prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
-  pracma = derive2 { name="pracma"; version="2.1.8"; sha256="0m8ladhrfyxwybblkcdgg4xv1mk5kibmwarpj2k0c2y34zzcix4z"; depends=[]; };
+  pracma = derive2 { name="pracma"; version="2.2.2"; sha256="18zhni05gwnxbphl6bmjjxmsgg5wwnnkwlb4g971cqyw3dsd83ki"; depends=[]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
   prais = derive2 { name="prais"; version="1.0.0"; sha256="176878dyfqfx9x2cd97c43qb0gn0rs04jn3268n9yksfsxmrr4wx"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
@@ -10291,14 +10470,14 @@ in with self; {
   preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
-  prediction = derive2 { name="prediction"; version="0.3.6"; sha256="19d7312f5lkqfglfvlgssnvyw7gl161s0xradcry44r1i6qp05j1"; depends=[data_table]; };
+  prediction = derive2 { name="prediction"; version="0.3.6.1"; sha256="1znxpacd79fjkf84w3493p1vmafanqfxsspwpwpkmda323bsxj0n"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="1.0.1"; sha256="06zspg1v0x1qqaah7xj5jdaqjv7asnzmgybyyzx3j26v4h59p350"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; };
   predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
   predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; };
   prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
-  preference = derive2 { name="preference"; version="0.2.2"; sha256="0rj8mmlzkk8rhxdm1370xp3sayhfmpvq2jrn9rkrk6y3mk28q78r"; depends=[ggplot2 tidyr]; };
+  preference = derive2 { name="preference"; version="1.0.2"; sha256="0lp28v6zyxjzb3zw38wwlbbw4g1y03kn2k82ycgn1smrj6dkcyda"; depends=[ggplot2 tidyr]; };
   prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
   prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; };
@@ -10328,7 +10507,7 @@ in with self; {
   prioritizr = derive2 { name="prioritizr"; version="4.0.2"; sha256="1v5bkarsgi40w9afalsjfgl7azd1q4lzwr0ipw761cnqcnhkkmkh"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; };
   prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; };
   prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; };
-  prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; };
+  prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; };
   prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; };
   pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; };
   proPubBills = derive2 { name="proPubBills"; version="0.1"; sha256="1fpn9x31jjahdyk0f30mbb3ijj4dsghrq9q94r04pjsgr2jw23zx"; depends=[dplyr httr stringr]; };
@@ -10338,12 +10517,12 @@ in with self; {
   probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; };
   probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
   proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; };
-  processanimateR = derive2 { name="processanimateR"; version="0.3.0"; sha256="18bzn4x0aiv1z0ips2wkyb5pvdbq1fxh4mi430i44qn64z88wasi"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang scales zoo]; };
+  processanimateR = derive2 { name="processanimateR"; version="1.0.0"; sha256="12mcrf1nk2hzi95k4i086aw6c7p7dgxsw3s8k5z5prnlssdbsy1v"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang tidyr zoo]; };
   processcheckR = derive2 { name="processcheckR"; version="0.1.0"; sha256="1arckp3m9z9idq8dq6aghijc6h8i6giir606h1viivrwj0ks0f90"; depends=[bupaR dplyr edeaR glue rlang stringr]; };
   processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; };
   processmapR = derive2 { name="processmapR"; version="0.3.2"; sha256="0j42791qarxrn5ianbndbx0rkq6av4gvrxjl92svzki1mv5cl59n"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr viridis]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
-  processx = derive2 { name="processx"; version="3.2.0"; sha256="1pzx4ap4xa07gf9zkd6hacdsnb9sp3kb60a7v7ljl0ywrcpn1fn4"; depends=[assertthat crayon ps R6]; };
+  processx = derive2 { name="processx"; version="3.2.1"; sha256="1skjyi767avc3safajlj3ikk9lf11zzyjybdcmx8m9y59rf319ql"; depends=[ps R6]; };
   prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; };
   prodigenr = derive2 { name="prodigenr"; version="0.4.0"; sha256="1rbfg3jzspw51lbhjbdy0wy5fgl3k3cnb324i73nbgjn7ycmpfqx"; depends=[clipr clisymbols crayon desc devtools fs git2r rmarkdown rprojroot usethis withr]; };
   prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; };
@@ -10357,7 +10536,7 @@ in with self; {
   profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
   profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; };
-  profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
+  profr = derive2 { name="profr"; version="0.3.3"; sha256="00bv1q0qn46nz4zjfs0l2yfh3hk71rajlp2rrlwg442z11k79ap9"; depends=[plyr stringr]; };
   proftools = derive2 { name="proftools"; version="0.99-2"; sha256="1vx0270sgx15dl6x3nnx13v5y4c0m18yvrhiycl429zky0jzxfr0"; depends=[]; };
   profvis = derive2 { name="profvis"; version="0.3.5"; sha256="0wkpmjlrfrvrn0pp81n7cbxg8xzi796d0mxfi1v7m41x6z43fm6a"; depends=[htmlwidgets stringr]; };
   progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
@@ -10369,14 +10548,14 @@ in with self; {
   projmanr = derive2 { name="projmanr"; version="0.2.1"; sha256="0pj2a79xnhkwik7lq1gm9jv30pkjgv057yd9nlmb58mf2097i7an"; depends=[ggplot2 igraph mc2d R6 Rcpp tidyr]; };
   projpred = derive2 { name="projpred"; version="1.1.0"; sha256="03lfzlhrch7l87vmpfvyiggq12bzj45kkqp0dy307jnrvfzx9lb1"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools]; };
   promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; };
-  promote = derive2 { name="promote"; version="1.0.2"; sha256="0nxbwy6ls7bn0dqxa87a2gc74yvpyvsvn03q4v0sy3jmdyca0c73"; depends=[httr jsonlite stringr]; };
+  promote = derive2 { name="promote"; version="1.1.0"; sha256="04gwlln17dl4i9rzmr8gjdg29w9f3hlsy83dfiv91dg5i17nm55w"; depends=[httr jsonlite stringr]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
   propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
   properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; };
   prophet = derive2 { name="prophet"; version="0.3.0.1"; sha256="0ays7qn8vsa8kwzh5fk0b7nbd0l72yczjbg9h0ajkyywz3jda3fv"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rstan scales tidyr xts]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
-  propr = derive2 { name="propr"; version="4.0.0"; sha256="1bqprryww8qhivklla2jv0ygy49321racs2msmw4g5y6gpi29593"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="4.1.1"; sha256="06gydd4a6lra25lsvn3jljihjinsmqbyvin9yd9bm2j9vg863wdp"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.3.1"; sha256="1im3ajimycsc1zpzbihxlsibjk0462q0vldy7v5ypsqnjbi1ndxm"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -10388,14 +10567,14 @@ in with self; {
   protolite = derive2 { name="protolite"; version="1.8"; sha256="05w5lgf255agj70qdyjm64ci9j0pncz0k0bxhq2cxjbkv09169lr"; depends=[jsonlite Rcpp]; };
   proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
   prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
-  protr = derive2 { name="protr"; version="1.5-1"; sha256="1hy10pd7lycnagjfbb8a6csprb1x0b30g5d0mwpp5jz2d1nadpgh"; depends=[]; };
+  protr = derive2 { name="protr"; version="1.5-2"; sha256="0gy483nznrh9b3mw9vlkwfwm9zxfm6xy5gz0vzqvfr12wgb9bd67"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.2.1"; sha256="17syaxfrwm9kh5q825hj7bsrvi4h9avpdabw9y0vq20y87w8cq1s"; depends=[assertthat dplyr magrittr purrr rlang SnowballC stringr tidyr tokenizers]; };
   provenance = derive2 { name="provenance"; version="2.2"; sha256="1g70s5pwgb3cvw4vgxxqp4gi5qi3d02ldq09n4kildms4shxgsmn"; depends=[IsoplotR MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-22"; sha256="0l0ff8irmmvic941is290hd5vszyhaj5nfwna4v3w9c1zk5nr1ma"; depends=[]; };
   prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; };
   prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; };
   pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; };
-  ps = derive2 { name="ps"; version="1.2.0"; sha256="0ai8igdkysmks1ihbp3h3s552da2hskxqwrvp4cx7vwn91x9f3wd"; depends=[]; };
+  ps = derive2 { name="ps"; version="1.2.1"; sha256="1zxylcb0nr4qb5v6j199mc2pfgf2bpf00jrw47jajmv59qb0fwmx"; depends=[]; };
   psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; };
   psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; };
   pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[MASS]; };
@@ -10404,9 +10583,10 @@ in with self; {
   psda = derive2 { name="psda"; version="1.0.1"; sha256="0hqagrylfllc7mxbnsgxvc2qb3av1wh6ck7y0bs331s4paz0b2mc"; depends=[ggplot2 plyr raster rgeos sp]; };
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
-  pseudorank = derive2 { name="pseudorank"; version="0.3.7"; sha256="1wrf91z75yw88wy1b42z05z7lnykvnfkf8mi9li8108m4k9b13rk"; depends=[doBy Rcpp]; };
+  pseudorank = derive2 { name="pseudorank"; version="0.3.8"; sha256="1nj2cq8v8gj8wg23yrn8v21jwgd572gbz1wplpaxhk5v2ckhf1p0"; depends=[doBy Rcpp]; };
   pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; };
   psgp = derive2 { name="psgp"; version="0.3-18"; sha256="1jfkqwqnmzj3m1d9gxbp2rjkbqb0di75gh78zg861by5qhhaz1a7"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; };
+  psica = derive2 { name="psica"; version="1.0.1"; sha256="1xgq2xqs26v6y91b2b23b5imzjgxv5dihbn69yyjq91a3nvrfk7p"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; };
   psidR = derive2 { name="psidR"; version="1.9"; sha256="0ljfjxsj6krxyk3ss1n0ccymca4hiwkp9fdb1h1l4rqm0dsj8jj8"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; };
   pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
@@ -10416,16 +10596,18 @@ in with self; {
   pssmooth = derive2 { name="pssmooth"; version="1.0.1"; sha256="0g43fkls36lsv3z79326x6g1d370dym8879700lq29wl5fslp3an"; depends=[chngpt MASS np osDesign]; };
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="1.8.4"; sha256="1kzv9nc7rwn1sj1zxd8xrbs6c7qlka7j2c8lsr4f20znkd3qx8gf"; depends=[foreign lattice mnormt nlme]; };
-  psychReport = derive2 { name="psychReport"; version="0.2"; sha256="1pmxknfvrkwfsa1xw1a6nv9ms0ivrpm7pzzr7az8blj5hnpqm8d5"; depends=[cli crayon dplyr ez reshape2 testthat xtable]; };
+  psych = derive2 { name="psych"; version="1.8.10"; sha256="0n3frgzsfmnan6cp3yyq5h6c28v5pd7q5a42pp6byaa7n7d1v478"; depends=[foreign lattice mnormt nlme]; };
+  psychReport = derive2 { name="psychReport"; version="0.4"; sha256="0025m39gxjv63p230xg6vmyndni8bqx5nfs6dzz7xlc8qys56jqs"; depends=[cli crayon dplyr ez testthat xtable]; };
   psychmeta = derive2 { name="psychmeta"; version="2.2.1"; sha256="0x5yxzd78xfz9sbbzx4yxa1vbgwj70fiiiypkk0bai5wjhx40c8v"; depends=[boot cli crayon data_table dplyr ggplot2 knitr MASS metafor nor1mix progress purrr RCurl RefManageR reshape2 rlang rmarkdown stringi stringr tibble tidyr tmvtnorm xml2]; };
   psycho = derive2 { name="psycho"; version="0.3.7"; sha256="0n9cj841mjf661cik6xyd7hhhw1dm0yshhg8fh3iq15gn88bgmqi"; depends=[BayesFactor broom coda DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
   psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; };
   psychotools = derive2 { name="psychotools"; version="0.4-3"; sha256="023cfh9ks8cdk458g4yvjhdy8g9vkcabgpj24bcs46r8nga3adjv"; depends=[]; };
   psychotree = derive2 { name="psychotree"; version="0.15-1"; sha256="1awavyzblh4s0v15kv52sq5dpalg5p0fp7ih46jxppm1srdxsz41"; depends=[Formula partykit psychotools]; };
+  psymonitor = derive2 { name="psymonitor"; version="0.0.1"; sha256="1iw0sllxqnyb69pnryx72080g2cpl9x8k1gpm4hr75czxp6dzwq1"; depends=[doParallel foreach magrittr]; };
   psyosphere = derive2 { name="psyosphere"; version="0.1.4"; sha256="0z3qnbybpf5zk07zny2mq8ax8lr0m4n7gwp899km0lixb10z4ysf"; depends=[geosphere ggmap ggplot2 lubridate plyr rgdal RgoogleMaps SDMTools sp]; };
   psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
+  pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; };
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
   ptstem = derive2 { name="ptstem"; version="0.0.3"; sha256="0dasfqkrd5dkqr1wbg56qrpkyjcb0lcdfcgz5mbxbhs478gf0nwj"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; };
@@ -10433,7 +10615,7 @@ in with self; {
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
   pubchunks = derive2 { name="pubchunks"; version="0.1.0"; sha256="1mi5vzm80fm0vbh9kmmsh7kmgc915i1f1yi2kyw2d3mg98jld9xj"; depends=[data_table xml2]; };
-  pubh = derive2 { name="pubh"; version="0.4.2"; sha256="1g5w600iwpazdm445xn8b22gdr0fx9pyjsignlhrvw65dw7pgykh"; depends=[bookdown car desctable effects Epi epiR epitools knitr latex2exp lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR sandwich survival tactile]; };
+  pubh = derive2 { name="pubh"; version="0.4.3"; sha256="18n6jyidq01gxbqvfal7ipgpjvfkdy71niy7w24dvvxnvcy7hc4l"; depends=[bookdown car desctable effects Epi epiR epitools knitr latex2exp lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR sandwich survival tactile]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.13"; sha256="17pb5y5savh9iga3i7pyp32j41jwfac0vl538gln3n371x5fjh2r"; depends=[boot R2HTML RCurl XML]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
   pulsar = derive2 { name="pulsar"; version="0.3.4"; sha256="076bakisgw2sv4mv9a21ky97zdz7wr733xylpdczmyyhhqi0n8yp"; depends=[Matrix]; };
@@ -10444,6 +10626,7 @@ in with self; {
   purrr = derive2 { name="purrr"; version="0.2.5"; sha256="0dc53zzan3km2l9lzxjixcv6yn7dhw2ppmz8qf2awhak7x2qm9m4"; depends=[magrittr rlang tibble]; };
   purrrlyr = derive2 { name="purrrlyr"; version="0.0.3"; sha256="0cx3vzrkd8dv6cgpdhjn119fyn2kvixvkabvf2h5l6ab61x54wpx"; depends=[BH dplyr magrittr purrr Rcpp]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
+  pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; };
   pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; };
   pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; };
   pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
@@ -10472,6 +10655,7 @@ in with self; {
   qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; };
   qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; };
   qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; };
+  qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; };
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   qdap = derive2 { name="qdap"; version="2.3.0"; sha256="11m2si5zn0sls7hhfdcny3cmhirfxr4m49krqww2msj636yr2f64"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
@@ -10488,6 +10672,7 @@ in with self; {
   qicharts2 = derive2 { name="qicharts2"; version="0.5.1"; sha256="1xix0k62zrw6f29fb5yz97lkms669070i42nfdgz64b77axhqjcl"; depends=[dplyr ggplot2 scales]; };
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
+  qkerntool = derive2 { name="qkerntool"; version="1.18"; sha256="0z03czmh62m740amvws8vdsha6x4zwf0cc8097sc3c894w5xn9q7"; depends=[class]; };
   qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; };
   qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; };
   qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; };
@@ -10511,7 +10696,7 @@ in with self; {
   qrjoint = derive2 { name="qrjoint"; version="2.0-2"; sha256="1b8yxlq56z4xgy2k4da75j7gk3l1n6lcl0pzz7c9mx45296d200q"; depends=[coda kernlab Matrix quantreg]; };
   qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; };
   qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; };
-  qrmtools = derive2 { name="qrmtools"; version="0.0-9"; sha256="0q6hp6j4hcj17i1c1rf180rvjcjmka0zq4r89x2rb5cwrhgps99a"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
+  qrmtools = derive2 { name="qrmtools"; version="0.0-10"; sha256="0mkd4xigz1cg52dldbws3va7251pjzss8z0al25izmp9dbknb3gw"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
   qrng = derive2 { name="qrng"; version="0.0-5"; sha256="0ddwbbw5w7y8vns83z4dyh8inl976k2cg55rxbynaks8bdxr38mj"; depends=[]; };
   qrnn = derive2 { name="qrnn"; version="2.0.3"; sha256="0lc1gj674ll168dbcb1wh0zxmvjaqfhfxg7p2zfpakq63qns442g"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
@@ -10530,7 +10715,7 @@ in with self; {
   qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; };
   quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
   quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; };
-  quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; };
+  quadmesh = derive2 { name="quadmesh"; version="0.2.0"; sha256="0fchkqnjm2kdv8a3g9hhbcrhq7nvcmx7qgm6by495gwabphl71jn"; depends=[gridBase png proj4 raster viridis]; };
   quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
   quadprogXT = derive2 { name="quadprogXT"; version="0.0.3"; sha256="1pa494xpmxanbqcpylhhhm4bnsd1vkrixnmi2rg2bdw21x77hlmb"; depends=[quadprog]; };
   quadrupen = derive2 { name="quadrupen"; version="0.2-6"; sha256="0din0b4iaixjfkdiy4gbl83hq6z7v7aca2xk65hzfsalp6llk91x"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
@@ -10538,13 +10723,13 @@ in with self; {
   qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; };
   qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; };
   qualmap = derive2 { name="qualmap"; version="0.1.1"; sha256="1z085zyqxnizpx4y1891shhijs2a9gg5ap800ryvfxncg6gk35wa"; depends=[dplyr glue leaflet purrr rlang sf]; };
-  qualpalr = derive2 { name="qualpalr"; version="0.4.2"; sha256="0lgg8r7w2fwd2nw8x3k876pyc9r3igqri57akc5fwi92gb8grj5b"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
+  qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; };
-  quanteda = derive2 { name="quanteda"; version="1.3.4"; sha256="1m6qhkhdqrd3lvnxpy66klmi7bbkjgjfjp7y1m9cbjws27fgnspi"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
+  quanteda = derive2 { name="quanteda"; version="1.3.14"; sha256="1qnnv248hhr1fpbq12plkhk4nqijvx3kbcgl0vbh9q51ka3rxqbh"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
-  quantities = derive2 { name="quantities"; version="0.1.1"; sha256="0yi9p0d7k07mfhvl1fhlrzslwmfcj9aaxxj97xdlwvd0kb9qs41j"; depends=[errors Rcpp units]; };
+  quantities = derive2 { name="quantities"; version="0.1.2"; sha256="01h0d2cmqqyqch98d8pgv3n2rvp3vc3sby95srahgcrrlxmmrrvj"; depends=[errors Rcpp units]; };
   quantmod = derive2 { name="quantmod"; version="0.4-13"; sha256="16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"; depends=[curl TTR xts zoo]; };
   quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; };
   quantreg = derive2 { name="quantreg"; version="5.36"; sha256="023gdzahxp582rpabilpxbl3wyjrgjjnnrhcv9xhrqdfiq5l2yza"; depends=[Matrix MatrixModels SparseM]; };
@@ -10554,11 +10739,11 @@ in with self; {
   quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; };
   quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; };
   quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; };
-  questionr = derive2 { name="questionr"; version="0.6.3"; sha256="1vak9wlhdgdc1vh8g87ha3gjcnx6kpl67wpsxnpvkgxai6qd8fb9"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
+  questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
   queuecomputer = derive2 { name="queuecomputer"; version="0.8.3"; sha256="0ravk2bxzq3zhk6mmh6iv11ql3bkpp2318vvrl39ghm5bh6pp6mg"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
   queueing = derive2 { name="queueing"; version="0.2.11"; sha256="1rgavpivvxwww1qiphbjm25d1avhjcjv31imsrzrkwh1d12b2k7x"; depends=[]; };
   quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; };
-  quickPlot = derive2 { name="quickPlot"; version="0.1.5"; sha256="0jqfshwb7ykrz5xi0gfp80fs81yv6mfc0vhbgkbzn7kcjfkcydac"; depends=[data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
+  quickPlot = derive2 { name="quickPlot"; version="0.1.6"; sha256="0mffialxdim8f5s0bw9bb7p8dbrfdgq1wqih441x27lnmrvhlsa8"; depends=[backports data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
   quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; };
   quickblock = derive2 { name="quickblock"; version="0.2.0"; sha256="0ij4ivpnkjzdixbq7pg4g1xkb031qawadr22qhzp0q210qhmhc0m"; depends=[distances scclust]; };
   quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; };
@@ -10583,7 +10768,7 @@ in with self; {
   r6extended = derive2 { name="r6extended"; version="0.1.1"; sha256="184c3jh84vihbwg81c2wv3ndaddki8cpas3wgvqk2akyq168rnfc"; depends=[digest hellno magrittr R6]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="2.1.8"; sha256="02j4wbgh3hfkv3zhrpjyjj61w76qmm4v0642crlzdab959n5qsfy"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAmCharts = derive2 { name="rAmCharts"; version="2.1.9"; sha256="0fy74fk07kj08dp532dqv2zijgb29vbb0mpn377gfds6daqj0x2r"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
   rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
@@ -10591,6 +10776,7 @@ in with self; {
   rCAT = derive2 { name="rCAT"; version="0.1.5"; sha256="03nbhcfgawz0a8h5fr51aqn1n9v7kprwvafxzjb2pb8751rica2d"; depends=[pracma rgdal sp]; };
   rCBA = derive2 { name="rCBA"; version="0.4.2"; sha256="1ky3426h6idadwr3al6vzglw34xdlq54gl5cxaafwgdilj0p0qmq"; depends=[arules R_utils rJava TunePareto]; };
   rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
+  rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; };
   rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
   rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
   rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
@@ -10598,7 +10784,7 @@ in with self; {
   rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; };
   rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; };
   rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; };
-  rEDM = derive2 { name="rEDM"; version="0.7.1"; sha256="03f5dd8ki13g3xwiji05pjmmgz13j34hjv9hwv7jcq113g1sc509"; depends=[Rcpp RcppEigen]; };
+  rEDM = derive2 { name="rEDM"; version="0.7.2"; sha256="1k7i8idn3aybkwld0093ixkn7ijqfrgqprgan5a9xmipp4divla4"; depends=[Rcpp RcppEigen]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
   rENA = derive2 { name="rENA"; version="0.1.5"; sha256="1iwz7dk0x9114zjgk9gg3awx3c8lnd9xhzk2bqvsan7v24xqrcgy"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll rmarkdown scales]; };
   rERR = derive2 { name="rERR"; version="0.1"; sha256="1ymf0v3r2sv9m72c19csk38fy5kmld3i18jh06rir5kxkb5l245p"; depends=[dplyr ggplot2 numDeriv plyr reshape2 survival]; };
@@ -10614,6 +10800,7 @@ in with self; {
   rIP = derive2 { name="rIP"; version="0.1.1"; sha256="0fmn48zfp7pkjza6a4dl7hpm2addijxk9990fw845q0awdd181ax"; depends=[httr]; };
   rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; };
   rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; };
+  rJST = derive2 { name="rJST"; version="1.0"; sha256="143qb1iglfsjdcdr57mr3syrgxz6ksywm7m65hba92i2bd6ys7cj"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; };
   rJava = derive2 { name="rJava"; version="0.9-10"; sha256="0y7yg70i3zwbwl4g36js4dqpl51cmwss5ymrsk24d1z07bflp4y9"; depends=[]; };
   rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
   rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
@@ -10631,21 +10818,22 @@ in with self; {
   rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; };
   rPackedBar = derive2 { name="rPackedBar"; version="0.1.0"; sha256="12jwkch3264m6ksl8rdjirwdzm1g8b4050mm6rysw9v57k3v57ji"; depends=[data_table plotly scales]; };
   rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; };
-  rPraat = derive2 { name="rPraat"; version="1.1.2"; sha256="1fvawmpv3zxd1gjcal69j5biga1mcd956kr52x0azqprhqdk6r52"; depends=[dplyr dygraphs readr stringr]; };
+  rPraat = derive2 { name="rPraat"; version="1.2.0"; sha256="1hhx7qayc69skzrb8sb18cid5y49naig7qxkk3x5x1icvk324n0x"; depends=[dplyr dygraphs readr stringr tuneR]; };
   rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
   rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; };
-  rSARP = derive2 { name="rSARP"; version="1.0.0"; sha256="0gg6qs7jgn2qvzdwbz0xyfpfzjwa2dwi0j0hal7glc5qlhrrynwl"; depends=[ggplot2 lattice qcc]; };
   rSCA = derive2 { name="rSCA"; version="3.0"; sha256="1ka8p1slqb3a9hfc8z4j7v90k0wn6y35vmwxqaf8jlgwfhhc1v9f"; depends=[]; };
+  rSEA = derive2 { name="rSEA"; version="1.0"; sha256="0icphv6l23yqjjk7i81y68yjf1fsccbqaxwb55f2izay5lpaalhs"; depends=[hommel]; };
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
+  rSPARCS = derive2 { name="rSPARCS"; version="0.0.1"; sha256="1djb26k7q3j660sjgdwyjglkjkdi3k2k2h83nmvmr4dbgsx6nbmm"; depends=[data_table foreign geosphere raster sp spatialEco tigris]; };
   rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
   rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; };
-  rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
+  rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; };
   rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
-  rWind = derive2 { name="rWind"; version="1.0.3"; sha256="04b3yz0x07j2fvq0gzmvl071wwnkhzx4wfr7xpdss2nq8vjwxjaj"; depends=[gdistance lubridate Matrix raster]; };
+  rWind = derive2 { name="rWind"; version="1.0.4"; sha256="13ci2xzkjal869zm7llvkm8zrya7vhqy3gizq9py87zsds3h0f4y"; depends=[gdistance lubridate Matrix raster]; };
   rWishart = derive2 { name="rWishart"; version="0.1.1"; sha256="1zv35l2nvwwidx5zxfh7a4jgiaq2mqk69xf974994k1ksfvibkmi"; depends=[lazyeval MASS Matrix]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   rabi = derive2 { name="rabi"; version="0.1.0"; sha256="02ldpkqpdvh0b660j34bppw5j9pl3a2b4vkzaaiq4kcangahg2r6"; depends=[numbers polynom stringdist]; };
@@ -10660,7 +10848,7 @@ in with self; {
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.7"; sha256="1p7857h0p8l828hngb0l4qswjifdisi9ya0yxmn9wry50ids9rgf"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; };
   radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; };
   radir = derive2 { name="radir"; version="1.0.3"; sha256="0v1w0jy19fqscwkggyjashb6n9r6xjc0d971zw0lqnh1ap3chg0y"; depends=[hermite]; };
-  radix = derive2 { name="radix"; version="0.5"; sha256="18sjhkrqsdr03sjpdh0crd83r8rk8q3p2saabasbkkbvprh6b769"; depends=[base64enc digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xml2 yaml]; };
+  radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; };
   radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; };
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
   radtools = derive2 { name="radtools"; version="1.0.0"; sha256="0xspd3spfr59nciddx4gmfrw52jr0m0gznqb5rjsarshn9y8x3xf"; depends=[dplyr Hmisc magrittr oro_dicom oro_nifti]; };
@@ -10680,6 +10868,7 @@ in with self; {
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
+  randcorr = derive2 { name="randcorr"; version="1.0"; sha256="1hnr0wvbsmgql39wlj4z2qbqn0fdfwyihfl6xgrlzvs9vrmig5xx"; depends=[]; };
   randgeo = derive2 { name="randgeo"; version="0.3.0"; sha256="14hlh9k66lcbf0xhnxx12rrnyl8awqcsm3csvxdz23s5wnm2ya5p"; depends=[]; };
   randnet = derive2 { name="randnet"; version="0.1"; sha256="1mpz3dsbzd5hffv2v5p6jdp0z07f7rhgcjinr1lwggvxw37xwrkj"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; };
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
@@ -10715,20 +10904,20 @@ in with self; {
   rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
-  raptr = derive2 { name="raptr"; version="0.1.2"; sha256="17aba9jxlvvf2946wy2y0ck5j85sqzkr8q1yk68cdqkf45lxkvz8"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
+  raptr = derive2 { name="raptr"; version="0.1.3"; sha256="0xzgpb3da06v6va1y8755r3hmcbpky1m55s80n2ra2mp286s8acd"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
   rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
   rarhsmm = derive2 { name="rarhsmm"; version="1.0.7"; sha256="0pvqa6f0ib1jb0rwc6wv6hfinncb21v2g0y0hsy5l33gdagjw2sz"; depends=[glmnet Rcpp RcppArmadillo]; };
   rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; };
   rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
-  raster = derive2 { name="raster"; version="2.7-15"; sha256="1b0js80bypy2nh91y12pfxqwldwq8y09dhkrjqkgj9n89k5fj55s"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="2.8-4"; sha256="14pcfznxm5kdwd908axkr9v1l0hzxlrwd8kwrz0liqnfh9cx5rsa"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
   rasterVis = derive2 { name="rasterVis"; version="0.45"; sha256="0x1d28jn6l78lhccbnlnzyr18734f16rcfnfyl9vqpkrn7sgwc3i"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; };
-  ratematrix = derive2 { name="ratematrix"; version="1.0"; sha256="09nbgybgdgdkc6bdcxjiy1kdgv398lgih1aqzd7abj5lndlh8pny"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
+  ratematrix = derive2 { name="ratematrix"; version="1.1"; sha256="0sfh9bb27hf0q1f6986lpwmjp8dh78bh1pamkl8z6mqlzpawnpgy"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
   ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; };
@@ -10773,19 +10962,22 @@ in with self; {
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rcheology = derive2 { name="rcheology"; version="3.5.1.1"; sha256="1yb9d55x6ffam4lirpfign3czx5c14nc1qz0cxqyi9ak63p9mb13"; depends=[]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
+  rchie = derive2 { name="rchie"; version="1.0.0"; sha256="0bn00kglfc3sm5j83r5sj94b3vj27i1zwky4xn18swjg0c2cf94y"; depends=[jsonlite V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
-  rcites = derive2 { name="rcites"; version="0.1.0"; sha256="0n8wcyjj41ggmry9lrm7j4f1gcq8l97cdsknkgmb4a0l0da1c6xk"; depends=[data_table httr jsonlite]; };
+  rcites = derive2 { name="rcites"; version="1.0.0"; sha256="0w2jzd3kwk21pbvv91zmj9z8qxszk6q3502gfg22gv24mpb7bsv7"; depends=[httr jsonlite]; };
   rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
   rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; };
-  rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.0"; sha256="13liz9lmx9xgc0f7pjiz3sp8ygvazx2zslbiwz3p9fimfsx1yfsg"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot withr xopen]; };
-  rcompanion = derive2 { name="rcompanion"; version="2.0.0"; sha256="1zbx4r43ql14hqwq6hpyy4dv7igbs6dl96127kriiyfvbkj0cmyw"; depends=[boot BSDA coin DescTools EMT lmtest multcompView nortest plyr]; };
+  rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.2"; sha256="0ys1nd7690mhwzslyzg8fq1wxr28nz8g6av5iykkrshb8lkxg7ly"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; };
+  rcompanion = derive2 { name="rcompanion"; version="2.0.3"; sha256="0y29z05k6ankxvff880rkih4bxzcdairp0ps7z8b0v248pkifn1i"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
   rcongresso = derive2 { name="rcongresso"; version="0.4.6"; sha256="1xd07vlbcp3msmwvg2nk7acdx513v2wfbq64na0045rsv2v96m44"; depends=[dplyr httr jsonlite magrittr stringr tibble tidyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; };
+  rcosmo = derive2 { name="rcosmo"; version="1.0.0"; sha256="1r9q8y9an2dw9kpnfl7qhnqx136xk05vi1ps52d9n76rr86lw0fw"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.8.4"; sha256="1q58wngr28a0vrafwhxj8jvh42aprv2v1s68mdbbq30rn28yplj7"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; };
   rcrtan = derive2 { name="rcrtan"; version="0.1.0"; sha256="1pg0w9amlxnzv5mrh4p3gnh8959m93dx8bfy2gvbm94isilb969z"; depends=[dplyr magrittr purrrlyr tibble tidyr]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
+  rcss = derive2 { name="rcss"; version="1.7"; sha256="0sl175x2l6c493b4kvcbxp6ps95d5rgydqmd6fcwwr3in5lhjdky"; depends=[nabor Rcpp RcppArmadillo]; };
   rcube = derive2 { name="rcube"; version="0.3"; sha256="0y4sw67g0ws3iywbaz56ccg5q6n2885yfl8rvb45yvwjmdmbg85r"; depends=[magrittr]; };
   rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; };
   rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; };
@@ -10793,6 +10985,7 @@ in with self; {
   rdatacite = derive2 { name="rdatacite"; version="0.4.0"; sha256="14p8albilnzf882m499zfps77jrx0zav9wpz3m047xgs2msnwxqw"; depends=[crul jsonlite oai solrium]; };
   rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
   rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; };
+  rdbnomics = derive2 { name="rdbnomics"; version="0.4.3"; sha256="0wq10dcwf2r7w6s8lzqr0iimhahb00g1r488kfzb0jmk5l392a7y"; depends=[data_table jsonlite]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
   rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; };
   rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; };
@@ -10800,7 +10993,7 @@ in with self; {
   rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; };
   rdefra = derive2 { name="rdefra"; version="0.3.5"; sha256="0mj5xpr1xk0r2ph9fvbabmzrb9yqgdaj0bl76xrhkzisdkagf705"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
-  rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; };
+  rdflib = derive2 { name="rdflib"; version="0.2.1"; sha256="16hm6yfgzng1bv81mjfjx8ywvblk9if2z0jx326k4b0a8fvfijyr"; depends=[dplyr jsonld readr redland stringi tidyr]; };
   rdfp = derive2 { name="rdfp"; version="0.1.2"; sha256="1kznr5p5mhplgpgmc0f4vrs1fwpivwjy52hwfc8k0q0vx53h3fs2"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; };
   rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
@@ -10815,18 +11008,20 @@ in with self; {
   rdrobust = derive2 { name="rdrobust"; version="0.99.4"; sha256="0ykz9lgkr95l6h7jk9k8k0yv26hd4iyvgr9j298l388ry9w1ph9w"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; };
   rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; };
-  rdwd = derive2 { name="rdwd"; version="0.10.2"; sha256="18ghcg1arm5k2gan2h71bx0h27hsqr0mkajb5sha0ijyby3wa4h8"; depends=[berryFunctions pbapply]; };
+  rdtLite = derive2 { name="rdtLite"; version="1.0.2"; sha256="11l9n6y5vlhkwyc9hirjw18yzkhbbmnph7dbqy0n3l3q5r9icfac"; depends=[curl digest ggplot2 gtools jsonlite knitr sessioninfo XML]; };
+  rdwd = derive2 { name="rdwd"; version="0.11.0"; sha256="02abp32kyawn5a9pfah6b9qb4l1393b8mam74g7d71cclg65zvx2"; depends=[berryFunctions pbapply]; };
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
   reReg = derive2 { name="reReg"; version="1.1.6"; sha256="198vgf3294if9zmvl54pgx6ram63pswpjnh44fy7n60g8nza44bb"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tibble tidyr]; };
   reactR = derive2 { name="reactR"; version="0.2.1"; sha256="1abj3lh2vk4pni5gn2vb8sym2j2sx7yvnph86nz9hp6r270d0g86"; depends=[htmltools]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
+  read_gb = derive2 { name="read.gb"; version="1.6"; sha256="17py6al9cwq4jmab7k2164f7hi8943gi8a50d8zpn1xms9l2cnld"; depends=[]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; };
   readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; };
   readJDX = derive2 { name="readJDX"; version="0.3.250"; sha256="0h7yfc0y4b67rhh949zknqyjx0jknsld1099y9x563a5lhzwrchv"; depends=[stringr]; };
   readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; };
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
-  readODS = derive2 { name="readODS"; version="1.6.4"; sha256="1kj648phxvpg480fdhr2sj4l8q306gjdl886zqnkwxif5mw1aq7g"; depends=[cellranger readr xml2]; };
+  readODS = derive2 { name="readODS"; version="1.6.7"; sha256="1nvkhjv3i6l7d15v2abxg4141hrgv2jmc4agxi2d0wv6j1fc1ya1"; depends=[cellranger readr stringi xml2]; };
   readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
   readabs = derive2 { name="readabs"; version="0.2.1"; sha256="0zm8n036qrh61ywba411x36zlda6n8iq1vv66d4akv55xz91f3bx"; depends=[dplyr readr readxl rsdmx sjmisc stringr tidyr]; };
   readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; };
@@ -10835,7 +11030,7 @@ in with self; {
   readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; };
   readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; };
   readobj = derive2 { name="readobj"; version="0.3.1"; sha256="1hnmj6ydvdss7jbl3h16ip0g993wdfyfm15r8f78ihjlh84swima"; depends=[Rcpp]; };
-  readr = derive2 { name="readr"; version="1.1.1"; sha256="1cvw5wdcqk88cp5fyv678mnmp66l3whcd2yh33p2qvx0168bja8s"; depends=[BH hms R6 Rcpp tibble]; };
+  readr = derive2 { name="readr"; version="1.2.1"; sha256="05h7hyd67x0sjn0sbggpmlhsjx0k88ws8l967gmzxmm3h8a6xwkg"; depends=[BH clipr hms R6 Rcpp tibble]; };
   readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
   readtext = derive2 { name="readtext"; version="0.71"; sha256="1blcsk1d78q0s1bijsrzrfrvhgbsq3qi1r9w3i51h1r9g3v9p87f"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi tibble xml2]; };
@@ -10851,7 +11046,7 @@ in with self; {
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
-  recipes = derive2 { name="recipes"; version="0.1.3"; sha256="1vqh3pxs4n1azhnd1lzg91vasya6g323kllhbrw177j7kdxqyimy"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix pls purrr RcppRoll rlang tibble tidyr tidyselect timeDate]; };
+  recipes = derive2 { name="recipes"; version="0.1.4"; sha256="0bwijw4427v2k5z3qci2kyr5dyzql8b3lvf88rwy16p741jckjsn"; depends=[dplyr generics gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyr tidyselect timeDate withr]; };
   reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recmap = derive2 { name="recmap"; version="1.0.0"; sha256="09aa6480lsrcqwh82rp9sijf720pkbihb5rrc3a74wr5svry7rd2"; depends=[GA Rcpp sp]; };
@@ -10870,15 +11065,16 @@ in with self; {
   reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; };
   redist = derive2 { name="redist"; version="1.3-2"; sha256="0qkv2n9jianxm95vk2dqsqghhf2zirab8vhzc8cc8zichjv79f69"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
   redland = derive2 { name="redland"; version="1.0.17-10"; sha256="0k28896jsxy1qxnn6iyx3xxasq4y171xfjragqkj568nn9lmzfi8"; depends=[roxygen2]; };
-  redlistr = derive2 { name="redlistr"; version="1.0.1"; sha256="07zg0yzrcamaag5xcn33mh8i099r2gyz5p47f38lsg33j7am0m8n"; depends=[plyr raster rgeos sp]; };
+  redlistr = derive2 { name="redlistr"; version="1.0.2"; sha256="1s335dim68qx0i28w7586kacb8j8qawwg5az56a8ggja6yll306f"; depends=[plyr raster rgeos sp]; };
   redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; };
+  ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; };
   refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; };
   referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
   refimpact = derive2 { name="refimpact"; version="1.0.0"; sha256="0qifqhar2pv81npsxl2pj713vgldyap7y79fq20jpk7qigzf9573"; depends=[checkmate curl httr jsonlite tibble xml2]; };
   refinr = derive2 { name="refinr"; version="0.3.1"; sha256="0q76sr050pg3ahwzcxj08mjig0k2jq8yh7nv6d914pwg3dhq05sn"; depends=[Rcpp stringdist stringi]; };
   refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; };
   refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; };
-  refuge = derive2 { name="refuge"; version="0.2.0"; sha256="15c1052dp13wcwxi15bnh3x700biw0jcy6b7532rqbgdkv67kqxn"; depends=[dplyr httr jsonlite tibble]; };
+  refuge = derive2 { name="refuge"; version="0.3.2"; sha256="0ksznc72yvcscviqq6iysjkbkklqxff04q0rsh2l8gyy7g7m9415"; depends=[dplyr httr jsonlite tibble]; };
   refund = derive2 { name="refund"; version="0.1-17"; sha256="1lz90y3zim0vl2gxiy4zw0qhkvg7i0p64jqabblnlx13f3lzn944"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
   refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; };
   refund_wave = derive2 { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
@@ -10901,7 +11097,7 @@ in with self; {
   regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; };
   rehh = derive2 { name="rehh"; version="2.0.2"; sha256="00wxx6w9ahddrg3lz14cqyg3dn0rfcxwy1z8arhdp1pn8d48pahw"; depends=[gplots rehh_data]; };
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
-  reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.0"; sha256="1q83wnp935wr3z7rzfc6jrqm4p72diq1g0mdn69xnv2ljim4ps83"; depends=[glmnet MASS refund]; };
+  reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; };
   reinforcelearn = derive2 { name="reinforcelearn"; version="0.1.0"; sha256="025v8flr8q2p473kz760vywczhvx8b4lakm6rasr9ijgxpbd2jpn"; depends=[checkmate nnet purrr R6]; };
   reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; };
   reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; };
@@ -10920,15 +11116,16 @@ in with self; {
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
-  relsurv = derive2 { name="relsurv"; version="2.2-2"; sha256="1r8gmqq4jnn697d4a6m48lf4kzkk6cq160ici60zfd7vb1b1y4vf"; depends=[date survival]; };
+  relsurv = derive2 { name="relsurv"; version="2.2-3"; sha256="0jiky939n8vi44n8xg9kag67xjvf1dpywyjrn4bpdfrvfmkrr0l9"; depends=[date survival]; };
   rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; };
   rematch2 = derive2 { name="rematch2"; version="2.0.1"; sha256="16k0i5p7fa3qfxv59ijyn638wpz8n4jrkrnilqmh5g9l8f8bn4h6"; depends=[tibble]; };
+  remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; };
   remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; };
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
   remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; };
-  remotes = derive2 { name="remotes"; version="2.0.1"; sha256="1xkzlciv68jyf4j8hads0i47nxbgsy1kv7258c6zzyq66z0amhss"; depends=[]; };
+  remotes = derive2 { name="remotes"; version="2.0.2"; sha256="0rsjxmhwpr51ilsdjfqn06mj8yr2d7nckcn3arv1ljn23qfkpcxa"; depends=[]; };
   renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; };
   rentrez = derive2 { name="rentrez"; version="1.2.1"; sha256="115ffrmsg755ynfwywql7xkcnlvv8ch4nlr1ab11i5923fz6vkvl"; depends=[httr jsonlite XML]; };
   repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; };
@@ -10942,23 +11139,23 @@ in with self; {
   repo = derive2 { name="repo"; version="2.1.3"; sha256="1g72zvj2mg8cxfy1w3d46lkk4hayad64ns5w1y43731whzraxk95"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
   reportROC = derive2 { name="reportROC"; version="3.2"; sha256="1fskkligymxxfxbimd1sg1lhrd3pj62nkc41wpxfwacfr1zx57qb"; depends=[pROC]; };
-  reportReg = derive2 { name="reportReg"; version="0.2.0"; sha256="063z2szsainld9yb0hmpw23ij4d52qs6zjvdfdzj9h48qd50h38d"; depends=[nlme]; };
+  reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
   reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; };
   reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-  repr = derive2 { name="repr"; version="0.15.0"; sha256="0myg8d9idpp0gbi7nmcrjq3fa0zy4v73hkg6g5zlpw5vhsmvi8h0"; depends=[base64enc htmltools]; };
+  repr = derive2 { name="repr"; version="0.18"; sha256="1a7pffzzmdm3gqyiifwrlhhp3z3qqsdhr4adzq39gj3ll24ql281"; depends=[base64enc htmltools]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.2.1"; sha256="1ws5gds453xgfili87r35rz1wn2i7jbqissq98csbiddpkgls8sx"; depends=[callr clipr fs rlang rmarkdown whisker withr]; };
-  reproducer = derive2 { name="reproducer"; version="0.1.9"; sha256="092gz58sanpawgg0jk1634x9ki0jw460csbb6cywp0ndghswfgwh"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; };
-  reproducible = derive2 { name="reproducible"; version="0.2.3"; sha256="1cx6d07lsc6x122i1khgqfzh3nzxxfr4kxs0mjp0ghbsvnpk1rg9"; depends=[archivist backports crayon data_table devtools digest dplyr fastdigest fasterize gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl rgdal rgeos sf sp versions]; };
+  reproducer = derive2 { name="reproducer"; version="0.2.1"; sha256="1jxv6j5vavncjwrhwbxiz9a4v3kixgrs08kyk6drmhcc031g1dfv"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx reshape xtable]; };
+  reproducible = derive2 { name="reproducible"; version="0.2.5"; sha256="0wci51p80z28annm5zjhs5cam30kgclq4fmf0kyzp00dzy7h9yy4"; depends=[archivist backports crayon data_table devtools digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl remotes rgdal rgeos sf sp testthat tibble versions]; };
   repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; };
-  reqres = derive2 { name="reqres"; version="0.2.1"; sha256="056cjdx0nmf32vma2jkpbaznbaf76kc4jn0w6nv7blq33qlvx37z"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
+  reqres = derive2 { name="reqres"; version="0.2.2"; sha256="18ib0qbfw3sih7xs1z4szjqppr7lbj5wx0w0kx80g810m7q27wyp"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
   rerddap = derive2 { name="rerddap"; version="0.4.2"; sha256="0jn5fqjjn4nqn6hyaiadq8xdg7vd23l09h9ax6nq8r5iiizpv249"; depends=[data_table digest dplyr hoardr httr jsonlite ncdf4 tibble xml2]; };
-  rerf = derive2 { name="rerf"; version="1.1.3"; sha256="0mc55rwqbqxr655m6rgn5i63yg0pyn225yrmrd46b9h76j5hz3aj"; depends=[dummies Rcpp RcppArmadillo RcppZiggurat]; };
+  rerf = derive2 { name="rerf"; version="2.0.2"; sha256="00j5mmlzdky12ixv03f717kxmy7p4szp97c14k47ll6q9nqnxzdq"; depends=[dummies Rcpp RcppArmadillo RcppZiggurat]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
   resampledata = derive2 { name="resampledata"; version="0.3.0"; sha256="09hp97zk31f016d65vq64gv413c6bx1dwqy74ai34xk00flkwady"; depends=[]; };
   resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; };
@@ -10967,11 +11164,12 @@ in with self; {
   reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; };
   reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
   respirometry = derive2 { name="respirometry"; version="0.7.0"; sha256="1anmi0pc54gbrbwcpx7sn8p2cqpyf7d5bf3v9zp4mzy4g7nx7vvj"; depends=[birk lubridate marelac measurements seacarb segmented]; };
+  restez = derive2 { name="restez"; version="1.0.0"; sha256="19r6qi7n32g24hc4ls9qxzdgk4fzbs56bll9dxam0qy7xvrdnqi5"; depends=[callr cli crayon DBI devtools downloader MonetDBLite RCurl rentrez]; };
   restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; };
   restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
   restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
   restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; };
-  restriktor = derive2 { name="restriktor"; version="0.1-80.811"; sha256="0yyaiv5777apf2hwf7kyhya9pxkqvsj94shn310dl7gfxks5bvqd"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
+  restriktor = derive2 { name="restriktor"; version="0.1-80.911"; sha256="0n3fsif2ni6w1dpg3yhr7iwg03bayhy00h3ykqbafjx361mxlqrc"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
   resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; };
   reticulate = derive2 { name="reticulate"; version="1.10"; sha256="0bz3lxbisjwn6cv23090zivpy0bxcncr82g5qja13l37i8xnvqsq"; depends=[jsonlite Matrix Rcpp]; };
@@ -10984,7 +11182,7 @@ in with self; {
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   revengc = derive2 { name="revengc"; version="1.0.3"; sha256="0hls00hnwq9f72v4dnaqsmz81lzddvma81p38qrl85v792l16q61"; depends=[dplyr mipfp stringr truncdist]; };
   revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; };
-  revtools = derive2 { name="revtools"; version="0.2.2"; sha256="0sn7k5vcp09vp6j1bf879jrig382ayhfnwp569z9dxgdh7s18v6n"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
+  revtools = derive2 { name="revtools"; version="0.3.0"; sha256="0k5cr2qypfjrhv0l4d6hrzc2r6d9ipc279x16jhy3zzvwzgyjf0x"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
   rexpokit = derive2 { name="rexpokit"; version="0.26.6"; sha256="06h2k1jzn9rvbgyhhgnshwdajl9psks1sx09108appyf7sqlb9bp"; depends=[Rcpp]; };
@@ -10993,13 +11191,14 @@ in with self; {
   rfacebookstat = derive2 { name="rfacebookstat"; version="1.8.3"; sha256="1a9xj0hpbvjp70v8rim0vpqpdjf6x81jw47nzjl9iggny3c1nb1m"; depends=[bitops data_table dplyr httr jsonlite RCurl]; };
   rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
-  rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; };
+  rfishbase = derive2 { name="rfishbase"; version="3.0.0"; sha256="1p98vsxg6r7ddzi5rzp4zvryvlp9vw7vds5cbr8zbg7by9zanrpm"; depends=[dplyr magrittr memoise purrr readr rlang stringr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
   rfm = derive2 { name="rfm"; version="0.1.0"; sha256="0bd71qk6vrd0jnnwdwlh30mn8v8dwwgmffrd71kbq83gbfp8ry3l"; depends=[assertthat dplyr forcats ggplot2 lubridate magrittr purrr RColorBrewer rlang shiny tidyr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
   rfoaas = derive2 { name="rfoaas"; version="2.0.0"; sha256="04wx3d6v9zci6i5k3c4nfdycgjmng7f533b9k84kf1pa4lwp45ad"; depends=[httr]; };
   rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; };
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
+  rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgam = derive2 { name="rgam"; version="0.6.6"; sha256="0klf2prw5zj76az66c5hzv23yya1b45l61xdy1zbnggvwh62fqik"; depends=[Rcpp RcppArmadillo]; };
   rgbif = derive2 { name="rgbif"; version="1.1.0"; sha256="1rn4gpl5paf8qmk535y1gg81xdnlglm70spvw2y72kvdl5jyrzhl"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
@@ -11011,7 +11210,7 @@ in with self; {
   rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
   rgeopat2 = derive2 { name="rgeopat2"; version="0.2.6"; sha256="04r8q3mig7sp38f3m9g20xlb0h046c04hhrzg4n06b5wkn7298s5"; depends=[readr sf stringr]; };
-  rgeos = derive2 { name="rgeos"; version="0.4-1"; sha256="1zash6cfq6wlk1gn30al9gvb5im1kgl2yw2isrc06nnd4cxjaswd"; depends=[sp]; };
+  rgeos = derive2 { name="rgeos"; version="0.4-2"; sha256="1bym5y7vhkhmqk9xmbmfqwfsznn0ka6vvncca8k4rzs4rzw8xkbh"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
@@ -11023,7 +11222,7 @@ in with self; {
   rgrass7 = derive2 { name="rgrass7"; version="0.1-12"; sha256="1gsy45j6nq4i6lbr4gyhgmnc9l8g6qxbhsqby9r59d6xz49b2xlv"; depends=[sp XML]; };
   rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; };
   rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; };
-  rhandsontable = derive2 { name="rhandsontable"; version="0.3.6"; sha256="1n631vffbfi8mgbcjgav1209ryj88igb17h73xvjdmglh5f0s6dz"; depends=[htmlwidgets jsonlite magrittr]; };
+  rhandsontable = derive2 { name="rhandsontable"; version="0.3.7"; sha256="1y6dlpzid5apjx0gphkym7gq3lhwp0bxan8ca274pg170xyb33h8"; depends=[htmlwidgets jsonlite magrittr]; };
   rhierbaps = derive2 { name="rhierbaps"; version="1.1.0"; sha256="0c18xa6ikgs1j1xn1f9q3angqki7iwzfnq1kzdcgk0rvxkcn1rir"; depends=[ape ggplot2 LambertW matrixStats purrr]; };
   rhli = derive2 { name="rhli"; version="0.0.2"; sha256="1mb6bizqkg7zd8nc5a81fw7d0y0vcv6zh6y28k9vikqmc5l1n21q"; depends=[]; };
   rhmc = derive2 { name="rhmc"; version="1.0.0"; sha256="1m79f1hx404y0k8lk3n6jnzhr6wwrk83xiym68sq1zvj0wjqiqmw"; depends=[]; };
@@ -11034,7 +11233,6 @@ in with self; {
   rhub = derive2 { name="rhub"; version="1.0.2"; sha256="18aq28q4vggbp19l9wcw3dylnyv7sd26wg0i5w8jrva5cq1v2n5j"; depends=[assertthat callr clisymbols crayon desc httr jsonlite parsedate prettyunits R6 rappdirs rcmdcheck rematch whoami withr]; };
   rhymer = derive2 { name="rhymer"; version="1.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; depends=[httr jsonlite]; };
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
-  ri2 = derive2 { name="ri2"; version="0.1.1"; sha256="01iyk9cfs6v7jd1z962vrcdb3bfab5pcq9abkb21yqi82f9w97jf"; depends=[estimatr ggplot2 pbapply randomizr]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
   rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
   ridge = derive2 { name="ridge"; version="2.3"; sha256="15m9klxcxj33s8wkxyamc4awzarg2ncahgaz5cg5m926g8haz9c8"; depends=[]; };
@@ -11049,10 +11247,11 @@ in with self; {
   rindex = derive2 { name="rindex"; version="0.12.1"; sha256="0q86dvgmrgm94l05inapm7kbgzlmm1xh3x8plvir43rx6gq0am4h"; depends=[regtest]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
   rintrojs = derive2 { name="rintrojs"; version="0.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; depends=[jsonlite shiny]; };
-  rio = derive2 { name="rio"; version="0.5.10"; sha256="158xg3vj0glk3fslwi6fywwmfym2b6kn3fdmjligdfy5lf68khix"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
+  rio = derive2 { name="rio"; version="0.5.16"; sha256="0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
   rioja = derive2 { name="rioja"; version="0.9-15.1"; sha256="18fyqcykg12mf4ap0a2la30656xq32immqz11ddmrfrb0vpd2h7h"; depends=[mgcv vegan]; };
   ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
   rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; };
+  riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
   riskRegression = derive2 { name="riskRegression"; version="2018.10.03"; sha256="1j0q0a9rkh9gmcidl6kwlmiiwn24cxg9yrx0i72py1b2765kqwk2"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava plotrix prodlim ranger Rcpp RcppArmadillo rms survival timereg]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
@@ -11095,7 +11294,7 @@ in with self; {
   rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
   rmapzen = derive2 { name="rmapzen"; version="0.4.1"; sha256="1vql1cy38c4kv8pyl81877s587kq4l9sx9nslbgk3l41wvyyvphk"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.10"; sha256="0mh2f3k98w7pgz0ri34149s4kx5y0kfm27nwq64k0qwxd16hwd9r"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr tinytex yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.11"; sha256="0yyjbh891mdqzpjkblz8510ng71i7mxmyiqr69x3rwlwk2vakk79"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
   rmcfs = derive2 { name="rmcfs"; version="1.2.15"; sha256="0qz8b6z1rslsay0m94y013wychajq850bffv6kg2m0jlf4m16320"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
@@ -11117,8 +11316,8 @@ in with self; {
   rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.2"; sha256="0by2d6l25lf5vidxbkcxghpxycffyldzzbxcw6h4rm86zmkkv1m0"; depends=[magrittr purrr readr tidyverse xts zoo]; };
   rmumps = derive2 { name="rmumps"; version="5.1.2-4"; sha256="1qdpvyxwb18dapa8xqj8kjjmrnrqixkn29qn6q4cnwdwi1zcbdx6"; depends=[Rcpp]; };
   rmutil = derive2 { name="rmutil"; version="1.1.1"; sha256="0yyzypkz6jjqvhafg6ipml8hrhr0w9l6j2vnmf0gdy90xj78mgag"; depends=[]; };
-  rmweather = derive2 { name="rmweather"; version="0.1.2"; sha256="1w78qp4irgl2v3hcfmdk3c4yzbaf12lb2whf8nxpj1lcajkpcvq4"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; };
-  rmytarget = derive2 { name="rmytarget"; version="1.1"; sha256="1gjmp0mk91f15sswmi8fhkdr7j3zrl49k02m0jmhhp51g4wazxim"; depends=[dplyr httr jsonlite lubridate stringr]; };
+  rmweather = derive2 { name="rmweather"; version="0.1.3"; sha256="1qdf511vmpffrdfcxlll54km2s0pf6pdswj8401k4ymv5iif91hl"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; };
+  rmytarget = derive2 { name="rmytarget"; version="2.0.1"; sha256="0yccirp07i4dgqb3zf16rf29df78iqgpjsvbj2v42557dgjgbak2"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
@@ -11130,20 +11329,20 @@ in with self; {
   rngtools = derive2 { name="rngtools"; version="1.3.1"; sha256="097215qcfw6ybllpzmp1532r59h2srvch3aca4z4s6l2rf9w8gvn"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
   rnn = derive2 { name="rnn"; version="0.8.1"; sha256="0g2c87x939x5gh1h6np0fbyrg5w2zk2ydw8r0yaq2zj3z5yc5mlc"; depends=[shiny sigmoid]; };
-  rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
+  rnoaa = derive2 { name="rnoaa"; version="0.8.0"; sha256="0w0a37gpy7smjcvc7qzx4s0n9l7f0yk99cwwg5y6xhx5270z30md"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
   rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; };
-  rnrfa = derive2 { name="rnrfa"; version="1.4.0"; sha256="007j6a2hihw7h0vhv6aiz7iymzr3lkzmc1dy5f8b22z5n52k4pl3"; depends=[ggmap ggplot2 httr plyr rgdal rjson sp stringr xml2 xts]; };
+  rnrfa = derive2 { name="rnrfa"; version="1.5.0"; sha256="07c2fp0vl02mh31yzimq7hwkcrwrdl83jyi58302hn4anx0cyvjy"; depends=[ggmap ggplot2 httr plyr rgdal rjson sp stringr xml2 xts]; };
   roadoi = derive2 { name="roadoi"; version="0.5.2"; sha256="0fzvg75m5yyz2181n2i208525cixyiwclfij47qd3d61qqzlmlp3"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
   roahd = derive2 { name="roahd"; version="1.4.1"; sha256="0d89d21s32bsjkm8bdiqrbccd3m9badh87vrsb1laawhl4hr3dn9"; depends=[dplyr magrittr robustbase scales]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.0.8"; sha256="0i7pjp0ir0n7j5r75ha5avsrqniji1zg7jb93nj9ji3qy286yyxw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.0.9"; sha256="00l70km6njd2al2lga8x1q5qaawywzr9avr5j8jw52cjvszbizl3"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; };
   robcbi = derive2 { name="robcbi"; version="1.1-2"; sha256="1n8whpnpsm9imiz8l1jxq5x597ydzb2b54jkvrl05hmwh79p97in"; depends=[robeth]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
   robeth = derive2 { name="robeth"; version="2.7-4"; sha256="11ghpy88r02844mw99zxl7qzkic8kcl0gw56a4kdyw84r0lyv8rg"; depends=[]; };
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1.1"; sha256="1fxqva2khk16sj5ka5zdpaknh2w9n925ys0i4v7ahqvzhnxg6l3b"; depends=[lattice MASS robustbase]; };
   robis = derive2 { name="robis"; version="1.0.1"; sha256="11j86nyslh52fxvl6m2vay638n5gqw4akd9d1mkqnpvrvxhm41l5"; depends=[dplyr httr jsonlite leaflet]; };
-  robmed = derive2 { name="robmed"; version="0.2.0"; sha256="1xrdlmyawzzglv9s41nm470yc6dn21cqqalsnk77vk72dhib7p3k"; depends=[boot ggplot2 robustbase shiny]; };
+  robmed = derive2 { name="robmed"; version="0.3.0"; sha256="1q5l11khsx0wilcdp157jp3jfkks88rfraf2rcwjhcq28yw1sjcj"; depends=[boot ggplot2 quantreg robustbase shiny]; };
   robmixglm = derive2 { name="robmixglm"; version="1.0-2"; sha256="0z23frjv9yscw0q33s5vlrmisg9an5hksyhcrgcnlan6x63r91kq"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; };
   robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
@@ -11168,7 +11367,7 @@ in with self; {
   rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; };
   rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
   roccv = derive2 { name="roccv"; version="1.1"; sha256="13pwrc31w279l7j58wdz24p8j9jdh53rsavj1mymj92jpm52nfzl"; depends=[glmnet pROC]; };
-  rockchalk = derive2 { name="rockchalk"; version="1.8.117"; sha256="0xy665iypp6c3whzk5qj3n3f69mm23z08cxdgxnvyrnwp5zznqg8"; depends=[carData lme4 MASS]; };
+  rockchalk = derive2 { name="rockchalk"; version="1.8.129"; sha256="1wriwmwbl04jk27s76cvlllgx79315ng8k5habb8hlp1mbm4hpby"; depends=[carData kutils lme4 MASS]; };
   rococo = derive2 { name="rococo"; version="1.1.7"; sha256="1fp3kk5j9kc0vyr50rlbsxjc9p3qz5137sifxsbd297p7zj1fcs2"; depends=[Rcpp]; };
   rocsvm_path = derive2 { name="rocsvm.path"; version="0.1.0"; sha256="1pd59bzcz96sxpp725pqa7pjh2gdrfapbilp4wccjkf5290zw56v"; depends=[quadprog svmpath]; };
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
@@ -11191,8 +11390,8 @@ in with self; {
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; };
   ropercenter = derive2 { name="ropercenter"; version="0.2.0"; sha256="1ghn666jhwmkxwrr8pc398nhzvg4y4097pa19m4b08d9mkg9iqlj"; depends=[dplyr foreign haven httr readr rvest stringr tibble tidyr xml2]; };
-  roprov = derive2 { name="roprov"; version="0.1.1"; sha256="1b03y61h5j5cirk43hf1z520g47iq9jnkh150qshpk52pd4iq1n0"; depends=[CodeDepends fastdigest igraph]; };
-  roptim = derive2 { name="roptim"; version="0.1.1"; sha256="0r06msb8d3i01inzkyc02zy4zg63sww6jb5cdhzzi5iz768lczc1"; depends=[Rcpp RcppArmadillo]; };
+  roprov = derive2 { name="roprov"; version="0.1.2"; sha256="16w9i7svlkn2wbv35890f1zpcxilj0ar28d2xrdvmx7ni9vrz61q"; depends=[CodeDepends fastdigest igraph]; };
+  roptim = derive2 { name="roptim"; version="0.1.2"; sha256="0kamdhyc7s1i7mbgzf6zbdbcs2qjjq4wgl1v181xzhq6gpv7fhy6"; depends=[Rcpp RcppArmadillo]; };
   rorcid = derive2 { name="rorcid"; version="0.4.0"; sha256="1diz14b5jzs9i4khyykq58cbgz87qraivv9lhq5nrrrfi2gryl9r"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.9.0"; sha256="0pnrfc0dcbh5r3qwfwyb0q063bzwpw4ga60965y5qyxz64cyx74r"; depends=[httr jsonlite]; };
@@ -11206,22 +11405,24 @@ in with self; {
   roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; };
   routr = derive2 { name="routr"; version="0.3.0"; sha256="1mjf1vwrh1k1kjl1kcgqs29zb8h9m05630czsjkz7li3pmvy9mrv"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
-  roxygen2 = derive2 { name="roxygen2"; version="6.1.0"; sha256="0ji9k4s1bvfbl8wimfqj1lqr33h1claaz30vb5pgksxyg77j5xaa"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp stringi stringr xml2]; };
+  roxygen2 = derive2 { name="roxygen2"; version="6.1.1"; sha256="0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp stringi stringr xml2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
+  rpact = derive2 { name="rpact"; version="1.0.0"; sha256="0wphrkmsqy57y63b643bcamhxjj6f5nkddbiyniab43mfqpyz3ln"; depends=[]; };
   rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-13"; sha256="0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"; depends=[]; };
-  rpart_plot = derive2 { name="rpart.plot"; version="3.0.4"; sha256="0b4y1adn0gnx9igi0nghjp2bf5pa2d5fqz00ra505ljdwj8d0lgx"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="3.0.6"; sha256="00jbkzg58sf4v32dbmgclgn0hd561l57jf067xffv3gmr2844n0w"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
   rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; };
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; };
-  rpdo = derive2 { name="rpdo"; version="0.2.4"; sha256="153xj2fw6ddqxcdriq825nigf6zdakgx5ik2yr4w4bayam1qa5fq"; depends=[checkr]; };
+  rpdo = derive2 { name="rpdo"; version="0.2.5"; sha256="1504f1i4aldnasnkc596pfpyqcmpvk6p20k46s27j8ld5470w3hn"; depends=[checkr err]; };
   rpf = derive2 { name="rpf"; version="0.59"; sha256="06gibjngl27mmvmni6ncz5qa4nlbxlna57f13607a9r739146378"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; };
   rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; };
+  rphylopic = derive2 { name="rphylopic"; version="0.2.0"; sha256="0wmdvdz75bbwhn3qk8ic5lj256ik27d7vxrq9hg8c9rqzygj8wh3"; depends=[crul ggplot2 gridBase jsonlite png]; };
   rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; };
@@ -11231,10 +11432,10 @@ in with self; {
   rpn = derive2 { name="rpn"; version="1.0"; sha256="0wk8y4yk6wqzbq5bqv6zncfp9az5vn8xgwh426pk3bxm3v4xi16i"; depends=[BBmisc checkmate]; };
   rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; };
   rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; };
-  rpostgis = derive2 { name="rpostgis"; version="1.4.1"; sha256="15s5k5grg2va5dkszpbrk0kgbmrq5xhg7jm37q90m3ydbgln2ys2"; depends=[DBI raster rgeos RPostgreSQL sp]; };
+  rpostgis = derive2 { name="rpostgis"; version="1.4.2"; sha256="0zbq9605jk26r2mdkigi2pgn2s5ssrp5dvm4kbgk7fscnm1r6fbs"; depends=[DBI raster rgeos RPostgreSQL sp]; };
   rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; };
   rppo = derive2 { name="rppo"; version="1.0"; sha256="0agqys52l8bb3mc3bpawym12phl5r1ymalfvgrq5w6n78lpzcxls"; depends=[httr jsonlite plyr readr]; };
-  rpql = derive2 { name="rpql"; version="0.6"; sha256="0kbxhh0pacgh5d490665a5k00qh93rv5k7v3g73vrgn6lc085a54"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  rpql = derive2 { name="rpql"; version="0.7"; sha256="18llgwk1jfwf3y1dabpc508kfb1k4yh4cr4k76azkziv11arbh0c"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
   rprev = derive2 { name="rprev"; version="1.0.0"; sha256="0v8ibflqbc45qss2jnnalqhq788cp6gpx1lylcwj2h9k4i8qgi4c"; depends=[data_table doParallel dplyr foreach ggplot2 lazyeval lubridate magrittr survival tidyr]; };
   rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
   rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; };
@@ -11246,11 +11447,12 @@ in with self; {
   rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; };
   rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; };
   rqdatatable = derive2 { name="rqdatatable"; version="1.1.1"; sha256="1634llj4ykkn85ijj978k9rxclp7ff687vsvr9i2v5xppg7sbr5h"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="1.1.1"; sha256="0w7fs5mvw8dzaiw7xl75a2rl99nhfay5mwl12smakd1zpsn0v8n3"; depends=[wrapr]; };
+  rquery = derive2 { name="rquery"; version="1.2.0"; sha256="0vid05sx73swfg13fd1kar4ggb9ri1pscc8rqz465sqmbknlp2r1"; depends=[wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
+  rr2 = derive2 { name="rr2"; version="1.0.0"; sha256="1cflysdx7n8mcb2whqi3wirg67aszbf2h8x23bpg7xx1im1xmgy4"; depends=[ape lme4 Matrix phylolm]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
-  rrcov = derive2 { name="rrcov"; version="1.4-4"; sha256="0wn5h8vi0zyk5ah898m37ysz4kiih6y792nb9zdvhvd8r07f0sc5"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
+  rrcov = derive2 { name="rrcov"; version="1.4-7"; sha256="14zjyqcdiqx6js99nx5s8hmyx564ixy2d8s6i7wa50xmx368rl6b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; };
   rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; };
@@ -11270,13 +11472,13 @@ in with self; {
   rrtable = derive2 { name="rrtable"; version="0.1.0"; sha256="1rvqb32fr63dkm5kz291pxzli8yi10k76v0lm1qdn28cx1l6ff3y"; depends=[devEMF editData flextable ggplot2 magrittr moonBook officer purrr readr rmarkdown rvg shiny stringr ztable]; };
   rsMove = derive2 { name="rsMove"; version="0.2.6"; sha256="15mr2i0fv1k230ncfkbdk564rydsq9zy9bgwackbg9zlix8x7874"; depends=[caret gdalUtils ggplot2 igraph lattice lubridate plyr pryr randomForest raster RCurl rgdal sp spatialEco]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
-  rsample = derive2 { name="rsample"; version="0.0.2"; sha256="10lmpy4ca045j2fxbz5xzl1w9242dkp6sc8hhrk0fxs0dkfb7amf"; depends=[broom dplyr purrr recipes rlang tibble tidyr]; };
+  rsample = derive2 { name="rsample"; version="0.0.3"; sha256="1gdlx9irba0snyl5jv0gi6dwv5l044s2axjlnygh5narm2rhi4y1"; depends=[dplyr generics purrr rlang tibble tidyr]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="3.2.3"; sha256="11p626ys62xgvs0pd5hsnywnhvgm5m082s6laqg823az8ybs9wyp"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="3.2.5"; sha256="1qkg0kdixbsjava4xx5afbwq8d91fcx799bf0siadygm31aa9gcr"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
-  rscopus = derive2 { name="rscopus"; version="0.6.1"; sha256="1nhpgslwhsz6zpk82fsyqk4qrsw9avq1jv2wbz5ahbfkgd5rshwa"; depends=[dplyr httr plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.10.0"; sha256="1sls4fnr02kwc1d9myd92am1yzj6mi1pxs694n74amyl4m58kqg9"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
+  rsconnect = derive2 { name="rsconnect"; version="0.8.12"; sha256="1zw7rvkg0vcajcyvx8nhxgp1c4882pwmdij4zv1by2fr3qw32678"; depends=[jsonlite openssl packrat RCurl rstudioapi yaml]; };
+  rscopus = derive2 { name="rscopus"; version="0.6.3"; sha256="1fplb7wmzp78a1xi9b4bw6xis16gixhvl227yfhip650ib4srpv1"; depends=[dplyr httr plyr tidyr]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.11.1"; sha256="0ic00g74iilg7ydndm40vvbl7z9r5fbfiayrzfvgpjhqrl1qx337"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
@@ -11290,27 +11492,28 @@ in with self; {
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; };
   rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; };
-  rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; };
+  rsoi = derive2 { name="rsoi"; version="0.4.0"; sha256="0aa4iiq5kh9l7wplvsqlgj89rnbr6p4bnnfn10dgfpyrpf7rqvza"; depends=[]; };
   rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
   rspa = derive2 { name="rspa"; version="0.2.3"; sha256="171bwyxbjx2w8fz87jsbaghqxgmmkaxixhia0kp2y33ns6fc1hy9"; depends=[lintools validate]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.2.11"; sha256="150lg0zdpnpcgrh10vh7fr8fmmq6qhvf8pc27fil4rq31k4aazr9"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.2.12"; sha256="0hx8ikgf3v0aaz3vshcv47ljasdhi52g68a0grfgzig2l3gmzbwk"; depends=[h2o sparklyr]; };
+  rsppfp = derive2 { name="rsppfp"; version="1.0.3"; sha256="06lafgdbxaq3rifbz6mhvp5b3dm3vxz3dkzdmiz218xhvn4mdfry"; depends=[doParallel dplyr foreach igraph stringr tidyr]; };
   rsq = derive2 { name="rsq"; version="1.1"; sha256="0pvnyf875jybid16mg1y3dmnlrk1vahckhr5zaai1a0k4i6mh4jf"; depends=[MASS]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
-  rstan = derive2 { name="rstan"; version="2.18.1"; sha256="01cwm4vrlrrcqmda0dgr23bpav1rbb8xp53n9hl8x70995k4lpcf"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.18.1"; sha256="08md6kjxrq0cpgjj8jq69jxk21lhdf6arav2griz66mgkydg8xkm"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
+  rstan = derive2 { name="rstan"; version="2.18.2"; sha256="1zvh5qlxkwi947nqmlhazr7jwii68fpxnkcsr38s3m8havcxlxad"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; };
+  rstanarm = derive2 { name="rstanarm"; version="2.18.2"; sha256="0jflfj7g1rx0zhq0kbi1b1zwad1m7lhbvymz43g5c9cx3hh4gi68"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
   rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; };
   rstantools = derive2 { name="rstantools"; version="1.5.1"; sha256="11dlrz3mj1j9qigh2qff0ixdcfds4ppxd37112yq8bn16b0idasw"; depends=[]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="0.20"; sha256="1wrl7rc4nrnxjs26l9v36x3mpx33mjijk27nbzidwrhp9gppzz1i"; depends=[]; };
-  rstpm2 = derive2 { name="rstpm2"; version="1.4.2"; sha256="19cijqx1jblhgwzr0q1p7aaiajnrf5g9l4fw67p69nv4nljcypan"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
+  rstpm2 = derive2 { name="rstpm2"; version="1.4.4"; sha256="0q7pnhbxysh9kbnns6xdg2kcs4jwz9bw442935vxddqaib1jnddm"; depends=[bbmle fastGHQuad mgcv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; };
   rstudioapi = derive2 { name="rstudioapi"; version="0.8"; sha256="0d6r0in13k0rcyr6asanwy0a9dv4lizq6l2w913rr222pq6vrrck"; depends=[]; };
   rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
   rsunlight = derive2 { name="rsunlight"; version="0.7.0"; sha256="0v2wrgq8fxvkf8sf4z4wi4bbvbskw5wzcplns9imwfmm3y2pabyi"; depends=[crul data_table jsonlite plyr stringr tibble]; };
   rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; };
   rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; };
-  rsvd = derive2 { name="rsvd"; version="0.9"; sha256="1d71y4r27gpwsaq195yys301va8wdc2bvwxjk6501f7ma2yhl7y9"; depends=[]; };
+  rsvd = derive2 { name="rsvd"; version="1.0.0"; sha256="0vjhrvnkl9rmvl8sv2kac5sd10z3fgxymb676ynxzc2pmhydy3an"; depends=[Matrix]; };
   rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; };
   rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; };
   rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; };
@@ -11324,11 +11527,11 @@ in with self; {
   rticles = derive2 { name="rticles"; version="0.6"; sha256="1rdjk5h9li55j3r7pj7q82z2y4phxqwybr3375dyajymd370gsys"; depends=[knitr rmarkdown tinytex xfun yaml]; };
   rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; };
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
-  rtika = derive2 { name="rtika"; version="1.1.19"; sha256="0qh6qq3hxhsa2nb3bn468h87k54xjq8f0jj5rixcp95p4krr6wn7"; depends=[curl digest rappdirs sys]; };
+  rtika = derive2 { name="rtika"; version="1.19.1"; sha256="1vq3lnl5c7ivmd4wmfgdaa6vi9ipicmbyf8d08xyviv469c3phfy"; depends=[curl digest rappdirs sys]; };
   rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; };
   rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; };
-  rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; };
+  rtk = derive2 { name="rtk"; version="0.2.5.7"; sha256="0h2664z7rbpj0zqnixb5swkkpjbbsgiagmd6dl92k10zphw0c8i0"; depends=[Rcpp]; };
   rtkore = derive2 { name="rtkore"; version="1.5.5"; sha256="0srk0ih4gbmhb1pl6zf8sjwrkdmgws9cl1397fcqv6l3bc376622"; depends=[inline Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; };
   rtrek = derive2 { name="rtrek"; version="0.1.0"; sha256="05dzqylvv8rgh0sxl2qa2zvxnmilwmxsa6f99mh6ygcf9pal8jzd"; depends=[dplyr jsonlite magrittr purrr]; };
@@ -11346,7 +11549,7 @@ in with self; {
   rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.4-0"; sha256="0b0rq88v93945g7pr6xin7wfdm8zl2vw8hxwa2kfak4xnrrprsyy"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
   ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; };
-  ruler = derive2 { name="ruler"; version="0.1.3"; sha256="000hnnnz3zccpshpi725f67kbfr3hnpgr48zyz24pbynyz3d7vap"; depends=[dplyr keyholder rlang tidyr]; };
+  ruler = derive2 { name="ruler"; version="0.1.4"; sha256="0fxwadx217h8nhry3mvwqk1pvi7f6ns19kcidixdk2b4zb5pqsc7"; depends=[dplyr keyholder rlang tibble tidyr]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
   runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; };
   runner = derive2 { name="runner"; version="0.1.0"; sha256="0gzh8438pvpg5wwirh0hn5s8fnd8cb6y66syndxarr06v9jy1gza"; depends=[Rcpp]; };
@@ -11358,7 +11561,7 @@ in with self; {
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   rvalues = derive2 { name="rvalues"; version="0.6.3"; sha256="1bsdvwcijb75f27c8padjx8663as667axc4skwa6xgv5y423kbd0"; depends=[]; };
-  rvcheck = derive2 { name="rvcheck"; version="0.1.1"; sha256="116cs1ih5m55jyp0f5whjvnbn4gpi4550qkbwzw0mq254x2r8vdg"; depends=[rlang]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.1.3"; sha256="1i2g6gyiqyd1pn6y0h6vmlcmg1qb5pv7rym8mkw8jnyc3in9hn8b"; depends=[rlang]; };
   rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; };
   rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
@@ -11458,7 +11661,7 @@ in with self; {
   sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
   sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; };
   scBio = derive2 { name="scBio"; version="0.1.2"; sha256="01yqfqddgak0iaysphsf08mbkqbgbpr0gsyvkj3hpyj7kk1937h4"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; };
-  scPDSI = derive2 { name="scPDSI"; version="0.1.0"; sha256="1p5hrahklm85hawssp223hc1binyhz3fadd9qkr7hw3a47yn9cc5"; depends=[Rcpp]; };
+  scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; };
   scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
   scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; };
@@ -11484,7 +11687,7 @@ in with self; {
   scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; };
   schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
   schumaker = derive2 { name="schumaker"; version="1.1"; sha256="09ggzhi60lzqwmc344h6f31zdz0b22mzvj0jpfpdp9lllqb25amf"; depends=[]; };
-  scico = derive2 { name="scico"; version="1.0.0"; sha256="1z1w4j84h5rxa7s9ccjw7ygad85sm6km2l09rba1gad8bp0pfxmf"; depends=[]; };
+  scico = derive2 { name="scico"; version="1.1.0"; sha256="0c52a4mhsd9y5vhz3h6f7j2fa5cq0lkks5qa449w6kra5cqpbx34"; depends=[]; };
   scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; };
   scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; };
   scifigure = derive2 { name="scifigure"; version="0.1.1"; sha256="0wfvg0c9hbdc3ipsnq6nkf7k9hf8yl27aqg012nqk9ynlwp9qa56"; depends=[]; };
@@ -11504,20 +11707,21 @@ in with self; {
   scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
   scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; };
   scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
-  scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
+  scrime = derive2 { name="scrime"; version="1.3.5"; sha256="0y2mh9fsffjf3i15bafpasa17z99c1s75r8g6h4hgcwfgpjx75sx"; depends=[]; };
   scriptName = derive2 { name="scriptName"; version="1.0.0"; sha256="0jpr9x5hf45cik5zxqw0j3vkvbk04a7ck2crvb2472hrv7s9al55"; depends=[purrr rlang]; };
   scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; };
-  scriptexec = derive2 { name="scriptexec"; version="0.2.3"; sha256="0smpn7d1lqyq5x8l5rdhybzv0sqrps0czv1r8bni67i80zjaaff8"; depends=[]; };
-  scrm = derive2 { name="scrm"; version="1.7.2-4"; sha256="1fj0204hc0yvahg3plz3ia9kwa93mimk721mf2dljwdnj46lb067"; depends=[Rcpp]; };
+  scriptexec = derive2 { name="scriptexec"; version="0.3.0"; sha256="11pd74y601ylxjy17267zlh1j2diac665k4qy0ly69iv77wl9cfy"; depends=[]; };
+  scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; };
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
   scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; };
+  sctransform = derive2 { name="sctransform"; version="0.1.0"; sha256="0cz5ssb55s7bmssx4y9dllm75f1qapldkxparvqv0sm39rwv7j7y"; depends=[MASS Matrix]; };
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
   sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; };
-  sdStaf = derive2 { name="sdStaf"; version="1.0.0"; sha256="0yd6nh2kdg81j4hdwbjjmd7ah4jl0p5vm15jq9v3mkw6rrjdz9bi"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; };
+  sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; };
   sdcMicro = derive2 { name="sdcMicro"; version="5.3.0"; sha256="0n2pbwm344iw3zm0nf6ybx51hf79jhjzd2780c57n71jl2ybxzpk"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.24"; sha256="10qwfa64fji7l24znrhl15ich2bmsq2y219y0pbr6q4xy02vp515"; depends=[data_table data_tree knitr lpSolveAPI Rcpp Rglpk rlang slam stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.25"; sha256="01d64lsd8hjyl16ycy06v5ij7yxl6k09gx2lrdpq0cy4sqxmfkgb"; depends=[data_table data_tree knitr lpSolveAPI Rcpp Rglpk rlang slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
@@ -11526,7 +11730,7 @@ in with self; {
   sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; };
-  sdols = derive2 { name="sdols"; version="1.6"; sha256="083yvlqgr5151dy0570jkhns12nyj2na2gk39vf8gv0gyw72c3yk"; depends=[commonsMath rscala]; };
+  sdols = derive2 { name="sdols"; version="1.7"; sha256="18c9y80pvhcqfl5ppfsfdhiygzx073xrzm1zzj08wn4r6snw04sh"; depends=[commonsMath rscala]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; };
   sdpt3r = derive2 { name="sdpt3r"; version="0.2"; sha256="0q97gxmf2vka566dm6jry5q2scqnm88fq0v5kqkphihsi52kya23"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -11543,8 +11747,8 @@ in with self; {
   seasonal = derive2 { name="seasonal"; version="1.6.1"; sha256="1nvavn84f2zb0f6n352br52wcrcmnxv6vprzcpymrnzik7pyp8y6"; depends=[x13binary]; };
   seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="3.1.7"; sha256="0shshkgv89q2w51nmrqx482d8d28xjyrwdnwr6g4061rxms7plsz"; depends=[abind MASS mgcv nlme raster sp stringr]; };
-  secrdesign = derive2 { name="secrdesign"; version="2.5.4"; sha256="1kbqgdjpyns11ag16rgw9n6mvmjgdypk9lv3yzwf4kynds46wbbk"; depends=[abind secr]; };
+  secr = derive2 { name="secr"; version="3.1.8"; sha256="02m7iac6z41w49lxnbfpfw20h272wnmg16ys3lpi1d0rli5xghg4"; depends=[abind MASS mgcv nlme raster sp stringr]; };
+  secrdesign = derive2 { name="secrdesign"; version="2.5.5"; sha256="1fkz6l8wl2mq7daqyfq3xbghnp0qrqzx1ps7jhkg83nill4yakvb"; depends=[abind openCR secr]; };
   secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; };
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
   secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
@@ -11559,10 +11763,10 @@ in with self; {
   segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; };
   segregation = derive2 { name="segregation"; version="0.1.0"; sha256="17dhgk56j6zxqgfq08vig68lkhxhbgbbqhshqh5051m1k4ivjdyz"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
-  seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; };
+  seismicRoll = derive2 { name="seismicRoll"; version="1.1.3"; sha256="1868g8mlmhhlc6d6p86xlp6qhfbbrhba02dmx1zcvydsbqdvnpjj"; depends=[Rcpp]; };
   sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; };
   selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
-  selectapref = derive2 { name="selectapref"; version="0.1.0"; sha256="09kqrr814261mvpzc9x7v0fcnd4wf8fcl52jsx6snf1qp336hw26"; depends=[]; };
+  selectapref = derive2 { name="selectapref"; version="0.1.1"; sha256="0pn0s8dxbshwmv0qdrf670cjk3inf5w7jgac3fq29gmcx4f3fhl2"; depends=[]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
   selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; };
   selectr = derive2 { name="selectr"; version="0.4-1"; sha256="1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"; depends=[R6 stringr]; };
@@ -11578,11 +11782,12 @@ in with self; {
   semTools = derive2 { name="semTools"; version="0.5-1"; sha256="0lh10yw888hcj1mdl96p5pw8gi0a1dj8panclghry6b8xaa3w7ni"; depends=[lavaan]; };
   semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
-  semds = derive2 { name="semds"; version="0.9-5"; sha256="16zla94jzqrm2gji4sgiz44fw15f2kf4i8s76s1cnjai6saqcf9f"; depends=[minpack_lm pracma]; };
+  semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; };
+  semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; };
   semiArtificial = derive2 { name="semiArtificial"; version="2.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; };
   seminr = derive2 { name="seminr"; version="0.5.3"; sha256="18yd2pcp4msy6w4gpj5znid4gygh1hg2794lhsjqxvyz36hb3i5p"; depends=[]; };
   semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; };
-  semtree = derive2 { name="semtree"; version="0.9.12"; sha256="07i82f3bnn9x7gy8gsjyd99mzcq9pk3xqb3479d338vpky2afv43"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets]; };
+  semtree = derive2 { name="semtree"; version="0.9.13"; sha256="0am7fm7f9kgq6kmd17axrswlg191ny3pq6b5sf731diz1ghyncmp"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets stringr]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
@@ -11595,28 +11800,29 @@ in with self; {
   sensitivitymult = derive2 { name="sensitivitymult"; version="1.0.2"; sha256="19pyq6c7pvr3zkz3dz5p2hhfcvwm0im0bwaw4yhhgin4kqfnfjd5"; depends=[]; };
   sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
+  sensmediation = derive2 { name="sensmediation"; version="0.2.0"; sha256="0x8wa1gmnhnsq8asdjfklb34ghk9jvqlmpw29cpvhvlhvl5x7fr3"; depends=[maxLik mvtnorm]; };
   sensors4plumes = derive2 { name="sensors4plumes"; version="0.9.3"; sha256="1r9sddnlxpjck7rhm2w7z8jak7wmrxg3d62dydc5dqcqhgp54r6p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
   senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; };
   sentimentr = derive2 { name="sentimentr"; version="2.6.1"; sha256="1xwi3rjyhx3w042r2g4a8rzqr2svam7fdx2ivc9vyhj9y81az7fh"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.5.1"; sha256="1icnf7p45hgh2z02xmxc5a7bx9k5r0jjs3mnpr1j97vnm19rk8jx"; depends=[abind caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi zoo]; };
+  sentometrics = derive2 { name="sentometrics"; version="0.5.5"; sha256="0snrajyw9zlvzyxqb3l74h2dn79fp8y0q5hhx0z0gzw2lw36avqp"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
   seplyr = derive2 { name="seplyr"; version="0.8.2"; sha256="0inqnrqf2dld2dkhwp16iz8hzrvi01jbj437ghhvprfp06320lxg"; depends=[dplyr rlang tidyr wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
-  seqHMM = derive2 { name="seqHMM"; version="1.0.8-1"; sha256="18rpmncm5xn34l336kzg0pby59pw16s5cdv3h946yhrcjigz0kkn"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
+  seqHMM = derive2 { name="seqHMM"; version="1.0.9"; sha256="1rkcdj73h5jvqrjc24wjbig99il6ppkjy82255avbn1bdrrnrins"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
   seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
   seqinr = derive2 { name="seqinr"; version="3.4-5"; sha256="17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"; depends=[ade4 segmented]; };
-  seqminer = derive2 { name="seqminer"; version="6.1"; sha256="15yhg4vfc7jg1jnqb3371j00pgbmbyc9l1xx63hq1l3p34lazq2l"; depends=[]; };
-  seqmon = derive2 { name="seqmon"; version="2.1"; sha256="0p7vbrx0l59wyxhg59a8nnnk1z46inys30rpchj0v5ggadaazjkx"; depends=[]; };
+  seqminer = derive2 { name="seqminer"; version="6.7"; sha256="0cyzyfp0x39fg83g74jqyakd1qni3qkcvrzmjhrglgx8hgqd06nd"; depends=[]; };
+  seqmon = derive2 { name="seqmon"; version="2.2"; sha256="0l17s3f6p228iz9q257ix0lqzrw5wnlqkcb8p4vn24kz7rvfcjz3"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
   sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; };
   sequoia = derive2 { name="sequoia"; version="1.1.1"; sha256="12s6890jr9rvp45h1hrfwpndsrr7na0kz1a29hd96ycnk7bvd1ic"; depends=[plyr]; };
   sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
-  serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; };
+  serial = derive2 { name="serial"; version="2.1.2"; sha256="0bv8jal3l2bq4qdz7qbl0mfmx11s9zpdilymcc6myxsr7fcv7laq"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-3"; sha256="1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   serieslcb = derive2 { name="serieslcb"; version="0.2.0"; sha256="1af7mvfiv40hwjlf6f53grw48c343rnmzxiyw4yx95mf8rk46bsd"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
@@ -11624,7 +11830,7 @@ in with self; {
   servr = derive2 { name="servr"; version="0.11"; sha256="0yj3p1risf269n25dd56lqv82dsxv6a0aq4bcc1ddn9wv7h2xdfi"; depends=[httpuv jsonlite mime xfun]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
-  sessioninfo = derive2 { name="sessioninfo"; version="1.1.0"; sha256="01c0m8yzadpwd825hky6as0f8ka4xyz7zfy0ih2iy7qqw11w6qn5"; depends=[cli withr]; };
+  sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; };
   setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
   sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; };
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
@@ -11636,7 +11842,7 @@ in with self; {
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
-  sfsmisc = derive2 { name="sfsmisc"; version="1.1-2"; sha256="0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0"; depends=[]; };
+  sfsmisc = derive2 { name="sfsmisc"; version="1.1-3"; sha256="1y25nnw09qfm66523w1z4q766lv15a6ykvsq30r154n7m7aggvsq"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; };
   sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; };
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
@@ -11651,10 +11857,10 @@ in with self; {
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
-  shades = derive2 { name="shades"; version="1.2.0"; sha256="06mz09rrrjp4dkzbw6nnv6n3k80ddwzaw4pkp4127d1f4cij9pnj"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.5.7"; sha256="11x3vrkar0cf0x8dgsylhk4j53mcpw1vcja0wfxa08y9rcbjlb5b"; depends=[plyr raster rgeos sp]; };
-  shadowtext = derive2 { name="shadowtext"; version="0.0.3"; sha256="1mqi7n6m9mm86z3gv6cf37qbq8p4n0lqlzs9d7x873a27bpclca0"; depends=[ggplot2]; };
-  shallot = derive2 { name="shallot"; version="0.4.4"; sha256="0bjbw8l5lzz5d6nxgwjby40fxvxrfli0wkipdf84pg4nigy84w2w"; depends=[commonsMath rscala sdols]; };
+  shades = derive2 { name="shades"; version="1.3.0"; sha256="0qbg7b37ifgil7ka4vhk15wjf65rwha233yppqd9wlf3gys8784n"; depends=[]; };
+  shadow = derive2 { name="shadow"; version="0.5.9"; sha256="00wakldv4nlw2vnydzgmf7kapi5k0qr4vzk5cyp4kk6q2m7p1dzg"; depends=[plyr raster rgeos sp]; };
+  shadowtext = derive2 { name="shadowtext"; version="0.0.4"; sha256="0fs2sa0y0wamv0c3zw8mka0yczlnlhagmbi8wn26fd31yqqgrh6s"; depends=[ggplot2]; };
+  shallot = derive2 { name="shallot"; version="0.4.5"; sha256="0r1zxpqqdfck7a9f868f9knr1ccnv8kf006milafjci57pvim1fg"; depends=[commonsMath rscala sdols]; };
   shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
@@ -11666,15 +11872,16 @@ in with self; {
   shazam = derive2 { name="shazam"; version="0.1.10"; sha256="1rhd2jh8s548z4p984l0cqn0hgdvnv4mgfbb82k5l4m9p2rsii81"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
   shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; };
   shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; };
-  shiny = derive2 { name="shiny"; version="1.1.0"; sha256="12aw4kmf0j993fj4lpyqlyqzzn0bnniwd55w22p9pa0b3g6n9dbh"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; };
+  shiny = derive2 { name="shiny"; version="1.2.0"; sha256="1wb68vjzclblq5fnhyfxr7n585za3dy4wnxryva0k43fxgyq9kpy"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; };
   shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; };
   shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; };
   shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
   shinyAce = derive2 { name="shinyAce"; version="0.3.2"; sha256="1fbk5i6w6cpam8s3acf4bgdp8hajn4digjjix3i6i4q3p2rvn6zx"; depends=[jsonlite shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
+  shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; };
   shinyFeedback = derive2 { name="shinyFeedback"; version="0.1.0"; sha256="01qp75c5dsvc4xs1id1yhn81gmjl0hnjz8msf8mkvf4ifqal563f"; depends=[digest shiny]; };
-  shinyFiles = derive2 { name="shinyFiles"; version="0.7.1"; sha256="1cbg09l7w2zbgxb4qjm9p873p0lzrihlzsk5xxi3cpxdckn6zsrm"; depends=[fs htmltools jsonlite shiny tibble]; };
+  shinyFiles = derive2 { name="shinyFiles"; version="0.7.2"; sha256="0dlcjrw96x72grg6j915070x8x98l7629pn86gf148iknflm7gd5"; depends=[fs htmltools jsonlite shiny tibble]; };
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
   shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; };
@@ -11682,7 +11889,7 @@ in with self; {
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.6"; sha256="1rw6nwvjsmzfj5fprvg0fasfq079pmdid6vv6rj11wvy7rf40y6j"; depends=[jsonlite shiny]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.3"; sha256="070yy6vq9w97bz17nxbc2z65v05k50hr24dxfcld994bw0910ldx"; depends=[htmltools jsonlite shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.4"; sha256="1fgl024m4cvlw2c6j5gd1439dd7249rif4cjcv5m7676r7nygk1l"; depends=[htmltools jsonlite scales shiny]; };
   shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; };
   shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; };
   shinyanimate = derive2 { name="shinyanimate"; version="0.2.0"; sha256="04knbwv8ls23ibwj0gnnpmvnich9nbakx4pjfawghwlm75z9bpdk"; depends=[shiny]; };
@@ -11697,11 +11904,11 @@ in with self; {
   shinymaterial = derive2 { name="shinymaterial"; version="0.5.3"; sha256="0lddw626mlb6vv474vv22pbjlwl1hgnjs8py3a30d84m94wg7p3z"; depends=[jsonlite shiny]; };
   shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
   shinytest = derive2 { name="shinytest"; version="1.3.0"; sha256="0xgsbw72jpyjw0shg6vb8cxxw3948xhbl2sjx0d376fy2jb1rh43"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch shiny testthat webdriver withr]; };
-  shinythemes = derive2 { name="shinythemes"; version="1.1.1"; sha256="0i220y051dq763idh1j5zhpb5cpv3jr11jd9akmry9aadyys5pz6"; depends=[shiny]; };
+  shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
-  shotGroups = derive2 { name="shotGroups"; version="0.7.3"; sha256="0h6c4fz2b4gpbfqykic6apflvp11bcafqm87gzl0zv8b03ydylxk"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
+  shotGroups = derive2 { name="shotGroups"; version="0.7.4"; sha256="1x2ar8ybb972nd146gqz57hxybxc1myx862wbb743rpa70c7iawc"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
   showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; };
   showtext = derive2 { name="showtext"; version="0.5-1"; sha256="0zb9h6frw580cql0nbkvfb0jajq6k4yhqaifvz8cpysd32dk35wm"; depends=[showtextdb sysfonts]; };
   showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; };
@@ -11715,18 +11922,19 @@ in with self; {
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
+  siebanxicor = derive2 { name="siebanxicor"; version="1.0.0"; sha256="0bnpqqhqvqq9kxvzljzp4d5aw9drh78cwyxyqzdvshijl7mmqjwc"; depends=[httr jsonlite]; };
   sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
   sigQC = derive2 { name="sigQC"; version="0.1.21"; sha256="0794xvkz4fd81gqqpxzn5njv3d34nfxy0jl5zpixlnz0ap4c9vhx"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet RankProd]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
-  sigmajs = derive2 { name="sigmajs"; version="0.1.1"; sha256="05fkwm0lkk3mg59ldc68y8sc58223zw1c3vgvxn09100bf6kfvyr"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr shiny]; };
+  sigmajs = derive2 { name="sigmajs"; version="0.1.2"; sha256="1nvzvfaz29gi5ja4jhycy3bf2j02ixp07v6d8mnx81scf31n1d6g"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr shiny]; };
   sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; };
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
-  signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; };
+  signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="1.0.2"; sha256="1477xc3ba4zm0z73aqyrqd47x84184vp4v0zkzfxjw4y7rkw1anh"; depends=[wrapr]; };
+  sigr = derive2 { name="sigr"; version="1.0.3"; sha256="1i9sdjpwlwcjvy3x4am82f3pfcf5442vmgbi1z4aqryk9was51b1"; depends=[wrapr]; };
   siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; };
   sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
@@ -11749,7 +11957,8 @@ in with self; {
   simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
   simglm = derive2 { name="simglm"; version="0.7.1"; sha256="1y5j0a09svxq7gygw02l906pgs0lwv26qsikjy8vf5rmds58mcfd"; depends=[broom dplyr Matrix purrr rlang]; };
-  simmer = derive2 { name="simmer"; version="4.0.1"; sha256="1vsg4540id6006pp7wdfwz3s7ny6adc3z9ynaw1qad2z0xnxcn6y"; depends=[BH codetools magrittr R6 Rcpp]; };
+  similr = derive2 { name="similr"; version="1.0.0"; sha256="12s1jrhy5cl02hdggbg4dsv8afh9j4gpxhyixvllqaadl7425652"; depends=[R6 Rcpp stringr]; };
+  simmer = derive2 { name="simmer"; version="4.1.0"; sha256="1cy09pbk1dcf5h7yd8s7lry1xv2wnglbdaqi6ywzwzxpyadcl6bh"; depends=[BH codetools magrittr R6 Rcpp]; };
   simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.0"; sha256="1i4vhklky7d837z35859jp5q43aabcw5zk3936017awdsn4fkn9r"; depends=[simmer]; };
   simmer_plot = derive2 { name="simmer.plot"; version="0.1.14"; sha256="0w72064h8s6b2fhz5nv3i6c86wvcxfvhybb96vh5ykr1xkqpybbh"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; };
@@ -11766,7 +11975,7 @@ in with self; {
   simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
   simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-14"; sha256="1sg1zmngpviqpbsy8kxnw4f4x93gy3gh02ykmcw8j9falfnd7g6i"; depends=[lavaan]; };
-  simstandard = derive2 { name="simstandard"; version="0.1.0"; sha256="09jggrcfjjyr248rjr3nfrwmpr843z8h379cyxkl302s9g1qz57s"; depends=[lavaan mvtnorm tibble]; };
+  simstandard = derive2 { name="simstandard"; version="0.2.0"; sha256="1m72ifrfk5adn3hkrwjf90p8k1bpmwai9wrjfg8myycr2s1iiwji"; depends=[lavaan magrittr mvtnorm rlang tibble]; };
   simstudy = derive2 { name="simstudy"; version="0.1.10"; sha256="0wc3464np94m429jrwdna3im1z2r2yq2xxxr212ndw6is0bb5w9s"; depends=[data_table mvnfast mvtnorm Rcpp]; };
   simsurv = derive2 { name="simsurv"; version="0.2.2"; sha256="1dfn156mm08l1cyp6wy69rd9a2lyy7qlbqa59jq35n9fhpjbrif0"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="3.0.0"; sha256="0hfp652s97dz07fs92gfsaiwd6pwg95qsvr6qjwj1k5d3h6hzf8y"; depends=[]; };
@@ -11779,7 +11988,7 @@ in with self; {
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
   siplab = derive2 { name="siplab"; version="1.3"; sha256="1wl7i8i24mwmndkfjbk38kn49x4hrcs52sq1hfw8crqa20knaf12"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
-  sirt = derive2 { name="sirt"; version="2.7-50"; sha256="1l1y65qr1ziapszm4n309q8gahcf55jfi7i2jj5v8wrg2b3g660w"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
+  sirt = derive2 { name="sirt"; version="3.0-32"; sha256="0rxshvpr82j5f90c337jzx8dlz355azm8sfn1xq8kvxjr6brymyb"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
@@ -11792,9 +12001,9 @@ in with self; {
   sizeMat = derive2 { name="sizeMat"; version="1.0.0"; sha256="05dw4hgpw5msgy5cabf5dixr6ma66i9wz9wlajihqkpbg134jz1k"; depends=[MASS matrixStats mcmc MCMCpack]; };
   sjPlot = derive2 { name="sjPlot"; version="2.6.1"; sha256="13qvw2s3r96qfi8kfsn76m050ccnmckl31a9qv94xws8da99v2fk"; depends=[broom dplyr forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.0.14"; sha256="0ayfzhm9bwjfaarq5z0gvn9kapjwj3532azgin97nr5fnjdhvgaw"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.7.5"; sha256="05fjqfr2rfk11065zqkzb9mbqd6mgdkw9jdhq3by425a7f8m2dcg"; depends=[broom crayon dplyr haven magrittr purrr rlang sjlabelled stringdist stringr tidyr]; };
-  sjstats = derive2 { name="sjstats"; version="0.17.1"; sha256="0s9b0xr8gmcm0kh48jkwk8ns0lqknd8kpys4f7czf0xwzmcx2n1z"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 magrittr MASS Matrix modelr nlme purrr pwr rlang sjlabelled sjmisc tidyr]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.0.15"; sha256="0k21z9w5ys42d0ijraaa4l8n9izwsk226xflzhp3065xw4b19b90"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.7.6"; sha256="1jhrigikjpkdar3jxvi7qhqsg6lgjkjqhqll9vaay98b88rfc2im"; depends=[broom crayon dplyr haven magrittr purrr rlang sjlabelled stringdist stringr tidyr]; };
+  sjstats = derive2 { name="sjstats"; version="0.17.2"; sha256="0c7g35vn7r9rylhp0gj1yfslg7jybwrhpqpp7vdcd90xfccih24r"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 magrittr MASS Matrix modelr nlme purrr pwr rlang sjlabelled sjmisc tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
@@ -11804,17 +12013,19 @@ in with self; {
   sklarsomega = derive2 { name="sklarsomega"; version="2.0"; sha256="05ar391bsaixv83dah3qzfi50avsjhn85niyq5n05sb8d5943z9h"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
   skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; };
-  skpr = derive2 { name="skpr"; version="0.56.1"; sha256="110qlb4ksp7c6ipv2w445ziwykqqbvs188gkg6sclb4rnzjy4lix"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lme4 magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; };
+  skpr = derive2 { name="skpr"; version="0.57.0"; sha256="0n33ymjaf3dx6gb753r03fnjqiwsjk997cy81xv9631n2zfn2aa5"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lme4 magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; };
   skynet = derive2 { name="skynet"; version="1.2.2"; sha256="1k6909fm40g6ianzjzbrv93x0fx2l8lnwl38krb7r50g1yk7lnrd"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; };
   skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
   slam = derive2 { name="slam"; version="0.1-43"; sha256="0hy4qzngcgafxxr6ld7n9a9wy979ji998gpcc32vidwyab66dj5h"; depends=[]; };
   sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
+  sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; };
   slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; };
   slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; };
   slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; };
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
+  sloop = derive2 { name="sloop"; version="1.0.0"; sha256="1c6zp5mwbldmy9s8jxyl5n8vbl8n04yrlffzcykvkja5ilgypzkd"; depends=[codetools crayon purrr rlang tibble]; };
   slouch = derive2 { name="slouch"; version="2.1.1"; sha256="1pzvlbqyby12m0pfspbih222mbhdcgmians8khd3yj9570djxqa7"; depends=[ape memoise]; };
   slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; };
   slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; };
@@ -11827,6 +12038,7 @@ in with self; {
   smam = derive2 { name="smam"; version="0.4.0"; sha256="00fgjcx0pqj03f4bhbzdcj8194l0y1rp34qp51p5vnnagdksj11j"; depends=[doParallel foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; };
   smapr = derive2 { name="smapr"; version="0.2.0"; sha256="13nvcfz4c2ipfb6ad9x59fm950prpdd991lzvszkdhsp53d0z9l4"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
+  smartR = derive2 { name="smartR"; version="0.62.0"; sha256="1jc2zvys05xs8y24fsrqkfvg77dpcqd2ydq1rknh0j9m4qhd9x9i"; depends=[caret chron clues cluster foreign ggplot2 ggrepel ggthemes gridExtra gstat gsubfn gWidgets2 gWidgets2RGtk2 igraph jpeg jsonlite lattice mapdata mapproj maps maptools marmap mtsdi nnls PBSmapping plyr R6 RColorBrewer reshape2 rgdal rgeos rjags ROCR rpart scales shape sp spdep sqldf vegan]; };
   smartdata = derive2 { name="smartdata"; version="1.0.0"; sha256="011yhhyfczzp90bzzfy6zh9nl7ikr6g7d0nghx63qvh89i823g2s"; depends=[adaptiveGPCA Amelia Boruta checkmate class clusterSim denoiseR discretization DMwR FSelector functional imbalance infotheo lle magrittr mice missForest missMDA MVN NoiseFiltersR outliers RoughSets unbalanced VIM]; };
   smartsizer = derive2 { name="smartsizer"; version="1.0.1"; sha256="0m474f6dz0izwdh2xvgx6shsbkpr969ckcld56d7c589kjhapbrl"; depends=[MASS]; };
   smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; };
@@ -11845,9 +12057,10 @@ in with self; {
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="2.4.6"; sha256="1fcfhf7vzhvfa977a8wwgg4j1pb763a0yr4jzjkk1ah350h49vc4"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="2.4.7"; sha256="1qpnzvp1l5mqfz8ndl7w6k4ysq7c2b6qdjdkl9hc7rimlx93kmk0"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
+  smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; };
   smoothSurv = derive2 { name="smoothSurv"; version="2.0.1"; sha256="0srb6ms1ag3mllkf2rh0pnji9zp8c11mh8i5zgb6zh1nx2s86x93"; depends=[survival]; };
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
   smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
@@ -11859,11 +12072,13 @@ in with self; {
   smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
-  sn = derive2 { name="sn"; version="1.5-2"; sha256="16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig"; depends=[mnormt numDeriv]; };
+  smurf = derive2 { name="smurf"; version="1.0.0"; sha256="1hrampq7gdk8znn13q56n77z4jxlqmyf6fjiw9g3myv8shcwm69s"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; };
+  sn = derive2 { name="sn"; version="1.5-3"; sha256="10via4lg0vx9pzq350vwhz5wv1dhzxr2l3r6jq99nk37vmyvj8fc"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
   snakecase = derive2 { name="snakecase"; version="0.9.2"; sha256="1g6xai53dl24ws0mwhqrkcv583ziaq505cv3z8v5dhjgy98kilyj"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
+  snfa = derive2 { name="snfa"; version="0.0.1"; sha256="01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb"; depends=[abind ggplot2 prodlim quadprog Rdpack rootSolve]; };
   snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
   snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; };
@@ -11892,7 +12107,7 @@ in with self; {
   softermax = derive2 { name="softermax"; version="0.3.0"; sha256="0shsd7cbj8j8z65flyddkjdpigyyqpw4j6ljl9pl9hwasksi05gk"; depends=[readr xml2]; };
   softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; };
   soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
-  soilDB = derive2 { name="soilDB"; version="2.0-1"; sha256="0nzi0fss77x0bjdzslhy0flwvhap0i0cq3xw82x7sggnbmc3ya72"; depends=[aqp curl Hmisc plyr raster reshape2 sp xml2]; };
+  soilDB = derive2 { name="soilDB"; version="2.3"; sha256="1xgaznpdp3mcqf3z4wnqz9ihr8283swrw90dak846yfddcswvzzy"; depends=[aqp curl Hmisc plyr raster reshape2 sp xml2]; };
   soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; };
   soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; };
   soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; };
@@ -11901,7 +12116,9 @@ in with self; {
   solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
-  solrad = derive2 { name="solrad"; version="0.99.0"; sha256="1r3bz2nvg660bfba9xbqlzrysvn0wpmn948qx3hfbqcv5ihcnly3"; depends=[]; };
+  solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; };
+  solitude = derive2 { name="solitude"; version="0.1.0"; sha256="0kfjp2zrlpxwgriv2b0br0ij0bnjkhjyqw532f89378s9jy6izsf"; depends=[data_table igraph ranger]; };
+  solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; };
   solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
   solvebio = derive2 { name="solvebio"; version="2.6.1"; sha256="17zcnfmccfl2njv1ph40jchxb06x0qhgn82fz4yg8nqyf8b9cq5h"; depends=[dplyr httr jsonlite mime]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
@@ -11910,7 +12127,7 @@ in with self; {
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="3.6"; sha256="1znp5svj2l2632ivnilc0060x8k8mbiv55ppgfcmnj5d22vlb06q"; depends=[data_table lattice MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="3.7.3"; sha256="0hbkb75yimgrp5ap2izazd1v2v9qpb1na893vj7vbr6kcx80zs82"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -11935,8 +12152,8 @@ in with self; {
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
-  spCP = derive2 { name="spCP"; version="1.0"; sha256="1qi5p77kjwkv8c84j20mx0zm4y4vycip4ghgf6jqhn14d4ifvkmj"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
-  spData = derive2 { name="spData"; version="0.2.9.4"; sha256="039rf7c5npv0xhw46ja5igravi3l0zcg9vfkngza1vn4zwgg1yi8"; depends=[]; };
+  spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
+  spData = derive2 { name="spData"; version="0.2.9.6"; sha256="059nly4gdfg0zxwkbkql6ai4jczcslwvdmdr34dqinjlnb7nw547"; depends=[]; };
   spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; };
   spGARCH = derive2 { name="spGARCH"; version="0.1.6"; sha256="10ksbqk5s9qq6lz17h07kmg2gr1ppq2rjm06kipscs9v0zldki9l"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
   spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; };
@@ -11945,15 +12162,15 @@ in with self; {
   spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; };
   spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
-  spTimer = derive2 { name="spTimer"; version="3.2"; sha256="1hw40jb8n9amg3i1lyjlc26gpafxd0jjf3yw5r24pqlh0d11n0i7"; depends=[coda extraDistr sp spacetime]; };
+  spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="2.5.0"; sha256="00y2n0k9qq54qa1vz72q7g6m3nq62n6wm3vxx2c540k404kil8p3"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.5.11"; sha256="1vas9b4s495vh6w4i0kilv9psyhw5amb597x5r95dysgp53xa15s"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
   spaceNet = derive2 { name="spaceNet"; version="1.0.1"; sha256="005jz7bm3c7zi3pgm8wyivc2kl058c0lwdjjzv0qb1vdsq9mpxx1"; depends=[MASS permute RcppTN Rfast sna vegan]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
   spacesRGB = derive2 { name="spacesRGB"; version="1.1-1"; sha256="1298dxzli8f4bpv8114y7d9r7d2i80qvbmc9n67znpg5wdib79b7"; depends=[]; };
-  spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-1"; sha256="1v6ancnd0k6rpf5b4bh4ndk9d8rlvlqd17snnlq53mr1pm9a2hp8"; depends=[]; };
+  spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-4"; sha256="04387yrz9kmr4y10d6dg2z0nn56qafgi1v08jfw5wcwq12cm7052"; depends=[]; };
   spacetime = derive2 { name="spacetime"; version="1.2-2"; sha256="0bgaarh2ibj3z6z504mzcb94x6w2bh5vyn1ar1lllqf4wn93z78y"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
@@ -11964,16 +12181,17 @@ in with self; {
   spam64 = derive2 { name="spam64"; version="2.2-0"; sha256="1kyj93drzvd4ph6x7wr318xq3ldrrdxb17rwxws39wa4gj7jkmkg"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="0.11.0"; sha256="0fy5fsiqf4sgrlzrfy16affdz83f564qm6369jsv6jcdxcsl3pmv"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
+  spant = derive2 { name="spant"; version="0.12.0"; sha256="17668h6m7bfjyp5imr9zgkhhlaqwnrajqpvira0kns6hh99w2ysn"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; };
   spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
   spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; };
   sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
-  sparkavro = derive2 { name="sparkavro"; version="0.1.0"; sha256="0jihqvjs7dgyxhyzhsbki7khy7fjniwf9xwlangzqfi4rcan8g7x"; depends=[DBI dplyr sparklyr]; };
+  sparkavro = derive2 { name="sparkavro"; version="0.2.0"; sha256="005pdfb08clq2fsabdxcbmd4n8nj5ix6yqk5pxpv3gvrzw8s7y32"; depends=[DBI dplyr sparklyr]; };
   sparkbq = derive2 { name="sparkbq"; version="0.1.0"; sha256="0jcxnivi5zfbixmdywhn1v42lxi085wh7r4c26laclz9j2wvj8mk"; depends=[sparklyr]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="0.9.2"; sha256="06jkxp7y57fs2ij1rzr56lf3a5900l6a0aq24qapyyn6jsvrk00h"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr forge httr jsonlite lazyeval openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi shiny tibble tidyr withr xml2]; };
+  sparklyr = derive2 { name="sparklyr"; version="0.9.3"; sha256="119wbric965rj5mn4rz7hjxq91w83pc9kj2dmdbp1sqisng1ph7y"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr forge httr jsonlite lazyeval openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi shiny tibble tidyr withr xml2]; };
+  sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; };
   sparr = derive2 { name="sparr"; version="2.2-13"; sha256="1cn8bzlfairfrxfwwdap0pnaa97rn9h13jz54il8cn9zacnzb8yc"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
@@ -11997,7 +12215,7 @@ in with self; {
   sparsesvd = derive2 { name="sparsesvd"; version="0.1-4"; sha256="1yf373552wvdnd65r7hfcqa3v29dqn7jd4cn431mqd2acnqjrsam"; depends=[Matrix]; };
   sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; };
-  spartan = derive2 { name="spartan"; version="3.0.1"; sha256="15gn72cgbb3hf6grq2hhh2vxd3in0jp62k11qfap6fy9rm4cnqg6"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
+  spartan = derive2 { name="spartan"; version="3.0.2"; sha256="040iq7y5fk93zcvbinnmlhj9l8w3bjq3yqcf7v715i77hx5d18bs"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
   spass = derive2 { name="spass"; version="1.2"; sha256="0vf7fl68ibv6bwj6v3mh7d0l809kxlcjjgpwqhpgrkqmk1qvzgss"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
   spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; };
@@ -12016,10 +12234,10 @@ in with self; {
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; };
   spatialwarnings = derive2 { name="spatialwarnings"; version="1.2"; sha256="1kpyx1jl23ml4gpbwz5p4srmdq58634dxznw1g6f618wml13ab3s"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
   spatsoc = derive2 { name="spatsoc"; version="0.1.4"; sha256="0h41ql1ll1ypmwfjczk3pls78z75xz8qakl61xrynqmw0y7l9fys"; depends=[adehabitatHR data_table igraph rgeos sp]; };
-  spatstat = derive2 { name="spatstat"; version="1.56-1"; sha256="0q3srg3rdnvwz52lqpamhhj97nkxkl55kqk2dw1707iic14dv0w6"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.57-1"; sha256="1mpwh65g2jp2m58whwi6sw1ngajdrgn7sd64xmnijplcwjyy9zvr"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
   spatstat_data = derive2 { name="spatstat.data"; version="1.4-0"; sha256="137cf9x6qcp7lw3rpjqizsy73z99yihff8gr434wlz7b5fwmn7hj"; depends=[spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; };
-  spatstat_utils = derive2 { name="spatstat.utils"; version="1.10-0"; sha256="1wmakkc9b8vzyjdjwgr15hf676lrx11kxgmg3mbl0r9i72lflnvs"; depends=[]; };
+  spatstat_utils = derive2 { name="spatstat.utils"; version="1.13-0"; sha256="0wijib2fmmvz5sf2sp212ms88ffhcz9c1d0j2ljdxf222lp6v8l1"; depends=[]; };
   spatsurv = derive2 { name="spatsurv"; version="1.2"; sha256="0acg6n5qs3z9c7y2n3amla61dm3z1p16njkx0h52dlgdbj5v1nhn"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.6.0"; sha256="118r2yjfmzm0bi3ccx9pzi56vw2kbjz0pbxrjqdks0075fk7ij0q"; depends=[]; };
@@ -12029,13 +12247,13 @@ in with self; {
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="0.7-9"; sha256="17sx6zkrnmbhhqqjb9qgp9mmykszqqr2hw3npk8q74k567mgxgcm"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
+  spdep = derive2 { name="spdep"; version="0.8-1"; sha256="1c13y9zjklqr6y87kra9i9mcf5n0zvd80iqmhg5l9bdzpd6x3h8b"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; };
   spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="2.3.3"; sha256="1zrm8xd2laix1rl4fgxscciia9sn932q44p0dsphpd1wr63sh6mv"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
+  speaq = derive2 { name="speaq"; version="2.4.0"; sha256="1r65hmy050m69bjx6r6fkmwmqi8r1zlds2wg4vw9wj289klh8bvi"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 Rfast rvest xml2]; };
   spearmanCI = derive2 { name="spearmanCI"; version="1.0"; sha256="1xi51dphv91j5hgrd25sqs1li0g24cwpa1k162arw5b0qfl04f17"; depends=[emplik MASS]; };
   spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
@@ -12092,7 +12310,7 @@ in with self; {
   spmoran = derive2 { name="spmoran"; version="0.1.6"; sha256="15cz3ivs20yspdz36279gjcc4w4lr5anb5dyyl96lvz6gjdacb4g"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
   spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; };
-  spocc = derive2 { name="spocc"; version="0.8.0"; sha256="00wm3fkwzcma847kfxliap66sr0i6vfr0kpkvcdjidgk3z51y3bw"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
+  spocc = derive2 { name="spocc"; version="0.9.0"; sha256="1azid8girmj4f0j4x9irljpxbsdpsxz572grb4fdjdxmlzpls7sy"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
   sport = derive2 { name="sport"; version="0.1.1"; sha256="0sqlnapmfdmpsxs5gapcw8k4dbc5jfc48qa6lirvfqz85yg2xzxs"; depends=[data_table ggplot2 Rcpp]; };
@@ -12101,6 +12319,7 @@ in with self; {
   spp = derive2 { name="spp"; version="1.15.5"; sha256="097rb34kk20varsdf0d9gf3k2hxbislsirzgjm61ksrzmj96fj0w"; depends=[BH caTools Rcpp Rsamtools]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
   spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; };
+  spreadr = derive2 { name="spreadr"; version="0.1.0"; sha256="1azf1543ijlgmry0f2sxivpy4hk9mcwnn5kqggzwwzwla2ql3lhj"; depends=[extrafont ggplot2 igraph Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
   sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
   sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; };
@@ -12129,16 +12348,16 @@ in with self; {
   ssc = derive2 { name="ssc"; version="2.0.0"; sha256="0w7c0blqny7dyjh1a6l9lr7nysgpmasfqbf7wf368rwmv59pk0b3"; depends=[proxy]; };
   sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
-  ssdtools = derive2 { name="ssdtools"; version="0.0.2"; sha256="193b7qq57vzhv45bvnqz0vh8z89zm83gq8c6ayadw8sbxcras4rs"; depends=[actuar checkr dplyr FAdist fitdistrplus ggplot2 magrittr plyr pryr purrr scales tibble VGAM]; };
+  ssdtools = derive2 { name="ssdtools"; version="0.0.3"; sha256="1q6mg28bp48bgzr2ahbw16d9zbadhpq3mnd91c15cm4dq1airksv"; depends=[checkr FAdist fitdistrplus ggplot2 scales VGAM]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
   ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
-  ssgraph = derive2 { name="ssgraph"; version="1.5"; sha256="0d8zfk6q3q2krjyhkpb7h08cmgx7hsw4q7qhpzsbb3pjma0pkad7"; depends=[BDgraph igraph Matrix]; };
+  ssgraph = derive2 { name="ssgraph"; version="1.6"; sha256="0jann5jj95w38hk3l0w5psvymfnyjbpgzynqm724vcsc2yc1wb5n"; depends=[BDgraph igraph Matrix]; };
   ssh = derive2 { name="ssh"; version="0.3"; sha256="0javjjl8bay18hg69fwwkmkzfin42yqlcafw0g6w9wslbm5a7fxh"; depends=[getPass]; };
   ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
   ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
   ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.9"; sha256="1916r0hmhpfa0p1s8myqk8g4i8fgjqkm4wvpb4nf3sl69kfdva95"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
   ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; };
-  ssmrob = derive2 { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; };
+  ssmrob = derive2 { name="ssmrob"; version="0.5"; sha256="06l8ihincmmqz2awd44d1aac66lgqw9i1f1p4hj3y51z7781jwgw"; depends=[MASS mvtnorm robustbase sampleSelection]; };
   ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; };
   sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
   sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; };
@@ -12159,7 +12378,7 @@ in with self; {
   stablelearner = derive2 { name="stablelearner"; version="0.1-1"; sha256="19mvk6dzg8zg0nj1q4sraqg6h3zj8xvnfc0jql1xiqas9wcypx7d"; depends=[e1071 MASS partykit]; };
   stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
   stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; };
-  stackoverflow = derive2 { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; };
+  stackoverflow = derive2 { name="stackoverflow"; version="0.3.0"; sha256="184iz5ng7d31cgnn0b51hh11h1mn6pjdkfcm7ssvgbhs83j2x4r6"; depends=[]; };
   stacomiR = derive2 { name="stacomiR"; version="0.5.4.0"; sha256="0spkv1xx6mh2v41pba0gasymsb80xvqi42a3v0qqvd0ib8sgj2k7"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; };
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; };
   stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
@@ -12205,6 +12424,7 @@ in with self; {
   stepR = derive2 { name="stepR"; version="2.0-2"; sha256="0inxlgihyivfr0l4gk8zq0043l9s5w4r3x3hwjlzfwbqjkwy1rjs"; depends=[digest R_cache Rcpp]; };
   stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; };
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
+  stevedore = derive2 { name="stevedore"; version="0.9.0"; sha256="00wjy0wh9f0a0qiwd2r8a0bywwhfkwa5qq75grphpc4gamcybrc9"; depends=[crayon curl jsonlite yaml]; };
   stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
   sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; };
   stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; };
@@ -12215,7 +12435,7 @@ in with self; {
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
   stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
-  stminsights = derive2 { name="stminsights"; version="0.2.2"; sha256="13b94z4wp24hbmwz1hkyds2p7adp48rvp6rd7lh0l3qm0k3q6krb"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
+  stminsights = derive2 { name="stminsights"; version="0.3.0"; sha256="11lhsk7l11bcxsmc7hm8pnwj75634m5gkigr714i16ai2dkvzqpq"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
   stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
@@ -12243,17 +12463,17 @@ in with self; {
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
   stream = derive2 { name="stream"; version="1.3-0"; sha256="0wj6j070wmiw50vmjs075jm7k7aaryq4qm8dnj522vr7g0ryvkdh"; depends=[animation BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamMOA = derive2 { name="streamMOA"; version="1.1-4"; sha256="09vspcz806j2f397hr8h685vy4xbx419bbha91f44s3bhks1y7fr"; depends=[rJava stream]; };
-  streamR = derive2 { name="streamR"; version="0.4.4"; sha256="0xb0bzp3axflwrbxc6zsscmq8bn7qhlsk00l10qlxm4h1mh8xnlb"; depends=[ndjson RCurl rjson]; };
+  streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; };
   streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-  strex = derive2 { name="strex"; version="0.1.2"; sha256="12hbzlkihzvmyd8qx147bk57cia2db4w9k6wh7csbbqp95cy77bi"; depends=[checkmate glue magrittr matrixStats ore purrr Rcpp rlang stringr tibble]; };
+  strex = derive2 { name="strex"; version="0.1.3"; sha256="1hd3f5qi7gl0hqd18hx4ic5fyvn38ayr3n226n76mw11gx76mgya"; depends=[checkmate glue magrittr matrixStats ore purrr Rcpp rlang stringr tibble]; };
   strider = derive2 { name="strider"; version="1.1"; sha256="00r6gbvwmla5h27iyi7rdfd0kr4alxz19fd7g2ba0in3779za3sw"; depends=[BH Rcpp]; };
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
   stringdist = derive2 { name="stringdist"; version="0.9.5.1"; sha256="0gap1g9xwhp0zxqsznkc2carpvi80z03prr4q8m528684lznx2xa"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; };
   stringi = derive2 { name="stringi"; version="1.2.4"; sha256="1y46xab7g1lsjmilp4hbl7pjad6pcxp66hdj8wnfdg9518h0lmq1"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.3.1"; sha256="0hq3ybz7clnifi5wdm2s6p2i0kzljdkv26blg6yphng472h8x2vs"; depends=[glue magrittr stringi]; };
-  strip = derive2 { name="strip"; version="0.1.7"; sha256="1nzl5513s0gfd3mhnp9xzmhaj8q46lmdpv7j5jni8f50pnm3niay"; depends=[rlist]; };
+  strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
   striprtf = derive2 { name="striprtf"; version="0.5.1"; sha256="1pv67grm8fb1plsfxrfrmv0yk6cjnf44ssawddlcxy9mvg3ka5mm"; depends=[magrittr Rcpp stringr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
@@ -12265,7 +12485,7 @@ in with self; {
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
   stuart = derive2 { name="stuart"; version="0.7.3"; sha256="0xd85ijshhsyzkm22vacjl2p7ni8x3zfypmrwmvvba5x9l82s3hi"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
-  styler = derive2 { name="styler"; version="1.0.2"; sha256="0rsbaszwr0089imcwracjss52ivjzlcba9j0sqvpza4qgd0yjmd4"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
+  styler = derive2 { name="styler"; version="1.1.0"; sha256="1z24mi88snbz1avjw9phq0lzmigddvycc56s83nxzr9w9z85mh05"; depends=[backports cli magrittr purrr rematch2 rlang rprojroot tibble withr xfun]; };
   stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; };
   stylo = derive2 { name="stylo"; version="0.6.8"; sha256="1j27hyjsjs3y76lb0pn92ng23q0lk7w69vdx3429q610dixqdfim"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
@@ -12289,8 +12509,8 @@ in with self; {
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; };
-  sugrrants = derive2 { name="sugrrants"; version="0.2.0"; sha256="0860jc979f5j0697hksx5bzrrmq7jqi9461w3f1m9xbgd0d01ag2"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
-  sumFREGAT = derive2 { name="sumFREGAT"; version="1.0.0"; sha256="13g3px3c3dxacrvgwrvqdp8lm7k185npr0dlq3siq9x9mgjr7hsj"; depends=[Matrix]; };
+  sugrrants = derive2 { name="sugrrants"; version="0.2.1"; sha256="1k683h6z5dl01l0n3k8ivrbrl9byl9l38r9jq49hl70wbi9x810p"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
+  sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
   summarytools = derive2 { name="summarytools"; version="0.8.8"; sha256="0z836m6ib9bznwcawn6xf8gck05ydxwi3bx4jbrbyqql4kci8zwb"; depends=[htmltools lubridate matrixStats pander pryr rapportools RCurl]; };
   sunburstR = derive2 { name="sunburstR"; version="2.1.0"; sha256="0dg988fnm9z1p14j2l604q4aqb83vrijvafbpc1l4kn0dg3cs1ff"; depends=[d3r dplyr htmltools htmlwidgets]; };
@@ -12313,6 +12533,7 @@ in with self; {
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; };
   surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; };
+  suropt = derive2 { name="suropt"; version="0.1.0"; sha256="11raanq6ijw8mmqsffqcckxvkc0pf8xyhwgyx97631mvpvxx6yqp"; depends=[DiceKriging DiceOptim dplyr emoa GenSA ggplot2 GPareto lhs mco pso purrr rgenoud tibble tidyr]; };
   surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; };
   survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
@@ -12320,7 +12541,8 @@ in with self; {
   survAccuracyMeasures = derive2 { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; };
   survBootOutliers = derive2 { name="survBootOutliers"; version="1.0"; sha256="1gfh2n1kd1m4bpd1j7islm5ar1qmzycnmfpb8zl8ghv0z5rf5f09"; depends=[survival]; };
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
-  survHE = derive2 { name="survHE"; version="1.0.64"; sha256="1vqfvmr2dza8hw61b5q0wl22b7gpca7llpq5swdclnll1narff5i"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
+  survELtest = derive2 { name="survELtest"; version="1.0.0"; sha256="0kqwiskwc1jr9r529ddyd28pj2j44iic69335kkhf5kkad8qx5jj"; depends=[Iso nloptr plyr survival]; };
+  survHE = derive2 { name="survHE"; version="1.0.65"; sha256="0phhcn3gm5l2q8q4j7v8x7bsbk5a8ivqjvyxh45vgh5lrg6zpqg1"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
@@ -12333,13 +12555,13 @@ in with self; {
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive2 { name="survey"; version="3.34"; sha256="09024mqkbm5aak9rsi9qw97d3xrq2dba3z2hyvydncygjmjymy65"; depends=[lattice Matrix minqa numDeriv survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
-  surveydata = derive2 { name="surveydata"; version="0.2.0"; sha256="1iwhjhazfy38dbcj224kz3zbw2nvpq01ry54wmmkg9d0n6mb02h4"; depends=[dplyr magrittr plyr purrr stringr]; };
+  surveydata = derive2 { name="surveydata"; version="0.2.2"; sha256="0rxyyvpl972z2qr54cwhm1il80kb1vvmvn9r8mji01nyxw6d9l91"; depends=[assertthat dplyr DT ggplot2 magrittr plyr purrr rlang scales stringr tidyr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; };
   survidm = derive2 { name="survidm"; version="1.1.0"; sha256="1piwhb8zsqnw284xp0l3ajs8r9amyn8yfng19hkci574mkdgsw4f"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
   survivALL = derive2 { name="survivALL"; version="0.9.3"; sha256="0lnvs7b097sl21gvnfafdprzvh197p1q4nzzagkdf4xm1xw8pj0h"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; };
-  survival = derive2 { name="survival"; version="2.42-6"; sha256="1bsxc2fir9pbvdzy9n474fkl7har606h9zhspp0z67wnjpp48g73"; depends=[Matrix]; };
+  survival = derive2 { name="survival"; version="2.43-3"; sha256="0ldrjja1dj4n1ic0lbggm7jvk52sl5h85i8m23nrgndi60acsv4r"; depends=[Matrix]; };
   survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.0"; sha256="148l6qp9gwzpjh7hky9bayggal9cw629xabl34iklqvqlz1im7gb"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
@@ -12364,7 +12586,7 @@ in with self; {
   svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
   svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; };
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
-  svars = derive2 { name="svars"; version="1.2.1"; sha256="1kdnrwwrb903a53qr8ppwyw7p0nhgxwgpj2yyd0w248nwswfwhfz"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA strucchange tsDyn vars zoo]; };
+  svars = derive2 { name="svars"; version="1.2.2"; sha256="0ajiw22lrwi4s7vya42c6xxa4mlx44axxhdcvw20ksykkr350bxq"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA strucchange tsDyn vars zoo]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.4.1"; sha256="00plnwrjnp3majssr3qbz2zp25z9cfivgpggyfvy4lnc4av5qn3g"; depends=[]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
@@ -12393,7 +12615,8 @@ in with self; {
   swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
-  switchr = derive2 { name="switchr"; version="0.13.0"; sha256="1ij97gz31gxbmd0fwsw950vhgyd1py3xr4vlh7q98ba1ldzw8dg1"; depends=[RCurl RJSONIO]; };
+  switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; };
+  switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; };
   swmmr = derive2 { name="swmmr"; version="0.8.1"; sha256="0zl00864x9q6a2aqdbqs3b5kw6z50wgr46c62kxk9xkns8317sa7"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
   sybil = derive2 { name="sybil"; version="2.1.2"; sha256="1nfhh696hrajmxg3z36rjgp7bmgsxiz7hpyz00y0w1qkjczbbph3"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
@@ -12414,9 +12637,9 @@ in with self; {
   synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; };
   synchrony = derive2 { name="synchrony"; version="0.3.7"; sha256="0lnin4aphy1lq20bn7nsdj0ymy2xdwjzdj2f89xq0qwkc7w7b5jb"; depends=[]; };
   synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; };
-  synoptReg = derive2 { name="synoptReg"; version="0.1.0"; sha256="1d1341b2al6qjhdx2s2ww9lfr3pz7hxc9gv41vgvh4bw8pxcd48d"; depends=[fields maps ncdf4 raster zoo]; };
+  synoptReg = derive2 { name="synoptReg"; version="0.2.0"; sha256="1mqyciards48j6x1h82xxvq67wqrb7nqxn9cvz5vx0zgfwk0ywdb"; depends=[fields maps ncdf4 raster zoo]; };
   synthpop = derive2 { name="synthpop"; version="1.5-0"; sha256="0p0dszrh66xzfaiks89qli23c8qzq8gvi4d7wwlngkmq4k8y80rq"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; };
-  sys = derive2 { name="sys"; version="1.6"; sha256="16jkdfik3n7h1cjas7qgxkv9z1fv8mcsm0mx6jsfyj180bp2a49v"; depends=[]; };
+  sys = derive2 { name="sys"; version="2.1"; sha256="10ml2492bdllh6cz2zl192ip0fdgjkkgayggd3ghswsj5gjv5hrh"; depends=[]; };
   sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
   systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; };
@@ -12434,16 +12657,18 @@ in with self; {
   tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; };
   tableone = derive2 { name="tableone"; version="0.9.3"; sha256="0wcp4ip9ww56sffnd9v0p73a50aakdnx0gs98qniy6g3z86s328j"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; };
   tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
-  tables = derive2 { name="tables"; version="0.8.4"; sha256="1d4w3gjl5v8jnmdizg0rmnyxa9z3pxi3k226kc7nh7jfm8m9raif"; depends=[Hmisc knitr]; };
+  tables = derive2 { name="tables"; version="0.8.7"; sha256="0lsmgna7bkad9fns9a9qkn60gmsk9g6bk08rgx9i3r7j9r5hsq45"; depends=[Hmisc knitr]; };
+  tableschema_r = derive2 { name="tableschema.r"; version="1.1.0"; sha256="0ny683p9kaidj5bayz77hyvsaqg3jk87pb95271znk8hzhl2jlcj"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; };
   tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; };
   tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
   tabr = derive2 { name="tabr"; version="0.2.0"; sha256="1wmb1ywlsx2fqc9rg6hfi1anjiq4g552y65b0nflbv5yxsw96wsk"; depends=[dplyr magrittr purrr]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
+  tabula = derive2 { name="tabula"; version="1.0.0"; sha256="1w3lk5999hnxbpyg4kvihd9sydm85b8yzqxjwd8mkhz6amxi55n8"; depends=[dplyr FactoMineR ggplot2 magrittr rlang tidyr]; };
   tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; };
   tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; };
   tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; };
   tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
-  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.0"; sha256="0i69zyiqq8mc5wfc9r43dpcjhwmq4iwj605n4a6h4hma37jjnc2g"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
+  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.1"; sha256="0xqvg73l00kskgg7ipcc19rvi9n5ylwnaph5g5x8iwgim5dhcb9s"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
@@ -12466,12 +12691,13 @@ in with self; {
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
   tbl2xts = derive2 { name="tbl2xts"; version="0.1.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
+  tbltools = derive2 { name="tbltools"; version="0.0.2"; sha256="07p2gwqwd11wcb25iz2vsgw5wp0hzdlrb6f7cxxfh2h8r4c9knb4"; depends=[rlang tfse tibble tidyselect]; };
   tbrf = derive2 { name="tbrf"; version="0.1.0"; sha256="011p14jbgswbkb1habk09117a8aywzg8zzdaz0qmyr9icab7dpf1"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; };
   tcR = derive2 { name="tcR"; version="2.2.2"; sha256="0r44l47pyvj8zc0qa74y048yzjvwf7qrcf635cq656spmf1yszl0"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
-  tcgsaseq = derive2 { name="tcgsaseq"; version="1.6.6"; sha256="0sk8fydhfx1c3mrir3qx8bqcif220l6ggzmlw9yw8faha210ak2y"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; };
+  tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
   tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; };
-  tcpl = derive2 { name="tcpl"; version="1.4.3"; sha256="0b588in2xmdvybzfbbr0ik9mf0ls6k31nbrdpl7ijvxg2xfxfr1w"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; };
+  tcpl = derive2 { name="tcpl"; version="2.0.1"; sha256="16a245wvyckkc2hxq57gcwd4d29ri3c9nn44amwiy779gc2rb0sm"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; };
   tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
   tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; };
   tdsc = derive2 { name="tdsc"; version="1.0.0.1"; sha256="17nr5fa4f16ww8si8qikbqmixl38jxjy185b80ff2i5v4129mnwd"; depends=[data_table]; };
@@ -12483,25 +12709,26 @@ in with self; {
   teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; };
   telefit = derive2 { name="telefit"; version="1.0.0"; sha256="1g54alrkigbrcf9p7np4cbzdzn3hjch70wvv5d0qxrj1xbbz0rgg"; depends=[abind coda cowplot doRNG dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules SDMTools sp stringr]; };
   telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; };
-  telegram_bot = derive2 { name="telegram.bot"; version="1.0.0"; sha256="10i126wa5dbpzxvr8f9zysfwg53051sk9cjdpdrjva1p3yvyn143"; depends=[httr R6 telegram]; };
+  telegram_bot = derive2 { name="telegram.bot"; version="2.2.0"; sha256="0kw3z7zmaa8vk12rgsdcfxwc2mwj0cawrnqyin7f9c1yi49gilfy"; depends=[curl httr jsonlite R6]; };
   tempR = derive2 { name="tempR"; version="0.9.9.15"; sha256="00xxrwzbqcsvb50xcrr4aii4fjcfa8bc25jn0zvg4dxmww8w4s1r"; depends=[]; };
   tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
   tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; };
+  temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; };
   templates = derive2 { name="templates"; version="0.3.0"; sha256="0xnzj3cvhw1r7zfqaijbfdyclka61jwixcdh05a5z9qwgv0076sh"; depends=[dat magrittr stringr]; };
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; };
   tensorBSS = derive2 { name="tensorBSS"; version="0.3.4"; sha256="0wh14qy7fa7klb7yy272d16cvgfgnrf25wba3bqbpral9pv5nkmv"; depends=[ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
-  tensorflow = derive2 { name="tensorflow"; version="1.9"; sha256="0g346xzjkq7bsbdchcp6k5lzx7242vamf1zj0clgmpidqz4afhf3"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
+  tensorflow = derive2 { name="tensorflow"; version="1.10"; sha256="15zzirwxwfp29a180w5kkb4dgmzc79zfi0w0hzsh8r5j7hnvcf7r"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
   tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; };
   tergm = derive2 { name="tergm"; version="3.5.2"; sha256="0p7qcr59p6n7snzspv02m8gn26rgk3rp2hxilmp5jailk43zid35"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
-  tesseract = derive2 { name="tesseract"; version="2.3"; sha256="14v6ac0p6nc76ks1vkrcz74lpmib7hrp5m6gw4vh6pl68cwmd0y6"; depends=[curl digest pdftools rappdirs Rcpp tibble]; };
+  tesseract = derive2 { name="tesseract"; version="4.0"; sha256="1dadr3q0g8vr44rc0xmhism8llq3awl4svvrcghlrv7m85zps9ih"; depends=[curl digest pdftools rappdirs Rcpp]; };
   testDriveR = derive2 { name="testDriveR"; version="0.4.0"; sha256="1ri5wa0qab3mn921vycxrmzhs0g95dsdj1vxvcr5a999wggwabak"; depends=[]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
-  testit = derive2 { name="testit"; version="0.8"; sha256="1xwpimphcv23ps824s6s77y9w8xww0imm22qmgs61bifjsfc3a88"; depends=[]; };
+  testit = derive2 { name="testit"; version="0.9"; sha256="0mayvbzfg7zkr9n38h0z9rkzxgpsck5vimfbgm70ww1ckggv7xlw"; depends=[]; };
   testthat = derive2 { name="testthat"; version="2.0.1"; sha256="1cafy5xsjx6m08s45456mjsal7mfxzwpbrds0p4z3gwam948gpzy"; depends=[cli crayon digest magrittr praise R6 rlang withr]; };
   testthis = derive2 { name="testthis"; version="1.0.4"; sha256="1gdfpxrgk801ai98mla7hczsa4m85wqsjbc3xk7ngq0dd0knz2j3"; depends=[assertthat devtools magrittr pkgload stringi testthat usethis]; };
   tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; };
@@ -12510,14 +12737,14 @@ in with self; {
   texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; };
   text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; };
   textTinyR = derive2 { name="textTinyR"; version="1.1.2"; sha256="177m3mh61isjk9svbnv5gdlpyfy7fdmafi2znxh2m7fqcwn7k3af"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
-  textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
+  textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
   texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; };
-  textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; };
+  textfeatures = derive2 { name="textfeatures"; version="0.3.0"; sha256="07xi4bdpf5zibhs83wwv8sh58b8avmnm7f5j8gcai4195wwqflnn"; depends=[dplyr purrr rlang syuzhet text2vec tfse tibble tokenizers]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
   textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; };
-  textmineR = derive2 { name="textmineR"; version="2.1.3"; sha256="120zhg63q09m1fs08kivw15scvy2dc66xc9f1vrd4vgx8wlgn70b"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm]; };
+  textmineR = derive2 { name="textmineR"; version="3.0.1"; sha256="1bwqwda1c18qx8gjg6ikk3fgxhfq27l67f32qczhlc64v8j7zbks"; depends=[Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; };
   textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textrank = derive2 { name="textrank"; version="0.2.0"; sha256="0s2mnid3dha3nyyc9abhb36vlij4bg0024i9ay4pvvy4l1x947gr"; depends=[data_table digest igraph]; };
@@ -12529,12 +12756,12 @@ in with self; {
   textutils = derive2 { name="textutils"; version="0.1-9"; sha256="13fy5krm8giprw0jjdws8p4c5fra6r4vhbyzpf5aksacy125j66y"; depends=[]; };
   tfdatasets = derive2 { name="tfdatasets"; version="1.9"; sha256="1djq3ywkzbnmmfr3fbdi6pg4sapqjh53dm2p5bil8f41maak12b7"; depends=[magrittr reticulate rlang tensorflow tidyselect]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
-  tfestimators = derive2 { name="tfestimators"; version="1.9.0"; sha256="0yfnwiszxypzinzl2qzbl317lm1xfshg4228c7h6z8im5da59x9p"; depends=[magrittr progress purrr reticulate rlang tensorflow tfruns tibble tidyr tidyselect]; };
+  tfestimators = derive2 { name="tfestimators"; version="1.9.1"; sha256="0da34iy7fyfzhbvaj8494sl6nrmhcfbqcr71l95ziaxgb8285ndm"; depends=[forge magrittr progress purrr reticulate rlang tensorflow tfruns tibble tidyr tidyselect]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
   tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; };
   tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; };
   tfruns = derive2 { name="tfruns"; version="1.4"; sha256="1mqv5m13qm1dqz0622jd5ayb3nk76lfa657y2hyqv261flxizhvg"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; };
-  tfse = derive2 { name="tfse"; version="0.4.2"; sha256="06d2v69xcikzilbc1hkl1hw54r3sjng7mgiswyg0san50swgs7l2"; depends=[]; };
+  tfse = derive2 { name="tfse"; version="0.4.4"; sha256="05bm3hhi62xd47pxlxq2wrjh9g7yn4nbkps90v39b5dir3iag9nx"; depends=[crayon]; };
   tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; };
   tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; };
   tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; };
@@ -12560,27 +12787,27 @@ in with self; {
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-  tidyLPA = derive2 { name="tidyLPA"; version="0.2.2"; sha256="0z9yh4wa9mzly5g3jkqap70zh7l3s2xzgjjrhzyvshd82g1bs7ac"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
-  tidyRSS = derive2 { name="tidyRSS"; version="1.2.6"; sha256="1kwc0bnpz4gi05j2yz6c4r30jhd1dvcqcpajaxlmnwnblpcp033f"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
+  tidyLPA = derive2 { name="tidyLPA"; version="0.2.3"; sha256="02qmnqp0zc494nj9331h4y5pzyvhfxbjrk3chqafrl44w9x2jbh2"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
+  tidyRSS = derive2 { name="tidyRSS"; version="1.2.7"; sha256="0834g61fxdwvpxdr0a65k4k35iazwwzv792zjwj46391a2nmq5h7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
   tidybayes = derive2 { name="tidybayes"; version="1.0.3"; sha256="1dkkzfbbq94vrrswf3g6dcds4vpvjn2kldf91f7642qf6kdgy135"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggridges ggstance HDInterval LaplacesDemon magrittr MASS plyr purrr rlang stringi stringr tibble tidyr tidyselect]; };
   tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
   tidycensus = derive2 { name="tidycensus"; version="0.8.1"; sha256="1xw3r53wy3sy8rc08nprs4xfxplq6h1gmy1lhcwi8db922nyb671"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; };
-  tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; };
+  tidygraph = derive2 { name="tidygraph"; version="1.1.1"; sha256="1gskh3l9vjwpp6h9knfhg241cbs2zwz6cx7sw565jbqxqspd7ymi"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; };
   tidyhydat = derive2 { name="tidyhydat"; version="0.3.5"; sha256="1b82pxkn54kil661hkc5dp52nkl4sdbc0qr835ax1j00ix4hzi0b"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; };
   tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; };
-  tidymodels = derive2 { name="tidymodels"; version="0.0.1"; sha256="1ijl9hkdnqiszzgnm7bk8mq34anm6xqwa1hv3q9kh3iwph9mi10c"; depends=[broom cli crayon dplyr ggplot2 infer magrittr pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; };
-  tidyposterior = derive2 { name="tidyposterior"; version="0.0.1"; sha256="09q2j6kjwqphdzi60w26mlax9fnmndw7s3fsxfcj0pjjl8688w52"; depends=[broom dplyr ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
+  tidymodels = derive2 { name="tidymodels"; version="0.0.2"; sha256="1hidjrayqxz1g7bn20pqs1bwyx4cxxqx9dq5lwqyfsij0ir0lia9"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; };
+  tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
   tidypredict = derive2 { name="tidypredict"; version="0.2.0"; sha256="1hq9xzaa234679qvf02nc5w8l21yh1f3dhl76zxzqc7na7chn13k"; depends=[dplyr purrr rlang tibble tidyr]; };
   tidyquant = derive2 { name="tidyquant"; version="0.5.5"; sha256="0kh3y291j5d6qbqr45jjzjpwa02r0ymb7gdr0zd9g3d4czllwv95"; depends=[dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang stringr tibble tidyr tidyverse timetk TTR xml2 xts]; };
   tidyr = derive2 { name="tidyr"; version="0.8.2"; sha256="03s9dv6c2dj65a769h8fgy9878y46rdq7x65i53kd44kag80i9cr"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
   tidyselect = derive2 { name="tidyselect"; version="0.2.5"; sha256="0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"; depends=[glue purrr Rcpp rlang]; };
   tidystats = derive2 { name="tidystats"; version="0.2"; sha256="15f12zizgql1y303pr4vhmvpmpxib0wpybd0b5gbx281iglpdsc0"; depends=[dplyr knitr magrittr purrr readr stringr tibble tidyr]; };
-  tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; };
+  tidystringdist = derive2 { name="tidystringdist"; version="0.1.3"; sha256="0mffzkgd5154ip03v125q0galmg2qyd0gb4m517mz95i38z6c2yy"; depends=[attempt rlang stringdist tibble]; };
   tidytext = derive2 { name="tidytext"; version="0.2.0"; sha256="15xyn7mz81cm6dqsjvdb681q2sag9pp62kv11y0blyxd81wpy994"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
   tidytidbits = derive2 { name="tidytidbits"; version="0.1.0"; sha256="154k3gn87fnmzhldyp7h0rq5gxpndwaf4gahqydhsh9i6dq61lk7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   tidytransit = derive2 { name="tidytransit"; version="0.3.5"; sha256="0pxkn162i601lc8lwci1j4ns44yxc1d7zy7c7423ccqjpj85nm7g"; depends=[assertthat dplyr here htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; };
-  tidytree = derive2 { name="tidytree"; version="0.1.9"; sha256="0bxgmwamiclr4fnn5dk7hnkl7jf4p1fgwga2gfa3a6lwa79qgpwn"; depends=[ape dplyr lazyeval magrittr tibble]; };
+  tidytree = derive2 { name="tidytree"; version="0.2.0"; sha256="16i1bgiw1wj0sxic4fj6x5rfd6jk7l4mmxzw4kj0mp1vsxsrwj8x"; depends=[ape dplyr lazyeval magrittr tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
   tidyxl = derive2 { name="tidyxl"; version="1.0.3"; sha256="02icd5xwyimdlzrn6ikj6rrs3kj3qw1ngap69cf89mvmlkp93y79"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
@@ -12593,7 +12820,7 @@ in with self; {
   tigris = derive2 { name="tigris"; version="0.7"; sha256="0azfp8ahf63a10862669wsamf0270rcyrmknc331vjs52b3qlrvl"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
   tikzDevice = derive2 { name="tikzDevice"; version="0.12"; sha256="0srp7q91714sday4n2nbhnkwjy84q6kw7iihlskr7ckjdcqk7s3v"; depends=[filehash png]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
-  tiler = derive2 { name="tiler"; version="0.2.0"; sha256="0pdr34zlqvkkimp03nmj9p9ak39c2927ggyrhy7sc7h7k4x59dh8"; depends=[png raster rgdal sp]; };
+  tiler = derive2 { name="tiler"; version="0.2.1"; sha256="19w772wwv764i2b8i9ym6scf18kyci3albz27hw3mdhjy7i0acm3"; depends=[png raster rgdal sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
   timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; };
@@ -12643,15 +12870,15 @@ in with self; {
   tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.0"; sha256="0q4njhfpwqym9d8xfbb577vn6g9ks4nkpb4bh6j31nzg7yp96av7"; depends=[ISOcodes NLP tm xml2]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tm1r = derive2 { name="tm1r"; version="1.1.0"; sha256="0vzl1w5x1gpbfkxkqhf6lafvnqzh7z4ahhd38g9a7miw27c60a5a"; depends=[httr jsonlite]; };
+  tm1r = derive2 { name="tm1r"; version="1.1.1"; sha256="1sxapq9yfv7hyzrn10xxqclw9vnh0bp2mrsi45bsr9wl0qkdfhcj"; depends=[httr jsonlite]; };
   tmap = derive2 { name="tmap"; version="2.1-1"; sha256="0928f7cqwqy66hp959mpaq7idb3riz6ahhfh26aidpaqc85lwqpw"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer sf tmaptools units viridisLite]; };
   tmaptools = derive2 { name="tmaptools"; version="2.0-1"; sha256="0zfj2q3p4xmb7xzpiidfn20g569fscyhryzcpmvwkp98a7fg9swz"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; };
-  tmbstan = derive2 { name="tmbstan"; version="1.0.0"; sha256="01x1nw0mlbpsldrd6hx2g040d9slrhk7hm2pm1v7pci3vxgbpgy9"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
+  tmbstan = derive2 { name="tmbstan"; version="1.0.1"; sha256="0l79fzmviy1r4hvjvhjl5yfck0j3xiq7qjc4jwvi6yfglbivii08"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
   tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
   tmle = derive2 { name="tmle"; version="1.3.0-1"; sha256="1y7fjj2492a70idnqwrlcdpz2bqphdxbaz96yjxnkfhx940y26b5"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
-  tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; };
+  tmod = derive2 { name="tmod"; version="0.40"; sha256="157m5jjkfd7g9aih5zylxzwkkdryj9l6yapgwjqydvwj6ab6k67l"; depends=[beeswarm plotwidgets tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
   tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.0.2"; sha256="04bjdlrz82v9skirap2fmngi2sv9xakkgmkgpwdv3qshszvx3wz4"; depends=[]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
@@ -12670,13 +12897,12 @@ in with self; {
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
   tosca = derive2 { name="tosca"; version="0.1-2"; sha256="0zr0q0l4ic0hmmahgzm4hzjqzy0vxb31xsgmvqnvi8kya2bb68sh"; depends=[data_table htmltools lda lubridate RColorBrewer stringr tm WikipediR]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
-  totalcensus = derive2 { name="totalcensus"; version="0.5.0"; sha256="0qmx1vmkvywkdl837vvyx8wl2ldab80m9gks2dfcqfancl8ijkm8"; depends=[data_table magrittr purrr stringr]; };
+  totalcensus = derive2 { name="totalcensus"; version="0.5.1"; sha256="0b2mfci8fdfzw21nd1cgzx9vcvb0f27wdn0j58rszi1s7ngajl2v"; depends=[data_table magrittr purrr stringr]; };
   touch = derive2 { name="touch"; version="0.1-4"; sha256="0xz3mvwhyn7wbqhbfp2klrnf89gvsncrv5y7fmk9ym3nkq7z26cg"; depends=[Rcpp]; };
   touchard = derive2 { name="touchard"; version="1.0"; sha256="0hjki9y94kzapkik48dpdz3x5ybi1miy94mvn4klsgs54z68apsi"; depends=[MASS nleqslv numDeriv plotrix]; };
   tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; };
   tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
-  toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; };
-  toxplot = derive2 { name="toxplot"; version="0.1.1"; sha256="1g5q04ryn2dg675yp90x36z8iw3l5js50gpm4j2c17r88jb2fsl5"; depends=[dplyr ggplot2 ggthemes tcpl tidyr]; };
+  toxboot = derive2 { name="toxboot"; version="0.2.0"; sha256="0qjnd6x6d4m8ycl6iq5iq45vhhf5w1amyw4smwbizx6hdhg9jm4h"; depends=[data_table tcpl]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
   tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; };
   tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
@@ -12686,17 +12912,18 @@ in with self; {
   track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
   trackdem = derive2 { name="trackdem"; version="0.4.2"; sha256="0isd3cs10z6sqm8sh2q577z8bhnagq9gqsvdlsv377lk1z7wd1ln"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
   trackeR = derive2 { name="trackeR"; version="1.2.0"; sha256="07kfnla6dq1x62k43nl2d2s2bn1m1djzqzhks09f8fjz7vcbjgsy"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; };
-  trackr = derive2 { name="trackr"; version="0.10.2"; sha256="0nl4f476a6rq5hhbsh8snhgaspalrx7r74n6i7z51p39z8rdfsik"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; };
+  trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; };
   tractor_base = derive2 { name="tractor.base"; version="3.2.2"; sha256="1pbh9hand7h68vxap2qis3a7zs5qkrj2wxk8flqyvhx50p98wigv"; depends=[ore reportr shades]; };
   trade = derive2 { name="trade"; version="0.5.3"; sha256="0v0yw261daag0hw3sc7dh2bpm8sd3r46xbcbcbxv7qb59rad756w"; depends=[antitrust]; };
-  trafo = derive2 { name="trafo"; version="1.0.0"; sha256="03s341v264yvcyfli4smrsgak15123bilm8a944kg64s0z3hg79y"; depends=[FNN lmtest moments pryr]; };
+  trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
-  trajectories = derive2 { name="trajectories"; version="0.2-0"; sha256="0zd2a57pfc6aamh6d3n79sxlsvdwzrnq77xsfjyil4kvgh9ajd9c"; depends=[lattice sp spacetime]; };
+  trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; };
   trajr = derive2 { name="trajr"; version="1.1.0"; sha256="1wfncd3ays8wqz8hhwz46diyac49ivz31qm1rvy1gkbw71icmnd7"; depends=[plotrix signal]; };
   tram = derive2 { name="tram"; version="0.2-3"; sha256="1bbz9a57pmdalb9xmhawy9wjswcvr7lcb390plrs43lka2j55j6n"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
+  transformr = derive2 { name="transformr"; version="0.1.1"; sha256="186n789zzf2p9ggw9j7gmd4knfq051jhl35x1585jgll2karyn2c"; depends=[lpSolve Rcpp rlang sf tweenr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
@@ -12720,11 +12947,11 @@ in with self; {
   treeplyr = derive2 { name="treeplyr"; version="0.1.4"; sha256="140j1cd8a34fww8bi6b7mi3c7c1nik5sajk085nyfmjq7lxds0cy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
   treespace = derive2 { name="treespace"; version="1.1.3"; sha256="0s3hmmjx2hf8l0piwz6mddd80hb5jsljnpzpakighqj9iiah5jjv"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
   treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; };
-  trekfont = derive2 { name="trekfont"; version="0.9.2"; sha256="1njmllp6i10rafjq5c9z1qp3bmy8zr3nxv9cjw75w5fnrh50rlzh"; depends=[]; };
+  trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; };
   trelliscopejs = derive2 { name="trelliscopejs"; version="0.1.14"; sha256="1yjgn0a7jdfp1l3b1l8ss4pl23z9j4w27ny73mgmdbji02xqklyv"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
   trend = derive2 { name="trend"; version="1.1.1"; sha256="1bd567n15k2vpmgbx02584k5kglrc58mlb5kgd07wdss3knpa48q"; depends=[extraDistr]; };
-  trialr = derive2 { name="trialr"; version="0.0.4"; sha256="1vav3kvmwl7lf2hp89i0vh6a8zc294m0ch24mw0a0ml6mvw9iwpx"; depends=[BH dplyr ggplot2 gtools loo magrittr Rcpp RcppEigen rstan rstantools StanHeaders stringr tidyr]; };
+  trialr = derive2 { name="trialr"; version="0.0.5"; sha256="0viiwv7wd6mzarf8zcdbrx3haka3vfsc94fl7kn4c0ibzkp092g8"; depends=[BH dplyr ggplot2 gtools loo magrittr Rcpp RcppEigen rstan rstantools StanHeaders stringr tidyr]; };
   triangle = derive2 { name="triangle"; version="0.11"; sha256="0983bvywbyl0sms29j1hby2qy6p984vy4r0q1awh1f8gr01bbk5b"; depends=[]; };
   triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
   tribe = derive2 { name="tribe"; version="0.1.7"; sha256="1k12yzicf3p5wpgzpsv4kk5xzrdfx712z67kj9xmcr1mbs8l5skb"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; };
@@ -12770,14 +12997,14 @@ in with self; {
   tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
   tsensembler = derive2 { name="tsensembler"; version="0.0.4"; sha256="0n5mh951799yd00sbxz0ia2s086kc12rk9xmkdyjvqj8d83vh1ff"; depends=[Cubist earth forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xts zoo]; };
-  tseries = derive2 { name="tseries"; version="0.10-45"; sha256="14s1glh5zzdvdl05a2z7ymhgf962svxf8xircghg5sc649lb33n0"; depends=[quadprog quantmod zoo]; };
+  tseries = derive2 { name="tseries"; version="0.10-46"; sha256="08kjw0bfj5gfcrxpblwqxwna8a5g9gnr7ya61qb02r263pyhm50j"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
   tsfknn = derive2 { name="tsfknn"; version="0.1.0"; sha256="0gzij2fbgwavpsqmr7cp012lhii23fav4nsrbc2w9qingglcnqd1"; depends=[ggplot2]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.5.3"; sha256="0i026q33zsv184rbywbmcd8m7cilg89m7ai0n1m74z6c57zs8lc0"; depends=[anytime dplyr lubridate purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.6.1"; sha256="1qmz260jlypqbqj5ngas06k35flikk6z0qfq87m2q7mxls2cshqg"; depends=[anytime dplyr lubridate purrr Rcpp rlang tibble tidyr tidyselect]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsmp = derive2 { name="tsmp"; version="0.3.2"; sha256="1q1rdlx90dwk2p9s7i3246yi192pwysflphfvd20ldc0qm815sml"; depends=[audio doSNOW foreach magrittr progress]; };
   tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
@@ -12790,6 +13017,7 @@ in with self; {
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.6"; sha256="1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4"; depends=[corpcor limma MASS matrixStats simsalapar sva]; };
   ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; };
+  ttestshiny = derive2 { name="ttestshiny"; version="0.1.0"; sha256="186569p9h3597z9lxyzm7fj8k6bzgm2kw757dcv2qhhf2k7nfch9"; depends=[dplyr shiny shinyAce shinyjs]; };
   tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; };
   tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; };
   ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
@@ -12824,6 +13052,7 @@ in with self; {
   twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
   twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; };
   twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
+  twosamples = derive2 { name="twosamples"; version="1.0.0"; sha256="0i8k157ph2whll72a590rnafgjx767k8vxy5d8x9dq7s4baiw1cx"; depends=[Rcpp]; };
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
@@ -12834,12 +13063,13 @@ in with self; {
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.4"; sha256="0djx6z9489pr03bf01y2d79ar840q4ffj39j72c8phz27yz40y04"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
+  uavRst = derive2 { name="uavRst"; version="0.5-2"; sha256="0hsm3469jfyll4vwvzy5zc64mgb7q4ddih5h9k6d3jjh40yb47jc"; depends=[foreach raster Rcpp]; };
   ubci = derive2 { name="ubci"; version="0.0.3"; sha256="0pczbasicng6zl44kh61jcx8mbmg2na14q2lni10z1liwwk3swsp"; depends=[dplyr httr lubridate magrittr tibble tidyr]; };
   ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
   ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
   udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; };
-  udpipe = derive2 { name="udpipe"; version="0.7"; sha256="1dmrnlmj3aj01jzhixdkvglqfdsrkqnp52xrvz5pblmwmcdmjflf"; depends=[data_table Matrix Rcpp]; };
+  udpipe = derive2 { name="udpipe"; version="0.8"; sha256="0gdb0azrcf6lc3rgwlmmh2i8mgcmz1f9w9yzh0vcg6pmnhs4z6h7"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
   ufs = derive2 { name="ufs"; version="0.0.1"; sha256="0sp4963ijhn5zgni2kcx1shf59p7dr0pigb368fp8b01077q8qqn"; depends=[]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; };
@@ -12866,7 +13096,7 @@ in with self; {
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; };
   unitizer = derive2 { name="unitizer"; version="1.4.5"; sha256="1ml1x9jvwmh8mg2w2j2g8ffibw6a1ihj0aih11zzf4gjhs0w5p9d"; depends=[crayon diffobj]; };
-  units = derive2 { name="units"; version="0.6-1"; sha256="0gafl1d89gvmpndmkb9ng7dqhvnb5cx9igza0rjdrdn285icb07i"; depends=[Rcpp]; };
+  units = derive2 { name="units"; version="0.6-2"; sha256="0w7iwp8c66d5gj4rsb8c87vb0ja39hym6fmfnqaqwb3is1snfa2y"; depends=[Rcpp]; };
   unittest = derive2 { name="unittest"; version="1.3-0"; sha256="0haf3s3pc5bhsm6y5njghr9w8ifsjxczm5r7g0ynylwzvd019n8b"; depends=[]; };
   univOutl = derive2 { name="univOutl"; version="0.1-4"; sha256="041cc1jn95zababc4i84c378i204zkn865k2vd7mk1piwm3qkrj5"; depends=[Hmisc robustbase]; };
   unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; };
@@ -12874,7 +13104,7 @@ in with self; {
   unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
   unpivotr = derive2 { name="unpivotr"; version="0.4.0"; sha256="0zixkrxizfa309bfscivdjkz0c62xxrrfnbp829pgj2pvyicki50"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr xml2]; };
   unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
-  unrtf = derive2 { name="unrtf"; version="1.2"; sha256="11q2p6cnf1pqsh8sys45gb4xf713bh693lm59d8nw09kcbm23210"; depends=[sys]; };
+  unrtf = derive2 { name="unrtf"; version="1.3"; sha256="06v6hjpbybv07vqfq23i2s6j0ic035vnm0i4wfqgiw0pw6c85242"; depends=[sys]; };
   unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-3"; sha256="1324gn42qxw4cf3jg9vd8nwxiw4w4fg6p2xhzmn636q5wlziln5c"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
@@ -12885,6 +13115,7 @@ in with self; {
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
   upwaver = derive2 { name="upwaver"; version="1.1.0"; sha256="1hchdh6h021bxw9516500ki7nqk8bprxwrinibl9wzi70xrb9z4i"; depends=[assertthat httr rjson XLConnect]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
+  urbin = derive2 { name="urbin"; version="0.1-6"; sha256="104qs0k2lqq2ivxfqfpzkl0wd73dnzhgmiif1ciqky89vv051ljs"; depends=[]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
   urlshorteneR = derive2 { name="urlshorteneR"; version="0.9.2"; sha256="1y5n1rn2c7yj5ncxfnsrj9lvaam2j3vvx8ld1vqyjay1r8flzifd"; depends=[httr jsonlite stringr]; };
   urltools = derive2 { name="urltools"; version="1.7.1"; sha256="01h3fwk5mzicy2isvdla9r0zxrxhaf902xx4dg3f16a1l4fgi1a4"; depends=[Rcpp triebeard]; };
@@ -12909,7 +13140,7 @@ in with self; {
   vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; };
-  vagalumeR = derive2 { name="vagalumeR"; version="0.1.3"; sha256="11f3jk5arpfbjdh1a84iwdr8hn3lq3g03n457lmlhkvl49vh5fq9"; depends=[httr jsonlite plyr stringr]; };
+  vagalumeR = derive2 { name="vagalumeR"; version="0.1.4"; sha256="0la9mg7s3zhfg4s17f74agcrixy08mb9vwbdjap3r0brwgwzwvpy"; depends=[httr jsonlite magrittr plyr stringr]; };
   valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
@@ -12919,7 +13150,7 @@ in with self; {
   validatetools = derive2 { name="validatetools"; version="0.4.3"; sha256="1v6mmk3iq5nzzjkkj1spiqfmqq2133xg2qyy3y8h4pwwfynp4v7c"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
-  valr = derive2 { name="valr"; version="0.4.1"; sha256="0w9hgcyvmny2z1k2phnid60y8qvwbp47dy7q85ppd3j1cxyik5id"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; };
+  valr = derive2 { name="valr"; version="0.4.2"; sha256="1rvxdg6hz1jl00gb19bwjcs93j7yslp75fyvks7yy0pi2s7m81pq"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; };
   valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
   vamc = derive2 { name="vamc"; version="0.1.0"; sha256="1rcyj2zsx33rxmhw7p1i45cm6z6380df0bayxlyizi7vh43ggy6p"; depends=[Rdpack]; };
   vanddraabe = derive2 { name="vanddraabe"; version="1.0.0"; sha256="0hnfkwrrk50a5rica3lk2d52qi77xya3aspf13g0zygbyvv7ls72"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; };
@@ -12936,7 +13167,7 @@ in with self; {
   varhandle = derive2 { name="varhandle"; version="2.0.3"; sha256="11yisjgqc8fq0sj1kzgp51i926cs4yqkpfmbis5ak786wqalc6na"; depends=[]; };
   variables = derive2 { name="variables"; version="1.0-1"; sha256="05bqhkzava24z7dqg79vf9144d226rr5mby6ry32lqyx7w0gql9x"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
-  variosig = derive2 { name="variosig"; version="0.1"; sha256="191d4f52z686s8xbx7aw9c3qjp77iri43l52n8nxjgfjl877x5m4"; depends=[geoR gstat sp]; };
+  variosig = derive2 { name="variosig"; version="0.2"; sha256="10cw7i7sdachv7hmzw8sbhldgwddk3k165klrhiagarmfgplxi1b"; depends=[geoR gstat sp testthat]; };
   varjmcm = derive2 { name="varjmcm"; version="0.1.0"; sha256="02l0d896faakh9pdq2rzl2psmrj7l2pvacz7nk3r6552glsk7h18"; depends=[expm jmcm MASS Matrix]; };
   varrank = derive2 { name="varrank"; version="0.1"; sha256="1ynpnzfvwbwfpcv7rqlkvxmmafnjgdssr5l42rr3bklm9j1z71vm"; depends=[FNN]; };
   vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; };
@@ -12948,6 +13179,7 @@ in with self; {
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
   vcr = derive2 { name="vcr"; version="0.2.0"; sha256="1zr94hxch8k8pcgpm43fip8wrlqswb0pjv0py66rpf9nn08nwjvy"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
+  vctrs = derive2 { name="vctrs"; version="0.1.0"; sha256="13w1r8zpalirpfaz5sykpn0mj4jmhxi2qkdcfq081ixlfjyzwa6c"; depends=[backports digest glue rlang zeallot]; };
   vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
   vdiffr = derive2 { name="vdiffr"; version="0.2.3"; sha256="0rsznvbymlwdjl9qdll98x8cqkf8rdi20c5sw4w547sfxr664yl0"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; };
   vdmR = derive2 { name="vdmR"; version="0.2.6"; sha256="15d3yrwiqs7cfyzl6v5vqgi33arx9lxjbqpif9zzfb56j0x1xsk5"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; };
@@ -12960,13 +13192,14 @@ in with self; {
   vegclust = derive2 { name="vegclust"; version="1.7.4"; sha256="1fz3p5jpqy99r601dj9fahgv32vw0v54jlrq48wn81rzg2wwfmk7"; depends=[Kendall Rcpp sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9.5"; sha256="145frmlsdb7m5z8qa03js4061pqmgvy3gykxkpiv1wv2wnfzyvnr"; depends=[foreign XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
+  vegperiod = derive2 { name="vegperiod"; version="0.2.5"; sha256="1icjv3z8bfl2yl1pkr3kbs34q2yqv65aadw40jzrd98djdprzkni"; depends=[]; };
   vegtable = derive2 { name="vegtable"; version="0.1.3"; sha256="1pjbqhc09bmyjxx21z01dysbvwbx7v0mxm9xbcmfxdmr10adhian"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
   vein = derive2 { name="vein"; version="0.5.2"; sha256="1iwmh8kd4sa4bby9vycsg6wby63yri3vj310q3kvkd8b7k7z2vlw"; depends=[data_table eixport sf sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
   venn = derive2 { name="venn"; version="1.7"; sha256="0lll5bcwx64di4m0k56f00vsfaas2l2mkcbblniq302v0g12v8cj"; depends=[]; };
-  vennLasso = derive2 { name="vennLasso"; version="0.1.2"; sha256="1lma34msdl8ik0375bh4adbfgvcy0crv29gpsk7p6x75464jsp9y"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
+  vennLasso = derive2 { name="vennLasso"; version="0.1.3"; sha256="1d24gzn72qmylz0m6ghv3ig3hc8z6ghapqs1j9qchxf9gh8lqxbs"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
   vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
@@ -12978,6 +13211,7 @@ in with self; {
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
+  viewshed3d = derive2 { name="viewshed3d"; version="1.0.0"; sha256="1wab7lj4hmq32g9pkgilvpnzpxbdscg63kh7jjygg7h3fxlgf0k2"; depends=[doParallel foreach iterators rgl tcltk2 VoxR]; };
   vimp = derive2 { name="vimp"; version="1.1.4"; sha256="146z6xismk97613cdiz508hn0mgg0w0rqnjb9as66sq57kqgn5yn"; depends=[SuperLearner]; };
   vinereg = derive2 { name="vinereg"; version="0.5.0"; sha256="17qni21jaizmfzl975xd39ahlc5flfnmy6xy7n9adfv346f3zwp0"; depends=[cctools furrr future kde1d rvinecopulib]; };
   vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
@@ -12990,19 +13224,21 @@ in with self; {
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.4-4"; sha256="04byc39id5vn22h06b0yqb08bxnpsfdgig4v5r8hjv240c0p8q91"; depends=[ade4 raster rworldmap sp]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
-  visNetwork = derive2 { name="visNetwork"; version="2.0.4"; sha256="05gdsma70zvkgly9qscbwy98x8zrqgsk93czb37jp0as365l00q5"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
-  visdat = derive2 { name="visdat"; version="0.5.1"; sha256="1vnfwldzq5ddqk8prj4cg0dmkbjhpchdkb6v8kicd876dv8vxy2q"; depends=[dplyr ggplot2 magrittr plotly purrr readr rlang tibble tidyr]; };
+  visNetwork = derive2 { name="visNetwork"; version="2.0.5"; sha256="1q0dgdv5nxfyb5xakll61y1klyd2js36f3rzipng89nl0v5almqz"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; };
+  visdat = derive2 { name="visdat"; version="0.5.2"; sha256="0l5bkgbib750r0wk4yqih0l3xhrkvz693lzp394nfch1a3b61k3m"; depends=[dplyr ggplot2 magrittr plotly purrr readr rlang tibble tidyr]; };
   visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; };
   vistime = derive2 { name="vistime"; version="0.6.0"; sha256="1ah3zwz2ikzd8y2rbff65mdd9lp4yd328mb2971afr2xdd9gvvqd"; depends=[plotly RColorBrewer]; };
-  visualFields = derive2 { name="visualFields"; version="0.5.4"; sha256="19fb1qq4kyhln21dmf7wm6kqf7g94ls7nsaspl2q9d3rlmcgz5h3"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
+  vistributions = derive2 { name="vistributions"; version="0.1.0"; sha256="1kpl11l0yp4rhcx9zcfsdk5n62ir92lwjlyqzirrkkfvqpwkmcay"; depends=[ggplot2 magrittr shiny tibble]; };
+  visualFields = derive2 { name="visualFields"; version="0.5.5"; sha256="0hn59gjpdmq5m5bnjc2k31xf9l9k678djdv02mxcvjdkghpgmfpv"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
-  visvow = derive2 { name="visvow"; version="0.2.0"; sha256="1518vhvhx64k18sf003j5bafhdpkx4m8hahvksgcp2a1n3660l1i"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS svglite WriteXLS]; };
+  visvow = derive2 { name="visvow"; version="0.3.0"; sha256="1q1i1vnr3zzls3p6rk1c2r89xmxlc11xzkl1r5pbd3ydgppllhna"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS svglite WriteXLS]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
   vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
-  vlad = derive2 { name="vlad"; version="0.1.0"; sha256="0gdp9488ir6zsnwaf0zb1n4qivafccqky7i867vjc2zb9nnji6a9"; depends=[Rcpp RcppArmadillo]; };
+  vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; };
   vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; };
-  vmsbase = derive2 { name="vmsbase"; version="2.1.3"; sha256="1y4r1f6miwxx3q8pajyh202wvjz08w6291jvpv723qyxa6z1r69a"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
+  vmsbase = derive2 { name="vmsbase"; version="2.2.0"; sha256="1hmgi63qwf7530pxl6w8cv74sjnngf83rb5hx7icjlqr1z6x2hms"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vocaldia = derive2 { name="vocaldia"; version="0.8.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; depends=[]; };
   vortexR = derive2 { name="vortexR"; version="1.1.5"; sha256="03bzjyscqf0npvdwm0741n1sg2kbpqlqkpxj843rmac6blkxy7cn"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
@@ -13022,7 +13258,8 @@ in with self; {
   vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
   vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; };
   vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; };
-  vtreat = derive2 { name="vtreat"; version="1.3.1"; sha256="00iwxfn42zanhs2bwk73731nzwzpjwb127dig91dqhdsvng9585s"; depends=[wrapr]; };
+  vtreat = derive2 { name="vtreat"; version="1.3.2"; sha256="1p7afvy6y0y4667d4rjhjaa540cc7xwhr27j0mz35zn30vralbyw"; depends=[wrapr]; };
+  vtree = derive2 { name="vtree"; version="0.1.4"; sha256="1wmvvg7mlbifg3cbjv9qm9rsnl3bs624wm0xnaf489grix92csjb"; depends=[DiagrammeR DiagrammeRsvg rsvg]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
   wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; };
@@ -13031,15 +13268,14 @@ in with self; {
   wNNSel = derive2 { name="wNNSel"; version="0.1"; sha256="19j2yz6lvkxpmjr0vv6pjc7j1c02y0hb3gay5sy1y0xk706aggb5"; depends=[]; };
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-  wTO = derive2 { name="wTO"; version="1.6.2"; sha256="04393rwl74m8qj89kcsnyayvhwkf9bynga33pc09spvjnpnfjj14"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; };
+  wTO = derive2 { name="wTO"; version="1.6.3"; sha256="1cgbw37b734ipg5qhjsil55qysfn6xmymj1q99ybkadi0axp55nn"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; };
   waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
   wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; };
   walkalytics = derive2 { name="walkalytics"; version="0.1.0"; sha256="1kl6kwwnl67d45akna01xp389wjxsxlc84l0bcpadbipsqyb3kd1"; depends=[base64enc dplyr httr purrr sp stringr tibble]; };
-  walker = derive2 { name="walker"; version="0.2.3"; sha256="0wnrqlkv6nrl2mb3pxmvv1fahx0vv4jcr86lhxhwgvjgff50idfl"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
-  walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
+  walker = derive2 { name="walker"; version="0.2.3-1"; sha256="0yz1ikhywrw0lg9hx8mhz18qh58p3dz0kyrmf8mmynyvzw94qp58"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="1.0.6"; sha256="0pnkwdfmimnvyygbz1iz1b9fhcdi7k53wjw44kmnr2b7ln9pbcl2"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin XML zip]; };
   wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; };
@@ -13075,7 +13311,7 @@ in with self; {
   webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
   webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.2.8"; sha256="03744y89d1cklidd5lyqw23yaz71yyv6w8gk5qqibg2alq58gcn8"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.2.9"; sha256="01fk50n3fakjz4fdgix14iavcnnsipdyl2w436irkkgmrqv7kd5l"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; };
   webr = derive2 { name="webr"; version="0.1.0"; sha256="0fjbk933034cgmqd41cw7q5xcvrwgylcic6lxav9jv3b2sspzw06"; depends=[ggplot2 moonBook stringr]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
@@ -13096,13 +13332,14 @@ in with self; {
   wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; };
   wevid = derive2 { name="wevid"; version="0.5.1"; sha256="1dw4ypdmhnvwv89ydjbl2jbaf6913gx966qvcbm82apvjbb624vy"; depends=[ggplot2 pROC reshape2 zoo]; };
-  wfe = derive2 { name="wfe"; version="1.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; depends=[arm MASS Matrix]; };
+  wfe = derive2 { name="wfe"; version="1.7"; sha256="058rbg6b8l3sndqlm493z6s4b2ylk0194gqdbbsfamnpygl21x0d"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
   wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
   wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
+  whiboclustering = derive2 { name="whiboclustering"; version="0.1.2"; sha256="0bzzr71kbynzj28i8g5li5j40653nyh08ywgs2xww49qxjm3b9lj"; depends=[cluster clusterCrit]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
   whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; };
   whitening = derive2 { name="whitening"; version="1.1.0"; sha256="19p0l2vim9nc1m381v9m3icg238n1xamvwz3v2v00sb1fan9nr9s"; depends=[corpcor]; };
@@ -13116,7 +13353,7 @@ in with self; {
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
   wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; };
-  wikisourcer = derive2 { name="wikisourcer"; version="0.1.1"; sha256="03n813w281y6zk0xl248jdis6jr10dgpax7lcmx8av18dipssf1d"; depends=[dplyr purrr rvest stringr urltools xml2]; };
+  wikisourcer = derive2 { name="wikisourcer"; version="0.1.2"; sha256="0p8wv2r6nfry2plnl55izifhxya30jjz6c4zgnaq6jk6hzr8zcvr"; depends=[dplyr purrr rvest stringr urltools xml2]; };
   wikitaxa = derive2 { name="wikitaxa"; version="0.3.0"; sha256="0v681qac33dlcdlah20qf5qb9g5h917rpzv67brx1handjnapnqh"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
   wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; };
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
@@ -13128,6 +13365,7 @@ in with self; {
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
   wiqid = derive2 { name="wiqid"; version="0.1.5"; sha256="02ssj0f12if3bic614bp9klzcag121rbqw4g0awvcpk9jql8k5dr"; depends=[coda HDInterval MASS truncnorm]; };
+  wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; };
   withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; };
   wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; };
@@ -13139,7 +13377,7 @@ in with self; {
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.6"; sha256="0x890h5fh59n54587adyzphr956fkg3px8i7c378aq1fs7k35gxs"; depends=[]; };
   woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; };
-  womblR = derive2 { name="womblR"; version="1.0.3"; sha256="0g8r98lfycvsaii3zczr55pah5ffqrpinbrax41yp62w6hzgkq9b"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
+  womblR = derive2 { name="womblR"; version="1.0.4"; sha256="0yjz4nymhqq6aqvxf0a90bw3hi1zqz1zp3mxbv2ns5v5ygh2a10p"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
   wooldridge = derive2 { name="wooldridge"; version="1.3.1"; sha256="0471x3vszf1c4fj9pk5ix8bdmp2bnq1ghnqvwzad9chvvkpzmg3l"; depends=[]; };
   word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; };
   wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; };
@@ -13151,8 +13389,8 @@ in with self; {
   workflowr = derive2 { name="workflowr"; version="1.1.1"; sha256="0qkppim5b6kb5jf0xmgaqpzhyxdcg5qfbmy3vafi5w4yw08q23q2"; depends=[callr getPass git2r glue knitr R_utils rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
   worldmet = derive2 { name="worldmet"; version="0.8.4"; sha256="15crnmlcj1yi9rm35n8f34jprms24r2xwx550zz627bdvq4vmam4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; };
   worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; };
-  worrms = derive2 { name="worrms"; version="0.2.8"; sha256="1f25x46b7hzrjz6y8ps29cfl8qa17smxbnrghf3bwhr4qc0vf5k5"; depends=[crul data_table jsonlite tibble]; };
-  wosr = derive2 { name="wosr"; version="0.2.0"; sha256="0q8mswxb3w4d9pgc2fi64142i3dad4f2999vr1jvc9n8sjrmmmfc"; depends=[httr jsonlite pbapply xml2]; };
+  worrms = derive2 { name="worrms"; version="0.3.0"; sha256="130ha9yagsr5gyylhc48dnh1ccbd9nxkap19li2bcq5cwd0c89ak"; depends=[crul data_table jsonlite tibble]; };
+  wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; };
   wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
   wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
@@ -13162,10 +13400,10 @@ in with self; {
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.6.3"; sha256="0qvlyj3wnvy6wxdnkb49c7a16v14xkk5zb9bw27w06p9iikc66i0"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.7.0"; sha256="0vl8ajk32zhnaj7mz0qd9d1lcxvg7fldkv6bxjfjprpkjda67bxj"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
-  writexl = derive2 { name="writexl"; version="1.0"; sha256="0r2v12dc4zqmr1agp6vbw0fc48i278018684x84psjjqfmnv14cf"; depends=[]; };
+  writexl = derive2 { name="writexl"; version="1.1"; sha256="0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46"; depends=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
   wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
   wrswoR = derive2 { name="wrswoR"; version="1.1"; sha256="0jnb818xz841bx2i03k3hhy4hxcwpxblskg9nrc8kgbc22rxx4lz"; depends=[logging Rcpp]; };
@@ -13184,7 +13422,7 @@ in with self; {
   x13binary = derive2 { name="x13binary"; version="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; };
   x3ptools = derive2 { name="x3ptools"; version="0.0.1"; sha256="16kms5hbpa5hz5i0pdwx49yp2hmhyr8hd4w672vmwi94s5d84i1q"; depends=[digest rgl xml2 zoo]; };
   xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; };
-  xROI = derive2 { name="xROI"; version="0.9.9"; sha256="10wr1298066mncycmcbgqrpbd3fnd36f8ydrq11mjg0gxcs8m3i8"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; };
+  xROI = derive2 { name="xROI"; version="0.9.11"; sha256="12m1jw3gswnkkqss5v439fhzd8fghclbg0mldvm9hgslv3yhfpdj"; depends=[adimpro colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; };
   xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; };
   xSub = derive2 { name="xSub"; version="2.0.1"; sha256="0pharrgncczdq06f6cspv4is595jrbc0zik0jcps2619khs7b1q8"; depends=[countrycode haven RCurl]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
@@ -13226,7 +13464,7 @@ in with self; {
   xtensor = derive2 { name="xtensor"; version="0.8.1-0"; sha256="0qyqadg2yvvf51ch2w1aqsi1j0yfgw1167fps4s0k7gjvv692zfx"; depends=[Rcpp]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; };
-  xts = derive2 { name="xts"; version="0.11-1"; sha256="17d3g14xkxa1a5z5gd3gk1xjqfkjg1ik3i12q0arina8frql3jhd"; depends=[zoo]; };
+  xts = derive2 { name="xts"; version="0.11-2"; sha256="1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj"; depends=[zoo]; };
   xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; };
   xxIRT = derive2 { name="xxIRT"; version="2.1.1"; sha256="1y21yc840kq98sy06qcnlnzizv5aya5yllx4mjx9njv7mvcsp1wr"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; };
   xyloplot = derive2 { name="xyloplot"; version="1.6"; sha256="0d1dv3syfjwcp9fil9bl1my19d0kdyz1qrp1yf7ykrk8aq91762v"; depends=[]; };
@@ -13235,22 +13473,24 @@ in with self; {
   yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
   yaml = derive2 { name="yaml"; version="2.2.0"; sha256="0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m"; depends=[]; };
-  yardstick = derive2 { name="yardstick"; version="0.0.1"; sha256="165czwi62nrhhci06fb0rfpk2gki94aiyl4wlflmgpzmspmgz7m8"; depends=[broom dplyr MLmetrics pROC rlang tibble tidyr tidyselect]; };
+  yardstick = derive2 { name="yardstick"; version="0.0.2"; sha256="0dpqriyik3vabxbgbbrbmxdf7vws328ldrj6678pzpw8yf1zcx03"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
   yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; };
   ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
-  yearn = derive2 { name="yearn"; version="0.1.3"; sha256="03aqbf3q0nhg73pqpwlqdhpbmfa0rvv78b84b4mqir43601vjx65"; depends=[BiocInstaller devtools githubinstall]; };
   yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; };
   yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
   yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
+  yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
+  ypr = derive2 { name="ypr"; version="0.3.0"; sha256="0smbr8zbyydrp82p04k64w9kxvx6i99xb06yh1zfapz4zqv32hac"; depends=[checkr ggplot2 scales]; };
   yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
-  yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
+  yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
-  zCompositions = derive2 { name="zCompositions"; version="1.1.1-1"; sha256="147layq5hj7hba2a5q9sb7dwv6rwha9d8040p1npmdif3nbap2zd"; depends=[MASS NADA truncnorm]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.1.2"; sha256="189lbw2i28czkz1w6nbbd2ka3xk0x3kmpb5y4bxmgazwa9wg8mgb"; depends=[MASS NADA truncnorm]; };
   zFactor = derive2 { name="zFactor"; version="0.1.7"; sha256="0vsjafg65qydfz0j75rrw40si5v2hwbf09z6d58wzffrwzgrwpvd"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; };
   zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
+  zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; };
   zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
   zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; };
@@ -13262,6 +13502,7 @@ in with self; {
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; };
+  zipR = derive2 { name="zipR"; version="0.1.0"; sha256="1kl8vns623f7a3a8ngmhaw0wnrp3l2p8r84s02l1q4jjjhln3bzk"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
   zipfextR = derive2 { name="zipfextR"; version="1.0.0"; sha256="007pw5z9rz8ng0llyd2088qxldc3sf0s35pcfqmm85qb94fdksdd"; depends=[tolerance VGAM]; };
@@ -13276,7 +13517,7 @@ in with self; {
   zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; };
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
   zoon = derive2 { name="zoon"; version="0.6.3"; sha256="11accyiv9n2zk7fq5bapbmv1ixadab19666i8w41bw642lafgivq"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; };
-  zscorer = derive2 { name="zscorer"; version="0.1.0"; sha256="1199d72v9hm7k5jnll2ngn3jlfsiaxrrpbqzrkl0fghm6wnxcc6h"; depends=[]; };
+  zscorer = derive2 { name="zscorer"; version="0.2.0"; sha256="03crixz3w1v1ahw2fk5qwmz1il07kywrl1445z09yxymgnpcs7gm"; depends=[tidyr]; };
   zstdr = derive2 { name="zstdr"; version="0.1.1"; sha256="1rigsdh0f68l6vvvxp277cp8hbxj10x4588s6az1njxfpxrc8ajj"; depends=[Rcpp]; };
   ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; };
   ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; };

From 2b5ceb28527295f4b5c6e7ba4f4d98594d9d181c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 12 Dec 2018 17:49:13 +0100
Subject: [PATCH 1775/2793] electron-cash: 3.3.1 -> 3.3.2

---
 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 170690cdad3..fff67b0add6 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.1";
+  version = "3.3.2";
   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 = "1jdy89rfdwc2jadx3rqj5yvynpcn90cx6482ax9f1cj9gfxp9j2b";
+    sha256 = "4538044cfaa4f87a847635849e0733f32b183ac79abbd2797689c86dc3cb0d53";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 3dbbd9f8c221949e442a4803981cd6d1aed24be8 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 29 Nov 2018 23:19:51 -0800
Subject: [PATCH 1776/2793] pgcli: 2.0.0 -> 2.0.1

Changelog: https://github.com/dbcli/pgcli/blob/master/changelog.rst#201
Major feature of note is Python 3.7 support.

Also default to using Python 3 because this is an application.
---
 .../tools/database/pgcli/default.nix          | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 650e1fc39e5..f9e60e3e492 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -1,23 +1,27 @@
-{ lib, pythonPackages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pgcli";
-  version = "2.0.0";
+  version = "2.0.1";
 
-  src = pythonPackages.fetchPypi {
+  # Python 2 won't have prompt_toolkit 2.x.x
+  # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
+  disabled = python3Packages.isPy27;
+
+  src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi";
+    sha256 = "149naq3gp1n922vag7vixs0hd114bpbmbmv70k4kzc1q7jz748l2";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     cli-helpers click configobj humanize prompt_toolkit psycopg2
     pygments sqlparse pgspecial setproctitle keyring
   ];
 
-  checkInputs = with pythonPackages; [ pytest mock ];
+  checkInputs = with python3Packages; [ pytest mock ];
 
   checkPhase = ''
-    py.test
+    pytest
   '';
 
   meta = with lib; {

From 6c138622a424569c34bb9e9695afb26f33913180 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 22:01:10 +0100
Subject: [PATCH 1777/2793] =?UTF-8?q?gnome3.evolution:=203.30.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 7b13c59a1a8..3f1dad87548 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.30.2";
+  version = "3.30.3";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ps49js0110lrvg5xiylj9ky0ndp43wrnm0l6p6phmhx4h4477mj";
+    sha256 = "1v0bqqwv34j8qamby7dwgnha50fpjs8mhlq0h6c35jxsqb2f3k66";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];

From 52691cf7d96b3c14d4dd880437596ff53c66a440 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:34:29 +0100
Subject: [PATCH 1778/2793] =?UTF-8?q?gnome3.gnome-maps:=203.30.2.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 07c00f5b632..2f7e5bbe807 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-maps";
-  version = "3.30.2.1";
+  version = "3.30.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57";
+    sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq";
   };
 
   doCheck = true;

From e77a8a5e74636dbb9c31a2962955b2db7cfcb81e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:34:52 +0100
Subject: [PATCH 1779/2793] =?UTF-8?q?evolution-data-server:=203.30.2=20?=
 =?UTF-8?q?=E2=86=92=203.30.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 c88d8c9c381..c9c8acfecb3 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.30.2";
+  version = "3.30.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv";
+    sha256 = "1q1wpsc3p6b1cacwgkgqbni7rdx3skvb2fm6fyjs2wjgq6zi5753";
   };
 
   patches = [

From 057d910e1293f9be73d9622efbd06a0fb6076729 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:35:40 +0100
Subject: [PATCH 1780/2793] =?UTF-8?q?gnome3.gnome-contacts:=203.30.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 286bec4a367..a7347f74ca4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
 , vala, meson, ninja }:
 
 let
-  version = "3.30.1";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1vizpjb3ll7pndxpvwjjplgdn6b2wf0mjqr9fga0p2cj57v00m89";
+    sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];

From 1079262d287448bf4b6b0a49dd7667de368c8c19 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:37:13 +0100
Subject: [PATCH 1781/2793] =?UTF-8?q?gnome3.totem:=203.26.2=20=E2=86=92=20?=
 =?UTF-8?q?3.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index baecba8d355..3b701591914 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
-  version = "3.26.2";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g";
+    sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0";
   };
 
   doCheck = true;

From 7f709c3d21b455b1ca6944163ecf7e477838f705 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:37:38 +0100
Subject: [PATCH 1782/2793] =?UTF-8?q?gnome3.vte:=200.54.2=20=E2=86=92=200.?=
 =?UTF-8?q?54.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 96b18a7d7c5..904bdd323d8 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vte-${version}";
-  version = "0.54.2";
+  version = "0.54.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj";
+    sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9";
   };
 
   passthru = {

From 929bf748e81a78cff5606ed61173dff11f8980fb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:41:57 +0100
Subject: [PATCH 1783/2793] =?UTF-8?q?gnome3.gnome-tweaks:=203.30.1=20?=
 =?UTF-8?q?=E2=86=92=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index d985eac4030..77edf27fbdd 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-tweaks";
-  version = "3.30.1";
+  version = "3.30.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa";
+    sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z";
   };
 
   nativeBuildInputs = [

From aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 22:32:40 +0100
Subject: [PATCH 1784/2793] libgda: move from gnome3.libgda

---
 pkgs/desktops/gnome-3/default.nix                             | 4 +---
 .../gnome-3/misc => development/libraries}/libgda/default.nix | 0
 pkgs/top-level/all-packages.nix                               | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/gnome-3/misc => development/libraries}/libgda/default.nix (100%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 436b12d1064..626f4652ece 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgnome-games-support = callPackage ./misc/libgnome-games-support { };
 
-  libgda = callPackage ./misc/libgda { };
-
   libgit2-glib = callPackage ./misc/libgit2-glib { };
 
   libmediaart = callPackage ./misc/libmediaart { };
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/libgda/default.nix
rename to pkgs/development/libraries/libgda/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ddb4755c32..4e0d4e74f92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10732,6 +10732,8 @@ in
   });
   libgap = callPackage ../development/libraries/libgap { };
 
+  libgda = callPackage ../development/libraries/libgda { };
+
   libgdata = gnome3.libgdata;
 
   libgig = callPackage ../development/libraries/libgig { };

From 1015575c0989ca7bc55f0e37630df5a4177c1994 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Dec 2018 23:42:28 +0100
Subject: [PATCH 1785/2793] =?UTF-8?q?gnome3.libgda:=205.2.5=20=E2=86=92=20?=
 =?UTF-8?q?5.2.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libgda/default.nix | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index 93e18f51916..ee9323ebc5c 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala
 , overrideCC, gcc6
 , mysqlSupport ? false, mysql ? null
 , postgresSupport ? false, postgresql ? null
@@ -8,18 +8,13 @@ assert mysqlSupport -> mysql != null;
 assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
-  name = "libgda-${version}";
-  version = "5.2.5";
+  pname = "libgda";
+  version = "5.2.8";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1j4hxhiwr4i8rgbn2ck93y1c2b792sfzlrq7abyjx8h8ik1f9lp3";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2";
   };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; };
-  };
-
   configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ]
     ++ (optional (mysqlSupport) "--with-mysql=yes")
     ++ (optional (postgresSupport) "--with-postgres=yes");
@@ -28,11 +23,17 @@ assert postgresSupport -> postgresql != null;
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ];
-  buildInputs = with stdenv.lib; [ gtk3 openssl ]
+  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ];
+  buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
     ++ optional (mysqlSupport) mysql.connector-c
     ++ optional (postgresSupport) postgresql;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Database access library";
     homepage = http://www.gnome-db.org/;

From 679cadbd7a07ceca6bbd7e5ff1e5f991af870761 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Dec 2018 19:55:47 +0100
Subject: [PATCH 1786/2793] =?UTF-8?q?gnome3.seahorse:=203.30=20=E2=86=92?=
 =?UTF-8?q?=203.30.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/seahorse/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index af5b861ab47..344fb4a5738 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -4,15 +4,13 @@
 , gnome3, gpgme, python3, openldap
 , libsecret, avahi, p11-kit, openssh }:
 
-let
+stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "3.30";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.30.1.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy";
   };
 
   doCheck = true;

From ed14b1e68818269c473bdd1fa671ebdb72412e90 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Dec 2018 19:58:49 +0100
Subject: [PATCH 1787/2793] =?UTF-8?q?gnome3.nautilus:=203.30.4=20=E2=86=92?=
 =?UTF-8?q?=203.30.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 f37a86be4f1..7e7c40e8130 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "nautilus";
-  version = "3.30.4";
+  version = "3.30.5";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1";
+    sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];

From 09eae5380f97d7b9020c7340e84d1416450089e6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Dec 2018 20:00:01 +0100
Subject: [PATCH 1788/2793] =?UTF-8?q?gnome3.libgnome-games-support:=201.4.?=
 =?UTF-8?q?2=20=E2=86=92=201.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 7054e41d729..3776a9adbf2 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "libgnome-games-support";
-  version = "1.4.2";
+  version = "1.4.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088";
+    sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From c2f6ab16a9828be1a1b4fbe99102f8e8a3c13a43 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 12 Dec 2018 20:14:27 +0100
Subject: [PATCH 1789/2793] powerline-fonts: 2017-05-25 -> 2018-11-11

---
 pkgs/data/fonts/powerline-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 9f42324e6d6..c932c7f06c0 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip}:
 
 fetchzip {
-  name = "powerline-fonts-2017-05-25";
+  name = "powerline-fonts-2018-11-11";
 
-  url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip;
+  url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip;
 
   postFetch = ''
     mkdir -p $out/share/fonts/opentype
@@ -22,7 +22,7 @@ fetchzip {
     unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf
   '';
 
-  sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388";
+  sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;

From 1a00b86334cc8bc3ccfbcd73a8e5d1950f0ff0b2 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Wed, 12 Dec 2018 21:30:32 +0100
Subject: [PATCH 1790/2793] nixos/kubernetes: fix import path of default
 nixpkgs

---
 nixos/tests/kubernetes/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index b77da3414b3..9d77be13175 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -1,6 +1,6 @@
 { system ? builtins.currentSystem,
   config ? {},
-  pkgs ? import ../.. { inherit system config; }
+  pkgs ? import ../../.. { inherit system config; }
 }:
 
 with import ../../lib/testing.nix { inherit system pkgs; };

From d776b224daae8e60fc23c4e1b4bb3cc2e7912c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 12 Dec 2018 21:30:47 +0100
Subject: [PATCH 1791/2793] nixos/tests/xmonad: fix terminal title

bash now sets a different title.
---
 nixos/tests/xmonad.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
index 61fa7c1a67d..6d6db6b0ea9 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     $machine->waitUntilSucceeds("xmonad --restart");
     $machine->sleep(3);
     $machine->sendKeys("alt-shift-ret");
-    $machine->waitForWindow(qr/machine.*alice/);
+    $machine->waitForWindow(qr/alice.*machine/);
     $machine->sleep(1);
     $machine->screenshot("terminal");
   '';

From 7cbb09a2ecc85bc9ff699ee1a8ec5ac716986090 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 12 Dec 2018 20:46:35 +0100
Subject: [PATCH 1792/2793] vimPlugins: update all plugins to latest and adding
 vimux and neovim-sensible plugins

---
 pkgs/misc/vim-plugins/generated.nix    | 134 ++++++++++++++-----------
 pkgs/misc/vim-plugins/vim-plugin-names |   2 +
 2 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 197a5d756cc..3e8c0d715d5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-12-07";
+    name = "ale-2018-12-10";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "9226e13b31474ac17d0c25cd27aa55bff21d55c2";
-      sha256 = "0x3ihhswcqy3451721f3yfi5m2m09src7yd4r67q9k2gcyldbwj8";
+      rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d";
+      sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp";
     };
   };
 
@@ -344,12 +344,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-05";
+    name = "denite-nvim-2018-12-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "a59c3e2f50452e0ddd1988e921624f6cfb47807d";
-      sha256 = "1m96l3kflywdggypmh832piisaah3958v3ql4s267b9pk1phsgsy";
+      rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17";
+      sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al";
     };
   };
 
@@ -427,12 +427,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-05";
+    name = "deoplete-nvim-2018-12-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "a5ac69adb4ca5fae12e2f07a07c934213248779a";
-      sha256 = "182ygr2fsbvxm3smp1s1m585vfyk5ivwmwa2wknzqwysz96bhfaf";
+      rev = "04159b053ae83933d67225c53c36d98e516fa729";
+      sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115";
     };
   };
 
@@ -457,12 +457,12 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-12-05";
+    name = "echodoc-vim-2018-12-09";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "39cc8d6b5645088d3449006cffb202e751c92865";
-      sha256 = "1s59jz88pdvz1nca7z5bzvazn2dp4n6xb39hagnbh4rw70s18xnx";
+      rev = "2ca26d0a63210d8936ee86b82d409bd98e1b6bf7";
+      sha256 = "19cmggxrgbj429fflcz0gamg1779577qm0mykq6kycx0j7zyclbf";
     };
   };
 
@@ -580,12 +580,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-11-27";
+    name = "fzf-vim-2018-12-11";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "95f025ef2dbc8fedf124521904a80c1879acd359";
-      sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc";
+      rev = "f0acabf7e837e626c7102c30af890bccf79e33b7";
+      sha256 = "0ac1xjrmidagna167i4q5ilplsqiqcaxwslyl37dw9qj75c9arj5";
     };
   };
 
@@ -771,12 +771,12 @@
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-11-23";
+    name = "julia-vim-2018-12-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d";
-      sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka";
+      rev = "b81e1486d0a46b52e73763ee6e6ea1f28a3573d1";
+      sha256 = "0lgjib5rni8rqiv3qkfxj204j6ccqrsnp7d7nij5bhqli3d2hryi";
     };
   };
 
@@ -801,12 +801,12 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-11-24";
+    name = "lightline-vim-2018-12-12";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "688240e0ef849cdc8457822658cedf10358c75d6";
-      sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv";
+      rev = "1ef44bfa50320347004be77f836e97dc4f54982e";
+      sha256 = "0xycmnd811si6c2sxwrw88law9wp5n6akxkqv0211iq9m8k72cp4";
     };
   };
 
@@ -991,12 +991,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-07";
+    name = "neomake-2018-12-12";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "1481dd4fb9effef8831ed57ae2459310621f5df0";
-      sha256 = "0y1mw113c58cy54vgfbv6km5g61wpd9v08r131jkbzylhzg2yqyh";
+      rev = "2e0b5facc8452b145162b6f45b571b30188d9774";
+      sha256 = "180znybxvs9cvlglx6kw5z3chyax7vadlcfj76zh39bzmgim6m7y";
     };
   };
 
@@ -1030,6 +1030,16 @@
     };
   };
 
+  neovim-sensible = buildVimPluginFrom2Nix {
+    name = "neovim-sensible-2017-09-20";
+    src = fetchFromGitHub {
+      owner = "jeffkreeftmeijer";
+      repo = "neovim-sensible";
+      rev = "e7ab7544f15e59de2d9a1b42f58e590938e496e7";
+      sha256 = "06whnfvmzfdsx9gvkd2nxhx29939gjzibr2xadh54sj8ns646w58";
+    };
+  };
+
   neoyank-vim = buildVimPluginFrom2Nix {
     name = "neoyank-vim-2018-12-03";
     src = fetchFromGitHub {
@@ -1051,12 +1061,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-12-07";
+    name = "nerdtree-2018-12-12";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "c1876da09c38315d7fdea33d9082d1868b5fbd2b";
-      sha256 = "1v2w5gf4ggm2bvnl6zhpqxna8c72fssp5bg2z350kncjjq069bks";
+      rev = "72c3656799289d4635520c28e17f737066ce19d6";
+      sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx";
     };
   };
 
@@ -1201,12 +1211,12 @@
   };
 
   purescript-vim = buildVimPluginFrom2Nix {
-    name = "purescript-vim-2018-07-05";
+    name = "purescript-vim-2018-12-10";
     src = fetchFromGitHub {
       owner = "raichoo";
       repo = "purescript-vim";
-      rev = "ab8547cef5827f046d43ba57203acb6692b7ef06";
-      sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33";
+      rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f";
+      sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8";
     };
   };
 
@@ -1531,12 +1541,12 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-04";
+    name = "traces-vim-2018-12-09";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "47bd356e8a5e32b9b0be5d9805b603ee1cbb4242";
-      sha256 = "145baj6jsp7j7amcgrmm3607lvgy2z2w6map0s1fcmgykrn89xfz";
+      rev = "5152813d9b91692d37db176a9383f147373a7a8a";
+      sha256 = "1f07nb4vn1nawcd32qy7wy0vgkd15ysg3f3yh1xd5jbfxixisbss";
     };
   };
 
@@ -1821,12 +1831,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-12-03";
+    name = "vim-airline-2018-12-10";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "3d9071e6b618280000a021a2517e28cb4b497be4";
-      sha256 = "1qhwyaszhgd6vnpa9xmbnrsgs39nc87m0d35a3ccpkjp0q7bpzgq";
+      rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60";
+      sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr";
     };
   };
 
@@ -1871,12 +1881,12 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-10-22";
+    name = "vim-autoformat-2018-12-10";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "db17ccbacb55beea82fdaa9a1cde82f6a928d16d";
-      sha256 = "0nnykvbz5hm4cpv9jqk0jb4zzywlwgbybbirf1655rqrqfv126pp";
+      rev = "c203080645936e73b2124040bc963386eeb44f5e";
+      sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9";
     };
   };
 
@@ -2221,12 +2231,12 @@
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-11-28";
+    name = "vim-ghost-2018-12-12";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa";
-      sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw";
+      rev = "26209657da7ea040c635b36331793a04694f4921";
+      sha256 = "16gg487mxqw58s5np2a9a1kjy6kp5f0fmk60d444ymbjblv6gaix";
     };
   };
 
@@ -2271,12 +2281,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-07";
+    name = "vim-go-2018-12-12";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "ef278b486ad0698b74c53b61b9ebb3752d0384c2";
-      sha256 = "0ki5fa6n40818rfscffpb12lzkmqns9yfbbxwipq7sf0bg2slys3";
+      rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27";
+      sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw";
     };
   };
 
@@ -2792,12 +2802,12 @@
   };
 
   vim-pathogen = buildVimPluginFrom2Nix {
-    name = "vim-pathogen-2018-04-05";
+    name = "vim-pathogen-2018-12-12";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
-      rev = "06da921608b971fb47603671bcafdb2843992eb3";
-      sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi";
+      rev = "24f5cdd8055787463dd8ca73c80c1424ff06b358";
+      sha256 = "0hyn8i3gmx1vismiww7snrmfz95zmfk8j6mbyvn50gwid6wjwk14";
     };
   };
 
@@ -2942,12 +2952,12 @@
   };
 
   vim-ruby = buildVimPluginFrom2Nix {
-    name = "vim-ruby-2018-10-02";
+    name = "vim-ruby-2018-12-11";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
-      rev = "a85f078d06ed11faf1b243315d67b6f37326686d";
-      sha256 = "1d76yjbk9jmh3ci1fbdzsfip0r1npk07vlwibjv4cli8icq5pghz";
+      rev = "0e57d862250bb4ce56e30e2c4e10781b8b1776ac";
+      sha256 = "18z6170nm1vz4hh52qgiqhj9p7ak3d363rxh0q9si4hc6w56agzx";
     };
   };
 
@@ -3402,12 +3412,22 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-08";
+    name = "vimtex-2018-12-10";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "f6fae0c858558344d622cde4e2ed4a58caffb813";
-      sha256 = "1pv05c90pcmxiq1553hz6f8g0x6a8b77g1m05i9f6j39acr63nrg";
+      rev = "861e7b2fa00a9b0391dd8de0bf63b86dce9eb44a";
+      sha256 = "1a1zvr1g8k97s8n3s2sjgi5drjsamj91fc649kgwsjjs880rfjsl";
+    };
+  };
+
+  vimux = buildVimPluginFrom2Nix {
+    name = "vimux-2017-10-24";
+    src = fetchFromGitHub {
+      owner = "benmills";
+      repo = "vimux";
+      rev = "37f41195e6369ac602a08ec61364906600b771f1";
+      sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra";
     };
   };
 
@@ -3523,12 +3543,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-12-07";
+    name = "youcompleteme-2018-12-12";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "80246aa9a23cab4175c41a514598284efe218c20";
-      sha256 = "1s002jq0n4nhaxk42hdgqdgww67f3crx5rj5xns34ifg3y1zagn2";
+      rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234";
+      sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c369328c8d5..e914a3f4323 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -15,6 +15,7 @@ artur-shaik/vim-javacomplete2
 bazelbuild/vim-bazel
 bbchung/clighter8
 benekastah/neomake
+benmills/vimux
 bitc/vim-hdevtools
 bling/vim-bufferline
 bronson/vim-trailing-whitespace
@@ -102,6 +103,7 @@ JazzCore/ctrlp-cmatcher
 jceb/vim-hier
 jceb/vim-orgmode
 jeetsukumaran/vim-buffergator
+jeffkreeftmeijer/neovim-sensible
 jgdavey/tslime.vim
 jhradilek/vim-docbk
 jiangmiao/auto-pairs

From 47f008676fe3b77b9c8edda54db621a0dc16dd8e Mon Sep 17 00:00:00 2001
From: David McKay <rawkode@pm.me>
Date: Thu, 13 Dec 2018 00:21:55 +0000
Subject: [PATCH 1793/2793] bibata-cursors: init at 0.4.1 (#51871)

---
 pkgs/data/icons/bibata-cursors/default.nix | 41 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/data/icons/bibata-cursors/default.nix

diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
new file mode 100644
index 00000000000..ce7bb11522b
--- /dev/null
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -0,0 +1,41 @@
+{ fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:
+
+stdenv.mkDerivation rec {
+  name = "bibata-cursors-${version}";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "KaizIqbal";
+    repo = "Bibata_Cursor";
+    rev = "v${version}";
+    sha256 = "14gvpjp4gv0m59qr8wls7xs5yjx5llldyzack5kg5cg2mzk2nsml";
+  };
+
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace build.sh --replace "gksu " ""
+  '';
+
+  nativeBuildInputs  = [
+    gnome-themes-extra
+    inkscape
+    xcursorgen
+  ];
+
+  buildPhase = ''
+    HOME="$NIX_BUILD_ROOT" ./build.sh
+  '';
+
+  installPhase = ''
+    install -dm 0755 $out/share/icons
+    cp -pr Bibata_* $out/share/icons/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Material Based Cursor";
+    homepage = https://github.com/KaizIqbal/Bibata_Cursor;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rawkode ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e09d0204c5..fa28f717056 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15281,6 +15281,8 @@ in
 
   bgnet = callPackage ../data/documentation/bgnet { };
 
+  bibata-cursors = callPackage ../data/icons/bibata-cursors { };
+
   brise = callPackage ../data/misc/brise { };
 
   inherit (kdeFrameworks) breeze-icons;

From ad27b068d7fe11536a34abc074ff1f77d537843a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 2 Dec 2018 00:34:58 -0500
Subject: [PATCH 1794/2793] installer: Adds AArch64 UEFI installer support.

---
 nixos/lib/make-iso9660-image.sh              |  5 +-
 nixos/modules/installer/cd-dvd/iso-image.nix | 78 +++++++++++++-------
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh
index 45cdef1ef4d..b7b1ab52a63 100644
--- a/nixos/lib/make-iso9660-image.sh
+++ b/nixos/lib/make-iso9660-image.sh
@@ -47,7 +47,8 @@ if test -n "$bootable"; then
 
     isoBootFlags="-eltorito-boot ${bootImage}
                   -eltorito-catalog .boot.cat
-                  -no-emul-boot -boot-load-size 4 -boot-info-table"
+                  -no-emul-boot -boot-load-size 4 -boot-info-table
+                  --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
 fi
 
 if test -n "$usbBootable"; then
@@ -112,7 +113,7 @@ xorriso="xorriso
  -r
  -path-list pathlist
  --sort-weight 0 /
- --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
+"
 
 $xorriso -output $out/iso/$isoName
 
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index aa8003fef2c..9475da23b1f 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -50,7 +50,7 @@ let
     finalCfg = {
       name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}";
       params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}";
-      image = "/boot/bzImage";
+      image = "/boot/${config.system.boot.loader.kernelFile}";
       initrd = "/boot/initrd";
     };
   in
@@ -163,7 +163,7 @@ let
       cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/
       ''
     else
-      "# No refind for ia32"
+      "# No refind for ${targetArch}"
   ;
 
   grubMenuCfg = ''
@@ -222,18 +222,34 @@ let
   efiDir = pkgs.runCommand "efi-directory" {} ''
     mkdir -p $out/EFI/boot/
 
+    # ALWAYS required modules.
     MODULES="fat iso9660 part_gpt part_msdos \
              normal boot linux configfile loopback chain halt \
-             efifwsetup efi_gop efi_uga \
+             efifwsetup efi_gop \
              ls search search_label search_fs_uuid search_fs_file \
              gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \
              exfat ext2 ntfs btrfs hfsplus udf \
              videoinfo png \
              echo serial \
             "
+
+    echo "Building GRUB with modules:"
+    for mod in $MODULES; do
+      echo " - $mod"
+    done
+
+    # Modules that may or may not be available per-platform.
+    echo "Adding additional modules:"
+    for mod in efi_uga; do
+      if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then
+        echo " - $mod"
+        MODULES+=" $mod"
+      fi
+    done
+
     # 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 "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
+    ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \
       $MODULES
     cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
 
@@ -344,12 +360,19 @@ let
       ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
     ''; # */
 
-  targetArch = if pkgs.stdenv.isi686 then
-    "ia32"
-  else if pkgs.stdenv.isx86_64 then
-    "x64"
-  else
-    throw "Unsupported architecture";
+  # Name used by UEFI for architectures.
+  targetArch =
+    if pkgs.stdenv.isi686 then
+      "ia32"
+    else if pkgs.stdenv.isx86_64 then
+      "x64"
+    else if pkgs.stdenv.isAarch64 then
+      "aa64"
+    else
+      throw "Unsupported architecture";
+
+  # Syslinux (and isolinux) only supports x86-based architectures.
+  canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
 
 in
 
@@ -483,9 +506,9 @@ in
     # here and it causes a cyclic dependency.
     boot.loader.grub.enable = false;
 
-    # !!! Hack - attributes expected by other modules.
-    system.boot.loader.kernelFile = "bzImage";
-    environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
+    environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ]
+      ++ optional canx86BiosBoot pkgs.syslinux
+    ;
 
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the
@@ -556,13 +579,7 @@ in
     # Individual files to be included on the CD, outside of the Nix
     # store on the CD.
     isoImage.contents =
-      [ { source = pkgs.substituteAll  {
-            name = "isolinux.cfg";
-            src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
-            bootRoot = "/boot";
-          };
-          target = "/isolinux/isolinux.cfg";
-        }
+      [
         { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
           target = "/boot/" + config.system.boot.loader.kernelFile;
         }
@@ -572,9 +589,6 @@ in
         { source = config.system.build.squashfsStore;
           target = "/nix-store.squashfs";
         }
-        { source = "${pkgs.syslinux}/share/syslinux";
-          target = "/isolinux";
-        }
         { source = config.isoImage.efiSplashImage;
           target = "/EFI/boot/efi-background.png";
         }
@@ -584,6 +598,17 @@ in
         { source = pkgs.writeText "version" config.system.nixos.label;
           target = "/version.txt";
         }
+      ] ++ optionals canx86BiosBoot [
+        { source = pkgs.substituteAll  {
+            name = "isolinux.cfg";
+            src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
+            bootRoot = "/boot";
+          };
+          target = "/isolinux/isolinux.cfg";
+        }
+        { source = "${pkgs.syslinux}/share/syslinux";
+          target = "/isolinux";
+        }
       ] ++ optionals config.isoImage.makeEfiBootable [
         { source = efiImg;
           target = "/boot/efi.img";
@@ -591,7 +616,7 @@ in
         { source = "${efiDir}/EFI";
           target = "/EFI";
         }
-      ] ++ optionals config.boot.loader.grub.memtest86.enable [
+      ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
         { source = "${pkgs.memtest86plus}/memtest.bin";
           target = "/boot/memtest.bin";
         }
@@ -606,9 +631,10 @@ in
     # Create the ISO image.
     system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
       inherit (config.isoImage) isoName compressImage volumeID contents;
-      bootable = true;
+      bootable = canx86BiosBoot;
       bootImage = "/isolinux/isolinux.bin";
-    } // optionalAttrs config.isoImage.makeUsbBootable {
+      syslinux = if canx86BiosBoot then pkgs.syslinux else null;
+    } // optionalAttrs (config.isoImage.makeUsbBootable && canx86BiosBoot) {
       usbBootable = true;
       isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin";
     } // optionalAttrs config.isoImage.makeEfiBootable {

From a6f78420085dbb4eaec3789bf504cc5bccd5fcea Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Nov 2018 15:21:27 +0100
Subject: [PATCH 1795/2793] libxmlb: init at 0.1.5

---
 .../development/libraries/libxmlb/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/libxmlb/default.nix

diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
new file mode 100644
index 00000000000..201940f1705
--- /dev/null
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }:
+
+stdenv.mkDerivation rec {
+  name = "libxmlb-${version}";
+  version = "0.1.5";
+
+  outputs = [ "out" "lib" "dev" "devdoc" ];
+
+  src = fetchFromGitHub {
+    owner = "hughsie";
+    repo = "libxmlb";
+    rev = version;
+    sha256 = "037j9fwkzsy3765gl2grkrmbxrfs67wlai213qbgsa5xn6fb8y68";
+  };
+
+  nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
+
+  buildInputs = [ glib libuuid ];
+
+  mesonFlags = [
+    "--libexecdir=${placeholder "out"}/libexec"
+    "-Dgtkdoc=true"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A library to help create and query binary XML blobs";
+    homepage = https://github.com/hughsie/libxmlb;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82efcbc5f86..f8e8eaffbe3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11461,6 +11461,8 @@ in
     '';
   };
 
+  libxmlb = callPackage ../development/libraries/libxmlb { };
+
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
   libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
 

From 1b5de09e7f100b0413ef7e71827c6871e8295bc6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 00:33:07 -0500
Subject: [PATCH 1796/2793] fwupd: 1.1.2 -> 1.2.1

Add cairo dep and others checked for
in fwupd's meson.build.

Cairo at least is required.
---
 ...d-option-for-installation-sysconfdir.patch | 169 ++++++++++++++++++
 .../linux/firmware/fwupd/default.nix          |  16 +-
 .../linux/firmware/fwupd/fix-paths.patch      |  80 ---------
 3 files changed, 179 insertions(+), 86 deletions(-)
 create mode 100644 pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch

diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
new file mode 100644
index 00000000000..44369dc5117
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -0,0 +1,169 @@
+From 2fe9625cc6dec10531482a3947ef75009eb21489 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Tue, 30 Oct 2018 22:26:30 +0100
+Subject: [PATCH] build: Add option for installation sysconfdir
+
+On NixOS, sysconfdir is read-only by default, and packages are not supposed to
+install files there. Instead, NixOS has a concept of modules that declaratively
+describe the system configuration.
+
+We still want to install the config files and certificates to fwupd prefix,
+so that the modules can use them as they see fit, but at the same time, we
+cannot set sysconfdir=${prefix}/etc because the daemon needs to read the
+configuration from the directory created by the module.
+
+With autotools, we could easily solve this by passing a the sysconfdir inside
+prefix only to `make install`, but Meson does not support anything like that.
+Until we manage to convince Meson to support install flags, we need to create
+our own install flag.
+---
+ data/meson.build            | 4 ++--
+ data/pki/meson.build        | 8 ++++----
+ data/remotes.d/meson.build  | 6 +++---
+ meson.build                 | 6 ++++++
+ meson_options.txt           | 1 +
+ plugins/redfish/meson.build | 2 +-
+ plugins/uefi/meson.build    | 2 +-
+ 7 files changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 8dd2ac9ad..d4ad1cbc1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -9,7 +9,7 @@ if get_option('tests') and get_option('daemon')
+ endif
+ 
+ install_data(['daemon.conf'],
+-  install_dir : join_paths(sysconfdir, 'fwupd')
++  install_dir : join_paths(sysconfdir_install, 'fwupd')
+ )
+ 
+ install_data(['org.freedesktop.fwupd.metainfo.xml'],
+@@ -17,7 +17,7 @@ install_data(['org.freedesktop.fwupd.metainfo.xml'],
+ )
+ 
+ install_data(['org.freedesktop.fwupd.conf'],
+-  install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
++  install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')
+ )
+ 
+ install_data(['metadata.xml'],
+diff --git a/data/pki/meson.build b/data/pki/meson.build
+index eefcc9142..dc801fa18 100644
+--- a/data/pki/meson.build
++++ b/data/pki/meson.build
+@@ -4,14 +4,14 @@ if get_option('gpg')
+       'GPG-KEY-Linux-Foundation-Firmware',
+       'GPG-KEY-Linux-Vendor-Firmware-Service',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
++    install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
+   )
+ 
+   install_data([
+       'GPG-KEY-Linux-Foundation-Metadata',
+       'GPG-KEY-Linux-Vendor-Firmware-Service',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
++    install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
+   )
+ endif
+ 
+@@ -19,12 +19,12 @@ if get_option('pkcs7')
+   install_data([
+       'LVFS-CA.pem',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
++    install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
+   )
+   install_data([
+       'LVFS-CA.pem',
+     ],
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
++    install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
+   )
+ endif
+ 
+diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
+index 824291fc5..d0599a00a 100644
+--- a/data/remotes.d/meson.build
++++ b/data/remotes.d/meson.build
+@@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs')
+       'lvfs.conf',
+       'lvfs-testing.conf',
+     ],
+-    install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
++    install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d')
+   )
+   i18n.merge_file(
+     input: 'lvfs.metainfo.xml',
+@@ -37,12 +37,12 @@ configure_file(
+   output : 'fwupd.conf',
+   configuration : con2,
+   install: true,
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
++  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
+ )
+ configure_file(
+   input : 'vendor.conf',
+   output : 'vendor.conf',
+   configuration : con2,
+   install: true,
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
++  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
+ )
+diff --git a/meson.build b/meson.build
+index 737841f1a..23bd7a2e3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -144,6 +144,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
+ mandir = join_paths(prefix, get_option('mandir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+ 
++if get_option('sysconfdir_install') != ''
++  sysconfdir_install = join_paths(prefix, get_option('sysconfdir_install'))
++else
++  sysconfdir_install = sysconfdir
++endif
++
+ gio = dependency('gio-2.0', version : '>= 2.45.8')
+ if gio.version().version_compare ('>= 2.55.0')
+   conf.set('HAVE_GIO_2_55_0', '1')
+diff --git a/meson_options.txt b/meson_options.txt
+index 23ef8cdb8..db8f93b6c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,7 @@ option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI
+ option('plugin_nvme', type : 'boolean', value : true, description : 'enable NVMe support')
+ option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
+ option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
++option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+ option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
+ option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
+diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
+index 288f614e4..90cfe6484 100644
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -22,7 +22,7 @@ shared_module('fu_plugin_redfish',
+ )
+ 
+ install_data(['redfish.conf'],
+-  install_dir:  join_paths(sysconfdir, 'fwupd')
++  install_dir:  join_paths(sysconfdir_install, 'fwupd')
+ )
+ 
+ if get_option('tests')
+diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
+index c037e1b30..a0e8cd3e6 100644
+--- a/plugins/uefi/meson.build
++++ b/plugins/uefi/meson.build
+@@ -69,7 +69,7 @@ executable(
+ )
+ 
+ install_data(['uefi.conf'],
+-  install_dir:  join_paths(sysconfdir, 'fwupd')
++  install_dir:  join_paths(sysconfdir_install, 'fwupd')
+ )
+ 
+ if get_option('tests')
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index f006565a95d..de0a1e2ee0d 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, gtk-doc, pkgconfig, gobject-introspection, intltool
-, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking
+, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking
 , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
 , gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
 , ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion
 , shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf
+, cairo, freetype, fontconfig, pango
 }:
 let
   # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
-  version = "1.1.2";
+  version = "1.2.1";
   python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
   installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
 
@@ -18,7 +19,7 @@ in stdenv.mkDerivation {
   name = "fwupd-${version}";
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "1qhg8h1dv9k3i0429j0wl37rpxfbahggfd1j8s7a4cw83k42cgfs";
+    sha256 = "126b3lsh4gkyajsqm2c8l6wqr4dd7m26krz2527khmlps0lxdhg1";
   };
 
   outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
@@ -28,15 +29,16 @@ in stdenv.mkDerivation {
     valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
   ];
   buildInputs = [
-    polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios gnu-efi libyaml
+    polkit libxmlb gusb sqlite libarchive libsoup elfutils libsmbios gnu-efi libyaml
     libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev
-    bash-completion
+    bash-completion cairo freetype fontconfig pango
   ];
 
   LC_ALL = "en_US.UTF-8"; # For po/make-images
 
   patches = [
     ./fix-paths.patch
+    ./add-option-for-installation-sysconfdir.patch
   ];
 
   postPatch = ''
@@ -63,6 +65,8 @@ in stdenv.mkDerivation {
     "-Defi-ldsdir=${gnu-efi}/lib"
     "-Defi-includedir=${gnu-efi}/include/efi"
     "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "-Dsysconfdir_install=${placeholder "out"}/etc"
   ];
 
   # TODO: We need to be able to override the directory flags from meson setup hook
@@ -100,7 +104,7 @@ in stdenv.mkDerivation {
       "fwupd/remotes.d/lvfs.conf"
       "fwupd/remotes.d/vendor.conf"
       "pki/fwupd/GPG-KEY-Hughski-Limited"
-      "pki/fwupd/GPG-KEY-Linux-Foundation-Metadata"
+      "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
       "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
       "pki/fwupd/LVFS-CA.pem"
       "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
index 1cd9eb0e8f1..d1024438d8a 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
@@ -4,86 +4,6 @@
 -install_data('README.md',
 -  install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
 -)
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -8,16 +8,12 @@
-   subdir('installed-tests')
- endif
- 
--install_data(['daemon.conf'],
--  install_dir : join_paths(sysconfdir, 'fwupd')
--)
--
- install_data(['org.freedesktop.fwupd.metainfo.xml'],
-   install_dir: join_paths(datadir, 'metainfo')
- )
- 
- install_data(['org.freedesktop.fwupd.conf'],
--  install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
-+  install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
- )
- 
- install_data(['metadata.xml'],
---- a/data/pki/meson.build
-+++ b/data/pki/meson.build
-@@ -4,14 +4,14 @@
-       'GPG-KEY-Linux-Foundation-Firmware',
-       'GPG-KEY-Linux-Vendor-Firmware-Service',
-     ],
--    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
-   )
- 
-   install_data([
-       'GPG-KEY-Linux-Foundation-Metadata',
-       'GPG-KEY-Linux-Vendor-Firmware-Service',
-     ],
--    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
-   )
- endif
- 
-@@ -19,12 +19,12 @@
-   install_data([
-       'LVFS-CA.pem',
-     ],
--    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
-   )
-   install_data([
-       'LVFS-CA.pem',
-     ],
--    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
-   )
- endif
- 
---- a/data/remotes.d/meson.build
-+++ b/data/remotes.d/meson.build
-@@ -3,7 +3,7 @@
-       'lvfs.conf',
-       'lvfs-testing.conf',
-     ],
--    install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
-   )
-   i18n.merge_file(
-     input: 'lvfs.metainfo.xml',
-@@ -37,12 +37,12 @@
-   output : 'fwupd.conf',
-   configuration : con2,
-   install: true,
--  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
-+  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
- )
- configure_file(
-   input : 'vendor.conf',
-   output : 'vendor.conf',
-   configuration : con2,
-   install: true,
--  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
-+  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
- )
 --- a/meson_post_install.sh
 +++ b/meson_post_install.sh
 @@ -11,6 +11,4 @@

From 8cccab7bf401c7952c86f188ef934611f48fb240 Mon Sep 17 00:00:00 2001
From: Sage Raflik <neonfuz@gmail.com>
Date: Wed, 12 Dec 2018 21:10:02 -0800
Subject: [PATCH 1797/2793] retroarch: 1.7.1 -> 1.7.5

---
 pkgs/misc/emulators/retroarch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 24b46c8f9ca..ee7ff114ec8 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -27,12 +27,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
-  version = "1.7.1";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "0qv8ci76f5kwv5b49ijgpc6jdfp6sm21fw5hq06mq6ygyiy9vdzf";
+    sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm";
     rev = "v${version}";
   };
 

From 158f1300d1cb495d669038243c7a9696186d2d5f Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 9 Dec 2018 04:41:01 +0000
Subject: [PATCH 1798/2793] maintainers: add ivan

---
 maintainers/maintainer-list.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fd6d2efa7d8..320a1aab9c3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1894,6 +1894,10 @@
     github = "ironpinguin";
     name = "Michele Catalano";
   };
+  ivan = {
+    email = "ivan@ludios.org";
+    name = "Ivan Kozik";
+  };
   ivan-tkatchev = {
     email = "tkatchev@gmail.com";
     name = "Ivan Tkatchev";

From bc4c3e5cb91597f41db8155c0fc549aefcb98e6b Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 13 Dec 2018 09:41:11 +0300
Subject: [PATCH 1799/2793] intelmetool: init at 4.8.1

---
 pkgs/tools/misc/intelmetool/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/intelmetool/default.nix

diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix
new file mode 100644
index 00000000000..66378e457a2
--- /dev/null
+++ b/pkgs/tools/misc/intelmetool/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, zlib, pciutils }:
+
+stdenv.mkDerivation rec {
+  name = "intelmetool-${version}";
+  version = "4.8.1";
+
+  src = fetchgit {
+    url = "https://review.coreboot.org/coreboot.git";
+    rev = version;
+    sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr";
+    fetchSubmodules = false;
+  };
+
+  buildInputs = [ zlib pciutils ];
+
+  buildPhase = ''
+    make -C util/intelmetool
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp util/intelmetool/intelmetool $out/bin
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Dump interesting things about Management Engine";
+    homepage = https://www.coreboot.org/Nvramtool;
+    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 8cdbff37956..2fa5bc562db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10256,6 +10256,8 @@ in
 
   ilmbase = callPackage ../development/libraries/ilmbase { };
 
+  intelmetool = callPackage ../tools/misc/intelmetool { };
+
   imlib = callPackage ../development/libraries/imlib {
     libpng = libpng12;
   };

From 2232135cf9cfe41a94f969bd4d18a0615715adfe Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 07:30:49 +0000
Subject: [PATCH 1800/2793] pythonPackages.Yapsy: 1.11.223 -> 1.12.0 and enable
 tests (#51925)

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

diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix
index 1f4a28459be..9aa1985270d 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/pkgs/development/python-modules/yapsy/default.nix
@@ -5,15 +5,13 @@
 
 buildPythonPackage rec {
   pname = "Yapsy";
-  version = "1.11.223";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19pjsnqizswnczhlav4lb7zlzs0n73ijrsgksy4374b14jkkkfs5";
+    sha256 = "0g1yd8nvhfdasckb929rijmj040x25ycns2b3l5wq53gm4lv537h";
   };
 
-  doCheck = false;
-
   meta = with stdenv.lib; {
     homepage = http://yapsy.sourceforge.net/;
     description = "Yet another plugin system";

From f1b814a879cda2550bdf9324ca88642dbc5c01d2 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 08:08:05 +0000
Subject: [PATCH 1801/2793] pythonPackages.lmdb: enable tests (#51931)

---
 pkgs/development/python-modules/lmdb/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index a7767be6dc4..5835fe3196d 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
+, pytest
+, cffi
 }:
 
 buildPythonPackage rec {
@@ -13,8 +14,11 @@ buildPythonPackage rec {
     sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww";
   };
 
-  # Some sort of mysterious failure with lmdb.tool
-  doCheck = !isPy3k;
+  checkInputs = [ pytest cffi ];
+  checkPhase = ''
+    export PYTHONPATH=.:$PYTHONPATH
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     description = "Universal Python binding for the LMDB 'Lightning' Database";

From e7ec6cdf1183be826807ab3b29166756893b46e7 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 06:05:46 +0000
Subject: [PATCH 1802/2793] pythonPackages.manhole: init at 1.5.0

---
 .../python-modules/manhole/default.nix        | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/manhole/default.nix

diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix
new file mode 100644
index 00000000000..8c8c6bf3501
--- /dev/null
+++ b/pkgs/development/python-modules/manhole/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, requests
+, process-tests
+}:
+
+buildPythonPackage rec {
+  pname = "manhole";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m";
+  };
+
+  # test_help expects architecture-dependent Linux signal numbers.
+  #
+  # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket
+  # on the x86_64-darwin builder.
+  doCheck = stdenv.isLinux;
+
+  checkInputs = [ pytest requests process-tests ];
+  checkPhase = ''
+    # Based on its tox.ini
+    export PYTHONUNBUFFERED=yes
+    export PYTHONPATH=.:tests:$PYTHONPATH
+
+    # The tests use manhole-cli
+    export PATH="$PATH:$out/bin"
+
+    # test_uwsgi fails with:
+    # http.client.RemoteDisconnected: Remote end closed connection without response
+    py.test -vv -k "not test_uwsgi"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ionelmc/python-manhole;
+    description = "Debugging manhole for Python applications";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 949103211ff..4eab3845f3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -422,6 +422,8 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
+  manhole = callPackage ../development/python-modules/manhole { };
+
   markerlib = callPackage ../development/python-modules/markerlib { };
 
   matchpy = callPackage ../development/python-modules/matchpy { };

From 113a7562fed2353cfd49d89b899fa363acb19834 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 3 Dec 2018 12:10:15 +0000
Subject: [PATCH 1803/2793] ocamlPackages.lablgtk3: init at 3.0.beta1

---
 .../ocaml-modules/lablgtk3/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/lablgtk3/default.nix

diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
new file mode 100644
index 00000000000..6de7a26fbd6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "lablgtk3 is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "3.0.beta1";
+  name = "ocaml${ocaml.version}-lablgtk3-${version}";
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/1769/lablgtk-3.0.beta1.tar.gz;
+    sha256 = "08izn2kwxdz1i74m11lqkl9n50bs7sy6pl8mcq6br77znarvqb91";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ];
+
+  buildFlags = "world";
+
+  meta = {
+    description = "OCaml interface to gtk+-3";
+    homepage = "http://lablgtk.forge.ocamlcore.org/";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e03cb8e8b3b..85cc5497c40 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -361,6 +361,8 @@ let
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };
 
+    lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };
+
     lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
       inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;
     };

From b33fc4e6180639da886e62b2bf2ee703dc1557bb Mon Sep 17 00:00:00 2001
From: Sage Raflik <neonfuz@gmail.com>
Date: Thu, 13 Dec 2018 02:20:31 -0800
Subject: [PATCH 1804/2793] retroarch: Remove --menu from wrapper

---
 pkgs/misc/emulators/retroarch/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
index f85d85f8621..71ae168f1b2 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
     makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
       --suffix-each LD_LIBRARY_PATH ':' "$cores" \
-      --add-flags "-L $out/lib/ --menu" \
+      --add-flags "-L $out/lib/" \
   '';
 
   cores = map (x: x + x.libretroCore) cores;

From 5698d7888e85b57939e846a03abf6dd001fae661 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 13 Dec 2018 20:08:04 +0900
Subject: [PATCH 1805/2793] thunderbird: 60.3.2 -> 60.3.3

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index a372a92e948..c048c2938a9 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -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.3.2";
+  version = "60.3.3";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "27hdv1c0jgwk6lkkdfy1rx7r29s2girikbbrriwr9v1gvmf7j3vgdldk7wqijjcp185dbp714wh3n5kp1p9f3sa8mf7z6321xby0mf7";
+    sha512 = "04m6mgm4nfnq3nfkv0d1al5b7bw95kfcjpyd7aschqi6wnn21g8qacx42ynj89i5l9vc1jx8nz0wy266sy6x5iv9q585c6l6j9gvkrh";
   };
 
   # from firefox, but without sound libraries

From 8c07524d241308bc473496fc52c249d3c20bf8ae Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 13 Dec 2018 20:12:52 +0900
Subject: [PATCH 1806/2793] thunderbird-bin: fix update script

---
 .../networking/mailreaders/thunderbird-bin/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index cf68a268619..ed798ee9233 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -159,7 +159,7 @@ stdenv.mkDerivation {
     '';
 
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
-    inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
+    inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg;
     baseName = "thunderbird";
     channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

From da28c89797a0d879609c287bcadd32fd05c30724 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 9 Dec 2018 04:41:01 +0000
Subject: [PATCH 1807/2793] maintainers: add ivan

---
 maintainers/maintainer-list.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fd6d2efa7d8..320a1aab9c3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1894,6 +1894,10 @@
     github = "ironpinguin";
     name = "Michele Catalano";
   };
+  ivan = {
+    email = "ivan@ludios.org";
+    name = "Ivan Kozik";
+  };
   ivan-tkatchev = {
     email = "tkatchev@gmail.com";
     name = "Ivan Tkatchev";

From 76dc4b56f769b3279782455ce39eb458ddecb570 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 11:11:58 +0000
Subject: [PATCH 1808/2793] pythonPackages.cchardet: init at 2.1.4

---
 .../python-modules/cchardet/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/cchardet/default.nix

diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix
new file mode 100644
index 00000000000..5596b3e37e5
--- /dev/null
+++ b/pkgs/development/python-modules/cchardet/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "cchardet";
+  version = "2.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h3wajwwgqpyb1q44lzr8djbcwr4y8cphph7kyscz90d83h4b5yc";
+  };
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    ${python.interpreter} setup.py nosetests
+  '';
+
+  meta = {
+    description = "High-speed universal character encoding detector";
+    homepage = https://github.com/PyYoshi/cChardet;
+    license = lib.licenses.mpl11;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 949103211ff..c0cfcb61e20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1176,6 +1176,8 @@ in {
 
   cccolutils = callPackage ../development/python-modules/cccolutils {};
 
+  cchardet = callPackage ../development/python-modules/cchardet { };
+
   CDDB = callPackage ../development/python-modules/cddb { };
 
   cntk = callPackage ../development/python-modules/cntk { };

From f9d6dcecd7e20d6f05b3a68c2f1d9cea3eeda5ae Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 13 Dec 2018 20:13:19 +0900
Subject: [PATCH 1809/2793] thunderbird-bin: 60.3.2 -> 60.3.3

---
 .../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 7cd3ad47c00..dfe541a083d 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.3.2";
+  version = "60.3.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ar/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ar/thunderbird-60.3.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "c051155472deab805e0e689d45ab82a952aecd19f91b2373cdfab3925a6b9fdebcd9a147c06e6ff491e1d1374cb03e2091220187801ab7f07f9d787c4fc4c269";
+      sha512 = "701dd700115a8e869a1231e54b333398a5a393ffca431dfba69bfff7b2e3bfbf5ce3cbef0b40feec8263cd8e93b34704b0ace27694823c8ae7e03bee170a94e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ast/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ast/thunderbird-60.3.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "099d5a43e4e037f33f9ae4f89c1958d9e7016cc5f5673eed74d3c37bde6590fc2e47bb832784561bcf9c4ed53decbde51372a83019e3c72bf09745b95aeaf74a";
+      sha512 = "e3de7987dfbf61df4da34e875ade4e6a9a98fb8405a219dd747a021777b0436b1eb817756e56e35e83206c22ec34820fdca813c5d7b0346d4a0d6b3341d7989c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/be/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/be/thunderbird-60.3.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "7e55877c3f75d9907e5cca8f7f423edc79d1bb072f96acf227fffe37375528dd5c40bf8b3d39151ac79ff510ad3e50f1940ea4df32a6cbb32a0afb085640aaba";
+      sha512 = "c5695799bf141feb01c5d6cf6bec96c09608512bf182f3f39da394cb5841aea6ba8c7fc5f730d20425598b036b58391a28fffa63f13d77f2f9bdc7151ba4a9c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/bg/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/bg/thunderbird-60.3.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "6230c26a960e962db8a0c4f8302df3ae471aa6b663bd7819da1b3ccd1b2f6db1fa207936502f7b8cf2eb47032efca7e6d0e1275223007758588df290ba9a9ac8";
+      sha512 = "0f45d0174871d71199299a4d7e9202b3ff17839ac324fe1e66b5c5ec57841f576e97311ccd6a70b1734afca8a8b1d3e2c42703f161b2a93bccabdea9de5a708a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/br/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/br/thunderbird-60.3.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "8005b6b605d8a863a4b2b312a0126ffcd09a25072d11731eaab9f096f5e0b22e4fc8142d86d39505c48b6f73f96cf2d6ac4c2158d148338cbfa8c587b238063a";
+      sha512 = "3926254e1d17e67735e48b49afb94a8bdfcea7ee393696058c6775319e3bffed72d1bc5df9e05a07afdbae166a13e4f218dd519a4d6c65f6bb3ca2cd85d19710";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ca/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ca/thunderbird-60.3.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "98be5d8e71110d4de311e15c448b71cceec37fce5b50b689ecdad0322c093a7e7d96caab9919a83b48af784bf4da7269274125cd5d351870dcb775c0453237ce";
+      sha512 = "14e37769be837288dbd72b25d7c714e524289051ea2c01ce1900f1b8198d22f17f8cc8cea0c45739e72fd0fade7f0e18755955a627e837c01258508647afc89c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cs/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/cs/thunderbird-60.3.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "35863fc6513dec41b256150a7a9c3bb9e45cc72ae869da422b8550986148c8de0de14d985a5bba50af030263c0480a709d2a9755aac73b7e60e40939db7f9f31";
+      sha512 = "e57008bc903675fa2b90c34b4fce32d4534789ccb5779573812e435b1b0c26f0a223364ec0624b8c14082961444b0abc2c56763295d986d9ee7d3276f7ef56c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/cy/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/cy/thunderbird-60.3.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "3e3813449095eea1c7715d98d9198c63001b46b1aae463c6cfa1622b3808659d8a71d3cbac4264fa0fdb6264c1de738a2c79503b0629e062e949616ba0208f7c";
+      sha512 = "67a2602230acb81d2e0d72ae266e1dba18a3f31a87f770e6f8e454c9acf6ae7def7db334cedcf8e4ea766a116998d0dbbeb05116674af692c96a9c2295b1d5fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/da/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/da/thunderbird-60.3.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "dc51279ead50553ef8e8345635925b45dd8be63fdd99e3aa1499d2cc2996d084931c00b7b942935d00914c78f56b8bef13a7545d6bbf47a51a16ab26a30132cf";
+      sha512 = "729b8230f1699bef030c69903ef9d8e1104f9941deeb539d1ab4d340b76ac276ce9024ae5aec8dc8b7b1077afa3a5f5bdea2cb0f709ae5a4fa95e08af1d6cc7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/de/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/de/thunderbird-60.3.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "117a1c2a930c8c5a3c5a96dd6e28e7e167fb6cbe06f607211aeb1af427b47bc3b75d0431ea38ddf3812f5899d690f9c7a6dc8341c124249836bd0ab0da3147c1";
+      sha512 = "25b89e8434f887268b25a6a29f39c685eb20fd46a8c5b171cd21fc1229db4ef24a6a864c4eaf51d7e07494c96f5f3b8a86e03c1a8d6a98f92e24f964e83cc7ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/dsb/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/dsb/thunderbird-60.3.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a717e0d4e57b354c4eb331f01de97267d0616fdf9a47dc8e51acadc4966ee21323a97c59b902e2b315079174acfb896c658cb07ee62f6f04959116961837d92f";
+      sha512 = "9c8436699fd04b7a7b0cd52c63711f313e43799f4ac13672a8f320cf805c9c580b3dc686c66eef3d547e268f25ce0532c1456a012b0165886b1c8476ba41e464";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/el/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/el/thunderbird-60.3.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4e4d0df91c563cf21c83617529751cfe26ddd6d0c3952fffd5ef03d40d622da9dc84e1dc861239cbfb345d87a99e2fbe0afe4fd7975bb589201bef8d70da092e";
+      sha512 = "8db67ce9fec63f21decaa02f739db70e0d3a6adc4787925c8be91f9b8450d9e264a236c81e6e80c41a5955a8dcc52ebcafbee959eeb8d6a461057ba2c118ae14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-GB/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/en-GB/thunderbird-60.3.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "6a7c42efe472950daa603462de76b57bfcf97810e4c4a2fa38f07aeff8a6729939ddd35b7348deab357c723c6a20b71d25da3e2fa05502ebac1d74fb9c6498c0";
+      sha512 = "a901a62b44e0ef53fa66cd81e94fe6c6b044829d95020aa8e2d8ffc88e71e650fa564cea217de2fd2a18859b67275640021a8828e2684f9475a31e6131f10b7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/en-US/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/en-US/thunderbird-60.3.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "6c549e9cb1a4de1f73b26332c933cb96da841f75afc54511e3d6ed459b3f1439e7febe72337e8b24d825a8fa82b1b1520248c8551bfd8446812abedd3df516b6";
+      sha512 = "a57f55f3383d1e584db53ff45a6bcfc8135eaea5976066bcddb4b2ac12eaaf5c5751b1d0a3f771177123ff359a0e1bfdc904a2c1252a2762e440089c8e1271f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-AR/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/es-AR/thunderbird-60.3.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "4465e400726d550d06fd36e8baf3c96445123f2b8c78c1d5c701d9175038878d52e304adb1cd5a6fee3be274605448916a8512b9fbda452852aaf63c8aeca242";
+      sha512 = "55f301cce9dabc9708ae4b7b9c033ee1856b9e0eeb9cf95d745c710bc15d1b15fcd8a079c20c3b58418fc05175e39e8e68e6bde3788d540ef660fb6ad41e5276";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/es-ES/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/es-ES/thunderbird-60.3.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "4629ac510525f6af9f287bad685f696f130607eaab020bfec8bb46c2b816b7b8a3df1d0cf45e98446e13b8d219add30b751935ba5d08d5fd426da9346f9292de";
+      sha512 = "cbdad6a6941058963d5be128b4bc54c529474d6fb1b3597d2f26d153724bdba3001369286baa010c3e2743b53c17ecc92885182b9d3a8914630d429f07f47589";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/et/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/et/thunderbird-60.3.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "fbb8b9e90ab0e3160e8b48ad788ec31ebc2c82b2839f64deb2d28c2377debb666bd94a7b081748f11d9eaa10af026693a25d9ac121754d8e2c333330984f97cb";
+      sha512 = "5fbe4472969925bf0990c18e9189f7b4c2fa80746556368f70a42d9f89ada51238db58577cd79931a52669ea899c8d976267e25fd3efb5987a74153953ff5b4f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/eu/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/eu/thunderbird-60.3.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "8c2e3da06c2ce5768e23d2a0e29e186d31be925c9fd2e7479978ee8a190113d753c80ca059126b1d28bc828f732c517ba6f28647402be5284948fbe7939ea98a";
+      sha512 = "efec50555d94f74e4f45352be31665c25ee1fa115101eb847dee9e4552b7725f4d9f3c04f4d20fce3bb3b12d8b2e4f27761d412237e47f5a7476adc13085b282";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fi/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/fi/thunderbird-60.3.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "05c7516c48e1574055ef56575e7c7f0315bf307dddee786758b5c49fc8acb41462fad1064fb1255d4b8c2f714da7ebd6070d4d5248c6078bfc587457b51b0f2e";
+      sha512 = "b16e7d32b7eedd42e6cb253227b7266d1ad6fd96e9c875bd1a3d5184e01ee8016a0aaf9569183055c0044997464ad076b25f83a2b786945cc97a5415b04557ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/fr/thunderbird-60.3.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "5a11368521eeff68cacf8ed353b12d9d17f134871739e0c1d25a6103e4c8b917b19179978940075905e5dbac51cc13ff8bdae6185222ceb6eaa5fdd3dfab16ef";
+      sha512 = "719a81fedd43423beac6ddf1c9fdf13af7e9c784639f018483dd11a72d07c1c5249e8878c0c40a31ec95f7eca417121bde466e78d8fcc54ebeb67f50bf8d0a9f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/fy-NL/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/fy-NL/thunderbird-60.3.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "003561a27b2ff7b484fe0ddf37fc539055ca8e302f0daea64c1932c0a9e2fb3a66809cef707ec3feb2dfbea5e57cb1d8aa957d4584a33f0465d252398dcad512";
+      sha512 = "92850ab9e552ea81de90c2973e819bf55bba46dfbf05c665188e119e6720258eabc3031318163e83490a50f749b079471de783efd3e6eec535795c71bdc9437f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ga-IE/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ga-IE/thunderbird-60.3.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "17db64205a0d56a90c61ab63326986054a3b162bacc01a5ae5cbfc5c6015b47a64886663418b10f1da779556b5730411bae6515e903af96c1d2f0bc51399067d";
+      sha512 = "711463c9179391eae973ba28be2e8a9c86063788f197d97774fc678e1264bb248425b16b51cd1bfb52c3ca9bcf30e1c3ccaba6afa64805400355d9e69cf84e12";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gd/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/gd/thunderbird-60.3.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "9c09193e9a24b7a34a5e247cb9bac9b1913a4bd7549a396a4c723c83de716b3e7d055588c926d6bb08e7b6a223515764b8ba51f6d013229f40da848a401f3b01";
+      sha512 = "4b6417e50491e424297321f01d57c3117b99326a0c789821fae2c1ab6d2d08c9a7cb5be95dfddf6d6ba8ef2fbc65f20f51fade5905ad441403d36a513ac39352";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/gl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/gl/thunderbird-60.3.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "a303ff6bd6fe3659ef2d09aa58cd911b7b8148ea5c925b82ca7a68f3b16534e13149e03f6fb15c5f93242d6e61d4e1448a1ff27b146de9adf586f01d8d32dfbc";
+      sha512 = "ed1667b91c509d08d732661acac86fdca2a3ea0cea4b3b79b283f713669b971afc6dcf72f7f82946eaf115ae51ac16a30e3804bab2a0723b17f4323c3a3d2b8f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/he/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/he/thunderbird-60.3.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ea72e43f7b1de708de898dd8351cf4837f97c1a28a71648cbfb76986bb2a87cdb747437e8b9358577685c38c9f5ec80e9982442521065a8c0e412e19cfdccdb9";
+      sha512 = "37502da5dfa5ae9b0751e17c44e217e28572492474cd9e3d913bf93bd48b6a0478a9d9ab3968ef7c18fc396b4eb5d80bdbd2ffdbb5fa5ab4d577792a4bb65257";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/hr/thunderbird-60.3.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "a48ac47c5c04fcdc532e983559fbd2967539250d242f84f2599883c068c67e9c72d73b6355f7f6756d80ed9a54bff5a36929928398acd080e04675b552bcffec";
+      sha512 = "8852bfda07df16ee1efc1a11b670ca1be2a6ab52696d7b1e0e9ca481cf6ed766c79f7c3eca5e4ea3a62b96b8edd669c4f36617dff062c121506fa59778de580e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hsb/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/hsb/thunderbird-60.3.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "cef96f079261d53092d2fb7e8f93f72caebb3aaff910264188e8b3532de1ec4fa0f43ed45a60f80bc9ba5eac69cd17f2a415b70700d7bfd6ed8c873f2fadfdd8";
+      sha512 = "4d9ef9914bc58096e47d3a36dd9c5a618f9f559da4753670607a7121dfd626261712bc668388d6ab78248e089b50291968275cb10c6279442fd6c8b4dfee55e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hu/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/hu/thunderbird-60.3.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "45245ae609216cb307e07b33ebc531c900e51634a6eba57bffcdbb4e0d72dd7466e399d0f5fff42a06973c3f2fde61d5e59a608985a513786819dde443cd2e3d";
+      sha512 = "4d3e6dc8fa59ba91687612ab8b643629cd28e4474b3d33ee9d8911245c8a65c9a197a5102702a8b0fffae74969ae7d3fb7346da9e8f72c55811115667dc1d289";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/hy-AM/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/hy-AM/thunderbird-60.3.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "d9b56f551997ba6d2413ce6847ab6af4bcf9d633bef2fea7a0fa8e8bf37fd87ce497134a7f58c31d647f781d07977be58449485c13212eff2996e3ebd34a3be7";
+      sha512 = "cd392f821439c31ff6eb23329bf59a484a8dfc5bd3755c16e5d40b7e870cc228a4ef7f5022b826786ccc03c827bad2d26997b3ef50483de341384903ffd63d42";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/id/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/id/thunderbird-60.3.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8d09a5e23191f454b628c3bbd1b95045b201dce34ce5ee78e35d4e03ab3e2f686a1be2683332d1fde5bccbffec1e878c851bbebe019b8e62634f64eae344e2df";
+      sha512 = "0cc11617865d196ee6e693881beaa7535940d8b3a6a4d622912c5925d1f75358c8c6e5a1a9898b1cce08fde343c8cee71bb52713c4f34f5dc5b1df7b1870bad6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/is/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/is/thunderbird-60.3.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "bd38c11eeecc90df111917e8d6d4c68882c24b40b1c7171f366c795dcaf4709fcd47aa1d81d76c7db549b054b3705330ce389bd8445dd48350c8cd3a22bdd9e0";
+      sha512 = "5f38c7e43a5fd40b7c54a601ac8604e943c60eff907414b5b3c7537381b9dbeaefac496c351191a29396f7b0ff7be6ddccf059768a488f44f0d41dbace282edc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/it/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/it/thunderbird-60.3.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "ad3fef3fc1414a98e7c24abd31b0fa0796e326c141ec5896b29feac7c3955c807ebdf01e7d099f37b31e32f3267cf8052ee8d4f324ef974ccbce38f13ae432d1";
+      sha512 = "fdb8ea55a3bb7264308113a3efdb18e4d5d6e85bf34a3ca37cad8bc77d9b8d68c1a19443d56f7affc8bf53eec1f799a4afef40e29ee05584d4848ad2ee7de433";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ja/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ja/thunderbird-60.3.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "880df6180766953da20c8917da020750431b5463879aa1803a6a4b9437a650f918a69e75804c267c1cfcc959a18edae1936f5059fa165cb9a5721937b3aa68af";
+      sha512 = "e6d9766ce3e6d3252f1ee69314ed7c8431947971fb7cf30fe6917969f5e8a4d98d3840606cf74ed8a37122e6a4ffb68f3a1d3dafe8055a4733881438220336be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kab/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/kab/thunderbird-60.3.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "285a5054b19e155905f0a29478b4cbb3694499d798ec009dcf4c3cf5d44510c5468d6119fcfd5d2e4ca4e4d1abd83ddc1d9fbdfc68499534e42040e2b8a27463";
+      sha512 = "0abb97159627d30bcd5eb2ff5765ea7b108c52cf95b43b2e06c3a7b793a07956eac63f31adc6ee9655958ec4dc4c27de777705eb7dc0be2f9d8cb3fa6d733fc6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/kk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/kk/thunderbird-60.3.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "fe77320d7228c623bab6eed15466bb31b64955dd885728728000e03ebd368c666b825bfce8a5ae9b9f17e74a519d74ae26c636e8451fa3df91a7b5b5e2ff3d05";
+      sha512 = "3def422ec663c376dc3c3d79b139933dee1a720447c965d59b46f6e45e0adb7b3435dd6cafd1be842486d68e2b84e0fd245768082fa3d9cb82b120929a6f2290";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ko/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ko/thunderbird-60.3.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f3cbb3fe94d44f4c4334041ff53983829c783ba1cb23bdf73d07a35f3b59dbff8c4a584f159441b142e1ceae3e768e4b20316a870033603db8987bf4f1b04d53";
+      sha512 = "27d16aaa29ee4bc0a70b4b19752df46358231f27066e6c3d9f65eb26c7d1ae02ed6f6b7e53dc26e69f554755f7614ece7b87d819c1139f3666206df3080515f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/lt/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/lt/thunderbird-60.3.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "977aeda9dfaa83b1abf844d40199382f5ab8be2466064b4258fe46b6821b333db027c2f45355c6655a7173ca369e5329b269bb456ab964ec38e3e5a878cb8054";
+      sha512 = "7d789bdc48e1dc105224b74db02dcdf95471c1eb40f7b7cff292c3547ac0004fcf7639bfbb7d55ae8620451cb1cd41c614780ce73e563f39d5554d2962cc4f4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ms/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ms/thunderbird-60.3.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f5e4ec77934a66ee22d8d8bc2d0c238d020a0843da562ac6ad344818ab0ed32497ca00eaf96c252392d3923151ecbe9f7a0c90d3dee7e558bbe75da278547549";
+      sha512 = "8fa38bf73b041117c847138d7ece1d6ef894456c07c38fcb637154f05a060fcd4b3ec818aa0e9e2f2df574e76a36139731b76c6a3c33a210347665a085379368";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nb-NO/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/nb-NO/thunderbird-60.3.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "4d3723af7503ef508ea269f44185eefb33894a989461a22a742cfd369d0a2d93d6c3bce61711ce2a5de868b3d7f7c612a8a596718609068950b32d1bca7f1c55";
+      sha512 = "4efab83bb702d0e18f99ee35ac198d3c3fd1fd21c7779fec5f3472c97cdd1794d574af6c1dbfe92318a070cfc4a07b8c757a0b105c4eac7a6cdf458c37de243f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/nl/thunderbird-60.3.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0a95e88ecaa1b3af514bdfcaab648f3cba9b280e5eb4c9efb371309cdaf0dd1215cd74d2d3af203e0547c1bab4b2480c4a3e9f81e2d1c301322497aa990af281";
+      sha512 = "1fbc90399a8a082dd256a37eaa3aab8acbec6ec7558d08421dc74c00f185f026e2e470e15257f7150a11c4540e47c0494ea6b80718eac510d5c3811ce19a52ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/nn-NO/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/nn-NO/thunderbird-60.3.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d4c112319b8df0e377cdca82b33f55b0e949d3b2f2cdc3bfc5b5eb0c0a0e98470452b231e8c82f2cf303f1e75b512c5097f5988bf10efc57cb2362f7711dfae2";
+      sha512 = "df80568600dd2ceecdb0ecaeec17223a54bf2f0bfb1ebf081628294329c3b14f4e190f9678c661d61cd2d9dbbb3b61b8eda82ae25268a88aad719110bf566b62";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/pl/thunderbird-60.3.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "94829eaf23916a0ff5273b38594a9a10ba9b178c0103deffcef0eb2015e4a2c51dba341644252b86430f18f4a2e526307f45ae5515f6d47832b74438dc798ea9";
+      sha512 = "4c705c98abad6160f39aa8ab80296e9c69a5abc830f72d52538941460e793f63442df84f3d20762c605202f3e18b7cad3638b99c34af4c7acdaec04ab3868ac8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-BR/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/pt-BR/thunderbird-60.3.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "55148505771d65796766e6ce0b46ae9787dffda5a3176f249092f9f446fa5cb9d7dffbca0774865bfe000e79cb8b9e7704e4f095117172b3a2b8fc661b4e21d7";
+      sha512 = "c1d22acb77d39b3085d8f03755877d2f075805bee3d926ecf11f71c93d4b88237bc0dd377ebd3c512d46470f98cfb7d112301d576c71f07ad922a52943188873";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/pt-PT/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/pt-PT/thunderbird-60.3.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "9d7c6f004afec887f06e7b08c344727dd8310390511f454e18a93ef618830bb68df5ef60129659a31c33ef6b57d3c0e7693ccb5d4c9452eed1ef1404c6f83956";
+      sha512 = "1809f4b6bd289c394393af2302722afaae025c07699ed5e5815fbf946c0fad516316610ebf7ee90f9c0f0bf98a502c93bf206b4f151121e10cf295ed9d0f048b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/rm/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/rm/thunderbird-60.3.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "f7dc1d5981d98f38c13c840e71b542dd3aad096d8dea8add79ebf756129a0a83316eb42b9018d47ab694c190384658cfb243dc96d4522a84a7f35ce82e79fa00";
+      sha512 = "552086eef3449a1dfab00c817197a0fd2c5a31c84f6cdc26600075939c356713c8bd955517bff00f29a80b43c7e9d508693b52803c356f794efb9d503ce2b6d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ro/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ro/thunderbird-60.3.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "97f7f674e4a858ee9c03bf1661071c6d0990b5018de9f69ac46a98c82db53c67d2589d91ec9db2c1f6361a700d47779f6f4015214d8010da490fd69fbe065764";
+      sha512 = "6b1f5c3627d8599345ddbdbec602d9dc92163caf31c213a8f274f5cf57225d9045d67627c2b66fc8c74685bc4c0b5b24f3b5712b521dac47024ce0bba1baeac2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/ru/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/ru/thunderbird-60.3.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "de481909f670659bbb3c227aa97780ceb54683b5ce47135e480fb95f89663b2fd9ce176d7507913f31417f66fbe8d4f8af08481bbfbac6468f7ebdc5b0bdcfa8";
+      sha512 = "0578f3158c0d4ccadfb73abbc6703ce6ae32b243c17381ed7f1ba1dcc3105dfa125aea8548d43e3548f5dd8d52ff7ead859b997295b2ce2a4be46688eedc49ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/si/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/si/thunderbird-60.3.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "07ebf67fa8673dc7bfcf5563591e4ef5c4736e3844b31a4e6662098d15dc05a437e3d5eab544cd09c010628a20f15ead8185e149560e0526dc1379f0a9202f56";
+      sha512 = "03e357657c37c4215ded0a88741adfc7fe515060611ac861d1f12a81f6221d2dec0d9b928f94034c4078077487b8f181dbb51b8d6add51efbf3c47631f38cb67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/sk/thunderbird-60.3.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "deb6291ba941743956603f6a91c0a19a2c56960bc91869ca7201f7a3eccfc630300987ce5b7bba51856bc16cbad2e34cd7ee645a22d692c12e8b4f66553c6a1a";
+      sha512 = "b80f81cf6d280eab59abb353a75eb284336bed01bd22ae043822d006771b65a52751366f107cd2de3bb4e1a2972b095a97fd8aad77ce3ce153b46af6d517eb07";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/sl/thunderbird-60.3.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "b07617d113b7c3ac75cd4b3f8fbd098bbbf5cc2b8f06317da410ce534a93013671519c9e0698809add4c14fe131b6273dafdbdb8a8ed56922a68978cd20a094f";
+      sha512 = "ea22e62825deeddf5c9ad9d98fa74917db8fca235683b5ede13415873a9e90994f7cebff6819bf63c8122c20055a88b40c446094f49fbd1bd4d52671cdde8bd2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sq/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/sq/thunderbird-60.3.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b22bdf2bf3b8cb3c1a5e63360652ac34bcc63499a02a8a5af7e2c6987b310d5d4a18495b17c2f7ce9f509be08b8b5ea1beefc241958d75c4c6be26bc5a02532d";
+      sha512 = "f84b93f1a4f8834494c1c289b7089070583e15d21c7b190696b28168ae40bf8d9d52f795ad0613655c156271a85ffdb942a6fb582d4dcbd46c51a4657683222b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/sr/thunderbird-60.3.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "5d5139a8f9405b4ced928bb9241c0a4b3502421c8329b2da4d582022c2f57b7c599b48428ceb6601799448ad40d52270429891b7a637f9a913b47ef15a3d296c";
+      sha512 = "e89deae4b166f56f4e0c81651ec4a36fdf8b83cae086af87b60c7cf27dd0f484d114212fce130e7c62a144c8977665709c4add6d3782aa13cfb8a9f295f29362";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/sv-SE/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/sv-SE/thunderbird-60.3.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2b8d2962846a7a0ef0c8f77cfb51e26da417de7a808bccc97ae3087dde1f4f0d38f770a3e14c26f5081af6c57dbd175ef81ff82992430bcc5fdfba2c2948c9ba";
+      sha512 = "899c76665d3b363bb239066d71aefd5920fa6f4382cae7ac5c6bd3a5ac96817791b8cf73597b2d388798b69229411fd97cd792b6caaaaf2b7bd87fb26344f3e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/tr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/tr/thunderbird-60.3.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "e37b98fca81ceb022d95e6b23260a22ae0dde8f48753c6dcab96a3aadc8a68c852c2c6e105ee7da8733402561435357b0d70524aac419604a13964894a88671c";
+      sha512 = "eded23fa5fc82fa0a9e2365e4323aa73cd00daa67fef6e752dafe6de1022240cea72ee7f5dafcf6283c629955899fdab21a38313130c9efdb472ae8bab447691";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/uk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/uk/thunderbird-60.3.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "9d1f38ed783b36f4312ce701dc8da3bf9facbff9874b08bf5730995a2fec3a060cd55aa395919b03ae12fd9f941e5f2fd329e5d836e1f722bfea97387e07be92";
+      sha512 = "e4c98d96fc418463a1ff53d12443c42bbd8f3bbed0fe48d18d0ebdc79e6cd792453def505dd42b0e8937be4d52034a3dd92041e2181a588d16535b74e7de791e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/vi/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/vi/thunderbird-60.3.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e70d087dcdfc0e5f6791b1c5e1483ffe6891b64792823b400d79fd9ed8bba10e5c21cb14a11cc2e020d8c91ef5f82455793595dc7143956d0d1a99f673125253";
+      sha512 = "98c22a356777c45176390f62043599a43e22e9c8f5f9215180d5f5e760214b16efc48a79463e5b8a0cd08a7d512ae3d9203a8ec30b3e8bfdab910ad93a183a64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-CN/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/zh-CN/thunderbird-60.3.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "28c4d992ce79d3f62984a1a0c009a742709c4d5dc1be3e9e05da6b4e232e269b04f548b67b1e0af85c51f7f4470cb3bb9a79d5bb2ab5c55f27806bbd27f5611d";
+      sha512 = "a8be99254b5d392b7236189c3633e5408ed1672ad4a69def12e0a75992f4f3dabe7f91cff840f01701bfb3e13bb2e188d3b8e396926fcadb16fcc03b257d62f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-x86_64/zh-TW/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-x86_64/zh-TW/thunderbird-60.3.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "444524e9be27bc5a37d06cf7f9496d75ae524a27c97577066cf6bfcb2923369cf11a949d8712433345f04fd2ed7423c45497a51a50c058b7910216d9f0986350";
+      sha512 = "491d5da4f4cb4eb1be71d1d3b1b9fcfaa2195d244c1837edd284d95b730e85658cc46bb2f6bb2b70f774e539d52be94e28cdfb45800d8d7ea02044d48ebedfaa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ar/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ar/thunderbird-60.3.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "5e147d4087d5b3f92f3f62e4f889bf1a38851f038ecaf9957bdc9ba8a7c52905ef74788a6879285836bf780177ea785b0ff65074eead4a1ba2442ad2466ef82b";
+      sha512 = "ff9a44f119b9004b6dd194d17f4b4e6bf7b32072d1cc9e69380e95ff9909ba427afba0b32cd33a8d0be2454b47363c1601e5a14ae03181d4cd45a166f267965f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ast/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ast/thunderbird-60.3.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "29066ad291416e4cb1e778effb807b3427d74285ca5edc4ae84c27e39e4b033eaa665ca22ebd603b7d1f7347e6d21874c1be6b00df56e6a4c93aa60fdf613b07";
+      sha512 = "16c2801b70a2ec756a9d3fcc8a315dbe3521d7740d98b59273a0aa80facbfac0a92ec6e3b753f0813da24229fb137ba284b9a71fe7b0dcca057768b8a23037b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/be/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/be/thunderbird-60.3.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "535a84a7943a1da9117829e9cc9aa0f1fef1e3eda0ee61d356a4f2e10dbf2a61da899fef2d0b858674a4e54f574bb0aa5db628b5dab52fccf2a0eca06b9695cf";
+      sha512 = "11abaf405de5025589e6ba4051c64c08e280ae49e06d610d30594925f018cea19521c75a1cae350ece37520b1108245a2c18dfdf69ddbf18ff5908c3dc4a9de2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/bg/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/bg/thunderbird-60.3.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "83c925fc5164146c24447835229cd1abe4d9eb89adababa68057d90906ee6b1fa51549311dfae934eb1faf36f5d10118a1d4cb7338019dd41a6d563fcfafafa7";
+      sha512 = "569b3fbb5856a7b2862d99e08d056c5cc2b0deac9ddc642e4c604c2217d5228545e1f7a5b2accbd43ad55d2d56b2233d02f640073f1c5e4aebf33f4ce439ccd8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/br/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/br/thunderbird-60.3.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "b9c0e4cd14a3c745f506c303e2cad6357890f7b9dda91de43d4bddf5bf45c0247120f6c824189721512536e3cfed4b3a1d32a1767b2cac64f20349f158c10acc";
+      sha512 = "6d70a1d2fd59ce5b63c597abf8bd204fe6324a6fb59c29fc45a4dced31cf84b7375642a0d60d79ee7650a4f07dcea79d20d9f82d239f75884750f70da9816a29";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ca/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ca/thunderbird-60.3.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "5d45160609b49ef060d7d6a92c5ca24b4dd6f02397103cd66a76796ac72c2ce8f9be6445b09489d8aa96ef0156ec31a734e7091d0134176593a488905370d81a";
+      sha512 = "8e76fc4ec337b8a900a65cb57b53d38ade3b69b818837cab82a3e37a16ad830bf2ce89b03d1560b4b4263fb1bb149d47d5d54dc67cf77b9a3097d59d45d83759";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cs/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/cs/thunderbird-60.3.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "659431aa61b6221543bb7e59b7b5361ac2011ffad65ece1046df3869b54c1cd39fda0998108f9c72f1dc4f5151496962b73e31ba1d3a2bf9bd6bd3186f7ed0a9";
+      sha512 = "96e33b1ffc95b52bbb81543a46691bfd20eb0a76006524719bda85649cd7f3f3793a0911dce73c3b820201590ea901d1b093a3fab58fe780820bee08c0c32425";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/cy/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/cy/thunderbird-60.3.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4a488557f0f64d4d4a4aa33ab385754f89bd1d1f2d7d39b64e75ef8a6a2d2f55bacfe9fcdad7901e44f9f2c69acb76d595ae379dbd3dee07bdf299a4dfa08a3a";
+      sha512 = "5dc24c92c939389347a4baab7dcb228535f740f3e606f9f6b2d8d7cd581d5ee2f1999966ae77b8004604b00aa673a99a821a61fa81102308e11d36daea587a8c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/da/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/da/thunderbird-60.3.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "39b46247bc1f83c1f2d3470421411cc931beef1087089110aaffa4b604c102048771069c833db85a3c3b070b9586e45a6eeeaeb5b3fe9ee1e77daf5e6e7aaf0e";
+      sha512 = "edd5d16951cf209e6375723a679fefe2d25f9cd1c84b22b860336cbadbdd5f1b404c12fc52bc0b1e7671c5691d6de0ffdcb61c553295d339f0ea456a6a95be74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/de/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/de/thunderbird-60.3.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "fd29518af52080217b38733f5babac66e7dfb17742b67be2ad962c541ac31e27bb162303474acb3c320a4a33c1e589c4f826b66b16df2296647e499051b540d4";
+      sha512 = "ac5a4fb5c3f4085000c5c3b7fe2cd9a2562757932b430f089d59b41f406b7d5dc86bcb9d0f6aa636f96a0151f120469ea31b0f9a692f56d82d45e77cde2c397e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/dsb/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/dsb/thunderbird-60.3.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "4f0c47c2757a5ef641f1618a7276a9a171cd681c517db130886a1569c7e00542be05fab2062fce21b5c3f8df60e3c521b25292f7bfe1c437b7c1a779c9165510";
+      sha512 = "9afdceba205d37309df67623b3ab4ad517d9c405bbe407070291b7b3b4982d42260da7b76967027cfe4eb8ba8288d5f5286c62e0e981e9a046ae57cbbd6939dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/el/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/el/thunderbird-60.3.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fb6f80d1a7a8e465fc49e38d986bdcbfd962b3c99c45629ac188e58ff3cc63cc97da4529fb67566705ed3c4e682598e0089e826d015b0dddcf60d359faece400";
+      sha512 = "6ba2d44c94edc89fadac86574b868595eaa5320a31a219e2c62e957f6c7fb770454a41f3eb1ed9118e26f846d60efe706b5a4d83cccc2e0bc81da5fda3e22bbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-GB/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/en-GB/thunderbird-60.3.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "7e2301e76e4be208256bcec9237c39b30cf49075c46d27a243005c39289e1ae26a1ee41a294c8d5389279b21749fda4f490c2fd1b3ee4b8bd9f1170f2efffcec";
+      sha512 = "257ca0e5adff187fb13494d4c2dcb8c707afbb834d3bb77a81bf48efefaf3538a53f2578a8a8fbc427cd56076a1af8b7ea184fa860571781c77cf791b9262e05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/en-US/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/en-US/thunderbird-60.3.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "0132ce8050a45246919e5fe538b84eb158cbf40401d487ffb7bf72d04a2bc3371d7606523dc6776dc3b6dd4c1930d56f6b47197385cf580d7b51c926c69eae99";
+      sha512 = "5f7f396026a73577fbc37626f07d57fd56bf2b2f10e2bd7ee0ceab1c8d241fd498fae590929300660d3452e4fb24af1bb2b29a8e8fbbd94a6c9f42c67904b133";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-AR/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/es-AR/thunderbird-60.3.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "bccb7704f8bd0f09054e48c54bd4ebeb4718667aaf46c55a7cca3e351181e09760fdcbca4e1e1948746b74f2c7ae46cf0d565f4a9c00430225e6f2c2849ea459";
+      sha512 = "0b79a226eb36758eb132675b79fe88a620422030772fa9fea6db3c822c98dfd5b62d8041e744ca35c93c7bb181091a869cc65abaa06e068561f4c7a1396b2c1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/es-ES/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/es-ES/thunderbird-60.3.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "81359edf957802660c0f92f8894a9087acb2ee6b08906de1fbf4be2145911c30b6de27b11b66ee8b7ad8cafeb09e00f336649537829f82cb7f204c834b1e585f";
+      sha512 = "7f37d63cedb27a6d0ba99617d1a8aa13a858fdf1315681d3f605c3199eded5d4cff57326b33364f5cc90cfd35494fa5e3ee0e8e3a02f7167f670d7b4ab0a20bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/et/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/et/thunderbird-60.3.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4039a1680551f03a17225cb8b2cb9e0fbf554ce3956e89700655cf010483c61e7b29070aba4a0fb7395b93838f9fab6542fb006b9c14f0a013b6eb587329d7c8";
+      sha512 = "48596be9c361f301c062e955a67a46375bcfa6444188f6285dd3557e45f423a0ec6dc7e4c29aeb7a8ae8f05dd52ab3ba0a224c1fa094f6b5e7ed5a060b653a3c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/eu/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/eu/thunderbird-60.3.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d7a5c40069541615ff8479a8eb48d5a199d9bf9f834661af833b65d68fce93d8b433fd45e0175bf29c8322a402136f8b4b174b7c85329659bfaaaa3430bab574";
+      sha512 = "f6f01952eee94db359ad1042a5343d77cdd4df1f41b38530ff4a9ce2cbabd14683eb7937724e34e276ac1ecc4ffc1dcc85bf2462cb071627ef490f2aed915f63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fi/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/fi/thunderbird-60.3.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "10c1d2e0a3d3d0dd2bc6166e4dd3ffc273f97e7b7a03d5148a8475411357eba8733ef33380cb79d813b65fe128e2bc07ac2eef30139e3d6c69af77003cee8950";
+      sha512 = "58c885494a9db36ebfb89207dee0e1bfd284760baa6d8bc0e351b9f4157a6bf826c20e33729a9d4661c146f40545e2228b916f9f6fb059da9558a5ba438f7a14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/fr/thunderbird-60.3.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "31b8463352704d1ac6640a07bd0131f683f4baa2faed799f91de956a083f184539186f0a1bd061c0e1793cc97f22a32b275c5e60994cce93f441181f2120ceaf";
+      sha512 = "205c540dc890bfa8a8514ed7d32e1599b21b3bea504594c99ddafed00b6341b23b767bead4ce47193929e8175424625a84f436ae36572209a3acf66cb395ef3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/fy-NL/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/fy-NL/thunderbird-60.3.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "80831dcef438c2737d38df2822223632030d62efd84361925f06caa7a108cc966848184403d8422a8a1c43fd1df52a77dc4b561dd2733de73d2c8aa0e0d5978e";
+      sha512 = "03e206b3373b45004ba90e973af4020c7956fa2b783ffe8a5f38ea695cf8d729598052413c993d3c57f449c81779775dc4b8988a1d4919a6460a519c89b0652e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ga-IE/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ga-IE/thunderbird-60.3.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7ceb9363d331fe9a0c3ed4b052cce765e2ef735b8a869ba3a08e83ed5195d073c1f4d9ca4578140b195cf25e3ae8771da8e061efb3e14bf5e9d875362babb713";
+      sha512 = "16846e5317f98dc77ca0185384f677befe9ea1f395c85560fd5ac14e4af28694e62e85a958d98adf39500a736b7a6689a9ee81d51d3e5497df2e02ba7043bd7b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gd/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/gd/thunderbird-60.3.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "292a67e214ab6392e7c6eb80a576fa130b9c22620c8c2ae5ae5eecddecb823526f39a0f16d7df3c4cb80b35325b907708083fd45efb845d40ab89bc3cf5d0374";
+      sha512 = "b0c58bddde3c41c0ae591a0981dd9f97eef0abf0aa76839c3bab8e8206f011510a944a3fb396f0b211f64c311e4a43cc694a95cf89c8f76666366d1858bc63e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/gl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/gl/thunderbird-60.3.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "df9f2a24a70facdaaa8c1b3831994fa2f5f14df92cc85dfdafa4fd4a28e7f331ae220ae08a4938755738f01e5f6fa1bbd62a558780a5444afe07e201d6c34f5c";
+      sha512 = "515ea18d83c3bd0630510331fa05b8ec8795657b5b175967ec893ad88c96ce5d91f20e52a3977aa4d601e67a198a8e9e1d8278cc4ef569066f8d3a56c0e7a6a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/he/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/he/thunderbird-60.3.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f1f527e5ec325fe9df177b172061dbfd205c307ea275f732b31ab460801dc49a18cd41625caca0c118f62d2642e4494e961b85b3058e2909445203d7b69ce6c1";
+      sha512 = "fc08ef178d41664279bb5dc3dfcefb16ab341775ae4179b5dd78ce4518bd05ad4a08487160ea7e2a53f53334c999841f1436e3a3e2ff2b77787b98d598c3d446";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/hr/thunderbird-60.3.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "dd5b62e71c708db2dfbaa59bf860b4dcff951607277605193ff084943f4ba7be9f458310a2a3c047d4e29b7ba432bfce1ee2dcb5217c460d90816b17c2232824";
+      sha512 = "7538f66ddd8b224d7aa8fa933dce4b77c2af55521dc7649eba585d4c3881a4db213848da52c3e3dc1c40ecbe563427786dc4fe07b582ccfdc18bdbe2165112c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hsb/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/hsb/thunderbird-60.3.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "30374f1750facbd5d96e9b38aa2f237a7424e278df6e8ceaa622d119866b10859b594622438c8299d92bdb6baee2ddd7e45498e6fbdb13a0b0d8bf2304454501";
+      sha512 = "84e3c382a911300076409fbbbe799b7852539a051e9153abd86e8f2a94542f95e1f2674e29b66b0a794063268fca6ee0eb1da150d5b1145adac0d75debfa3615";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hu/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/hu/thunderbird-60.3.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "7a1a955704d4fe5220f039a6fca68f87995f654a59f51df832970607809db76f1cf480df90893ffa88fe87c5cabfa0733ff307393e22c78318c379db963cb26e";
+      sha512 = "18c2cabb2de1b26e60f9e3c12e9ef7d12a11f47a28d2f866b477abff51dc455040887000dc562aac20c58e71b7f30514edf3faa0c7e35f9864a5784c8ca777c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/hy-AM/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/hy-AM/thunderbird-60.3.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8393a86a9217a4c387cc92b4c61ea552c7115549dba0ee02afac065757fcae4f79b67ef8fdd1559b942f674f6804bba7804d54696ffa71338de42bca7f12cf83";
+      sha512 = "01b27fff2282402476ea54e7fade1ec9ffc18e2b310e008a327f4a12ae109bbe093b4cbff034e5f474f840c2f8969bcbcc3c0cb1810b5245785c24dbaf7d1a74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/id/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/id/thunderbird-60.3.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "fafd7a26288b951d179657f99c72581e4bb5299e8db775b7a086f3481f700dde031137e2cc7370e308c943a0a874c5985c6b9e36c7af1b60c4553779a4653d85";
+      sha512 = "134ec9f6c468d6e389b2b0147b623b814f6bdf5115d55215cd2f6a3873f435f9fae08c4426b701aa7854344896c2216cdf7c8b62056aed552bef23fe6a31f14d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/is/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/is/thunderbird-60.3.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "3aa276ee0ee8f2613ec7ef1543ba5938658fdd5c1ea24b42d39c5fff4f016325daaa701f89c65a32f04c85fd066f3bef75dd0d5d28ffdeb29618fc16435f046d";
+      sha512 = "0795c91a48811491809166dc5cfa772f3243ab0e8b462a49745b892fa49db891f8c6638ba6fddcbeb434130c5ce92a997719aa573350d6e5b20ac28c99653396";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/it/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/it/thunderbird-60.3.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "696b5bd5c93fa5a174b04f2501e46c6334cbbdba43073015962e7ae17cbf577f0e64d016b7f892513a3a07b6867e8419cb16fc82b915d09695d5a84f3d904bad";
+      sha512 = "8ac5bd2df3f0fedfbe3e0a75f8798fbe4e2c405910619cbaea137ca522a59fcad9ee932463ab4042d70fe9f9e37d8a0a99c1c45216c125155aeb364f9e85c236";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ja/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ja/thunderbird-60.3.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "588e5c6dfbb40cf355d62f000b5561c6a2a4e0b5c43c7dd2136fab11ee4763cd9cbea89e958f3959aae0570c694aa067d77ed7cca818147cf51a28efb304ab72";
+      sha512 = "cc459b44a9ced486d090b78a547442e181ed556036197b9770c3e441976a867ebebbe9297cf8413ba5408e2181089a4850a68d18211d314d071d4a249f524173";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kab/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/kab/thunderbird-60.3.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "aa58f8a4309ca122d8517042c9a8c8a92b90087001ae4552de6b660bae082565ae1d80aacd3e506f8582a145132a482fb8c22eab033d7afd4a3959653d00f1d4";
+      sha512 = "0771159f455a9417c8322ca09d6f01e823095b8c5d87933e95152b0690bdaf1f935a9ea84c7fe6e669773c54ae84e7f51e22aee2376f41e546035cffbd4f2550";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/kk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/kk/thunderbird-60.3.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "6081c78fe6febdc6c1c0ef2d102755760c9b137d117c0ad5b8adbf1a50769c3198a703abbb5a826ddd723cb128d535d2f075359e7300d763d8e0a769e3bd5897";
+      sha512 = "6462ce8dad2f34108c9e08d9d891911e5a3093b49040df9e657b07abc123e01713ee8bf0a83437cc0835bef2085b29899dc70400ca0ed0cd65160ff32cf76090";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ko/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ko/thunderbird-60.3.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "980b2fe49c2f705296ff9036e6714f2039a81ca8c591dd8a0567ba2171196f188be647a3aab1bab25fd48c7f3a02b75307f0a35edb36c534785d51c207fd7203";
+      sha512 = "bacc91e37c658b0671b9fcd0f7efedea1b05ec2fe7b18ac989d2a282c8151d5d76de2ef6e381f4e8346d651c500b7f4374a5baf312fa70613550b01c5b440118";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/lt/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/lt/thunderbird-60.3.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e3b37725dcc8f97f36c7e57450b911ba4547b2f34720f27cd89b7f2be92bcc0ee20f1e3426e623a53125013b447ea90df138da53c68de535620f548c955915f0";
+      sha512 = "9218310de664035a0fbb70e579a2c34294f0b38f4a3787da7dc73018c3103ea23a8b3978ee8f2d7131aa67c2ed5858984d4e7eadf0f4987bfce5b8b0e23c89a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ms/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ms/thunderbird-60.3.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a27ab9c7c524f7dbeb6dde32f36c4cd0f3fe20026e90793bf6fb6396f9a7816aee99c48574224c72be8aba5922dd3d7a21b6c05cbbf8caf1e7b956af50018f2e";
+      sha512 = "1df6d4e8aae46d1b97142c975a1f7c9e3cdc7ea00b3693af2442468d712338519857e8ee8fca66dbddae2b0f28972e7fd077e20c237bb214c3f37ab66fb2ec86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nb-NO/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/nb-NO/thunderbird-60.3.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "45135f0d62b03919b754b2b95329dd4a60ad7a2ad1ed4fdff5f174df5d1391111c9f3acd1a0b4ee71b340327b06180619fe84740b43fa8d6fa5d70ea6bcba0da";
+      sha512 = "2527fe96bbdf9c827baf2fa86d526b274f4c72800d6ab4233544537ceda5a8b1bb284d5e141d1a09e05727f5b2b6c2b3d413d7d4c9a974b29537c6102935ed74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/nl/thunderbird-60.3.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "be4fd59d184fd161aa2afa1d2a13a11e54adad4329991b588d373a206b5f2e41bd03d51c1270d6bfc6c84a83c520cd3859eea8f5dbe71b0d2fbfe4bdac2a862e";
+      sha512 = "3d69a82dc64321111bd3971e984414336cfda3def779aed1a683bc65c02dfa4ae913b1ff2a1e5e13e31100719ae002b2efebc3854075e315a76bef84fca2dd5a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/nn-NO/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/nn-NO/thunderbird-60.3.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "896c6bfef19af9dc5cf48829869d47a7fcc2daeb9ce2f0a86a959fd6d656b6d721b024830f03230b9bf35a300b21dcb603d5e7aacb36666c33ff80bf5babf1a0";
+      sha512 = "533740fc37bd06eeead741afb6e13965f029c6996704c307c793cefcb4f38a4b3d2d4b9ec1aa934df95291c6b2d9965955333b3fc541806ae38226b119c7bec6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/pl/thunderbird-60.3.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "fb5f412f4bee2af9fed61f310306b883e78b4d64934643cfa0418b69a54e29f746b427e97f58aa94031bf1428d959e3c7e7605dc98c3658163f34217e87ed051";
+      sha512 = "e1984be8836f63d91656618509dad6ad34de544d6bbe49c0dac2649c01dd0dd4b8db88f05b08b8425e34548c7bc45ce10e69278eb840f061b4f0e88f40ec1515";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-BR/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/pt-BR/thunderbird-60.3.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d1cfa631a3491f1015b8182ef5beb8046cebb0d2a0f541a31dfaac88b2f54586c8a6ad15a23ad17aac0c1ff9ec3b5a214002f0aa46dea37698093ca9f71ad288";
+      sha512 = "0eda97e4fefe23af3126f9639358e3c0bb4a462bac2a64561bec0437cce426f61d995dfb8a081ab84101279a24f6d539338056d2a81f9c5aa157f61babea017b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/pt-PT/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/pt-PT/thunderbird-60.3.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5d63808463b829f6bffea85d0c07119ba8d33f09f39fd7494f84d12dcf205286df6e87ff1dbbeac8a6961403060f0f23b148c2ebe0329e47ec8dbab3b94267c6";
+      sha512 = "11ddef47843f68a72322e5750e4a3ccd09c21e768aa2a726cf48bf03a67c47cdbd83b886a50d82312d9472c198813d66b29baa98715cd564c89dfacdcbca0e41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/rm/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/rm/thunderbird-60.3.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "b8c0b360b47ab9d43fa2ec3fa0fde1cacc8cc7d2f47e43eda2b4f973991d2df247520d0a10972777ce78d87887e0ace82844aec5955d122cef3119328367c862";
+      sha512 = "b004eac3d9cf2c59a2531b39927a646dcd43638d97f306ba25b58fb9629d7f091c54d69aab623f2699b3063832afac7d6dbcc6d8c5d472f9aa12d150edabc834";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ro/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ro/thunderbird-60.3.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3a696c7bcf2ee63ca797579d5a196659cc00ebba9ccbd7f41450aa5f8352260cd7cece56b43722ff09dafeafa2e11e76bd51f6863a7badd15f550ef1e38c6ce5";
+      sha512 = "fc034eb4bc0335cd1d8c23d97ec046a735c8a43caba1989698ab84e6f317e3d12e9f82e22c55a2357eea87495863d3e9458690fae366c20bfb86ce5a717d6a16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/ru/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/ru/thunderbird-60.3.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "897df974fdda8f9c68091a15ddaaf36261b4d68183c3f09442fff486c2a86249e24744187cf85cfcd3217f54340a7c51f14ecc618373101ecd264ae767a387e2";
+      sha512 = "d78dc34620e193620e07f3041bbc4a3751bade9b0f2f66b34f37e57cb67a52b64746d6beed566452f0f27928bf58429c7ae99756a2328781b0ee6a981669aeef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/si/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/si/thunderbird-60.3.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "35b16423c41886f28a9aab9e9b5ebcc811ac03424a89b9e6f7ca494f8cc43a1c51668854d9c479fde8f977306290cf0b5bd2eb4c0c60fc98fc6522333624890e";
+      sha512 = "76d20ae74e5aee5c1f86d5f7b3fe780acb8021f442038dc4193bda59adb0de274a6fec14be90ee244eb91987cb73cf313e06c1f87d33789418158a78d455ce14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/sk/thunderbird-60.3.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "5e4855121d4d36dc639a85986d5ccef62c7eff28008d7d2c5150becd75ebe6f95a5ae54a280e35e50c5f2cbc27665a709e1fdc55860d17b893b2fc2e48d0e56b";
+      sha512 = "86cf766b5260a03a57cc2d9a8e7308badbc2488219627445b6f08bb92e0008c708b9b542a2a4b99e6210f8b461c5520385b2549d3f47ba1d8b3759fd364f79bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sl/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/sl/thunderbird-60.3.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "93ca3fb5eec8edeb050d8c293446f44c975f5b206de5ceac7cf9a7feb3699c90c1e85848fb22108ec757960d6a686d68ffba61644b20d1e0c8ffd0a126dadd17";
+      sha512 = "ca377881fb35c95e3a9bd3807a0ab227bb1a899406fc2c99c0a42e31702e6271379afb1197ebb53dbbf11d163c346ac664c056c02761653e56c445df1d066ccf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sq/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/sq/thunderbird-60.3.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "891a6a103eb05b84af59c76cee7742d5ad04aa51beb955a7023852879e2853b5ac2b79af2dd45f87cefbcd176ab7d6bda9773f9af8e624435ac228d0c04ce298";
+      sha512 = "b46f45d78295999c489b72114290ce38617d87011743d276a6ff90f575205f8e473ba68a9b080e622fd5350b8574f1602edf085ca30aec9f64801df5aa937d2b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/sr/thunderbird-60.3.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "14d84a42a89b84d2aeca1e4b4f2b2ecb30dd5e940ccb77a7b6337df88d0c73e4cfdaae0c6fdc055e6cbe213ad4652361c3b5f37680e09506da354bcc492cc155";
+      sha512 = "1952cb0e645f0bf4f6473cf2e01b3ab3b30deea450545d4027f2c8cd037016296ca08f14d80d2d47fab4ac1bd69e9177b3eb2e73a861e5da5d14f660f9ae7534";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/sv-SE/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/sv-SE/thunderbird-60.3.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "4a51fbca27bb37b556fd3aaaca45ba0f18129089da8d69d796ea6c13fcf8e65138db7d3f87d355777ce325c7f0e7b7b643d7a0c6067f71ca63e1c37c052d34ca";
+      sha512 = "fabc6da07f9269c7404b341b63e7377b94d481f96b8dd66b19bceb8e4b18e6ce99a75cac20e7952df900c5921b701e3f2d4f0e245dbf2f760a6d933730f6007b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/tr/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/tr/thunderbird-60.3.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "332deb7803f935e67bc3d3e8ff55255f5ac8a6a7f128fef924c78aeb8b4023f0f562b9957dbdf84ba25c4b65a55028a8b341a0764ec4aced8fb127b05c083029";
+      sha512 = "4e4136596cbbb50719219c9b1aaafa9fbdc9464750317b1e1f0f6c3a8289a1a11bb472b7f781081386a81f36411d04be91acdf8374c1870dd5fa65f171391a1f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/uk/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/uk/thunderbird-60.3.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "0c96360839e9e72848b1574c389cd29d71e3225cfaca7292c83f9835c4c9d59cb324b390acb00666861f7a060eedc233ac84dc475536e9b206af75e9fa4edf49";
+      sha512 = "a378b4d0107c8d16a40a934e898190d0e26593c7efcb3ad7338e95ccae88d00e7b1d5a7d54cdc063ef8423edf65f875688f3a96e60c36499c708dc642d11f14f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/vi/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/vi/thunderbird-60.3.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b0421b6a3ee1dd95d3282c69d618eadf8f1fb69f72d61bec63fa82544d387780b2f80b2531c48c853fcfb4e9a50d14a79b145d3fe3f9ca0919582876385d63af";
+      sha512 = "a02360132303d533abeb1bf82e318a416bac192a5ff017a3a7300cf0f062f0e165a8be1355b2d2cdcf8aee8e293ca615923ca97a6f6b9df054a93e57eeceb620";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-CN/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/zh-CN/thunderbird-60.3.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "22197ee9de592ea02894cf3cffda12267a4999b3fba31a6f90c621aec502834753f09834ed80901f156a385f7af6c1ff4a3d6558a47b2e489f153d1d727d0bd6";
+      sha512 = "9125c4078b4c0de07ff161cf468c0efa5d61a2df42f8237e9d54a4c2996ef769e810116fea7fc69b44f6688525860dc3821621b63355b83e61e08cbdaba0f2a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.2/linux-i686/zh-TW/thunderbird-60.3.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.3/linux-i686/zh-TW/thunderbird-60.3.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8e7e3d7063ef9b5e56f000cfada185ad31951b3ccf7dd9f84455fde7490e3cafef934f0b3501b70d7746464aa5b41180f6f9eeecc7b580d07823bf2ec97d11e8";
+      sha512 = "0a692b8bc5731bc2d656e1f1ac8a5c841885e4412f94bba325ae9a0396bdcd092eb5e31ea5dcde6774745e0edeecabdb3642f062f2bbe9c6ec4b66e7e362302b";
     }
     ];
 }

From 4d0a88b21a0b572cbdd59e6a5a5381d37af6b4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 09:13:18 +0100
Subject: [PATCH 1810/2793] gnome3.nautilus: fix thumbnail generation

3.30 copied over the thumbnail code frome gnome-desktop:
https://gitlab.gnome.org/GNOME/nautilus/commit/673c81cf9f1d68b71041220e6e44624dee44dbfc

Simply patch nautilus too.

ref https://github.com/NixOS/nixpkgs/issues/50494
---
 .../core/nautilus/bubblewrap-paths.patch      | 19 +++++++++++++
 .../gnome-3/core/nautilus/default.nix         | 27 ++++++++++++++-----
 2 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
new file mode 100644
index 00000000000..051b7618612
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
@@ -0,0 +1,19 @@
+---   a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
++++   a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -514,14 +514,10 @@ add_bwrap (GPtrArray   *array,
+   g_return_val_if_fail (script->s_infile != NULL, FALSE);
+ 
+   add_args (array,
+-	    "bwrap",
+-	    "--ro-bind", "/usr", "/usr",
+-	    "--ro-bind", "/lib", "/lib",
+-	    "--ro-bind", "/lib64", "/lib64",
++      "@bubblewrap_bin@",
++      "--ro-bind", "@storeDir@", "@storeDir@",
+ 	    "--proc", "/proc",
+ 	    "--dev", "/dev",
+-	    "--symlink", "usr/bin", "/bin",
+-	    "--symlink", "usr/sbin", "/sbin",
+ 	    "--chdir", "/",
+ 	    "--setenv", "GIO_USE_VFS", "local",
+ 	    "--unshare-all",
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 7e7c40e8130..b581d8f0983 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook
-, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif, libseccomp
-, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
+, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
+, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
+, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
+, substituteAll, bubblewrap
+}:
 
 let
   pname = "nautilus";
@@ -13,11 +16,14 @@ in stdenv.mkDerivation rec {
     sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
+    desktop-file-utils
+  ];
 
   buildInputs = [
     glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
-    tracker tracker-miners gnome-desktop gexiv2 libseccomp
+    tracker tracker-miners gexiv2 libseccomp bubblewrap
     gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
   ];
 
@@ -36,7 +42,16 @@ in stdenv.mkDerivation rec {
     patchShebangs build-aux/meson/postinstall.py
   '';
 
-  patches = [ ./extension_dir.patch ];
+  patches = [
+    ./extension_dir.patch
+    # 3.30 now generates it's own thummbnails,
+    # and no longer depends on `gnome-desktop`
+    (substituteAll {
+      src = ./bubblewrap-paths.patch;
+      bubblewrap_bin = "${bubblewrap}/bin/bwrap";
+      inherit (builtins) storeDir;
+    })
+  ];
 
   passthru = {
     updateScript = gnome3.updateScript {

From e1de1050d4939c0efe55b6bb923ba0d2a8d371de Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 13 Dec 2018 09:07:56 +0100
Subject: [PATCH 1811/2793] atom, atom-beta: 1.32.1 -> 1.33.0, 1.33.0-beta1 ->
 1.34.0-beta0

---
 pkgs/applications/editors/atom/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 73a9f26a122..4e6381f7d98 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -3,14 +3,14 @@
 let
   versions = {
     atom = {
-      version = "1.32.1";
-      sha256 = "1x22jbhvagqw9mvq0v7z4z09qp727vl0rkyvaxn98xnj9gvcfkq9";
+      version = "1.33.0";
+      sha256 = "0f6m6zwgz94m3q11ipyiliap3s5a3zlrg3ldjwkqnxjl6gwlxc2r";
     };
 
     atom-beta = {
-      version = "1.33.0";
-      beta = 1;
-      sha256 = "0sf98apmb57msgr5p1xly0mffzn2s808nsfsmbisk4qqmm9fv2m3";
+      version = "1.34.0";
+      beta = 0;
+      sha256 = "1xnrr4z55sj46hqr0il26sfs6s3knv60m340cw3rzzic271b3ifw";
     };
   };
 

From 22d46c4b6d853b2864dc3fe30f61424ccbc11c16 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 13 Dec 2018 09:08:24 +0100
Subject: [PATCH 1812/2793] atom: remove myself as maintainer

I longer use atom, so I won't be regularly updating it. I am hereby removing
myself as maintainer to reflect this.
---
 pkgs/applications/editors/atom/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 4e6381f7d98..710c3ca335a 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -79,7 +79,7 @@ let
       description = "A hackable text editor for the 21st Century";
       homepage = https://atom.io/;
       license = licenses.mit;
-      maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
+      maintainers = with maintainers; [ offline nequissimus ysndr ];
       platforms = platforms.x86_64;
     };
   };

From adf8cdd67dc225bab32606aaaed08559601bf85e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Dec 2018 06:57:42 -0500
Subject: [PATCH 1813/2793] linux: 4.4.166 -> 4.4.167

---
 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 a32424565d3..9ef3768332d 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.166";
+  version = "4.4.167";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0nj1wvsf1c843hp9ww68gpwsjdviax67dpffafsq78ask7yyy45z";
+    sha256 = "1pryjpih8js9640jhv74wzvka4199irnp7bzn33lyh35lll4rjik";
   };
 } // (args.argsOverride or {}))

From 1f92bdcd948b5198fb28e6899edf361e7979aa20 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Dec 2018 06:57:58 -0500
Subject: [PATCH 1814/2793] linux: 4.9.144 -> 4.9.145

---
 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 fcb01793067..97a730210d6 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.144";
+  version = "4.9.145";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0avqc9v22jxf9p71279ssa1lhml3hf2zdkc4j0pzms929m1pzl85";
+    sha256 = "0pmwnnjk05xpw9qvzl59llf4ihjdicrm52ardkra41f3x0vwl0b9";
   };
 } // (args.argsOverride or {}))

From f335fa6d74cf6ec7ace4d2fe7ef28e030126064e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Dec 2018 06:58:07 -0500
Subject: [PATCH 1815/2793] linux: 4.14.87 -> 4.14.88

---
 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 e9fb0ac7a46..0f115476b5d 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.87";
+  version = "4.14.88";
 
   # 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 = "09g12a8lkx5xm3c65q6wbzr2asnws956w2d8apj27avxcmylsx1n";
+    sha256 = "0bgm4vr1c4s4k8gyw8i92lxj82nl67jh55q0yg5bdsh8cz3viw5h";
   };
 } // (args.argsOverride or {}))

From 5a15ab7b5d6ea6c8b0f71ac9610b0b8880c0912c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Dec 2018 06:58:15 -0500
Subject: [PATCH 1816/2793] linux: 4.19.8 -> 4.19.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index d4d0fcb243a..451af3f8c8d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.8";
+  version = "4.19.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 = "0wg1cy8ydd3m6x86mqxmcr4crwhsrmrp62byzq63zw87ydkd0h6m";
+    sha256 = "1wnvd4901ppzmx26fiav4glfkpb8qc7srcyk2m198wwwhb36q4gw";
   };
 } // (args.argsOverride or {}))

From 3c54d6b2f8e7e59578f5c29a577c3d415e9febf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 6 Dec 2018 15:43:50 +0100
Subject: [PATCH 1817/2793] nixos/openldap: Support configuring the log level

---
 nixos/modules/services/databases/openldap.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9f2bf5ef8a9..e996211be7d 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -54,6 +54,13 @@ in
         description = "The database directory.";
       };
 
+      logLevel = mkOption {
+        type = types.str;
+        default = "0";
+        example = "acl trace";
+        description = "The log level selector of slapd.";
+      };
+
       configDir = mkOption {
         type = types.nullOr types.path;
         default = null;
@@ -139,7 +146,7 @@ in
         chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
       '';
       serviceConfig.ExecStart =
-        "${openldap.out}/libexec/slapd -d 0 " +
+        "${openldap.out}/libexec/slapd -d ${cfg.logLevel} " +
           "-u '${cfg.user}' -g '${cfg.group}' " +
           "-h '${concatStringsSep " " cfg.urlList}' " +
           "${configOpts}";

From d95dc9697e4f527bffafa7584b85be0692e40345 Mon Sep 17 00:00:00 2001
From: Stefano Probst <senden9@gmail.com>
Date: Thu, 13 Dec 2018 15:51:05 +0100
Subject: [PATCH 1818/2793] Update oh-my-zsh.xml

Change name of the parameter to match https://github.com/NixOS/nixpkgs/blob/3d4cb55b718cfab054e86e864c90220d040d1935/nixos/modules/programs/zsh/oh-my-zsh.nix
---
 nixos/modules/programs/zsh/oh-my-zsh.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 5cf690c1a56..0baf1944739 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -19,7 +19,7 @@
    configuration format of <literal>oh-my-zsh</literal>.
 <programlisting>
 {
-  programs.ohMyZsh = {
+  programs.zsh.ohMyZsh = {
     enable = true;
     plugins = [ "git" "python" "man" ];
     theme = "agnoster";

From 9a104494ece0dc3cf09d539bb5a587bbedf44e01 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 13 Dec 2018 16:46:22 +0100
Subject: [PATCH 1819/2793] haskellPackages.modular-arithmetic: disable tests

---
 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 b0d30724438..82063008676 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -342,6 +342,7 @@ self: super: {
   MemoTrie = dontHaddock (dontCheck super.MemoTrie);
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;
+  modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)
   nats-queue = dontCheck super.nats-queue;
   netpbm = dontCheck super.netpbm;
   network = dontCheck super.network;

From dcb5c0cd823a1a57467a72ceb0cd7c8185ec8534 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 13 Dec 2018 17:16:52 +0100
Subject: [PATCH 1820/2793] sublime: add new download url

The old one gave a 404. I left it there for if it ever comes back
---
 pkgs/applications/editors/sublime/2/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix
index 11724d9802a..24639f3bfd4 100644
--- a/pkgs/applications/editors/sublime/2/default.nix
+++ b/pkgs/applications/editors/sublime/2/default.nix
@@ -9,13 +9,19 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchurl {
         name = "sublimetext-2.0.2.tar.bz2";
-        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2;
+        url = [
+          http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2
+          https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2
+        ];
         sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
       }
     else
       fetchurl {
         name = "sublimetext-2.0.2.tar.bz2";
-        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2%20x64.tar.bz2;
+        url = [
+          http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2
+          https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2
+        ];
         sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
       };
   buildCommand = ''

From d5c931992d4bf0ddf067530d05a792e056727405 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 13 Dec 2018 17:23:51 +0100
Subject: [PATCH 1821/2793] Fix english in stdenv.xml

---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 26190debc29..de2bf00e062 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2500,7 +2500,7 @@ addEnvHooks "$hostOffset" myBashFunction
      <listitem>
       <para>
        This hook will make a build pause instead of stopping when a failure
-       happen. It prevents nix to cleanup the build environment immediatly and
+       happen. It prevents nix from cleaning up the build environment immediatly and
        allows the user to attach to a build environment using the
        <command>cntr</command> command. On build error it will print the
        instruction that are neccessary for <command>cntr</command>. Installing

From 3a2819891865ac32fcd6dcc47ad9f3cbc05d728e Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 13 Dec 2018 18:06:58 +0100
Subject: [PATCH 1822/2793] grafana: 5.4.1 -> 5.4.2

---
 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 f55fe9a8d58..c8e49a851e9 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.4.1";
+  version = "5.4.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1bfxj2f9hid1nj3j1kqr33sdh89y7kgcj8rk9a95ldnpgkxi1n79";
+    sha256 = "113cas1grvigfvgpkz3na6kaf2shfl7mpaikqsxn3z7xab7nqm96";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1f3qjk58dr30xvnck6s6655qr3njvdkg1whxij9canwx17wy022a";
+    sha256 = "0rpq0q84619g5cixrcnzkvx6875g8mxc12gl8y5nzmq7zdavfa32";
   };
 
   postPatch = ''

From 694d32f47df99620e5c653de252dc9d3555924bd Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Dec 2018 18:11:52 +0100
Subject: [PATCH 1823/2793] Update doc/stdenv.xml

Co-Authored-By: guibou <guillaum.bouchard@gmail.com>
---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index de2bf00e062..c54901a93eb 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2500,7 +2500,7 @@ addEnvHooks "$hostOffset" myBashFunction
      <listitem>
       <para>
        This hook will make a build pause instead of stopping when a failure
-       happen. It prevents nix from cleaning up the build environment immediatly and
+       happen. It prevents nix from cleaning up the build environment immediately and
        allows the user to attach to a build environment using the
        <command>cntr</command> command. On build error it will print the
        instruction that are neccessary for <command>cntr</command>. Installing

From 958a6c6dd39b0d6628e1408e798a8f1308f2f3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Thu, 13 Dec 2018 14:48:16 +0100
Subject: [PATCH 1824/2793] dune: 1.5.1 -> 1.6.2

---
 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 62493ee83a6..85fa76bb28e 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "dune-${version}";
-  version = "1.5.1";
+  version = "1.6.2";
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1dbf7wwhr7b41g3p24qb9v5r1vvgrk6i9w8f7y7k5k527xy9jk5w";
+    sha256 = "1k675mfywmsj4v4z2f5a4vqinl1jbzzb7v5k6rzyfgvxzd7gil40";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];

From e5d9f98e46949f08e5d868fb635522466901be9d Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Thu, 13 Dec 2018 18:47:50 +0100
Subject: [PATCH 1825/2793] go-ethereum: 1.8.19 -> 1.8.20

---
 pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 2d6312364fd..14bf13d8828 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.19";
+  version = "1.8.20";
   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 = "0shp8ak44v52ynlyawfh53wczd3zch7ydf6bmbrhm5rpbribirwr";
+    sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0";
   };
 
   meta = with stdenv.lib; {

From 6283971a2ce8c0338a767a24116550d0affa84fc Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 23 Nov 2018 17:10:02 +0100
Subject: [PATCH 1826/2793] slither-analyzer: init at 0.3.0

---
 .../slither-analyzer/default.nix              | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/slither-analyzer/default.nix

diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
new file mode 100644
index 00000000000..10241104ef3
--- /dev/null
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, makeWrapper, prettytable, pythonOlder, solc }:
+
+buildPythonPackage rec {
+  pname = "slither-analyzer";
+  version = "0.3.0";
+
+  disabled = pythonOlder "3.6";
+
+  # No Python tests
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10vrcqm371kqmf702xmqmzimv3xgrn3k3ip06nr1l6gnj3jk138g";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  propagatedBuildInputs = [ prettytable ];
+
+  postFixup = ''
+    wrapProgram $out/bin/slither \
+      --prefix PATH : "${lib.makeBinPath [ solc ]}"
+  '';
+
+  meta = with lib; {
+    description = "Static Analyzer for Solidity";
+    longDescription = ''
+      Slither is a Solidity static analysis framework written in Python 3. It
+      runs a suite of vulnerability detectors, prints visual information about
+      contract details, and provides an API to easily write custom analyses.
+    '';
+    homepage = https://github.com/trailofbits/slither;
+    license = licenses.agpl3;
+    maintainers = [ maintainers.asymmetric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6978a9e250..fe72aa02a07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5398,6 +5398,8 @@ in
 
   signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
 
+  slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
+
   signify = callPackage ../tools/security/signify { };
 
   # aka., pgp-tools
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c594faee53..8e159a6b1d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -716,6 +716,8 @@ in {
 
   slicerator = callPackage ../development/python-modules/slicerator { };
 
+  slither-analyzer = callPackage ../development/python-modules/slither-analyzer { };
+
   snapcast = callPackage ../development/python-modules/snapcast { };
 
   spglib = callPackage ../development/python-modules/spglib { };

From 907847061b5b747c80cb196e3d589603b0e83982 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 17:08:06 +0000
Subject: [PATCH 1827/2793] maintainers: add github for ivan

---
 maintainers/maintainer-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 320a1aab9c3..7a0ff6fe437 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1896,6 +1896,7 @@
   };
   ivan = {
     email = "ivan@ludios.org";
+    github = "ivan";
     name = "Ivan Kozik";
   };
   ivan-tkatchev = {

From e84255296f4ba8f22dd9216dd7024f87e15e60bd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:06:46 -0600
Subject: [PATCH 1828/2793] stdenv: implement crossOverlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.

(cherry picked from commit a3a6ad7a01e943a4097c87cb144d331910693d82)
---
 pkgs/stdenv/cross/default.nix   | 13 +++++++++----
 pkgs/stdenv/custom/default.nix  |  2 +-
 pkgs/stdenv/darwin/default.nix  |  4 ++--
 pkgs/stdenv/default.nix         |  4 ++--
 pkgs/stdenv/freebsd/default.nix |  2 +-
 pkgs/stdenv/linux/default.nix   |  4 ++--
 pkgs/stdenv/native/default.nix  |  2 +-
 pkgs/stdenv/nix/default.nix     |  4 ++--
 pkgs/top-level/default.nix      | 13 ++++++++-----
 9 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index daa9f66615c..a6063049a3a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,11 +1,14 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 }:
 
 let
   bootStages = import ../. {
     inherit lib localSystem overlays;
-    crossSystem = null;
+
+    crossSystem = localSystem;
+    crossOverlays = [];
+
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
@@ -33,7 +36,8 @@ in lib.init bootStages ++ [
 
   # Run Packages
   (buildPackages: {
-    inherit config overlays;
+    inherit config;
+    overlays = overlays ++ crossOverlays;
     selfBuild = false;
     stdenv = buildPackages.stdenv.override (old: rec {
       buildPlatform = localSystem;
@@ -48,7 +52,7 @@ in lib.init bootStages ++ [
 
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if crossSystem.useAndroidPrebuilt or false
              then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
 
@@ -56,6 +60,7 @@ in lib.init bootStages ++ [
         ++ lib.optionals
              (hostPlatform.isLinux && !buildPlatform.isLinux)
              [ buildPackages.patchelf buildPackages.paxctl ]
+        ++ lib.optional hostPlatform.isDarwin buildPackages.clang
         ++ lib.optional
              (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
              buildPackages.updateAutotoolsGnuConfigScriptsHook
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index b6ea8685f8e..e86face9519 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   bootStages = import ../. {
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index cda643c42fe..4c693f3e5d6 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,5 +1,5 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
@@ -16,7 +16,7 @@
   }
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 210e0439c0b..c0bbe24e521 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -7,7 +7,7 @@
 { # Args just for stdenvs' usage
   lib
   # Args to pass on to the pkgset builder, too
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 } @ args:
 
 let
@@ -36,7 +36,7 @@ let
 
   # Select the appropriate stages for the platform `system'.
 in
-  if crossSystem != null then stagesCross
+  if crossSystem != localSystem || crossOverlays != [] then stagesCross
   else if config ? replaceStdenv then stagesCustom
   else { # switch
     "i686-linux" = stagesLinux;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index b3a6cedad84..dbb4a056455 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 let inherit (localSystem) system; in
 
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 884730cfe90..3700211fa29 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -4,7 +4,7 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 , bootstrapFiles ?
   let table = {
@@ -32,7 +32,7 @@
   in files
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 37795b11f6d..810cf16301f 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index ffff8bdf51d..a8311f49609 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,10 +1,10 @@
 { lib
-, crossSystem, config, overlays
+, crossSystem, localSystem, config, overlays
 , bootStages
 , ...
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 bootStages ++ [
   (prevStage: {
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index da7fc1bed34..dcd443a1c29 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,8 @@
   # `*Platform`s.
   localSystem
 
-, # The system packages will ultimately be run on. Null if the two should be the
-  # same.
-  crossSystem ? null
+, # The system packages will ultimately be run on.
+  crossSystem ? localSystem
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
@@ -32,6 +31,9 @@
 , # List of overlays layers used to extend Nixpkgs.
   overlays ? []
 
+, # List of overlays to apply to target packages only.
+  crossOverlays ? []
+
 , # A function booting the final package set for a specific standard
   # environment. See below for the arguments given to that function, the type of
   # list it returns.
@@ -61,7 +63,8 @@ in let
     builtins.intersectAttrs { platform = null; } config
     // args.localSystem);
 
-  crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0;
+  crossSystem = if crossSystem0 == null then localSystem
+                else lib.systems.elaborate crossSystem0;
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
@@ -91,7 +94,7 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    inherit lib localSystem crossSystem config overlays;
+    inherit lib localSystem crossSystem config overlays crossOverlays;
   };
 
   pkgs = boot stages;

From 7fcbc52d7d717778e019bb35673eb2aaae7d2842 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:12:17 -0600
Subject: [PATCH 1829/2793] stdenv/adapters.nix: fixup makeStaticBinaries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore

(cherry picked from commit 8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc)
---
 pkgs/stdenv/adapters.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7d527729273..7ba65fd76e9 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -32,13 +32,15 @@ rec {
   # Return a modified stdenv that tries to build statically linked
   # binaries.
   makeStaticBinaries = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = "-static";
+    { mkDerivation = args:
+      if stdenv.hostPlatform.isDarwin
+      then throw "Cannot build fully static binaries on Darwin/macOS"
+      else stdenv.mkDerivation (args // {
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
         configureFlags = (args.configureFlags or []) ++ [
             "--disable-shared" # brrr...
           ];
       });
-      isStatic = true;
     };
 
 

From f11d5341aad86561b541839115e31e98326f3342 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:13:24 -0600
Subject: [PATCH 1830/2793] darwin/libiconv: fix static/shared logic

The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.

(cherry picked from commit 5e06294276754ef063c618a1ecb12b629cde8ac3)
---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index ea5a5953606..0532c88b66b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -15,7 +15,7 @@ appleDerivation {
     (lib.enableFeature enableShared "shared")
   ];
 
-  postInstall = lib.optionalString (!enableStatic) ''
+  postInstall = lib.optionalString enableShared ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
     ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 

From a8e0694993a561483e6b28d745367d04a0772600 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:14:41 -0600
Subject: [PATCH 1831/2793] zlib: clean up static/shared distincion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.

(cherry picked from commit e999def1597de9d03a35cfa6b62277adb0e9a7ad)
---
 pkgs/development/libraries/zlib/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index d348f877f72..735a92bd370 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
-, static ? false
+, static ? true
+, shared ? true
 }:
 
 stdenv.mkDerivation (rec {
@@ -24,13 +25,15 @@ stdenv.mkDerivation (rec {
       --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
   '';
 
-  outputs = [ "out" "dev" "static" ];
+  outputs = [ "out" "dev" ]
+    ++ stdenv.lib.optional (shared && static) "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-  configureFlags = stdenv.lib.optional (!static) "--shared";
+  configureFlags = stdenv.lib.optional shared "--shared"
+                   ++ stdenv.lib.optional (static && !shared) "--static";
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString (shared && static) ''
     moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
@@ -64,7 +67,7 @@ stdenv.mkDerivation (rec {
     "PREFIX=${stdenv.cc.targetPrefix}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "-f" "win32/Makefile.gcc"
-  ] ++ stdenv.lib.optionals (!static) [
+  ] ++ stdenv.lib.optionals shared [
     "SHARED_MODE=1"
   ];
 

From 3170d617ef7618a27cacf2eabac3ce3ea9d5a7c4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:16:43 -0600
Subject: [PATCH 1832/2793] ncurses: make shared linking optinoal

when enableShared = false, we set --without-shared flag.

(cherry picked from commit 53a67891ab1fefd3aceed07f173cdd33f549fc70)
---
 pkgs/development/libraries/ncurses/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6293efcca8b..56727f5a5d8 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -4,6 +4,7 @@
 , mouseSupport ? false
 , unicode ? true
 , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
+, enableShared ? !enableStatic
 , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 
 , gpm
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # some aren't supported
 
   configureFlags = [
-    "--with-shared"
+    (lib.withFeature enableShared "shared")
     "--without-debug"
     "--enable-pc-files"
     "--enable-symlinks"

From 3c36dccd7ca4bcc3a3899e794864780dc7a4ce8c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:17:22 -0600
Subject: [PATCH 1833/2793] top-level/stage.nix: add static overlay

Adds the static overlay that can be used to build Nixpkgs statically.
Can be used like:

  nix build pkgsStatic.hello

Not all packages build, as some rely on dynamic linking.

(cherry picked from commit 6d90a8b8948185a3118faf183f29f4b8de294675)
---
 pkgs/stdenv/darwin/portable-libsystem.sh |  10 ++
 pkgs/top-level/stage.nix                 |  17 +++
 pkgs/top-level/static.nix                | 150 +++++++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 pkgs/stdenv/darwin/portable-libsystem.sh
 create mode 100644 pkgs/top-level/static.nix

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
new file mode 100644
index 00000000000..27ae790fb5a
--- /dev/null
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -0,0 +1,10 @@
+# Make /nix/store/...-libSystem “portable” for static built binaries.
+# This just rewrites everything in $1/bin to use the
+# /usr/lib/libSystem.B.dylib that is provided on every macOS system.
+
+fixupOutputHooks+=('fixLibsystemRefs $prefix')
+
+fixLibsystemRefs() {
+  find "$1/bin" \
+    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+}
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index ff09fa5ad1f..69c87114318 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -160,6 +160,23 @@ let
         };
       };
     };
+
+    # Fully static packages.
+    # Currently uses Musl on Linux (couldn’t get static glibc to work).
+    pkgsStatic = nixpkgsFun ({
+      crossOverlays = [ (import ./static.nix) ];
+    } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      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;
+        };
+      };
+    });
   };
 
   # The complete chain of package set builders, applied from top to bottom.
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
new file mode 100644
index 00000000000..687e38dcc3a
--- /dev/null
+++ b/pkgs/top-level/static.nix
@@ -0,0 +1,150 @@
+# Overlay that builds static packages.
+
+# Not all packages will build but support is done on a
+# best effort basic.
+#
+# Note on Darwin/macOS: Apple does not provide a static libc
+# so any attempts at static binaries are going to be very
+# unsupported.
+#
+# Basic things like pkgsStatic.hello should work out of the box. More
+# complicated things will need to be fixed with overrides.
+
+self: super: let
+  inherit (super.stdenvAdapters) makeStaticBinaries
+                                 overrideInStdenv
+                                 makeStaticLibraries;
+  inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions;
+  inherit (super) makeSetupHook;
+
+  # Best effort static binaries. Will still be linked to libSystem,
+  # but more portable than Nix store binaries.
+  makeStaticDarwin = stdenv: stdenv // {
+    mkDerivation = args: stdenv.mkDerivation (args // {
+      NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
+                      + " -static-libgcc";
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
+        substitutions = {
+          libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
+        };
+      } ../stdenv/darwin/portable-libsystem.sh) ];
+    });
+  };
+
+  staticAdapters = [ makeStaticLibraries ]
+
+    # Apple does not provide a static version of libSystem or crt0.o
+    # So we can’t build static binaries without extensive hacks.
+    ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
+
+    ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
+
+    # Glibc doesn’t come with static runtimes by default.
+    # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
+  ;
+
+  # Force everything to link statically.
+  haskellStaticAdapter = self: super: {
+    mkDerivation = attrs: super.mkDerivation (attrs // {
+      enableSharedLibraries = false;
+      enableSharedExecutables = false;
+      enableStaticLibraries = true;
+    });
+  };
+
+in {
+  stdenv = foldl (flip id) super.stdenv staticAdapters;
+
+  haskell = super.haskell // {
+    packageOverrides = composeExtensions
+      (super.haskell.packageOverrides or (_: _: {}))
+      haskellStaticAdapter;
+  };
+
+  ncurses = super.ncurses.override {
+    enableStatic = true;
+  };
+  libxml2 = super.libxml2.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  zlib = super.zlib.override {
+    static = true;
+    shared = false;
+
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
+  xz = super.xz.override {
+    enableStatic = true;
+  };
+  busybox = super.busybox.override {
+    enableStatic = true;
+  };
+  v8 = super.v8.override {
+    static = true;
+  };
+  libiberty = super.libiberty.override {
+    staticBuild = true;
+  };
+  ipmitool = super.ipmitool.override {
+    static = true;
+  };
+  neon = super.neon.override {
+    static = true;
+    shared = false;
+  };
+  libjpeg = super.libjpeg.override {
+    static = true;
+  };
+  gifsicle = super.gifsicle.override {
+    static = true;
+  };
+  bzip2 = super.bzip2.override {
+    linkStatic = true;
+  };
+  optipng = super.optipng.override {
+    static = true;
+  };
+  openssl = super.openssl.override {
+    static = true;
+
+    # Don’t use new stdenv for openssl because it doesn’t like the
+    # --disable-shared flag
+    stdenv = super.stdenv;
+  };
+  boost = super.boost.override {
+    enableStatic = true;
+    enableShared = false;
+  };
+  gmp = super.gmp.override {
+    withStatic = true;
+  };
+  cdo = super.cdo.override {
+    enable_all_static = true;
+  };
+  gsm = super.gsm.override {
+    staticSupport = true;
+  };
+  parted = super.parted.override {
+    enableStatic = true;
+  };
+  libiconvReal = super.libiconvReal.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  perl = super.perl.override {
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
+
+  darwin = super.darwin // {
+    libiconv = super.darwin.libiconv.override {
+      enableShared = false;
+      enableStatic = true;
+    };
+  };
+
+}

From 1c63a4678af2273dd21a095c30a64c22832dae77 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 13 Dec 2018 20:43:54 +0100
Subject: [PATCH 1834/2793] gitRepo: 1.12.37 -> 1.13.0

---
 pkgs/applications/version-management/git-repo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index e0aed206b75..242c06138eb 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-repo-${version}";
-  version = "1.12.37";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd";
+    sha256 = "0078nyz2j3ci9rs0h104xh046n0mcls3xcw5mysi2r7453xj8fkn";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 81eed0f30a5303c7b9db7e1e25eddc4cb28a8ca0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 13 Dec 2018 20:48:52 +0100
Subject: [PATCH 1835/2793] androidStudioPackages.{dev,canary}: 3.4.0.6 ->
 3.4.0.7

---
 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 8e54dd6f9ee..fbed3b432c0 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"
-    build = "183.5159543";
-    sha256Hash = "0r685qqx4w1hwbd8jgrh7ks8bw9m7823ffhd3x6pl7j4b9hpc858";
+    version = "3.4.0.7"; # "Android Studio 3.4 Canary 8"
+    build = "183.5173923";
+    sha256Hash = "0bf96c9db15rw1k1znz6yxhbrn9q990zy3pkq0nsirnqfpgllvpi";
   };
 in rec {
   # Old alias

From 35aab266e3f6bb11bf1930b1264bcf5643c5197c Mon Sep 17 00:00:00 2001
From: Jos van Bakel <josvanbakel@protonmail.com>
Date: Mon, 10 Dec 2018 08:43:42 +0100
Subject: [PATCH 1836/2793] swiftclient: init at 3.6.0

---
 pkgs/tools/admin/swiftclient/default.nix | 32 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/admin/swiftclient/default.nix

diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix
new file mode 100644
index 00000000000..ae8e5cac68c
--- /dev/null
+++ b/pkgs/tools/admin/swiftclient/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonApplication, fetchPypi, requests, six, pbr }:
+
+buildPythonApplication rec {
+  pname = "python-swiftclient";
+  version = "3.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv";
+  };
+
+  propagatedBuildInputs = [ requests six pbr ];
+
+  # For the tests the following requirements are needed:
+  # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt
+  #
+  # The ones missing in nixpkgs (currently) are:
+  # - hacking
+  # - keystoneauth
+  # - oslosphinx
+  # - stestr
+  # - reno
+  # - openstackdocstheme
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/openstack/python-swiftclient;
+    description = "Python bindings to the OpenStack Object Storage API";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ c0deaddict ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3e9663756..6e27911bec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12586,6 +12586,8 @@ in
 
   svrcore = callPackage ../development/libraries/svrcore { };
 
+  swiftclient = python3.pkgs.callPackage ../tools/admin/swiftclient { };
+
   sword = callPackage ../development/libraries/sword { };
 
   biblesync = callPackage ../development/libraries/biblesync { };

From fbabead2646cedcfad37ff5d2a58b9bc4592800b Mon Sep 17 00:00:00 2001
From: David McKay <rawkode@pm.me>
Date: Thu, 13 Dec 2018 20:32:59 +0000
Subject: [PATCH 1837/2793] kind: master -> 0.0.1

---
 pkgs/development/tools/kind/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 25bc7934000..bf73e436fa7 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -4,14 +4,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "kind-${version}";
-  version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f";
+  version = "0.0.1";
 
   src = fetchFromGitHub {
-    rev = rev;
+    rev = "${version}";
     owner = "kubernetes-sigs";
     repo = "kind";
-    sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh";
+    sha256 = "1jldj864ip8hrk3zhkjifr4gzgc8kxmxxwvklxglymhv8cxc179f";
   };
 
   goPackagePath = "sigs.k8s.io/kind";
@@ -20,7 +19,8 @@ buildGoPackage rec {
   meta = {
     description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
     homepage = https://github.com/kubernetes-sigs/kind;
-    maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ offline rawkode ];
     license = stdenv.lib.licenses.asl20;
+    platforms = platforms.unix;
   };
 }

From c974813b92e0f9c44cf35ed17382b7aaccbd737c Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 13 Dec 2018 22:25:19 +0100
Subject: [PATCH 1838/2793] nixos/sddm: Fix spelling of option in docs

---
 nixos/modules/services/x11/display-managers/sddm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index d5f98874b6e..05830e325d5 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -203,7 +203,7 @@ in
       { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names;
         message = ''
           SDDM auto-login requires that services.xserver.desktopManager.default and
-          services.xserver.windowMananger.default are set to valid values. The current
+          services.xserver.windowManager.default are set to valid values. The current
           default session: ${defaultSessionName} is not valid.
         '';
       }

From 6fa51fe5cfb99b665f8d9f3b3a30101f38b8d1cc Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 13 Dec 2018 22:26:12 +0100
Subject: [PATCH 1839/2793] nixos/lightdm: Fix spelling of option in docs

---
 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 e1688c45104..567c3ac3454 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -196,7 +196,7 @@ in
       { assertion = cfg.autoLogin.enable -> dmDefault != "none" || wmDefault != "none";
         message = ''
           LightDM auto-login requires that services.xserver.desktopManager.default and
-          services.xserver.windowMananger.default are set to valid values. The current
+          services.xserver.windowManager.default are set to valid values. The current
           default session: ${defaultSessionName} is not valid.
         '';
       }

From 2417859932f3cd92b3256b81c98eaeca445773cd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Dec 2018 12:15:56 -0500
Subject: [PATCH 1840/2793] doc/breakpointHook: correct typos

---
 doc/stdenv.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index c54901a93eb..cab76ef1104 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2500,17 +2500,17 @@ addEnvHooks "$hostOffset" myBashFunction
      <listitem>
       <para>
        This hook will make a build pause instead of stopping when a failure
-       happen. It prevents nix from cleaning up the build environment immediately and
+       happens. It prevents nix from cleaning up the build environment immediately and
        allows the user to attach to a build environment using the
-       <command>cntr</command> command. On build error it will print the
-       instruction that are neccessary for <command>cntr</command>. Installing
+       <command>cntr</command> command. Upon build error it will print
+       instructions on how to use <command>cntr</command>. Installing
        cntr and running the command will provide shell access to the build
        sandbox of failed build. At <filename>/var/lib/cntr</filename> the
-       sandbox filesystem is mounted. All commands and files of the system are
+       sandboxed filesystem is mounted. All commands and files of the system are
        still accessible within the shell. To execute commands from the sandbox
        use the cntr exec subcommand. Note that <command>cntr</command> also
        needs to be executed on the machine that is doing the build, which might
-       be not the case when remote builders are enabled.
+       not be the case when remote builders are enabled.
        <command>cntr</command> is only supported on Linux-based platforms. To
        use it first add <literal>cntr</literal> to your
        <literal>environment.systemPackages</literal> on NixOS or alternatively to

From 0083685a01a4e07c981a1fe10085474ab427a3d5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 13 Dec 2018 20:17:43 +0000
Subject: [PATCH 1841/2793] freebind: init at 2017-12-27

---
 pkgs/tools/networking/freebind/default.nix | 32 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/freebind/default.nix

diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
new file mode 100644
index 00000000000..3f89323de36
--- /dev/null
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }:
+
+stdenv.mkDerivation rec {
+  name = "freebind-${version}";
+  version = "2017-12-27";
+
+  src = fetchFromGitHub {
+    owner = "blechschmidt";
+    repo = "freebind";
+    rev = "9a13d6f9c12aeea4f6d3513ba2461d34f841f278";
+    sha256 = "1iv2xiz9w8hbz684caw50fn4a9vc8ninfgaqafkh9sa8mzpfzcqr";
+  };
+
+  buildInputs = [ libnetfilter_queue libnfnetlink ];
+
+  postPatch = ''
+    substituteInPlace preloader.c --replace /usr/local/ $out/
+    substituteInPlace Makefile    --replace /usr/local/ $out/
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "IPv4 and IPv6 address rate limiting evasion tool";
+    homepage = https://github.com/blechschmidt/freebind;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe72aa02a07..b349e010f7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2756,6 +2756,8 @@ in
 
   freedroidrpg = callPackage ../games/freedroidrpg { };
 
+  freebind = callPackage ../tools/networking/freebind { };
+
   freeipmi = callPackage ../tools/system/freeipmi {};
 
   freetalk = callPackage ../applications/networking/instant-messengers/freetalk {

From b0dc7bc6a327f413322d7fe5c5fc2f046d43d3e4 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 28 Oct 2018 09:31:04 +0900
Subject: [PATCH 1842/2793] quaternion: 0.0.9.2 -> 0.0.9.3

---
 .../instant-messengers/quaternion/default.nix | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 983646fbad5..55b24f71fb6 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,35 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
+{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake
+, qttools, libqmatrixclient }:
 
 stdenv.mkDerivation rec {
   name = "quaternion-${version}";
-  version = "0.0.9.2";
+  version = "0.0.9.3";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "Quaternion";
     rev    = "v${version}";
-    sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
+    sha256 = "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3";
   };
 
-  buildInputs = [ qtbase qtquickcontrols ];
+  buildInputs = [ qtbase qtquickcontrols qttools libqmatrixclient ];
 
   nativeBuildInputs = [ cmake ];
 
-  patches = [
-    # https://github.com/QMatrixClient/Quaternion/pull/400
-    (fetchpatch {
-      url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch";
-      sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x";
-    })
-  ];
-
-  # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
-  # https://github.com/QMatrixClient/Quaternion/issues/239
-  postPatch = ''
-    rm -rf lib
-    ln -s ${libqmatrixclient.src} lib
-  '';
-
   postInstall = if stdenv.isDarwin then ''
     mkdir -p $out/Applications
     mv $out/bin/quaternion.app $out/Applications

From af2cebe78fd185d1bbabd071f85f74654602d042 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 5 Dec 2018 12:51:44 -0600
Subject: [PATCH 1843/2793] stdenv/darwin: fix portable libsystem hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.

(cherry picked from commit 0b8574540b8691924a8dac6dc4d03004d8b25efa)
---
 pkgs/stdenv/darwin/portable-libsystem.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
index 27ae790fb5a..f50ccc8d32e 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -5,6 +5,8 @@
 fixupOutputHooks+=('fixLibsystemRefs $prefix')
 
 fixLibsystemRefs() {
-  find "$1/bin" \
-    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  if [ -d "$1/bin" ]; then
+      find "$1/bin" -exec \
+        install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  fi
 }

From cb5a7bdc3a486054003d2fb0ed06451af872fd30 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Thu, 13 Dec 2018 15:39:04 -0500
Subject: [PATCH 1844/2793] lz4: fix pkgsStatic build

---
 pkgs/tools/compression/lz4/default.nix | 19 ++++++++++++++++---
 pkgs/top-level/static.nix              |  4 ++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 7e29ee2b856..d2b7969a183 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, valgrind }:
+{ stdenv, fetchFromGitHub, valgrind
+, enableStatic ? false, enableShared ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
@@ -17,12 +19,23 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "INCLUDEDIR=$(dev)/include"
+    # TODO do this instead
+    #"BUILD_STATIC=${if enableStatic then "yes" else "no"}"
+    #"BUILD_SHARED=${if enableShared then "yes" else "no"}"
+  ]
+    # TODO delete and do above
+    ++ stdenv.lib.optional (enableStatic) "BUILD_STATIC=yes"
+    ++ stdenv.lib.optional (!enableShared) "BUILD_SHARED=no"
+    ;
 
   doCheck = false; # tests take a very long time
   checkTarget = "test";
 
-  postInstall = "rm $out/lib/*.a";
+  # TODO remove
+  postInstall = stdenv.lib.optionalString (!enableStatic) "rm $out/lib/*.a";
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 687e38dcc3a..e6ef50e7ee9 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -139,6 +139,10 @@ in {
     # it doesn’t like the --disable-shared flag
     stdenv = super.stdenv;
   };
+  lz4 = super.lz4.override {
+    enableShared = false;
+    enableStatic = true;
+  };
 
   darwin = super.darwin // {
     libiconv = super.darwin.libiconv.override {

From 187095a952f306262633b89947a9294029a2d328 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 17:48:57 -0800
Subject: [PATCH 1845/2793] xterm: 337 -> 339

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions
---
 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 4306c4fe955..3a3025e7d69 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-337";
+  name = "xterm-339";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "19ygmswikbwa633bxf24cvk7qdxjz2nq3cv9zdgqvrs7sgg7gb6c";
+    sha256 = "1kigkl4va1jxycqcf5dkg4d74j1fgrxhfbp8ib367crn6fqnprk5";
   };
 
   buildInputs =

From d71b642e44110c7e2fe8fe9ff6ad96b2784411e5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 18:07:28 -0800
Subject: [PATCH 1846/2793] xtermcontrol: 3.4 -> 3.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/xtermcontrol/versions
---
 pkgs/applications/misc/xtermcontrol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
index 8df29cef539..f3e743b5528 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.4";
+  version = "3.6";
   name = "xtermcontrol-${version}";
 
   src = fetchurl {
     url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
-    sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l";
+    sha256 = "01bwgxya6qh4br2lx3v98p7j1b99skgr6c1frw5kdkxy57qlpgkz";
   };
 
   meta = {

From ecaac75875bffa5b35af46e957a66a218d1eb6e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 18:13:10 -0800
Subject: [PATCH 1847/2793] yq: 2.6.0 -> 2.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/yq/versions
---
 pkgs/development/tools/yq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index a08e01a48b7..8ce88dac381 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "yq";
-  version = "2.6.0";
+  version = "2.7.1";
 
   propagatedBuildInputs = [ pyyaml xmltodict jq ];
 
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wyzg6lwxmzqsblljg9hddkadda7qdpw54sp0pmmbv89hhz7cky6";
+    sha256 = "1c10wbhgx8d8s44a8g2vzn4cmvkf7z7yqxrnk88aapgi51i786q0";
   };
 
   meta = with lib; {

From 0e485ed768105845fa7b350899ba76bc4444b9e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 18:30:33 -0800
Subject: [PATCH 1848/2793] xmr-stak: 2.6.0 -> 2.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/xmr-stak/versions
---
 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 a2b2410a1a1..0fb2cec2916 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.6.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "15vb55bshgjxk77yys7p832mr8qf7fb1dv3l0ppl6cmdcg8k0sx2";
+    sha256 = "1mlli8sx1f3922ygnwakmi2h3swccz62njxbzxfzbi4hlmvsaz0y";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 0e15c9af3a3001b16819e6afa1f4bab931f17ec2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 19:31:31 -0800
Subject: [PATCH 1849/2793] urh: 2.4.2 -> 2.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/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 a563272be4f..4dc8d5cfa3e 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.4.2";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1irwrhfbvl3ds8bi69laf8h0fyph0kpwrbfy0q8xh0w3l222sj3m";
+    sha256 = "01n4swm2q2i10qvhfw1q04wxf48xwqlddfg7842ff98i2d9yxy13";
   };
 
   buildInputs = [ hackrf rtl-sdr airspy limesuite ];

From f9f2f951b6a38ea3acbc893a008f791beccfbadf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 21:48:31 -0800
Subject: [PATCH 1850/2793] gnome3.webkitgtk: 2.22.4 -> 2.22.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/webkitgtk/versions
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e18142eb1d0..8baa6b0fc83 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.22.4";
+  version = "2.22.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs";
+    sha256 = "04ybyvaz5xhfkd2k65pc0sqizngjvd82j1p56wz3lz4a84zqdlwr";
   };
 
   patches = optionals stdenv.isDarwin [

From 9c56e3e21c7c08310da496dae7ee7fc4d8b1f543 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:02:00 -0800
Subject: [PATCH 1851/2793] unclutter-xfixes: 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/unclutter-xfixes/versions
---
 pkgs/tools/misc/unclutter-xfixes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix
index 9f43a7bd699..31087dbf7eb 100644
--- a/pkgs/tools/misc/unclutter-xfixes/default.nix
+++ b/pkgs/tools/misc/unclutter-xfixes/default.nix
@@ -2,7 +2,7 @@
   xlibsWrapper, libev, libXi, libXfixes,
   pkgconfig, asciidoc, libxslt, docbook_xsl }:
 
-let version = "1.3"; in
+let version = "1.4"; in
 
 stdenv.mkDerivation {
   name = "unclutter-xfixes-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "Airblader";
     repo = "unclutter-xfixes";
     rev = "v${version}";
-    sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz";
+    sha256 = "0anny6hvwf5nh7ghgi4gdcywhwyhgfvqvp7fjhm59kjc3qxnwf96";
   };
 
   nativeBuildInputs = [pkgconfig];

From e6afc78965d9bb47020c9e577b766320e8f8a545 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:09:21 -0800
Subject: [PATCH 1852/2793] wimlib: 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/wimlib/versions
---
 pkgs/tools/archivers/wimlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index dbf3d91f37a..8fdb75892e8 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.12.0";
+  version = "1.13.0";
   name = "wimlib-${version}";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://wimlib.net/downloads/${name}.tar.gz";
-    sha256 = "852cf59d682a91974f715f09fa98cab621b740226adcfea7a42360be0f86464f";
+    sha256 = "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai";
   };
 
   preBuild = ''

From 1c1dce6079825fd26710d5e5d847e477c0d77238 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:23:02 -0800
Subject: [PATCH 1853/2793] texstudio: 2.12.10 -> 2.12.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/texstudio/versions
---
 pkgs/applications/editors/texstudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 7ba37bd14ff..ca04cccdf17 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.12.10";
+  version = "2.12.14";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
     repo = pname;
     rev = version;
-    sha256 = "0mkx7fym41hwd7cdg31ji2hxlv3gxx0sa6bnap51ryxmq8sxdjhq";
+    sha256 = "08vfhkgzhh1227wcvr5wwpnw0072c80nf2crhmxwh3jgjfgi538f";
   };
 
   nativeBuildInputs = [ qt5.qmake pkgconfig ];

From 16d9f71db7d38089acb2f00b7202e7799ab9331c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:33:19 -0800
Subject: [PATCH 1854/2793] slurm: 18.08.3.1 -> 18.08.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/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 053fadc8af5..c30ee04623d 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.3.1";
+  version = "18.08.4.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 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07";
+    sha256 = "1vnlh1fazqa1rhiq5sm3dxgnwf4ipli357686r5w8cgij3m7qj98";
   };
 
   outputs = [ "out" "dev" ];

From 9e2956f7df996da97406396bbc29ed120e90f5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 14 Dec 2018 08:38:19 +0100
Subject: [PATCH 1855/2793] plasma5: 5.14.3 -> 5.14.4

---
 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 312691dcc7e..57b11f970f2 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.14.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index a4d90aa7e3d..9fc1c7b6a9a 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/bluedevil-5.14.3.tar.xz";
-      sha256 = "048iyzps89caw6dr1x767byj8a7gcg9vl1fvnndabkhm3d71cgxk";
-      name = "bluedevil-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/bluedevil-5.14.4.tar.xz";
+      sha256 = "04c7nwlmwkdmqjxxy9wz2sdb9nx40vzln150iyw6bpw8vix5wwkv";
+      name = "bluedevil-5.14.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/breeze-5.14.3.tar.xz";
-      sha256 = "19wm6krcnyis1vgs655jynvgm93k776drvjra4ysy378d2n3f1w6";
-      name = "breeze-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/breeze-5.14.4.tar.xz";
+      sha256 = "0xdnfnvkzy96wn4y670wq1xq4jla8pqr2pwy4z4flhck61a0s7nf";
+      name = "breeze-5.14.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/breeze-grub-5.14.3.tar.xz";
-      sha256 = "1nkf4av6xdx7q8z6hq0gdsmm38z5xawh1awpcjwc61dd8n55bn8a";
-      name = "breeze-grub-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/breeze-grub-5.14.4.tar.xz";
+      sha256 = "1q21frlacgjyl5r6x32ihzsy25rihdpc18hg0qdcar1zq5hmk7b1";
+      name = "breeze-grub-5.14.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/breeze-gtk-5.14.3.tar.xz";
-      sha256 = "000w368cvyi8whbrp500jjcrdivm2fl7kwcn81fj8ydk7wn5pmyn";
-      name = "breeze-gtk-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/breeze-gtk-5.14.4.tar.xz";
+      sha256 = "0aqj4ap1j9pajk211pbx7a692gm89kjdfh3lpbrrsi1bnq1rcq94";
+      name = "breeze-gtk-5.14.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/breeze-plymouth-5.14.3.tar.xz";
-      sha256 = "0fd8d5hwkhrd3n9ahfw99anh43azi28n5wh47ncrwdy7m81v4lgx";
-      name = "breeze-plymouth-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/breeze-plymouth-5.14.4.tar.xz";
+      sha256 = "1q9z5d96rrm8m3kjg3vi82az7a4c7h5n4mj736867nbcy4slqwk7";
+      name = "breeze-plymouth-5.14.4.tar.xz";
     };
   };
   discover = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/discover-5.14.3.tar.xz";
-      sha256 = "12zx6p68yq5mhv459wy7y2f90nmw3n0n9l7xpb6g7k5ssmr1jqk4";
-      name = "discover-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/discover-5.14.4.tar.xz";
+      sha256 = "0pivys2ygpzyi3ykyqslnh1c429f722mk5raa4h4krl8aa5cwwni";
+      name = "discover-5.14.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/drkonqi-5.14.3.tar.xz";
-      sha256 = "11k8mf45rjrqxb3pny96x6pz50x9hglpaspsmjz9w19b2drxg79i";
-      name = "drkonqi-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/drkonqi-5.14.4.tar.xz";
+      sha256 = "1fyz5wxmilar01x94i46mzfg5nvkqanx2xsw8bwkzqmnd8ndmnmi";
+      name = "drkonqi-5.14.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kactivitymanagerd-5.14.3.tar.xz";
-      sha256 = "0ham0p2zrjx47g12fad2gci56jiq5x57vgnpr29pypqrc3hqwsn5";
-      name = "kactivitymanagerd-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kactivitymanagerd-5.14.4.tar.xz";
+      sha256 = "1ahfsqqgwlcsfy5d86i35kz8m90iarldnmlhsqw2bqk9al0qnsgm";
+      name = "kactivitymanagerd-5.14.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kde-cli-tools-5.14.3.tar.xz";
-      sha256 = "1ld4rhmjbm6xz5xri8r1zs4lr2d443372h7pqjs1hc3r836aivwa";
-      name = "kde-cli-tools-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kde-cli-tools-5.14.4.tar.xz";
+      sha256 = "11gkplnn95c78rdr0qs2hr08qv6scplsrff2nrz0n3g8sdplz2yy";
+      name = "kde-cli-tools-5.14.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kdecoration-5.14.3.tar.xz";
-      sha256 = "0sifflfdz3md5ymlpkzp2pvccfr0gzw8dx87j1s5qk1b04fx9vg8";
-      name = "kdecoration-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kdecoration-5.14.4.tar.xz";
+      sha256 = "10nqshn8jj5dvrmdzn2x62lpa99d3q9wq7pv9q7lkbianlic3zzk";
+      name = "kdecoration-5.14.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kde-gtk-config-5.14.3.tar.xz";
-      sha256 = "1m0vhgwm5zrk7sg4j71qmn2gsm5qhhgvcdpgryc64kjdk24lss31";
-      name = "kde-gtk-config-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kde-gtk-config-5.14.4.tar.xz";
+      sha256 = "1dmx9pd404jy03k7wgh0xjdpxn2nmz8mbg6ysjvw1z89ggm4dxy8";
+      name = "kde-gtk-config-5.14.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kdeplasma-addons-5.14.3.tar.xz";
-      sha256 = "1rw84wfym722z6cl127gwma9npjzy0yj65fzr9rqpplks8il6m4m";
-      name = "kdeplasma-addons-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kdeplasma-addons-5.14.4.tar.xz";
+      sha256 = "0sdrkjsh4a4i7iv49m9s8rjp40bzarq8i3w4c64w6446jz66g4j9";
+      name = "kdeplasma-addons-5.14.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kgamma5-5.14.3.tar.xz";
-      sha256 = "03r866icbnk5q11zpnkxg3azcgbr6fp16b8mmsw7j4jl820shv4q";
-      name = "kgamma5-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kgamma5-5.14.4.tar.xz";
+      sha256 = "028alj0768pc2zb7h613vcxs8zsqgd6nn4lpni4c8l25n5wzyd11";
+      name = "kgamma5-5.14.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/khotkeys-5.14.3.tar.xz";
-      sha256 = "1arsjvxw7q6434y3c8l458ilmynqbdb30sdvfzgrlk19m1dqmkym";
-      name = "khotkeys-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/khotkeys-5.14.4.tar.xz";
+      sha256 = "033syji5mwd0il6d71p3r2dgqvs3lb5ybxkjb4m54sffbb0glrx2";
+      name = "khotkeys-5.14.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kinfocenter-5.14.3.tar.xz";
-      sha256 = "1kapxxb4f4lia7yr4jmx83y0vwn6m1hrij05p5d1axy90jwmcy37";
-      name = "kinfocenter-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kinfocenter-5.14.4.tar.xz";
+      sha256 = "1nh9dg37dnl2b11l400dswaf8qf8qspck0pdr7svrncv2yn3zirc";
+      name = "kinfocenter-5.14.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kmenuedit-5.14.3.tar.xz";
-      sha256 = "0yikz8v3gawkbn1vds7i9xj2j4p1y8nv0adrhr4vwdii2ar37jvd";
-      name = "kmenuedit-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kmenuedit-5.14.4.tar.xz";
+      sha256 = "09lafgcxv2v745m04ljgsqgflw3j3ydx17974c1c7qfgr255994g";
+      name = "kmenuedit-5.14.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kscreen-5.14.3.tar.xz";
-      sha256 = "0jn2d5373agh5b47v7xd17apbkpbrvl5z7x3n83k4q4j30q7pgs3";
-      name = "kscreen-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kscreen-5.14.4.tar.xz";
+      sha256 = "1cqlhi4r1qli2izrj64x07cwz1k0qxclr0ckgkfx2lzdgp00gc96";
+      name = "kscreen-5.14.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kscreenlocker-5.14.3.tar.xz";
-      sha256 = "1zn99zsn07fm4npf7l6n243bnn970pb818pfpbw9kgwjlh0nyms8";
-      name = "kscreenlocker-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kscreenlocker-5.14.4.tar.xz";
+      sha256 = "1fpknd22d1lr63d203k1m7w09d2dxg80a5r83jhxs439y9winwz2";
+      name = "kscreenlocker-5.14.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/ksshaskpass-5.14.3.tar.xz";
-      sha256 = "1gh5hakc2i7m2scvf8nyrl8inkh1fsrggdydiwb02mg763lkk9nc";
-      name = "ksshaskpass-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/ksshaskpass-5.14.4.tar.xz";
+      sha256 = "1cj6w9kqjg7qxq7xdn227xy6wnmpv72s08wdphhpv1lhpafgf0pm";
+      name = "ksshaskpass-5.14.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/ksysguard-5.14.3.tar.xz";
-      sha256 = "1aw8r4ngq00lv0d38iddwdhlmmv97qiwqjvgzy4m20dfm7ldaldp";
-      name = "ksysguard-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/ksysguard-5.14.4.tar.xz";
+      sha256 = "0gqji22k1pvs89zr6f5y71v2rma3p2ypp9ld449jn6rlizyfski1";
+      name = "ksysguard-5.14.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kwallet-pam-5.14.3.tar.xz";
-      sha256 = "109jzfwf9b0c1mm5rq4jgiaf4sxad1wx4j9pmwxr4m17nf3ys5pg";
-      name = "kwallet-pam-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kwallet-pam-5.14.4.tar.xz";
+      sha256 = "15656m50xly9x7j2min813pr5lk7ymyb82is2s1lmfggrxghqjiq";
+      name = "kwallet-pam-5.14.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kwayland-integration-5.14.3.tar.xz";
-      sha256 = "117wvplwxhphk3yiy61dlid5nf42m869qkcsx5mlnjdwxglwgwfj";
-      name = "kwayland-integration-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kwayland-integration-5.14.4.tar.xz";
+      sha256 = "02w048f366mikpbqmjpliyrali7gd2flfjbv9nfgzhld9ixx1wwq";
+      name = "kwayland-integration-5.14.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kwin-5.14.3.tar.xz";
-      sha256 = "0yv8sa96rnaabi29mny17vyxswj4b4rgny75kznqnk6n01wjm4xy";
-      name = "kwin-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kwin-5.14.4.tar.xz";
+      sha256 = "0g9j394q7a2fk6wb2np7rjr1icdz9sr6iqjsicr881j088vxsini";
+      name = "kwin-5.14.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/kwrited-5.14.3.tar.xz";
-      sha256 = "1lzbrifsb9qvn4622rd3b0p5jfr67ql5rsd1lkw1jpib9ckzlrph";
-      name = "kwrited-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/kwrited-5.14.4.tar.xz";
+      sha256 = "1c8zwvc672a1z4dj8qq1wma5a8lm0kvyxki4kacx7n9xfrh54njv";
+      name = "kwrited-5.14.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/libkscreen-5.14.3.tar.xz";
-      sha256 = "14zfmycnzf30jgbf1gcyp8kpipvn1w2sd6inrylyyf089565r9ai";
-      name = "libkscreen-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/libkscreen-5.14.4.tar.xz";
+      sha256 = "1n56fb6sxjyh73lb17s44yjlfhyqx2n3q320vncjx2jxxh0an80z";
+      name = "libkscreen-5.14.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/libksysguard-5.14.3.tar.xz";
-      sha256 = "099cn9hmz5k10ms3wgskcdps91wmw8r0g52jknnid4ggb7vkpvkr";
-      name = "libksysguard-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/libksysguard-5.14.4.tar.xz";
+      sha256 = "1nflk9vr2s2mc8ddl0rjvvh9iks4vwvf8ahlskqc068xm8ja0cr2";
+      name = "libksysguard-5.14.4.tar.xz";
     };
   };
   milou = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/milou-5.14.3.tar.xz";
-      sha256 = "16xqshzc4q2c0h9ihgmcqvyh181qacqz7c3amczzf4yc14xcsgxl";
-      name = "milou-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/milou-5.14.4.tar.xz";
+      sha256 = "1dkkr5zinia1zy439rm1sdz6r8hix1l4w8bw9rwwbk6yydvp2mkf";
+      name = "milou-5.14.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/oxygen-5.14.3.tar.xz";
-      sha256 = "1q6xsk9aha6sxq98r28g6wg93ml6hcqd3b73ygrwgncx1rhia446";
-      name = "oxygen-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/oxygen-5.14.4.tar.xz";
+      sha256 = "1rdxisnrmyywbanvchs57fr37d3ilakg83b78v8z6ji0jiy1wk0z";
+      name = "oxygen-5.14.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-browser-integration-5.14.3.tar.xz";
-      sha256 = "1fzxmrijrwh75ni5g79cy2dj6g6mja9vkgd3hqrbir7hmmrqs8b3";
-      name = "plasma-browser-integration-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-browser-integration-5.14.4.tar.xz";
+      sha256 = "0gwdi6mqfmv7hpdbhklxcxy07awvm9k22vj4wmzca3h7k334l35m";
+      name = "plasma-browser-integration-5.14.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.14.3";
+    version = "5.14.4.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-desktop-5.14.3.tar.xz";
-      sha256 = "0kn2l5ca0pmpfjalnbc53h892hj9kr0xv9070a0i09fn6qn4pxcs";
-      name = "plasma-desktop-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-desktop-5.14.4.1.tar.xz";
+      sha256 = "0qcmqm9dag6xjfdn5zlbcpksbc70z3bwpc0dg5s315bdv2jha8c4";
+      name = "plasma-desktop-5.14.4.1.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-integration-5.14.3.tar.xz";
-      sha256 = "0iwfkv32s97s459ksbmrk6w3p5qkmg99yiy3prclq73pa7i176x9";
-      name = "plasma-integration-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-integration-5.14.4.tar.xz";
+      sha256 = "0jjfb0gx51zglcn59xzz8306zm55b6nsd057vkwddinq5qi3x938";
+      name = "plasma-integration-5.14.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-nm-5.14.3.tar.xz";
-      sha256 = "0sgqb5izlfpk95vjyn65jg9mwidvlranzrdjq5nyyl47pf8nfigf";
-      name = "plasma-nm-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-nm-5.14.4.tar.xz";
+      sha256 = "14jjaaaqbsqgzzfpz7nqk7sw1jy4dc6sxrgz46hrdf0n04ga9kxk";
+      name = "plasma-nm-5.14.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-pa-5.14.3.tar.xz";
-      sha256 = "1s1csabc6w9vmi0klckq5kvrfbkv2qn9jv7x8r3v6nx6wibc5y7r";
-      name = "plasma-pa-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-pa-5.14.4.tar.xz";
+      sha256 = "18mc1aagz4b3lmv1dmabqnc4xr64j9is597lqpjc0c28gm0rnqp3";
+      name = "plasma-pa-5.14.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-sdk-5.14.3.tar.xz";
-      sha256 = "0sx7a24fzw15dwnlm574z8643sy4kqzcqai1v6l8078smqz4kdqc";
-      name = "plasma-sdk-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-sdk-5.14.4.tar.xz";
+      sha256 = "1mg1229xcv0zjx85a0418ypv38q0q87xxcmmzjdqgxmhk6dx5dys";
+      name = "plasma-sdk-5.14.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-tests-5.14.3.tar.xz";
-      sha256 = "0y975sv202gg68fnv3wycisx642vmb177zl7x9gkk66wdi5958gb";
-      name = "plasma-tests-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-tests-5.14.4.tar.xz";
+      sha256 = "17imxri9n4hv27z0d7nbwvdgvc45ql224aj1gcpxmrn4p4zfc8w7";
+      name = "plasma-tests-5.14.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-vault-5.14.3.tar.xz";
-      sha256 = "05l96lnfni2vc92vsxjvzlwh0vd8kacmn1ywp3rwzklwdyzwwbw5";
-      name = "plasma-vault-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-vault-5.14.4.tar.xz";
+      sha256 = "1fwa8w95n3d25mk823q1dzyhari4fzwnnx6jwny0spcqyhzr4xcr";
+      name = "plasma-vault-5.14.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz";
-      sha256 = "0mrhlsgckin6n2njr9lmpd84qm515wfdvr4lbhs64dllmqa9c77f";
-      name = "plasma-workspace-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz";
+      sha256 = "0dmgk26wcs69py9qd6q3hg8npkbkk25fl5l6nl88x0jh9mqiyff5";
+      name = "plasma-workspace-5.14.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plasma-workspace-wallpapers-5.14.3.tar.xz";
-      sha256 = "09cwydr45bh367jqi31fax459pj0w4cia6y752869hcm0x55m4jb";
-      name = "plasma-workspace-wallpapers-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-wallpapers-5.14.4.tar.xz";
+      sha256 = "1kvc0v0rjixkf4zfr9gcpmyrs62xpccv96fyw534xiw4w5pr73i6";
+      name = "plasma-workspace-wallpapers-5.14.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/plymouth-kcm-5.14.3.tar.xz";
-      sha256 = "0srv7ph43hcyly69d0jydrxncc2hq8xxy0ppm6g8pdyl06q06iag";
-      name = "plymouth-kcm-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/plymouth-kcm-5.14.4.tar.xz";
+      sha256 = "02c7s9js3943by7s0d3lalamliq98jm26syafmn6q1wz0msza40x";
+      name = "plymouth-kcm-5.14.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.14.3";
+    version = "1-5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/polkit-kde-agent-1-5.14.3.tar.xz";
-      sha256 = "05qvwmbaj79m5myb8ah7873diflnqri2j3cwsr4y1i9wyjq2l5bw";
-      name = "polkit-kde-agent-1-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/polkit-kde-agent-1-5.14.4.tar.xz";
+      sha256 = "1pvyxjg1p510v6ahrab017s2sqfq3zld0xjf2yh30x55hz6pvnmb";
+      name = "polkit-kde-agent-1-5.14.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/powerdevil-5.14.3.tar.xz";
-      sha256 = "0css6lrb7bfm4l2piqi6cc28blw45kfxdxrn6q3d30nwb9jhsfj6";
-      name = "powerdevil-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/powerdevil-5.14.4.tar.xz";
+      sha256 = "04qyz7jncnyj65rpdriaylarsnimqhk1va98im50bsdyiya5hj33";
+      name = "powerdevil-5.14.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/sddm-kcm-5.14.3.tar.xz";
-      sha256 = "0f25lyqrjq5kbqjh3bgxlgmfbii0nzgdf3pza8gnbmq8jfx58i5w";
-      name = "sddm-kcm-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/sddm-kcm-5.14.4.tar.xz";
+      sha256 = "03xisf0z88385zfixmah09ry53cayc4kqjn92zlqnfrc9pqnmgcz";
+      name = "sddm-kcm-5.14.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/systemsettings-5.14.3.tar.xz";
-      sha256 = "1ks6ib4n1gcmrac9q1cdas1c7xl86cvcz278anrw3ch2dfr7xppc";
-      name = "systemsettings-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/systemsettings-5.14.4.tar.xz";
+      sha256 = "0glyk9798kaps0fdmclchb6phpr0p315n7w9c9p8ww4b8kj4jyly";
+      name = "systemsettings-5.14.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/user-manager-5.14.3.tar.xz";
-      sha256 = "043nc8nlxs6y9fqb2g574l2pjzdlklar9n5v1clrzqmxdrqva0ba";
-      name = "user-manager-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/user-manager-5.14.4.tar.xz";
+      sha256 = "110w6n8k1zjbillcmbqy3vc43lznimns60pwh84js8mgqrjx7psb";
+      name = "user-manager-5.14.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.14.3";
+    version = "5.14.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.14.3/xdg-desktop-portal-kde-5.14.3.tar.xz";
-      sha256 = "0g0b73ylhl6y7afdk2mxnsd809v6aby7vbw86zf82ymx23lmwg83";
-      name = "xdg-desktop-portal-kde-5.14.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.14.4/xdg-desktop-portal-kde-5.14.4.tar.xz";
+      sha256 = "1p2h7rqgvwzlfk9jjhsifjcdl81d72d1d7zmgxy9alc4cqnlmbih";
+      name = "xdg-desktop-portal-kde-5.14.4.tar.xz";
     };
   };
 }

From fd25c447150950c2e5855926f3c8c9eabb8b0014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 14 Dec 2018 08:40:06 +0100
Subject: [PATCH 1856/2793] kde-frameworks: 5.52 -> 5.53

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../kio/samba-search-path.patch               |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 632 +++++++++---------
 3 files changed, 318 insertions(+), 318 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 0a87918f210..9822bf4f725 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.52/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.53/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
index c9ad46b41bb..3e18d304c30 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
@@ -14,7 +14,7 @@ Index: kio-5.17.0/src/core/ksambashare.cpp
 +        QLatin1Char pathSep(':');
 +        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
 +        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
++            it->append(QStringLiteral("/smbd"));
 +            if (QFile::exists(*it)) {
 +                return true;
 +            }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 56cab6f2e81..4b5cc3a3752 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,635 @@
 
 {
   attica = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/attica-5.52.0.tar.xz";
-      sha256 = "0770wq0ijkxyi6mcxh1xlkf2xmxpdphqg0dii6kwn2b9dnblswxn";
-      name = "attica-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/attica-5.53.0.tar.xz";
+      sha256 = "0qn2x5551zv8547v20wcjhf123c4432651rdxz25p398wsm9ixlg";
+      name = "attica-5.53.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/baloo-5.52.0.tar.xz";
-      sha256 = "1a2ypz3xy6zh4smrfny7y243hxddzn02nmkvydlcinklmv38bpwd";
-      name = "baloo-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/baloo-5.53.0.tar.xz";
+      sha256 = "1jvxx7ggraaciw5i6vwda2jh41gqvjy19bjkcqwrmg59ggwzc1g8";
+      name = "baloo-5.53.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/bluez-qt-5.52.0.tar.xz";
-      sha256 = "1z2ckwc7h66a7fa194gawq0q95fxv4w081v7qds5yv10rbwm8n7n";
-      name = "bluez-qt-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz";
+      sha256 = "11i3xjaxqvczh8hky71jq20g2k4ipl0sxnaw8f1xix6h0v79m810";
+      name = "bluez-qt-5.53.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/breeze-icons-5.52.0.tar.xz";
-      sha256 = "0nnwl5dijf0dhfg4gi7lycdy5ss0cj7rhcy1ranzfzlc1l2b17cp";
-      name = "breeze-icons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz";
+      sha256 = "1612kr0mrns3w5pydvfvcjdpfcvyw35bnzm44y286n99213w3cdf";
+      name = "breeze-icons-5.53.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/extra-cmake-modules-5.52.0.tar.xz";
-      sha256 = "0jcv87xagilkxvy0p0bl8fbfvy2npajvp9bnskggmqqi4sn8mh38";
-      name = "extra-cmake-modules-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz";
+      sha256 = "07dllz7r00jm7n37wnz6zvjin304affaj69d8ji4v2wxhkxpg89d";
+      name = "extra-cmake-modules-5.53.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/frameworkintegration-5.52.0.tar.xz";
-      sha256 = "1sbs14cbf0gxhx09dby606cff5mycvpblx20pr7n2wy7xxxs2zh1";
-      name = "frameworkintegration-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz";
+      sha256 = "0a5szgknj96mphiczddl0l4c79ajszhyy3f19rqacj1z1kwrx9pj";
+      name = "frameworkintegration-5.53.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kactivities-5.52.0.tar.xz";
-      sha256 = "0pckbkvf4l4c88sr01qkmzpqbjqiy4qsk98khg5858nl65ilrldd";
-      name = "kactivities-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kactivities-5.53.0.tar.xz";
+      sha256 = "1pjfh8ii4y9kpjr12z3zs9hmc8n5r0phkp40dclsrjsdpm9n8bf6";
+      name = "kactivities-5.53.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kactivities-stats-5.52.0.tar.xz";
-      sha256 = "0pnnpqw4q556yh95040rv9yby2ac1rb1vfbw26q8igs8z6lwqkms";
-      name = "kactivities-stats-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz";
+      sha256 = "0bd6km50h0jlpi8z1dhh9jvx2wqgh3sa473n7bsyd2dgzyibs52n";
+      name = "kactivities-stats-5.53.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kapidox-5.52.0.tar.xz";
-      sha256 = "1xhyc4j2fhrmcr4z12623x3jqv4kl8cxkskxkv6f9ag97g5ccgm8";
-      name = "kapidox-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kapidox-5.53.0.tar.xz";
+      sha256 = "1snsql5scq6licrlqf9w77085s4992f1ij6w7rwj8d5x4cyxc9ca";
+      name = "kapidox-5.53.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/karchive-5.52.0.tar.xz";
-      sha256 = "0l49chdbn5mpd72ldyfgy83dvsnphq0w59kv8rg9k7afy6wfm8ix";
-      name = "karchive-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/karchive-5.53.0.tar.xz";
+      sha256 = "0jbr19azrkxywf9dwrfdw5qi47g7h5m92m4f93skccr11a1m0hvr";
+      name = "karchive-5.53.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kauth-5.52.0.tar.xz";
-      sha256 = "0y90yxqvqadkbd53vr823rfkikr08hsqfzkns02bkz1xw72aixxm";
-      name = "kauth-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kauth-5.53.0.tar.xz";
+      sha256 = "0c41azn8c6wr5rc7f0v1bxvka9i4z3c346814mlim3i62842fz3b";
+      name = "kauth-5.53.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kbookmarks-5.52.0.tar.xz";
-      sha256 = "0j4bflbgwkb6dyia92rllbmz0w2j5j5aklaaahpb5awxjnlng0v0";
-      name = "kbookmarks-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz";
+      sha256 = "1mrzbwsirma1bzazamilh3r5a04m6x5902gjs1sd7bc0ijs85dr9";
+      name = "kbookmarks-5.53.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kcmutils-5.52.0.tar.xz";
-      sha256 = "1cs2667gk1y1sa1728gy7wsnkmsxanbs7rqrfkgmn80wn6yvl6xi";
-      name = "kcmutils-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz";
+      sha256 = "0xsg50pywawzzw2fb0bhhmjp2z3w4572knfq8s4jki3iidixp3kv";
+      name = "kcmutils-5.53.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kcodecs-5.52.0.tar.xz";
-      sha256 = "1z2pk3q25hdvaliqsvkrdss0s0vva35w1p9alkh3bqv63lx8m62v";
-      name = "kcodecs-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz";
+      sha256 = "0wmilqkcw1dvvrw56r8virp7zscy0g04ry8j7h812nfzhfz9z4vs";
+      name = "kcodecs-5.53.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kcompletion-5.52.0.tar.xz";
-      sha256 = "0favf0h59z7r599kf894pl5l8yq9civqkn8yl213h9cy4lym4jqb";
-      name = "kcompletion-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz";
+      sha256 = "00df0pa28glf4w5zyjmnzasbip1q2cyyyply1f6k0xpfg0qwgxf9";
+      name = "kcompletion-5.53.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kconfig-5.52.0.tar.xz";
-      sha256 = "12s2pa1dlr1p3y0nqj6vhq7wi1ka9jwsmfjhm3xf8a5fpqf1r8hx";
-      name = "kconfig-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kconfig-5.53.0.tar.xz";
+      sha256 = "0xyxycpbi680sfrfzdzhwi95dqd4xsc42zxn5clzvfbgapbw2db7";
+      name = "kconfig-5.53.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kconfigwidgets-5.52.0.tar.xz";
-      sha256 = "0630gabfmgnbvs8psla3vifl6jv8dbshzvksxmf6farx1zx05y53";
-      name = "kconfigwidgets-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz";
+      sha256 = "0bpylj1faki7f55cf82ljmgll17vz1irqna1i9rzkbb28kvqf2kv";
+      name = "kconfigwidgets-5.53.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.52.0";
+    version = "5.53.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kcoreaddons-5.52.0.tar.xz";
-      sha256 = "1lvqgilng9z3jw0nhc9qzvcyvfwhsbj2xskqggpjlvqryh4sxaj9";
-      name = "kcoreaddons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz";
+      sha256 = "18rhih779sxrlvg8sxyw31v3h58arvk2vsmvr0bmpnrnnfwv3vak";
+      name = "kcoreaddons-5.53.1.tar.xz";
     };
   };
   kcrash = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kcrash-5.52.0.tar.xz";
-      sha256 = "10cl5xs8wjr0nqsid3n5g30q7fspkj4143yrkwxakazdcxyx6p1b";
-      name = "kcrash-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kcrash-5.53.0.tar.xz";
+      sha256 = "1nnfn71kl97d5ywg2xjacr48mh9khrgszm9cifdn2jdk6vxssmlb";
+      name = "kcrash-5.53.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdbusaddons-5.52.0.tar.xz";
-      sha256 = "1fbxdsvf4mpyfjvpjhn42k49cvgya6z5rnswmmyl7di7aw738myp";
-      name = "kdbusaddons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz";
+      sha256 = "05zf41m3j4ckjk68dqv2rw8abg22x6m6bwiwp8rm6ac1p33hqayh";
+      name = "kdbusaddons-5.53.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdeclarative-5.52.0.tar.xz";
-      sha256 = "0sskzb19xy5bivz69yi73y523j0fp1zv9656js2y18952mfy9sjk";
-      name = "kdeclarative-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz";
+      sha256 = "0c7sxz733c9gfarjbrphrvn5v9bkx1i7vhn97xp7b3w22892ab7w";
+      name = "kdeclarative-5.53.0.tar.xz";
     };
   };
   kded = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kded-5.52.0.tar.xz";
-      sha256 = "1mcv0w10af6mbczqm1v345i2xbiikaxnqag710r67npl0qds43bm";
-      name = "kded-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kded-5.53.0.tar.xz";
+      sha256 = "18yh27ddp4aldpmkflj9q6anrpnzawhn7nrykvayxxbgmdg4gn48";
+      name = "kded-5.53.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/kdelibs4support-5.52.0.tar.xz";
-      sha256 = "08sag2fy3l13m125r3ampnxsp11pvf47701ny80mqkgd78pkhrpb";
-      name = "kdelibs4support-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz";
+      sha256 = "1ai1k1m08zq04rxi5px1agmqzmv59lic7qqiqg4iwnm5i8q2z2i0";
+      name = "kdelibs4support-5.53.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdesignerplugin-5.52.0.tar.xz";
-      sha256 = "0xfzglhynrnqaywl1if6yv1b2mlka94pjc4dlxi6csbv8mh69d4d";
-      name = "kdesignerplugin-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz";
+      sha256 = "1m0ysmpysjpmnmmmyp5xkfzygi1w0dnn7j707c6nj31y2s7078q6";
+      name = "kdesignerplugin-5.53.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdesu-5.52.0.tar.xz";
-      sha256 = "18m1gq825i6n6zdlaa5jvkl08w39v0l4lmjgsrbggjsbaqlpj7w2";
-      name = "kdesu-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdesu-5.53.0.tar.xz";
+      sha256 = "18kd19y95gllyarjlm0768s3b9q67ia6dajdw89rrk1qgvbw42xy";
+      name = "kdesu-5.53.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdewebkit-5.52.0.tar.xz";
-      sha256 = "06z8b2330jvmjwr1gwf2gdfxjmxc12nik5791xpgi83b99d8h5lq";
-      name = "kdewebkit-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz";
+      sha256 = "1x5b85lr6ck2vklj641ra6sx1fvz2daiy8vsgpziii0752a0ayf2";
+      name = "kdewebkit-5.53.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdnssd-5.52.0.tar.xz";
-      sha256 = "1h8k2kygv48la3zyg1wzhlr56viv4y4liwrs6niy4vninyg2al7y";
-      name = "kdnssd-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz";
+      sha256 = "0hghpamkxwjvfh87y2qcy20bmxvglzwrzmfg26hycmxgj0l3frhb";
+      name = "kdnssd-5.53.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kdoctools-5.52.0.tar.xz";
-      sha256 = "0f915i59cbm3vkyd14xla40n5c2bayavvyq5d9m01v2hibbg53in";
-      name = "kdoctools-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz";
+      sha256 = "0kjijwc66rg737z6z8c275wfb2gn7xgslgmrys5dxaqqzrinbn1j";
+      name = "kdoctools-5.53.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kemoticons-5.52.0.tar.xz";
-      sha256 = "1f846gjx4d9wwi526xpykhqssmswgh63zghksp2j9jfn3bri24ya";
-      name = "kemoticons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz";
+      sha256 = "0x9jrc5pswmcj36qs3283c5bz63sbgr87m7dn9ykas7a50xgyv0w";
+      name = "kemoticons-5.53.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kfilemetadata-5.52.0.tar.xz";
-      sha256 = "1zjibm9si8ffmqmczya9xgqpz0p9ygc9qk5629znn09l88g2gamw";
-      name = "kfilemetadata-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz";
+      sha256 = "18wgzhg146iscg7nm7xabmzsw73x0by2imkh6wgky87nwry7020s";
+      name = "kfilemetadata-5.53.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kglobalaccel-5.52.0.tar.xz";
-      sha256 = "03d37fm741qbyk2aaqnh4nbvlrfaicl587f4607qvs8lc56vbdhy";
-      name = "kglobalaccel-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz";
+      sha256 = "1h60kl309pz4i6jr6a444d14i2dzqhjapga837my2mylsdjj3wqi";
+      name = "kglobalaccel-5.53.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kguiaddons-5.52.0.tar.xz";
-      sha256 = "0m628ilab8g5ny389jp24z7jsxrmciki018il43pcqia4njignkb";
-      name = "kguiaddons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz";
+      sha256 = "1kj1jvq7lqlnr00fmlfrj7vkvlwav7b5r4bpifysx1l4285y5y76";
+      name = "kguiaddons-5.53.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kholidays-5.52.0.tar.xz";
-      sha256 = "1pi9qqpakdyan2iyrx9yk5ncdwy5i3nd2jlhk9wm73gmir3l5bdl";
-      name = "kholidays-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kholidays-5.53.0.tar.xz";
+      sha256 = "1zn581ibv4wg5c4q97l40wdpj18p5kwxk4zxl3cl4l445ivv04p5";
+      name = "kholidays-5.53.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/khtml-5.52.0.tar.xz";
-      sha256 = "0nhigbngq2rln1lqzgal6908rrjnfny4jwx7dkn6xv2mpfwkf1qm";
-      name = "khtml-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz";
+      sha256 = "07cmpqk92z4b631q6ngg7sdw4p56r11mdqf2fvbcwmqksx6b11fy";
+      name = "khtml-5.53.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/ki18n-5.52.0.tar.xz";
-      sha256 = "0lxx8wan92njkpjg84s5snqfv4jjvqn85fyj0az3awh6lm7w3ndi";
-      name = "ki18n-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/ki18n-5.53.0.tar.xz";
+      sha256 = "052c7rvqqb2hx9wn91sdp4wcz5vdym5iszb1vnpr9wdc3psqq41x";
+      name = "ki18n-5.53.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kiconthemes-5.52.0.tar.xz";
-      sha256 = "0brzzn6k9srcixc3f15w26ml5kcqg6w6m0hbffn4xwsn8pkwpqq2";
-      name = "kiconthemes-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz";
+      sha256 = "1h54mqda05x4p1kplhxnqa488pvqn354qnk1qg2l851lh69ail9q";
+      name = "kiconthemes-5.53.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kidletime-5.52.0.tar.xz";
-      sha256 = "1sa8815wqr9ps1wdjgm801al8vxjlw3w96h2bzz9dm786d56yanp";
-      name = "kidletime-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kidletime-5.53.0.tar.xz";
+      sha256 = "04jbig9mf45mzajwgi66vz3b2zqg4p1gca1jkcl4yk6a4csg43ri";
+      name = "kidletime-5.53.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kimageformats-5.52.0.tar.xz";
-      sha256 = "1cmb47q90r67jkhf1fgrbipy3qrkq9rikncag13f4vw4plzakl6g";
-      name = "kimageformats-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz";
+      sha256 = "0b59sa5x58mxzkv9h9xxfzb89k27cpyqzfgf4kl7zbxklxxszafj";
+      name = "kimageformats-5.53.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kinit-5.52.0.tar.xz";
-      sha256 = "0pq02rp9zs14aqm7y1cd72wcgjnixxjwmpvggd30ljmvlya519nd";
-      name = "kinit-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kinit-5.53.0.tar.xz";
+      sha256 = "14dd165al0gn1y3jhlk3jgz3px8rcccn3hp5isywa2xxzl7v5raw";
+      name = "kinit-5.53.0.tar.xz";
     };
   };
   kio = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kio-5.52.0.tar.xz";
-      sha256 = "18946lql9ph2sanm8b2655ljgp7skw0igcnicfi82yh51xrmvc5c";
-      name = "kio-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kio-5.53.0.tar.xz";
+      sha256 = "1hr4875v1ph8jbsqbyrhk5vxa908kv7xic7ymk9rmaqrkc0dy83k";
+      name = "kio-5.53.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kirigami2-5.52.0.tar.xz";
-      sha256 = "094cqd8khmlybxadxcmj4p0k7z108zxirpj3bwxfwwbasl1w2pip";
-      name = "kirigami2-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz";
+      sha256 = "0avr7slzww3fpdyczi0y3djvrccs3jq2jyq82r02xfw8mwb93zii";
+      name = "kirigami2-5.53.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kitemmodels-5.52.0.tar.xz";
-      sha256 = "0pjv6vnd3l7ip7w1glfs9yh42lcgdhmgz9k9w68n5818wwcgbwsn";
-      name = "kitemmodels-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz";
+      sha256 = "1gkw57fgm6dcy9jssaq9d1mkgd1g6jxk2aqpf4lq1nvqkr7jqzbl";
+      name = "kitemmodels-5.53.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kitemviews-5.52.0.tar.xz";
-      sha256 = "1nq7zsqk0z56cydjg61rlr26qaqbjcn7rmk6zxf2h8s1cw6gwwgb";
-      name = "kitemviews-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz";
+      sha256 = "0r60mp90k7psa9maz3dhhq3npbl95cckvmk51fpljcb8c3rpjymq";
+      name = "kitemviews-5.53.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kjobwidgets-5.52.0.tar.xz";
-      sha256 = "1dzhcngdk1s979dirpkh2fms6w13h8sdfpxkaw0jmah6l5vkf782";
-      name = "kjobwidgets-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz";
+      sha256 = "161wq1s1a1cb5a47wswg6g6qrmczgzwikp1cjsgxfykpgrxkp620";
+      name = "kjobwidgets-5.53.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/kjs-5.52.0.tar.xz";
-      sha256 = "1vpn1dhhw6qfym3n58khanlg4r3gcid3y4yhrn4d5qsglvb0ssyr";
-      name = "kjs-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz";
+      sha256 = "1jic7xyfmd829i82kbjin2xf9f3cir2s9v04r7ri7bq6gi2iw4c9";
+      name = "kjs-5.53.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/kjsembed-5.52.0.tar.xz";
-      sha256 = "04v8b0liprr2pph18ns76fibc969lrknqf34vp73h4rk29fz3zyf";
-      name = "kjsembed-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz";
+      sha256 = "0j3jzn7qwh9sw9gxk1f435vijkrgnzpsqx3a4yx7w3n93h96h36r";
+      name = "kjsembed-5.53.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/kmediaplayer-5.52.0.tar.xz";
-      sha256 = "1gjizl8dpyly856rkyniccj07d8wzcbxdrx37mx3v0pkq2sh62wb";
-      name = "kmediaplayer-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz";
+      sha256 = "1r6cl6paap7hmpqr05mj8qxcb2sa16kdc0zqj8g6gqb32xj6wk0k";
+      name = "kmediaplayer-5.53.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/knewstuff-5.52.0.tar.xz";
-      sha256 = "1x4vmdzkvm7v3pkhjhg09s23w6agxyxizgql611kv835xwvpcpxd";
-      name = "knewstuff-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz";
+      sha256 = "0d5yszf6fj8qjmr50jfa9f34xcn9k8n4bj4c3h635ccwb7l3i6q3";
+      name = "knewstuff-5.53.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/knotifications-5.52.0.tar.xz";
-      sha256 = "0mknmz464q62dxcliki4wnlzpxzjrg07n21566ajkx8blc7lpqi7";
-      name = "knotifications-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/knotifications-5.53.0.tar.xz";
+      sha256 = "0fbjg48ck6mr98gl3075vf9mn8fwdrsz0jm9hbnzr2vn9yrg57nz";
+      name = "knotifications-5.53.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/knotifyconfig-5.52.0.tar.xz";
-      sha256 = "0k9x0ir2brfqg444gw0f6pswryfqcxad0986zc4pzp70a2rrlk5x";
-      name = "knotifyconfig-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz";
+      sha256 = "1f3hq2l8fkff4dnkf6klj60jv946yfaw84i50q192blwqfkij896";
+      name = "knotifyconfig-5.53.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kpackage-5.52.0.tar.xz";
-      sha256 = "05388qwnhbvdrqpw1qp1nb41kx74qaz2ssm8kxppmz5lsk8av5rr";
-      name = "kpackage-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kpackage-5.53.0.tar.xz";
+      sha256 = "1gllbi7y4svlkwhvp0sh3bdhiah2f55spg7wh149sqwmnmvj09ra";
+      name = "kpackage-5.53.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kparts-5.52.0.tar.xz";
-      sha256 = "10zpa7kndcch0w52klhvfmsnyn35q5n62s31qj0hg9b6chz8jb87";
-      name = "kparts-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kparts-5.53.0.tar.xz";
+      sha256 = "0cfzbf706dn4kjz8mz53b1a0dzk0f540n0j144x4701c4gfajnim";
+      name = "kparts-5.53.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kpeople-5.52.0.tar.xz";
-      sha256 = "1i5nzfzik9x5lll2dy6i3mv59pb3cx0nb81xymmrdj36p9bnvfcq";
-      name = "kpeople-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kpeople-5.53.0.tar.xz";
+      sha256 = "1bsnj5r47azl889izxdlwcbfrfmg921cpapicn7klynmsw58lpdg";
+      name = "kpeople-5.53.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kplotting-5.52.0.tar.xz";
-      sha256 = "0inir47zgdjzjkz4jdhj739ppz9qgmk98s4p8ibv9dmkh12l9nfp";
-      name = "kplotting-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kplotting-5.53.0.tar.xz";
+      sha256 = "0cnnzyybzsrdrnhhcc47i6jakhrixdxakfv2ib0fpsiif3fn3jpx";
+      name = "kplotting-5.53.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kpty-5.52.0.tar.xz";
-      sha256 = "12n7j7pqclnn6x5nddjxyprn9rjdn9ykhlwiwxv6v521zg35gk82";
-      name = "kpty-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kpty-5.53.0.tar.xz";
+      sha256 = "01qy5pvd5j014zh455sh0qb8x0g1yc60bbdqh34nk84s8mx3mz9z";
+      name = "kpty-5.53.0.tar.xz";
     };
   };
   kross = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/portingAids/kross-5.52.0.tar.xz";
-      sha256 = "158crvni2119gvh07dgzkl54ggj7z908n09wq66pa53nnlsvmbws";
-      name = "kross-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz";
+      sha256 = "1q69pppmnxmjfmi73ks6mrkib76nhhffn0c3j93qq7cq3ingjzjy";
+      name = "kross-5.53.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/krunner-5.52.0.tar.xz";
-      sha256 = "1by900jijgb9005hx9q7vwlxh4gf7scgnva18lgbjv5ll05mazck";
-      name = "krunner-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/krunner-5.53.0.tar.xz";
+      sha256 = "09n824q8k1ihfgz6yzb5xv99p241733574yhhv1y47cyrp7d904l";
+      name = "krunner-5.53.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kservice-5.52.0.tar.xz";
-      sha256 = "1plpvj3a6ans8piygb09n3blks8abb0rwl6d44skdf670bc06zil";
-      name = "kservice-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kservice-5.53.0.tar.xz";
+      sha256 = "06b35zynmlhidgzxp7mqv20fcw6wvdsszfam1phv7wji1xhhpnk2";
+      name = "kservice-5.53.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/ktexteditor-5.52.0.tar.xz";
-      sha256 = "18q3mns9rmjsa06clnqr3j5q1p1s8rb81ya5z40x19cc58a3hp11";
-      name = "ktexteditor-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz";
+      sha256 = "1hcn4dk6gw96aknh6dn9yi1fwq7s90kjmcvn3wgf4ig1408q6b7g";
+      name = "ktexteditor-5.53.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/ktextwidgets-5.52.0.tar.xz";
-      sha256 = "1qbrflawx4ibl4jkifpkq8am6zjai0xh7a2scv6rpjcmxmi7dppi";
-      name = "ktextwidgets-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz";
+      sha256 = "025z1x7mp7wdm62h6igbsvb99l09jsdzna4m30h586h7rhn8kvdc";
+      name = "ktextwidgets-5.53.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kunitconversion-5.52.0.tar.xz";
-      sha256 = "1ybd29ygwchm69nc523f8b8qvmzwg2mr9vn29zzwy5jn6r8m581n";
-      name = "kunitconversion-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz";
+      sha256 = "1yr6dfcqabkv2r7p9f814hd1x8c1bfy2k2f83zj4qlahzb91mw6v";
+      name = "kunitconversion-5.53.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kwallet-5.52.0.tar.xz";
-      sha256 = "1nw41rwqnavqkf3nq543qc9ipdr1326jbr2qywapyryxaiv7jfmh";
-      name = "kwallet-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kwallet-5.53.0.tar.xz";
+      sha256 = "135vc52zx0ikb684z6ds2hlr39vj2z8g2rp9f51py52pf7fxkwc0";
+      name = "kwallet-5.53.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kwayland-5.52.0.tar.xz";
-      sha256 = "0dylwr1cnil5dgaf96rvzd90732v6ki5wnh247ld7yv51fqyj1j0";
-      name = "kwayland-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kwayland-5.53.0.tar.xz";
+      sha256 = "0k6j8w3ccx9kkqnp757z2g5y4jcl2y2ppvx8vvl7z97jjn66563h";
+      name = "kwayland-5.53.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kwidgetsaddons-5.52.0.tar.xz";
-      sha256 = "1na7y1ix2icxhnmz8bazj8iknfpwakj3n335b2qb1ss9iq0b1j3n";
-      name = "kwidgetsaddons-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz";
+      sha256 = "1k9y3gcpzgdzd4ps8m4gx3wz166k0jqzccn8z8p2jr2nfjdwp4mc";
+      name = "kwidgetsaddons-5.53.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kwindowsystem-5.52.0.tar.xz";
-      sha256 = "1axfpma24lg0fhqjjia9fw594l37kzcs26zalz6k4dw0ivjxwypx";
-      name = "kwindowsystem-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz";
+      sha256 = "1z89b3my3wsncbq16bqsncbf9grji77sb0j17lj7w5hm36d01clz";
+      name = "kwindowsystem-5.53.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kxmlgui-5.52.0.tar.xz";
-      sha256 = "0cdn05q44jchh9c707fpbn8nhxiyhcbmyy7ajc0f63k3i97lyqp4";
-      name = "kxmlgui-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz";
+      sha256 = "1acppl4wzqrpa8iys8z2qqxrw4xy61q02vybn0ysspa0yrdxga9f";
+      name = "kxmlgui-5.53.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/kxmlrpcclient-5.52.0.tar.xz";
-      sha256 = "1sa6dwkaw3s7w3872kcrly1f6c5dy2z20494ncd1sq1ckdsc052m";
-      name = "kxmlrpcclient-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz";
+      sha256 = "07ns1fj5vq0fzqhrrmbm7cjnnzkl1jlgcf1lv3kfik1y13fd9zkd";
+      name = "kxmlrpcclient-5.53.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/modemmanager-qt-5.52.0.tar.xz";
-      sha256 = "14y6ficyimb3ny5ynbqh5h39pfaw3gj0x91wjppdp0z6vnmwpj88";
-      name = "modemmanager-qt-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz";
+      sha256 = "1lgvj086k21sm6b0pf9k51zv4fy5i4wlnsjwv2zfvapdrndl8kdp";
+      name = "modemmanager-qt-5.53.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/networkmanager-qt-5.52.0.tar.xz";
-      sha256 = "0pmxb6cjziilqamnqyi5wrz97fv6djizqfbpr4549icrki1ssy8p";
-      name = "networkmanager-qt-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz";
+      sha256 = "11vqmx11lgyagbq9zvaw4s9k7wyyyigpd8d0i3w49h34nyv0p5yi";
+      name = "networkmanager-qt-5.53.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/oxygen-icons5-5.52.0.tar.xz";
-      sha256 = "1pnky38m4mzlplzj90l5nzvvdk7h3nj0alzm273y2r8lm6szvjhn";
-      name = "oxygen-icons5-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz";
+      sha256 = "13pcvzskng2mc8cwwhmq6p428nc9qzllxykx95z2s2k3b8nh726m";
+      name = "oxygen-icons5-5.53.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/plasma-framework-5.52.0.tar.xz";
-      sha256 = "1krqsn7k2xv4adwymcd1cxd2y5g3xs11nfrir598pibgxicx9hk4";
-      name = "plasma-framework-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz";
+      sha256 = "0swyn04w61dvdkmb2fahb6k93vlggh7xv4k2yygshqrkmwk6ilym";
+      name = "plasma-framework-5.53.0.tar.xz";
     };
   };
   prison = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/prison-5.52.0.tar.xz";
-      sha256 = "1cf4g446r1h9gm9ghx3vhfy3k6bm4cnd9n0sq4ng9awmg49qi6ld";
-      name = "prison-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/prison-5.53.0.tar.xz";
+      sha256 = "0ydm36jkwc2x53kf5n0xswh72g2cixd5444xfrhcwiyq905z3db1";
+      name = "prison-5.53.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/purpose-5.52.0.tar.xz";
-      sha256 = "0qg24d215m98vb90glp3i4kq03zk4zlpm5l94whsqpy7sqgxcdsn";
-      name = "purpose-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/purpose-5.53.0.tar.xz";
+      sha256 = "1y6v51p9j9gm9pad38h6dqxav4m7ryxp4h35qjz46wisacgvpfkf";
+      name = "purpose-5.53.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/qqc2-desktop-style-5.52.0.tar.xz";
-      sha256 = "1dqh7d3wp25vp6ahbcxc0p53v0nfg9l9zpcpw1qqlb8blnrs7s1f";
-      name = "qqc2-desktop-style-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz";
+      sha256 = "1f17f3mqwzn5s0a08xh68dmvzkvn2g8ah7810hd25l2hvmkfvm04";
+      name = "qqc2-desktop-style-5.53.0.tar.xz";
     };
   };
   solid = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/solid-5.52.0.tar.xz";
-      sha256 = "1jh2i6g6b7cgc2q1pdbqs082rnm6bc6bajx6zbr715aijp2pdxxj";
-      name = "solid-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/solid-5.53.0.tar.xz";
+      sha256 = "1x9qc8vm16vlqws9jb2pynw705mx6xvbb617lkdwdb60fzlrjkln";
+      name = "solid-5.53.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/sonnet-5.52.0.tar.xz";
-      sha256 = "1a711dcrwa6c82vvypg8jnc45xhkpzi6rprgsagkipcql0n7y0qi";
-      name = "sonnet-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/sonnet-5.53.0.tar.xz";
+      sha256 = "0jk8kcsdzjg7x37cw95n3wdnjg403x3plzw0zwa3r3xkg8vlqv18";
+      name = "sonnet-5.53.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/syndication-5.52.0.tar.xz";
-      sha256 = "16ly3lsdd4q8mm36lq8ygnqx98kdmgqz41fzh3si0lygxsvf96hd";
-      name = "syndication-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/syndication-5.53.0.tar.xz";
+      sha256 = "0znj8rgdh14ci3nx1h7s9v8kl208z8zlcq3c99bh216rznxvzr6b";
+      name = "syndication-5.53.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/syntax-highlighting-5.52.0.tar.xz";
-      sha256 = "0dv1yijl755900pvkxf130q1idjlvrcq1ah660s9d108yam1ff19";
-      name = "syntax-highlighting-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz";
+      sha256 = "1ar50an84pcb090zh50ni2d3ck6dxvbij9d6qa091hd66rwm2cda";
+      name = "syntax-highlighting-5.53.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.52.0";
+    version = "5.53.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.52/threadweaver-5.52.0.tar.xz";
-      sha256 = "1hlnwfnknc7937hg0jl3f100ch9qpffsxxy5c180i9infgqanqm2";
-      name = "threadweaver-5.52.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz";
+      sha256 = "0wlpbnan5g2nhs0fc9l3p0c1gcs9ak7m83hfcibg7vsq9kqvcs6p";
+      name = "threadweaver-5.53.0.tar.xz";
     };
   };
 }

From 3daf7727289c1cf287f4315985df547076850394 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:43:47 -0800
Subject: [PATCH 1857/2793] sqlcipher: 3.4.2 -> 4.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/sqlcipher/versions
---
 pkgs/development/libraries/sqlcipher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index fbf7d8df53e..0d31b294e1c 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "sqlcipher-${version}";
-  version = "3.4.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
     rev = "v${version}";
-    sha256 = "168wb6fvyap7y8j86fb3xl5rd4wmhiq0dxvx9wxwi5kwm1j4vn1a";
+    sha256 = "0faadjr4qnm1pvm5yx37jfqqxqwii02nzlmmi2h91z6371888m7g";
   };
 
   buildInputs = [ readline ncurses openssl tcl ];

From 19e14c44f0305b7e9be24a93c062349d5d4a6ee7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:46:34 -0800
Subject: [PATCH 1858/2793] stunnel: 5.49 -> 5.50

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/stunnel/versions
---
 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 d2b9a54183d..4bbcb7beacd 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.49";
+  version = "5.50";
 
   src = fetchurl {
     url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0plmdnwmhjjganhprsw9a8w3h5w43hyirpizy8cmq5w278hl2rix";
+    sha256 = "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
   };

From 0288d43a2d148061850a93cf841d5f1cbb96c89c Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 10:10:00 +0300
Subject: [PATCH 1859/2793] php: remove unsupported options

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index ae4e9b9635d..f1e0128abb9 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -2,7 +2,7 @@
 { lib, stdenv, fetchurl, flex, bison, autoconf
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip
 }:
 
@@ -17,7 +17,6 @@ let
   , imapSupport ? config.php.imap or (!stdenv.isDarwin)
   , ldapSupport ? config.php.ldap or true
   , mhashSupport ? config.php.mhash or true
-  , mysqlSupport ? (config.php.mysql or true)
   , mysqlndSupport ? config.php.mysqlnd or true
   , mysqliSupport ? config.php.mysqli or true
   , pdo_mysqlSupport ? config.php.pdo_mysql or true
@@ -27,7 +26,6 @@ let
   , bcmathSupport ? config.php.bcmath or true
   , socketsSupport ? config.php.sockets or true
   , curlSupport ? config.php.curl or true
-  , curlWrappersSupport ? config.php.curlWrappers or true
   , gettextSupport ? config.php.gettext or true
   , pcntlSupport ? config.php.pcntl or true
   , postgresqlSupport ? config.php.postgresql or true
@@ -48,7 +46,6 @@ let
   , ftpSupport ? config.php.ftp or true
   , fpmSupport ? config.php.fpm or true
   , gmpSupport ? config.php.gmp or true
-  , mssqlSupport ? config.php.mssql or (!stdenv.isDarwin)
   , ztsSupport ? config.php.zts or false
   , calendarSupport ? config.php.calendar or true
   , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
@@ -92,7 +89,6 @@ let
         ++ optional postgresqlSupport postgresql
         ++ optional pdo_pgsqlSupport postgresql
         ++ optional pdo_mysqlSupport mysqlBuildInputs
-        ++ optional mysqlSupport mysqlBuildInputs
         ++ optional mysqliSupport mysqlBuildInputs
         ++ optional gmpSupport gmp
         ++ optional gettextSupport gettext
@@ -100,7 +96,6 @@ let
         ++ optional xslSupport libxslt
         ++ optional mcryptSupport libmcrypt'
         ++ optional bz2Support bzip2
-        ++ optional (mssqlSupport && !stdenv.isDarwin) freetds
         ++ optional sodiumSupport libsodium
         ++ optional tidySupport html-tidy
         ++ optional argon2Support libargon2
@@ -130,7 +125,6 @@ let
       ++ optional embedSupport "--enable-embed"
       ++ optional mhashSupport "--with-mhash"
       ++ optional curlSupport "--with-curl=${curl.dev}"
-      ++ optional curlWrappersSupport "--with-curlwrappers"
       ++ optional zlibSupport "--with-zlib=${zlib.dev}"
       ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
       ++ optional pcntlSupport "--enable-pcntl"
@@ -139,11 +133,10 @@ let
       ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
       ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
       ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
-      ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"
       ++ 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 ( pdo_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 [
@@ -166,7 +159,6 @@ let
       ++ optional zipSupport "--enable-zip"
       ++ optional ftpSupport "--enable-ftp"
       ++ optional fpmSupport "--enable-fpm"
-      ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}"
       ++ optional ztsSupport "--enable-maintainer-zts"
       ++ optional calendarSupport "--enable-calendar"
       ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"

From bd850ff624df240d5447dfab18ce215d97993e70 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 10:40:34 +0300
Subject: [PATCH 1860/2793] php: fix build without libxml2Support

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f1e0128abb9..24bfb4f6a80 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -32,7 +32,7 @@ let
   , pdo_pgsqlSupport ? config.php.pdo_pgsql or true
   , readlineSupport ? config.php.readline or true
   , sqliteSupport ? config.php.sqlite or true
-  , soapSupport ? config.php.soap or true
+  , soapSupport ? (config.php.soap or true) && (libxml2Support)
   , zlibSupport ? config.php.zlib or true
   , opensslSupport ? config.php.openssl or true
   , mbstringSupport ? config.php.mbstring or true
@@ -127,6 +127,15 @@ let
       ++ optional curlSupport "--with-curl=${curl.dev}"
       ++ optional zlibSupport "--with-zlib=${zlib.dev}"
       ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
+      ++ optional (!libxml2Support) [
+        "--disable-dom"
+        "--disable-libxml"
+        "--disable-simplexml"
+        "--disable-xml"
+        "--disable-xmlreader"
+        "--disable-xmlwriter"
+        "--without-pear"
+      ]
       ++ optional pcntlSupport "--enable-pcntl"
       ++ optional readlineSupport "--with-readline=${readline.dev}"
       ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"

From 5d609ab66b90dc0143380a093863c6295c18a626 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:49:48 -0800
Subject: [PATCH 1861/2793] soapyrtlsdr: 0.2.5 -> 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/soapyrtlsdr/versions
---
 pkgs/applications/misc/soapyrtlsdr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/soapyrtlsdr/default.nix b/pkgs/applications/misc/soapyrtlsdr/default.nix
index c62cb88e495..d85fe347cd7 100644
--- a/pkgs/applications/misc/soapyrtlsdr/default.nix
+++ b/pkgs/applications/misc/soapyrtlsdr/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.2.5";
+  version = "0.3.0";
 
 in stdenv.mkDerivation {
   name = "soapyrtlsdr-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyRTLSDR";
     rev = "soapy-rtlsdr-${version}";
-    sha256 = "1wyghfqq3vcbjn5w06h5ik62m6555inrlkyrsnk2r78865xilkv3";
+    sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 535b6298c76f4ffda833c1c180984c5361915741 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 10:56:46 +0300
Subject: [PATCH 1862/2793] php: add option config.php.xmlrpc

---
 pkgs/development/interpreters/php/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 24bfb4f6a80..2757b9bd4ba 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -56,6 +56,7 @@ let
   , cgiSupport ? config.php.cgi or true
   , cliSupport ? config.php.cli or true
   , pharSupport ? config.php.phar or true
+  , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
   }:
 
     let
@@ -178,7 +179,8 @@ let
       ++ optional (!phpdbgSupport) "--disable-phpdbg"
       ++ optional (!cgiSupport) "--disable-cgi"
       ++ optional (!cliSupport) "--disable-cli"
-      ++ optional (!pharSupport) "--disable-phar";
+      ++ optional (!pharSupport) "--disable-phar"
+      ++ optional xmlrpcSupport "--with-xmlrpc";
 
       hardeningDisable = [ "bindnow" ];
 

From 253b786b4dc7ea00a5481b0162b95d4aa3f66dfd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 23:58:05 -0800
Subject: [PATCH 1863/2793] snapper: 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/snapper/versions
---
 pkgs/tools/misc/snapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index ff7518b04de..8f56ad6f6a2 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "snapper-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
     rev = "v${version}";
-    sha256 = "1blllmkwh13pnf3hxi1p2az5i77arbm2661n0rd0569s6kf5brb7";
+    sha256 = "0kl0najv8jpx94v44v68fmqsg2vv6yz3y5dmy0q8la0zyz766dhm";
   };
 
   nativeBuildInputs = [

From 381f229f2eca43ab3af9c4e6f9c4da2e3bb53350 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:10:23 -0800
Subject: [PATCH 1864/2793] sniproxy: 0.5.0 -> 0.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/sniproxy/versions
---
 pkgs/applications/networking/sniproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 1751106cd68..10bb465b8a1 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "sniproxy-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
     rev = version;
-    sha256 = "0nspisqdl0si5zpiiwkh9hhdy6h7lxw8l09rasflyawlmm680z1i";
+    sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 70f0f3e7c463f794143aaf6e4026463ddccf4d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 3 Dec 2018 14:01:40 +0100
Subject: [PATCH 1865/2793] kde-applications: 18.08.1 -> 18.12.0

---
 .../kde/akonadi/akonadi-paths.patch           |   19 +-
 pkgs/applications/kde/default.nix             |    1 -
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/kdepim-runtime.nix      |    4 +-
 pkgs/applications/kde/kmbox.nix               |    4 +-
 pkgs/applications/kde/kpimtextedit.nix        |    5 +-
 pkgs/applications/kde/srcs.nix                | 1728 +++++++++--------
 pkgs/applications/kde/syndication.nix         |   16 -
 8 files changed, 886 insertions(+), 893 deletions(-)
 delete mode 100644 pkgs/applications/kde/syndication.nix

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 4743c36c44d..9fa3c8a1414 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index 2e9f1acf4..ecc80afdc 100644
+index d85c1a79b..8df02710c 100644
 --- a/src/akonadicontrol/agentmanager.cpp
 +++ b/src/akonadicontrol/agentmanager.cpp
-@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
+@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
      mStorageController = new Akonadi::ProcessControl;
      mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
      connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
@@ -15,8 +15,8 @@ index 2e9f1acf4..ecc80afdc 100644
 -        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
 +        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
      }
+ }
  
- #ifndef QT_NO_DEBUG
 diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
 index be1cc4afb..6d0c1d7e5 100644
 --- a/src/akonadicontrol/agentprocessinstance.cpp
@@ -31,7 +31,7 @@ index be1cc4afb..6d0c1d7e5 100644
      }
      return true;
 diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index a32e86602..48ea4e52e 100644
+index 8b057b459..3fa4548ad 100644
 --- a/src/server/storage/dbconfigmysql.cpp
 +++ b/src/server/storage/dbconfigmysql.cpp
 @@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -121,7 +121,7 @@ index a32e86602..48ea4e52e 100644
      const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
      if (globalConfig.isEmpty()) {
 diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 60e6272f2..ad7cefbfe 100644
+index 6b50ae50e..f94a8c5eb 100644
 --- a/src/server/storage/dbconfigpostgresql.cpp
 +++ b/src/server/storage/dbconfigpostgresql.cpp
 @@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -132,7 +132,7 @@ index 60e6272f2..ad7cefbfe 100644
      QString defaultInitDbPath;
      QString defaultPgData;
  
-@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
  
      mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
      if (mInternalServer) {
@@ -144,7 +144,8 @@ index 60e6272f2..ad7cefbfe 100644
 -            postgresSearchPath << QStringLiteral(POSTGRES_PATH);
 -        }
 -#endif
--        postgresSearchPath << QStringLiteral("/usr/sbin")
+-        postgresSearchPath << QStringLiteral("/usr/bin")
+-                           << QStringLiteral("/usr/sbin")
 -                           << QStringLiteral("/usr/local/sbin");
 -        // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
 -        // sorted order, so we search from the newest one to the oldest.
@@ -168,7 +169,7 @@ index 60e6272f2..ad7cefbfe 100644
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
-@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -180,7 +181,7 @@ index 60e6272f2..ad7cefbfe 100644
      qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
      mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
      if (mInternalServer && mInitDbPath.isEmpty()) {
-@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
          settings.setValue(QStringLiteral("Port"), mHostPort);
      }
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 16c3a47431c..43974e027a2 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -165,7 +165,6 @@ let
       pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
-      syndication = callPackage ./syndication.nix {};
       # Okteta was removed from kde applications and will now be released independently
       # Lets keep an alias for compatibility reasons
       inherit okteta;
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index d4830a9e239..3b01e497039 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.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.12.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index b3cfed91dd4..201930c53d6 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -5,7 +5,7 @@
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
   kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
   kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
-  pimcommon, qtwebengine, libkgapi
+  pimcommon, qtwebengine, libkgapi, qtspeech
 }:
 
 mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
     akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
-    pimcommon libkgapi
+    pimcommon libkgapi qtspeech
   ];
   # Attempts to build some files before dependencies have been generated
   enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix
index 4b6b72a3734..c1348edf3f6 100644
--- a/pkgs/applications/kde/kmbox.nix
+++ b/pkgs/applications/kde/kmbox.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  kmime, qtbase,
+  kmime, qtbase, kcodecs
 }:
 
 mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
     maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kmime qtbase ];
+  buildInputs = [ kmime qtbase kcodecs ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
index 05d174b0554..4ede854d546 100644
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -2,7 +2,8 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
-  kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
+  kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, 
+  qtspeech
 }:
 
 mkDerivation {
@@ -14,7 +15,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
-    sonnet syntax-highlighting qttools
+    sonnet syntax-highlighting qttools qtspeech
   ];
   propagatedBuildInputs = [ ktextwidgets ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index bc7b7407d6a..b691902e133 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1715 +3,1723 @@
 
 {
   akonadi = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz";
-      sha256 = "0fipz3xnbgqk7f9pxfm3p38fniddb76scpb80fvb2v6gn0snlabi";
-      name = "akonadi-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-18.12.0.tar.xz";
+      sha256 = "1c3frrfkcpr01684c1fkrwxbnzb7ipvwncm0jf5nb4d0waiv8q08";
+      name = "akonadi-18.12.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-18.12.0.tar.xz";
+      sha256 = "0amp79x3jwib7f0a8ksv96prb1mhfhpp475k09ryz7c054lmj1ys";
+      name = "akonadi-calendar-18.12.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-tools-18.12.0.tar.xz";
+      sha256 = "0w2ng8lfy3cib49c0warqh0k43q17bfmkq3g4rjkwri9cqdqrahp";
+      name = "akonadi-calendar-tools-18.12.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz";
-      sha256 = "031garrv2q3rv6qjjkzm3rmmd25f6j17sz2yv4hn3zgzydkjjskn";
-      name = "akonadiconsole-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadiconsole-18.12.0.tar.xz";
+      sha256 = "1qg889g1a1c5iwvwdwz8ygkj59v46yfk5cwpkf8q1jldjdxkrib5";
+      name = "akonadiconsole-18.12.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-contacts-18.12.0.tar.xz";
+      sha256 = "0cn50nyrahb6pzshd35pc0issgiwg0r7j96xkmaxdigg9agjz9rn";
+      name = "akonadi-contacts-18.12.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-import-wizard-18.12.0.tar.xz";
+      sha256 = "1s477z6vb9qqz4q8bwprznn11fjjq0a6xfdmif6x0z30qrddllfd";
+      name = "akonadi-import-wizard-18.12.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-mime-18.12.0.tar.xz";
+      sha256 = "1w974gn81gyrp3m5r2l8jx7xrq610mhmmn005wqfl7ac1n3s65ln";
+      name = "akonadi-mime-18.12.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-notes-18.12.0.tar.xz";
+      sha256 = "0b233nw7jcr4dnlfnnymwrm9my47a4mdmdbp9qsp2rmlzwddplvw";
+      name = "akonadi-notes-18.12.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/akonadi-search-18.12.0.tar.xz";
+      sha256 = "1kg8q5jkzcc4vndc8l2q7hvkjkdw2v5500pjw8pszwifzmi5klln";
+      name = "akonadi-search-18.12.0.tar.xz";
     };
   };
   akregator = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz";
-      sha256 = "1js6fbz7hhj0pyjgaz5zhi5bbyw2l9v2gkpj8f8jw4ria2hiz4w8";
-      name = "akregator-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/akregator-18.12.0.tar.xz";
+      sha256 = "03968pcpvggn19721x89wn7d1n757xdk22f4rvxqq4d6qqh2myhd";
+      name = "akregator-18.12.0.tar.xz";
     };
   };
   analitza = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz";
-      sha256 = "11zzrgjl2fjbpjagzpzff0aq83ss5037pj4g83wi3qqvlkhphzf2";
-      name = "analitza-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/analitza-18.12.0.tar.xz";
+      sha256 = "0g8iz69cq2gc0qsraaqji8h7z1wcqq1baic4x7158q3xkrc7hg1f";
+      name = "analitza-18.12.0.tar.xz";
     };
   };
   ark = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ark-18.08.1.tar.xz";
-      sha256 = "1k95qnjn4xgi0dnypfiwa86n0zwckkh5qnc54mv9g1xvvzah04cq";
-      name = "ark-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ark-18.12.0.tar.xz";
+      sha256 = "16nmi8a9j4s00m4dnh4l7kcz1vjaqpcq1ilr0iv6wglpn3sycl1g";
+      name = "ark-18.12.0.tar.xz";
     };
   };
   artikulate = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz";
-      sha256 = "1cvd6sm45j2gg0ga7j3vyz89lrl1ghlwq6516rsxrvsy3vg7vdmy";
-      name = "artikulate-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/artikulate-18.12.0.tar.xz";
+      sha256 = "187qwl9adrggbkf6dyw12pmmxxxbjcp2swxbyvmqx10dca2pgbgn";
+      name = "artikulate-18.12.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/audiocd-kio-18.12.0.tar.xz";
+      sha256 = "044ksczgc5k6ai1inmxqpibvcigjvxbqpf6n6irgl1jgavmxdpim";
+      name = "audiocd-kio-18.12.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/baloo-widgets-18.12.0.tar.xz";
+      sha256 = "1sq70l529dg2ww8pcksnbbmgh1wi1baj69adakqiacxi5v893clg";
+      name = "baloo-widgets-18.12.0.tar.xz";
     };
   };
   blinken = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz";
-      sha256 = "0xzk8ddgr55sil00dl6b00m0x5az81yhd1cklr6mahjgg7w822br";
-      name = "blinken-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/blinken-18.12.0.tar.xz";
+      sha256 = "1dnp14g20a7gqy3zcysa7pxrj38zqxhgpyd4nxpdj6lzjgh2p7hx";
+      name = "blinken-18.12.0.tar.xz";
     };
   };
   bomber = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz";
-      sha256 = "0x4z8fa2klhabr99al3iyyf9aq3pm8rk1gi6cjghjgwrrcav7an7";
-      name = "bomber-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/bomber-18.12.0.tar.xz";
+      sha256 = "1vjvajbra1m4zjbijn1nxj5x66hyv8q65874b3ajshb3lmv7rklj";
+      name = "bomber-18.12.0.tar.xz";
     };
   };
   bovo = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz";
-      sha256 = "1jwq9wjkdhy8bvkxg4lvb1m4qqw0zr84ws096nk6pccqk7xlkpr2";
-      name = "bovo-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/bovo-18.12.0.tar.xz";
+      sha256 = "1fslwk3zbxi16b1m7w7rbf8bgdhflnqrd6k90lpbwvlnxy6839iw";
+      name = "bovo-18.12.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz";
-      sha256 = "0hh8jr81hcqyhm9fp0s27g52077d9li8x8rrg3bd18lw3flib0fq";
-      name = "calendarsupport-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/calendarsupport-18.12.0.tar.xz";
+      sha256 = "180qzjlx0y4cfasmrf06ah8jdckbym1wrbmqlpyzjfy55mkwyf40";
+      name = "calendarsupport-18.12.0.tar.xz";
     };
   };
   cantor = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz";
-      sha256 = "05cvyrf17lvh85qrcg1yf8x2c9d3l9wgbvnlhw4idx06crhvwvbb";
-      name = "cantor-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/cantor-18.12.0.tar.xz";
+      sha256 = "0isddvdd8gvaasigyj3njyl7ckcqc8ciqp82awlland3avll6rby";
+      name = "cantor-18.12.0.tar.xz";
     };
   };
   cervisia = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz";
-      sha256 = "1hir8ssr2yjjkly8kh8qdxqlgaa29q94kpsrk1crcdl67vrc8pph";
-      name = "cervisia-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/cervisia-18.12.0.tar.xz";
+      sha256 = "1r55zjfvlh5by9cv6pzcsbz71igbjr1pvyiyjkdhc36sbaiv0r3x";
+      name = "cervisia-18.12.0.tar.xz";
     };
   };
   dolphin = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz";
-      sha256 = "1f8w1315kg5mnz0jfdbynw5kapg529kwr3qc98nh83q4vfrjr7yj";
-      name = "dolphin-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/dolphin-18.12.0.tar.xz";
+      sha256 = "10mzdk9i5x4kmsrpamm5q9ihy8ymii9w3iaccd7fgw4yy11qlzw3";
+      name = "dolphin-18.12.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz";
+      sha256 = "07pkslxhawl03030zjy889zjbym13d94nllg9fxvmd3402y2djiw";
+      name = "dolphin-plugins-18.12.0.tar.xz";
     };
   };
   dragon = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz";
-      sha256 = "1r9zdia4r1g77c456zi1yv3vjrccww6lqrhplwg90bw8091isc7s";
-      name = "dragon-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/dragon-18.12.0.tar.xz";
+      sha256 = "0j3d8a97ymh9lm6al0vv3abxalfw3wnf689i3mzkg7bdqkaaxz24";
+      name = "dragon-18.12.0.tar.xz";
     };
   };
   eventviews = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz";
-      sha256 = "0h5aqjncsmhgjqsj65j12bx4rb5rf4604fs6h04lda8jrk2qla3y";
-      name = "eventviews-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/eventviews-18.12.0.tar.xz";
+      sha256 = "0r3y3z8zzzs1154wqi16kwb7vjijphscsnna76hpxcllw23cnb7v";
+      name = "eventviews-18.12.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz";
-      sha256 = "11gwrw3fm6di4z5a04jqxfvm176mh20h8pfpv0c0zq9qipr1khkc";
-      name = "ffmpegthumbs-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ffmpegthumbs-18.12.0.tar.xz";
+      sha256 = "0wwrhj6xblz96g1rpqds4m0savp9n08w1xlwlhrm9xq81kajpw5x";
+      name = "ffmpegthumbs-18.12.0.tar.xz";
     };
   };
   filelight = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz";
-      sha256 = "03sz1bnz7w3b4227hvfidi225ci5i83z022fgkb632b0dp2l9m8p";
-      name = "filelight-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/filelight-18.12.0.tar.xz";
+      sha256 = "1vayrsgs5q1ky34kx5a8fi198b57478w68641xwhxmzwllssd9sx";
+      name = "filelight-18.12.0.tar.xz";
     };
   };
   granatier = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz";
-      sha256 = "062qh639n1k919n67k2xn5h829gr0ncczif9mffw8ggvqqrzh560";
-      name = "granatier-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/granatier-18.12.0.tar.xz";
+      sha256 = "145z4h7vwmg2zlvncp5dijm06m1d0z20hlmlz2zd69nfvs8w1lmz";
+      name = "granatier-18.12.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/grantlee-editor-18.12.0.tar.xz";
+      sha256 = "0h5hcsnkh8gkqcnn620zs4kni5k8cpr65nbkkxybgxjf3kljapin";
+      name = "grantlee-editor-18.12.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz";
-      sha256 = "1ydi89smsim4lvgwclm9xsnldimsy45b69qsipz9vhhck4pccd7n";
-      name = "grantleetheme-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/grantleetheme-18.12.0.tar.xz";
+      sha256 = "1k5q30viyvwx4c8nl5gxk2sqxd9l703n6fnxw5dz5q7hzsxykzzx";
+      name = "grantleetheme-18.12.0.tar.xz";
     };
   };
   gwenview = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz";
-      sha256 = "0p32v9y2gz5q4j1vz0yqw90qg8l7nbyzxqn7pqwrzbhlycsx7mp9";
-      name = "gwenview-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/gwenview-18.12.0.tar.xz";
+      sha256 = "1p9g6q5bfaxbk60k91wbjhbv0wwzin5ai3hyasl7rg3c6hisp2rf";
+      name = "gwenview-18.12.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz";
-      sha256 = "0da1jba66pvjar5wxcx2q9dhfwj2mlwk17h0j9xc9kgxj2y0bzx9";
-      name = "incidenceeditor-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/incidenceeditor-18.12.0.tar.xz";
+      sha256 = "0f313zw1n4dgaianmxnmd5d5bqad40izli20ab08lqhv9d03sdkh";
+      name = "incidenceeditor-18.12.0.tar.xz";
     };
   };
   juk = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/juk-18.08.1.tar.xz";
-      sha256 = "17mylgsw11nc64y0if3imrs2hsxwfdflnn1a4f5p64awrzid04mc";
-      name = "juk-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/juk-18.12.0.tar.xz";
+      sha256 = "1jsxvcqpj87n6yv2v0a7rvmg832ayrk0fknmch04gc8bkb7w52az";
+      name = "juk-18.12.0.tar.xz";
     };
   };
   k3b = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz";
-      sha256 = "1vv7pr1i3vj778m763mv1bzrq29kaqm02hnllhgq4dcci3hafn6a";
-      name = "k3b-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/k3b-18.12.0.tar.xz";
+      sha256 = "1fmy94cda1nsqv5g4w3bnypx9c8ngrndbzf6l7l2pv5q889p73x1";
+      name = "k3b-18.12.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kaccounts-integration-18.12.0.tar.xz";
+      sha256 = "1wyjd7iv0z8q9adbgnkvwmz4zrhrz3wgkz0lp52i8j0511xby93r";
+      name = "kaccounts-integration-18.12.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kaccounts-providers-18.12.0.tar.xz";
+      sha256 = "03kjjshbxgj1mj8vv60rbssn3kdf3gx9kqmgsbbwybxg46277w1r";
+      name = "kaccounts-providers-18.12.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz";
-      sha256 = "0917d7m2nvgadkns8im7fzzqp2m5i21m4nrw75hv6bil7v0cshnn";
-      name = "kaddressbook-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kaddressbook-18.12.0.tar.xz";
+      sha256 = "0dfmwn6swa6m11ih52aj2r8zfma6jffy8gsqhaph4xg4ba58nmpj";
+      name = "kaddressbook-18.12.0.tar.xz";
     };
   };
   kajongg = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kajongg-18.08.1.tar.xz";
-      sha256 = "0apjydg0q9yvvnlirhhvri2bqwzrkrq85fzphi49pr5ki3ah03dz";
-      name = "kajongg-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kajongg-18.12.0.tar.xz";
+      sha256 = "0k9nxcr2fpkrmckzc5fxani4l304fxj7kp80y2nrv1p5cagn2x7l";
+      name = "kajongg-18.12.0.tar.xz";
     };
   };
   kalarm = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz";
-      sha256 = "1558nls14a22pwjnk59fpgmb4ddrdvzf3rdhl0nf6kkgr0ma0p1w";
-      name = "kalarm-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kalarm-18.12.0.tar.xz";
+      sha256 = "1cmk6l8450sz3rfdk25p9dn26zcbhcrdwz9v242cpsndyvnl13i2";
+      name = "kalarm-18.12.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz";
-      sha256 = "02shp4m85frjs4kp5n2kv3nz5frjfrckm7zkjlnwn6lrg6jz7q0f";
-      name = "kalarmcal-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kalarmcal-18.12.0.tar.xz";
+      sha256 = "0l90yxfkjwybff80z7zhgx4sbw7xz8nx0acg56avgrkh3230fv3i";
+      name = "kalarmcal-18.12.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz";
-      sha256 = "1996vbcvbpkvmya291w2kxfjwkm3baqflx04drrglildsrn6q07w";
-      name = "kalgebra-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kalgebra-18.12.0.tar.xz";
+      sha256 = "0hc3k4zm50n39nvw6fki6997vzz56fwjkn61q48fkbzd4jvcfqni";
+      name = "kalgebra-18.12.0.tar.xz";
     };
   };
   kalzium = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz";
-      sha256 = "0sp89xi94xpix1gpz1s7qya1ki7lbbx93yr17bmhlp4dhyfqbzw5";
-      name = "kalzium-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kalzium-18.12.0.tar.xz";
+      sha256 = "0j3a3r1j4vc0ssdw60lvgkdwmh02zz07xakdgxr5jrys4fix23ci";
+      name = "kalzium-18.12.0.tar.xz";
     };
   };
   kamera = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz";
-      sha256 = "03p94azchdgr19mbgpgkvb3rlddik3bjl6iy3j0yd99frlns15ck";
-      name = "kamera-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kamera-18.12.0.tar.xz";
+      sha256 = "098gg2v8bina5famp2bk0x8dakzz66zd0dxh8vjczjycvzac6hzd";
+      name = "kamera-18.12.0.tar.xz";
     };
   };
   kamoso = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kamoso-18.08.1.tar.xz";
-      sha256 = "11hm8q2v3x1rhm2smiqm9gmscbpdkyfb6x4sl0xrnm36m7ps54qb";
-      name = "kamoso-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kamoso-18.12.0.tar.xz";
+      sha256 = "0f4hvbw216xmyavgakvydplcspqcyv1v9bv0pqvwdk1swk1jp0r3";
+      name = "kamoso-18.12.0.tar.xz";
     };
   };
   kanagram = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz";
-      sha256 = "0mq8qrvvn30axhizzlzhzp5vl9q1ys7s7p5v525flyyz9fs011dz";
-      name = "kanagram-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kanagram-18.12.0.tar.xz";
+      sha256 = "1xbb04i06qrffb6pxk05ksn8h1n08r9pyaf9nkhrymgv90l62739";
+      name = "kanagram-18.12.0.tar.xz";
     };
   };
   kapman = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz";
-      sha256 = "0grq9yllpaa267lx654n39mj7ll0g2pj6s42fq7b7236naqyna3d";
-      name = "kapman-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kapman-18.12.0.tar.xz";
+      sha256 = "0shq8bjfixjx9gqid27cgiybx0anwgbm69gsrvlczmragswcqxwi";
+      name = "kapman-18.12.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz";
-      sha256 = "1dp9831hzmh9gd3qwvfyb2ihindl5c42jvmmrhnmfbz1j199z98w";
-      name = "kapptemplate-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kapptemplate-18.12.0.tar.xz";
+      sha256 = "18q7lxkfim41lhzqwvv4ir2c45fhf9pxxajfwibg9a462b1jxk4a";
+      name = "kapptemplate-18.12.0.tar.xz";
     };
   };
   kate = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kate-18.08.1.tar.xz";
-      sha256 = "1jsdk6jfff36fcb1x0vxl0iqa1xrl0400bm7fhp1gv9m553pkysa";
-      name = "kate-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kate-18.12.0.tar.xz";
+      sha256 = "15k66vipm1lqcmk73a44niz1279rkab3g23p9jqyvvbw41j1368l";
+      name = "kate-18.12.0.tar.xz";
     };
   };
   katomic = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz";
-      sha256 = "0cd8l7hn89xr5spq107nqxz7dx12drvv70siqx896d8lfpkmh96d";
-      name = "katomic-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/katomic-18.12.0.tar.xz";
+      sha256 = "183pgb7pphzmi3lgza4lm5crzf9rs6l2d6fl1xwzvvb3ik77ccqz";
+      name = "katomic-18.12.0.tar.xz";
     };
   };
   kbackup = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kbackup-18.08.1.tar.xz";
-      sha256 = "15x75biiwixiw0j329pcxhh5sfyqm82x2rdfb0nqp0zz01cwicv6";
-      name = "kbackup-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kbackup-18.12.0.tar.xz";
+      sha256 = "1qwrgrrd408y7ipqfhajqfwcicn7pb32akvbls3rby17b2nwn16x";
+      name = "kbackup-18.12.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz";
-      sha256 = "00xd6k9ndm1jbr1j2mhi8xfcxqdiwzwnb1cvr35a22r414lbc3cw";
-      name = "kblackbox-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kblackbox-18.12.0.tar.xz";
+      sha256 = "0hx5bd97k1k4hdyal6g7r7y1xk70sf0779vxfqnin1dpzhgnq2dq";
+      name = "kblackbox-18.12.0.tar.xz";
     };
   };
   kblocks = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz";
-      sha256 = "0y9hfxb9rpijpkm1r697v1w5q3gny8pa3ax5y0qq6695j2h7c52p";
-      name = "kblocks-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kblocks-18.12.0.tar.xz";
+      sha256 = "0f0mapx67gxiy5s9k60qhgc9sfr21hwy62wzdiw4ssbxfhhqv7fa";
+      name = "kblocks-18.12.0.tar.xz";
     };
   };
   kblog = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz";
-      sha256 = "0ickxhz7y098zx88308774kkz8wf6v51ydlnbmnayb8lyaw8ms8i";
-      name = "kblog-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kblog-18.12.0.tar.xz";
+      sha256 = "1slrwablxhsjzl3vj714rzm7rp59vnd9d0ri0k7yvc1ykc4aj8v6";
+      name = "kblog-18.12.0.tar.xz";
     };
   };
   kbounce = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz";
-      sha256 = "1k2qmdhm3sllxhsz6hhs94fndm1lrifhh7md2lmws2l2977ymkpi";
-      name = "kbounce-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kbounce-18.12.0.tar.xz";
+      sha256 = "1r5rhlra9p89wn4mmjn81v7lgh78k53xfzhr0sz08dhg7qk2rb48";
+      name = "kbounce-18.12.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz";
-      sha256 = "06mxh67pyg7fv8x152kd79xzrfnlw22x4x3iklhbngsk1cqsg62r";
-      name = "kbreakout-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kbreakout-18.12.0.tar.xz";
+      sha256 = "0bw84bl2r9am69zv0ik1rhqwcjzazfzwnwjg0zqzzwlyhww0ya5f";
+      name = "kbreakout-18.12.0.tar.xz";
     };
   };
   kbruch = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz";
-      sha256 = "0m4m1xqp2aqkqs7cgj8z5c6b3s64d330bfgsq7mnm2wakmc69x9g";
-      name = "kbruch-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kbruch-18.12.0.tar.xz";
+      sha256 = "156varmig28a3swk099k2c2l0hn8kbr1khz5cd9c9wdy46ln6w8n";
+      name = "kbruch-18.12.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz";
-      sha256 = "0llqmziq0h6wx3inxc2rmph1qs68fb34q09fvhfasg43l8y8a6cm";
-      name = "kcachegrind-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcachegrind-18.12.0.tar.xz";
+      sha256 = "1jvpn2ly2pn9pnv6zx7i8z0zn91lb2kf6q9linqmpag47qbg0p7y";
+      name = "kcachegrind-18.12.0.tar.xz";
     };
   };
   kcalc = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz";
-      sha256 = "139pjh31k9cy608h7yl9kxq48x6dsm5c0gcbndqc6nsjwd88ck04";
-      name = "kcalc-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcalc-18.12.0.tar.xz";
+      sha256 = "15wdyv5sgnd9amar41k14mgyz8p4d1aba0kw7gphzl7c9gms0y70";
+      name = "kcalc-18.12.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz";
-      sha256 = "0kf92imqm9lqisfy3i25qn0g588p35w23xl0vmx75i67pzr3jcjn";
-      name = "kcalcore-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcalcore-18.12.0.tar.xz";
+      sha256 = "04y7bdrdcbz98waydi9r5hw25mdzy8a0pzzdsmp2ky2lj4shph4h";
+      name = "kcalcore-18.12.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz";
-      sha256 = "1z346k9aniv3bq9c1dak3x5hzymi71ygns773r4agzm4kdn8ghwh";
-      name = "kcalutils-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcalutils-18.12.0.tar.xz";
+      sha256 = "1w10np6g02f3hh3bn3zksbj335mrzy0a5wg4lk2hny06rakk0hh0";
+      name = "kcalutils-18.12.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz";
-      sha256 = "06r9q03rs00zqs0dpb0wxa9663pc2i51hsf83c0z9jnkpq6sjijb";
-      name = "kcharselect-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcharselect-18.12.0.tar.xz";
+      sha256 = "0s4yqylc5jhgl7s3cs8gf8bb4r7n8nhxhl502sbnamss11lx7gqw";
+      name = "kcharselect-18.12.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz";
-      sha256 = "027afkj0mllvnwdrrfjnpp4769dp5ixrdmd17r59q2hja0wz6cpf";
-      name = "kcolorchooser-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcolorchooser-18.12.0.tar.xz";
+      sha256 = "0za9isapgmbafmn5v6fwdw1vaafszwnia1iim9k4ga7bs9aakfhb";
+      name = "kcolorchooser-18.12.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz";
-      sha256 = "1y0drw7n9mhyq84brqxz4rr666pqj5ww94f2i8k34chdzkcqsr52";
-      name = "kcontacts-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcontacts-18.12.0.tar.xz";
+      sha256 = "1drp0rzhjbb9nqqjl9cmwpyqk8dgvnaw42rmn0cwla8l8qas5xs5";
+      name = "kcontacts-18.12.0.tar.xz";
     };
   };
   kcron = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz";
-      sha256 = "1blalii8b6i8b1cknwcarbj84m6rrffsjamgnzyz6l81l43b0j9m";
-      name = "kcron-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kcron-18.12.0.tar.xz";
+      sha256 = "02fxsnka3d3456j99nsrgvkxpjd677xl0z7hmqwsr0zx3bx0krk7";
+      name = "kcron-18.12.0.tar.xz";
     };
   };
   kdav = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz";
-      sha256 = "046h72gvcc9wxq0rn5ribf3lr03q6zq6acz2c3kxsbdw6kbypb2x";
-      name = "kdav-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdav-18.12.0.tar.xz";
+      sha256 = "0fbw65yiskygbhhagsc48yrhdslg951fd13b6mzwf2ab55fw6vmf";
+      name = "kdav-18.12.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz";
-      sha256 = "0n6lvccm803g9ilwwdka0srvak14i8lk5g149c6qmd73wywqdk84";
-      name = "kdebugsettings-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdebugsettings-18.12.0.tar.xz";
+      sha256 = "1gdrc1x5bavdi6ljqv5wh1hwvys1r2v00xi555dfyijjryr7kd27";
+      name = "kdebugsettings-18.12.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kde-dev-scripts-18.12.0.tar.xz";
+      sha256 = "03wmki422lw1r5i51gh17ha3w2gpdjv4ix7bndjakwq315iivlxi";
+      name = "kde-dev-scripts-18.12.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kde-dev-utils-18.12.0.tar.xz";
+      sha256 = "0x2ji7jd12b1blww2jz0709yl79pb3slglx7mp4yyfi66c5ngl1q";
+      name = "kde-dev-utils-18.12.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdeedu-data-18.12.0.tar.xz";
+      sha256 = "1p3rjsdhf4hy9468515vkbihkj69s2gpz6fxk3rqvi03ksmpdi5x";
+      name = "kdeedu-data-18.12.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-mobipocket-18.12.0.tar.xz";
+      sha256 = "05gxnbrl4p1s6mccvp0482as4r41rhqsrfd84v57sqyd93mgzsji";
+      name = "kdegraphics-mobipocket-18.12.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-thumbnailers-18.12.0.tar.xz";
+      sha256 = "096acsz560k238sfa54nyjydx5wlc0b92khi4ahmvaqmllzjc9p4";
+      name = "kdegraphics-thumbnailers-18.12.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdenetwork-filesharing-18.12.0.tar.xz";
+      sha256 = "183f8fir8rx7jr35gyj074k852s51gjsd2q7hp1bgkj7g5avql4i";
+      name = "kdenetwork-filesharing-18.12.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz";
-      sha256 = "1ampvjlxn3q8l3mi4nap4lq3hgxzmp6ic88hzmkdj41vpm01flpf";
-      name = "kdenlive-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdenlive-18.12.0.tar.xz";
+      sha256 = "0jknpfs7gql527pbj0nb1bxvhxpbk0gnyjx4g6wdhlmk87w2g0wp";
+      name = "kdenlive-18.12.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdepim-addons-18.12.0.tar.xz";
+      sha256 = "0dbys45cn00xism83x2j1ypidg5dp8zv29wx18a4bga4y8mfnrkp";
+      name = "kdepim-addons-18.12.0.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdepim-apps-libs-18.12.0.tar.xz";
+      sha256 = "18y3n602b6v1jyl18lvqalasf2v795ln31nn79ih1z4y49j1s67x";
+      name = "kdepim-apps-libs-18.12.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdepim-runtime-18.12.0.tar.xz";
+      sha256 = "0vmwgbbnwipi62aciy52pdd4ygrgx3l87i5g5nspkb03wlb5jl51";
+      name = "kdepim-runtime-18.12.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdesdk-kioslaves-18.12.0.tar.xz";
+      sha256 = "0ca9cwxv836jl9crqik9s1v3dgk5z9jhvzxvbcvrbalvs1cyxg8b";
+      name = "kdesdk-kioslaves-18.12.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kdesdk-thumbnailers-18.12.0.tar.xz";
+      sha256 = "1q57c5i7pnrpd7g1dwrahac9lji9ljqyb60qkj9qx3v3fnr11v7f";
+      name = "kdesdk-thumbnailers-18.12.0.tar.xz";
     };
   };
   kdf = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz";
-      sha256 = "1m5hwfhzvikh7isakbvzyc3y98zdky4iz8vdsi7nnyb6d8n2hbrr";
-      name = "kdf-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdf-18.12.0.tar.xz";
+      sha256 = "1ds4z4adyaazmhbybq2f361qq02a8l73a9g2hwcrh95w0dcisyvp";
+      name = "kdf-18.12.0.tar.xz";
     };
   };
   kdialog = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz";
-      sha256 = "0s8a3y8sjhyq8lf3i8r6ligg1s9nbhxsd34vncw3lkbq60xkyhrr";
-      name = "kdialog-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdialog-18.12.0.tar.xz";
+      sha256 = "04v2s3wlaihcm4c64kzcxmxs9niw6ghid0vdl4pw8h0ks1s8xz0g";
+      name = "kdialog-18.12.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz";
-      sha256 = "0vcqdadb9kbmxnycaba6g9hiiyxqybqiw1i4zldlw5x4gnj7dcv2";
-      name = "kdiamond-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kdiamond-18.12.0.tar.xz";
+      sha256 = "0c11v3c7hxllg15h8mq18jl5lqprwwpnz04rjjggwzz8c4iz2kjs";
+      name = "kdiamond-18.12.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz";
-      sha256 = "10nzhsyia1q0m26icqb20qh8s8n6r5vlb5q498gw8dv3rzsmh6sf";
-      name = "keditbookmarks-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/keditbookmarks-18.12.0.tar.xz";
+      sha256 = "1ia69amq6dfidfgxq297xa10f3812spibb00wsv9dj4cp36y89mm";
+      name = "keditbookmarks-18.12.0.tar.xz";
     };
   };
   kfind = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz";
-      sha256 = "15w4cdvz35yyfyfaxb4mnxynlbryixydkwmx7lkmhlwnk3zjmskr";
-      name = "kfind-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kfind-18.12.0.tar.xz";
+      sha256 = "0km2f88pw9ynqbxsl3pwfkk120ni0by2rsaldqp2h3a26kyc5gzk";
+      name = "kfind-18.12.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz";
-      sha256 = "07v3q4jiw728s9akwhy27hczp4hxhp7f8c6g59gdqm0ply0vgxk6";
-      name = "kfloppy-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kfloppy-18.12.0.tar.xz";
+      sha256 = "0ng0d18dnnrdp9xccald0jn8hl40v2kshgmy8pnr4agl20aagh61";
+      name = "kfloppy-18.12.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz";
-      sha256 = "03g8g0s2214fqkqp4lyh9m8f382s8xwzi0yqz0yigyq1w5igcl9p";
-      name = "kfourinline-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kfourinline-18.12.0.tar.xz";
+      sha256 = "01wjqyg7aw2wi7nrrqri3znb545hr1qcanzibjiakhb2pbx5db3z";
+      name = "kfourinline-18.12.0.tar.xz";
     };
   };
   kgeography = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz";
-      sha256 = "1pqs2sk88idzc8xr85qy689palkf5y5l4pfqkd9xfkb87041rl93";
-      name = "kgeography-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kgeography-18.12.0.tar.xz";
+      sha256 = "1fa2333xmxswlfjzl7d3ssl7s2hgwszhqxkdyi9db9lqxq0m3ckv";
+      name = "kgeography-18.12.0.tar.xz";
     };
   };
   kget = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kget-18.08.1.tar.xz";
-      sha256 = "1ax6sdkpvzg37sp05fx083h0nn78a2zpfpr2l74j3qwq2yssy298";
-      name = "kget-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kget-18.12.0.tar.xz";
+      sha256 = "1f3ahslqcicgkhgdpdrvy9ydlsl1hwnnym7fw2v2k07h5mprw8hp";
+      name = "kget-18.12.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz";
-      sha256 = "1wbdranw0fq8qynn13d0wkb7fckfzqbz2g920gyx2igw0bblcj0y";
-      name = "kgoldrunner-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kgoldrunner-18.12.0.tar.xz";
+      sha256 = "0cmcjmfhair649nbfx74qdmsf67lx4j53qkj0xsr7bijv52pi4br";
+      name = "kgoldrunner-18.12.0.tar.xz";
     };
   };
   kgpg = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz";
-      sha256 = "1i3g7x18khnyvwnvgpnv6xdfbv29w65x8d8ml60zb8siipbnlwb5";
-      name = "kgpg-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kgpg-18.12.0.tar.xz";
+      sha256 = "1hlcpgfcwpiyf1xfy62mris60cnws1mcgpni5nvvwdzdi4scad3g";
+      name = "kgpg-18.12.0.tar.xz";
     };
   };
   khangman = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz";
-      sha256 = "1nc9lbjxlwr4aqsl6idjyhqxd5wampcz7a6zgq6py03n8mr811qy";
-      name = "khangman-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/khangman-18.12.0.tar.xz";
+      sha256 = "0y05jjacnw2h70hjn5jbpnmcj53xgcx8304s39aa8zc1ry9jvsqq";
+      name = "khangman-18.12.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz";
-      sha256 = "1k60yqnpkplj0k0b8h27zyhviqs6ddwhygmv7cpmnwa1d7kvhdwi";
-      name = "khelpcenter-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/khelpcenter-18.12.0.tar.xz";
+      sha256 = "0cwxf6m3f6md4y51zpscxh89p9p9jzzsfslxh04y92p9g0l1qvwm";
+      name = "khelpcenter-18.12.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz";
-      sha256 = "0w1lmfcjq2fb65l3vd9qzq037j7r3dd49aqh8bnrwkjslshy7iwz";
-      name = "kidentitymanagement-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kidentitymanagement-18.12.0.tar.xz";
+      sha256 = "1i0amb9m2vc00zaawv2wdyw7gzwz8lfw4bvz0mlnad4nrcmkvjyk";
+      name = "kidentitymanagement-18.12.0.tar.xz";
     };
   };
   kig = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kig-18.08.1.tar.xz";
-      sha256 = "1haf21widyfi0afixyfczk944l048w8dvlmgkwvfqhmgiiz52g72";
-      name = "kig-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kig-18.12.0.tar.xz";
+      sha256 = "0zq7z4jj8bsmhjggjh7byjv74ry6caps9pviwqqcsrdrl5357kzi";
+      name = "kig-18.12.0.tar.xz";
     };
   };
   kigo = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz";
-      sha256 = "1dmb3cmbi473wpkbnv895nyxxhqmp09ihghvxir77khjpmask04a";
-      name = "kigo-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kigo-18.12.0.tar.xz";
+      sha256 = "03kl5hn8b2qbbv436rd8slqwr5w4034wz7vvm9z9cmjbpxavls2q";
+      name = "kigo-18.12.0.tar.xz";
     };
   };
   killbots = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz";
-      sha256 = "184glirpf8jzy91769d13rck3vnh96s171h6sfqab755857wj960";
-      name = "killbots-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/killbots-18.12.0.tar.xz";
+      sha256 = "0w8xl73ir9a3zxvsj3027gdlh7mskns3f0bk4mspirwg761zn1hf";
+      name = "killbots-18.12.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz";
-      sha256 = "1w0yinp58f7x4ss2m069736faagwil7ay8gd5w79a5frqizsj36d";
-      name = "kimagemapeditor-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kimagemapeditor-18.12.0.tar.xz";
+      sha256 = "0l17biqkq8jkc2vnnw51a6g13y29rnsfn9dx3afv88bdf2a52x1m";
+      name = "kimagemapeditor-18.12.0.tar.xz";
     };
   };
   kimap = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz";
-      sha256 = "0na135np2li231kzxfjy4wb5bbgkkyll66x8jd4y0lxvc4cwipfd";
-      name = "kimap-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kimap-18.12.0.tar.xz";
+      sha256 = "04m6sd36k6w4iiqanxy49v06am11p5xcb253gk99pyfrssb596m5";
+      name = "kimap-18.12.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kio-extras-18.12.0.tar.xz";
+      sha256 = "1sbl7m8c4fy63389bv19ck89nzxjpf0l2855sc81fzy3zig89b65";
+      name = "kio-extras-18.12.0.tar.xz";
+    };
+  };
+  kirigami-gallery = {
+    version = "18.12.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/18.12.0/src/kirigami-gallery-18.12.0.tar.xz";
+      sha256 = "008ixa0kvqjjk98aq9mcapxd8d8svkjpz04v4ka64zwks8qyzdrk";
+      name = "kirigami-gallery-18.12.0.tar.xz";
     };
   };
   kiriki = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz";
-      sha256 = "1kc2flpfqvfijrazvnk7mk03myy7f7lqia1r9lxg1g3xx095jqhz";
-      name = "kiriki-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kiriki-18.12.0.tar.xz";
+      sha256 = "098gsl6pj8bdm29qa1w6pnyg7m25m0m2f97f7cwgqi1h4asyz9h8";
+      name = "kiriki-18.12.0.tar.xz";
     };
   };
   kiten = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz";
-      sha256 = "1i1pgfxvcqh5jbbk39b6rlc0s67z2naw5glxhkg3nrvxy9yxw9n2";
-      name = "kiten-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kiten-18.12.0.tar.xz";
+      sha256 = "1lkaicfc5z59g6gvcgmkdwpfl2i622s26w3pf1w0cmlw1hnspblc";
+      name = "kiten-18.12.0.tar.xz";
     };
   };
   kitinerary = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kitinerary-18.08.1.tar.xz";
-      sha256 = "0bv1nwwi2mc0l3vfvx29d46l7b876qf4bch9g84zmdcas37w786l";
-      name = "kitinerary-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kitinerary-18.12.0.tar.xz";
+      sha256 = "0q4fhfckvzlcza7r2gddygfn7f3dfj4kl82m644givb4394hjapd";
+      name = "kitinerary-18.12.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz";
-      sha256 = "1qfzydbpd86zsb0yfy5xdaqlbh1awm70lg1nzbqn99rl47vsm85b";
-      name = "kjumpingcube-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kjumpingcube-18.12.0.tar.xz";
+      sha256 = "0j022vr1dj06s21cwxhsiv8xb1000l2yz2jz128rnkpr63b8darr";
+      name = "kjumpingcube-18.12.0.tar.xz";
     };
   };
   kldap = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz";
-      sha256 = "1knf61whi1raj66z55a8535rj911na15zkq0vcb8djz6cg3xw29r";
-      name = "kldap-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kldap-18.12.0.tar.xz";
+      sha256 = "0359vzfhscqlha2vyaygqpai7qi924ircw290prwrmhn9jqzms5x";
+      name = "kldap-18.12.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz";
-      sha256 = "0g65qxz6v1glh86fvgpb89ay1221qbnz97mnzw8fb26aar838s8y";
-      name = "kleopatra-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kleopatra-18.12.0.tar.xz";
+      sha256 = "1j1s7dmg5wadfd8z76i5l81drii0sjdynahkcm8jdz3gvrsd773k";
+      name = "kleopatra-18.12.0.tar.xz";
     };
   };
   klettres = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz";
-      sha256 = "0k5c9j9w0d95fzs7103nx13cxz9q5ivn34wq8px0ma9jaig1w1j9";
-      name = "klettres-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/klettres-18.12.0.tar.xz";
+      sha256 = "0gyd7vnm6mq7wy398h9nrny611pc6v4kksmdbhhsrkagvj4rvywq";
+      name = "klettres-18.12.0.tar.xz";
     };
   };
   klickety = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz";
-      sha256 = "1zx7f4hpcgfrfbgmmhfj9p9l604bzhg06zznfgq40774m4d5m992";
-      name = "klickety-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/klickety-18.12.0.tar.xz";
+      sha256 = "083w9lj6h6yxxk6vgmf72651vb423gakppbi7z7ii5i546miilyn";
+      name = "klickety-18.12.0.tar.xz";
     };
   };
   klines = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/klines-18.08.1.tar.xz";
-      sha256 = "1wwvzvwshxj03s3ywpg65lfj32xcd3yj4y7fhdms8xjn0b341grc";
-      name = "klines-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/klines-18.12.0.tar.xz";
+      sha256 = "1v05ssjrb6x81c5nj9c8dpfqj9wr2m4mz9c883pnc5pjbc33fh0x";
+      name = "klines-18.12.0.tar.xz";
     };
   };
   kmag = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz";
-      sha256 = "1a1xml73yhfrqzw37apgmf1f88x58ws09vfdrp8zchawskcm3yi2";
-      name = "kmag-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmag-18.12.0.tar.xz";
+      sha256 = "0micbc4wqi23jc2bpf1kjzy8xafqkd8gp70hg83id7mlncq12pm7";
+      name = "kmag-18.12.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz";
-      sha256 = "1rdimx9kdm9n3g4856672z0spwsj5ihd40yx17vbzc3lhyqnk0w1";
-      name = "kmahjongg-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmahjongg-18.12.0.tar.xz";
+      sha256 = "1zv4dljkj1i4hxmy1cnyzpnipvdh6dmp6msmivgbsaz7yra1zqlx";
+      name = "kmahjongg-18.12.0.tar.xz";
     };
   };
   kmail = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz";
-      sha256 = "12097jncdx5zdsr99lmsvhiymarymgbd004vmxm6rni0hq1aqzkl";
-      name = "kmail-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmail-18.12.0.tar.xz";
+      sha256 = "0ivzl7cpjcavqybbd5jfd9gk7qfvnfrly8gi20lwg97s07cih42x";
+      name = "kmail-18.12.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kmail-account-wizard-18.12.0.tar.xz";
+      sha256 = "04q3yrbarqqw5wd8waaacd4kb409y8k6rbwk0lsrr4gvs7b5h4jg";
+      name = "kmail-account-wizard-18.12.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz";
-      sha256 = "196cjbnzqcp1ayqpn4vy8ah55nskhv07xrfrm8h0baxj90jd01xn";
-      name = "kmailtransport-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmailtransport-18.12.0.tar.xz";
+      sha256 = "0i3rgw4pf143jnkxnds84j8yg7smhgf2c5qkc1vk37i05vg81r76";
+      name = "kmailtransport-18.12.0.tar.xz";
     };
   };
   kmbox = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz";
-      sha256 = "0sjl64cjr2dxvjklpdl2p25vjbvzi0w42m5s3fzlqam9avmckfia";
-      name = "kmbox-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmbox-18.12.0.tar.xz";
+      sha256 = "03krrgzbvvhn0xcmbhx4whk347pxr26gqhnxh7mg82w5pzx7y6gm";
+      name = "kmbox-18.12.0.tar.xz";
     };
   };
   kmime = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz";
-      sha256 = "00jxsnwkx4c9x1cm7w6r5z39d4962d0w6b8irdczix4r660xf56x";
-      name = "kmime-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmime-18.12.0.tar.xz";
+      sha256 = "0kh1v62xxca6i6g48xznqrxfw4wfwqcbv338m0ybqr06w0kgcfr2";
+      name = "kmime-18.12.0.tar.xz";
     };
   };
   kmines = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz";
-      sha256 = "0csjr16s6jjj6z0963kc5jqwywjf9mvsa8c7x751h76kci1x53b0";
-      name = "kmines-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmines-18.12.0.tar.xz";
+      sha256 = "0lgzh1pa9g807jdq16k0a9n2akqgad0vgpx1zms6ldnaqvr7mm6w";
+      name = "kmines-18.12.0.tar.xz";
     };
   };
   kmix = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz";
-      sha256 = "1i5wgdmr8sml9cqjlgmi2i4v8lgksa7pnp91cgj75bmcy68sv0gj";
-      name = "kmix-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmix-18.12.0.tar.xz";
+      sha256 = "09m1d62w912ly6r8874b6ccimwdf6i9p2fyfb3pa5axc8d01lca9";
+      name = "kmix-18.12.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz";
-      sha256 = "0drpzdsry3xj4wm50850wf9rg3banbfaspbrmj1vwinbyz6f7pwz";
-      name = "kmousetool-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmousetool-18.12.0.tar.xz";
+      sha256 = "00nwk11w7ljn22bfh06l109gw8yhl9vccgwimqhyplq0p8c3cnb0";
+      name = "kmousetool-18.12.0.tar.xz";
     };
   };
   kmouth = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz";
-      sha256 = "0ywadz614w308vsss7b25xx4ddqyabr15miz9x7izffh67dhvm97";
-      name = "kmouth-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmouth-18.12.0.tar.xz";
+      sha256 = "0ig1wxaxwjj6qv7k2djdzhlnbbx74yk5f1sk42qx6csprl2bgp39";
+      name = "kmouth-18.12.0.tar.xz";
     };
   };
   kmplot = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz";
-      sha256 = "1287pk524lfqvadq2rc8226v9qiwqh80fj1gjhsw6y3vhj88dpvg";
-      name = "kmplot-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kmplot-18.12.0.tar.xz";
+      sha256 = "1mn7qrqwhwna9znprhb6fb2h127lcgjkx6m9csi8g11kklj95zi0";
+      name = "kmplot-18.12.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz";
-      sha256 = "0jxzgv06mysjalm0gfig3h6a9b84nkrq1qchi47h9x8cfaspba9r";
-      name = "knavalbattle-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/knavalbattle-18.12.0.tar.xz";
+      sha256 = "16v4q2hn4d2d8iqj9mim0y8azx4nraja9a6fhym2h5nzqsz253gk";
+      name = "knavalbattle-18.12.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz";
-      sha256 = "1bg4jaijvhb312cpwrfr4chmxj3fcj3k9caw5xwzrgdgw7prrbax";
-      name = "knetwalk-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/knetwalk-18.12.0.tar.xz";
+      sha256 = "1pgk7wnll793hmjmc0r416vvrgpicyyf88g459a5ybmj28hi5xqi";
+      name = "knetwalk-18.12.0.tar.xz";
+    };
+  };
+  knights = {
+    version = "18.12.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/18.12.0/src/knights-18.12.0.tar.xz";
+      sha256 = "10p994q5rycs3p5yn6r0gn8fjj3m8gsrx2gdvzdavizbsp5xv0qb";
+      name = "knights-18.12.0.tar.xz";
     };
   };
   knotes = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz";
-      sha256 = "1cihancavh5z5781gy6h8cikwbsw2p5hb2wbwakzjs3ld31nsjcv";
-      name = "knotes-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/knotes-18.12.0.tar.xz";
+      sha256 = "1r0p5k66gadglm329dcmr6x93wr56z32r03v8zd2r4ffbvp2hvqr";
+      name = "knotes-18.12.0.tar.xz";
     };
   };
   kolf = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz";
-      sha256 = "1ngzjmlhx471rfy486fpglpihydskrvwiqnl6xrp6fw1wg9pbd6b";
-      name = "kolf-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kolf-18.12.0.tar.xz";
+      sha256 = "0j5scf9ynq71z5pcbiqm13a3asz62man5nirjxr9fcj4mb1zirfk";
+      name = "kolf-18.12.0.tar.xz";
     };
   };
   kollision = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz";
-      sha256 = "0is63m9zw8s53pf73c2a7f2wkvrsg70wk49x6rpzb28jmsgm1xi2";
-      name = "kollision-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kollision-18.12.0.tar.xz";
+      sha256 = "1zifm52q8yc2l5mqrc7wnddz9a0r1yz4dnk85c9dj2cndk8jz05p";
+      name = "kollision-18.12.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz";
-      sha256 = "101vz981kl006q8kirs9d9bsp1bpjzcl22bbswgjny6niqlzd5lm";
-      name = "kolourpaint-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kolourpaint-18.12.0.tar.xz";
+      sha256 = "1m0j0bdcrhhk8k1imnz7xm33yi8dcbsx432866ikh31l68i44wgc";
+      name = "kolourpaint-18.12.0.tar.xz";
     };
   };
   kompare = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz";
-      sha256 = "0ksdf5c6a3rhq0r8g8hiai53pzk37jiicislfik6y8f71rq0crqv";
-      name = "kompare-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kompare-18.12.0.tar.xz";
+      sha256 = "02f4laclz3vhgbyzfxhi3f79k62z27fwa5qhdwwsvbn1xlgzbpx4";
+      name = "kompare-18.12.0.tar.xz";
     };
   };
   konqueror = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/konqueror-18.08.1.tar.xz";
-      sha256 = "0bz9vyagcrm7yihrx464hkf30y5rx6p9cvx8hq0sblvb7m4308y7";
-      name = "konqueror-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/konqueror-18.12.0.tar.xz";
+      sha256 = "0yzldqi0i1hiw33ppiccn8vpvy5ygf2vf4m3awfcj2376bzz7d4r";
+      name = "konqueror-18.12.0.tar.xz";
     };
   };
   konquest = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz";
-      sha256 = "1y3afkna2xg47qk9iwh3gsxbp1plf5y7k87svk8nzbh6aa8pillx";
-      name = "konquest-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/konquest-18.12.0.tar.xz";
+      sha256 = "1w7r1a7ilakz9k0f1z4jrfsjscf9z8l18rdfry5b1h8zz70j5j0z";
+      name = "konquest-18.12.0.tar.xz";
     };
   };
   konsole = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz";
-      sha256 = "05i9mkw4ygpy6ilqkkm5s7m9kva9ds0gr5gszci7z52m7y67s27d";
-      name = "konsole-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/konsole-18.12.0.tar.xz";
+      sha256 = "04qmldzfb0qjwddz56nv20gffi8z6vhm0vsvqd59q5nhkj9shnr3";
+      name = "konsole-18.12.0.tar.xz";
     };
   };
   kontact = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz";
-      sha256 = "136sfr6gwf2cdlc54hc5p1wzcrjpnan0rzmzs21cwpp9gsvmsjvq";
-      name = "kontact-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kontact-18.12.0.tar.xz";
+      sha256 = "0i9hj2rrwa5vzzh7p586d7vkzgk69inq3c7bvvjr6lhy0xrcy9cb";
+      name = "kontact-18.12.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz";
-      sha256 = "1w96wyr5kinaghnaima1pcq5hz8qyzvvyjpsk3dg8h3is86npvkb";
-      name = "kontactinterface-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kontactinterface-18.12.0.tar.xz";
+      sha256 = "05kx0jrxh13f42az6p9kj90wyqjl3ansqni9pa06fd1klq0ssncz";
+      name = "kontactinterface-18.12.0.tar.xz";
     };
   };
   kopete = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kopete-18.08.1.tar.xz";
-      sha256 = "0i38hvnp1qiwva6gd3p7zs962bhi5fviysr8wzm7296f1hv1rz4k";
-      name = "kopete-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kopete-18.12.0.tar.xz";
+      sha256 = "1xzriv2zqpf7vzny2k7qn39slx0b6cls8414c757ppd9ai4yh32a";
+      name = "kopete-18.12.0.tar.xz";
     };
   };
   korganizer = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz";
-      sha256 = "0wdpcjar64f8bii3xbbj08dfnd0290xwdvlr09p1pfmlllp09l0v";
-      name = "korganizer-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/korganizer-18.12.0.tar.xz";
+      sha256 = "0pk8psl90xmb06y0h87ar35kbqr9pjl31l05h01ig32w1vr0rw8c";
+      name = "korganizer-18.12.0.tar.xz";
     };
   };
   kpat = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kpat-18.08.1.tar.xz";
-      sha256 = "0cmdfmd8pcwwwq4hjcfjscdl36p9gmw9shmqimjnqm60i5ivlz65";
-      name = "kpat-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kpat-18.12.0.tar.xz";
+      sha256 = "18q0pa4aijjkgjcg3v1v7ap2nvyavqsgh4s672v74jrxijd353gw";
+      name = "kpat-18.12.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz";
-      sha256 = "0v47hb9nvx3bq3ybsqng6546qxk5yi66kd0mm2g7bdx9iq060x0j";
-      name = "kpimtextedit-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kpimtextedit-18.12.0.tar.xz";
+      sha256 = "0fg3cfh6v2hkhca9yb2kcvc9rq7f94a2wxkyi6cx88r3k3plh212";
+      name = "kpimtextedit-18.12.0.tar.xz";
     };
   };
   kpkpass = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kpkpass-18.08.1.tar.xz";
-      sha256 = "11d125rd35p44phksxrbzaixasgrsa4z9ym98h69ylyk2mm8h9lk";
-      name = "kpkpass-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kpkpass-18.12.0.tar.xz";
+      sha256 = "07rmjzgkww405f0f16w3fgd5kwz335xbl9gjlc1lkh6lhddmbjc6";
+      name = "kpkpass-18.12.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz";
-      sha256 = "1qki34i42hzr0zg0hydg4axsakfl7fydl23sn2xlvxyixw8yvcwi";
-      name = "kqtquickcharts-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kqtquickcharts-18.12.0.tar.xz";
+      sha256 = "01vdg2l48521pgkkx7h1vkgbrjl7gpzzinldk3aa7ki0997rff6h";
+      name = "kqtquickcharts-18.12.0.tar.xz";
     };
   };
   krdc = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz";
-      sha256 = "05fkpwcl1ivprvqy8x1h8akc2fxqnfh80vbis1k1gy8wanizigg9";
-      name = "krdc-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/krdc-18.12.0.tar.xz";
+      sha256 = "0yvk15grdk82flf7s9zsfgfhrmcy9wvcjhgdqjng2m9hd9sviix4";
+      name = "krdc-18.12.0.tar.xz";
     };
   };
   kreversi = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz";
-      sha256 = "1srn6czbhmlglnmnkg9pl9qs1b98ckfralydivk14y40m24s4j0b";
-      name = "kreversi-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kreversi-18.12.0.tar.xz";
+      sha256 = "04mpkpa8lar7l8blrgkz9n5xzq0br15qxxginh3hgp9vcp83njpb";
+      name = "kreversi-18.12.0.tar.xz";
     };
   };
   krfb = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz";
-      sha256 = "0p4jyl8dya1xvhisv30h86hnjyjc9sqaqj0d2zx447nqm479k9kw";
-      name = "krfb-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/krfb-18.12.0.tar.xz";
+      sha256 = "107z3bwq5xb2l4p88qpv9zibjzbgdbhf3d13bp220vnpwkwaxhpm";
+      name = "krfb-18.12.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/kross-interpreters-18.12.0.tar.xz";
+      sha256 = "1xr7cb3v40lm2wh78vhzxw3v34g52ngrd1baf4g4yi00y85y42bf";
+      name = "kross-interpreters-18.12.0.tar.xz";
     };
   };
   kruler = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz";
-      sha256 = "13gksm8mpnlvsi5v4a4fpbqb4mxq3l6giycwryi0qrh6bw33xak9";
-      name = "kruler-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kruler-18.12.0.tar.xz";
+      sha256 = "0ms875n8rr19lvvbmq7jjbbgd4l4p4k8fqxhay7wil2mgdpkd087";
+      name = "kruler-18.12.0.tar.xz";
     };
   };
   kshisen = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz";
-      sha256 = "07w7rps4wh8ibhjnk1s80x9p1mvnl5yw37fnjz3byknk2a10lcm4";
-      name = "kshisen-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kshisen-18.12.0.tar.xz";
+      sha256 = "0bd9wbn343glgsf6qnyqqdhqrkw61lywgnjslsmc4bb1parka8ww";
+      name = "kshisen-18.12.0.tar.xz";
     };
   };
   ksirk = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz";
-      sha256 = "0rqjxfrnbbmcx07l0rlyfv8mlka5hm4a59q8zsk6x2vii18yhi49";
-      name = "ksirk-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksirk-18.12.0.tar.xz";
+      sha256 = "1nm8y05im0h6vdkdqlbh21ci68dalan7qmjiiwamrzc5dsvh9lwi";
+      name = "ksirk-18.12.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz";
-      sha256 = "0kznmx1qbv3kf0cqxwqgfwy1k79awrf6v46ni97h2fwrw90af9w9";
-      name = "ksmtp-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksmtp-18.12.0.tar.xz";
+      sha256 = "1caqqml7q41rk49mxq0wj439h87ln827jvxsbiv11qphkp6041y4";
+      name = "ksmtp-18.12.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz";
-      sha256 = "0l0b94mx948zas3q27qn2dpvwfiqyd08zv2izl947prwg4mvmb0q";
-      name = "ksnakeduel-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksnakeduel-18.12.0.tar.xz";
+      sha256 = "06acl0bc87fcixkj67l4n4csa060lnaqkh8p3s7r3zccsy660ya4";
+      name = "ksnakeduel-18.12.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz";
-      sha256 = "1fjk0i2f72kzzg321w96989nqw0zfvv9iyv28ywg2pjb62nj9z2x";
-      name = "kspaceduel-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kspaceduel-18.12.0.tar.xz";
+      sha256 = "08dbmwbjqy8d0xidxipadndi0lxm1n2h0dxksjk8imsprz5r4j2l";
+      name = "kspaceduel-18.12.0.tar.xz";
     };
   };
   ksquares = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz";
-      sha256 = "0m30yw3hwh9jmwfwabnmjg2l19q4c4b8qcxp2ywp2xzxggvs3ssd";
-      name = "ksquares-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksquares-18.12.0.tar.xz";
+      sha256 = "0a6kf3arxvakd7mcr6xxasls8gmgc16gsnm0bjvviaxfc9f3wx8x";
+      name = "ksquares-18.12.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz";
-      sha256 = "1ma0009prjmi59jym0qbfqan7iyp3h4pa7q5sdqykk77mlqm1z81";
-      name = "ksudoku-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksudoku-18.12.0.tar.xz";
+      sha256 = "1bm4lx5w4d3drgydqz2wxi3gh2778q8nl3k6ac4pm4iq8amgmgi6";
+      name = "ksudoku-18.12.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz";
-      sha256 = "0c05gzqn51mg7ag6nyir1z3jdy5wd4bfka8lx2gigf6kjqyq4yny";
-      name = "ksystemlog-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ksystemlog-18.12.0.tar.xz";
+      sha256 = "0gh83ih9y0ydhm4g2drbcjkqh58g5a1flg1zqxr7rak8kf1pchnm";
+      name = "ksystemlog-18.12.0.tar.xz";
     };
   };
   kteatime = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz";
-      sha256 = "0przpgn2kwvnmfsqxncb1wx4xxr696j6zpgwwx3bhqfd89dc0bgm";
-      name = "kteatime-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kteatime-18.12.0.tar.xz";
+      sha256 = "1p4a3kahsjgfw9f6mw16bzz1bzk1jnssgvhzqh9ragqyp5qpn3s3";
+      name = "kteatime-18.12.0.tar.xz";
     };
   };
   ktimer = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz";
-      sha256 = "0bwkxl619d4gar2piyk63lds85sz43gghg02cifsjvdvjfqfqbhp";
-      name = "ktimer-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ktimer-18.12.0.tar.xz";
+      sha256 = "1lv64bk64k7nb2y9qahc45cg3n51qrb4ahk5l9mrbj9q5yvm1acs";
+      name = "ktimer-18.12.0.tar.xz";
     };
   };
   ktnef = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz";
-      sha256 = "184isgr9c5amwrlzlkji9q0dhl06936r2axdn5kjy2shbn7j7hz2";
-      name = "ktnef-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ktnef-18.12.0.tar.xz";
+      sha256 = "1ca9gga65h9kygfcsr1yvy50ccq3587scml36p740iwrxms8lrcb";
+      name = "ktnef-18.12.0.tar.xz";
     };
   };
   ktouch = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz";
-      sha256 = "1z23i7h6s31b3az6fk22whp1zs7np20wji5bcwvck1cv5a0nlpvc";
-      name = "ktouch-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ktouch-18.12.0.tar.xz";
+      sha256 = "1221xagypm1j56lx2g4845wrw0w01f2s4x8r3jwr32wzxvi8bxs3";
+      name = "ktouch-18.12.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-accounts-kcm-18.12.0.tar.xz";
+      sha256 = "0bx97zalwk78340klgh87rb5fadma8flg6q0bg436j01dsld0s0p";
+      name = "ktp-accounts-kcm-18.12.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-approver-18.12.0.tar.xz";
+      sha256 = "1cvixdcws126x7wll57dv6w78p3fb06lgd411i9jf7n02sx3l09q";
+      name = "ktp-approver-18.12.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-auth-handler-18.12.0.tar.xz";
+      sha256 = "0zfdq7q1v48vcaj4raz5r6l400xhz7ngjylg3kd7jabarljjv2gs";
+      name = "ktp-auth-handler-18.12.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-call-ui-18.12.0.tar.xz";
+      sha256 = "1q9z6g0djk7mszy48bwrw4mvja15xkcg6x88391sw1lvanps9hmk";
+      name = "ktp-call-ui-18.12.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-common-internals-18.12.0.tar.xz";
+      sha256 = "00smq4q4m8hvvfaz0b9iyxxz3dl15qs0is6zbkh4scvxxp54n056";
+      name = "ktp-common-internals-18.12.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-list-18.12.0.tar.xz";
+      sha256 = "0kyllg9f0kj1w00jhk2khmsfdqqixnz8s74jvg5fjw8bbibjbn3y";
+      name = "ktp-contact-list-18.12.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-runner-18.12.0.tar.xz";
+      sha256 = "1hpapg3fnmwsgai7jb9kbh5f71hp8qfzphgczcmf6h5151g2l6jj";
+      name = "ktp-contact-runner-18.12.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-desktop-applets-18.12.0.tar.xz";
+      sha256 = "1dfcjjmbplgx7b45q9vklq8kvc0ajclzy6cmyq3maj577747h5xz";
+      name = "ktp-desktop-applets-18.12.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-filetransfer-handler-18.12.0.tar.xz";
+      sha256 = "1dzrzv6nmv6ighiqq8hi9crasnqdbqimg3qdssyryxrqs64m9h29";
+      name = "ktp-filetransfer-handler-18.12.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-kded-module-18.12.0.tar.xz";
+      sha256 = "0720yayzz4rwrmplwjpq6bfb86k0jhmxc5k25yqj9fg7n6w2qsx3";
+      name = "ktp-kded-module-18.12.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-send-file-18.12.0.tar.xz";
+      sha256 = "0jfy8qqm6n5pm2s24pbvxmmcibxxq71gggg4xf0miqkhdvx5b9kw";
+      name = "ktp-send-file-18.12.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/ktp-text-ui-18.12.0.tar.xz";
+      sha256 = "14ln91srqfkk0fgp197wvlqxgagw23x4h94j1v1m51pia0v6226b";
+      name = "ktp-text-ui-18.12.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz";
-      sha256 = "176fdw99ni02nz3kv62dbiw7887a5kvmxsm8bg3viwyymcs8aay8";
-      name = "ktuberling-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/ktuberling-18.12.0.tar.xz";
+      sha256 = "0ms20qffd5mwlrxbd8ajb0lx3ny7mhlx25n59w2paq2x313qcsfk";
+      name = "ktuberling-18.12.0.tar.xz";
     };
   };
   kturtle = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz";
-      sha256 = "1r3w5hbzw2f4794j690wgm7x3dfxfyqnaylhjcrxqmqydkc54w2c";
-      name = "kturtle-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kturtle-18.12.0.tar.xz";
+      sha256 = "0ik44282gc6rmzsg6xv4fvpx1yzb4y4gv7jmslxgwi6rwc1q0m5v";
+      name = "kturtle-18.12.0.tar.xz";
     };
   };
   kubrick = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz";
-      sha256 = "0nwd0n8rx7dzbwjvkhnmvb2g4g7lasng7745klcdwk40ww223b60";
-      name = "kubrick-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kubrick-18.12.0.tar.xz";
+      sha256 = "0h4jx41wawbifdx7mzqbsx9nfrn2r9rkb01y0d63f5s2835hs2yc";
+      name = "kubrick-18.12.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz";
-      sha256 = "08hr7ii6dybbmipppay2gxiwak8rqbrxrwbjz0206cyav16bbp7q";
-      name = "kwalletmanager-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kwalletmanager-18.12.0.tar.xz";
+      sha256 = "0znbrp1hk7jky9y3p9bc47sqn8mqd54x5j8kw52sg9v4428aag09";
+      name = "kwalletmanager-18.12.0.tar.xz";
     };
   };
   kwave = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz";
-      sha256 = "1gsxzpf8ij7bw6s4dbdl8kvyz21wy76dxi4wqwdggi29gvxzpi76";
-      name = "kwave-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kwave-18.12.0.tar.xz";
+      sha256 = "00h5i0iax9hd79pw71wvv4p75rv6z61zpfg2s4n6zqjx8c312rhh";
+      name = "kwave-18.12.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz";
-      sha256 = "0bkxvw2g64r2k87m05mdxwh25lbixcga406x9i64z5dmgpsb7d9m";
-      name = "kwordquiz-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/kwordquiz-18.12.0.tar.xz";
+      sha256 = "0a0i7khsvn68rxwwm3q5h4ymf6j3bdm3sc3q3z74rj3n0s03dnww";
+      name = "kwordquiz-18.12.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz";
-      sha256 = "0axmf5ph5ahs4124fi016hjj559472k2apgfsbnf9q80d6y25lgf";
-      name = "libgravatar-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libgravatar-18.12.0.tar.xz";
+      sha256 = "077qkpsg2v77mzg2q5jw7fr6sss07x5998f9x65pqgqlc9b6h494";
+      name = "libgravatar-18.12.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz";
-      sha256 = "1qy3zid9n7irkiz6vizmhwljrg3wcxxgcch58nmacg7fdxwcnnn1";
-      name = "libkcddb-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkcddb-18.12.0.tar.xz";
+      sha256 = "15dmbb5cvr9rcaspizrc2laxkwhfrsnlczdns0biq3lysajblwfa";
+      name = "libkcddb-18.12.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz";
-      sha256 = "075i81gpb4c1wgzbv6nnvhgkz2sww0y5zqh8sxw67r46rz4rjwak";
-      name = "libkcompactdisc-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkcompactdisc-18.12.0.tar.xz";
+      sha256 = "1jrw16hbp8fn48l70gqxpiy6iwpisk087sixvs3cbn94dmczgpka";
+      name = "libkcompactdisc-18.12.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz";
-      sha256 = "0fp01s9fw3m9li5v8cd2zmvy6xrysdqddzcal1xm5df2qj6xnk1d";
-      name = "libkdcraw-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkdcraw-18.12.0.tar.xz";
+      sha256 = "0n3b5blda31gf38hyplpb29mp6aa187adgqqyijzhnvvm1mfwa5z";
+      name = "libkdcraw-18.12.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz";
-      sha256 = "05xqmg0g08gd45d1q1wblyj5002fvcs72iazif6j7lj9zy60x3qw";
-      name = "libkdegames-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkdegames-18.12.0.tar.xz";
+      sha256 = "01i00n4cjpq1srag5ca8siw6rjc1gwhdzfib6cg3xf9my5sl0hbv";
+      name = "libkdegames-18.12.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz";
-      sha256 = "0rq7y5r15d1r8s9v1mip780xyh11011j1w2id0cbll9a3fhjfgy9";
-      name = "libkdepim-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkdepim-18.12.0.tar.xz";
+      sha256 = "188jf33dihrrq0zzmdddg6sx4ck2lp5gj1br4xfsqgrc1qf9z5hd";
+      name = "libkdepim-18.12.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz";
-      sha256 = "1nchaip5rcgvazbn3bsiycsa5wcvqj3c0xz48isaz1rmirw4dkan";
-      name = "libkeduvocdocument-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkeduvocdocument-18.12.0.tar.xz";
+      sha256 = "1fa6pgpcarqabc18bph4lijsx1paf1a1arisrlf5mgkivg2yvy2k";
+      name = "libkeduvocdocument-18.12.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz";
-      sha256 = "0v0g626hjpksb8kxgp0kzx84a6hf3qq66if2hxh82kis5xdzbj4l";
-      name = "libkexiv2-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkexiv2-18.12.0.tar.xz";
+      sha256 = "1x3pxcii60kn8c1bmgrra9h4ahblwwp5vjd6p2wg2f4jkpmjz1ha";
+      name = "libkexiv2-18.12.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz";
-      sha256 = "0rsfk8n4z67m371vnglin16l33ankv0i60l07c8znr7jllkyzf7r";
-      name = "libkgapi-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkgapi-18.12.0.tar.xz";
+      sha256 = "0d79p7f6gmb8vjbp2nmc5rz9rabj08np96jbqf4wzgcjcxxi64kp";
+      name = "libkgapi-18.12.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz";
-      sha256 = "1mnf43bpklyxh1schphndc7izknnzn3ymwppq4anysb9k603s7n4";
-      name = "libkgeomap-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkgeomap-18.12.0.tar.xz";
+      sha256 = "1pmicj4p3d17i7nj6alns8a24ay0xrs852d1x1xrcdkv7h7y5hvi";
+      name = "libkgeomap-18.12.0.tar.xz";
     };
   };
   libkipi = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz";
-      sha256 = "166njf2w6qy30xiccagnpsb7ggcvqmdkp1djahfwmvjwqqxqq9ic";
-      name = "libkipi-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkipi-18.12.0.tar.xz";
+      sha256 = "0cfn09x7splycpqwz0fy52lnkpc9dsq6i2j2q3r4fjgpblj9m86h";
+      name = "libkipi-18.12.0.tar.xz";
     };
   };
   libkleo = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz";
-      sha256 = "1q1s335rmh2k2hmx4k67ik9wy2wa4n271fv21k6sg0l3h58z3fc6";
-      name = "libkleo-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkleo-18.12.0.tar.xz";
+      sha256 = "14iy3wis79rfri7najbyvx94ym2aa7si8h35rx4977flhc80nzin";
+      name = "libkleo-18.12.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz";
-      sha256 = "0vvmm0mp2s5bl28vn7nq49b3izfy1myxx7c55qq6h3pmml70alp9";
-      name = "libkmahjongg-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkmahjongg-18.12.0.tar.xz";
+      sha256 = "12pki8hkcv8ihcwwdnhpcz21h4676zra5qwf56aa5cj5qpdgf4gx";
+      name = "libkmahjongg-18.12.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz";
-      sha256 = "114w3xcd31i0y5fk4cr9d075mmvx746hsnm6grc8mkhi6diplxs1";
-      name = "libkomparediff2-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libkomparediff2-18.12.0.tar.xz";
+      sha256 = "0xbccawxqk29f2qvr6hcbpan4fhahzksg7bl7jnv8xsv01lbm3rs";
+      name = "libkomparediff2-18.12.0.tar.xz";
     };
   };
   libksane = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz";
-      sha256 = "0vi0kph8klnm3br9f9ifs5zgnncw83wrvk3kmxc412i28216qgf1";
-      name = "libksane-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libksane-18.12.0.tar.xz";
+      sha256 = "1vdxyik47fij9mm1fs6p9bn0n56wsajzqd5am03nrwkwanva25xj";
+      name = "libksane-18.12.0.tar.xz";
     };
   };
   libksieve = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz";
-      sha256 = "06agi9wkj455sx0inn6hiahmqlfjaa3ffr8i7zfs2rfzw78qvg20";
-      name = "libksieve-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/libksieve-18.12.0.tar.xz";
+      sha256 = "1hwasycmfnjzqyxfh0kir1jhx002qci6dclv4cysv1ww33wsyskp";
+      name = "libksieve-18.12.0.tar.xz";
     };
   };
   lokalize = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz";
-      sha256 = "1k5vn3jnvqvdc4bn1hdfjjp3snfcpc5i3925kns760vpvdm4a9in";
-      name = "lokalize-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/lokalize-18.12.0.tar.xz";
+      sha256 = "07rnx40836xncndqbcvpircvgnaywmwzbkfl16665ciphxrilm6q";
+      name = "lokalize-18.12.0.tar.xz";
     };
   };
   lskat = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz";
-      sha256 = "11snjlsmcsh4nkcfdzjdl0jia8g350xj2hgilqk5b9jir0j8rsyp";
-      name = "lskat-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/lskat-18.12.0.tar.xz";
+      sha256 = "1cw9z22gvyd9d44sg1qxir923q1ilmmqdgzzrh8wrb5p3m0mn0nz";
+      name = "lskat-18.12.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz";
-      sha256 = "1791ph0r5b9a0k2qgjrbxsz8drg23v5bdn832d695yy9q9rgxvwx";
-      name = "mailcommon-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/mailcommon-18.12.0.tar.xz";
+      sha256 = "0aigxd6pkw9xwy8q1kx9vqp17vljrzwv8skq6qmh9fvkjiampw84";
+      name = "mailcommon-18.12.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz";
-      sha256 = "1rnmhfi54a9vlmvqjv2hsj967q886dkbv6nqn5imz11s8a97anb9";
-      name = "mailimporter-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/mailimporter-18.12.0.tar.xz";
+      sha256 = "06nsn7vfgrvfgrmx4qyy21rq4a8bj5vxi4hrfd7377pd1sx58qvi";
+      name = "mailimporter-18.12.0.tar.xz";
     };
   };
   marble = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/marble-18.08.1.tar.xz";
-      sha256 = "1vc6l68fvqdncvpmd8995v4hawi4w4zn3yjfpnghgvmvs30bak4p";
-      name = "marble-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/marble-18.12.0.tar.xz";
+      sha256 = "0ljzv2ygpqwz4a387ja280p7cd47bkjv7m40c3yn2yijiladyffv";
+      name = "marble-18.12.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/mbox-importer-18.12.0.tar.xz";
+      sha256 = "08rfgf5zcp6vhd78rj2yikmzrgddhdn7cykw9pqfgmhy0nci14sm";
+      name = "mbox-importer-18.12.0.tar.xz";
     };
   };
   messagelib = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz";
-      sha256 = "17z8c60dnhwzgpls3b6hsvyjgjpjybw7cfkc05xn1yihi5gr2rxs";
-      name = "messagelib-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/messagelib-18.12.0.tar.xz";
+      sha256 = "189bn6lblqq4vr1a2pk99pj3y3xh5q8xxdrg2hrdcc10wmjk9knv";
+      name = "messagelib-18.12.0.tar.xz";
     };
   };
   minuet = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz";
-      sha256 = "06jwrra25v2al0jw7dvp7h41jmw48d784ky74xi9lx4ma4h4vsvg";
-      name = "minuet-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/minuet-18.12.0.tar.xz";
+      sha256 = "1hma6r3z7k382gpd0wccxdbss1a17gvkb5fvdaii5xm7c9ca63r7";
+      name = "minuet-18.12.0.tar.xz";
     };
   };
   okular = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/okular-18.08.1.tar.xz";
-      sha256 = "1in053a3ir4qw2fabrv69g6kxr2hmdwq360kikmwdgsb6a7a8sjk";
-      name = "okular-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/okular-18.12.0.tar.xz";
+      sha256 = "184r6lqsyx1x63zjirn709w0pd81hyh4f5j6m37m5hr6dg8l6mli";
+      name = "okular-18.12.0.tar.xz";
     };
   };
   palapeli = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz";
-      sha256 = "17c6xlmjz8nnnvp4xa27yzrx2vrsjlznjm2awj70z923js5kzfhl";
-      name = "palapeli-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/palapeli-18.12.0.tar.xz";
+      sha256 = "09fbsw0id1p81zvd7kfimjx81m3zz36kdvd40jwbsffrqi682iww";
+      name = "palapeli-18.12.0.tar.xz";
     };
   };
   parley = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/parley-18.08.1.tar.xz";
-      sha256 = "1bwj806qm2g3n57f1svaz6x5y238xl0b3pmp4cg29a9c090gcj0r";
-      name = "parley-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/parley-18.12.0.tar.xz";
+      sha256 = "1mnp835g1b7vwz5gnzl78x3s80sw1ps4gsddg4ywrdkjr5b099gk";
+      name = "parley-18.12.0.tar.xz";
     };
   };
   picmi = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz";
-      sha256 = "0bc3zs5ql1yfriq3pbxc0cb010n8rygqglpz8c2qinnsgf9wb305";
-      name = "picmi-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/picmi-18.12.0.tar.xz";
+      sha256 = "0y6fnh8629zj98ih4cwgy31gknpc6ipn4aqxcjg8hfic8jxnppyp";
+      name = "picmi-18.12.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz";
-      sha256 = "0h8g374bdnf9nm43flz9wg1ddcdppqxng1vq58vqlviiy32qf86p";
-      name = "pimcommon-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/pimcommon-18.12.0.tar.xz";
+      sha256 = "1rchq4clw6r08vm6cw9kw52bn7z1nfjmp2lmi0sq3pjfqlxif2zc";
+      name = "pimcommon-18.12.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/pim-data-exporter-18.12.0.tar.xz";
+      sha256 = "0ywxcd02crwjrqx8ikkc4rgx1z93zvzqadqg3sjh636iz8svv5jc";
+      name = "pim-data-exporter-18.12.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/pim-sieve-editor-18.12.0.tar.xz";
+      sha256 = "144frbny1pq1viam527b96fxalc9iv5ppqrrvpndqsvjrlsrll45";
+      name = "pim-sieve-editor-18.12.0.tar.xz";
     };
   };
   poxml = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz";
-      sha256 = "1zazxxh4j8ihlb5v33b5wgj4ddqqhd809lzhxq28dq0mg7wvqcm8";
-      name = "poxml-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/poxml-18.12.0.tar.xz";
+      sha256 = "1gnk9rzpa6rgff9xhawizx8cgsw84jqkpkr8aa2ki8zs4s6n9zl6";
+      name = "poxml-18.12.0.tar.xz";
     };
   };
   print-manager = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/print-manager-18.12.0.tar.xz";
+      sha256 = "03jgjj7xfc57bsq3nx3l836pmpqywlchqis9109k5cpygqvgqkr5";
+      name = "print-manager-18.12.0.tar.xz";
     };
   };
   rocs = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz";
-      sha256 = "1kchipj3q29zfp60l81q52m6gb4fcmawcl42rvzr4mxf4h7dw72n";
-      name = "rocs-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/rocs-18.12.0.tar.xz";
+      sha256 = "1gg0xg732wb9vzf1c69r5cqqhayxygv2brvbk3gvq6b201hv1q90";
+      name = "rocs-18.12.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/signon-kwallet-extension-18.12.0.tar.xz";
+      sha256 = "0izmwyv1bw4iqgyhjrsq85xg7m5bp1v9khy5fxh1mhvh52w9zq8s";
+      name = "signon-kwallet-extension-18.12.0.tar.xz";
     };
   };
   spectacle = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/spectacle-18.08.1.tar.xz";
-      sha256 = "0xvw6l0712gmb3dvq9hnyp7r160rvmvmm3mvgapj4z5c00m8a1d7";
-      name = "spectacle-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/spectacle-18.12.0.tar.xz";
+      sha256 = "0nnsv0y28pxxhvf3r76nqgmn0ncixhr8d783mm3i3a3yz1z8a45c";
+      name = "spectacle-18.12.0.tar.xz";
     };
   };
   step = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/step-18.08.1.tar.xz";
-      sha256 = "1b7cvrhdbfkqg72phbgbl15v8c4nr6b1b9fw8i1vam028a97bq8z";
-      name = "step-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/step-18.12.0.tar.xz";
+      sha256 = "0gqcwvv2xb321zx7y4bg28haqpzz5h8r7cxn6z4x5qnj6ijkx0zr";
+      name = "step-18.12.0.tar.xz";
     };
   };
   svgpart = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz";
-      sha256 = "07mm5vzd5lslr5x7r71ac3hp3s779i89nz4d84550pk0qdn3qpmb";
-      name = "svgpart-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/svgpart-18.12.0.tar.xz";
+      sha256 = "1nqbbzndbyj9ikgw7fhy52621swb5blzycd5qn9if9ymsi524217";
+      name = "svgpart-18.12.0.tar.xz";
     };
   };
   sweeper = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/syndication-18.08.1.tar.xz";
-      sha256 = "0lirbr8zb1j5kalki6v98wmcg5z25xj1wamszd81h9wlkgk5aqd0";
-      name = "syndication-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/sweeper-18.12.0.tar.xz";
+      sha256 = "0pq991zxdg1816j8dbhc3vjxj84plif17zpvp3smiscr4n6x209h";
+      name = "sweeper-18.12.0.tar.xz";
     };
   };
   umbrello = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz";
-      sha256 = "16p283jz5v5j40i1i7c9fk36bhs2k30rk17l3nikmf0qd7j5n6ir";
-      name = "umbrello-18.08.1.tar.xz";
+      url = "${mirror}/stable/applications/18.12.0/src/umbrello-18.12.0.tar.xz";
+      sha256 = "15r5wv0k1dwfxp4l2mc4886s17ck390a2mpy1l08jvg93w1cbm3f";
+      name = "umbrello-18.12.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.08.1";
+    version = "18.12.0";
     src = fetchurl {
-      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";
+      url = "${mirror}/stable/applications/18.12.0/src/zeroconf-ioslave-18.12.0.tar.xz";
+      sha256 = "1qvmsr88kl1gq3wrn5g4wf4ka24pbbhdy54c8n25bhxd8pv0rd07";
+      name = "zeroconf-ioslave-18.12.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix
deleted file mode 100644
index 42782d449d5..00000000000
--- a/pkgs/applications/kde/syndication.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  mkDerivation, lib, kdepimTeam,
-  extra-cmake-modules, kdoctools,
-  kio
-}:
-
-mkDerivation {
-  name = "syndication";
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kio ];
-  outputs = [ "out" "dev" ];
-}

From 8ff8e7e8f3ff9fe0a3ee9445c1aebf69d755c04b Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 11:12:57 +0300
Subject: [PATCH 1866/2793] phpPackages.ast: 0.1.5 -> 1.0.0

---
 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 481bdcdf81c..08a98604870 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -27,9 +27,9 @@ let
   };
 
   ast = buildPecl {
-    name = "ast-0.1.5";
+    name = "ast-1.0.0";
 
-    sha256 = "0vv2w5fkkw9n7qdmi5aq50416zxmvyzjym8kb6j1v8kd4xcsjjgw";
+    sha256 = "0abccvwif1pih222lbj2z4cf9ibciz48xj35lfixyry163vabkck";
   };
 
   couchbase = buildPecl rec {

From 4bc630aa65070152e52cf56074e736e37c68a302 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:17:55 -0800
Subject: [PATCH 1867/2793] shc: 4.0.0 -> 4.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/shc/versions
---
 pkgs/tools/security/shc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index c32addd8ffc..42a4b04ddfe 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "shc-${version}";
-  version = "4.0.0";
+  version = "4.0.1";
   rev = "${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "neurobin";
     repo = "shc";
-    sha256 = "1ghvggrygvs1nxjbmq4pqskfr3mzjhcprql9qfkyhz6ii6si75v8";
+    sha256 = "03f5hq1wkwfcm6b1q9956zqd05l2am91ij8lxbc8akiwz14dmkw7";
   };
 
   meta = with stdenv.lib; {

From 1122901b973f1c741d30f02c79ab4e1318b1b3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Dec 2018 08:19:39 +0000
Subject: [PATCH 1868/2793] stunnel: remove stunnel3 wrapper

---
 pkgs/tools/networking/stunnel/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 4bbcb7beacd..e00b5335d35 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
+  postInstall = ''
+    # remove legacy compatibility-wrapper that would require perl
+    rm $out/bin/stunnel3
+  '';
+
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"

From b6b1b86d7cc634209c1fc03fb25e6b2f8b41afe6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:35:15 -0800
Subject: [PATCH 1869/2793] tortoisehg: 4.8 -> 4.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/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 41027ce6dec..b7334ebbe5e 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.8";
+    version = "4.8.1";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "1zp74nb24pq0qrla5zf7kridxb8rky3n25z7xya0gwp0c0d0aygh";
+      sha256 = "10s7v7mi438b8lh3rpd6da9lkwgaflpi6a0inkd8bl4b4ya38vc6";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From 6a6266a34449cea7928b52b0efb2fec9951c1bab Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 11:35:46 +0300
Subject: [PATCH 1870/2793] phpPackages.redis: 3.1.4 -> 4.2.0

---
 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 08a98604870..c08daa274af 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -216,8 +216,8 @@ let
   };
 
   redis = buildPecl {
-    name = "redis-3.1.4";
-    sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd";
+    name = "redis-4.2.0";
+    sha256 = "105k2rfz97svrqzdhd0a0668mn71c8v0j7hks95832fsvn5dhmbn";
   };
 
   v8 = buildPecl rec {

From c729c17b94a5409b11e6b61687d165642f3185c0 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 11:39:02 +0300
Subject: [PATCH 1871/2793] phpPackages.v8: 0.1.9 -> 0.2.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 c08daa274af..56f350e7c77 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -221,10 +221,10 @@ let
   };
 
   v8 = buildPecl rec {
-    version = "0.1.9";
+    version = "0.2.2";
     name = "v8-${version}";
 
-    sha256 = "0bj77dfmld5wfwl4wgqnpa0i4f3mc1mpsp9dmrwqv050gs84m7h1";
+    sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71";
 
     buildInputs = [ pkgs.v8_6_x ];
     configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ];

From 734cd2c98a310dc0bfdc919bbbe5226fd69a8e29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:39:32 -0800
Subject: [PATCH 1872/2793] sysprof: 3.30.0 -> 3.31.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/sysprof/versions
---
 pkgs/development/tools/profiling/sysprof/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index f032669990b..2fffb7dfb9c 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -16,7 +16,7 @@
 , gnome3
 }:
 let
-  version = "3.30.0";
+  version = "3.31.1";
   pname = "sysprof";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0qrzcs60m44mmj7ln9815kfgvi2pjlhmk0p4vjc0dw3pw95jrk99";
+    sha256 = "0gjcd7agxn7cb8xnm8ldss1md7njwqzklqlsxclzqm87s7klnyrg";
   };
 
   nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];

From 555489219197d5e394877cb10e29d96aa5991cf0 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 11:42:23 +0300
Subject: [PATCH 1873/2793] phpPackages.composer: 1.7.2 -> 1.8.0

---
 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 56f350e7c77..2fddf4787b2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -242,11 +242,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.7.2";
+    version = "1.8.0";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c";
+      sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089";
     };
 
     unpackPhase = ":";

From c6cb93339f16b165df57a7e49134d7a6741a49ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:53:57 -0800
Subject: [PATCH 1874/2793] snes9x-gtk: 1.56.2 -> 1.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/snes9x-gtk/versions
---
 pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index 79832227a14..a58f95875cc 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "snes9x-gtk-${version}";
-  version = "1.56.2";
+  version = "1.57";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
     rev = version;
-    sha256 = "0cbv95799gpagf6bxs1fmwmxvz5qs9g2rmmf5fsdd1cb4lryaijr";
+    sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a";
   };
 
   enableParallelBuilding = true;

From 29481937426b6d2e233adb4948471ce9aa9cc475 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 00:57:52 -0800
Subject: [PATCH 1875/2793] termtosvg: 0.6.0 -> 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/termtosvg/versions
---
 pkgs/tools/misc/termtosvg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 33af6a9d67b..1dca7f4a70b 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -2,14 +2,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "termtosvg";
-  version = "0.6.0";
+  version = "0.7.0";
 
   # tests are not available when fetching from pypi
   src = fetchFromGitHub {
     owner = "nbedos";
     repo = pname;
     rev = version;
-    sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2";
+    sha256 = "17hhdrsn9ggcrwqp2c1h2la9cwhdazfrczd7nnm5mz7w6rk25lx3";
   };
 
   propagatedBuildInputs = with python3.pkgs; [ lxml pyte ];

From 87481c2ff165b5d07624cde969e39da8f42bdbd0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 01:07:34 -0800
Subject: [PATCH 1876/2793] star: 2.6.1c -> 2.6.1d

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/star/versions
---
 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 e22043d9eb9..cbe38649503 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.1c";
+  version = "2.6.1d";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd";
+    sha256 = "1h0j8qj95a0brv7p3gxmg3z7z6f4670jzjg56kzyc33k8dmzxvli";
   };
 
   sourceRoot = "source/source";

From 42fd1728fae0eb9c9843cd3f6267dd311fa4d4db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Dec 2018 09:11:25 +0000
Subject: [PATCH 1877/2793] ocamlPackages.lablgtk3: 3.0.beta1 -> 3.0.beta2

---
 pkgs/development/ocaml-modules/lablgtk3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 6de7a26fbd6..e8e890bd85a 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -5,11 +5,11 @@ then throw "lablgtk3 is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "3.0.beta1";
+  version = "3.0.beta2";
   name = "ocaml${ocaml.version}-lablgtk3-${version}";
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1769/lablgtk-3.0.beta1.tar.gz;
-    sha256 = "08izn2kwxdz1i74m11lqkl9n50bs7sy6pl8mcq6br77znarvqb91";
+    url = https://forge.ocamlcore.org/frs/download.php/1774/lablgtk-3.0.beta2.tar.gz;
+    sha256 = "1v4qj07l75hqis4j9bx8x1cfn7scqi6nmp4j5jx41x94ws7hp2ch";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 026c0dbb1040f7f9378ce3094c460c9295d83bbc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 01:17:42 -0800
Subject: [PATCH 1878/2793] soapyairspy: 0.1.1 -> 0.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/soapyairspy/versions
---
 pkgs/applications/misc/soapyairspy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix
index af72c784135..1d8056ca1e8 100644
--- a/pkgs/applications/misc/soapyairspy/default.nix
+++ b/pkgs/applications/misc/soapyairspy/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.1.1";
+  version = "0.1.2";
 
 in stdenv.mkDerivation {
   name = "soapyairspy-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyAirspy";
     rev = "soapy-airspy-${version}";
-    sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk";
+    sha256 = "061r77vs6ywxbxfif12y6v5xkz6gcvbz9k060q12vmdh6sisdwk2";
   };
 
   nativeBuildInputs = [ cmake ];

From 463498e3fa2753ffa177d7570bdc66a192ce8d4a Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 9 Dec 2018 15:50:07 +0100
Subject: [PATCH 1879/2793] bazel: Don't perform the checkPhase, since it's
 redundant with installCheckPhase.

This change is going to be required when upgrading to Bazel 0.20.0,
because in the checkPhase we're not wrapping the Bazel binary yet to
set some necessary default arguments.
---
 .../development/tools/build-managers/bazel/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 966c91028de..60370989b5a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -180,16 +180,6 @@ stdenv.mkDerivation rec {
         --prepend=scripts/bazel-complete-template.bash
   '';
 
-  # Build the CPP and Java examples to verify that Bazel works.
-
-  doCheck = true;
-  checkPhase = ''
-    export TEST_TMPDIR=$(pwd)
-    ./output/bazel test --test_output=errors \
-        examples/cpp:hello-success_test \
-        examples/java-native/src/test/java/com/example/myproject:hello
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
 

From 6f5014e0ae8635c73387cc59b0fafa7183a89880 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 9 Dec 2018 15:53:26 +0100
Subject: [PATCH 1880/2793] bazel: 0.18.0 -> 0.20.0

---
 .../tools/build-managers/bazel/default.nix         | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 60370989b5a..15a14be7b13 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.18.0";
+  version = "0.20.0";
 
   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 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h";
+    sha256 = "1g9hglly5199gcw929fzc5f0d0dwlharkh387h58p1fq9ylayi8r";
   };
 
   sourceRoot = ".";
@@ -131,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 "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
+      sed -i -e "420 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "420 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "420 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "420 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
@@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
     cp scripts/packages/bazel.sh $out/bin/bazel
     mv output/bazel $out/bin/bazel-real
 
-    wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}"
+    wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
 
     # shell completion files
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 442d5c418f0..c3dffe9a367 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8297,6 +8297,7 @@ in
   bazel = callPackage ../development/tools/build-managers/bazel {
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+    runJdk = jdk11;
   };
   bazel_jdk11 = callPackage ../development/tools/build-managers/bazel {
     inherit (darwin) cctools;

From 8d8b443ce29076caa0f87e462edb14fbe70b0f70 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 9 Dec 2018 15:54:10 +0100
Subject: [PATCH 1881/2793] bazel_jdk11: remove.

This package is redundant, since Bazel (since the upgrade to v0.20.0),
now uses JDK 11 as the runtime JDK.
---
 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 c3dffe9a367..05dbfacb628 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8299,11 +8299,6 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
     runJdk = jdk11;
   };
-  bazel_jdk11 = callPackage ../development/tools/build-managers/bazel {
-    inherit (darwin) cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
-    runJdk = jdk11;
-  };
 
   bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
   buildifier = bazel-buildtools;

From f5b3450e887742a0d862b4eecc5cc94ef7e0e64b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 02:46:00 -0800
Subject: [PATCH 1882/2793] synthv1: 0.9.3 -> 0.9.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/synthv1/versions
---
 pkgs/applications/audio/synthv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 13560e34062..e44df51404a 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "0f58k5n2k667q8wsigg7bzl3lfgaf6jdj98r2a5nvyb18v1wpy2c";
+    sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv";
   };
 
   buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];

From 4d7ff6c04ce71dc2286bcc05557ab34b17a86bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Dec 2018 10:58:32 +0000
Subject: [PATCH 1883/2793] sysprof: also provide default icons

---
 .../development/tools/profiling/sysprof/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 2fffb7dfb9c..3945af2794d 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -28,7 +28,18 @@ in stdenv.mkDerivation rec {
     sha256 = "0gjcd7agxn7cb8xnm8ldss1md7njwqzklqlsxclzqm87s7klnyrg";
   };
 
-  nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
+  nativeBuildInputs = [
+    desktop-file-utils
+    gettext
+    itstool
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    shared-mime-info
+    wrapGAppsHook
+    gnome3.defaultIconTheme
+  ];
   buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 
   mesonFlags = [

From eb76dd37a709a1ad21fb297c005a8ac428053964 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Thu, 13 Dec 2018 20:35:50 +0000
Subject: [PATCH 1884/2793] makeStaticBinaries: add a static glibc when
 performing a mkDerivation

---
 pkgs/stdenv/adapters.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 850785cd881..7823d641344 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -31,12 +31,19 @@ rec {
 
   # Return a modified stdenv that tries to build statically linked
   # binaries.
-  makeStaticBinaries = stdenv: stdenv //
+  makeStaticBinaries = stdenv:
+    let stdenv' = if stdenv.hostPlatform.libc != "glibc" then stdenv else
+      stdenv.override (prev: {
+          extraBuildInputs = prev.extraBuildInputs or [] ++ [
+              stdenv.glibc.static
+            ];
+        });
+    in stdenv' //
     { mkDerivation = args:
-      if stdenv.hostPlatform.isDarwin
+      if stdenv'.hostPlatform.isDarwin
       then throw "Cannot build fully static binaries on Darwin/macOS"
-      else stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
+      else stdenv'.mkDerivation (args // {
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
         configureFlags = (args.configureFlags or []) ++ [
             "--disable-shared" # brrr...
           ];

From 3650f59570cd12eab38fe4062920db49c67d9afa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 02:32:04 -0800
Subject: [PATCH 1885/2793] thefuck: 3.27 -> 3.28

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

diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 1ccfc528e8f..e6fb9084359 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "thefuck";
-  version = "3.27";
+  version = "3.28";
 
   src = fetchFromGitHub {
     owner = "nvbn";
     repo = "${pname}";
     rev = version;
-    sha256 = "1lsg0g9lnpj2nidggm16b7jm4xzhg0dgy81crfzny62hah1zk0pj";
+    sha256 = "070b2sx8r0b4hry6xg97psxlikxghmz91zicg2cm6kc1yhgz4agc";
   };
 
   propagatedBuildInputs = [ colorama decorator psutil pyte six ];

From 95f11baa21499faf5d6d52a37e91457074887b8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 18:16:10 -0800
Subject: [PATCH 1886/2793] you-get: 0.4.1167 -> 0.4.1181

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 2e033c6bc82..6ca284f15a6 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.1167";
+  version = "0.4.1181";
 
   # 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 = "0lvddm62c0pwx4cksbwh2n0xzz80p26lz1xsvb4z40h7hlwaf41w";
+    sha256 = "1rcy590392aycjazi3z8gf6ll39rxkbgmkgnsbsl6yl5vb3jgk83";
   };
 
   meta = with stdenv.lib; {

From 4f5063d5eb333f1d689f14a7a96d31ed03ba761b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 19:40:05 -0800
Subject: [PATCH 1887/2793] urlscan: 0.9.0 -> 0.9.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/urlscan/versions
---
 pkgs/applications/misc/urlscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 6b0c4670544..a82d7792cab 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urlscan";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = pname;
     rev = version;
-    sha256 = "0vad1g234r9agvkdsry9xb6hmn6lg4mygfcy0mg68gibmrg7h1ji";
+    sha256 = "0np7w38wzs72kxap9fsdliafqs0xfqnfj01i7b0fh7k235bgrapz";
   };
 
   propagatedBuildInputs = [ python3Packages.urwid ];

From daf6e558013bdc0068e1fbdbe8d1dcfbed2d7cff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 18:48:57 -0800
Subject: [PATCH 1888/2793] ttyplot: 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/ttyplot/versions
---
 pkgs/tools/misc/ttyplot/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index 9fdac0b8b9c..d82c7dda96a 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
+
 stdenv.mkDerivation rec {
   name = "ttyplot-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = "ttyplot";
     rev = version;
-    sha256 = "1i54hw7fad42gdlrlqg7s0vhsq01yxzdi2s0r3svwbb1sr7ynzn1";
+    sha256 = "0icv40fmf8z3a00csjh4c4svq3y6s6j70jgxjd6zqlxyks9wj7mr";
   };
 
   buildInputs = [ ncurses ];
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "a simple general purpose plotting utility for tty with data input from stdin.";
+    description = "A simple general purpose plotting utility for tty with data input from stdin";
     homepage = https://github.com/tenox7/ttyplot;
     license = licenses.unlicense;
     maintainers = with maintainers; [ lassulus ];

From b17326750173cf9c0033aba11ec1c3ae777f4af9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 03:27:38 -0800
Subject: [PATCH 1889/2793] sound-juicer: 3.16.1 -> 3.24.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/sound-juicer/versions
---
 pkgs/applications/audio/sound-juicer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index 5679a4d5342..686b27223a6 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "sound-juicer";
-  version = "3.16.1";
+  version = "3.24.0";
 in stdenv.mkDerivation rec{
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
+    sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny";
   };
 
   nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];

From 87dae4f58088abb370b3e47434480d9829f2650c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 03:37:38 -0800
Subject: [PATCH 1890/2793] redis: 5.0.1 -> 5.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/redis/versions
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index a7370847be1..d6cade72a87 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.1";
+  version = "5.0.3";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "1jxbjmsxn0lgh0y3k5j57rxf2sdjj71hxhw4jcvsvycpxh77r9l2";
+    sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472";
   };
 
   buildInputs = [ lua ];

From d121a13f67b5d4967657c4ee0f996ba2474d44ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 03:50:48 -0800
Subject: [PATCH 1891/2793] recoll: 1.24.3 -> 1.24.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/recoll/versions
---
 pkgs/applications/search/recoll/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index d8f3b5b0a41..15c78fd81bb 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -8,12 +8,12 @@
 assert stdenv.hostPlatform.system != "powerpc-linux";
 
 stdenv.mkDerivation rec {
-  ver = "1.24.3";
+  ver = "1.24.4";
   name = "recoll-${ver}";
 
   src = fetchurl {
     url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "1lnabbivqas46blabsnxhlhdyih8k7s1paszv491mz8cvmhjjmgi";
+    sha256 = "0b1rz679gbv2qy5b5jgr25h1dk8560iac16lq0h2021nrv6ix74q";
   };
 
   configureFlags = [ "--enable-recollq" ]

From 1ba77eeb22a559c1fef96b830a3ca201f0dea171 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 14 Dec 2018 12:50:40 +0100
Subject: [PATCH 1892/2793] tor-browser-bundle-bin: 8.0.3 -> 8.0.4

---
 .../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 74fccc2f7c8..c31005f877b 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -89,7 +89,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "8.0.3";
+  version = "8.0.4";
 
   lang = "en-US";
 
@@ -99,7 +99,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 = "19clhhsyhc8brjzjyrq0xl5gavwhbyq036nbl0x6dybawr3684gz";
+      sha256 = "1hclxqk54w1diyr8lrgirhy6cwmw2rccg174hgv39zrj2a5ajvmm";
     };
 
     "i686-linux" = fetchurl {
@@ -107,7 +107,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 = "1hlrbn8r9z93mswnaksn66azgf3zjf08wrlk58risli32j9gywd0";
+      sha256 = "16393icjcck7brng1kq1vf4nacllcz1m3q3w2vs9rdkjfsazqh42";
     };
   };
 in

From b54d6d181dfeaa63120a6bf39cf52ab45e0dbf09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 04:00:34 -0800
Subject: [PATCH 1893/2793] renpy: 7.1.1 -> 7.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/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 22b4f93b136..947f0580903 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.1.1";
+  version = "7.1.3";
 
   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 = "1lmahwgy5jyak0bdbh4jlr23x35f87k7jcydkywns3mph6q7r01i";
+    sha256 = "0z6s1vzjb5jh0i79pv5kgynfrzqj1a1f3afrpmp2aaqbrljkidbn";
   };
 
   patches = [

From 51f6839a9a21d5cf710d686dbaa50dad2d68d234 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 04:16:23 -0800
Subject: [PATCH 1894/2793] rustup: 1.15.0 -> 1.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/rustup/versions
---
 pkgs/development/tools/rust/rustup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 7647478b7f4..1da9a10f234 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustup.rs";
     rev = version;
-    sha256 = "12d8z53vixrrbhvadw8fgifik0xi3hyfj1s75my8lcqwmij91gkn";
+    sha256 = "1z9358y01jlpx7xlj56ba1d05dxb98j1wd2agrlhwmidmwp8qbz5";
   };
 
   cargoSha256 = "0syp53s285ixshp6yswly0mwkcl0y2ddj5hc110irqsrvwgss32r";

From 3fba6d81754bea9447b6005f3883f386637f67d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 22:35:12 -0800
Subject: [PATCH 1895/2793] wireshark: 2.6.4 -> 2.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/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 5d82b117486..2a3d49ba5a0 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.4";
+  version = "2.6.5";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "0qf81dk726sdsmjqa9nd251j1cwvzkyb4hrlp6w4iwa3cdz00sx0";
+    sha256 = "12j3fw0j8qcr86c1vsz4bsb55j9inp0ll3wjjdvg1cj4hmwmn5ck";
   };
 
   cmakeFlags = [

From f0d95f00d0aff960bebe3ea708abfde27a184ec9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 04:51:58 -0800
Subject: [PATCH 1896/2793] riemann_c_client: 1.10.3 -> 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/riemann-c-client/versions
---
 pkgs/tools/misc/riemann-c-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index bbbb19fc200..970cf28c26d 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "riemann-c-client-1.10.3";
+  name = "riemann-c-client-1.10.4";
 
   src = fetchFromGitHub {
     owner = "algernon";
     repo = "riemann-c-client";
     rev = "${name}";
-    sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc";
+    sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 38d4c09096cae258f6e5a0ccc6f2d1a416429582 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 14 Dec 2018 13:15:15 +0100
Subject: [PATCH 1897/2793] vscode: 1.29.1 -> 1.30.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 2a6926a8708..35fe273cdac 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -12,9 +12,9 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "0r19i3gg6iz8j7plb89c0k8r3wlh9vxbv7mwbssy0yvhid2af3ww";
-    "x86_64-linux" = "1r66mjz4lgv3dk0rjb9p27ha9y7vj7xld9x9gqnjxqx9ify71r9i";
-    "x86_64-darwin" = "0akr8675hnppxwr8xy5lr6rlqz8zg1fj823vks5mx3ssmd3sg189";
+    "i686-linux" = "0bd2jdn67vnbhrsqy54bymz4di3fw3p18ni5j2wikqkl4d9h4jj1";
+    "x86_64-linux" = "1zbnyff0q15xkvkrs14rfgyn6xb9v0xivcnbl8yckl71s45vb2l1";
+    "x86_64-darwin" = "1qgzhpfzcwym1qyzx2v14336l106hzhs7ii84g356vxkm219x7kw";
   }.${stdenv.hostPlatform.system};
 
   archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -31,7 +31,7 @@ let
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
-    version = "1.29.1";
+    version = "1.30.0";
 
     src = fetchurl {
       name = "VSCode_${version}_${plat}.${archive_fmt}";

From ab9532b1feceee53cbdd7f006e9f8efb1214523d Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Fri, 14 Dec 2018 08:01:20 -0500
Subject: [PATCH 1898/2793] gmsh: 4.0.5 -> 4.0.7

---
 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 9aff8e616c8..c689ae98b7a 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.0.5"; in
+let version = "4.0.7"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "194354f5cfede4ef47cb6f1d2bde294873315a1b34be114564defef88d108adf";
+    sha256 = "c6572320d0ffdf7d2488e113861bc4bd9c38a29f7fc5b67957f6fbcb63fbdbd5";
   };
 
   buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined

From f25fb4b03f7dfd99f98d2c4cceba742c773ed530 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 14 Dec 2018 14:05:46 +0100
Subject: [PATCH 1899/2793] solc: disable LLL installation

It has been [disabled by
default](https://github.com/ethereum/solidity/releases/tag/v0.5.1) in 0.5.1.
---
 pkgs/development/compilers/solc/default.nix        |  4 +---
 .../solc/patches/shared-libs-install.patch         | 14 +-------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index af9ddb872f9..38a554a3fe3 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -33,11 +33,10 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
     "-DBUILD_SHARED_LIBS=ON"
-    "-DINSTALL_LLLC=ON"
   ];
 
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
-  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
+  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
                "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
 
   nativeBuildInputs = [ cmake ];
@@ -47,7 +46,6 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
-    longDescription = "This package also includes `lllc', the LLL compiler.";
     homepage = https://github.com/ethereum/solidity;
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index fa30655e04e..0fb693ef421 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0c05208f..8893648e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,22 @@ add_subdirectory(libevmasm)
  add_subdirectory(libsolidity)
  add_subdirectory(libsolc)
  
@@ -21,9 +21,6 @@ index 0c05208f..8893648e 100644
 +install(DIRECTORY liblangutil/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
 +        FILES_MATCHING PATTERN "*.h")
-+install(DIRECTORY liblll/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
-+        FILES_MATCHING PATTERN "*.h")
 +
  if (NOT EMSCRIPTEN)
  	add_subdirectory(solc)
@@ -46,15 +43,6 @@ index 86192c1b..e7f15e93 100644
  add_library(evmasm ${sources} ${headers})
  target_link_libraries(evmasm PUBLIC devcore)
 +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
-index 4cdc073a..b61f03c7 100644
---- a/liblll/CMakeLists.txt
-+++ b/liblll/CMakeLists.txt
-@@ -3,3 +3,4 @@ file(GLOB headers "*.h")
- 
- add_library(lll ${sources} ${headers})
- target_link_libraries(lll PUBLIC evmasm devcore)
-+install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
 index 0bdec4b4..e876177e 100644
 --- a/libsolidity/CMakeLists.txt

From fbe282b25a6770d22a31584651f5219fd2ee50dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 05:19:41 -0800
Subject: [PATCH 1900/2793] samplv1: 0.9.3 -> 0.9.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/samplv1/versions
---
 pkgs/applications/audio/samplv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 71912e73c47..73f24e03e30 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "1yvdr0fvw13lj2r8dppmn0aw83g9f5r1hp5ixvw7cdhrxs7fh4vw";
+    sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld";
   };
 
   buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

From 451b181586161b548efba53fbd71a4fa141f6c9a Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Fri, 14 Dec 2018 16:23:33 +0300
Subject: [PATCH 1901/2793] fetchcargo: fixed config installation path

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

diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 13d52e38337..e8465ba6162 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     # But not to break old cargoSha256, if the previous behavior was enough,
     # we don't store the config.
     if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
-      install -Dt $out/.cargo $CARGO_CONFIG;
+      install -D $CARGO_CONFIG $out/.cargo/config;
     fi;
   '';
 

From df42e8a636683a6b169c423b9b42de81fa88d852 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 05:24:37 -0800
Subject: [PATCH 1902/2793] redo: 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/redo/versions
---
 pkgs/development/tools/build-managers/redo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix
index bd0562463fd..97b82d204ad 100644
--- a/pkgs/development/tools/build-managers/redo/default.nix
+++ b/pkgs/development/tools/build-managers/redo/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "redo-1.3";
+  name = "redo-1.4";
   src = fetchurl {
     url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz";
-    sha256 = "1yx7nd59s01j096hr1zbnbx6mvd6ljzd4vgawh7p2l644jgwj70r";
+    sha256 = "1c8gr5h77v4fw78zkhbm9z9adqs3kd7xvxwnmci2zvlf4bqqk4jv";
   };
 
   nativeBuildInputs = [ perl /* for pod2man */ ];

From 6443b8ecb7ee77cf23115ee0798231abc61afa07 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 05:55:40 -0800
Subject: [PATCH 1903/2793] python37Packages.urwidtrees: 1.0 -> 1.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/python3.7-urwidtrees/versions
---
 pkgs/development/python-modules/urwidtrees/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index da5501f50ba..915194459b2 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "urwidtrees";
-  version  = "1.0";
+  version  = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "urwidtrees";
     rev = "${version}";
-    sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa";
+    sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";
   };
 
   propagatedBuildInputs = [ urwid ];

From 92975d07c6b3bff4849dd34f621fffdded73b7f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 06:01:58 -0800
Subject: [PATCH 1904/2793] python37Packages.twilio: 6.19.2 -> 6.21.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/python3.7-twilio/versions
---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 2247773b950..02c260a9dfe 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.19.2";
+  version = "6.21.0";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "1dymn98wlby93jx7agvmhzy5dvwmaclz481lbzgvbqavy3n0sbdk";
+    sha256 = "1xinj2vyfasi1j3g7kk7xkmp6w8yawaqi3dz7mvibf9ywsi4dhc9";
   };
 
   buildInputs = [ nose mock ];

From 567910d3e31548a0af54fafdb35bf8fe126d9a7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 06:11:09 -0800
Subject: [PATCH 1905/2793] pywal: 3.1.0 -> 3.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/pywal/versions
---
 pkgs/tools/graphics/pywal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix
index a1d1f21a007..4d493bdd73e 100644
--- a/pkgs/tools/graphics/pywal/default.nix
+++ b/pkgs/tools/graphics/pywal/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pywal";
-  version = "3.1.0";
+  version = "3.2.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76";
+    sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic";
   };
 
   # necessary for imagemagick to be found during tests

From 9f7fccab092d7d4279428cf4a2c77abc74801816 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 14 Dec 2018 15:25:00 +0100
Subject: [PATCH 1906/2793] gosec: 1.1.0 -> 1.2.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/gosec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 2cffd86f396..7ee87b8f848 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -5,7 +5,7 @@
 
 buildGoPackage rec {
   name = "gosec-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   goPackagePath = "github.com/securego/gosec";
   excludedPackages = ''cmd/tlsconfig'';
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "securego";
     repo = "gosec";
     rev = "${version}";
-    sha256 = "0vjn3g6w4y4ayx0g766jp31vb78cipl90fcg0mccjr0a539qrpy6";
+    sha256 = "1420yl4cjp4v4xv0l0wbahgl6bjhz77lx5va9hqa6abddmqvx1hg";
   };
 
   goDeps = ./deps.nix;

From 81c99bfe63eb741c4ad1424a3c08034d770e6577 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 13 Dec 2018 20:29:14 -0500
Subject: [PATCH 1907/2793] flow: 0.87.0 -> 0.89.0

---
 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 9457e88ed83..f3a5905c14e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "0.87.0";
+  version = "0.89.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k";
+    sha256 = "1p2ix39h4g9hcsq2bm08ip9ivw5bh4w7am403mh7h6yrnanc9djv";
   };
 
   installPhase = ''

From f2f805d6d8a370379d89972d45b16d008112b56a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 06:28:05 -0800
Subject: [PATCH 1908/2793] qgnomeplatform: 0.4 -> 0.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/qgnomeplatform/versions
---
 pkgs/development/libraries/qgnomeplatform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 3a3d3e0277c..1fb3a415dc6 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "qgnomeplatform-${version}";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "QGnomePlatform";
     rev = version;
-    sha256 = "1403300d435g7ngcxsgnllhryk63nrhl1ahx16b28wkxnh2vi9ly";
+    sha256 = "01ncj21cxd5p7pch6p3zbhv5wp0dgn9vy5hrw54g49fmqnbb1ymz";
   };
 
   nativeBuildInputs = [

From 3c249e2cabb733c1680ca110c176af27d1cc8e4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 07:22:49 -0800
Subject: [PATCH 1909/2793] python37Packages.scp: 0.12.1 -> 0.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/python3.7-scp/versions
---
 pkgs/development/python-modules/scp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix
index 191e79a4556..623b94124d1 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/pkgs/development/python-modules/scp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "scp";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cjyc19v46lwrhdyc18f87z589rhqg7zjg0s8a05w6mv3262b6ai";
+    sha256 = "09219c45hafq6pb8z6rsinsfhp3rsx5mr9cgz2099rcs4if2gk6g";
   };
 
   propagatedBuildInputs = [

From a7e1717d4bc36a20772710b562693d4cedcb52f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 07:37:22 -0800
Subject: [PATCH 1910/2793] qalculate-gtk: 2.8.1 -> 2.8.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/qalculate-gtk/versions
---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 7cd22f22a4e..42dc2853409 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf";
+    sha256 = "0vdrpnarbwhappwgp38jjndnq30h1lh8hbk75i9rhkb7x4kblqfi";
   };
 
   patchPhase = ''

From 23073717cdc7e85125e9d5fc3cee1fac10ebb0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Dec 2018 15:50:17 +0000
Subject: [PATCH 1911/2793] unit: remove perl526, which is EOL

related to https://github.com/NixOS/nixpkgs/pull/52062
---
 pkgs/servers/http/unit/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index d39c25bec2a..38212885541 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -4,7 +4,6 @@
 , php71
 , php72
 , php73
-, perl526
 , perl
 , perldevel
 , ruby_2_3
@@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
     php71
     php72
     php73
-    perl526
     perl
     perldevel
     ruby_2_3
@@ -52,7 +50,6 @@ stdenv.mkDerivation rec {
     ./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib
     ./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib
     ./configure php     --module=php73     --config=${php73.dev}/bin/php-config  --lib-path=${php73}/lib
-    ./configure perl    --module=perl526   --perl=${perl526}/bin/perl
     ./configure perl    --module=perl      --perl=${perl}/bin/perl
     ./configure perl    --module=perl529   --perl=${perldevel}/bin/perl
     ./configure ruby    --module=ruby23    --ruby=${ruby_2_3}/bin/ruby

From b98926d55a33e5d50692a18bb3b4f26f11e17c9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 08:14:10 -0800
Subject: [PATCH 1912/2793] qbs: 1.12.1 -> 1.12.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/qbs/versions
---
 pkgs/development/tools/build-managers/qbs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 99fb9090c0d..3c5a485e36f 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "qbs-${version}";
 
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "qbs";
     repo = "qbs";
     rev = "v${version}";
-    sha256 = "14b7bz07yfrmbry57n3xh8w4nbapm6aknk45fgi7ljvsfzp85fzl";
+    sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv";
   };
 
   nativeBuildInputs = [ qmake ];

From c7386145ad6a33fa12f15027677ad59af7001f6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 08:25:36 -0800
Subject: [PATCH 1913/2793] qsampler: 0.5.2 -> 0.5.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/qsampler/versions
---
 pkgs/applications/audio/qsampler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 8ad251652d0..69bf41e1e4f 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "qsampler-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsampler/${name}.tar.gz";
-    sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq";
+    sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];

From 3e6abb633c17e82977b5ef7a0c122b666c9e3fc2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 14 Dec 2018 09:41:51 -0600
Subject: [PATCH 1914/2793] ber_metaocaml: cleanup, tweaks

This puts MetaOCaml on more equal footing with the normal OCaml
packages, which have a few passthru's and expect to have more 'meta'
information available (such as 'platforms').

With these changes, you can use the ber_metaocaml package along with
ocaml-ng.mkOcamlPackages in order to create a full package set with
Native MetaOCaml support, though this currently isn't implemented (you
have to do this yourself).

There are also other light cleanups, for example this also removes the
old MIPS support and restricts the platforms to x86 Linux/Darwin, for
now. Other platforms can be added on a case-by-case basis.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../compilers/ocaml/ber-metaocaml.nix         | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index 2eeb6ad8408..999b2ebd6f6 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }:
+{ stdenv, fetchurl
+, ncurses
+, libX11, xproto, buildEnv
+}:
 
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
+   x11deps = [ libX11 xproto ];
    inherit (stdenv.lib) optionals;
+
+   baseOcamlBranch  = "4.07";
+   baseOcamlVersion = "${baseOcamlBranch}.1";
+   metaocamlPatch   = "107";
 in
 
 stdenv.mkDerivation rec {
-
   name = "ber-metaocaml-${version}";
-  version = "107";
+  version = metaocamlPatch;
 
   src = fetchurl {
-    url = "https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.1.tar.gz";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";
     sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a";
   };
 
@@ -20,21 +27,19 @@ stdenv.mkDerivation rec {
     sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm";
   };
 
-  # Needed to avoid a SIGBUS on the final executable on mips
-  NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
-
-  x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];};
-  x11lib = x11env + "/lib";
-  x11inc = x11env + "/include";
+  x11env = buildEnv { name = "x11env"; paths = x11deps; };
+  x11lib = "${x11env}/lib";
+  x11inc = "${x11env}/include";
 
   prefixKey = "-prefix ";
-  configureFlags = optionals useX11 [ "-x11lib" x11lib
-                                      "-x11include" x11inc ];
+  configureFlags = optionals useX11
+    [ "-x11lib" x11lib
+      "-x11include" x11inc
+      "-flambda"
+    ];
 
   dontStrip = true;
-  buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
-  installFlags = "-i";
-  installTargets = "install"; # + optionalString useNativeCompilers " installopt";
+  buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
 
   postConfigure = ''
     tar -xvzf $metaocaml
@@ -42,6 +47,7 @@ stdenv.mkDerivation rec {
     make patch
     cd ..
   '';
+
   buildPhase = ''
     make world
     make -i install
@@ -53,13 +59,13 @@ stdenv.mkDerivation rec {
     ln -sv $out/lib/ocaml/caml $out/include/caml
     cd ${name}
     make all
+  '';
+
+  installPhase = ''
     make install
     make install.opt
-    cd ..
- '';
-  installPhase = "";
-  postBuild = ''
   '';
+
   checkPhase = ''
     cd ${name}
     make test
@@ -68,16 +74,23 @@ stdenv.mkDerivation rec {
     cd ..
   '';
 
+  passthru = {
+    nativeCompilers = true;
+  };
+
   meta = with stdenv.lib; {
-    homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
-    license = with licenses; [
-      qpl /* compiler */
-      lgpl2 /* library */
-    ];
-    description = "Conservative extension of OCaml";
+    description     = "Multi-Stage Programming extension for OCaml";
+    homepage        = http://okmij.org/ftp/ML/MetaOCaml.html;
+    license         = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ];
+    maintainers     = with maintainers; [ thoughtpolice ];
+
+    branch          = baseOcamlBranch;
+    platforms       = with platforms; linux ++ darwin;
+    broken          = stdenv.isAarch64 || stdenv.isMips;
+
     longDescription = ''
-      A conservative extension of OCaml with the primitive type of code values,
-      and three basic multi-stage expression forms: Brackets, Escape, and Run
+      A simple extension of OCaml with the primitive type of code values, and
+      three basic multi-stage expression forms: Brackets, Escape, and Run.
     '';
   };
 }

From be096f9a273b0f0091d8422631d5d1dc836e17c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 14 Dec 2018 18:51:26 +0100
Subject: [PATCH 1915/2793] python3.pkgs.git-annex-adapter: fix broken test

Apply https://github.com/alpernebbi/git-annex-adapter/pull/9.
---
 .../python-modules/git-annex-adapter/default.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 935217c6992..f4d690eedc3 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -39,6 +39,12 @@ buildPythonPackage rec {
       url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
       sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
     })
+
+    # fix test broken due to renaming of repository version 6 to 7
+    (fetchpatch {
+      url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch;
+      sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7";
+    })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin:
     # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b

From 6b77a7f8bfb507eb5cd16c41068a885b2630c3b6 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 14 Dec 2018 20:27:50 +0300
Subject: [PATCH 1916/2793] fprint_demo: drop package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://fprint.freedesktop.org/

fprint_demo is obsolete. Most features are integrated into fprintd’s helpers, and libfprint has an examples section
---
 pkgs/tools/security/fprint_demo/default.nix | 24 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/tools/security/fprint_demo/default.nix

diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix
deleted file mode 100644
index 2179b2b7b03..00000000000
--- a/pkgs/tools/security/fprint_demo/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }:
-
-stdenv.mkDerivation rec {
-  name = "fprint_demo-2008-03-03";
-
-  src = fetchgit {
-    url = "git://github.com/dsd/fprint_demo";
-    rev = "5d86c3f778bf97a29b73bdafbebd1970e560bfb0";
-    sha256 = "1rysqd8kdqgis1ykrbkiy1bcxav3vna8zdgbamyxw4hj5764xdcm";
-  };
-
-  buildInputs = [ libfprint gtk2 ];
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-
-  hardeningDisable = [ "format" ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/;
-    description = "A simple GTK+ application to demonstrate and test libfprint's capabilities";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05dbfacb628..7a4ea7aecd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2750,8 +2750,6 @@ in
 
   fprintd = callPackage ../tools/security/fprintd { };
 
-  fprint_demo = callPackage ../tools/security/fprint_demo { };
-
   franz = callPackage ../applications/networking/instant-messengers/franz { };
 
   freedroidrpg = callPackage ../games/freedroidrpg { };

From 74fd4f357ad06e0ec38638080318eea86598f883 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:04:06 -0800
Subject: [PATCH 1917/2793] python37Packages.timeout-decorator: 0.4.0 -> 0.4.1
 (#52085)

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

diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix
index 342531ab976..af1a85c9627 100644
--- a/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "timeout-decorator";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bckwbi5078z3x9lyf8vl9dhx10nymwwnp46c98wm5m02x5j37g4";
+    sha256 = "1inkf68i2s2x27arpqwkdxigiqbpbpjbbnfv7jzsrif1fmp2fphs";
   };
 
   meta = with stdenv.lib; {

From 4387bbf1496045533b7317bc804c3870782d6665 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:09:05 -0800
Subject: [PATCH 1918/2793] python37Packages.ordered-set: 3.0.2 -> 3.1 (#52086)

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

diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index 233a4d44c43..dc86068becb 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "ordered-set";
-  version = "3.0.2";
+  version = "3.1";
 
   buildInputs = [ pytest pytestrunner ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d292b866fa44f339ac6e624e3d338accfb415ce0a8431595d51990fbdf61d3b";
+    sha256 = "0slg1ys58dzxl96mws3sydzavdzqdk0s2nrc852dphd9kbm07dzr";
   };
 
   checkPhase = ''

From 171b112ef1695feaf5b4dbd9e15e829e3eb95e5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:16:35 -0800
Subject: [PATCH 1919/2793] python37Packages.rpy2: 2.9.4 -> 2.9.5 (#52084)

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

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index cefd155353a..dfbcdec858a 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     version = if isPy27 then
       "2.8.6" # python2 support dropped in 2.9.x
     else
-      "2.9.4";
+      "2.9.5";
     pname = "rpy2";
     disabled = isPyPy;
     src = fetchPypi {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
       sha256 = if isPy27 then
         "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
       else
-        "0bl1d2qhavmlrvalir9hmkjh74w21vzkvc2sg3cbb162s10zfmxy"; # 2.9.x
+        "1nrj8pgyxrwrfdrxzb4j3z1adjwjx1mr8d1n5cmrz4nhlzy8w7xr"; # 2.9.x
     };
     buildInputs = [
       readline

From 517534810dd82b383316907ff39cdbc1556c5981 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:20:08 -0800
Subject: [PATCH 1920/2793] python37Packages.splinter: 0.9.0 -> 0.10.0 (#52081)

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

diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix
index 5a2ee5877c9..5d863192b2b 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/pkgs/development/python-modules/splinter/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "splinter";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0il187zajpiw4p011nkb4bcjxxd85f131bcqz31201ff14ifvih8";
+    sha256 = "1x5g7pfj813rnci7dc46y01bq24qzw5qwlzm4iw61hg66q2kg7rd";
   };
 
   propagatedBuildInputs = [ selenium ];

From e17cb15e73ec034a79d10589dc74cd4bc3716599 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:21:30 -0800
Subject: [PATCH 1921/2793] python27Packages.spambayes: 1.1b2 -> 1.1b3 (#52080)

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

diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix
index 19d5cb15493..bbd7cbb210e 100644
--- a/pkgs/development/python-modules/spambayes/default.nix
+++ b/pkgs/development/python-modules/spambayes/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "spambayes";
-  version = "1.1b2";
+  version = "1.1b3";
 
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d";
+    sha256 = "016r3g43ja73rls1nh1dl82d75lgsjdl4cv2r5s7zcihm47nb38q";
   };
 
   propagatedBuildInputs = [ bsddb3 pydns lockfile ];

From fc75d552960c8085a60a3d32deb43c018ce3c93c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:33:12 -0800
Subject: [PATCH 1922/2793] python37Packages.prov: 1.5.2 -> 1.5.3 (#52089)

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

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index f5f5b719b06..c6cb98e33b2 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "prov";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb";
+    sha256 = "1a9h406laclxalmdny37m0yyw7y17n359akclbahimdggq853jd0";
   };
 
   prePatch = ''

From b366c1597d1ed38906b48049769dd8f871ef4053 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:34:31 -0800
Subject: [PATCH 1923/2793] python37Packages.ptest: 1.5.3 -> 1.7.4 (#52087)

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

diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix
index 0de6f98828f..bdd9fc5c47e 100644
--- a/pkgs/development/python-modules/ptest/default.nix
+++ b/pkgs/development/python-modules/ptest/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "ptest";
-  version =  "1.5.3";
+  version =  "1.7.4";
 
   src = fetchFromGitHub {
     owner = "KarlGong";
     repo = pname;
     rev = version + "-release";
-    sha256 = "1r50lm6n59jzdwpp53n0c0hp3aj1jxn304bk5gh830226gsaf2hn";
+    sha256 = "0v1zpfjagjlvdmgv6d502nmb7s996wadvpzg93i651s64rrlwq4s";
   };
 
   meta = with stdenv.lib; {

From b73074071ba3aa09a6514cca0a368fafe4154576 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Dec 2018 10:55:56 +0100
Subject: [PATCH 1924/2793] LTS Haskell 12.22

---
 .../configuration-hackage2nix.yaml            | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 979e105c1bc..8a135d48d4f 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.21
+  # LTS Haskell 12.22
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -184,7 +184,7 @@ default-package-overrides:
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - api-field-json-th ==0.1.0.2
-  - appar ==0.1.4
+  - appar ==0.1.5
   - apply-refact ==0.5.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.1
@@ -230,7 +230,7 @@ default-package-overrides:
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
   - base58string ==0.10.0
-  - base64-bytestring ==1.0.0.1
+  - base64-bytestring ==1.0.0.2
   - base64-bytestring-type ==1
   - base64-string ==0.2
   - base-compat ==0.10.5
@@ -361,7 +361,7 @@ default-package-overrides:
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
-  - chan ==0.0.4
+  - chan ==0.0.4.1
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
@@ -565,7 +565,7 @@ default-package-overrides:
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.11.0.3
+  - dejafu ==1.11.0.4
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
@@ -732,11 +732,11 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - Fin ==0.2.6.0
   - fin ==0.0.1
+  - Fin ==0.2.6.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
-  - fingertree ==0.1.4.1
+  - fingertree ==0.1.4.2
   - finite-typelits ==0.1.4.2
   - first-class-patterns ==0.3.2.4
   - fixed ==0.2.1.1
@@ -754,7 +754,7 @@ default-package-overrides:
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
-  - focuslist ==0.1.0.0
+  - focuslist ==0.1.0.1
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.8
   - fold-debounce-conduit ==0.2.0.3
@@ -960,7 +960,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.6.1
   - hedgehog-corpus ==0.1.0
-  - hedis ==0.10.8
+  - hedis ==0.10.10
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.2
@@ -1016,8 +1016,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
@@ -1083,7 +1083,7 @@ default-package-overrides:
   - hvect ==0.4.0.0
   - hvega ==0.1.0.3
   - hw-balancedparens ==0.2.0.2
-  - hw-bits ==0.7.0.4
+  - hw-bits ==0.7.0.5
   - hw-conduit ==0.2.0.5
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
@@ -1130,7 +1130,7 @@ default-package-overrides:
   - Imlib ==0.1.2
   - immortal ==0.3
   - include-file ==0.1.0.3
-  - incremental-parser ==0.3.2
+  - incremental-parser ==0.3.2.1
   - indentation-core ==0.0.0.2
   - indentation-parsec ==0.0.0.2
   - indents ==0.5.0.0
@@ -1316,7 +1316,7 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.2.4.0
+  - massiv ==0.2.5.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1772,7 +1772,7 @@ default-package-overrides:
   - rhine ==0.4.0.1
   - riak ==1.1.2.5
   - riak-protobuf ==0.23.0.0
-  - rio ==0.1.5.0
+  - rio ==0.1.6.0
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
@@ -1802,8 +1802,8 @@ default-package-overrides:
   - say ==0.1.0.1
   - sbp ==2.3.17
   - sbv ==7.12
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1899,8 +1899,8 @@ default-package-overrides:
   - siphash ==1.0.3
   - size-based ==0.1.2.0
   - skein ==1.0.9.4
-  - skylighting ==0.7.4
-  - skylighting-core ==0.7.4
+  - skylighting ==0.7.5
+  - skylighting-core ==0.7.5
   - slack-web ==0.2.0.9
   - slave-thread ==1.0.2
   - smallcheck ==1.1.5
@@ -2026,7 +2026,7 @@ default-package-overrides:
   - tardis ==0.4.1.0
   - tasty ==1.1.0.4
   - tasty-ant-xml ==1.1.4
-  - tasty-dejafu ==1.2.0.7
+  - tasty-dejafu ==1.2.0.8
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.2
@@ -2220,7 +2220,7 @@ default-package-overrides:
   - valor ==0.1.0.0
   - vault ==0.3.1.2
   - vec ==0.1
-  - vector ==0.12.0.1
+  - vector ==0.12.0.2
   - vector-algorithms ==0.7.0.4
   - vector-binary-instances ==0.2.5.1
   - vector-buffer ==0.4.1
@@ -2236,7 +2236,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.24
+  - viewprof ==0.0.0.25
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2357,7 +2357,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.9.1
   - yesod-auth-hashdb ==1.7.1
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.8.1
+  - yesod-core ==1.6.9
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0

From d793f16da41dd625a22a3a18a53278c9ac6b39ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Dec 2018 10:49:53 +0100
Subject: [PATCH 1925/2793] hackage2nix: allow updates of
 'base-compat-batteries' again

I assume that the build issues that prevented us from using versions beyond
0.10.1 have been fixed by now.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8a135d48d4f..8b15570e621 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -41,8 +41,6 @@ core-packages:
   - ghcjs-base-0
 
 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.22

From 1fb0890f21ff457e7c33e7ef5609164e1595cc04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Dec 2018 10:54:02 +0100
Subject: [PATCH 1926/2793] hackage2nix: drop unused Cabal 1.x versions

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8b15570e621..18a6c1ea12b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2401,9 +2401,6 @@ extra-packages:
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - blank-canvas < 0.6.3                # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
-  - 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

From 4e7fdb3fa6c197afaed73772ac1cdeac7bb5adff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Dec 2018 02:30:51 +0100
Subject: [PATCH 1927/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-5-g7b287a8 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ce1988e2972a543642d7035c6b2a7a16f6ba9cba.
---
 .../haskell-modules/hackage-packages.nix      | 1144 +++++++++--------
 1 file changed, 624 insertions(+), 520 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5f2f4377f65..7bf3cc2bdb2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2373,83 +2373,6 @@ self: {
          opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; 
          opencv_video = null;};
 
-  "Cabal_1_18_1_7" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, extensible-exceptions, filepath, HUnit, pretty
-     , process, QuickCheck, regex-posix, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time, unix
-     }:
-     mkDerivation {
-       pname = "Cabal";
-       version = "1.18.1.7";
-       sha256 = "10kjdrzb3lq2srcbwb4q79klcgd3ianpf1zvbzjcw68027ax9hhz";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath pretty
-         process time unix
-       ];
-       testHaskellDepends = [
-         base bytestring directory extensible-exceptions filepath HUnit
-         process QuickCheck regex-posix test-framework test-framework-hunit
-         test-framework-quickcheck2 unix
-       ];
-       doCheck = false;
-       description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Cabal_1_20_0_4" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, extensible-exceptions, filepath, HUnit, pretty
-     , process, QuickCheck, regex-posix, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time, unix
-     }:
-     mkDerivation {
-       pname = "Cabal";
-       version = "1.20.0.4";
-       sha256 = "1q74jjip24mc5647yxz6gw0jhj5j694xbx3ia15pxqklxhsdkxpx";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath pretty
-         process time unix
-       ];
-       testHaskellDepends = [
-         base bytestring directory extensible-exceptions filepath HUnit
-         process QuickCheck regex-posix test-framework test-framework-hunit
-         test-framework-quickcheck2 unix
-       ];
-       doCheck = false;
-       description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Cabal_1_24_2_0" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, directory, exceptions, filepath, old-time, pretty
-     , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "Cabal";
-       version = "1.24.2.0";
-       sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p";
-       revision = "2";
-       editedCabalFile = "15ncrm7x2lg4hn0m5mhc8hy769bzhmajsm6l9i6536plfs2bbbdj";
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         pretty process time unix
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath old-time
-         pretty process QuickCheck regex-posix tagged tasty tasty-hunit
-         tasty-quickcheck transformers unix
-       ];
-       doCheck = false;
-       description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       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
@@ -15289,8 +15212,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, hspec }:
      mkDerivation {
        pname = "RLP";
-       version = "1.0.1";
-       sha256 = "0xxhd2whz8q3zxrk37pwbhjayfhq9dv89068q0qlfwwg6aby0k6s";
+       version = "1.1.0";
+       sha256 = "11jkzq6qnh449ilj2lk6snfs3sn66nbybj751pqg9vgkqjfab2yy";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
@@ -21620,17 +21543,19 @@ self: {
      }) {};
 
   "advent-of-code-api" = callPackage
-    ({ mkDerivation, base, containers, curl, deepseq, directory
-     , filepath, finite-typelits, mtl, taggy, text, time, uri-encode
+    ({ mkDerivation, attoparsec, base, containers, curl, deepseq
+     , directory, filepath, finite-typelits, HUnit, mtl, tagsoup, text
+     , time, uri-encode
      }:
      mkDerivation {
        pname = "advent-of-code-api";
-       version = "0.1.0.0";
-       sha256 = "15dn78scm0hj1dqcd4xm4gmdvbmjd7afkrh64pnwfbldy74smfxy";
+       version = "0.1.2.3";
+       sha256 = "1ma9x8dxvhrgxg55bcf6l1d5w1mnmplav2yisnyrgs5034jqpm7l";
        libraryHaskellDepends = [
-         base containers curl deepseq directory filepath finite-typelits mtl
-         taggy text time uri-encode
+         attoparsec base containers curl deepseq directory filepath
+         finite-typelits mtl tagsoup text time uri-encode
        ];
+       testHaskellDepends = [ base directory filepath HUnit text ];
        description = "Advent of Code REST API bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23498,6 +23423,17 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "alist" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "alist";
+       version = "0.1.0.2";
+       sha256 = "1gjhn4yyrh3i509m9f2k83chzpsnczb7cyzk93qb3lksq9rdins5";
+       libraryHaskellDepends = [ base ];
+       description = "lists with O(1) append";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "allocated-processor" = callPackage
     ({ mkDerivation, base, vector-space }:
      mkDerivation {
@@ -23703,8 +23639,8 @@ self: {
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
      mkDerivation {
        pname = "alsa-mixer";
-       version = "0.2.0.3";
-       sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp";
+       version = "0.3.0";
+       sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb";
        libraryHaskellDepends = [ alsa-core base unix ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -28127,8 +28063,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "appar";
-       version = "0.1.4";
-       sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
+       version = "0.1.5";
+       sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
@@ -28545,18 +28481,20 @@ self: {
   "arbor-monad-metric" = callPackage
     ({ mkDerivation, arbor-datadog, base, bytestring, containers
      , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens, mtl
-     , network, resourcet, stm, transformers
+     , network, resourcet, stm, text, transformers
      }:
      mkDerivation {
        pname = "arbor-monad-metric";
-       version = "0.0.4";
-       sha256 = "1g5d5a0lcx255002a02i0zc987pyimhm34h0vrbqaibapbp98yi0";
+       version = "1.1.0";
+       sha256 = "05924jv5m1jsx0l3px8m1a4hakadqvva5808lvfp6rpzssdjrwmb";
        libraryHaskellDepends = [
-         base containers generic-lens lens mtl resourcet stm transformers
+         base containers generic-lens lens mtl resourcet stm text
+         transformers
        ];
        testHaskellDepends = [
          arbor-datadog base bytestring containers generic-lens hedgehog
-         hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
+         hspec hw-hspec-hedgehog lens mtl network resourcet stm text
+         transformers
        ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
@@ -28570,8 +28508,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbor-monad-metric-datadog";
-       version = "0.0.3";
-       sha256 = "0dqidvn3nblnnnsiq0zqhg3d9b09bv1ksnrfyyibyi75mhvx3d3r";
+       version = "1.0.0";
+       sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc";
        libraryHaskellDepends = [
          arbor-datadog arbor-monad-metric base bytestring containers
          generic-lens lens mtl network resourcet stm text transformers
@@ -32278,6 +32216,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-lambda-haskell-runtime" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
+     , directory, filepath, hspec, microlens-platform, mtl
+     , optparse-generic, process, QuickCheck, relude, template-haskell
+     , text, wreq
+     }:
+     mkDerivation {
+       pname = "aws-lambda-haskell-runtime";
+       version = "1.0.4";
+       sha256 = "0cfmdgy0vn62gdi01r02k4yb87s4xv0xhyd06j5ws6ky6cpmmdwx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive conduit directory filepath
+         microlens-platform mtl optparse-generic process relude
+         template-haskell text wreq
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring case-insensitive conduit directory filepath
+         microlens-platform mtl optparse-generic process relude
+         template-haskell text wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive conduit directory filepath
+         hspec microlens-platform mtl optparse-generic process QuickCheck
+         relude template-haskell text wreq
+       ];
+       description = "Haskell runtime for AWS Lambda";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aws-lambda-runtime" = callPackage
     ({ mkDerivation, aeson, async, base, base-compat, bytestring
      , containers, deepseq, filepath, http-client, http-media
@@ -33592,23 +33561,6 @@ self: {
      }) {};
 
   "base64-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, containers, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "base64-bytestring";
-       version = "1.0.0.1";
-       sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring containers HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base64-bytestring_1_0_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , HUnit, QuickCheck, split, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -33627,7 +33579,6 @@ self: {
        ];
        description = "Fast base64 encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base64-bytestring-type" = callPackage
@@ -39046,8 +38997,8 @@ self: {
      }:
      mkDerivation {
        pname = "boomange";
-       version = "0.1.3.6";
-       sha256 = "0gdhvxjcbyzhxvrgzk70jaihgkxa03ycg4bls03rgnqy773p07f1";
+       version = "0.1.3.7";
+       sha256 = "1is7j497w2vgdyxyv7advgwmcc9yacjy41wkz3q1rva9lnzdhca9";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -39603,7 +39554,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_42_1" = callPackage
+  "brick_0_43" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
      , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
@@ -39611,8 +39562,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.42.1";
-       sha256 = "1ckisdvq0n5j35abz8as36jhp872yp3vjyxq1wbpf4lc1bnplw8k";
+       version = "0.43";
+       sha256 = "1vj0b31jlmwihdg2ggr82bngqnj9lxnkv2s0h5x21pizfx18c6kp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39627,6 +39578,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brick_0_44_1" = callPackage
+    ({ mkDerivation, base, config-ini, containers, contravariant
+     , data-clist, deepseq, directory, dlist, filepath, microlens
+     , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
+     , text, text-zipper, transformers, unix, vector, vty, word-wrap
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.44.1";
+       sha256 = "1d2nzinc2vqsznb5jydyfyb0zx7mga69w18hnhdkk1sxsrlvjra5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base config-ini containers contravariant data-clist deepseq
+         directory dlist filepath microlens microlens-mtl microlens-th stm
+         template-haskell text text-zipper transformers unix vector vty
+         word-wrap
+       ];
+       testHaskellDepends = [
+         base containers microlens QuickCheck vector
+       ];
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brick-dropdownmenu" = callPackage
     ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
      , microlens-th, pointedlist, vector, vty
@@ -40704,8 +40681,8 @@ self: {
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.7.3";
-       sha256 = "1hm4xg2f7ksyhdqfy3vnn2fvqc56ix6n3j3b2rdpcglnnda4qb9j";
+       version = "0.7.4";
+       sha256 = "1ivisgd7w7hi0yvfnm689grq0mfn03k2rmj5sn570qcpa4xfm2kw";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -45600,18 +45577,6 @@ self: {
      }) {};
 
   "chan" = callPackage
-    ({ mkDerivation, async, base, stm }:
-     mkDerivation {
-       pname = "chan";
-       version = "0.0.4";
-       sha256 = "07kykcgv4xdzby2s50wlqjjvcbgvda6prcz4jhg8qzfazngpn4g3";
-       libraryHaskellDepends = [ async base stm ];
-       testHaskellDepends = [ async base stm ];
-       description = "Some extra kit for Chans";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "chan_0_0_4_1" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
        pname = "chan";
@@ -45621,7 +45586,6 @@ self: {
        testHaskellDepends = [ async base stm ];
        description = "Some extra kit for Chans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chan-split" = callPackage
@@ -60501,7 +60465,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "dbus_1_1_1" = callPackage
+  "dbus_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
      , network, parsec, process, QuickCheck, random, resourcet, split
@@ -60510,8 +60474,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.1.1";
-       sha256 = "094js8lba0hr8421s968fil625n2gmzw3ryglz1dm8lx5wnlvwsz";
+       version = "1.2.1";
+       sha256 = "1mxijj32lvl6dxkpz95mxywq2hrj7krc9r8q41zbyqqx0hvc3n4r";
        libraryHaskellDepends = [
          base bytestring cereal conduit containers deepseq exceptions
          filepath lens network parsec random split template-haskell text
@@ -61158,20 +61122,21 @@ self: {
      }) {};
 
   "debug-me" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
-     , cryptonite, directory, filepath, graphviz, http-client
-     , http-client-tls, http-types, memory, mime-mail, network
-     , network-uri, optparse-applicative, posix-pty, process, protobuf
-     , sandi, stm, stm-chans, terminal-size, text, time
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cereal
+     , containers, cryptonite, directory, filepath, graphviz
+     , http-client, http-client-tls, http-types, memory, mime-mail
+     , network, network-uri, optparse-applicative, posix-pty, process
+     , protobuf, sandi, stm, stm-chans, terminal-size, text, time
      , unbounded-delays, unix, unordered-containers, utf8-string, uuid
      , wai, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "debug-me";
-       version = "1.20170810";
-       sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq";
+       version = "1.20181208";
+       sha256 = "0gnnhgqzhbhgc49y3md7440plgfv1wry8fk73f81s2f1c1agqh1i";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal filepath ];
        executableHaskellDepends = [
          aeson async base bytestring cereal containers cryptonite directory
          filepath graphviz http-client http-client-tls http-types memory
@@ -61548,8 +61513,8 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.9.1";
-       sha256 = "0dq914blk3w8yw29aw7pm4f3chkjh1v0jwvc1kr1j3v46jjxq17n";
+       version = "0.9.10";
+       sha256 = "0rvb7cv45xs087jrm4dmv9ajyx5kfs8n01cclc7msfg90fcs60fx";
        libraryHaskellDepends = [
          base bytestring containers foldl hashable primitive transformers
          unordered-containers vector
@@ -61697,22 +61662,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "1.11.0.3";
-       sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_1_11_0_4" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
@@ -61726,7 +61675,6 @@ self: {
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -62182,14 +62130,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "deque_0_2_6" = callPackage
+  "deque_0_2_7" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
      , tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "deque";
-       version = "0.2.6";
-       sha256 = "1jpapfa5lza9vpdj64a55imr9gjm19b7bwx773hb9fky77wrxn52";
+       version = "0.2.7";
+       sha256 = "1wshylwnajw3hhqnnb72rlb05m91br57gf32770xi2h4r0h30lcr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -72965,6 +72913,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_1_2_0" = 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
+     , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty
+     , tasty-hspec, tasty-hunit, text, time, transformers-base
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.2.0";
+       sha256 = "03ckizx7phz6jykj10s1vj7wfc454qzjq04jrmqhxsbrrqilhyk3";
+       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 safe-exceptions semigroups stm stm-chans streaming 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
+         safe-exceptions semigroups stm stm-chans streaming 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 {
@@ -74147,8 +74131,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.14.1";
-       sha256 = "03xlzxijs79l9q548yggfazr4rds4xg9hn2nmijp3q8wv5rn1srm";
+       version = "0.14.3";
+       sha256 = "1kzjrmj9zvjbr6j8gns81p212lnx9i60s5gdf67pwrww70abp5m6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74594,6 +74578,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "faktory" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
+     , cryptonite, hspec, markdown-unlit, megaparsec, memory, network
+     , random, safe-exceptions, scanner, text, time, unix
+     }:
+     mkDerivation {
+       pname = "faktory";
+       version = "1.0.0.0";
+       sha256 = "10dvgxipik8pw2cibmw65887ri1zssy2ha72r6x57flgkr0jal0j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring connection cryptonite megaparsec
+         memory network random safe-exceptions scanner text time unix
+       ];
+       executableHaskellDepends = [ aeson base safe-exceptions ];
+       testHaskellDepends = [ aeson base hspec markdown-unlit ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Faktory Worker for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "falling-turnip" = callPackage
     ({ mkDerivation, base, gloss, gloss-raster, JuicyPixels-repa
      , QuickCheck, random, repa, repa-algorithms, vector
@@ -76827,8 +76833,8 @@ self: {
      }:
      mkDerivation {
        pname = "fingertree";
-       version = "0.1.4.1";
-       sha256 = "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p";
+       version = "0.1.4.2";
+       sha256 = "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -78529,32 +78535,6 @@ self: {
      }) {};
 
   "focuslist" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
-     , genvalidity-containers, genvalidity-hspec, hedgehog, lens
-     , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "focuslist";
-       version = "0.1.0.0";
-       sha256 = "1przphis37yh06q2scqh2njcrvgynh0p9km52f4a5yvmnxvaqs8n";
-       revision = "1";
-       editedCabalFile = "1935ng4pxqhakz78fgwyliwmvdgnj9pq5344421jqa5krclywab5";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base containers lens mono-traversable QuickCheck
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity-containers genvalidity-hspec hedgehog lens
-         QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
-       ];
-       description = "Lists with a focused element";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "focuslist_0_1_0_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
      , genvalidity-containers, genvalidity-hspec, hedgehog, lens
      , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
@@ -78578,7 +78558,6 @@ self: {
        ];
        description = "Lists with a focused element";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce" = callPackage
@@ -79823,8 +79802,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.6.0";
-       sha256 = "1332awl3aps1zw537ym18jp1d5igwsnpk3acmrznks7vfsdr27as";
+       version = "0.0.7.0";
+       sha256 = "1aiifvfrz668lzxy41i82w19z6jc2xi9awhz6b07xv47f22qphgh";
        libraryHaskellDepends = [
          base constraints containers data-fix dlist free groups
          kan-extensions mtl natural-numbers transformers
@@ -80079,6 +80058,8 @@ self: {
        pname = "free-vector-spaces";
        version = "0.1.5.0";
        sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1";
+       revision = "1";
+       editedCabalFile = "0b95827ppw0nvhaxg9axkngsij2sj8d6s06amz2vi79jgs7vbfr6";
        libraryHaskellDepends = [
          base lens linear MemoTrie pragmatic-show vector vector-space
        ];
@@ -84287,6 +84268,8 @@ self: {
        pname = "gf";
        version = "3.10";
        sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
+       revision = "1";
+       editedCabalFile = "1g7l4j57h78vnjhkf7k21jfirykj4ghrj08xy8ylx8b5a4iilyrg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -86041,7 +86024,7 @@ self: {
 
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
+     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -86053,11 +86036,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gobject-introspection ];
+       libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) gobject-introspection;};
+     }) {inherit (pkgs) gobjectIntrospection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -86685,8 +86668,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.8.1.0";
-       sha256 = "1l0gwi92jb38a8maq96xxfjvjqyhlh3v21xvgkqszqappjzabcpd";
+       version = "0.8.2.0";
+       sha256 = "06k2imp511v4xxlzqgii14hf0ncnc6wci3hm7w48z332c5nk24m1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -86904,8 +86887,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20181121";
-       sha256 = "07fbnz3rr9dq76zx6cpxdxppkgb7wwhbrm9y89jdcpn8giaz0i6h";
+       version = "7.20181205";
+       sha256 = "0qh6s4ihbvxh3lqnwhzxfd0z06y5m6l5fy86cpf8xdmnaczgxk2d";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
@@ -91811,6 +91794,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graph-wrapper_0_2_5_2" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "graph-wrapper";
+       version = "0.2.5.2";
+       sha256 = "1kcdfr1bz2ks71gapz6wrzv7sj6qbmj1zadj1cmh39g9xvqjx94q";
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
+         array base containers deepseq hspec QuickCheck
+       ];
+       description = "A wrapper around the standard Data.Graph with a less awkward interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "graphbuilder" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -93091,6 +93091,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gtfs-realtime" = callPackage
+    ({ mkDerivation, base, protocol-buffers
+     , protocol-buffers-descriptor
+     }:
+     mkDerivation {
+       pname = "gtfs-realtime";
+       version = "0.2.0.0";
+       sha256 = "0ydi358ks9cswwqqdjhxhbasr9l34gmqjxwnvylp5zhgymnyjhl0";
+       libraryHaskellDepends = [
+         base protocol-buffers protocol-buffers-descriptor
+       ];
+       description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gtk" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
      , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
@@ -93248,8 +93263,8 @@ self: {
     ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
      mkDerivation {
        pname = "gtk-strut";
-       version = "0.1.2.1";
-       sha256 = "1m5vvyiyn4v6a8jhizcm8dyi20q2nag9ycm0c2hdxfhsl7fxbx31";
+       version = "0.1.3.0";
+       sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1";
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
        license = stdenv.lib.licenses.bsd3;
@@ -99188,7 +99203,7 @@ self: {
 
   "haskell-gi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobject-introspection
+     , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
      , text, transformers, xdg-basedir, xml-conduit
      }:
@@ -99201,12 +99216,11 @@ self: {
          haskell-gi-base mtl pretty-show process regex-tdfa safe text
          transformers xdg-basedir xml-conduit
        ];
-       libraryPkgconfigDepends = [ glib gobject-introspection ];
+       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobject-introspection;};
+     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -99946,6 +99960,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-exts_1_21_0" = 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.21.0";
+       sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm";
+       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 {
@@ -100070,6 +100105,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-stack-trace-plugin" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "haskell-stack-trace-plugin";
+       version = "0.1.0.0";
+       sha256 = "0rg920cc9l7vn29w10hdy68aw4jaxr64h3nxs8jb738h0n23bf50";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc ];
+       executableHaskellDepends = [ base ];
+       description = "haskell-stack-trace-plugin";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haskell-time-range" = callPackage
     ({ mkDerivation, base, doctest, lens, semigroups, text, time }:
      mkDerivation {
@@ -104346,8 +104395,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.10.8";
-       sha256 = "058lm0gfgqack5627ys1iwlwkqgcniqfnvjlabvhkq4643lgv6a1";
+       version = "0.10.10";
+       sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq errors HTTP mtl
          network network-uri resource-pool scanner stm text time tls
@@ -104362,31 +104411,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hedis_0_10_9" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, stm, test-framework, test-framework-hunit
-     , text, time, tls, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.10.9";
-       sha256 = "0y64h61w78pn3yn2hi3q41bbp5zwjlycjz2w23x6sh2w5b2xphw3";
-       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 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -108161,6 +108185,8 @@ self: {
        pname = "hledger-ui";
        version = "1.12";
        sha256 = "0cidm3kjlfnzfpsbzkbmfx36gm5msipkavw5267s67crzdcg8qwg";
+       revision = "1";
+       editedCabalFile = "0iy7kai1vqa4984l46rid3xjmxykyq2p0x4jgl4wdrcf9bgw7jf3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109748,25 +109774,28 @@ self: {
 
   "homplexity" = callPackage
     ({ mkDerivation, base, containers, cpphs, deepseq, directory
-     , filepath, happy, haskell-src-exts, hflags, template-haskell
-     , uniplate
+     , filepath, happy, haskell-src-exts, hflags, pqueue
+     , template-haskell, uniplate
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.4.3";
-       sha256 = "1gb4bkzkkka5kzq9zy085pivswxxp2bbi271dgjm6harlrlmnkk2";
+       version = "0.4.4.4";
+       sha256 = "14kzfaldbycwz8hwrmb4ig2nba9pxh808qqvl2djmsxqpcjq593k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags template-haskell uniplate
+         hflags pqueue template-haskell uniplate
        ];
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [
          base containers cpphs deepseq directory filepath haskell-src-exts
          hflags template-haskell uniplate
        ];
-       testHaskellDepends = [ base haskell-src-exts uniplate ];
+       testHaskellDepends = [
+         base containers cpphs deepseq directory filepath haskell-src-exts
+         hflags pqueue template-haskell uniplate
+       ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118007,6 +118036,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "htvm" = callPackage
+    ({ mkDerivation, array, base, bytestring, c2hs, containers
+     , deriving-compat, directory, Earley, filepath, mtl, pretty-show
+     , process, QuickCheck, recursion-schemes, tasty, tasty-hunit
+     , tasty-quickcheck, temporary, text, tvm_runtime
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "htvm";
+       version = "0.1.0.0";
+       sha256 = "0bf3dqyqrdi9mw72kp6hid4p6jk3gs5vw5fd1ycjgid218na7qmm";
+       libraryHaskellDepends = [
+         array base bytestring containers deriving-compat directory Earley
+         filepath mtl pretty-show process recursion-schemes temporary text
+         unordered-containers
+       ];
+       librarySystemDepends = [ tvm_runtime ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bytestring containers directory QuickCheck recursion-schemes
+         tasty tasty-hunit tasty-quickcheck temporary text
+       ];
+       testSystemDepends = [ tvm_runtime ];
+       description = "TVM bindings";
+       license = stdenv.lib.licenses.gpl3;
+     }) {tvm_runtime = null;};
+
   "htzaar" = callPackage
     ({ mkDerivation, base, OpenGL, random, SDL }:
      mkDerivation {
@@ -118635,8 +118691,8 @@ self: {
     ({ mkDerivation, aeson, base, hedgehog, hspec, text }:
      mkDerivation {
        pname = "hw-aeson";
-       version = "0.1.0.0";
-       sha256 = "0k9yzf8dfgqawyjgkk4s27ps3mcmxj3k6xqgrixym1vqzasjsp0d";
+       version = "0.1.0.1";
+       sha256 = "0ymjsadvwmbxc1lk913z31vcr50i88dx29i3g0x8zvm6vj6m96g0";
        libraryHaskellDepends = [ aeson base text ];
        testHaskellDepends = [ aeson base hedgehog hspec ];
        description = "Convenience functions for Aeson";
@@ -118665,27 +118721,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
-     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
-     , safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.7.0.4";
-       sha256 = "1si3y3wnp1ing32b6bbhxzy5ai971ipkd28qw8b15a3vqwlkk5gw";
-       libraryHaskellDepends = [
-         base bytestring hw-int hw-prim hw-string-parse safe vector
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
-         vector
-       ];
-       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
-       description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-bits_0_7_0_5" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
      , safe, vector
@@ -118704,7 +118739,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hw-prim vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-conduit" = callPackage
@@ -122492,26 +122526,6 @@ self: {
      }) {};
 
   "incremental-parser" = 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-parser_0_3_2_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
@@ -126937,15 +126951,15 @@ self: {
      }) {};
 
   "jord" = callPackage
-    ({ mkDerivation, base, haskeline, hspec, HUnit }:
+    ({ mkDerivation, base, criterion, haskeline, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.4.2.0";
-       sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc";
+       version = "0.5.0.0";
+       sha256 = "19rjqdvgbsgl62z3d2ggb5m7c5fassr7b3h5gsv9dp1zdp76sbbc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base haskeline ];
+       executableHaskellDepends = [ base criterion haskeline ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "Geographical Position Calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -130078,8 +130092,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "kind-apply";
-       version = "0.2.0.0";
-       sha256 = "1c98537cinsv0pdp8alcvqmbijxz7ac0cn7xxyla3mnnv5awk7zf";
+       version = "0.3.0.0";
+       sha256 = "1k4plkf7j0spjvi565zfg25fshm2lkh6xjb5a0mr9c5nmq3cp2q7";
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
        license = stdenv.lib.licenses.bsd3;
@@ -130090,14 +130104,30 @@ self: {
     ({ mkDerivation, base, kind-apply }:
      mkDerivation {
        pname = "kind-generics";
-       version = "0.2.1.0";
-       sha256 = "0j6r70gafcx3wg3rxhcm28gqlr7zpghl105imcqm2jgm5kb2189l";
+       version = "0.3.0.0";
+       sha256 = "0xkrijwhldgx742xj9nhr8268vdbbgk4pg9mj73c7j13laj27y8x";
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kind-generics-th" = callPackage
+    ({ mkDerivation, base, kind-generics, template-haskell
+     , th-abstraction
+     }:
+     mkDerivation {
+       pname = "kind-generics-th";
+       version = "0.1.0.0";
+       sha256 = "1dbx24yb8imy7sn9x6372ckdzhslxv9i0svzlwslaavbycpqyvzd";
+       libraryHaskellDepends = [
+         base kind-generics template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base kind-generics ];
+       description = "Template Haskell support for generating `GenericK` instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kinds" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -131918,12 +131948,12 @@ self: {
      }:
      mkDerivation {
        pname = "language-elm";
-       version = "0.1.1.3";
-       sha256 = "11g8jf7pbkb6gjwxjrwnk6hx38hjfymm421qnqd41cm0w2xmxbhh";
+       version = "0.2.0.0";
+       sha256 = "13hlkdkxybldwkri0r93pn14lbx9msj4vhyxkibkkjyx7hc9zi9i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
        libraryToolDepends = [ doctest ];
-       testHaskellDepends = [ base doctest hspec mtl pretty protolude ];
+       testHaskellDepends = [ base hspec mtl pretty protolude ];
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
@@ -136120,6 +136150,8 @@ self: {
        pname = "linearmap-category";
        version = "0.3.5.0";
        sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
+       revision = "1";
+       editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw";
        libraryHaskellDepends = [
          base call-stack constrained-categories containers
          free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -137001,8 +137033,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-zipper";
-       version = "0.0.7";
-       sha256 = "1lbvj76bgsc1z0d3lzxrlam96i5z6jd8iymd06wlm313mdmkpgxy";
+       version = "0.0.9";
+       sha256 = "1926a02k9z97arbr622w1j13h8kik6ba148glpnmnm5kyr8d5xk4";
        libraryHaskellDepends = [
          base comonad deriving-compat lens mtl semigroupoids semigroups
          transformers
@@ -141889,27 +141921,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, data-default-class
-     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
-     , vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.2.4.0";
-       sha256 = "1zk8jkd4rng80spwha6xcmvszwjx2h8gd5xfa39zncdikd94l2hk";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq ghc-prim primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base bytestring data-default deepseq hspec QuickCheck
-         safe-exceptions vector
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, data-default-class
      , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
      , vector
@@ -141928,7 +141939,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -142375,8 +142385,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.1.0";
-       sha256 = "02rwxq42my7347p1wb0jh50z1m6fqkifgxg2hd2vrxiwzblyz0qc";
+       version = "50200.1.1";
+       sha256 = "1s022iyid3msyvpimd88bs7684nvlxmalhwsp7bjxv4mlx3fz0zp";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -143182,6 +143192,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mega-sdist_0_3_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
+     , yaml
+     }:
+     mkDerivation {
+       pname = "mega-sdist";
+       version = "0.3.3.2";
+       sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra http-conduit optparse-simple
+         rio rio-orphans tar-conduit yaml
+       ];
+       description = "Handles uploading to Hackage from mega repos";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-discover, hspec-expectations
@@ -148126,8 +148156,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "more-containers";
-       version = "0.1.0.5";
-       sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm";
+       version = "0.1.1.0";
+       sha256 = "1gy7h36spmksn1d3vg56l93kfgd24im304ync20pzaymkbljh1gk";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "A few more collections";
@@ -154015,8 +154045,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.3.3.0";
-       sha256 = "06bi9vzq8alb4wylmq9npisnnpsc0r96srbmq68hmy6pjrva6rlg";
+       version = "0.4.0.0";
+       sha256 = "11z3xpivxd344fcq48vvjkvyl658f9mw7k7wqhgchzd5lsymx05s";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -154899,8 +154929,8 @@ self: {
      }:
      mkDerivation {
        pname = "nonempty-containers";
-       version = "0.1.0.0";
-       sha256 = "15800rd4hix5iab0n5k484za494zs110gyga8wn5xaag1axr4alp";
+       version = "0.1.1.0";
+       sha256 = "1vhpanz5n7fljc86kxif9kp9fr75wr87wy1fmawd7c5qmhk1b61k";
        libraryHaskellDepends = [
          base comonad containers deepseq semigroupoids these
        ];
@@ -156314,13 +156344,13 @@ self: {
      }) {};
 
   "observable" = callPackage
-    ({ mkDerivation, async, base, transformers }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "observable";
-       version = "0.1.1";
-       sha256 = "1mcjmna0fra3xcxxxq4a7rzndrmh752ps0ykim1ikcjrgh2r0cpp";
-       libraryHaskellDepends = [ async base transformers ];
-       description = "Make your action to be observable and listen events from them";
+       version = "0.1.4";
+       sha256 = "0x03da2pynbdlkgfrpzhbp7ld5dmggy6i1ggz0mg9vkdnl22sjl6";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Continuation patterns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -170248,14 +170278,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pretty-simple_2_2_0_0" = callPackage
+  "pretty-simple_2_2_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl
      , text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "2.2.0.0";
-       sha256 = "0cf7pfx98dq8ykxja7gi2y7zpczj41sqfg4dindm8v5knlv1ppik";
+       version = "2.2.0.1";
+       sha256 = "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171036,16 +171066,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_4_0" = callPackage
+  "process_1_6_5_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.4.0";
-       sha256 = "1w12ssmwpz5glmm964rxdc3fgi2w5sq9lac17rxs8p626r5p6rkn";
-       revision = "1";
-       editedCabalFile = "1sijph1gkqbdsdbwqlibhglzsdscmhskpys71b3lzlw0ga7c3k0a";
+       version = "1.6.5.0";
+       sha256 = "0a04jch13d0va47yhkf1ni7pk9hxsdr3m4h8645r4qs0mzvsby60";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -171468,6 +171496,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profunctor-monad" = callPackage
+    ({ mkDerivation, base, constraints, hashable, mtl, profunctors
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "profunctor-monad";
+       version = "0.1.0.0";
+       sha256 = "15lz4mbf7jcg19gn0hh9q58713p26hvbm5q0sa4baxrwk9n3rghs";
+       libraryHaskellDepends = [ base constraints profunctors ];
+       testHaskellDepends = [
+         base hashable mtl transformers unordered-containers
+       ];
+       description = "Monadic bidirectional programming";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "profunctors" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, semigroups, tagged, transformers
@@ -172138,14 +172182,36 @@ self: {
      }) {inherit (pkgs) libpulseaudio;};
 
   "proteome" = callPackage
-    ({ mkDerivation, base, nvim-hs }:
+    ({ mkDerivation, ansi-terminal, base, containers
+     , data-default-class, deepseq, directory, filepath, hslogger, HTF
+     , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
+     , prettyprinter, process, resourcet, split, stm, strings, text
+     , time, unliftio, utf8-string
+     }:
      mkDerivation {
        pname = "proteome";
-       version = "0.1.0.0";
-       sha256 = "13c4hrgc1vxvwmzw49djvp22y80z2cndqbqcd4fy4rm6hd6zbs81";
-       isLibrary = false;
+       version = "0.3.2.0";
+       sha256 = "00raq54s0a0ayrpk30jwy9rsjngbdx0phxpn7qairl94jwqr8wjw";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ base nvim-hs ];
+       libraryHaskellDepends = [
+         ansi-terminal base containers data-default-class deepseq directory
+         filepath hslogger lens messagepack MissingH mtl nvim-hs
+         pretty-terminal prettyprinter process resourcet split stm strings
+         text time unliftio utf8-string
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base containers data-default-class deepseq directory
+         filepath hslogger lens messagepack MissingH mtl nvim-hs
+         pretty-terminal prettyprinter process resourcet split stm strings
+         text time unliftio utf8-string
+       ];
+       testHaskellDepends = [
+         ansi-terminal base containers data-default-class deepseq directory
+         filepath hslogger HTF lens messagepack MissingH mtl nvim-hs
+         pretty-terminal prettyprinter process resourcet split stm strings
+         text time unliftio utf8-string
+       ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -173669,24 +173735,25 @@ self: {
 
   "push-notify-apn" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
-     , containers, data-default, http2, http2-client
-     , optparse-applicative, random, text, time, tls, x509, x509-store
+     , containers, data-default, hspec, http2, http2-client
+     , optparse-applicative, random, semigroups, text, time, tls, x509
+     , x509-store
      }:
      mkDerivation {
        pname = "push-notify-apn";
-       version = "0.1.0.8";
-       sha256 = "1077sgc2fhaf99y7p09638bx3w1xlayg2jsf0sf2g85rc6j971nd";
+       version = "0.1.1.0";
+       sha256 = "06hm83g88mbaikx3gy51vkslhhpvy5ipajwgyxcczkvh7x4a3z2j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring containers
-         data-default http2 http2-client random text time tls x509
-         x509-store
+         data-default http2 http2-client random semigroups text time tls
+         x509 x509-store
        ];
        executableHaskellDepends = [
-         base bytestring optparse-applicative text
+         base bytestring optparse-applicative semigroups text
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174339,6 +174406,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "qsem" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "qsem";
+       version = "0.1.0.0";
+       sha256 = "1y9c22jr0frflgzmpzpz4d7zgcz7wbql8xwr6bx912rh6gm4gx9h";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "quantity semaphores";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "qt" = callPackage
     ({ mkDerivation, base, OpenGL, qtc_core, qtc_gui, qtc_network
      , qtc_opengl, qtc_script, qtc_tools
@@ -175131,8 +175209,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.4.2";
-       sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3";
+       version = "0.4.3";
+       sha256 = "0f9hsjhrnab8gy51m4m1fn5i594ixx1qw14hsfwsakbn8f78aarx";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers exceptions lifted-async matrix
          monad-control mtl pretty-show QuickCheck split stm tree-diff vector
@@ -177379,6 +177457,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) re2;};
 
+  "re2_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, re2, vector }:
+     mkDerivation {
+       pname = "re2";
+       version = "0.3";
+       sha256 = "0slrbgpqccnxywy0aqlg65w6kzvfiqsf0n273m8cv3c32wvkw8nb";
+       libraryHaskellDepends = [ base bytestring vector ];
+       librarySystemDepends = [ re2 ];
+       testHaskellDepends = [ base bytestring HUnit vector ];
+       description = "Bindings to the re2 regular expression library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) re2;};
+
   "react-flux" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, mtl
      , template-haskell, text, time, unordered-containers
@@ -179369,6 +179461,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex-generator" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , exceptions, hspec, HUnit, random, regex-pcre
+     }:
+     mkDerivation {
+       pname = "regex-generator";
+       version = "0.1.0.3";
+       sha256 = "0b8mgjnmdmiiliwnvq2qbn5af427swvzawa3az5w1xab8xszc9nl";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers exceptions random
+       ];
+       testHaskellDepends = [
+         base bytestring hspec HUnit random regex-pcre
+       ];
+       description = "Generate a random string from a PCRE";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "regex-genex" = callPackage
     ({ mkDerivation, base, containers, logict, mtl, regex-tdfa, sbv
      , stream-monad, text
@@ -179840,23 +179950,23 @@ self: {
 
   "registry" = callPackage
     ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
-     , io-memoize, MonadRandom, protolude, random, resourcet, tasty
+     , io-memoize, MonadRandom, mtl, protolude, random, resourcet, tasty
      , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.1.2";
-       sha256 = "0shcp8capsxs8avaslfj6f0zmqxishmiymy848igfsfdi7m4apl4";
+       version = "0.1.2.0";
+       sha256 = "1y2fvb5qf2gz3nzw983v7r1xgdxxxg0n62sambngf7w8pww5p27d";
        libraryHaskellDepends = [
-         base exceptions protolude resourcet text transformers-base
+         base exceptions mtl protolude resourcet text transformers-base
        ];
        testHaskellDepends = [
          async base exceptions hedgehog hedgehog-corpus io-memoize
-         MonadRandom protolude random resourcet tasty tasty-discover
+         MonadRandom mtl protolude random resourcet tasty tasty-discover
          tasty-hedgehog tasty-th text transformers-base
        ];
        testToolDepends = [ tasty-discover ];
-       description = "data structure for assembling \"components\"";
+       description = "data structure for assembling components";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -182626,8 +182736,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.5.0";
-       sha256 = "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g";
+       version = "0.1.6.0";
+       sha256 = "0fwrzlh36rrv42qmavspr1km1yawhh54hw51bnklnr5bhf8vrpl2";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -183130,6 +183240,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "roc-id" = callPackage
+    ({ mkDerivation, base, generic-arbitrary, hspec, MonadRandom, Only
+     , QuickCheck, text, vector-sized
+     }:
+     mkDerivation {
+       pname = "roc-id";
+       version = "0.1.0.0";
+       sha256 = "0ac4hrl6qihrhcyx41rf0qnmf9bi848nhdgs71mq3i9gqbnxfi1i";
+       libraryHaskellDepends = [
+         base MonadRandom Only text vector-sized
+       ];
+       testHaskellDepends = [
+         base generic-arbitrary hspec MonadRandom Only QuickCheck text
+         vector-sized
+       ];
+       description = "Implementation of the ROC National ID standard";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rocksdb-haskell" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, directory
      , filepath, hspec, hspec-expectations, process, QuickCheck
@@ -195278,29 +195407,6 @@ self: {
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, directory, filepath, hxt
-     , mtl, regex-pcre-builtin, safe, skylighting-core, text
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting";
-       version = "0.7.4";
-       sha256 = "0w1cv21rm4ssmr2zbn7bamlfc2pkswxg5plvqzrf7rs4h1y43672";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-pcre-builtin safe skylighting-core text
-         utf8-string
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "skylighting_0_7_5" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -195321,42 +195427,9 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-core" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, criterion, Diff, directory
-     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
-     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting-core";
-       version = "0.7.4";
-       sha256 = "1awddq9cn5gyafz97ir21rncq97k2gzfxijn2xmxw35qhr2kbfl0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-pcre-builtin safe text transformers
-         utf8-string
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath HUnit
-         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory filepath text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "skylighting-core_0_7_5" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -195386,7 +195459,6 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skype4hs" = callPackage
@@ -196546,8 +196618,8 @@ self: {
        pname = "snap-loader-dynamic";
        version = "1.0.0.0";
        sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
-       revision = "2";
-       editedCabalFile = "1q5lal77sgxwcwbabw5rqwlrx84xv1c24zs2ry2gz57ccdr6n9qm";
+       revision = "3";
+       editedCabalFile = "0kk3viaz5hikj9815ja9l3fqq3653vx7q9jamkz68hyfxyvf8qxh";
        libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
@@ -196563,8 +196635,8 @@ self: {
        pname = "snap-loader-static";
        version = "1.0.0.0";
        sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas";
-       revision = "2";
-       editedCabalFile = "1f9dn3x8m53rywlmmn274cfh0ahvaz9vqfc6cwc79bmbz0r7fq1z";
+       revision = "3";
+       editedCabalFile = "07f2j0fsw6hhg6qjzfis72ka9dd7iijx09lwypp2mk0qsx6y63bi";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
@@ -200506,8 +200578,8 @@ self: {
        pname = "stack";
        version = "1.9.3";
        sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf";
-       revision = "1";
-       editedCabalFile = "1d6hf71l2i94xhx23jxl3qapidw7v73kig8m2as5kxdymnpfh48r";
+       revision = "2";
+       editedCabalFile = "1cza3s075a1rnfkyr8ds471lf96ah0zrmgzaxyj61nll40xyrl0b";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -201075,6 +201147,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-to-hackage" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , extra, filepath, HsOpenSSL, HsYAML, http-streams, network-uri
+     , optparse-applicative, semigroupoids, text
+     }:
+     mkDerivation {
+       pname = "stackage-to-hackage";
+       version = "1.0.2";
+       sha256 = "0s474q0hwz917vhh9hmx33j9jjbgm58ajgl0wacw8hfbs8awwk20";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal containers directory extra filepath HsOpenSSL
+         HsYAML http-streams network-uri optparse-applicative semigroupoids
+         text
+       ];
+       description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
+       license = stdenv.lib.licenses.gpl3Plus;
+     }) {};
+
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, safe, semigroups, text, time, unordered-containers
@@ -208376,17 +208468,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "1.2.0.7";
-       sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_2_0_8" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -208395,7 +208476,6 @@ self: {
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
@@ -210103,12 +210183,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "terminfo_0_4_1_2" = callPackage
+  "terminfo_0_4_1_3" = callPackage
     ({ mkDerivation, base, ncurses }:
      mkDerivation {
        pname = "terminfo";
-       version = "0.4.1.2";
-       sha256 = "0g5y4s82bh26wj3x3f7g3s4qipnxvg71m3xw32rqy59inwxvvpsm";
+       version = "0.4.1.3";
+       sha256 = "09hf9wrp2q3k4y9fcp4fzmk34zh7hfmp0mfqxc0v6h5clajdbvai";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        description = "Haskell bindings to the terminfo library";
@@ -213916,6 +213996,8 @@ self: {
        pname = "timeit";
        version = "2.0";
        sha256 = "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1";
+       revision = "1";
+       editedCabalFile = "0d4vjg48xyqjmydnjqjxica0zr30vgb91b3vv75cig686ikpjmq7";
        libraryHaskellDepends = [ base ];
        description = "Time monadic computations with an IO base";
        license = stdenv.lib.licenses.bsd3;
@@ -219438,6 +219520,56 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ucam-webauth" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , cryptonite, errors, generic-random, here, hspec, hspec-discover
+     , http-api-data, http-types, microlens, microlens-mtl, mtl
+     , parser-combinators, pem, QuickCheck, quickcheck-instances, text
+     , time, time-qq, ucam-webauth-types, x509
+     }:
+     mkDerivation {
+       pname = "ucam-webauth";
+       version = "0.1.0.0";
+       sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
+       revision = "2";
+       editedCabalFile = "1myl5nncwmld4hr0b9990dnqn9ydvza5ciqw5b8pjl747g9qky9f";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers cryptonite errors
+         http-api-data http-types microlens microlens-mtl mtl
+         parser-combinators pem text time ucam-webauth-types x509
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers cryptonite errors
+         generic-random here hspec http-api-data http-types microlens
+         microlens-mtl mtl parser-combinators pem QuickCheck
+         quickcheck-instances text time time-qq ucam-webauth-types x509
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "The Ucam-Webauth protocol, used by Raven";
+       license = "(BSD-3-Clause OR Apache-2.0)";
+     }) {};
+
+  "ucam-webauth-types" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, hspec, hspec-discover
+     , http-types, microlens, microlens-mtl, mtl, text, time, timerep
+     }:
+     mkDerivation {
+       pname = "ucam-webauth-types";
+       version = "0.1.0.0";
+       sha256 = "0jq66amdmrbkg69m0cbbw7xfvsc9iy74khn1k39n7jkq821pzjni";
+       revision = "2";
+       editedCabalFile = "1pbl2sy17pkc15170h96ard4z155fm45g18jdxjcdx9hacl003rw";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq http-types microlens microlens-mtl mtl text time timerep
+       ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Types for the Ucam-Webauth protocol, as used by Raven";
+       license = "(BSD-3-Clause OR Apache-2.0)";
+     }) {};
+
   "uconv" = callPackage
     ({ mkDerivation, base, icu }:
      mkDerivation {
@@ -221051,6 +221183,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "unlifted-list" = callPackage
+    ({ mkDerivation, base, ghc-prim, semigroups }:
+     mkDerivation {
+       pname = "unlifted-list";
+       version = "0.1.0.0";
+       sha256 = "06ygxv8c1435rn9yrg27l1zsihzh4argqn677g0qrigw6wcvn0gg";
+       libraryHaskellDepends = [ base ghc-prim semigroups ];
+       description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unliftio" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
@@ -221323,6 +221466,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unparse-attoparsec" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, constraints
+     , mtl, profunctor-monad, profunctors, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "unparse-attoparsec";
+       version = "0.1.0.0";
+       sha256 = "1xkvjdnnks7897fgnk93vn1xsvg67yvr8p7jnsbsmsdhd5d6c5fs";
+       libraryHaskellDepends = [
+         attoparsec base bytestring mtl profunctors
+       ];
+       testHaskellDepends = [
+         aeson base bytestring constraints mtl profunctor-monad profunctors
+         scientific text unordered-containers vector
+       ];
+       description = "An attoparsec roundtrip";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "unroll-ghc-plugin" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -223707,20 +223870,19 @@ self: {
      }) {};
 
   "vector" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
-     , QuickCheck, random, template-haskell, test-framework
+    ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
+     , primitive, QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "vector";
-       version = "0.12.0.1";
-       sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
-       revision = "3";
-       editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
+       version = "0.12.0.2";
+       sha256 = "1wy0pfa3ks6s2dkp1fwrl1s9d3wjmqy9d09icnwfs2zimyn9vs2j";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
-         base HUnit QuickCheck random template-haskell test-framework
-         test-framework-hunit test-framework-quickcheck2 transformers
+         base base-orphans HUnit primitive QuickCheck random
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers
        ];
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -224517,24 +224679,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.24";
-       sha256 = "15dknzkrbmb79w2vny2fqyx02350dfkhamx931jgvibgy82hj4w9";
-       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_25" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -224550,7 +224694,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -225216,8 +225359,8 @@ self: {
      }:
      mkDerivation {
        pname = "vt-utils";
-       version = "1.0.0.0";
-       sha256 = "0mvf5y2mpcxccjsi0h3p0ljwlrhw080wm4j2n1rw2zxh5yvvhlxc";
+       version = "1.0.1.0";
+       sha256 = "1a33bxnyyhs4ibnrgz5472bqvg4irqh4z5cv0wcwmmpi8s4i629w";
        libraryHaskellDepends = [
          aeson base bytestring directory HUnit parsec text time
          unordered-containers vector
@@ -228685,18 +228828,16 @@ self: {
 
   "wedged" = callPackage
     ({ mkDerivation, array, base, colour, containers, diagrams-lib
-     , diagrams-rasterific, MonadRandom, strict
+     , diagrams-postscript, MonadRandom, strict
      }:
      mkDerivation {
        pname = "wedged";
-       version = "2";
-       sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs";
-       revision = "1";
-       editedCabalFile = "0b3wq7pcz0m5qz7d9np5lhi3yh76ksx1v14bvsd6krr49p742zg5";
+       version = "3";
+       sha256 = "1v7xc7bnyhlb2fs0j8zafbnvzyl0hsdyl59f0kibmn0w6sxq34xl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base colour containers diagrams-lib diagrams-rasterific
+         array base colour containers diagrams-lib diagrams-postscript
          MonadRandom strict
        ];
        description = "Wedged postcard generator";
@@ -232482,8 +232623,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.29.1";
-       sha256 = "0q8ssd51r1bdm6rr5frlq0v00c4af8xgc3zgs4sa23yy3yf9gzrm";
+       version = "0.29.2";
+       sha256 = "1bykaaf9jhzplvgql9am0pn8zyinnnvgr4kbfmbhal67jxyz8b2f";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -234808,42 +234949,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, 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.8.1";
-       sha256 = "0kqgpcz1jihc80haidzx6cm75ak139q41195j8l3gz1vwbf94i9j";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types monad-logger mtl
-         parsec path-pieces primitive random resourcet rio shakespeare
-         template-haskell text time transformers unix-compat unliftio
-         unordered-containers vector wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_9" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -234877,7 +234982,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage

From 19f8bedb02249c5e5128485abe60c06d330ae971 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Dec 2018 02:30:54 +0100
Subject: [PATCH 1928/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ae41ad7ac3808fe2ace867989ae7c2830449c3ce.
---
 .../haskell-modules/hackage-packages.nix      | 256 ++++++++++++++----
 1 file changed, 206 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7bf3cc2bdb2..a9f88e4cad9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12253,8 +12253,8 @@ self: {
        pname = "MissingH";
        version = "1.4.0.1";
        sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
-       revision = "1";
-       editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
+       revision = "2";
+       editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb";
        libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
@@ -15212,8 +15212,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, hspec }:
      mkDerivation {
        pname = "RLP";
-       version = "1.1.0";
-       sha256 = "11jkzq6qnh449ilj2lk6snfs3sn66nbybj751pqg9vgkqjfab2yy";
+       version = "1.1.1";
+       sha256 = "075hv3ljc47zr5xkvmbiqq666cgicvwl90isq2n45x9nsbg441d1";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
@@ -23427,8 +23427,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "alist";
-       version = "0.1.0.2";
-       sha256 = "1gjhn4yyrh3i509m9f2k83chzpsnczb7cyzk93qb3lksq9rdins5";
+       version = "0.1.0.3";
+       sha256 = "0asm8kp7xsqs1r5x65j4nhdbzs2sk1w5yh0f9g6sn6k03acg8gcr";
        libraryHaskellDepends = [ base ];
        description = "lists with O(1) append";
        license = stdenv.lib.licenses.bsd3;
@@ -73043,6 +73043,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "exact-pi_0_5_0_0" = callPackage
+    ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "exact-pi";
+       version = "0.5.0.0";
+       sha256 = "03rwpqgk3j965pgfbch38k7ghhdwa76rdg9is11kmwr7mff2wm0x";
+       libraryHaskellDepends = [ base numtype-dk ];
+       testHaskellDepends = [
+         base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Exact rational multiples of pi (and integer powers of pi)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exact-real" = callPackage
     ({ mkDerivation, base, checkers, criterion, directory, doctest
      , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty
@@ -74205,6 +74222,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_14" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.14";
+       sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -75533,6 +75567,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "fedora-dists" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fedora-dists";
+       version = "1.0.0.1";
+       sha256 = "0x5lccpwcf2cd97vnqlzyi4lgbyhqcs5ks1sr3l33h1zffpb0br8";
+       libraryHaskellDepends = [ base ];
+       description = "Library for Fedora distribution versions";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "fedora-haskell-tools" = callPackage
     ({ mkDerivation, base, directory, filepath, process, time, unix }:
      mkDerivation {
@@ -108183,10 +108228,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.12";
-       sha256 = "0cidm3kjlfnzfpsbzkbmfx36gm5msipkavw5267s67crzdcg8qwg";
-       revision = "1";
-       editedCabalFile = "0iy7kai1vqa4984l46rid3xjmxykyq2p0x4jgl4wdrcf9bgw7jf3";
+       version = "1.12.1";
+       sha256 = "0ifyp2kawi4x0slnv5gkcgn8v6vx6d9q56x6zjpfzslajqfwfk8y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108326,8 +108369,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.11";
-       sha256 = "0nv6627dacfsfjd3irmkff06hj1hr194zpm9xq6ng93dxhkhsnab";
+       version = "2.1.12";
+       sha256 = "1d3gbvjs7zg9n4fbj2b3c5wn5xf2idygx9cqjdbmgndk3jic9rbx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -110120,24 +110163,24 @@ self: {
   "hoogle" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
      , conduit-extra, connection, containers, deepseq, directory, extra
-     , filepath, haskell-src-exts, http-conduit, http-types, js-flot
-     , js-jquery, mmap, network, network-uri, old-locale, process-extras
-     , QuickCheck, resourcet, storable-tuple, tar, template-haskell
-     , text, time, transformers, uniplate, utf8-string, vector, wai
-     , wai-logger, warp, warp-tls, zlib
+     , filepath, foundation, hashable, haskell-src-exts, http-conduit
+     , http-types, js-flot, js-jquery, mmap, network-uri, old-locale
+     , process-extras, QuickCheck, resourcet, storable-tuple, tar
+     , template-haskell, text, time, transformers, uniplate, utf8-string
+     , vector, wai, wai-logger, warp, warp-tls, zlib
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.3";
-       sha256 = "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6";
+       version = "5.0.17.4";
+       sha256 = "059dys3vlbxpd4kx1nrjib1ww9rqkk9am3gdsy3d8vl0fxx2p6s9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cmdargs conduit conduit-extra
-         connection containers deepseq directory extra filepath
-         haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri old-locale process-extras QuickCheck resourcet
+         connection containers deepseq directory extra filepath foundation
+         hashable haskell-src-exts http-conduit http-types js-flot js-jquery
+         mmap network-uri old-locale process-extras QuickCheck resourcet
          storable-tuple tar template-haskell text time transformers uniplate
          utf8-string vector wai wai-logger warp warp-tls zlib
        ];
@@ -114003,6 +114046,8 @@ self: {
        pname = "hslogger";
        version = "1.2.12";
        sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr";
+       revision = "1";
+       editedCabalFile = "1rk2lrg3959nbgbyd1aacvwbv865lsrnczqdmj4ivkfn0c8nkidh";
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
@@ -119607,6 +119652,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hwormhole" = callPackage
+    ({ mkDerivation, aeson, async, base, binary, binary-conduit
+     , bytestring, conduit, conduit-extra, containers, cryptonite
+     , directory, filepath, haskeline, hedgehog, hex, hspec
+     , magic-wormhole, memory, mtl, network, network-info
+     , optparse-applicative, pathwalk, protolude, random, saltine
+     , spake2, temporary, text, transformers, unix-compat, zip
+     }:
+     mkDerivation {
+       pname = "hwormhole";
+       version = "0.1.0.0";
+       sha256 = "1nl9p0kd4nqrdhwms868mr6h904pl282i5ljhai7kvxr8s7v2s9v";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson async base binary bytestring conduit conduit-extra containers
+         cryptonite directory filepath haskeline hex magic-wormhole memory
+         mtl network network-info pathwalk protolude random saltine spake2
+         temporary text transformers unix-compat zip
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring optparse-applicative protolude text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base binary binary-conduit bytestring conduit conduit-extra
+         containers hedgehog hspec magic-wormhole protolude saltine text
+       ];
+       description = "magic-wormhole client";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hws" = callPackage
     ({ mkDerivation, array, base, containers, directory, haskell98
      , html, mtl, network, old-time, regex-compat, text, unix
@@ -145115,6 +145193,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "minimorph_0_2_0_0" = callPackage
+    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "minimorph";
+       version = "0.2.0.0";
+       sha256 = "10dymy3l433rwsv30kldvm12yr27x2fw2b4cdrbbwjqwv5m9rm9c";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       description = "English spelling functions with an emphasis on simplicity";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minimung" = callPackage
     ({ mkDerivation, base, GLUT, haskell98, unix }:
      mkDerivation {
@@ -145291,6 +145386,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miniutter_0_5_0_0" = callPackage
+    ({ mkDerivation, base, binary, containers, HUnit, minimorph
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "miniutter";
+       version = "0.5.0.0";
+       sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base binary containers minimorph text ];
+       testHaskellDepends = [
+         base containers HUnit test-framework test-framework-hunit text
+       ];
+       description = "Simple English clause creation from arbitrary words";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minlen" = callPackage
     ({ mkDerivation, base, mono-traversable, semigroups, transformers
      }:
@@ -152260,19 +152373,23 @@ self: {
      }) {ghc-binary = null;};
 
   "net-spider" = callPackage
-    ({ mkDerivation, aeson, base, containers, greskell
-     , greskell-websocket, hashable, hspec, safe-exceptions, text, time
+    ({ mkDerivation, aeson, base, containers, data-interval, doctest
+     , doctest-discover, extended-reals, greskell, greskell-websocket
+     , hashable, hspec, monad-logger, safe-exceptions, text, time
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "net-spider";
-       version = "0.1.0.0";
-       sha256 = "0vhvq29dr8s3w5acjpaha3k4g14li970rpx405dpj66l96pk2a7x";
+       version = "0.2.0.0";
+       sha256 = "0xka2fa5zxznm2fg5xmc2c2ppamwybdlmh5jqy00ivxjmliy20s0";
        libraryHaskellDepends = [
-         aeson base containers greskell greskell-websocket hashable
-         safe-exceptions text time unordered-containers vector
+         aeson base containers data-interval extended-reals greskell
+         greskell-websocket hashable monad-logger safe-exceptions text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base doctest doctest-discover hspec vector
        ];
-       testHaskellDepends = [ base hspec vector ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156347,8 +156464,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "observable";
-       version = "0.1.4";
-       sha256 = "0x03da2pynbdlkgfrpzhbp7ld5dmggy6i1ggz0mg9vkdnl22sjl6";
+       version = "0.1.5";
+       sha256 = "0hi9y867yg48nv0756ylblxmsdw9vkfg72n0bb0ali227695d6qb";
        libraryHaskellDepends = [ base transformers ];
        description = "Continuation patterns";
        license = stdenv.lib.licenses.bsd3;
@@ -172182,7 +172299,7 @@ self: {
      }) {inherit (pkgs) libpulseaudio;};
 
   "proteome" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , data-default-class, deepseq, directory, filepath, hslogger, HTF
      , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
      , prettyprinter, process, resourcet, split, stm, strings, text
@@ -172190,27 +172307,27 @@ self: {
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.2.0";
-       sha256 = "00raq54s0a0ayrpk30jwy9rsjngbdx0phxpn7qairl94jwqr8wjw";
+       version = "0.3.4.0";
+       sha256 = "1vyy8raj5xvdi8cik3f0awd1k6vi6bqikngpf4sqrvbgc5k3sr94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base containers data-default-class deepseq directory
-         filepath hslogger lens messagepack MissingH mtl nvim-hs
-         pretty-terminal prettyprinter process resourcet split stm strings
-         text time unliftio utf8-string
+         aeson ansi-terminal base bytestring containers data-default-class
+         deepseq directory filepath hslogger lens messagepack MissingH mtl
+         nvim-hs pretty-terminal prettyprinter process resourcet split stm
+         strings text time unliftio utf8-string
        ];
        executableHaskellDepends = [
-         ansi-terminal base containers data-default-class deepseq directory
-         filepath hslogger lens messagepack MissingH mtl nvim-hs
-         pretty-terminal prettyprinter process resourcet split stm strings
-         text time unliftio utf8-string
+         aeson ansi-terminal base bytestring containers data-default-class
+         deepseq directory filepath hslogger lens messagepack MissingH mtl
+         nvim-hs pretty-terminal prettyprinter process resourcet split stm
+         strings text time unliftio utf8-string
        ];
        testHaskellDepends = [
-         ansi-terminal base containers data-default-class deepseq directory
-         filepath hslogger HTF lens messagepack MissingH mtl nvim-hs
-         pretty-terminal prettyprinter process resourcet split stm strings
-         text time unliftio utf8-string
+         aeson ansi-terminal base bytestring containers data-default-class
+         deepseq directory filepath hslogger HTF lens messagepack MissingH
+         mtl nvim-hs pretty-terminal prettyprinter process resourcet split
+         stm strings text time unliftio utf8-string
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
@@ -230414,6 +230531,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wreq_0_5_3_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec
+     , authenticate-oauth, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, cabal-doctest, case-insensitive, containers
+     , cryptonite, directory, doctest, exceptions, filepath, ghc-prim
+     , hashable, http-client, http-client-tls, http-types, HUnit, lens
+     , lens-aeson, memory, mime-types, network-info, psqueues
+     , QuickCheck, snap-core, snap-server, template-haskell, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, time-locale-compat, transformers, unix-compat
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "wreq";
+       version = "0.5.3.1";
+       sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base base16-bytestring
+         bytestring case-insensitive containers cryptonite exceptions
+         ghc-prim hashable http-client http-client-tls http-types lens
+         lens-aeson memory mime-types psqueues template-haskell text time
+         time-locale-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring
+         case-insensitive containers directory doctest filepath hashable
+         http-client http-types HUnit lens lens-aeson network-info
+         QuickCheck snap-core snap-server temporary test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat unordered-containers uuid vector
+       ];
+       description = "An easy-to-use HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wreq-sb" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
@@ -232623,8 +232779,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.29.2";
-       sha256 = "1bykaaf9jhzplvgql9am0pn8zyinnnvgr4kbfmbhal67jxyz8b2f";
+       version = "0.29.3";
+       sha256 = "1bg8nj9k8r7i7328djnf6bgqzdq7lgx9yjgvl9fqq76bkxzkgx0a";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -236993,8 +237149,8 @@ self: {
        pname = "yoctoparsec";
        version = "0.1.0.0";
        sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp";
-       revision = "1";
-       editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9";
+       revision = "2";
+       editedCabalFile = "149a34hpbm6fkkmck70wgqg6792yl91kjirpwf6wdkkr4ga0v514";
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;

From 3ab58ceaabe58d25902cdf626a1eaa220c39218b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Dec 2018 02:30:42 +0100
Subject: [PATCH 1929/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/574fb20f4cd8bd5c95730eb7fe3405ed80ebc87a.
---
 .../haskell-modules/hackage-packages.nix      | 315 +++++++++++++-----
 1 file changed, 232 insertions(+), 83 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a9f88e4cad9..cb888a6b446 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1618,26 +1618,27 @@ self: {
      }) {};
 
   "BiobaseTypes" = callPackage
-    ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal
-     , cereal-text, cereal-vector, containers, data-default, deepseq
-     , hashable, intern, lens, mtl, primitive, PrimitiveArray
-     , QuickCheck, string-conversions, tasty, tasty-quickcheck, tasty-th
-     , text, text-binary, utf8-string, vector, vector-binary-instances
+    ({ mkDerivation, aeson, attoparsec, base, bimaps, binary
+     , bytestring, cereal, cereal-text, cereal-vector, containers
+     , data-default, deepseq, ForestStructures, hashable, intern, lens
+     , mtl, primitive, PrimitiveArray, QuickCheck, SciBaseTypes
+     , string-conversions, tasty, tasty-quickcheck, tasty-th, text
+     , text-binary, utf8-string, vector, vector-binary-instances
      , vector-th-unbox
      }:
      mkDerivation {
        pname = "BiobaseTypes";
-       version = "0.1.3.0";
-       sha256 = "15yzg4llvz7pq5f0chfwrkaqspwrqxan4xvczrk4mvwa07z3abbp";
+       version = "0.1.4.0";
+       sha256 = "1ih3l72i9ahgxb261y43gncdrha3jpzkpavvhbsyqv6vi7pgcj4r";
        libraryHaskellDepends = [
-         aeson base bimaps binary bytestring cereal cereal-text
-         cereal-vector containers data-default deepseq hashable intern lens
-         mtl primitive PrimitiveArray QuickCheck string-conversions text
-         text-binary utf8-string vector vector-binary-instances
-         vector-th-unbox
+         aeson attoparsec base bimaps binary bytestring cereal cereal-text
+         cereal-vector containers data-default deepseq ForestStructures
+         hashable intern lens mtl primitive PrimitiveArray QuickCheck
+         SciBaseTypes string-conversions text text-binary utf8-string vector
+         vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
-         base QuickCheck tasty tasty-quickcheck tasty-th
+         base bytestring lens QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
@@ -3602,25 +3603,30 @@ self: {
      }) {};
 
   "DPutils" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion
-     , kan-extensions, lens, mtl, parallel, pipes, pipes-bytestring
-     , pipes-parse, QuickCheck, quickcheck-instances, stringsearch
-     , tasty, tasty-quickcheck, tasty-th, transformers, vector
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, kan-extensions, lens, mtl, parallel, pipes
+     , pipes-bytestring, pipes-parse, QuickCheck, streaming
+     , streaming-bytestring, stringsearch, tasty, tasty-quickcheck
+     , tasty-th, timeit, transformers, vector
      }:
      mkDerivation {
        pname = "DPutils";
-       version = "0.0.1.0";
-       sha256 = "1a0ivvq16q8k21xjhv1kmm2s73ajc0gmacwdawkk4nr7jklyhh16";
+       version = "0.0.2.0";
+       sha256 = "0axavxxg0n1dsdby8306yrinjhbfrvy5a27kkwiw75xvjprk4w5w";
        libraryHaskellDepends = [
-         base bytestring containers kan-extensions parallel pipes QuickCheck
-         stringsearch transformers vector
+         attoparsec base bytestring containers kan-extensions parallel pipes
+         QuickCheck streaming streaming-bytestring stringsearch transformers
+         vector
        ];
        testHaskellDepends = [
-         base bytestring containers kan-extensions lens mtl parallel pipes
-         pipes-bytestring pipes-parse QuickCheck quickcheck-instances tasty
+         base bytestring containers lens mtl pipes pipes-bytestring
+         pipes-parse QuickCheck streaming streaming-bytestring tasty
          tasty-quickcheck tasty-th vector
        ];
-       benchmarkHaskellDepends = [ base criterion vector ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion streaming streaming-bytestring timeit
+         vector
+       ];
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5611,6 +5617,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ForestStructures_0_0_1_0" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, criterion, fgl, lens
+     , QuickCheck, tasty, tasty-quickcheck, tasty-th
+     , unordered-containers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "ForestStructures";
+       version = "0.0.1.0";
+       sha256 = "1hhmcc0cpjbixqjgl35gv9dpymamdfb4vhhd5hard0qpg1xllnvw";
+       libraryHaskellDepends = [
+         base bifunctors containers fgl lens QuickCheck unordered-containers
+         vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck tasty tasty-quickcheck tasty-th vector
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Tree- and forest structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Forestry" = callPackage
     ({ mkDerivation, ADPfusion, ADPfusionForest, base, BiobaseNewick
      , BiobaseTypes, containers, criterion, ForestStructures
@@ -14646,19 +14674,19 @@ self: {
 
   "PrimitiveArray" = callPackage
     ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
-     , containers, deepseq, DPutils, hashable, log-domain, OrderedBits
-     , primitive, QuickCheck, smallcheck, tasty, tasty-quickcheck
-     , tasty-smallcheck, tasty-th, text, vector, vector-binary-instances
-     , vector-th-unbox
+     , containers, deepseq, DPutils, hashable, lens, log-domain, mtl
+     , OrderedBits, primitive, QuickCheck, smallcheck, tasty
+     , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
+     , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.8.0.1";
-       sha256 = "1x9qmm9bq14dv7abxbmbij1mfyj3pmrmn61yy09zs52m247pvrwi";
+       version = "0.9.0.0";
+       sha256 = "0zhv17cjdppli5q66j1yabbgx3ad172w4jj4zhn0va2wsc9fs5vi";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector deepseq DPutils
-         hashable log-domain OrderedBits primitive QuickCheck smallcheck
-         text vector vector-binary-instances vector-th-unbox
+         hashable lens log-domain mtl OrderedBits primitive QuickCheck
+         smallcheck text vector vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
          base containers QuickCheck smallcheck tasty tasty-quickcheck
@@ -16357,6 +16385,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SciBaseTypes" = callPackage
+    ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable
+     , lens, log-domain, mtl, QuickCheck, tasty, tasty-quickcheck
+     , tasty-th, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "SciBaseTypes";
+       version = "0.0.0.1";
+       sha256 = "14xzlyca61jhfak1vjll5k2ac2hq55hfvbmqbpk8ls56amlyal5j";
+       libraryHaskellDepends = [
+         aeson base binary cereal deepseq hashable lens log-domain mtl
+         vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th
+       ];
+       benchmarkHaskellDepends = [ base ];
+       description = "Base types and classes for statistics, sciences and humanities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "SciFlow" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
      , containers, data-default-class, directory, exceptions
@@ -28065,11 +28114,25 @@ self: {
        pname = "appar";
        version = "0.1.5";
        sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi";
+       revision = "1";
+       editedCabalFile = "0adhm7jldcqnikvd8b9wj6p5rnhf4ciwbms0jafwx79w720knj9p";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "appar_0_1_7" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "appar";
+       version = "0.1.7";
+       sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn";
+       libraryHaskellDepends = [ base bytestring ];
+       description = "A simple applicative parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "appc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , hspec-smallcheck, optparse-applicative, semver, smallcheck, text
@@ -64819,8 +64882,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "0.6.0";
-       sha256 = "1202zfh3lq0ci48ylp637hcih469awz6sfkp14lzq5psybiiynvw";
+       version = "0.7.0";
+       sha256 = "0zq9aaarh34c24ih49ap5bblswpzc1nwcp8rw8bw1j4agp2ndpy0";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring containers
          data-default http-client iso8601-time JuicyPixels MonadRandom req
@@ -69479,8 +69542,8 @@ self: {
      }:
      mkDerivation {
        pname = "eigen";
-       version = "3.3.4.2";
-       sha256 = "0l88bzp6f5bs5lpcav1c0lg2dc59rfdka2d6dx3c6gzbj1jmf5iz";
+       version = "3.3.7.0";
+       sha256 = "0smpfli12kzmgpw92azx9lsb1kiq6zn490yr1fmhv1a3lynm53rs";
        libraryHaskellDepends = [
          base binary bytestring constraints ghc-prim primitive transformers
          vector
@@ -72781,16 +72844,16 @@ self: {
   "eventsource-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , enclosed-exceptions, lifted-async, lifted-base, monad-control
-     , monad-loops, mtl, stm, stm-chans, string-conversions, text
-     , transformers-base, unordered-containers, uuid
+     , monad-loops, mtl, stm, stm-chans, streaming, string-conversions
+     , text, transformers-base, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "eventsource-api";
-       version = "1.3.1";
-       sha256 = "0dlrbc3xxijz1hf8w34lvk70ic6gsfb9j5z3ldqdssvv9c8fksy2";
+       version = "1.5.0";
+       sha256 = "0748wrj8amw66cl95cri7g2nw9kwc5h0dsw1419p90xpxgvn4kvr";
        libraryHaskellDepends = [
          aeson base bytestring containers enclosed-exceptions lifted-async
-         lifted-base monad-control monad-loops mtl stm stm-chans
+         lifted-base monad-control monad-loops mtl stm stm-chans streaming
          string-conversions text transformers-base unordered-containers uuid
        ];
        description = "Provides an eventsourcing high level API";
@@ -72799,20 +72862,23 @@ self: {
 
   "eventsource-geteventstore-store" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
-     , eventsource-store-specs, eventstore, mtl, protolude
-     , string-conversions, tasty, tasty-hspec, transformers-base
+     , eventsource-store-specs, eventstore, lifted-async, lifted-base
+     , mtl, protolude, streaming, string-conversions, tasty, tasty-hspec
+     , transformers-base
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.1.0";
-       sha256 = "00siad63vciymkdql9b3bszb2qfcylb9y32x04ndd19mvpixhdi3";
+       version = "1.2.0";
+       sha256 = "0v0k89xb86h8zxrzzpph0bayy47v3gn56vi3v02cvvnwnif3071l";
        libraryHaskellDepends = [
-         aeson base eventsource-api eventstore mtl string-conversions
+         aeson base eventsource-api eventsource-store-specs eventstore
+         lifted-async lifted-base mtl streaming string-conversions
          transformers-base
        ];
        testHaskellDepends = [
-         base eventsource-api eventsource-store-specs eventstore protolude
-         tasty tasty-hspec
+         aeson base eventsource-api eventsource-store-specs eventstore
+         lifted-async lifted-base mtl protolude streaming string-conversions
+         tasty tasty-hspec transformers-base
        ];
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -72820,16 +72886,16 @@ self: {
      }) {};
 
   "eventsource-store-specs" = callPackage
-    ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty
-     , tasty-hspec, text, transformers-base, uuid
+    ({ mkDerivation, aeson, async, base, eventsource-api, mtl
+     , streaming, tasty, tasty-hspec, text, transformers-base, uuid
      }:
      mkDerivation {
        pname = "eventsource-store-specs";
-       version = "1.1.1";
-       sha256 = "1pa4s9y9cgvaadzyp186snhvrgp4jw1xgzxy2w58hxfa2mcxqn4i";
+       version = "1.2.0";
+       sha256 = "1fvwwbbn8407rcxl7sww1k944gq95hniq9s9ys3hzr8a9y65598i";
        libraryHaskellDepends = [
-         aeson async base eventsource-api mtl tasty tasty-hspec text
-         transformers-base uuid
+         aeson async base eventsource-api mtl streaming tasty tasty-hspec
+         text transformers-base uuid
        ];
        description = "Provides common test specification for Store implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -72837,19 +72903,20 @@ self: {
 
   "eventsource-stub-store" = callPackage
     ({ mkDerivation, aeson, async, base, containers, eventsource-api
-     , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
-     , transformers-base
+     , eventsource-store-specs, mtl, protolude, stm, streaming, tasty
+     , tasty-hspec, transformers-base
      }:
      mkDerivation {
        pname = "eventsource-stub-store";
-       version = "1.0.3";
-       sha256 = "12vsn32m2h3bgssp2s6p1x90lj3h814iwplzhiyhmnaapq451h2w";
+       version = "1.1.0";
+       sha256 = "0rfbn3f6dw6m03f47f68if11xkjd98djhballl50zv7fqifcpz7h";
        libraryHaskellDepends = [
-         async base containers eventsource-api mtl stm transformers-base
+         async base containers eventsource-api mtl stm streaming
+         transformers-base
        ];
        testHaskellDepends = [
-         aeson base eventsource-api eventsource-store-specs protolude tasty
-         tasty-hspec
+         aeson base eventsource-api eventsource-store-specs protolude
+         streaming tasty tasty-hspec
        ];
        description = "An in-memory stub store implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -74148,8 +74215,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.14.3";
-       sha256 = "1kzjrmj9zvjbr6j8gns81p212lnx9i60s5gdf67pwrww70abp5m6";
+       version = "0.15.0";
+       sha256 = "0hy1z2caqwyxqw1s3xxkbrzi3f86w3vzch783ajq41xqd6z8spdp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86932,8 +86999,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20181205";
-       sha256 = "0qh6s4ihbvxh3lqnwhzxfd0z06y5m6l5fy86cpf8xdmnaczgxk2d";
+       version = "7.20181211";
+       sha256 = "05zvi2z4fs2sprzgm31m6y1rhvwkhmjilvmgvyajzs12vzsaik6x";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
@@ -124454,6 +124521,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-choice_0_0_7" = callPackage
+    ({ mkDerivation, base, hspec, lifted-base, monad-control
+     , template-haskell, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "io-choice";
+       version = "0.0.7";
+       sha256 = "16v6b9r5k2y5vm2s8k3j7xc5wh77nqd8j636mc6wxcxwn3260jir";
+       libraryHaskellDepends = [
+         base lifted-base monad-control template-haskell transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base hspec lifted-base monad-control transformers
+       ];
+       description = "Choice for IO and lifted IO";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-machine" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -124905,6 +124992,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_7" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.7";
+       sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -131671,8 +131778,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.0.4";
-       sha256 = "1dqmb2wp47smjg55klwb2si8v14yahkrqzgzw9sssla9kyqna46n";
+       version = "1.7.0.5";
+       sha256 = "1vdn1f5bx395jynacmpsvfsyyr29jgpg1y25i1jmbkzjdzkb0h2b";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -146523,10 +146630,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-dijkstra";
-       version = "0.1.1.0";
-       sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4";
-       revision = "1";
-       editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c";
+       version = "0.1.1.1";
+       sha256 = "0j29ffim7hwvj791na92yrbgly1frn0qvcpyc1z29837kawap190";
        libraryHaskellDepends = [ base free mtl psqueues transformers ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
@@ -156712,8 +156817,8 @@ self: {
      }:
      mkDerivation {
        pname = "oeis2";
-       version = "0.1.0";
-       sha256 = "17wzcf4zq8jg6kqd0mfkhcf37mkhjys1vzwpylhzkfgxwvhi4fjj";
+       version = "1.0.0";
+       sha256 = "0rrzdv5ida7vlvrpchzsjq3r8pnkrjxn8c6413qxnz2q512igi9l";
        libraryHaskellDepends = [
          aeson base containers http-conduit lens lens-aeson text vector
        ];
@@ -172303,31 +172408,31 @@ self: {
      , data-default-class, deepseq, directory, filepath, hslogger, HTF
      , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
      , prettyprinter, process, resourcet, split, stm, strings, text
-     , time, unliftio, utf8-string
+     , time, transformers, unliftio, utf8-string
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.4.0";
-       sha256 = "1vyy8raj5xvdi8cik3f0awd1k6vi6bqikngpf4sqrvbgc5k3sr94";
+       version = "0.3.5.0";
+       sha256 = "029wrri1b6wdkl16wmiybg11685i2jdwx4n12i9hn01zsb7absnx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory filepath hslogger lens messagepack MissingH mtl
          nvim-hs pretty-terminal prettyprinter process resourcet split stm
-         strings text time unliftio utf8-string
+         strings text time transformers unliftio utf8-string
        ];
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory filepath hslogger lens messagepack MissingH mtl
          nvim-hs pretty-terminal prettyprinter process resourcet split stm
-         strings text time unliftio utf8-string
+         strings text time transformers unliftio utf8-string
        ];
        testHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory filepath hslogger HTF lens messagepack MissingH
          mtl nvim-hs pretty-terminal prettyprinter process resourcet split
-         stm strings text time unliftio utf8-string
+         stm strings text time transformers unliftio utf8-string
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
@@ -178454,8 +178559,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "1.2.1.1";
-       sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5";
+       version = "2.0.0.0";
+       sha256 = "1mjq7jk2r97fkkq77c1ynrqk4qf39xh74wjpzqnva9bpm62pyqn5";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -210720,6 +210825,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-lib" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, HUnit
+     , process, simple-get-opt, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "test-lib";
+       version = "0.1.0.0";
+       sha256 = "1vwn32nsfz19gd620a8wbiwdhmq863lgxq4sibrl8x5hmypygxcc";
+       revision = "1";
+       editedCabalFile = "0dsyihhzlrdiy6v1jpgdr08algm1zrwpdqx6zzfjwddm4bl2bc59";
+       libraryHaskellDepends = [
+         base containers directory filepath HUnit process simple-get-opt
+         test-framework test-framework-hunit
+       ];
+       description = "A library to make a quick test-runner script";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "test-pkg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215384,8 +215507,8 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.0.1";
-       sha256 = "0k94a6am7cmqhia543rmaw06xl0xq5lx22q1sb01x3l96sxh1aa8";
+       version = "1.0.2";
+       sha256 = "066nc1xgy9g7w82f0s1lagxjpf5hw9zxpnbcf5lbjdj58ssrkdr5";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -221333,6 +221456,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_9_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, gauge
+     , hspec, process, QuickCheck, stm, time, transformers, unix
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.9.0";
+       sha256 = "1f1rrmajnz5j2ljryi9gqx64hjr30yy7pz9rjx02pdfi6alrcrgz";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process QuickCheck stm
+         time transformers unix unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         async base deepseq directory filepath gauge 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 {

From 31e4345dbd79ea84e59b979da58b8b123a0e0066 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Dec 2018 02:30:43 +0100
Subject: [PATCH 1930/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6b2a686eebcdff8c0a73572ed64908362c1d8e54.
---
 .../haskell-modules/hackage-packages.nix      | 212 ++++++++++++++----
 1 file changed, 164 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cb888a6b446..416c77fe56c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1466,6 +1466,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BiobaseEnsembl" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , cereal, containers, deepseq, directory, either-unwrap, text
+     , vector, word8
+     }:
+     mkDerivation {
+       pname = "BiobaseEnsembl";
+       version = "0.1.0.0";
+       sha256 = "1knbi8azq5n8kdgmbx4f2d14x6z94vj540ickq4dcspmbvslr0kf";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring cereal containers deepseq
+         directory either-unwrap text vector word8
+       ];
+       description = "Ensembl related datastructures and functions";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "BiobaseFR3D" = callPackage
     ({ mkDerivation, base, BiobaseXNA, bytestring, containers
      , filemanip, iteratee, tuple
@@ -1483,24 +1500,46 @@ self: {
      }) {};
 
   "BiobaseFasta" = callPackage
-    ({ mkDerivation, base, biocore, bytestring, cmdargs, conduit
-     , containers, transformers
+    ({ mkDerivation, base, BiobaseTypes, bytestring, deepseq, filepath
+     , lens, QuickCheck, resourcet, streaming, streaming-bytestring
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, tasty-silver
+     , tasty-th, text
      }:
      mkDerivation {
        pname = "BiobaseFasta";
-       version = "0.0.1.0";
-       sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "1ilsq8wjvmz1pw00rfk78f1si7s4ld3gbbp6w8nfq051hgg5ydsh";
        libraryHaskellDepends = [
-         base biocore bytestring conduit containers transformers
+         base BiobaseTypes bytestring deepseq lens resourcet streaming
+         streaming-bytestring
        ];
-       executableHaskellDepends = [ cmdargs ];
-       description = "conduit-based FASTA parser";
+       testHaskellDepends = [
+         base bytestring filepath QuickCheck resourcet streaming
+         streaming-bytestring tasty tasty-golden tasty-hunit
+         tasty-quickcheck tasty-silver tasty-th text
+       ];
+       description = "streaming FASTA parser";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BiobaseHTTP" = callPackage
+    ({ mkDerivation, aeson, base, BiobaseEnsembl, bytestring, conduit
+     , either-unwrap, HTTP, http-conduit, hxt, mtl, network, Taxonomy
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "BiobaseHTTP";
+       version = "1.1.0";
+       sha256 = "0y26d4aqxqpdr142y26p70v6cnrr48dhxm5nnnhqxg0lsirbxad0";
+       libraryHaskellDepends = [
+         aeson base BiobaseEnsembl bytestring conduit either-unwrap HTTP
+         http-conduit hxt mtl network Taxonomy text transformers
+       ];
+       description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "BiobaseInfernal" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
      , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector
@@ -5426,6 +5465,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Fin_0_2_6_1" = callPackage
+    ({ mkDerivation, alg, base, foldable1, natural-induction, peano
+     , universe-base
+     }:
+     mkDerivation {
+       pname = "Fin";
+       version = "0.2.6.1";
+       sha256 = "15r5cvxwwbp7d6fmkfkzg65kzwf5v4j3rf84a5qsw900i4c05cmx";
+       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
@@ -11117,8 +11172,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "LParse";
-       version = "0.2.2.2";
-       sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl";
+       version = "0.2.3.0";
+       sha256 = "060jxkdnw1s01sawnlzrm91ycjgpa3kw8n9xrb1hgcrbjkzdw39s";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A continuation-based parser library";
@@ -23217,6 +23272,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alg_0_2_9_0" = callPackage
+    ({ mkDerivation, base, util }:
+     mkDerivation {
+       pname = "alg";
+       version = "0.2.9.0";
+       sha256 = "0w5lxmz52nskh8ms3nliya78v1pb77f7nyn19klqf8yskaalywlq";
+       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
@@ -52425,19 +52492,19 @@ self: {
      }) {};
 
   "confetti" = callPackage
-    ({ mkDerivation, base, directory, filepath, MissingH, tasty
-     , tasty-hunit, tasty-smallcheck, text, time, unix, yaml
+    ({ mkDerivation, base, cmdargs, directory, filepath, MissingH
+     , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
      }:
      mkDerivation {
        pname = "confetti";
-       version = "0.3.2";
-       sha256 = "0ac1mrxwiyjwihywy7hclfymrixhb0mj8266sljzpmk1671qr4ym";
+       version = "1.0.0";
+       sha256 = "1ryvfaizai0m98lb687laqmix17k0f4a8cpbvpn15scng604gf0k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base directory filepath MissingH text time unix yaml
        ];
-       executableHaskellDepends = [ base directory text ];
+       executableHaskellDepends = [ base cmdargs directory text ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-smallcheck text
        ];
@@ -57108,8 +57175,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuckoo-filter";
-       version = "0.2.0.1";
-       sha256 = "01l1ilxdd83l60f5hmpajwszn77lfmk16aqygg1jz45zkrd3scnb";
+       version = "0.2.0.2";
+       sha256 = "1yya8r3igwms910xp3cc4y1y34f5yw3yqqy1wy49d4xsi6smyjdc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66983,15 +67050,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dotenv_0_7_0_0" = callPackage
+  "dotenv_0_8_0_0" = callPackage
     ({ mkDerivation, base, base-compat, containers, directory
      , exceptions, hspec, hspec-megaparsec, megaparsec
      , optparse-applicative, process, text, transformers, yaml
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.7.0.0";
-       sha256 = "1rxr90jcn1swfr4sac331w44cm4c7ci87ll2d2w03hbdlysvdv8h";
+       version = "0.8.0.0";
+       sha256 = "0b1pz7wh5kf0sjkig0y4ks6i2z5yzpvlnd6hgzl0sj4j6w2j35ly";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -83103,6 +83170,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "generic-monoid" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "generic-monoid";
+       version = "0.1.0.0";
+       sha256 = "0jzhmy6vi38p3cnlvi4hw59zga239y67nszzl7zscx263wsk7q0w";
+       libraryHaskellDepends = [ base ];
+       description = "Derive monoid instances for product types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-pretty" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , tasty, tasty-hunit, text, vector
@@ -98098,6 +98176,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasbolt_0_1_3_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, connection, containers
+     , data-binary-ieee754, data-default, hex, hspec, network
+     , QuickCheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "hasbolt";
+       version = "0.1.3.2";
+       sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
+       libraryHaskellDepends = [
+         base binary bytestring connection containers data-binary-ieee754
+         data-default network text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hex hspec QuickCheck text
+       ];
+       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasbolt-extras" = callPackage
     ({ mkDerivation, base, containers, free, hasbolt, lens, mtl
      , neat-interpolation, template-haskell, text, th-lift-instances
@@ -99700,8 +99799,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-names";
-       version = "0.9.4";
-       sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y";
+       version = "0.9.5";
+       sha256 = "0j1snakldb29v8786licz4k2b92pbdbxhxgyz22rvjypdxyhaa7h";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-lens-light filepath
@@ -107399,8 +107498,8 @@ self: {
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "0.7.0";
-       sha256 = "1n4w8mwx09i8f1h96p7nqls7r22xscy4z9fviwgivp0y59qfbdsx";
+       version = "0.8.0";
+       sha256 = "1mzq87sdcx50i67kf2lv5wg0k6ahxf1x2qxvi41dnaxkjjl1vcmr";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite deepseq
          exceptions lifted-async lifted-base memory monad-control
@@ -107409,7 +107508,7 @@ self: {
        ];
        testHaskellDepends = [
          async base binary bytestring hspec monad-logger QuickCheck
-         transformers
+         transformers vector
        ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
@@ -113620,8 +113719,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.2.2";
-       sha256 = "0b4xjkj1qc6mbsp0sn7gqmhys3h39rbfam8qwvhjmgd7d1cbl69p";
+       version = "0.3.2.3";
+       sha256 = "03v1lls7dv134675x10rgp4nla5a9dgczf4g78vrx488zf50rf1v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119729,8 +119828,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwormhole";
-       version = "0.1.0.0";
-       sha256 = "1nl9p0kd4nqrdhwms868mr6h904pl282i5ljhai7kvxr8s7v2s9v";
+       version = "0.2.0.0";
+       sha256 = "0y0wg4zxq8wzym8x7b103h0ai2z5ji22vvqz4i64pnzq83ksmxym";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -121889,6 +121988,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "ihs_0_1_0_3" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "ihs";
+       version = "0.1.0.3";
+       sha256 = "1zfmxgb3l7mihzjyggzb30d9b57y2z80yk562z2x2padsqx95gqk";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base process ];
+       description = "Interpolated Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihttp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , contstuff, enumerator, netlines, network
@@ -132536,22 +132649,24 @@ self: {
 
   "language-ocaml" = callPackage
     ({ mkDerivation, alex, array, base, containers, data-default
-     , extensible-effects, happy, interpolate, lens, megaparsec, mtl
-     , prettyprinter, string-qq, tasty, tasty-hunit, zlib
+     , directory, extensible-effects, extra, filepath, happy
+     , interpolate, lens, megaparsec, mtl, prettyprinter, string-qq
+     , tasty, tasty-golden, tasty-hunit, zlib
      }:
      mkDerivation {
        pname = "language-ocaml";
-       version = "0.1.31";
-       sha256 = "1vkqy5hdyqq5c22cccyvj1ci5srimpd5w8qwrwrrq9d5yai061w6";
+       version = "0.2.0";
+       sha256 = "1z9qk9vyv0nimkpgjkmnjvqg0schyiffyx59myi6r9gnmdagifh5";
        libraryHaskellDepends = [
-         array base containers data-default extensible-effects interpolate
-         lens megaparsec mtl prettyprinter string-qq tasty tasty-hunit
+         array base containers data-default directory extensible-effects
+         extra filepath interpolate lens megaparsec mtl prettyprinter
+         string-qq tasty tasty-golden tasty-hunit
        ];
        libraryPkgconfigDepends = [ zlib ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
-         base interpolate megaparsec prettyprinter string-qq tasty
-         tasty-hunit
+         base directory extra filepath interpolate megaparsec prettyprinter
+         string-qq tasty tasty-golden tasty-hunit
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -172412,8 +172527,8 @@ self: {
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.5.0";
-       sha256 = "029wrri1b6wdkl16wmiybg11685i2jdwx4n12i9hn01zsb7absnx";
+       version = "0.3.6.0";
+       sha256 = "16kg7vqiykhxyahh8s5qr4xlsfwqpjjn8ndf920vynyhhrgpd262";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178559,8 +178674,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "2.0.0.0";
-       sha256 = "1mjq7jk2r97fkkq77c1ynrqk4qf39xh74wjpzqnva9bpm62pyqn5";
+       version = "2.1.0.0";
+       sha256 = "04vgcpijkphcy5ybiw4b14ax5nwjs8vrs0ywbpl2dfhsxw9gpv0h";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -210831,14 +210946,15 @@ self: {
      }:
      mkDerivation {
        pname = "test-lib";
-       version = "0.1.0.0";
-       sha256 = "1vwn32nsfz19gd620a8wbiwdhmq863lgxq4sibrl8x5hmypygxcc";
-       revision = "1";
-       editedCabalFile = "0dsyihhzlrdiy6v1jpgdr08algm1zrwpdqx6zzfjwddm4bl2bc59";
+       version = "0.2";
+       sha256 = "0i9q483sd5a8f7d95fxjqzyb4vsi3w1bycs518wi0k0w1rlfm33i";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory filepath HUnit process simple-get-opt
          test-framework test-framework-hunit
        ];
+       executableHaskellDepends = [ base simple-get-opt ];
        description = "A library to make a quick test-runner script";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -218260,8 +218376,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitch";
-       version = "0.1.7.1";
-       sha256 = "1nhc6w0ax0fhr1rhdpf8k4j58kxp05fzkfkykbdgn9hjrmmxfn41";
+       version = "0.1.7.2";
+       sha256 = "1l42vifrq025s98gl8n0v2j42l9w6nys916a3pi0av17kqaa29v0";
        libraryHaskellDepends = [
          base data-default directory filepath fsnotify Glob
          optparse-applicative time transformers

From ef7433ebdf3690a95ecb8eb644857537f39745ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Dec 2018 02:30:49 +0100
Subject: [PATCH 1931/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-8-g7b07d27 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/9e2fca7940118806fa7a868b2c1aaa135f729730.
---
 .../haskell-modules/hackage-packages.nix      | 120 ++++++++++++++----
 1 file changed, 92 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 416c77fe56c..dc46c69d57c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1540,6 +1540,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "BiobaseHTTPTools" = callPackage
+    ({ mkDerivation, base, BiobaseFasta, BiobaseHTTP, bytestring
+     , cmdargs, containers, either-unwrap, hxt, text
+     }:
+     mkDerivation {
+       pname = "BiobaseHTTPTools";
+       version = "1.0.0";
+       sha256 = "1sbwhil0d0118nwx7wsryk6j8a7rysdxqksphvyrlxfdm7pd3l1z";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base BiobaseFasta BiobaseHTTP bytestring cmdargs containers
+         either-unwrap hxt text
+       ];
+       description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "BiobaseInfernal" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
      , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector
@@ -37924,6 +37942,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
+  "blas-ffi_0_0_2" = callPackage
+    ({ mkDerivation, base, blas, netlib-ffi }:
+     mkDerivation {
+       pname = "blas-ffi";
+       version = "0.0.2";
+       sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base netlib-ffi ];
+       libraryPkgconfigDepends = [ blas ];
+       description = "Auto-generated interface to Fortran BLAS";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) blas;};
+
   "blas-hs" = callPackage
     ({ mkDerivation, base, blas, storable-complex, vector }:
      mkDerivation {
@@ -39708,7 +39741,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick_0_44_1" = callPackage
+  "brick_0_45" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
      , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
@@ -39716,8 +39749,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.44.1";
-       sha256 = "1d2nzinc2vqsznb5jydyfyb0zx7mga69w18hnhdkk1sxsrlvjra5";
+       version = "0.45";
+       sha256 = "126h6cidq2rlh0plrgap5rlw9mxm03v3iray7pa95ydzp82imm7i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81045,8 +81078,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatch";
-       version = "0.1.0.5";
-       sha256 = "0f1rvvkfqm3q12dvagmsdpvw0c9r5a9gj6g34rrsyjdbpc818prw";
+       version = "0.1.0.6";
+       sha256 = "1972pw7p9njl6h225v8yam5riyiyzkvzhbkv987wl1l3ayga9mdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91004,6 +91037,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "google-oauth2-jwt_0_3_1" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+     , RSA, text, unix-time
+     }:
+     mkDerivation {
+       pname = "google-oauth2-jwt";
+       version = "0.3.1";
+       sha256 = "121g7fsdcnv65gp81z450dqqw6ii75pwn3cbilwx5yv4mm571mvi";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+       ];
+       description = "Get a signed JWT for Google Service Accounts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "google-search" = callPackage
     ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
@@ -92358,8 +92407,8 @@ self: {
      }:
      mkDerivation {
        pname = "gray-extended";
-       version = "1.5.2";
-       sha256 = "1jn9bx47jdai9yqf9mcfzkv3yfyd4bl0n9hd6njc9m83zycyfsnm";
+       version = "1.5.4";
+       sha256 = "106kwrgpiyzndknnn9vn1hlic227q84qjkh6qa47zkjkl6kxwmsk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -92592,8 +92641,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.10";
-       sha256 = "1470w214jk285jvb7hyzz539gi3jl52dpa97k5yyfcm2q7186pbj";
+       version = "7.8.11";
+       sha256 = "0kqd04zv1gpz78kdhpd89yhr7xhkzwp3vl7r5hr4ng65zshkdprg";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -96391,8 +96440,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-sass";
-       version = "0.2.3";
-       sha256 = "08klssx4kmph3wv4hxqy1c6i6g0i6sdknmrm09p7fgvk2zsaphzb";
+       version = "0.2.4";
+       sha256 = "151c1x1ipy3759vwih3a84r6912imsqfgvkxd994dbz8jag6465m";
        libraryHaskellDepends = [
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
@@ -119194,16 +119243,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-ip_0_4_2" = callPackage
-    ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
-     , hw-bits, hw-hspec-hedgehog, text
+  "hw-ip_1_0_0_0" = callPackage
+    ({ mkDerivation, appar, attoparsec, base, generic-lens, hedgehog
+     , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "0.4.2";
-       sha256 = "1jcfj75hlg7szvknw6v13barvcilldzh76jv1rnfyscrfhpdkd2s";
+       version = "1.0.0.0";
+       sha256 = "0di0r4dq1fzmb1cgmks54wqamx9jsjgnv4qjs3s8kwszz19plpfw";
        libraryHaskellDepends = [
-         attoparsec base generic-lens hw-bits text
+         appar attoparsec base generic-lens hw-bits iproute text
        ];
        testHaskellDepends = [
          attoparsec base generic-lens hedgehog hspec hw-bits
@@ -145415,14 +145464,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "minimorph_0_2_0_0" = callPackage
+  "minimorph_0_2_1_0" = callPackage
     ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
      , text
      }:
      mkDerivation {
        pname = "minimorph";
-       version = "0.2.0.0";
-       sha256 = "10dymy3l433rwsv30kldvm12yr27x2fw2b4cdrbbwjqwv5m9rm9c";
+       version = "0.2.1.0";
+       sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
@@ -172527,8 +172576,8 @@ self: {
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.6.0";
-       sha256 = "16kg7vqiykhxyahh8s5qr4xlsfwqpjjn8ndf920vynyhhrgpd262";
+       version = "0.3.7.0";
+       sha256 = "03ll4vrh0a40l6rsxp98yax923ginp4483gx11102d8srvvx5qbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188778,8 +188827,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.6.0.3";
-       sha256 = "0zipxs3l99ppaxwsvidjycm7mfyvqll88vrn6ajdpdcbmv1c5vc4";
+       version = "0.6.1";
+       sha256 = "1anxb5b8kmwf4bjzh49yxgnx3kkx37ydr4aw2xd46dph1gdk07mb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -221502,6 +221551,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unix-time_0_4_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, doctest, hspec
+     , old-locale, old-time, QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "unix-time";
+       version = "0.4.0";
+       sha256 = "0fb9mdg596db9wbxsr5m3zc3wasvwblb32fsva0zrac93c9rq51r";
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
+         base bytestring doctest hspec old-locale old-time QuickCheck time
+       ];
+       description = "Unix time parser/formatter and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unjson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, invariant, pretty, primitive, scientific
@@ -233296,10 +233362,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-volume";
-       version = "0.1.0.1";
-       sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild";
-       revision = "2";
-       editedCabalFile = "1lyaapci7phy59h2f4y7gk4i16i4bl7jnp835i41d5sr2m7mcr4p";
+       version = "0.1.1.0";
+       sha256 = "0bc52vy142hn75k52zz8afjfxwv86p73kmqmi48rqiws10kpnclw";
        libraryHaskellDepends = [
          alsa-mixer base composition-prelude containers X11
        ];

From 578a5f6588aa0644f032df86b193a6b35d5afd52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Dec 2018 11:48:07 +0100
Subject: [PATCH 1932/2793] haskell-brick: update override for the new version

---
 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 94ac1244ffa..2b3165981ea 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_42_1;
+  brick = self.brick_0_45;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From 89ed58dbeaeb7fe351a58e420718bf03daab5fff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Dec 2018 15:07:09 +0100
Subject: [PATCH 1933/2793] git-annex: update sha256 for new 7.20181211 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 82063008676..b7b2e5f2b21 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 = "0f0pp0d5q4122cjh4j7iasnjh234fmkvlwgb3f49087cg8rr2czh";
+      sha256 = "0wczijw80pw31k6h3a65m76aq9i02aarr2zxl7k5m7p0l6rn82vd";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From ea45e771a164e5e903b07ff4f6808285a9187e45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Dec 2018 17:46:38 +0100
Subject: [PATCH 1934/2793] haskell-cryptonite: disable test suite to avoid
 transient errors

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b7b2e5f2b21..ffbe5310505 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -683,7 +683,8 @@ self: super: {
   # 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 {
+  # Also, disable the test suite to avoid https://github.com/haskell-crypto/cryptonite/issues/260.
+  cryptonite = appendPatch (dontCheck super.cryptonite) (pkgs.fetchpatch {
     url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch;
     sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq";
   });

From d7dcb9c291750f6ce704472627deb09513c1af24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Dec 2018 18:43:19 +0100
Subject: [PATCH 1935/2793] haskell-appar: update to latest version to fix test
 suite failures in iproute

---
 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 ffbe5310505..293492984ee 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1201,4 +1201,7 @@ self: super: {
   # https://github.com/mgajda/json-autotype/issues/25
   json-autotype = dontCheck super.json-autotype;
 
+  # https://github.com/kazu-yamamoto/iproute/issues/43
+  appar = self.appar_0_1_7;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From f0f3cb75deb9bfe29a8abbb29a7ba06d7a726a09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Dec 2018 17:37:51 +0100
Subject: [PATCH 1936/2793] haskell-hlint: override haskell-src-exts to the
 latest version (as required)

---
 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 293492984ee..dfb70efd445 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1204,4 +1204,7 @@ self: super: {
   # https://github.com/kazu-yamamoto/iproute/issues/43
   appar = self.appar_0_1_7;
 
+  # The LTS-12.x version doesn't suffice to build hlint.
+  hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 76e284fc60f23cca8b871ef813155636e865b102 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Dec 2018 17:40:17 +0100
Subject: [PATCH 1937/2793] haskell-hoogle: override haskell-src-exts to the
 latest version (as required)

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dfb70efd445..28d5e50e96f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1204,7 +1204,8 @@ self: super: {
   # https://github.com/kazu-yamamoto/iproute/issues/43
   appar = self.appar_0_1_7;
 
-  # The LTS-12.x version doesn't suffice to build hlint.
+  # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
+  hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 339a9980ec1b62e6546da15a52f6ef78daa5d82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 13 Dec 2018 17:25:12 +0100
Subject: [PATCH 1938/2793] home-assistant: 0.83.3 -> 0.84.2

---
 .../home-assistant/component-packages.nix     | 23 +++++++++++++++----
 pkgs/servers/home-assistant/default.nix       | 10 ++++----
 pkgs/servers/home-assistant/frontend.nix      |  4 ++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 30fe7354f65..f79390442a6 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.83.3";
+  version = "0.84.2";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -264,6 +264,8 @@
     "climate.zwave" = ps: with ps; [  ];
     "cloud" = ps: with ps; [ aiohttp-cors warrant ];
     "cloud.auth_api" = ps: with ps; [  ];
+    "cloud.cloud_api" = ps: with ps; [  ];
+    "cloud.cloudhooks" = ps: with ps; [  ];
     "cloud.const" = ps: with ps; [  ];
     "cloud.http_api" = ps: with ps; [  ];
     "cloud.iot" = ps: with ps; [  ];
@@ -438,6 +440,7 @@
     "geo_location.demo" = ps: with ps; [  ];
     "geo_location.geo_json_events" = ps: with ps; [  ];
     "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [  ];
+    "geo_location.usgs_earthquakes_feed" = ps: with ps; [  ];
     "geofency" = ps: with ps; [ aiohttp-cors ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
@@ -467,6 +470,7 @@
     "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
     "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ];
     "hive" = ps: with ps; [  ];
+    "hlk_sw16" = ps: with ps; [  ];
     "homekit" = ps: with ps; [  ];
     "homekit.const" = ps: with ps; [  ];
     "homekit.util" = ps: with ps; [  ];
@@ -564,6 +568,7 @@
     "light.knx" = ps: with ps; [  ];
     "light.lifx" = ps: with ps; [  ];
     "light.lifx_legacy" = ps: with ps; [  ];
+    "light.lightwave" = ps: with ps; [  ];
     "light.limitlessled" = ps: with ps; [  ];
     "light.litejet" = ps: with ps; [  ];
     "light.lutron" = ps: with ps; [  ];
@@ -571,8 +576,6 @@
     "light.lw12wifi" = ps: with ps; [  ];
     "light.mochad" = ps: with ps; [  ];
     "light.mqtt" = ps: with ps; [ paho-mqtt ];
-    "light.mqtt_json" = ps: with ps; [ paho-mqtt ];
-    "light.mqtt_template" = ps: with ps; [ paho-mqtt ];
     "light.mysensors" = ps: with ps; [  ];
     "light.mystrom" = ps: with ps; [  ];
     "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
@@ -608,6 +611,7 @@
     "light.zha" = ps: with ps; [  ];
     "light.zigbee" = ps: with ps; [  ];
     "light.zwave" = ps: with ps; [  ];
+    "lightwave" = ps: with ps; [  ];
     "linode" = ps: with ps; [ linode-api ];
     "lirc" = ps: with ps; [  ];
     "litejet" = ps: with ps; [  ];
@@ -770,7 +774,6 @@
     "notify.hipchat" = ps: with ps; [  ];
     "notify.homematic" = ps: with ps; [ pyhomematic ];
     "notify.html5" = ps: with ps; [ aiohttp-cors ];
-    "notify.instapush" = ps: with ps; [  ];
     "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
     "notify.joaoapps_join" = ps: with ps; [  ];
     "notify.knx" = ps: with ps; [  ];
@@ -866,6 +869,7 @@
     "scene" = ps: with ps; [  ];
     "scene.deconz" = ps: with ps; [  ];
     "scene.elkm1" = ps: with ps; [  ];
+    "scene.fibaro" = ps: with ps; [  ];
     "scene.homeassistant" = ps: with ps; [  ];
     "scene.hunterdouglas_powerview" = ps: with ps; [  ];
     "scene.knx" = ps: with ps; [  ];
@@ -896,6 +900,7 @@
     "sensor.arlo" = ps: with ps; [  ];
     "sensor.arwn" = ps: with ps; [ paho-mqtt ];
     "sensor.asuswrt" = ps: with ps; [  ];
+    "sensor.awair" = ps: with ps; [  ];
     "sensor.bbox" = ps: with ps; [  ];
     "sensor.bh1750" = ps: with ps; [  ];
     "sensor.bitcoin" = ps: with ps; [  ];
@@ -948,6 +953,7 @@
     "sensor.emoncms" = ps: with ps; [  ];
     "sensor.enocean" = ps: with ps; [  ];
     "sensor.enphase_envoy" = ps: with ps; [  ];
+    "sensor.entur_public_transport" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
     "sensor.envisalink" = ps: with ps; [  ];
     "sensor.etherscan" = ps: with ps; [  ];
@@ -1066,6 +1072,7 @@
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
     "sensor.pvoutput" = ps: with ps; [  ];
     "sensor.pyload" = ps: with ps; [  ];
+    "sensor.qbittorrent" = ps: with ps; [  ];
     "sensor.qnap" = ps: with ps; [  ];
     "sensor.qwikswitch" = ps: with ps; [  ];
     "sensor.radarr" = ps: with ps; [  ];
@@ -1235,6 +1242,7 @@
     "switch.hdmi_cec" = ps: with ps; [  ];
     "switch.hikvisioncam" = ps: with ps; [  ];
     "switch.hive" = ps: with ps; [  ];
+    "switch.hlk_sw16" = ps: with ps; [  ];
     "switch.homekit_controller" = ps: with ps; [  ];
     "switch.homematic" = ps: with ps; [ pyhomematic ];
     "switch.homematicip_cloud" = ps: with ps; [  ];
@@ -1246,6 +1254,7 @@
     "switch.kankun" = ps: with ps; [  ];
     "switch.knx" = ps: with ps; [  ];
     "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
+    "switch.lightwave" = ps: with ps; [  ];
     "switch.linode" = ps: with ps; [ linode-api ];
     "switch.litejet" = ps: with ps; [  ];
     "switch.lupusec" = ps: with ps; [  ];
@@ -1319,6 +1328,8 @@
     "telegram_bot.polling" = ps: with ps; [  ];
     "telegram_bot.webhooks" = ps: with ps; [ aiohttp-cors ];
     "tellduslive" = ps: with ps; [  ];
+    "tellduslive.const" = ps: with ps; [  ];
+    "tellduslive.entry" = ps: with ps; [  ];
     "tellstick" = ps: with ps; [  ];
     "tesla" = ps: with ps; [  ];
     "thethingsnetwork" = ps: with ps; [  ];
@@ -1402,11 +1413,15 @@
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
     "wirelesstag" = ps: with ps; [  ];
+    "wunderlist" = ps: with ps; [  ];
     "xiaomi_aqara" = ps: with ps; [  ];
     "zabbix" = ps: with ps; [  ];
     "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
     "zha" = ps: with ps; [  ];
+    "zha.config_flow" = ps: with ps; [  ];
     "zha.const" = ps: with ps; [  ];
+    "zha.entities" = ps: with ps; [  ];
+    "zha.helpers" = ps: with ps; [  ];
     "zigbee" = ps: with ps; [  ];
     "zone" = ps: with ps; [  ];
     "zone.config_flow" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 88b82453063..e4a68fdfc69 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -36,8 +36,8 @@ let
       "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
     (mkOverride "requests" "2.20.1"
       "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263")
-    (mkOverride "ruamel_yaml" "0.15.78"
-      "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f")
+    (mkOverride "ruamel_yaml" "0.15.80"
+      "4f203351575dba0829c7b1e5d376d08cf5f58e4a2b844e8ce552b3e41cd414e6")
     (mkOverride "voluptuous" "0.11.5"
       "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
     (mkOverride "voluptuous-serialize" "2.0.0"
@@ -85,7 +85,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.83.3";
+  hassVersion = "0.84.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar";
+    sha256 = "1w1p0w8bwajiz6dms5x1vdc9sxnxdrjflnxvflxg4kba0w1mxq9m";
   };
 
   propagatedBuildInputs = [
@@ -111,7 +111,7 @@ in with py.pkgs; buildPythonApplication rec {
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
-    pytest requests-mock pydispatcher pytest-aiohttp
+    asynctest pytest pytest-aiohttp requests-mock pydispatcher
   ];
 
   checkPhase = ''
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 1695a6eb95d..006d242f841 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 = "20181121.1";
+  version = "20181211.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433";
+    sha256 = "ebb5d96154590794e9df9b5b48ec0c122419762c7460c4e67c535b65b7a00487";
   };
 
   propagatedBuildInputs = [ user-agents ];

From ff2ef484847d6b0ffc121c8d103bd7a077667e9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 11:20:00 -0800
Subject: [PATCH 1939/2793] python37Packages.yapf: 0.24.0 -> 0.25.0 (#52071)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-yapf/versions
---
 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 9c535d90e91..292709a455b 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.24.0";
+  version = "0.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf";
+    sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa";
   };
 
   meta = with stdenv.lib; {

From b5a69a2557fd226a6be63da07b0ed2538eaf5204 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 11:20:50 -0800
Subject: [PATCH 1940/2793] python37Packages.s3fs: 0.1.6 -> 0.2.0 (#52066)

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 7a9454734d9..77aafc1c94d 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "0.1.6";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "38a3dda6800a5dc6ed697bff8e9a47d84f5c28d186dc25d2ff2f91b445f0dae5";
+    sha256 = "1p14sm3lbkwz2fidiinmyfyxwkh58ymjb0c0bsv5i0zfv0fy87x3";
   };
 
   buildInputs = [ docutils ];

From f58d21ac8798b93b2610d35db2c6657783551592 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 11:21:52 -0800
Subject: [PATCH 1941/2793] python37Packages.sphinx-testing: 0.7.2 -> 0.8.1
 (#52061)

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

diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix
index 3ddfdab50aa..86d440a63b1 100644
--- a/pkgs/development/python-modules/sphinx-testing/default.nix
+++ b/pkgs/development/python-modules/sphinx-testing/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "sphinx-testing";
-  version = "0.7.2";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94";
+    sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf";
   };
 
   checkInputs = [ mock ];

From 8d937208fabe95d8b86105786e52d72b66c88612 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Dec 2018 20:22:15 +0100
Subject: [PATCH 1942/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-9-g89ccf08 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/7882a52a634fbc2da03adc9616aa83b27b06d7a2.
---
 .../haskell-modules/hackage-packages.nix      | 137 ++++++++++--------
 1 file changed, 73 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dc46c69d57c..db518444cb2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9916,20 +9916,25 @@ self: {
 
   "HsHTSLib" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, conduit
-     , containers, inline-c, mtl, template-haskell
+     , containers, inline-c, mtl, tasty, tasty-golden, tasty-hunit
+     , template-haskell, vector, zlib
      }:
      mkDerivation {
        pname = "HsHTSLib";
-       version = "1.3.2.3";
-       sha256 = "1j80lwall9ji5fb2iw1fni2jxplyiss5rx0zfkbx9g5ns1cd98r3";
+       version = "1.3.2.4";
+       sha256 = "07zgbmk7511n0r7z7zdiryqxrxp000pq5wjdlhnr2ljahz53qnsq";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit containers inline-c mtl
          template-haskell
        ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
+         base bytestring conduit mtl tasty tasty-golden tasty-hunit vector
+       ];
        description = "High level bindings to htslib";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) zlib;};
 
   "HsHaruPDF" = callPackage
     ({ mkDerivation, base }:
@@ -39717,30 +39722,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_43" = callPackage
-    ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, directory, dlist, filepath, microlens
-     , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
-     , text, text-zipper, transformers, unix, vector, vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.43";
-       sha256 = "1vj0b31jlmwihdg2ggr82bngqnj9lxnkv2s0h5x21pizfx18c6kp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq
-         directory dlist filepath microlens microlens-mtl microlens-th stm
-         template-haskell text text-zipper transformers unix vector vty
-         word-wrap
-       ];
-       testHaskellDepends = [ base containers QuickCheck ];
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "brick_0_45" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
@@ -73210,14 +73191,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "exact-pi_0_5_0_0" = callPackage
+  "exact-pi_0_5_0_1" = callPackage
     ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck
      }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.5.0.0";
-       sha256 = "03rwpqgk3j965pgfbch38k7ghhdwa76rdg9is11kmwr7mff2wm0x";
+       version = "0.5.0.1";
+       sha256 = "0q0qrkmpff835m3zz3w60i1y4sqicnzqb6vqmk13cjh4ign5d0ax";
        libraryHaskellDepends = [ base numtype-dk ];
        testHaskellDepends = [
          base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -81423,8 +81404,10 @@ self: {
     ({ mkDerivation, base, funcons-tools, funcons-values }:
      mkDerivation {
        pname = "funcons-simple";
-       version = "0.1.0.3";
-       sha256 = "0ar5sxcalbfyhyvm6ijbyrrz2pzqyj5bihngnf187wrc5llq2ydr";
+       version = "0.1.0.7";
+       sha256 = "1p6dvrfymap6b2n7ys3llxaa3jvykpykm27yv3mfy19q29djpwv4";
+       revision = "1";
+       editedCabalFile = "1zv6njnp3ymp2hgq68fyhckv8lq4h36wqwx01zbnkwcajwiy66mr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base funcons-tools funcons-values ];
@@ -81440,8 +81423,8 @@ self: {
      }:
      mkDerivation {
        pname = "funcons-tools";
-       version = "0.2.0.5";
-       sha256 = "16a4jn2l13da7n4c73raqplisz4xg7g4rpi707vks5x9gi44pag4";
+       version = "0.2.0.7";
+       sha256 = "132l3wzhr60xnp1zd3qh5yrz9y8fk0v6fz9i242vdvj1rbacfdhf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81458,15 +81441,13 @@ self: {
      }) {};
 
   "funcons-values" = callPackage
-    ({ mkDerivation, base, bv, containers, multiset, random-strings
-     , text, vector
-     }:
+    ({ mkDerivation, base, bv, containers, multiset, text, vector }:
      mkDerivation {
        pname = "funcons-values";
-       version = "0.1.0.3";
-       sha256 = "0j9sn5b6c6v1vllkvrc02r81bpcmh2a3srq74na8vvzq8pp6midy";
+       version = "0.1.0.5";
+       sha256 = "0wmkag1dlvk6lq2f17pvzwxlafd7hn69vxwrkr8ar02vb1yvnb2q";
        libraryHaskellDepends = [
-         base bv containers multiset random-strings text vector
+         base bv containers multiset text vector
        ];
        description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
@@ -86247,7 +86228,7 @@ self: {
 
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
+     , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -86259,11 +86240,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gobjectIntrospection ];
+       libraryPkgconfigDepends = [ gobject-introspection ];
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs.gnome3) gobject-introspection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -99463,7 +99444,7 @@ self: {
 
   "haskell-gi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
+     , directory, doctest, filepath, glib, gobject-introspection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
      , text, transformers, xdg-basedir, xml-conduit
      }:
@@ -99476,11 +99457,12 @@ self: {
          haskell-gi-base mtl pretty-show process regex-tdfa safe text
          transformers xdg-basedir xml-conduit
        ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       libraryPkgconfigDepends = [ glib gobject-introspection ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib; 
+         inherit (pkgs.gnome3) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -125834,8 +125816,8 @@ self: {
      }:
      mkDerivation {
        pname = "itanium-abi";
-       version = "0.1.0.0";
-       sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk";
+       version = "0.1.1.0";
+       sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8";
        libraryHaskellDepends = [
          base boomerang text transformers unordered-containers
        ];
@@ -148617,6 +148599,16 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "morphisms" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "morphisms";
+       version = "0.1.0";
+       sha256 = "0mgkpasj9jd4fhmxcxaij8jkcvp57q8xymf2wvldpwcgi05602az";
+       description = "It's all about functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
@@ -154431,8 +154423,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.0.0";
-       sha256 = "11z3xpivxd344fcq48vvjkvyl658f9mw7k7wqhgchzd5lsymx05s";
+       version = "0.4.1.0";
+       sha256 = "0q70p894sqzzx534vxl8grrizllzhw3cx1d02nfg88h7gr82zp3f";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -172576,8 +172568,8 @@ self: {
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.7.0";
-       sha256 = "03ll4vrh0a40l6rsxp98yax923ginp4483gx11102d8srvvx5qbb";
+       version = "0.3.8.0";
+       sha256 = "1lr0a5vyf305ikhzf8xqrdzksz48vjlikx7zvjxkp0wsarz07ikd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178723,8 +178715,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "2.1.0.0";
-       sha256 = "04vgcpijkphcy5ybiw4b14ax5nwjs8vrs0ywbpl2dfhsxw9gpv0h";
+       version = "2.2.0.0";
+       sha256 = "075rmdrfvaq14p6c3fpg8svf3klrxi5a43a4cgl2j61q5yhhgb3a";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -179670,8 +179662,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "1.0.1.3";
-       sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb";
+       version = "1.0.1.4";
+       sha256 = "15kdlb8wgdv72wsxd0av7j085vd3hg6lhpnx4wn3q659f43g6ahc";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable regex-base
          regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
@@ -179822,8 +179814,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "1.0.1.3";
-       sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad";
+       version = "1.0.1.4";
+       sha256 = "0lxwp1kqacw7dvhbrzy7kl0w5g79gp22b9143m6cgd2f2z7bgzqp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180127,8 +180119,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "1.0.1.3";
-       sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9";
+       version = "1.0.1.4";
+       sha256 = "0pgy9bym4450kzhrzy3amw8dhswzvmqnj5i8pn33l8rvsyr37zp7";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
          regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
@@ -187453,12 +187445,13 @@ self: {
   "script-monad" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client
      , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, unordered-containers, vector, wreq
+     , tasty-quickcheck, tasty-quickcheck-laws, text, time
+     , unordered-containers, vector, wreq
      }:
      mkDerivation {
        pname = "script-monad";
-       version = "0.0.1";
-       sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j";
+       version = "0.0.2.1";
+       sha256 = "1lmla9jwb46d4ffm4igd23v0v2pr45sfbizgg7n29kkv8i2czhkz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187468,6 +187461,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
+         tasty-quickcheck-laws
        ];
        description = "Transformer stack of error, reader, writer, state, and prompt monads";
        license = stdenv.lib.licenses.bsd3;
@@ -209203,6 +209197,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-quickcheck-laws" = callPackage
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "tasty-quickcheck-laws";
+       version = "0.0.1";
+       sha256 = "0hlp1l2my0wydvlxqb8kvqyy1avcnx47brj16ikann83r6za67dp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck tasty ];
+       description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-rerun" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers

From df6abca68d204aff2681e6f1634320e207e67636 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Dec 2018 20:23:18 +0100
Subject: [PATCH 1943/2793] all-cabal-hashes: update snapshot to Hackage at
 2018-12-14T17:18:37Z

---
 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 893ad997c11..d141dba0795 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/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz";
-  sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz";
+  sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2";
 }

From 4c7ac061159ae65097a41f4ff5bd905e8ea23f7a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Dec 2018 20:29:49 +0100
Subject: [PATCH 1944/2793] =?UTF-8?q?gupnp-tools:=200.8.14=20=E2=86=92=200?=
 =?UTF-8?q?.8.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/gupnp-tools/default.nix | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 4d1796eb2ac..cef5c5538a7 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,18 +1,23 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}:
+{fetchurl, fetchpatch, stdenv, meson, ninja, gupnp, gssdp, pkgconfig, gtk3, libuuid, gettext, gupnp-av, gtksourceview4, gnome3, wrapGAppsHook}:
 
-let
+stdenv.mkDerivation rec {
   pname = "gupnp-tools";
-  version = "0.8.14";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "0.8.15";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ykybsljjnngj8rsn808a0h37r2jx99c2jbmsb3ihf7l7hmraav8";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1awpqjs08cf6aimvzldnlnz5zmdyw8aq4k2rl5239j4zkfhg8vik";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-  buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ];
+  patches = [
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/gupnp-tools/commit/2845d07b1584789a23a0e691ceff476e5d82ccb7.patch;
+      sha256 = "1a8bhsz41s27kbaxp9jbmbisabin6lz2ln87012syvi6f2s332hv";
+    })
+  ];
+
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
+  buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ];
 
   passthru = {
     updateScript = gnome3.updateScript {

From c3c071b78e7c68f94f2a7b1358e9743ef9eb405d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Dec 2018 20:36:19 +0100
Subject: [PATCH 1945/2793] =?UTF-8?q?jsonrpc-glib:=203.30.0=20=E2=86=92=20?=
 =?UTF-8?q?3.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/jsonrpc-glib/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index 7eee8201f57..95b11b5e904 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,10 +1,7 @@
 { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
-let
-  version = "3.30.0";
-  pname = "jsonrpc-glib";
-in
 stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  pname = "jsonrpc-glib";
+  version = "3.30.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -13,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0z7v2kld9gyh0faarbs82vrdvg8h6a01x9mxlrwkxbghjgmq05w4";
+    sha256 = "1iqxfdymsspsn1xr5bv7xllw73yhqq6k9bfixsggrf2g85pwwxdn";
   };
 
   mesonFlags = [

From 24be8a7f7c6b606b851557683e67125ea4be8a5f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Dec 2018 20:42:43 +0100
Subject: [PATCH 1946/2793] =?UTF-8?q?fixup!=20jsonrpc-glib:=203.30.0=20?=
 =?UTF-8?q?=E2=86=92=203.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index 95b11b5e904..2324f1280a5 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "jsonrpc-glib";
   version = "3.30.1";
 

From 87d84a6397b37f639a0d946510b1831248b3d006 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Dec 2018 14:53:02 -0500
Subject: [PATCH 1947/2793] pythonPackages.pytest-dependency: init at 0.4.0
 (#51912)

---
 .../pytest-dependency/default.nix             | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-dependency/default.nix

diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
new file mode 100644
index 00000000000..cb5c95aa1aa
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  version = "0.4.0";
+  pname = "pytest-dependency";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142";
+  };
+
+  propagatedBuildInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/RKrahl/pytest-dependency;
+    description = "Manage dependencies of tests";
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e159a6b1d5..a9ecf9495e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1423,6 +1423,8 @@ in {
 
   pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };
 
+  pytest-dependency = callPackage ../development/python-modules/pytest-dependency { };
+
   pytest-django = callPackage ../development/python-modules/pytest-django { };
 
   pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { };

From 867590b6f78f19ca9ee292a49d6378d70367129f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 11:53:54 -0800
Subject: [PATCH 1948/2793] python37Packages.pycountry: 18.5.26 -> 18.12.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/python3.7-pycountry/versions
---
 pkgs/development/python-modules/pycountry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index c1a7f19b126..b946740ff92 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pycountry";
-  version = "18.5.26";
+  version = "18.12.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz";
+    sha256 = "1phn1av57jbm166facjk6r8gw4pf886q4wymjc443k8m5c5h5i4f";
   };
 
   meta = with stdenv.lib; {

From af18f6b121972a5f307822ee1990eeca3d5e56af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 11:59:58 -0800
Subject: [PATCH 1949/2793] python37Packages.rasterio: 1.0.10 -> 1.0.12
 (#52099)

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 562d8aac527..6ca2610948f 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.0.10";
+  version = "1.0.12";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "rasterio";
     rev = version;
-    sha256 = "0gnck9y3n31nnazlrw54swab8wql9qjx5r5x9r7hrmzy72xlzjqq";
+    sha256 = "0mdm03yhlcsa9jwy1yzvqrzk4spmh1dzjaq9krsj958k7wkps672";
   };
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];

From 153c14a9e4100be61381d7ea7f634d33e34a8d71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:04:02 -0800
Subject: [PATCH 1950/2793] python37Packages.mwclient: 0.9.2 -> 0.9.3 (#52102)

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

diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 37785730252..591aa6b0477 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -2,7 +2,7 @@
 , responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
 
 buildPythonPackage rec {
-  version = "0.9.2";
+  version = "0.9.3";
   pname = "mwclient";
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "mwclient";
     repo = "mwclient";
     rev = "v${version}";
-    sha256 = "0553pa5gm74k0lsrbcw5ic8jypnh5c3p58i50kzjvgcqz4frsafi";
+    sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw";
   };
 
   buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];

From ae46af2a51d6f6f3e9d86d3eacad34221d325340 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:04:25 -0800
Subject: [PATCH 1951/2793] python37Packages.pyfiglet: 0.7.6 -> 0.8.post0
 (#52103)

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

diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix
index f03bd266621..622c366cd8d 100644
--- a/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/pkgs/development/python-modules/pyfiglet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.7.6";
+  version = "0.8.post0";
   pname = "pyfiglet";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08npllxf85ccvhd27iyq2j1b813s1947q5b1x7vxv9hdni8rdmcp";
+    sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519";
   };
 
   doCheck = false;

From ea82d9594918d0d3b903b971b8ae7b0766a13854 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:05:38 -0800
Subject: [PATCH 1952/2793] python37Packages.pydot: 1.2.4 -> 1.4.0 (#52101)

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

diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index e21b876be04..ddbc0a5bfdd 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pydot";
-  version = "1.2.4";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "92d2e2d15531d00710f2d6fb5540d2acabc5399d464f2f20d5d21073af241eb6";
+    sha256 = "02yp2k7p1kh0azwd932jhvfc3nxxdv9dimh7hdgwdnmp05yms6cq";
   };
   checkInputs = [ chardet ];
   # No tests in archive

From f02fc7610c132c1d6b735d97a3ae0c96afa6d524 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:08:01 -0800
Subject: [PATCH 1953/2793] python37Packages.phonenumbers: 8.10.0 -> 8.10.2
 (#52094)

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 334b4ace070..afa965ffc02 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.10.0";
+  version = "8.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06nj00qlw2qx5wvwvg32izxq461lyrkif23giixaw2xmzzddzy0l";
+    sha256 = "08cpjmvbm9aazdhlr6pm7msmazysfrdzf4pilnlq8w0ddw1szh7i";
   };
 
   meta = {

From 873cf894f8f0571491dd8df7024bc1e663f7366e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:08:16 -0800
Subject: [PATCH 1954/2793] python37Packages.misaka: 2.1.0 -> 2.1.1 (#52093)

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

diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix
index b40aead3909..85511d3ad25 100644
--- a/pkgs/development/python-modules/misaka/default.nix
+++ b/pkgs/development/python-modules/misaka/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, cffi }:
 buildPythonPackage rec {
   pname = "misaka";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7";
+    sha256 = "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2";
   };
 
   propagatedBuildInputs = [ cffi ];

From 849726f760ee311f3693a514adcc8e952f906ee3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 12:15:44 -0800
Subject: [PATCH 1955/2793] python37Packages.pyshp: 1.2.12 -> 2.0.0 (#52105)

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

diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index f03cab5c193..b9c5fb4583f 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -2,12 +2,12 @@
 , setuptools }:
 
 buildPythonPackage rec {
-  version = "1.2.12";
+  version = "2.0.0";
   pname = "pyshp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179";
+    sha256 = "0l5a28878vplwclqvjj7v0xx6zlr03ia1dkq5hc3mxf05bahiwyz";
   };
 
   buildInputs = [ setuptools ];

From 0584ff89b1800d48c086a4ee4fd81e0876f4bd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 14 Dec 2018 21:21:10 +0100
Subject: [PATCH 1956/2793] abcmidi: 2018.10.25 -> 2018.12.01

---
 pkgs/tools/audio/abcmidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 1a215d4ca83..03e468a9b0a 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.10.25";
+  version = "2018.12.01";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0q7yrds1hpis1821mdsz31c2cvn7hs73a10fi1mrk1v4hqql8vv3";
+    sha256 = "133kdyin2lwidlnd8ivjyymrrb0rr1028apj2biyp6l0l5yrqw78";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 2f9934d78e33aa4c2252f1b5a117e8bc03859f2d Mon Sep 17 00:00:00 2001
From: Jacob Logemann <jake@lgmn.io>
Date: Fri, 14 Dec 2018 15:24:34 -0500
Subject: [PATCH 1957/2793] maintainers: add jakelogemann (#52095)

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7a0ff6fe437..9b07e439e2e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1928,6 +1928,11 @@
     github = "jagajaga";
     name = "Arseniy Seroka";
   };
+  jakelogemann = {
+    email = "jake.logemann@gmail.com";
+    github = "jakelogemann";
+    name = "Jake Logemann";
+  };
   jammerful = {
     email = "jammerful@gmail.com";
     github = "jammerful";

From e0af2df2607e82b2eff5253801d5a787d55d8b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 14 Dec 2018 21:26:14 +0100
Subject: [PATCH 1958/2793] python.pkgs.yarl: 1.2.6 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 3425d915f45..d07690503f3 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.2.6";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8cbc21bbfa1dd7d5386d48cc814fe3d35b80f60299cdde9279046f399c3b0d8";
+    sha256 = "024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9";
   };
 
   checkInputs = [ pytest pytestrunner ];

From a3c536fcb374387b228c7a270987d6d38d697b86 Mon Sep 17 00:00:00 2001
From: Darius Jahandarie <djahandarie@gmail.com>
Date: Fri, 14 Dec 2018 15:48:58 -0500
Subject: [PATCH 1959/2793] dockerTools.buildImage: fix two bugs introduced in
 c88337c9aca9d91804da7d1d05960c88e17455c9

---
 pkgs/build-support/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index f16cb7cec13..731dd1ea992 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -157,7 +157,7 @@ rec {
         };
         inherit fromImage fromImageName fromImageTag;
 
-        buildInputs = [ utillinux e2fsprogs jshon rsync ];
+        buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
       } ''
       rm -rf $out
 
@@ -202,8 +202,8 @@ rec {
         extractionID=$((extractionID + 1))
 
         mkdir -p image/$extractionID/layer
-        tar -C image/$extractionID/layer -xpf $layerTar
-        rm $layerTar
+        tar -C image/$extractionID/layer -xpf image/$layerTar
+        rm image/$layerTar
 
         find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
 

From 3492943d178f1923105ba344c0a2622713e074c8 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Fri, 14 Dec 2018 15:58:25 -0500
Subject: [PATCH 1960/2793] clean: 2.4 -> 3.0

---
 pkgs/development/compilers/clean/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index cc6197922fd..91c163fd343 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "clean-2.4";
+  name = "clean-3.0";
 
   src =
     if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
-      url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
-      sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
+      url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz";
+      sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010";
     })
     else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-        url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
-        sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
+        url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz";
+        sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i";
     })
     else throw "Architecture not supported";
 

From 6a18963eeba2fa3970526cc19946e84893529d1e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 7 Dec 2018 04:11:02 +0000
Subject: [PATCH 1961/2793] satysfi: 2018-03-07 -> 0.0.3

---
 pkgs/tools/typesetting/satysfi/default.nix | 37 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index aee85e08375..0a0f593eaa3 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchzip, fetchFromGitHub, ocamlPackages }:
+{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
+, ipaexfont, junicode
+}:
 let
   lm = fetchzip {
     url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
@@ -9,15 +11,31 @@ let
     url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
     sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
   };
+  camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
+    src = fetchFromGitHub {
+      owner = "gfngfn";
+      repo = "camlpdf";
+      rev = "v2.2.1+satysfi";
+      sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy";
+    };
+  });
+  otfm = ocamlPackages.otfm.overrideAttrs (o: {
+    src = fetchFromGitHub {
+      owner = "gfngfn";
+      repo = "otfm";
+      rev = "v0.3.2+satysfi";
+      sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd";
+    };
+  });
 in
   stdenv.mkDerivation rec {
     name = "satysfi-${version}";
-    version = "2018-03-07";
+    version = "0.0.3";
     src = fetchFromGitHub {
       owner = "gfngfn";
       repo = "SATySFi";
-      rev = "a050ec0906d083682c630b0dea68887415b5f53d";
-      sha256 = "12bhl7s2kc02amr8rm71pihj203f2j15y5j0kz3swgsw0gqh81gv";
+      rev = "v${version}";
+      sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f";
       fetchSubmodules = true;
     };
 
@@ -27,9 +45,16 @@ in
       $out/share/satysfi
     '';
 
-    buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib menhir
-      ppx_deriving uutf result core_kernel bitv batteries yojson camlimages ];
+    nativeBuildInputs = [ ruby dune ];
+
+    buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
+      ocaml findlib menhir
+      batteries camlimages core_kernel ppx_deriving uutf yojson
+    ]);
+
     installPhase = ''
+      cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/
+      cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/
       cp -r ${lm}/* lib-satysfi/dist/fonts/
       cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
       make install PREFIX=$out LIBDIR=$out/share/satysfi

From 6fbc9c4c6cc2eca54754147ffef8a661683c0537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 14 Dec 2018 22:10:14 +0100
Subject: [PATCH 1962/2793] python.pkgs.colorlog: 3.1.4 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index 3045e61db60..edcd040b066 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "3.1.4";
+  version = "4.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";
+    sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42";
   };
 
   checkInputs = [ pytest ];

From 1ba7f1190513041bbb09f647bd115b3445728707 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 13:13:04 -0800
Subject: [PATCH 1963/2793] python37Packages.dropbox: 9.1.0 -> 9.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/python3.7-dropbox/versions
---
 pkgs/development/python-modules/dropbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 7693f7f0568..345cd120f07 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "9.1.0";
+  version = "9.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j6p5hgbglpwqd4jl53iqs83537464lybzc0aszi3w6wm6i0dlyq";
+    sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

From 375f2c23dd5cf56d07a5352081d3d0bd7a247e3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 13:27:31 -0800
Subject: [PATCH 1964/2793] python37Packages.django_2_1: 2.1.3 -> 2.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/python3.7-django/versions
---
 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 adda83ce715..57a3198b4d1 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.3";
+  version = "2.1.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05k990b9zbj0nfkdcn13f5hg7ppfx9vffz5s0m66imd3mmlb5yhz";
+    sha256 = "1mxbrqdzim3xcy18dmd08xh2am0q7whbf0nf6bmnrl43802m3386";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 9295ffbf8edc76c777146b6d1b65d75118f2103b Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 03:01:45 +0000
Subject: [PATCH 1965/2793] pythonPackages.namedlist: init at 1.7

---
 .../python-modules/namedlist/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/namedlist/default.nix

diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix
new file mode 100644
index 00000000000..ae07076bb05
--- /dev/null
+++ b/pkgs/development/python-modules/namedlist/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "namedlist";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11n9c4a5ak9971awkf1g92m6mcmiprhrw98ik2cmjsqxmz73j2qr";
+  };
+
+  # Test file has a `unittest.main()` at the bottom that fails the tests;
+  # py.test can run the tests without it.
+  postPatch = ''
+    substituteInPlace test/test_namedlist.py --replace "unittest.main()" ""
+  '';
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Similar to namedtuple, but instances are mutable";
+    homepage = https://bitbucket.org/ericvsmith/namedlist;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9ecf9495e1..2586ca756f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3076,6 +3076,8 @@ in {
 
   namebench = callPackage ../development/python-modules/namebench { };
 
+  namedlist = callPackage ../development/python-modules/namedlist { };
+
   nameparser = callPackage ../development/python-modules/nameparser { };
 
   nbconvert = callPackage ../development/python-modules/nbconvert { };

From d94ac27dc54493a8c7c46b7705341ec455adbd4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 14 Dec 2018 23:20:39 +0100
Subject: [PATCH 1966/2793] python.pkgs.tweepy: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index c0c74743044..97903a4a222 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -2,18 +2,11 @@
 
 buildPythonPackage rec {
   pname = "tweepy";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c";
-  };
-
-  # Fix build with pip 10
-  # https://github.com/tweepy/tweepy/pull/1030
-  patches = fetchpatch {
-    url = "${meta.homepage}/commit/778bd7a31d2f5fae98652735e7844533589ca221.patch";
-    sha256 = "1sqmjn0ngiynhfkdkcs33qmvl49ysfp8522hvxjk8bx252y9qw2h";
+    sha256 = "fe85a79f58a01dd335968523b91c5fce760e7fe78bf25a6e71c72204fe499d0b";
   };
 
   doCheck = false;

From 33b906bacfb97182879e98bf9d8884a806c87d56 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 06:53:44 +0000
Subject: [PATCH 1967/2793] pythonPackages.ludios_wpull: init at 3.0.7

---
 .../python-modules/ludios_wpull/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/ludios_wpull/default.nix

diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix
new file mode 100644
index 00000000000..1c707b32031
--- /dev/null
+++ b/pkgs/development/python-modules/ludios_wpull/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, chardet
+, dnspython
+, html5-parser
+, lxml
+, namedlist
+, sqlalchemy
+, tornado_4
+, Yapsy
+}:
+
+buildPythonPackage rec {
+  pname = "ludios_wpull";
+  version = "3.0.7";
+
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    rev = "${version}";
+    owner = "ludios";
+    repo = "wpull";
+    sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
+  };
+
+  propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ];
+
+  # Test suite has tests that fail on all platforms
+  doCheck = false;
+
+  meta = {
+    description = "Web crawler; fork of wpull used by grab-site";
+    homepage = https://github.com/ludios/wpull;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2586ca756f0..4a0fea0b4f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1872,6 +1872,8 @@ in {
 
   lpod = callPackage ../development/python-modules/lpod { };
 
+  ludios_wpull = callPackage ../development/python-modules/ludios_wpull { };
+
   luftdaten = callPackage ../development/python-modules/luftdaten { };
 
   m2r = callPackage ../development/python-modules/m2r { };

From cb3e6e72b9f6d5427b8f757df23c9d00c6521e6f Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 13 Dec 2018 10:48:18 +0000
Subject: [PATCH 1968/2793] pythonPackages.fb-re2: init at 1.0.6

---
 .../python-modules/fb-re2/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/fb-re2/default.nix

diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
new file mode 100644
index 00000000000..88a75d29fd1
--- /dev/null
+++ b/pkgs/development/python-modules/fb-re2/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, re2
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "fb-re2";
+  version = "1.0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c";
+  };
+
+  buildInputs = [ re2 ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Python wrapper for Google's RE2";
+    homepage = https://github.com/facebook/pyre2;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a0fea0b4f3..8020cf2fb89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1671,6 +1671,8 @@ in {
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";
 
+  fb-re2 = callPackage ../development/python-modules/fb-re2 { };
+
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };

From 66f59ee1ad3707fb25078f2f68e5b359eef98a6b Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 14 Dec 2018 02:20:17 +0000
Subject: [PATCH 1969/2793] grab-site: init at 2.1.11

---
 pkgs/tools/backup/grab-site/default.nix | 30 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/backup/grab-site/default.nix

diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
new file mode 100644
index 00000000000..7209afd8e7e
--- /dev/null
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  version = "2.1.11";
+  name = "grab-site-${version}";
+
+  src = fetchFromGitHub {
+    rev = "${version}";
+    owner = "ludios";
+    repo = "grab-site";
+    sha256 = "0w24ngr2b7nipqiwkxpql2467b5aq2vbknkb0sry6a457kb5ppsl";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet
+  ];
+
+  checkPhase = ''
+    export PATH=$PATH:$out/bin
+    bash ./tests/offline-tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Crawler for web archiving with WARC output";
+    homepage = https://github.com/ludios/grab-site;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ivan ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 209a90a1601..3e392af3f65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10004,6 +10004,8 @@ in
 
   gperftools = callPackage ../development/libraries/gperftools { };
 
+  grab-site = callPackage ../tools/backup/grab-site { };
+
   grib-api = callPackage ../development/libraries/grib-api { };
 
   grpc = callPackage ../development/libraries/grpc { };

From 3f145d8e50ca8b4ba4e98a6d2a384d0354fabdb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 15:01:29 -0800
Subject: [PATCH 1970/2793] python27Packages.cmdtest: 0.18 -> 0.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/python2.7-cmdtest/versions
---
 pkgs/development/python-modules/cmdtest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
index 605529b1747..73c05c01aed 100644
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ b/pkgs/development/python-modules/cmdtest/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   name = "cmdtest-${version}";
-  version = "0.18";
+  version = "0.32";
   disabled = isPy3k || isPyPy;
 
   src = fetchurl {
     url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz";
-    sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn";
+    sha256 = "0scc47h1nkmbm5zlvk9bsnsg64kb9r4xadchdinf4f1mph9qpgn6";
   };
 
   propagatedBuildInputs = [ cliapp ttystatus markdown ];

From 35df6f5d758b9d3719ad629ee47e31aa28a25b7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 15:07:24 -0800
Subject: [PATCH 1971/2793] python37Packages.folium: 0.6.0 -> 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/python3.7-folium/versions
---
 pkgs/development/python-modules/folium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 7ff4a37d6d3..78db8e0e10c 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79";
+    sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n";
   };
 
   checkInputs = [ pytest nbconvert pandas mock ];

From 004cb5a694e39bd91b27b0adddc127daf2cb76cb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 14 Dec 2018 16:15:15 -0600
Subject: [PATCH 1972/2793] lmdb: ship static library, too

This is useful if you're using pkgs.pkgsMusl to build static libraries.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/lmdb/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 0bb3a67d950..ef187a15efc 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     moveToOutput bin "$bin"
-    moveToOutput "lib/*.a" REMOVE # until someone needs it
   ''
     # add lmdb.pc (dynamic only)
     + ''

From 04e2dd4c4fd16cbf6bb58540363340347df940ef Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Sat, 15 Dec 2018 00:48:32 +0100
Subject: [PATCH 1973/2793] mkdocs: 0.17.5 -> 1.0.4

---
 .../tools/documentation/mkdocs/default.nix       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index 925d0a786af..5f3dff95e35 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -4,25 +4,24 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "mkdocs";
-  version = "0.17.5";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "mkdocs";
     rev = version;
-    sha256 = "1l1dahpwqikmww3yx2m6j2134npk8vcikg9klsmpqjpza8nigwzw";
+    sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "tornado>=4.1,<5.0" "tornado>=4.1"
-  '';
-
   checkInputs = [
     nose nose-exclude mock
   ];
 
-  NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests";
+  NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [
+    "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy"
+    "mkdocs.tests.config.config_tests.ConfigTests"
+    "mkdocs.tests.config.config_options_tests.DirTest"
+  ];
 
   checkPhase = "nosetests mkdocs";
 
@@ -33,6 +32,7 @@ buildPythonApplication rec {
     pyyaml
     markdown
     jinja2
+    backports_tempfile
   ];
 
   meta = {

From b686f38c40c4f7be7819a35e6f305a77460e3b08 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 15 Dec 2018 00:22:08 +0000
Subject: [PATCH 1974/2793] qemu: 3.0.0 -> 3.1.0

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index ea330d59555..1cd85cead12 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -34,7 +34,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "3.0.0";
+  version = "3.1.0";
   name = "qemu-"
     + stdenv.lib.optionalString xenSupport "xen-"
     + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "1s7bm2xhcxbc9is0rg8xzwijx7azv67skq7mjc58spsgc2nn4glk";
+    sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq";
   };
 
   buildInputs =

From b261fb0474951e14b815f36e535d5ea6036d47c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 16:27:07 -0800
Subject: [PATCH 1975/2793] picard-tools: 2.18.17 -> 2.18.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/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 9c7de486573..ad37a3a7dab 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.17";
+  version = "2.18.20";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0ks7ymrjfya5h77hp0bqyipzdri0kf97c8wks32nvwkj821687zm";
+    sha256 = "0dx6fxn6d7mawkah242fdi9wm8pdzmm4m004fb9ak2fsvrs2m5pk";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3ab5c5a3203b4788a2cad46ddaefe706280f8319 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 16:34:59 -0800
Subject: [PATCH 1976/2793] plantuml: 1.2018.12 -> 1.2018.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/plantuml/versions
---
 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 0f035c347cf..c3d3f916d97 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2018.12";
+  version = "1.2018.13";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "1ydi4zwzwf9q6hldzd9pcvsbrwy8r52vqxm74j2wq8yivh2p85s4";
+    sha256 = "181wm05gp4hs4g0z345pp1x9w1g5bx1vpipkhnwvmy4vdj17b4bg";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 25debad443253a2c94a0f9b205480c0d22fbced0 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 15 Dec 2018 00:44:03 +0000
Subject: [PATCH 1977/2793] tilix: fix Po4a path

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

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 98e320b7aaf..5cd1b78e5c1 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(
-      PERL5LIB="${perlPackages.Po4a}/lib/perl5"
+      PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl"
       DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace'
     )
   '';

From df8749b5a0214c8673d70725ed7bde69f4132b05 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 15 Dec 2018 00:45:34 +0000
Subject: [PATCH 1978/2793] apt: fix Po4a path

---
 pkgs/tools/package-management/apt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index b2d5e96f391..7139454733a 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
+    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl";
 
     cmakeFlagsArray+=(
       -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include

From 269b100180bb8ddec87caff2e3adfcd61649f9b1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Dec 2018 20:02:15 -0500
Subject: [PATCH 1979/2793] gym: remove dot in meta.description

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

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index c8ad9107004..61b74ad6928 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents.";
+    description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
     homepage = https://gym.openai.com/;
     license = licenses.mit;
     maintainers = with maintainers; [ hyphon81 ];

From 19d06bc517fe5b697a7f386c69a2d0febaa2cff9 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 15 Dec 2018 01:12:14 +0000
Subject: [PATCH 1980/2793] apt: remove 'export PERL5LIB'

---
 pkgs/tools/package-management/apt/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 7139454733a..abd5e6f2f4f 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl";
-
     cmakeFlagsArray+=(
       -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
       -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl

From 8fd01fd7c8bd2316f03a860fee9ef33052c2dff9 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 15 Dec 2018 01:13:00 +0000
Subject: [PATCH 1981/2793] tilix: remove 'export PERL5LIB'

---
 pkgs/applications/misc/tilix/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 5cd1b78e5c1..eb7a8e41d4b 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(
-      PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl"
       DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace'
     )
   '';

From 2ebd5de01e017d88fe055b3ec67f86f4b0cd878c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 17:35:26 -0800
Subject: [PATCH 1982/2793] pspg: 1.6.2 -> 1.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/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 60851b467ed..597d0b566d9 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.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s";
+    sha256 = "1k2nnq15h5grymiylnh1iqipxn315paq58habfmaix2zlj3n3dy2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d085ce3b7c03f66e95356fa5f993270ef2ee5575 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 18:02:41 -0800
Subject: [PATCH 1983/2793] pulseeffects: 4.4.0 -> 4.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/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 659c0a71e27..6b62faa51bd 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.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "0bjzlqyvcp9hxaq07nqr14k9kvan5myaxb7ci30gz0fgayib85lv";
+    sha256 = "0hb575h9hdknhwvhn5lak89ddavn4v5c0nipnv8dsfnmjhfli5qm";
   };
 
   nativeBuildInputs = [

From 94a3fe4931e06bcf94d9cb6904f7e88f7d0bb1af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 19:00:11 -0800
Subject: [PATCH 1984/2793] playonlinux: 4.2.12 -> 4.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/playonlinux/versions
---
 pkgs/applications/misc/playonlinux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 8c9f13ce92c..e1b6b7fcc46 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "4.2.12";
+  version = "4.3.3";
 
   binpath = stdenv.lib.makeBinPath
     [ cabextract
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq";
+    sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 00f570005752e41a15d34b213a962b0f16bfac1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 19:04:32 -0800
Subject: [PATCH 1985/2793] playerctl: 0.6.1 -> 2.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/playerctl/versions
---
 pkgs/tools/audio/playerctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index 15e7a772bbd..9d30878daae 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
-  version = "0.6.1";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
     rev = "v${version}";
-    sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb";
+    sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];

From b8e09ad0b526eee1009608f28efb5e8745f189e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 19:45:56 -0800
Subject: [PATCH 1986/2793] octopus: 8.2 -> 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/octopus/versions
---
 pkgs/applications/science/chemistry/octopus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index e79e21707d4..2dd3c9b64c4 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "8.2";
+  version = "8.3";
   fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
-    sha256 = "0z74q17lzyga44m5pbsr1hmq12ly96y44pcz7glfvc4vbaq3jd8p";
+    sha256 = "0nr3qmyfhp6fy8qrp4p43pl5xxfqgqg5g1c2775hxhpsi29xr7zf";
   };
 
   nativeBuildInputs = [ perl procps fftw.dev ];

From 2976f43dd2a28df7eec0ab8a497b2ed0c431c914 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 19:53:32 -0800
Subject: [PATCH 1987/2793] osinfo-db: 20181101 -> 20181203

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 b4de04780bd..893707395ae 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-20181101";
+  name = "osinfo-db-20181203";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "1n9xq5nspfgsdqifh23ypsc85n5xl6cdbwdlacp0sa8rhkmfdvd7";
+    sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From ac62227cfe4d8b864b84f45cd55ca15b776e6950 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 20:10:07 -0800
Subject: [PATCH 1988/2793] padthv1: 0.9.3 -> 0.9.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/padthv1/versions
---
 pkgs/applications/audio/padthv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 5d74db5ec3e..084487fd407 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "padthv1-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${name}.tar.gz";
-    sha256 = "157w28wxggqpqkibz716v3r756q2z78g70ipncpalchb9dfr42b6";
+    sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

From 82c3d05d9e7e29857640c3cdaafbc1e29b33fec6 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 14 Dec 2018 22:37:18 -0500
Subject: [PATCH 1989/2793] rtl8812au: 5.2.20_25672.20171213 ->
 5.2.20.2_28373.20180619

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

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 879c427b049..4205cab6da6 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
-  version = "5.2.20_25672.20171213";
+  version = "5.2.20.2_28373.20180619";
 
   src = fetchFromGitHub {
     owner = "zebulon2";
     repo = "rtl8812au-driver-5.2.20";
-    rev = "aca1e0677bfe56c6c4914358df007c97486e7095";
-    sha256 = "19av8fkh3mvs2f57iibrg0cfyhjnnx4cbnfzv5aj7v5gb0j3dp0p";
+    rev = "2dad788f5d71d50df4f692b67a4428967ba3d42c";
+    sha256 = "17pn73j2xqya0g8f86hn1jyf9x9wp52md05yrg1md58ixsbh1kz3";
   };
 
   nativeBuildInputs = [ bc ];

From 67d5b90fac48142d765971907496e1bb1b0cfc7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 20:49:55 -0800
Subject: [PATCH 1990/2793] pdfgrep: 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/pdfgrep/versions
---
 pkgs/tools/typesetting/pdfgrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 59da3c1ccda..5f35beac2d0 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pdfgrep-${version}";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "https://pdfgrep.org/download/${name}.tar.gz";
-    sha256 = "02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c";
+    sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf";
   };
 
   postPatch = ''

From d299830f2ed73ec7dd8b694ae804c6f0426a3a49 Mon Sep 17 00:00:00 2001
From: Timothy Bess <tdbgamer@gmail.com>
Date: Sat, 15 Dec 2018 00:01:54 -0500
Subject: [PATCH 1991/2793] update flameshot and add new dep

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

diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index 5356f8ad065..3be418af823 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }:
 
 stdenv.mkDerivation rec {
   name = "flameshot-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
 
-  nativeBuildInputs = [ qmake qttools ];
+  nativeBuildInputs = [ qmake qttools qtsvg ];
   buildInputs = [ qtbase ];
 
   qmakeFlags = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "lupoDharkael";
     repo = "flameshot";
     rev = "v${version}";
-    sha256 = "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0";
+    sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm";
   };
 
   enableParallelBuilding = true;

From 84800eb00381c4ae1538b54bba5e8e3788f95d6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 21:14:14 -0800
Subject: [PATCH 1992/2793] oniguruma: 6.9.0 -> 6.9.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/onig/versions
---
 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 956c8b58ffc..4c994d596ba 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.9.0";
+  version = "6.9.1";
 
   src = fetchFromGitHub {
     owner = "kkos";
     repo = "oniguruma";
     rev = "v${version}";
-    sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h";
+    sha256 = "0dbdd9r15fsqn0rimkjwlv8v68v4i1830h0m7dw56b335wwl6bbg";
   };
 
   nativeBuildInputs = [ cmake ];

From 1cd8c81d50b92ac3c97d7e93d97b0bfd17811df5 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 15 Dec 2018 14:20:34 +0900
Subject: [PATCH 1993/2793] [bluezFull] add bluezFull package that enables all
 plugins

This PR adds the top-level `bluezFull` package.  This `bluezFull`
package enables all the plugins provided by the `bluez` package.
---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e392af3f65..b930b0e0d26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14195,6 +14195,12 @@ in
 
   bluez = bluez5;
 
+  bluezFull = bluez.override {
+    enableWiimote = true;
+    enableMidi = true;
+    enableSixaxis = true;
+  };
+
   inherit (python3Packages) bedup;
 
   bridge-utils = callPackage ../os-specific/linux/bridge-utils { };

From 614756aee35a49e6d4a67fcc0647f66dcfd32fe9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 21:26:37 -0800
Subject: [PATCH 1994/2793] papirus-icon-theme: 20181007 -> 20181120

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/papirus-icon-theme/versions
---
 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 83cae45426f..83ff9834c29 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 = "20181007";
+  version = "20181120";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = version;
-    sha256 = "1hv526k0ykq2yj9f6bcl711sgdxwx5y0yqjf5acpvcmx9pm58vz5";
+    sha256 = "1v0vb7l948gxyz37vzh01jqmb8d3w3hxw85vly08ra1ldixaczc5";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 9039cc3f28e21d14bc4c9af8b2aac4cd7d8875fa Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 15 Dec 2018 14:49:41 +0900
Subject: [PATCH 1995/2793] Add explanation of using the bluezFull package in
 nixos documentation.

---
 nixos/modules/services/hardware/bluetooth.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index d7ca8a43179..2a8dfe4a66c 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -25,9 +25,14 @@ in {
         type = types.package;
         default = pkgs.bluez;
         defaultText = "pkgs.bluez";
-        example = "pkgs.bluez.override { enableMidi = true; }";
+        example = "pkgs.bluezFull";
         description = ''
           Which BlueZ package to use.
+
+          <note><para>
+            Use the <literal>pkgs.bluezFull</literal> package to enable all
+            bluez plugins.
+          </para></note>
         '';
       };
 

From ded61975cc09b976fe8fd185b42c709a9babb84c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 21:51:30 -0800
Subject: [PATCH 1996/2793] pcsctools: 1.5.3 -> 1.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/pcsc-tools/versions
---
 pkgs/tools/security/pcsctools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 42f1df8b384..c1ab5e82af3 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -6,11 +6,11 @@
 let deps = lib.makeBinPath [ wget coreutils ];
 
 in stdenv.mkDerivation rec {
-  name = "pcsc-tools-1.5.3";
+  name = "pcsc-tools-1.5.4";
 
   src = fetchurl {
     url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2";
-    sha256 = "050x3yqd5ywl385zai3k1zhbm2lz1f5ksalfpm9hd86s50f03ans";
+    sha256 = "14vw6ya8gzyw3lzyrsvfcxx7qm7ry39fbxcdqqh552c1lyxnm7n3";
   };
 
   buildInputs = [ udev dbus perl pcsclite ];

From 44b2145dbe1642ad9b22b0aa6be1529332dad106 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 22:10:24 -0800
Subject: [PATCH 1997/2793] osrm-backend: 5.19.0 -> 5.20.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/osrm-backend/versions
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 97612f656cb..4e43fffb196 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.19.0";
+  version = "5.20.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz";
+    sha256 = "0frq16p4wms8zfb6mhn7xbxrvf81f1wn37lqlf5p1yjly5fbljhc";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 943e6fa283ec4e2820419e245ee59afae426f8be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 22:17:15 -0800
Subject: [PATCH 1998/2793] pari: 2.11.0 -> 2.11.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/pari/versions
---
 pkgs/applications/science/math/pari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 9fe1d9df46d..32e4d81acec 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
 stdenv.mkDerivation rec {
 
   name = "pari-${version}";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q";
+    sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
   };
 
   buildInputs = [

From 2d5545daaf8b86aeceacbc292ab8201b90f3007f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 22:26:13 -0800
Subject: [PATCH 1999/2793] ocamlPackages.curses: 1.0.3 -> 1.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/ocaml-curses/versions
---
 pkgs/development/ocaml-modules/curses/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index eebb2f68f3d..d08259af247 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml-curses-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "http://ocaml.phauna.org/distfiles/ocaml-curses-${version}.ogunden1.tar.gz";
-    sha256 = "0fxya4blx4zcp9hy8gxxm2z7aas7hfvwnjdlj9pmh0s5gijpwsll";
+    sha256 = "08wq1r93lincdfzlriyc5nl2p4q7ca4h6ygzgp1nhkgd93pgk9v2";
   };
 
   propagatedBuildInputs = [ ncurses ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OCaml Bindings to curses/ncurses";
-    homepage = https://opam.ocaml.org/packages/curses/curses.1.0.3/;
+    homepage = https://opam.ocaml.org/packages/curses/curses.1.0.4/;
     license = licenses.gpl2;
     maintainers = [ maintainers.volth ];
     platforms = ocaml.meta.platforms or [];

From 4c3e1114d8994d5787fad964a93011430b4ef717 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 23:01:19 -0800
Subject: [PATCH 2000/2793] neovim-qt: 0.2.10 -> 0.2.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/neovim-qt/versions
---
 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 cfdcd7fe939..315a51256f2 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.10";
+  version = "0.2.11";
 
   src = fetchFromGitHub {
     owner  = "equalsraf";
     repo   = "neovim-qt";
     rev    = "v${version}";
-    sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4";
+    sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh";
   };
 
   cmakeFlags = [

From 20f691ddeec1de3203e047483f1f0847c8f6d8d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 23:27:29 -0800
Subject: [PATCH 2001/2793] ocamlPackages.cmdliner: 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/ocaml-cmdliner/versions
---
 pkgs/development/ocaml-modules/cmdliner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 9ba48e6ebfd..a4341ed98c6 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
+    sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
   };
 
   nativeBuildInputs = [ ocamlbuild topkg ];

From b20fcce1957a86d058af5c6cc12728e402f7188a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 15 Dec 2018 08:33:28 +0100
Subject: [PATCH 2002/2793] nixos/nm-setup-hostsdir: RemainAfterExist ->
 RemainAfterExit

---
 nixos/modules/services/networking/networkmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2d76e0676b2..d372dfd8f41 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -488,7 +488,7 @@ in {
       '') cfg.dynamicHosts.hostsDirs);
       serviceConfig = {
         Type = "oneshot";
-        RemainAfterExist = true;
+        RemainAfterExit = true;
       };
     };
 

From 922acf1cf95aaac075037eb3c0319b61dc8d5fb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 23:40:00 -0800
Subject: [PATCH 2003/2793] mbuffer: 20180625 -> 20181119

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mbuffer/versions
---
 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 5eefc94a2cd..67640cf30ab 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
  } :
 
 stdenv.mkDerivation rec {
-  version = "20180625";
+  version = "20181119";
   name = "mbuffer-${version}";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "174m3zbm0qb68p1qng1vldcs23s7qjhyf7d39sw3r03m7y7f5g5p";
+    sha256 = "1pysnvq03g3w4npw15cykgd0n7nj7lmv655szav4802pz1dgywj7";
   };
 
   buildInputs = [ openssl ];

From c2679d11988e871354d76088219549151c5ca9ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 23:43:51 -0800
Subject: [PATCH 2004/2793] mbedtls: 2.14.0 -> 2.15.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/mbedtls/versions
---
 pkgs/development/libraries/mbedtls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index de72b8a6e1d..9193f0eba1d 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   name = "mbedtls-${version}";
-  version = "2.14.0";
+  version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "0115qk69j4dvkvw5ci34zlajzhk2hbkiqbjyzr0lxf0mnqacl03i";
+    sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8";
   };
 
   nativeBuildInputs = [ cmake ninja perl python ];

From 2473754ad2337c0186169f1e2c935807461bcf32 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 15 Dec 2018 08:49:47 +0100
Subject: [PATCH 2005/2793] mosquitto: 1.5.3 -> 1.5.4

Remove patch that has been merged upstrem.
---
 pkgs/servers/mqtt/mosquitto/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 21fe01e8a34..c5ece477ced 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,24 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "mosquitto-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz";
+    sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2";
   };
 
-  patches = [
-    # https://github.com/eclipse/mosquitto/issues/983
-    (fetchpatch {
-      url    = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch";
-      sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s";
-      name   = "fix_threading_on_cmake.patch";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace man/manpage.xsl \
       --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/

From 49b967c7dde1c58a1b1c012f258a1d85831f1b3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:00:38 -0800
Subject: [PATCH 2006/2793] python37Packages.mypy: 0.641 -> 0.650

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

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 854866f659b..bcb252a7b49 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.641";
+  version = "0.650";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf";
+    sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q";
   };
 
   disabled = !isPy3k;

From 06ed9ace3486eb518262f183492c5f3c20ec005f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:22:03 -0800
Subject: [PATCH 2007/2793] mediainfo-gui: 18.08.1 -> 18.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/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 185cd82435b..904fb95ca6c 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.1";
+  version = "18.12";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
+    sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 60b6c93f51cb0ab8474288a7ab862c36fb61903c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:25:19 -0800
Subject: [PATCH 2008/2793] mergerfs: 2.24.2 -> 2.25.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/mergerfs/versions
---
 pkgs/tools/filesystems/mergerfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 16e6db8e4f7..d84855ebb30 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.24.2";
+  version = "2.25.1";
 
   src = fetchFromGitHub {
     owner = "trapexit";
     repo = "mergerfs";
     rev = version;
-    sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs";
+    sha256 = "1xrd18spp3wj25dd8513bah856w44gw8hilk190v13g6yafx64n6";
   };
 
   nativeBuildInputs = [

From 9d4cc31a169be4ad112b32702299276dbbdbfa86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 23:11:41 -0800
Subject: [PATCH 2009/2793] mimeo: 2017.6.6 -> 2018.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/mimeo/versions
---
 pkgs/tools/misc/mimeo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 18e7281ce83..727732eb87b 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "mimeo-${version}";
-  version = "2017.6.6";
+  version = "2018.11";
 
   src = fetchurl {
     url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
-    sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";
+    sha256 = "0qhsy6d1mg00s3mbykci7zk2n3qp2c27mh9nvjja9x8lx7xyfznm";
   };
 
   buildInputs = [ file desktop-file-utils ];

From ff294a71621c8a949cb257fa09f788fdb2876c0a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:51:43 -0800
Subject: [PATCH 2010/2793] maven: 3.5.4 -> 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/apache-maven/versions
---
 .../development/tools/build-managers/apache-maven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 455cd0a3fe8..c48954a6aaa 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.5.4"; in
+let version = "3.6.0"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f";
+    sha256 = "0ds61yy6hs7jgmld64b65ss6kpn5cwb186hw3i4il7vaydm386va";
   };
 
   buildInputs = [ makeWrapper ];

From 1679fec4aa3fa8409e73df5fae627bc8258ebd9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:56:32 -0800
Subject: [PATCH 2011/2793] nsd: 4.1.25 -> 4.1.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/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 5f330c4f06e..8c0fc737766 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.25";
+  name = "nsd-4.1.26";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg";
+    sha256 = "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz";
   };
 
   prePatch = ''

From 7b8c41e04cc8ab8a35352bac240206704d55448c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:06:41 -0800
Subject: [PATCH 2012/2793] prometheus-node-exporter: 0.16.0 -> 0.17.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/node_exporter/versions
---
 pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index bb86e59e4c3..9714a6048e8 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -4,7 +4,7 @@
 # https://github.com/prometheus/node_exporter/issues/870
 buildGo19Package rec {
   name = "node_exporter-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -13,7 +13,7 @@ buildGo19Package rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0rm6ahccgr1djpwvsa3p1kfal3mpy4a6g5w974pra84gk3krli5a";
+    sha256 = "08g4dg6zcr95j88apsxp828jfyx4vq271w1mgkf77c46c16d2nh0";
   };
 
   # FIXME: tests fail due to read-only nix store

From 4c0f5dc756767b7665e6e812440005602d3d0051 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:11:09 -0800
Subject: [PATCH 2013/2793] motion: 4.2 -> 4.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/motion/versions
---
 pkgs/applications/video/motion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 000bebbc93c..5317ba1f294 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "motion-${version}";
-  version = "4.2";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner  = "Motion-Project";
     repo   = "motion";
     rev    = "release-${version}";
-    sha256 = "0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv";
+    sha256 = "1h359hngbkazdli7vl949r6glrq4xxs70js6n1j8jxcyw1wxian9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From f00dcf7f768573bc95e7119c99ff2f9c16fee4d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:26:02 -0800
Subject: [PATCH 2014/2793] mutt: 1.10.1 -> 1.11.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/mutt/versions
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index cb0b8c8f5b7..6d03f2276d0 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,15 +27,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.10.1";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk";
+    sha256 = "01fvn5h7l9rkwx6qz46svl4hmww108v4bmcywiw3prb26q0l2lbh";
   };
 
   patches = optional smimeSupport (fetchpatch {
-    url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
+    url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.11.1-2/debian/patches/misc/smime.rc.patch";
     sha256 = "1rl27qqwl4nw321ll5jcvfmkmz4fkvcsh5vihjcrhzzyf6vz8wmj";
   });
 

From 53aec105df6fd06d019a153c887f6c37cc167b15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:32:15 -0800
Subject: [PATCH 2015/2793] manuskript: 0.3.0 -> 0.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/manuskript/versions
---
 pkgs/applications/editors/manuskript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index 815af2103d5..4f4be05f79e 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "manuskript";
-  version = "0.3.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "olivierkes";
     rev = version;
-    sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7";
+    sha256 = "0vqz02p3m9n4hk2jplnklr9s6niqdm5iykab6nblqdm4plb04c34";
   };
 
   propagatedBuildInputs = [

From c0f88f637ff4bcb0069369356759087d6a8df6da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:41:14 -0800
Subject: [PATCH 2016/2793] python37Packages.astropy: 3.0.5 -> 3.1 (#52152)

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 84b43fbcfa9..1fd9b53054b 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.5";
+  version = "3.1";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2";
+    sha256 = "1ldmdwfp0g8293k4gyp962nv7ik4zw83p1khkq8jqkzmk7qf040y";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

From 0cca124b0400b92fd758e30270e20b7e5cec1a64 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 15 Dec 2018 10:42:40 +0100
Subject: [PATCH 2017/2793] pythonPackages.cysignals: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 8908f6ea9d5..0999248b089 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -9,11 +9,11 @@ assert pariSupport -> pari != null;
 
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rzwd9bjw6bj01xcmimqfim1g0njjyyyal0f93frm1la4hcmq96v";
+    sha256 = "1yh4lyrinhxxra42p0k4hiyjdrqjmifg4gnmf4bky5wa0mqnyai6";
   };
 
   # explicit check:

From 8e6ee63aa4135441033637711004c04ed95bff13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:43:38 -0800
Subject: [PATCH 2018/2793] now-cli: 12.1.3 -> 12.1.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/now-cli/versions
---
 pkgs/development/web/now-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 47be5ff4250..1057a987cbc 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
   name = "now-cli-${version}";
-  version = "12.1.3";
+  version = "12.1.12";
 
   # TODO: switch to building from source, if possible
   src = fetchurl {
     url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
-    sha256 = "0jg0x227g0x2fby7mnhfyrfyja59003isg7wyh2vqcfshh5hsaq0";
+    sha256 = "019lbysfwax69mmgia6h6kbljd7adbh319g3ky2s8djy7n6js4dz";
   };
 
   sourceRoot = ".";

From 6e21679285ee3fa758b4e739d413113ed2757c04 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 01:52:20 -0800
Subject: [PATCH 2019/2793] nxproxy: 3.5.99.16 -> 3.5.99.17-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/nxproxy/versions
---
 pkgs/tools/admin/nxproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index b29d80e159b..45ec8bb72e3 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "nxproxy-${version}";
-  version = "3.5.99.16";
+  version = "3.5.99.17-1";
 
   src = fetchurl {
-    sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
+    sha256 = "18a7cvjnaf50lf1cc5axx9jmi8n9g75d2i5y4s6q9r3phpwyp918";
     url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 

From d1edf245e8c1838a4c6df43a81ac976e36e70b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 15 Dec 2018 09:28:44 +0100
Subject: [PATCH 2020/2793] python3Package.thinc: 6.12.0 -> 6.12.1

---
 pkgs/development/python-modules/thinc/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index cdf2de9e730..acbc2a60817 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -19,18 +19,17 @@
 , plac
 , six
 , mock
-, termcolor
 , wrapt
 , dill
 }:
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "6.12.0";
+  version = "6.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lfdf08v7rrj9b29z2vf8isaqa0zh16acw9im8chkqsh8bay4ykm";
+    sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -45,20 +44,18 @@ buildPythonPackage rec {
    preshed
    numpy
    murmurhash
-   pytest
-   hypothesis
    tqdm
    cytoolz
    plac
    six
-   mock
-   termcolor
    wrapt
    dill
   ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
 
   checkInputs = [
+    hypothesis
+    mock
     pytest
   ];
 
@@ -66,7 +63,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \
       --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \
-      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+      --replace "msgpack-numpy<0.4.4" "msgpack-numpy"
   '';
 
   # Cannot find cython modules.

From 0730a55dca2d76c14f306254dbd1654506f8cba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 15 Dec 2018 09:29:14 +0100
Subject: [PATCH 2021/2793] python3Packages.spacy: 2.0.16 -> 2.0.18

Changes:

https://github.com/explosion/spaCy/releases/tag/v2.0.18
https://github.com/explosion/spaCy/releases/tag/v2.0.17
---
 pkgs/development/python-modules/spacy/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 035d0f70549..275e924e411 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -2,14 +2,12 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, html5lib
 , pytest
 , preshed
 , ftfy
 , numpy
 , murmurhash
 , plac
-, six
 , ujson
 , dill
 , requests
@@ -23,19 +21,17 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.0.16";
+  version = "2.0.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ghgbv819ff4777904p1kzayq1dj34i7853anvg859sak59r7pj1";
+    sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj";
   };
 
   prePatch = ''
     substituteInPlace setup.py \
       --replace "regex==" "regex>=" \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
-      --replace "thinc>=6.12.0,<6.13.0" "thinc>=6.12.0" \
-      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
   '';
 
   propagatedBuildInputs = [
@@ -45,8 +41,6 @@ buildPythonPackage rec {
    preshed
    thinc
    plac
-   six
-   html5lib
    ujson
    dill
    requests

From 4313a9b6bedd9d7c18e6bc70f071b10abcfc0780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 15 Dec 2018 11:16:28 +0100
Subject: [PATCH 2022/2793] python.pkgs.ftfy: disable on python2

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

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index ce847b81de6..1ffd24584bc 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , buildPythonPackage
+, isPy3k
 , fetchPypi
 , html5lib
 , wcwidth
@@ -15,6 +16,7 @@ buildPythonPackage rec {
   # python 2 and 3, they have pinned ftfy to the v4 branch.
   # I propose to stick to v4 until another package requires v5.
   # At that point we can make a ftfy_v4 package.
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;

From 4878a24df74be876009a621f19195fd808e57cce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 02:42:38 -0800
Subject: [PATCH 2023/2793] mycli: 1.17.0 -> 1.19.0 (#52198)

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

diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index d01dca45959..a4f4910a334 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -7,11 +7,11 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "mycli";
-  version = "1.17.0";
+  version = "1.19.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11d3ssjifms6bid77jk06zl5wl3srihijmv5kggxa0w2l59y8h9m";
+    sha256 = "0x5vzl4vvirqy03fnjwkamhzrqkknlajamwz1rmbnqh4bfmijh9m";
   };
 
   propagatedBuildInputs = [

From 00c8ba72544d38298b7753c4810149f7af813585 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 02:43:44 -0800
Subject: [PATCH 2024/2793] mpich: 3.2.1 -> 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/mpich/versions
---
 pkgs/development/libraries/mpich/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 87d24854255..bab52e0fbe0 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "mpich-${version}";
-  version = "3.2.1";
+  version = "3.3";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax";
+    sha256 = "02zs118q9n4xz9qnfc24i2r84vnzgnwnyyqanfv03lf3wqpy17ij";
   };
 
   configureFlags = [

From d7a022bb1d8e7bac8b7d57c485ea70384aa1f6fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 02:52:27 -0800
Subject: [PATCH 2025/2793] netdata: 1.11.0 -> 1.11.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/netdata/versions
---
 pkgs/tools/system/netdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 97a250f79d8..cb22022dc43 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit }:
 
 stdenv.mkDerivation rec{
-  version = "1.11.0";
+  version = "1.11.1";
   name = "netdata-${version}";
 
   src = fetchurl {
     url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
-    sha256 = "17b14w34jif6bviw3s81imbazkvvafwxff7d5zjy6wicq88q8b64";
+    sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From f15f78a3c2a5aa33aac965fdda1c34469bc197d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 03:28:50 -0800
Subject: [PATCH 2026/2793] libre: 0.5.9 -> 0.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/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 50b485c4822..c9debe61743 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.9";
+  version = "0.6.0";
   name = "libre-${version}";
   src = fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "04lnnlhifzyhv231abgnzvfzq21xhsal3lnimncp1q3pmrfa0aw8";
+    sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf";
   };
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]

From d4255008afc5fbe163600e68218eb14eee75b258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Sat, 15 Dec 2018 12:31:45 +0100
Subject: [PATCH 2027/2793] ola: use python36 (#52097)

python37.pkgs.protobuf does not build with protobuf3_1
---
 pkgs/applications/misc/ola/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index fce6b8426cb..e16d9354bb4 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
 , libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
-, perl, python3, python3Packages
+, perl, python36 # Replace by python3 after the next update
 }:
 
 stdenv.mkDerivation rec {
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
-  buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
+  buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python36 ];
   propagatedBuildInputs = [
-    (python3Packages.protobuf.override { protobuf = protobuf3_1; })
-    python3Packages.numpy
+    (python36.pkgs.protobuf.override { protobuf = protobuf3_1; })
+    python36.pkgs.numpy
   ];
 
   configureFlags = [ "--enable-python-libs" ];

From 24b116160450a5759f83253bb813ea6d7104804b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 03:38:59 -0800
Subject: [PATCH 2028/2793] love_11: 11.1 -> 11.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/love/versions
---
 pkgs/development/interpreters/love/11.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index e92a84b40b8..77cbd8a8245 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "love";
-  version = "11.1";
+  version = "11.2";
 in
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "rude";
     repo = "love";
     rev = "${version}";
-    sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr";
+    sha256 = "0bp22mzkjy48gncj5vm9b7whzrggcbs5pd4cnb6k8jpl9j02dhdv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 0bf6022325c4a5c77e361f9dbbe9169e9c668d26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 03:44:48 -0800
Subject: [PATCH 2029/2793] logrotate: 3.14.0 -> 3.15.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/logrotate/versions
---
 pkgs/tools/system/logrotate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index 75f60968440..e01636f2944 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "logrotate-${version}";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
     rev = version;
-    sha256 = "1wdjqbly97y1i11nl6cmlfpld3yqak270ixf29wixjgrjn8p4xzh";
+    sha256 = "094wv4d3gv5dmw55d0xij06lgcg5q9bmq49hipc2jhp4vdsj4xr5";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.

From 822c2824bf4bad70d7b39eb407164980e40cde2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 15 Dec 2018 12:54:25 +0100
Subject: [PATCH 2030/2793] ttwatch: 2018-02-01 -> 2018-12-04

---
 pkgs/tools/misc/ttwatch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix
index d7e1171064c..5663bcc35fd 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/pkgs/tools/misc/ttwatch/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ttwatch-${version}";
-  version = "2018-02-01";
+  version = "2018-12-04";
 
   src = fetchFromGitHub {
     owner = "ryanbinns";
     repo = "ttwatch";
-    rev = "b5c54647ed9b640584e53c4c15ee12d210790021";
-    sha256 = "136sskz9hnbwp49gxp983mswzgpl8yfc25ni79csbsnwp0k4lb94";
+    rev = "eeb4e19bf7ca7ca2cee7f5fbeb483b27198d86a1";
+    sha256 = "18384apdkq35120cgmda686d293354aibwcq2hwhvvjmnq49fnzr";
   };
 
   nativeBuildInputs = [ cmake perl ];

From b85bf642ffc1b450d0317ff154c96624a7b30df0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 03:58:49 -0800
Subject: [PATCH 2031/2793] librem: 0.5.3 -> 0.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/librem/versions
---
 pkgs/development/libraries/librem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index b173eddda7d..50c20d12ccc 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
-  version = "0.5.3";
+  version = "0.6.0";
   name = "librem-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
-    sha256 = "0l401sn8lkzz9gvnvww6839xa0ys1q7w66krln194w6l8ycsg64z";
+    sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
   };
   buildInputs = [zlib openssl libre];
   makeFlags = [

From fae39f76fffbb9e51744076bc30b508062248dbe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:07:31 -0800
Subject: [PATCH 2032/2793] python37Packages.pybtex: 0.21 -> 0.22.0 (#52107)

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

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index 20689255435..70e41009716 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
 
 buildPythonPackage rec {
-  version = "0.21";
+  version = "0.22.0";
   pname = "pybtex";
 
   doCheck = false;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg";
+    sha256 = "0rprg7h12pv9rb6bi950mz1disc265sg5qcg34637ns1z74hxdr6";
   };
 
   meta = {

From 297535be8ef50b2e41ecf7af5de62d6f37ce9b2e Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Sat, 15 Dec 2018 11:06:11 +0100
Subject: [PATCH 2033/2793] bloop: 1.1.1 -> 1.1.2

---
 pkgs/development/tools/build-managers/bloop/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index c53ff2b505f..db337137bb1 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.1.1";
+  version = "1.1.2";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,14 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6";
+    outputHash     = "0ki4xh8z31nv42jik998r7gvsxcm0vysx83w0nyvbhi18cah1qh6";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "6992a3bf";
+
+  # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
+  nailgunCommit = "dc1dd806";
 
   buildInputs = [ jdk makeWrapper deps ];
 

From 2548f6897ae619d87b0ebded40e9c38f37ce1c25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:13:00 -0800
Subject: [PATCH 2034/2793] python37Packages.cftime: 1.0.2.1 -> 1.0.3.4
 (#52108)

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

diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 4c11267b041..d4f59d41771 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.0.2.1";
+  version = "1.0.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fxpvy3z0b3ga8ylr54ml7nxsfah2bh5azk43nb565rcka3x909c";
+    sha256 = "0362dhxbzk593walyjz30dll6y2y79wialik647cbwdsf3ad0x6x";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

From a70c4c18458fe003b4ec5048bd638b4dcbe95e9f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 15 Dec 2018 07:30:35 -0500
Subject: [PATCH 2035/2793] mruby: 1.4.1 -> 2.0.0

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

diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index 3ab553678b6..cfc1f00a803 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mruby-${version}";
-  version = "1.4.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner   = "mruby";
     repo    = "mruby";
     rev     = version;
-    sha256  = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww";
+    sha256  = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5";
   };
 
   patches = [

From 66df0d9ce4f2998e73f1a6914f9a7860bd234072 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:31:04 -0800
Subject: [PATCH 2036/2793] librime: 1.3.1 -> 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/librime/versions
---
 pkgs/development/libraries/librime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index 5be9a2de94e..a592fd86257 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "librime-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
     rev = "${version}";
-    sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6";
+    sha256 = "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r";
   };
 
   nativeBuildInputs = [ cmake ];

From 5fa6721358c5ada2d229c0a02fbeaa1c0c99f126 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 14 Dec 2018 19:44:41 +0100
Subject: [PATCH 2037/2793] kitty: 0.12.3 -> 0.13.1

---
 pkgs/applications/misc/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 8cff766371e..d3f20f0282f 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.3";
+  version = "0.13.1";
   name = "kitty-${version}";
   format = "other";
 
@@ -15,7 +15,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c";
+    sha256 = "1j24zjasdh48z7majfpqr71n1wn5a9688wsmmqn26v8kfb68pqs4";
   };
 
   buildInputs = [

From 8c836fab9c2b6559cf4cb0a30021d9306be3bcdb Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 14 Dec 2018 19:29:04 +0100
Subject: [PATCH 2038/2793] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 90 ++++++++++++++---------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3e8c0d715d5..4f73822b573 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -437,12 +437,12 @@
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-12-02";
+    name = "dhall-vim-2018-12-12";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "caec6efbfc537f1a3a7bf6c5b0f6ab9cffa6911c";
-      sha256 = "0r9jd6pq94sjrsppa1avm4x01y01m9vv64p89l32vrpkrczgxgfa";
+      rev = "ef31cfee6d8c555d44d282e4cec1367512ad7fe9";
+      sha256 = "0r7y614xld5spgpa4c8ms4rm1p8xzsayp91j4jiqhxn6ly6igv7f";
     };
   };
 
@@ -991,12 +991,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-12";
+    name = "neomake-2018-12-15";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "2e0b5facc8452b145162b6f45b571b30188d9774";
-      sha256 = "180znybxvs9cvlglx6kw5z3chyax7vadlcfj76zh39bzmgim6m7y";
+      rev = "b84769baf9f04e1018ca16bb5d22287500c25e43";
+      sha256 = "0wfh0332yczq42pr2fyv5bv3ryf09021n1nsfrgiyrcy00k62r4j";
     };
   };
 
@@ -1081,12 +1081,12 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-09-19";
+    name = "nim-vim-2018-12-13";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
-      rev = "b0c4c6c7318866e5d74715885cb379aab70d2763";
-      sha256 = "18wdyw8kchfi0zglzvcnakzm9w8h22a1qjcqnk9j64siwcj6bzcy";
+      rev = "358e2e013056af5ad09b3e2963e3390db8677680";
+      sha256 = "0ygyxcbbf6vqimzi71gdq40xx7kyi03yc73h5lyycnzwqc7wyxm2";
     };
   };
 
@@ -1541,12 +1541,12 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-09";
+    name = "traces-vim-2018-12-13";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "5152813d9b91692d37db176a9383f147373a7a8a";
-      sha256 = "1f07nb4vn1nawcd32qy7wy0vgkd15ysg3f3yh1xd5jbfxixisbss";
+      rev = "46e01b6159a21c89695b9d03ea3529ddc92d3b1f";
+      sha256 = "0a77qx12kg4hmfz5zb2ng7lhd855gichs9qjrvich32v04qb2rwv";
     };
   };
 
@@ -1601,12 +1601,12 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-12-03";
+    name = "unite-vim-2018-12-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
-      rev = "77ae78f277896bc560a46a27a51c49f04b6d4ce1";
-      sha256 = "06asqf2hkszz4i9c676jvax6gbqzrcpqckjjb0dy175vifsiclnv";
+      rev = "f08df66abda88a83f0436e0bd1ffa05009a9645a";
+      sha256 = "15mrmawxa1gwhirb11w10lw1prl3sjr6xy7xgsfjja2fzz5wm1jy";
     };
   };
 
@@ -1941,12 +1941,12 @@
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-12-05";
+    name = "vim-codefmt-2018-12-14";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "5a198e23de16e3efabd041dc67b7718007bb7d83";
-      sha256 = "0z7f5qh453hpcba1gbyknn7244lhkwn18bkjx0xhrhi9qjz8bz9d";
+      rev = "62c09d51dd5fda2cbd579a3c4f261bbf34a1f655";
+      sha256 = "10bv35xm0qs44sff5nkp3pvvvi1fh339m4a2fcnnz2bbd0nal8dl";
     };
   };
 
@@ -2141,12 +2141,12 @@
   };
 
   vim-elixir = buildVimPluginFrom2Nix {
-    name = "vim-elixir-2018-12-06";
+    name = "vim-elixir-2018-12-12";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "34873ee66e0dfd7c8105d6f0ad048a2df04e77f2";
-      sha256 = "0vg82nhmliz8330znfy5yqldrgfpb9h52jc9bdhc9pw3d0szx74q";
+      rev = "7e65a353ea332c79c348ac0d4487cb19529759cd";
+      sha256 = "1vgg348m95q0l67fz6wfzp6aamj7aq16dq17xx7n6qdz7nys0q1f";
     };
   };
 
@@ -2261,12 +2261,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-11-26";
+    name = "vim-gitgutter-2018-12-13";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "c2651aefbd92dca05de1943619df965b848f9b4f";
-      sha256 = "1wsmmym3l3r57r8s972iflv1pcsidk8yjb9w4y2rh7dbgf6rkbqr";
+      rev = "5c636b128ed40f3ed926d18adb307e01dfc082f8";
+      sha256 = "014ylh6cmrfw7qp6nrjz0dr4f5v09fmmfi729kpkf97lx79sd37i";
     };
   };
 
@@ -2481,12 +2481,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-05";
+    name = "vim-javacomplete2-2018-12-14";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "876aaf702bb4632c15f44b7f679bd5dbe84ae756";
-      sha256 = "1p3g16gk6b3wv0hmg0wzahpg3l0vk35abcr6hgs0rkwhgbnhl3xk";
+      rev = "e896e0b249f6115a921cb27aaabdb688374d9f21";
+      sha256 = "0lqhb5kgswvsni456nmskrmn9lrnxwg523x5yaylm8s71w3kv1a6";
     };
   };
 
@@ -2622,12 +2622,12 @@
   };
 
   vim-maktaba = buildVimPluginFrom2Nix {
-    name = "vim-maktaba-2018-05-07";
+    name = "vim-maktaba-2018-12-13";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
-      rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d";
-      sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3";
+      rev = "99470333a54ff3c45406f6e99333b7771f864d42";
+      sha256 = "0l16ix2p89w6r9da5biv6mzg8g1ajjkmnh085f0601yml5vdzlda";
     };
   };
 
@@ -2802,12 +2802,12 @@
   };
 
   vim-pathogen = buildVimPluginFrom2Nix {
-    name = "vim-pathogen-2018-12-12";
+    name = "vim-pathogen-2018-12-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
-      rev = "24f5cdd8055787463dd8ca73c80c1424ff06b358";
-      sha256 = "0hyn8i3gmx1vismiww7snrmfz95zmfk8j6mbyvn50gwid6wjwk14";
+      rev = "e9fb0914dba5bdfe2feaa364dda2e9495c5620a2";
+      sha256 = "1hqfmk6xpkldhs8n5hmnvx0qn955fnzf19pp2gh4c2kvrq1y6sm8";
     };
   };
 
@@ -3062,12 +3062,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-12-09";
+    name = "vim-snippets-2018-12-14";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "1accde62ad62fe4adac62bbb16c4915d97786637";
-      sha256 = "0rgshn7w2c6dgykaqnlxvwb92wvv2rpvx5i7h5xmh67bira4bc5f";
+      rev = "a6090b9bffeec418ee7deaa31f90c4a8fd3b1170";
+      sha256 = "1f0jnsdn0zavpz5727683442c22mjgcnj1j5dkhaysrkdzn4qc64";
     };
   };
 
@@ -3412,12 +3412,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-10";
+    name = "vimtex-2018-12-12";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "861e7b2fa00a9b0391dd8de0bf63b86dce9eb44a";
-      sha256 = "1a1zvr1g8k97s8n3s2sjgi5drjsamj91fc649kgwsjjs880rfjsl";
+      rev = "6165a4421e7605a96d9b6c83f3ac853bf2f90a03";
+      sha256 = "01yp79w53wyxqjd1dnba069pmj1b56nl52x2r3mfzzldm1p5gx4k";
     };
   };
 
@@ -3532,12 +3532,12 @@
   };
 
   yats-vim = buildVimPluginFrom2Nix {
-    name = "yats-vim-2018-10-17";
+    name = "yats-vim-2018-12-15";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "4675d7ff4b04aa5c5eabd5a1d862fcf78a7cd759";
-      sha256 = "1hb36d4lb79dzn4idmar8zq1w4ya4a52a5gpzksj9x9k4fx6gakr";
+      rev = "e95d5895988a5f7c5c130ea6697a7cc73f5e4ad9";
+      sha256 = "1f1q6invygwig58kwmw7acd8cz0asxlvs7achnyij00w9cyyly82";
       fetchSubmodules = true;
     };
   };
@@ -3584,12 +3584,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-11-17";
+    name = "zig-vim-2018-12-12";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "0479c0ade7c27210e3a7982d36bd2673d560ffa9";
-      sha256 = "1ndbrzvkiyy55avmk6z7x7qd5b9v4ylc7i8n9xlcas90q6cjw9ga";
+      rev = "c24d058fef53601b1381d80243bffcb356815e31";
+      sha256 = "1nsji87vbz5rpl25rysy4np7zdwyqzv6qh8g15pvll0jqmsd5z0v";
     };
   };
 

From ab091810b6da01ac28df4c0c860682b7ccc854dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:49:02 -0800
Subject: [PATCH 2039/2793] libqalculate: 2.8.1 -> 2.8.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/libqalculate/versions
---
 pkgs/development/libraries/libqalculate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index bb823f69135..6a6adf06dba 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "1fakvv5vvx99pp5x72djp3313jxjwfhsl34gbyrpgkj5b4nnm7mz";
+    sha256 = "10d3dcq8zprj1bnhq6gl9smpbv7fq0nx3jw9s3f8lkl3bavc34ca";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 79a5a7616f21ebe1bd7d707244d7cae9169592ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:23:01 -0800
Subject: [PATCH 2040/2793] librealsense: 2.16.4 -> 2.17.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/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 766c0dcf00e..0487010d11e 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.16.4";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "0664lsdw9a3s3apqiv9kkzfnz86ai9wdc8y00qyxrmxq9lpjsq11";
+    sha256 = "1ac580yhxmvxpdvlzdzpcdffysr6z3dl8dykndnq5758alkyspd7";
   };
 
   buildInputs = [

From 8268fd19a323305d8dfdae818fca4a5bcf402fd3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:30:43 -0800
Subject: [PATCH 2041/2793] lidarr: 0.4.0.524 -> 0.5.0.583

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lidarr/versions
---
 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 9bffb27665d..897c061c918 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.4.0.524";
+  version = "0.5.0.583";
 
   src = fetchurl {
     url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
-    sha256 = "121898v8n9sr9wwys65c28flpmk941wk6df11bb47pfjcalrr3bj";
+    sha256 = "0vqnx8vd7mv4lsl7ffsjanl9pm107bk3ndvfka2ky74qisrqcyz7";
   };
 
   buildInputs = [

From 6a3364cc9fb49bd86b541271afa142e0c6b5929a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:56:14 -0800
Subject: [PATCH 2042/2793] libwnck3: 3.24.1 -> 3.30.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/libwnck/versions
---
 pkgs/development/libraries/libwnck/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index eb591d4e184..e4bbeacb362 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "libwnck";
-  version = "3.24.1";
+  version = "3.30.0";
 in stdenv.mkDerivation rec{
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
+    sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 13d3bf5b9880efbcb41a90f6309f625a3e733b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 15 Dec 2018 15:00:29 +0100
Subject: [PATCH 2043/2793] resilio-sync: 2.6.1 -> 2.6.2

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 b6c54a6d452..c855277e225 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.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "02wbllrj80kqpyywfr05fsqpgwrv2i8smr3gfdpn7ni9b8hkj0ji";
-      "i686-linux"   = "02zhh6gfds6miznbx30ghzihhm330mh5xnm42mxj8j29aqlzgd95";
+      "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2";
+      "i686-linux"   = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h";
     }.${stdenv.hostPlatform.system};
   };
 

From 5451116321a66c5012fd4c72b0a77c526ca685ab Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 15 Dec 2018 09:37:35 -0500
Subject: [PATCH 2044/2793] gitAndTools.lab: init at 0.14.0

---
 .../git-and-tools/default.nix                 |   2 +
 .../git-and-tools/lab/default.nix             |  25 ++
 .../git-and-tools/lab/deps.nix                | 327 ++++++++++++++++++
 3 files changed, 354 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/lab/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/lab/deps.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a1f79452242..9ee5df11830 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -122,6 +122,8 @@ let
 
   hubUnstable = throw "use gitAndTools.hub instead";
 
+  lab = callPackage ./lab { };
+
   pre-commit = callPackage ./pre-commit { };
 
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
new file mode 100644
index 00000000000..fdda6ff4e88
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "hub-${version}";
+  version = "0.14.0";
+
+  goPackagePath = "github.com/zaquestion/lab";
+
+  src = fetchFromGitHub {
+    owner = "zaquestion";
+    repo = "lab";
+    rev = "v${version}";
+    sha256 = "0dqahzm721kpps4i33qgk78y982n8gj5afpk73qyzbraf5y3cw92";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
+    homepage = https://zaquestion.github.io/lab;
+    license = licenses.unlicense;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/lab/deps.nix b/pkgs/applications/version-management/git-and-tools/lab/deps.nix
new file mode 100644
index 00000000000..03959300b43
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lab/deps.nix
@@ -0,0 +1,327 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/avast/retry-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/avast/retry-go";
+      rev =  "5469272a8171235352a56af37e5f7facf814423f";
+      sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev =  "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
+      sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gdamore/encoding";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gdamore/encoding";
+      rev =  "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
+      sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gdamore/tcell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gdamore/tcell";
+      rev =  "2f258105ca8ce35819115b49f5ac58197241653e";
+      sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev =  "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
+      sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev =  "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lucasb-eyer/go-colorful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lucasb-eyer/go-colorful";
+      rev =  "231272389856c976b7500c4fffcc52ddf06ff4eb";
+      sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lunixbochs/vtclean";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lunixbochs/vtclean";
+      rev =  "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
+      sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev =  "c3beff4c2358b44d0493c7dda585e7db7ff28ae6";
+      sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "9e777a8366cce605130a531d2cd6363d07ad7317";
+      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev =  "00c29f56e2386353d58c599509e8dc3801b0d716";
+      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+    };
+  }
+  {
+    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/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/rivo/tview";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rivo/tview";
+      rev =  "f855bee0205c35e6a055b86cc341effea0f446ce";
+      sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev =  "55d61fa8aa702f59229e6cff85793c22e580eaf5";
+      sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev =  "63644898a8da0bc22138abf860edaf5277b6102e";
+      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+    };
+  }
+  {
+    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 =  "615425954c3b0d9485a7027d4d451fdcdfdee84e";
+      sha256 = "01zsislgc72j86a1zq7xs7xj3lvxjjviz4lgn4144jzgppwanpk6";
+    };
+  }
+  {
+    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 =  "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev =  "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tcnksm/go-gitconfig";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tcnksm/go-gitconfig";
+      rev =  "d154598bacbf4501c095a309753c5d4af66caa81";
+      sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/xanzy/go-gitlab";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xanzy/go-gitlab";
+      rev =  "8d21e61ce4a9b9c7fe645e48672872e9fdb71138";
+      sha256 = "1lac57ard1vrd16ri8gfyd0ck8d7xg7zbcjlz90223jp0vc3l8nv";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7";
+      sha256 = "1amcpva20vff8v0lww655icaaf7388ns8xhm859whn4w4v0vanyg";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "f4c29de78a2a91c00474a2e689954305c350adf9";
+      sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "3d292e4d0cdc3a0113e6d207bb137145ef1de42f";
+      sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "79b0c6888797020a994db17c8510466c72fe75d9";
+      sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "b1f26356af11148e710935ed1ac8a7f5702c7612";
+      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
\ No newline at end of file

From 2bae825da1fa56d2361785132eaf1d8632e915dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 07:04:11 -0800
Subject: [PATCH 2045/2793] libosmium: 2.14.2 -> 2.15.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/libosmium/versions
---
 pkgs/development/libraries/libosmium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index e889a3cb275..1b7bcc8fa89 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libosmium-${version}";
-  version = "2.14.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "libosmium";
     rev = "v${version}";
-    sha256 = "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250";
+    sha256 = "0s51qk7py5dzr07q4a78b4mjjrpgbghnj2r8yjq1hnn6pgafbjv0";
   };
 
   nativeBuildInputs = [ cmake ];

From b2ef061bc21446b73829b1b0721437daa3714314 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 07:35:40 -0800
Subject: [PATCH 2046/2793] jruby: 9.2.4.0 -> 9.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/jruby/versions
---
 pkgs/development/interpreters/jruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 330e6b282ce..cfefa8c95dc 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.2.4.0";
+  version = "9.2.5.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr";
+    sha256 = "0jgkpp90x4v3izl58r53lg5ndf9pm6q6qgwqvxhkb9zcha00ibgl";
   };
 
   buildInputs = [ makeWrapper ];

From 68baf6bdd10bc162ad762c76c134fd330458da2d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 15 Dec 2018 23:39:02 +0800
Subject: [PATCH 2047/2793] nixos-artwork: make wallpapers available to KDE
 (#51926)

---
 pkgs/data/misc/nixos-artwork/wallpapers.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 648b4f1dd96..50f874baa4a 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -11,6 +11,15 @@ let
       installPhase = ''
         mkdir -p $out/share/artwork/gnome
         ln -s $src $out/share/artwork/gnome/${src.name}
+
+        # KDE
+        mkdir -p $out/share/wallpapers/${name}/contents/images
+        ln -s $src $out/share/wallpapers/${name}/contents/images/${src.name}
+        cat >>$out/share/wallpapers/${name}/metadata.desktop <<_EOF
+[Desktop Entry]
+Name=${name}
+X-KDE-PluginInfo-Name=${name}
+_EOF
       '';
 
       meta = with stdenv.lib; {

From 7d3993295ce3642617afe1a1b0d1dc613d671262 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 15 Dec 2018 11:28:34 -0500
Subject: [PATCH 2048/2793] motion: add veprbl to meta.maintainers

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

diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 5317ba1f294..b3367951b9f 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Monitors the video signal from cameras";
     homepage = https://motion-project.github.io/;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh veprbl ];
   };
 }

From dd78e629aa8bf53015592b41cbbb4482584f404f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 10 Dec 2018 18:22:03 -0600
Subject: [PATCH 2049/2793] treewide: use "buildPackages" darwin for
 bootstrap_cmds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are almost always from buildPackages. Another issue where
splicing doesn’t seem to pick them up correctly.

(cherry picked from commit 9ab67898f75be85acc2406f2110690b16d1f9b0a)
---
 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 dd963b6ee01..fd7559ead14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6319,7 +6319,7 @@ with pkgs;
   };
 
   ccl = callPackage ../development/compilers/ccl {
-    inherit (darwin) bootstrap_cmds;
+    inherit (buildPackages.darwin) bootstrap_cmds;
   };
 
   chez = callPackage ../development/compilers/chez {
@@ -8772,7 +8772,7 @@ with pkgs;
   jhiccup = callPackage ../development/tools/java/jhiccup { };
 
   valgrind = callPackage ../development/tools/analysis/valgrind {
-    inherit (darwin) xnu bootstrap_cmds cctools;
+    inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
     llvm = llvm_39;
   };
   valgrind-light = self.valgrind.override { gdb = null; };
@@ -10033,7 +10033,7 @@ with pkgs;
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
-    inherit (darwin) bootstrap_cmds;
+    inherit (buildPackages.darwin) bootstrap_cmds;
   };
   krb5Full = krb5;
   libkrb5 = krb5.override {
@@ -13574,7 +13574,7 @@ with pkgs;
   xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
   }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
     inherit (darwin) apple_sdk;
-    bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
+    bootstrap_cmds = if stdenv.isDarwin then buildPackages.darwin.bootstrap_cmds else null;
     python = python2; # Incompatible with Python 3x
     udev = if stdenv.isLinux then udev else null;
     libdrm = if stdenv.isLinux then libdrm else null;

From 931e5a07ed939e9bed1479c64efb3af8fc66b7cb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 08:07:27 -0800
Subject: [PATCH 2050/2793] josm: 14382 -> 14460

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 f529fa395d9..847ac3e299c 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 = "14382";
+  version = "14460";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1a2nx9jr1fvw95gdvl9kj3z0cs6ndafm0k4l0lwfx9p9qn4lgzjg";
+    sha256 = "1j95319dvj4cwi1af94n1p8m1z1191j1jx6x06l4vz8bcjxaaqf5";
   };
 
   buildInputs = [ jdk11 makeWrapper ];

From 562c62039821a276dc342258ec5efef73022fdcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 10:17:17 -0800
Subject: [PATCH 2051/2793] latte-dock: 0.8.2 -> 0.8.3 (#52203)

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 5af5d558dd7..a00a85b7a81 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.2";
+  version = "0.8.3";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
-    sha256 = "1acwgxg9swmazi9bg5a0iyyin07h2gvp3mhbn6cfqqhpmndqxfdx";
+    sha256 = "1jgg1ag8sxrkif1bqgz5pizn1xmiljas00rqcskszx10j0595mnk";
     name = "${name}.tar.xz";
   };
 

From 30fb5b0dcf68e94625c48c023e4c7662523f7b24 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 15 Dec 2018 13:31:08 -0500
Subject: [PATCH 2052/2793] haskell generic builder: Add flag to allow
 inconsistent dependencies.

---
 .../haskell-modules/generic-builder.nix           | 15 ++++++++++-----
 pkgs/development/haskell-modules/lib.nix          |  7 +++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a0bf655a67b..fc2c008be0c 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -74,6 +74,10 @@ in
 , hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all"
 , enableSeparateDataOutput ? false
 , enableSeparateDocOutput ? doHaddock
+, # Don't fail at configure time if there are multiple versions of the
+  # same package in the (recursive) dependencies of the package being
+  # built. Will delay failures, if any, to compile time.
+  allowInconsistentDependencies ? false
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
@@ -336,11 +340,12 @@ stdenv.mkDerivation ({
 
     echo configureFlags: $configureFlags
     ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
-    if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
-      echo >&2 "*** abort because of serious configure-time warning from Cabal"
-      exit 1
-    fi
-
+    ${stdenv.lib.optionalString (!allowInconsistentDependencies) ''
+      if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
+        echo >&2 "*** abort because of serious configure-time warning from Cabal"
+        exit 1
+      fi
+    ''}
     export GHC_PACKAGE_PATH="$packageConfDir:"
 
     runHook postConfigure
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index e3b73641989..9f18db1e6e9 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -408,4 +408,11 @@ rec {
   */
   generateOptparseApplicativeCompletions = commands: pkg:
     pkgs.lib.foldr generateOptparseApplicativeCompletion pkg commands;
+
+  # Don't fail at configure time if there are multiple versions of the
+  # same package in the (recursive) dependencies of the package being
+  # built. Will delay failures, if any, to compile time.
+  allowInconsistentDependencies = drv: overrideCabal drv (drv: {
+    allowInconsistentDependencies = true;
+  });
 }

From 4c9bbf01ef406c9c7952b7484f415bdc76562ea4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 15 Dec 2018 12:32:12 -0600
Subject: [PATCH 2053/2793] Revert "gcc-arm-embedded: remove"

This reverts commit c327df544ae0875ce71b0a82ae7a650a8e34a268.
---
 .../compilers/gcc-arm-embedded/6/default.nix  | 45 +++++++++++++++++
 .../compilers/gcc-arm-embedded/7/default.nix  | 39 +++++++++++++++
 .../compilers/gcc-arm-embedded/default.nix    | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 30 +++++++++++
 4 files changed, 164 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/6/default.nix
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/7/default.nix
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/default.nix

diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
new file mode 100644
index 00000000000..945649b2978
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, ncurses5, python27 }:
+
+stdenv.mkDerivation rec {
+  name = "gcc-arm-embedded-${version}";
+  version = "6-2017-q2-update";
+  subdir = "6-2017q2";
+
+  platformString =
+    if stdenv.isLinux then "linux"
+    else if stdenv.isDarwin then "mac"
+    else throw "unsupported platform";
+
+  urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2";
+
+  src =
+    if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
+    else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
+    else throw "unsupported platform";
+
+  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 stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
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 00000000000..c22683dae03
--- /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/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
new file mode 100644
index 00000000000..039b5a9ce36
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses
+, dirName ? null, subdirName ? null }:
+with stdenv.lib;
+let
+  versionParts = splitString "-" version; # 4.7 2013q3 20130916
+  majorVersion = elemAt versionParts 0; # 4.7
+  yearQuarter = elemAt versionParts 1; # 2013q3
+  underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916
+  yearQuarterParts = splitString "q" yearQuarter; # 2013 3
+  year = elemAt yearQuarterParts 0; # 2013
+  quarter = elemAt yearQuarterParts 1; # 3
+  dirName_ = if dirName != null then dirName else majorVersion;
+  subdirName_ = if subdirName != null then subdirName
+    else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
+in
+stdenv.mkDerivation {
+  name = "gcc-arm-embedded-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
+    sha256 = sha256;
+  };
+
+  nativeBuildInputs = [ bzip2 patchelf ];
+
+  dontPatchELF = true;
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  installPhase = ''
+    mkdir -pv $out
+    cp -r ./* $out
+
+    for f in $(find $out); do
+      if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
+        patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
+                 --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \
+                 "$f" || true
+      fi
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)";
+    homepage = https://launchpad.net/gcc-arm-embedded;
+    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+    maintainers = [ maintainers.rasendubi ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3e9663756..fd6fead4966 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6960,6 +6960,36 @@ in
 
   gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { };
 
+  gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
+    version = "4.7-2013q3-20130916";
+    releaseType = "update";
+    sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
+    ncurses = pkgsi686Linux.ncurses5;
+  };
+  gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
+    version = "4.8-2014q1-20140314";
+    releaseType = "update";
+    sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
+    ncurses = pkgsi686Linux.ncurses5;
+  };
+  gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
+    version = "4.9-2015q1-20150306";
+    releaseType = "update";
+    sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
+    ncurses = pkgsi686Linux.ncurses5;
+  };
+  gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
+    dirName = "5.0";
+    subdirName = "5-2016-q2-update";
+    version = "5.4-2016q2-20160622";
+    releaseType = "update";
+    sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r";
+    ncurses = pkgsi686Linux.ncurses5;
+  };
+  gcc-arm-embedded-6 = callPackage ../development/compilers/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 {};
 
   gtk-server = callPackage ../development/interpreters/gtk-server {};

From ea3aa5e700add7cd03800f2a431cb0f62728aefc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 15 Dec 2018 18:52:53 +0100
Subject: [PATCH 2054/2793] EmptyEpsilon: 2018.02.15 -> 2018.11.16

---
 pkgs/games/empty-epsilon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index fcefc5989b0..04810f792e3 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -3,8 +3,8 @@
 let
 
   major = "2018";
-  minor = "02";
-  patch = "15";
+  minor = "11";
+  patch = "16";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "0b4n4pn7x3y63i9y15f8983zlpdvmx7151iph1lcc49j3hmpd0gy";
+      sha256 = "1a5g16vvjrykmdgy5fc8x0v4ipfm0qdaimmy5jz84am14dqi3f8w";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "1by0wrw00frrlcs1kd003zkmfkwa1pnbnva2qn8km3xnl9chf11d";
+    sha256 = "0848rxa9xwbz573b5r5qc5bpcf6pipis4gkkszfgkj1zmdhyib6b";
   };
 
   nativeBuildInputs = [ cmake ];

From 78cabc3ca9edfd04b93230aa74c132a0f81a2a25 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 15 Dec 2018 14:40:26 -0600
Subject: [PATCH 2055/2793] libffado: refactor lib-prefixed package

---
 pkgs/os-specific/linux/ffado/default.nix | 99 +++++++++---------------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 85218042cf7..761ca564584 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,30 +1,12 @@
 { stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
-, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx, glibmm
-
-# Optional dependencies
-, libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
-, pyqt4 ? null, dbus-python ? null, xdg_utils ? null
-
-# Other Flags
-, prefix ? ""
+, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx
+, glibmm
+, alsaLib, dbus, dbus_cplusplus
+, pyqt4, dbus-python
 }:
 
-let
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
-
-  libOnly = prefix == "lib";
-
-  optLibjack2 = shouldUsePkg libjack2;
-  optDbus = shouldUsePkg dbus;
-  optDbus_cplusplus = shouldUsePkg dbus_cplusplus;
-  optAlsaLib = shouldUsePkg alsaLib;
-  optPyqt4 = shouldUsePkg pyqt4;
-  optPythonDBus = shouldUsePkg dbus-python;
-  optXdg_utils = shouldUsePkg xdg_utils;
-in
 stdenv.mkDerivation rec {
-  name = "${prefix}ffado-${version}";
+  name = "ffado-${version}";
   version = "2.4.0";
 
   src = fetchurl {
@@ -32,54 +14,47 @@ stdenv.mkDerivation rec {
     sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
   };
 
+  outputs = [ "out" "bin" "dev" ];
+
   nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
 
+  prefixKey = "PREFIX=";
+  sconsFlags = [
+    "DEBUG=False"
+    "ENABLE_ALL=True"
+    "SERIALIZE_USE_EXPAT=True"
+    "BUILD_TESTS=False"
+    "WILL_DEAL_WITH_XDG_MYSELF=True"
+    "BUILD_MIXER=True"
+  ];
+
+  configurePhase = ''
+    mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \
+             $out/lib/${python.libPrefix}/site-packages
+    sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d)
+    sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages)
+    sconsFlagsArray+=(BINDIR=$bin/bin)
+    sconsFlagsArray+=(INCLUDEDIR=$dev/include)
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
+  '';
+
   buildInputs = [
-    expat libraw1394 libconfig libavc1394 libiec61883
-  ] ++ stdenv.lib.optionals (!libOnly) [
-    optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4
-    optXdg_utils libxmlxx glibmm
+    expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus
+    libxmlxx pyqt4 dbus-python glibmm
   ];
 
   postPatch = ''
     sed '1iimport sys' -i SConstruct
-    # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
-    # Let's just skip this and tell it which to build
-    sed '/def is_userspace_32bit(cpuinfo):/a\
-        return ${if stdenv.is64bit then "False" else "True"}' -i SConstruct
-
-    # Lots of code is missing random headers to exist
-    sed -i '1i #include <memory>' \
-      src/ffadodevice.h src/bebob/bebob_dl_mgr.cpp tests/scan-devreg.cpp
-    sed -i -e '1i #include <stdlib.h>' \
-      -e '1i #include "version.h"' \
-      src/libutil/serialize_expat.cpp
   '';
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
-  '';
-
-  # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
-  buildPhase = ''
-    export PYDIR=$out/lib/${python.libPrefix}/site-packages
-
-    scons PYPKGDIR=$PYDIR DEBUG=False \
-      ENABLE_ALL=True \
-      SERIALIZE_USE_EXPAT=True \
-  '';
-
-  installPhase = if libOnly then ''
-    scons PREFIX=$TMPDIR UDEVDIR=$TMPDIR \
-      LIBDIR=$out/lib INCLUDEDIR=$out/include install
-  '' else ''
-    scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install
-  '' + stdenv.lib.optionalString (optPyqt4 != null && optPythonDBus != null) ''
-    wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
-      $PYTHONPATH:$PYDIR:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX:
-
-    wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \
-      $PYTHONPATH:$PYDIR:$out/share/libffado/python:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX:
+  postInstall = ''
+    for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do
+      wrapProgram $exe \
+        --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \
+        --prefix PYTHONPATH : $out/share/libffado/python \
+        --prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \
+        --prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a699c3a628e..73eaccda0ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14326,7 +14326,7 @@ in
   ffado = callPackage ../os-specific/linux/ffado {
     inherit (python2Packages) python pyqt4 dbus-python;
   };
-  libffado = ffado.override { prefix = "lib"; };
+  libffado = ffado;
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
 

From c1a26302cb65f423a685be07920336661fb57cc9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 15 Dec 2018 22:56:17 +0100
Subject: [PATCH 2056/2793] unifont: 11.0.02 -> 11.0.03

---
 pkgs/data/fonts/unifont/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 3dc7bba981f..943eb9572b2 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "unifont-${version}";
-  version = "11.0.02";
+  version = "11.0.03";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx";
+    sha256 = "1fqlf3kczh1y7vhpcdcs1i9043idg5x9jisfqfd99sikvcbw7w75";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy";
+    sha256 = "0wqcmvkqdww60hqh245whzh4mx3frrx2712lay826f9h5s4ywz6g";
   };
 
   nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15";
+  outputHash = "006jbla4zfwccyy84sm4ck869sq5az5s5cfkcmdgj7ah3rz4d7dn";
 
   meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";

From 066614a526a5c94ff48e8e4efb5b41192aa1d405 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 16 Dec 2018 00:10:33 +0100
Subject: [PATCH 2057/2793] pythonPackages.graph-tool: fix build (#52261)

The new version of cgal introduced in #47826 requires a patch (that will
be included in the next graph-tool version).

Fixes #50446
---
 .../python-modules/graph-tool/2.x.x.nix       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index cd8f7c0c91b..7c83039ecdb 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
-pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
-gobject-introspection, pygobject3, gtk3, matplotlib, ncurses,
-buildPythonPackage }:
+{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
+, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr
+, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
+, buildPythonPackage
+, fetchpatch
+}:
 
 buildPythonPackage rec {
   pname = "graph-tool";
@@ -20,6 +22,15 @@ buildPythonPackage rec {
     sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
   };
 
+  patches = [
+    # fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509)
+    (fetchpatch {
+      name = "cgal-4.13.patch";
+      url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch";
+      sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m";
+    })
+  ];
+
   configureFlags = [
     "--with-python-module-path=$(out)/${python.sitePackages}"
     "--with-boost-libdir=${boost}/lib"

From dc6ffc4f3ad46a09bb9cf3ccadfb871464c55f04 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Nov 2018 23:30:11 -0600
Subject: [PATCH 2058/2793] remind: 3.1.15 -> 3.1.16, new home, cleanup

Old page links to new home :).
---
 pkgs/tools/misc/remind/default.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index d9933e0018f..9c66ea849e2 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -6,30 +6,31 @@ assert tkremind -> tk != null;
 assert tkremind -> tcllib != null;
 assert tkremind -> makeWrapper != null;
 
-stdenv.mkDerivation rec {
-  name = "remind-3.1.15";
-  src = fetchurl {
-    url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
-    sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla";
-  };
-
-  tclLibraries = if tkremind then [ tcllib tk ] else [];
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+  tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ];
   tclLibPaths = stdenv.lib.concatStringsSep " "
     (map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
+in stdenv.mkDerivation {
+  name = "remind-3.1.16";
+  src = fetchurl {
+    url = https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz;
+    sha256 = "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf";
+  };
 
-  buildInputs = if tkremind then [ makeWrapper ] else [];
+  nativeBuildInputs = optional tkremind makeWrapper;
   propagatedBuildInputs = tclLibraries;
 
-  postPatch = if tkremind then ''
+  postPatch = optionalString tkremind ''
     substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
-  '' else "";
+  '';
 
-  postInstall = if tkremind then ''
+  postInstall = optionalString tkremind ''
     wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
-  '' else "";
+  '';
 
   meta = {
-    homepage = http://www.roaringpenguin.com/products/remind;
+    homepage = https://dianne.skoll.ca/projects/remind/;
     description = "Sophisticated calendar and alarm program for the console";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [raskin kovirobi];

From 75fc7e05df05bda0f640b6010ec9708954453bf0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Dec 2018 19:01:21 -0600
Subject: [PATCH 2059/2793] ibm-plex: 1.2.1 -> 1.2.3

https://github.com/IBM/plex/releases/tag/v1.2.3
https://github.com/IBM/plex/releases/tag/v1.2.2
---
 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 e5a281eebf6..91ef3ca49a7 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.2.1";
+  version = "1.2.3";
 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 = "1mwlw39nbqrk08crvgm77l98yyyabwhcgsng89c9s67gq4mlxmxa";
+  sha256 = "16vmby2svr4q0lvsnrpxzmhkb6yv84x2jg6jccaj7x9vq56b4adg";
 
   meta = with lib; {
     description = "IBM Plex Typeface";

From 9451bbf85296ba089af0c3af488f1f72bf64b2bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 16:18:13 -0800
Subject: [PATCH 2060/2793] kotlin: 1.3.10 -> 1.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/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 4d8b3f39814..f557f32a13a 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.10";
+  version = "1.3.11";
 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 = "0zf6p0pzdi6dz2d4dca364wf30zyq326xdfg97zk8kp1a4qwjyfa";
+    sha256 = "02d4x65z6kp20hmf5ri56zmq4rq45yc9br0awqrn9ls99cd0zph3";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 9eefb691e434670ebe07c426effec0255452485d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 15 Dec 2018 18:30:20 -0600
Subject: [PATCH 2061/2793] vaapiIntel: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 70ee61aecd3..4780ffb7519 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "intel-vaapi-driver-${version}";
-  version = "2.2.0"; # generally try to match libva version, but not required
+  version = "2.3.0"; # generally try to match libva version, but not required
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "intel-vaapi-driver";
     rev    = version;
-    sha256 = "1z8iqnswias2gph61yzyal53456y71ff98f21cs17hw4qjfkwa6k";
+    sha256 = "0s6cz9grymll96s7n2rpzvb3b566a2n21nfp6b23r926db089kjd";
   };
 
   patchPhase = ''

From 8a1aa036d3408e01ea8a86fff0c6d06649ab0979 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 16 Dec 2018 01:52:13 +0100
Subject: [PATCH 2062/2793] soapyremote: add 0.4.3 -> 0.5.0

* add avahi for DNS-SD
---
 pkgs/applications/misc/soapyremote/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix
index d10b09f99a8..f6970c156b8 100644
--- a/pkgs/applications/misc/soapyremote/default.nix
+++ b/pkgs/applications/misc/soapyremote/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, soapysdr }:
+{ stdenv, fetchFromGitHub, cmake, soapysdr, avahi }:
 
 let
-  version = "0.4.3";
+  version = "0.5.0";
 
 in stdenv.mkDerivation {
   name = "soapyremote-${version}";
@@ -9,12 +9,12 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapyRemote";
-    rev = "d07f43863b1ef79252f8029cfb5947220f21311d";
-    sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0";
+    rev = "soapy-remote-${version}";
+    sha256 = "1lyjhf934zap61ky7rbk46bp8s8sjk8sgdyszhryfyf571jv9b2i";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ soapysdr ];
+  buildInputs = [ soapysdr avahi ];
 
   cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
 

From 129fca2479270ac72b2cba4aa908b1e2efde7775 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:02:41 -0800
Subject: [PATCH 2063/2793] kea: 1.4.0-P1 -> 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/kea/versions
---
 pkgs/tools/networking/kea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index bd18faf0e00..a1c156475fb 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "kea";
-  version = "1.4.0-P1";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
-    sha256 = "0484h26ffdc1vmiznxllx69fax1lqi140wlsf5lx4wsab7a6nda6";
+    sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd";
   };
 
   patches = [ ./dont-create-var.patch ];

From dc7f6bc60a18faa8c20abfa7a64ddaaf83e56aef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:24:03 -0800
Subject: [PATCH 2064/2793] hwinfo: 21.62 -> 21.63

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 06f326a970a..6a4a09f4790 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.62";
+  version = "21.63";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "1mhvpvjdalxhvjkf8vhph414qfp14kwz24jk0mx2y4nijk958n0f";
+    sha256 = "0rwc30vs7clhl0kmniw4vms1ngx3xl6l1a979hywszvzhgmdclxh";
   };
 
   patchPhase = ''

From 538c38d5a6092db62f084ddda3df4a0e8e4021b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:39:26 -0800
Subject: [PATCH 2065/2793] gupnp-av: 0.12.10 -> 0.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/gupnp-av/versions
---
 pkgs/development/libraries/gupnp-av/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 5e68a027470..cf04ca73f9e 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gupnp-av-${version}";
-  version = "0.12.10";
+  version = "0.12.11";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
+    sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8";
   };
 
   nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];

From fd08f8ed9457187805cc1da0c94af84fa18e936d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:45:32 -0800
Subject: [PATCH 2066/2793] grib-api: 1.27.0 -> 1.28.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/grib-api/versions
---
 pkgs/development/libraries/grib-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index c8ce99dc90d..224cd125dce 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.27.0";
+  version = "1.28.0";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
-    sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd";
+    sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";
   };
 
   preConfigure = ''

From 52d0b872e47a302952beea91262cfa43207f2081 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:49:55 -0800
Subject: [PATCH 2067/2793] ipset: 7.0 -> 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/ipset/versions
---
 pkgs/os-specific/linux/ipset/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index 51c6f479504..e64840ac369 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-7.0";
+  name = "ipset-7.1";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "1bs1qz6cs9z167f36xsbg93fb6dj5bw05shk07fkwkjiglxhzyn6";
+    sha256 = "1i5d2v732jnx543w1h57g6zi9ckvbxp8pz7377f0rhh56awv6pkv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 54ece098fd82ccb3ff233b29e11c6ff43b5d62c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 18:07:39 -0800
Subject: [PATCH 2068/2793] gtkwave: 3.3.95 -> 3.3.97

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 3f664006cd0..214a918fa34 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.95";
+  version = "3.3.97";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1999wnipah1ncvjzjf95pfdrvgq1kd6hli8xlaj2hfjka8pamfaf";
+    sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 5276119858a5960579921deee00d782b520d221d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 18:28:59 -0800
Subject: [PATCH 2069/2793] libgnurl: 7.61.1 -> 7.62.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/libgnurl/versions
---
 pkgs/development/libraries/libgnurl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 6938cfd8c51..c7cf4a37b98 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -2,13 +2,13 @@
   libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
-  version = "7.61.1";
+  version = "7.62.0";
 
   name = "libgnurl-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
-    sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q";
+    sha256 = "15b5fn4na9vzmzp4i0jf7al9v3q0abx51g1sgkrdsvdxhypwji1v";
   };
 
   nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];

From a331afb05bbc59ae8215d66cfd3b6eca89814ff3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 19:28:44 -0800
Subject: [PATCH 2070/2793] gthumb: 3.6.1 -> 3.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/gthumb/versions
---
 pkgs/applications/graphics/gthumb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 7dc69bceda9..e8f831a21c2 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gthumb";
-  version = "3.6.1";
+  version = "3.6.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1vj26gw9b5y4bmb2m49wplqg0md568g3gxin500v3slggzhzkaww";
+    sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9";
   };
 
   nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];

From 2eae1009deba319b46f8f94dbe5d86b0f7433921 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 19:36:13 -0800
Subject: [PATCH 2071/2793] grpc: 1.16.1 -> 1.17.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/grpc/versions
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 938a47a4037..559ef962262 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.16.1";
+  version = "1.17.0";
   name = "grpc-${version}";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2";
+    sha256 = "17y8lhkx22qahjk89fa0bh76q76mk9vwza59wbwcpzmy0yhl2k23";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From 55a96df66a61c7cdc1c05fb6af4a233a93295308 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 19:58:32 -0800
Subject: [PATCH 2072/2793] img2pdf: 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/img2pdf/versions
---
 pkgs/applications/misc/img2pdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix
index 9b6ac086efd..c718d6c7bfd 100644
--- a/pkgs/applications/misc/img2pdf/default.nix
+++ b/pkgs/applications/misc/img2pdf/default.nix
@@ -4,11 +4,11 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "img2pdf";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4";
+    sha256 = "07wxgn5khmy94zqqv8l84q9b3yy84ddvwr2f7j4pjycrj2gg7si8";
   };
 
   doCheck = false; # needs pdfrw

From e94afe9dfd7f57956621eb9128b3c1a49247dff1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 20:06:04 -0800
Subject: [PATCH 2073/2793] gnome3.gtksourceview: 3.24.8 -> 3.24.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/gtksourceview/versions
---
 pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 58c8ebccc3c..0f9dd30d204 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -5,11 +5,11 @@ let
   checkInputs = [ xvfb_run dbus ];
 in stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
-  version = "3.24.8";
+  version = "3.24.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy";
+    sha256 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9";
   };
 
   propagatedBuildInputs = [

From df8dccfdcf027ebd94f51b58fa8104434a66925d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 15 Dec 2018 23:08:35 -0500
Subject: [PATCH 2074/2793] vscode-with-extensions: only add flag if extensions
 > 0

---
 pkgs/applications/editors/vscode/with-extensions.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 0af96e8bea8..88bea0c0809 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
 
   ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
   ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
-  makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \
-    --add-flags \
-      "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
+  makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
+    --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
+  ''}
 ''

From b25c32fc5c7984d81ee8f2abca7b1c33de10a238 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 20:15:36 -0800
Subject: [PATCH 2075/2793] insomnia: 6.2.0 -> 6.2.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/insomnia/versions
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index c7582f4d5b7..6f0de3932b5 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -17,11 +17,11 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "6.2.0";
+  version = "6.2.3";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1wxgcriszsbgpicaj4h1ycyykgwsjr8m7x5xi02y5bs5k6l7gcva";
+    sha256 = "1pq5y0w4yx2inyk6djcd1sb4c1m3awmn3mvr3smngwx9lsszn84i";
   };
 
   nativeBuildInputs = [ 

From 7c5bf040bb0b270937c045b33cfcb2ff71aad4bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 20:28:12 -0800
Subject: [PATCH 2076/2793] groonga: 8.0.8 -> 8.0.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/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 c692cee08bd..fd14a214be5 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.8";
+  version = "8.0.9";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1fl5s0a5ncw8lj3ild2qqqxa3h4d3k98dmyki760c54kw6p6bycv";
+    sha256 = "1fd5smhqchnjv0injj3x0zsqzffw1r4gq625znqljg6chny3cq08";
   };
 
   buildInputs = with stdenv.lib;

From fbf959f13df37c266f7cddffd2c0c3790bff1aa8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 20:51:50 -0800
Subject: [PATCH 2077/2793] ibus-engines.typing-booster-unwrapped: 2.1.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/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 1514959ea04..31d017de52b 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.3";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "1v9w5ak8ixasny7nkiwf6q058795c349dc2gr7jjpkz94gd4qls5";
+    sha256 = "0vzfnbld1k1ig1qgka30srmw1x53090xfn3cga80g64v0kqkwb5w";
   };
 
   patches = [ ./hunspell-dirs.patch ];

From fc3af0b5bd7b681da099c6ed2ea238f9142fbdb4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:01:06 -0800
Subject: [PATCH 2078/2793] goffice: 0.10.43 -> 0.10.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/goffice/versions
---
 pkgs/development/libraries/goffice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 4795f45812b..9a3775a79bd 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.43";
+  name = "goffice-0.10.44";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e";
+    sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From e52c0849fb6e93fa0abf7169114b5a1027b8fb89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:05:16 -0800
Subject: [PATCH 2079/2793] httpie: 1.0.0 -> 1.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/httpie/versions
---
 pkgs/tools/networking/httpie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 10f57532df1..2a608bf809a 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "httpie-1.0.0";
+  name = "httpie-1.0.2";
 
   src = fetchurl {
     url = "mirror://pypi/h/httpie/${name}.tar.gz";
-    sha256 = "09cs2n76318i34vms9pdnbds53pnp1m11gwn444j49na5qnk8l0n";
+    sha256 = "1ax22jh5lpjywpj7lsl072wdhr1pxiqzmxhyph5diwxxzs2nqrzw";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pygments requests ];

From 2aa36e2c8eac668f370ed90e7d45e38510c49d25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:12:24 -0800
Subject: [PATCH 2080/2793] goaccess: 1.2 -> 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/goaccess/versions
---
 pkgs/tools/misc/goaccess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index b7ce52f49b3..fce9f8272f0 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.3";
   name = "goaccess-${version}";
 
   src = fetchurl {
     url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb";
+    sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
   };
 
   configureFlags = [

From 03234ada9629b93a731e7e3ecdd116b3ab02aa1b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:24:31 -0800
Subject: [PATCH 2081/2793] gtkd: 3.8.3 -> 3.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/gtkd/versions
---
 pkgs/development/libraries/gtkd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index d89b00af4ce..66ba526f08e 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
-  version = "3.8.3";
+  version = "3.8.4";
 
   src = fetchzip {
     url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
-    sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj";
+    sha256 = "0q2kf1jwr89i8ajjzyf3b4bbla33djvnwrvljq17y206q7qknfyz";
     stripRoot = false;
   };
 

From 4ba0a3d645c34873e144aced5460110f931508c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:43:39 -0800
Subject: [PATCH 2082/2793] python37Packages.eyeD3: 0.8.7 -> 0.8.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/python3.7-eyed3/versions
---
 pkgs/development/python-modules/eyed3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
index 1cd3b5a934f..b2394f0a0c3 100644
--- a/pkgs/development/python-modules/eyed3/default.nix
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -14,13 +14,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.8.7";
+  version = "0.8.8";
   pname    = "eyeD3";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fzqy6hkg73xvpapdjrdzr3r0fsamnplvjfl7dz7rzgzx2r4x4pg";
+    sha256 = "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq";
   };
 
   # https://github.com/nicfit/eyeD3/pull/284

From e68c8ab017525027998b97822d6cd835ce4287e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 21:49:56 -0800
Subject: [PATCH 2083/2793] feh: 3.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/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 8938df4d42d..50664fc9e59 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 = "3.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn";
+    sha256 = "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31";
   };
 
   outputs = [ "out" "man" "doc" ];

From 08e45895a571688ce44a022cdf11affdf9807232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 22:16:51 -0800
Subject: [PATCH 2084/2793] eid-mw: 4.4.9 -> 4.4.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/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 637d2af9ae3..3534115bdb0 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.9";
+  version = "4.4.11";
 
   src = fetchFromGitHub {
-    sha256 = "019cfxgffl6z6ilz1w6b531dr8pi63ikflxmkc95glh7cxsaylax"; 
+    sha256 = "13mhz23j2gp5bywdq2xiwkk0gnc354j31ry8x35pzlwrcn19by10"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From c1f53579b84332961180edca9962c82cf116d2a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 22:36:48 -0800
Subject: [PATCH 2085/2793] feedreader: 2.4.1 -> 2.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/feedreader/versions
---
 .../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 bb64c837896..b7e9c02c0d2 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "FeedReader";
-  version = "2.4.1";
+  version = "2.6.1";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     owner = "jangernert";
     repo = pname;
     rev = "v" + version;
-    sha256 = "1fk2iiqwvrw58hpp96xypr4wh1sq15aixnz4760mnfynhjq5s3jh";
+    sha256 = "01r00b2jrb12x46fvd207s5lkhc13kmzg0w1kqbdkwkwsrdzb0jy";
   };
 
   nativeBuildInputs = [

From 1758debbaf4918f4299231172e0f0172bb370ac4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 23:08:58 -0800
Subject: [PATCH 2086/2793] geos: 3.7.0 -> 3.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/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 2417af3dbfd..d857c9931fe 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.7.0";
+  name = "geos-3.7.1";
 
   src = fetchurl {
     url = "https://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg";
+    sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0";
   };
 
   enableParallelBuilding = true;

From bb36a7284799b8873d5f8013fecb8164903a73f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 23:57:16 -0800
Subject: [PATCH 2087/2793] efivar: 36 -> 37

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

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 4072b8834ca..e77d4487582 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "36";
+  version = "37";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n";
+    sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b26ba90c34e2c01ec8afedb2c2ee608fe0c5f787 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 00:22:07 -0800
Subject: [PATCH 2088/2793] jmol: 14.29.28 -> 14.29.29 (#52275)

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 72dc154b71d..b748d26bb2a 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.28";
+  version = "14.29.29";
   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 = "0m72w5qsnsc07p7jjya78i4yz7zrdjqj8zpk65sa0xa2fh1y01g0";
+    sha256 = "0j3075lwagfvwzyh0mas9pj2fm8zdqn5ak0w0byz8s57azsrc3w4";
   };
 
   patchPhase = ''

From b6ca91fba5fd2b6c5db4ececcf2b6cbaf846143e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 9 Dec 2018 04:52:24 +0000
Subject: [PATCH 2089/2793] ocamlPackages.elina: init at 1.1

ELINA contains optimized implementations of popular numerical abstract domains
such as Polyhedra, Octagon and Zones for static analysis.

homepage: http://elina.ethz.ch/
---
 .../ocaml-modules/elina/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/elina/default.nix

diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix
new file mode 100644
index 00000000000..44bfeb2d474
--- /dev/null
+++ b/pkgs/development/ocaml-modules/elina/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }:
+
+stdenv.mkDerivation rec {
+  version = "1.1";
+  name = "ocaml${ocaml.version}-elina-${version}";
+  src = fetchurl {
+    url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz";
+    sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
+  };
+
+  buildInputs = [ perl ocaml findlib ];
+
+  propagatedBuildInputs = [ apron camlidl gmp mpfr ];
+
+  prefixKey = "--prefix ";
+  configureFlags = [
+    "--use-apron"
+    "--use-opam"
+    "--apron-prefix" "${apron}"
+  ]
+  ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs"
+  ;
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "ETH LIbrary for Numerical Analysis";
+    homepage = "http://elina.ethz.ch/";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 85cc5497c40..0af48890ff1 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -228,6 +228,8 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
+    elina = callPackage ../development/ocaml-modules/elina { };
+
     eliom = callPackage ../development/ocaml-modules/eliom {
       js_of_ocaml-lwt = js_of_ocaml-lwt.override {
         ocaml_lwt = lwt3;

From bbe5e97f1b4b623989d019f6eef1b7a9d5f06fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Dec 2018 08:49:48 +0000
Subject: [PATCH 2090/2793] xsecurelock: 1.1 -> 1.2

---
 pkgs/tools/X11/xsecurelock/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 88e36bfde39..738b9d3dcea 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -4,16 +4,18 @@
 
 stdenv.mkDerivation rec {
   name = "xsecurelock-${version}";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
     rev = "v${version}";
-    sha256 = "0yqp5xhkl9jpjyrmrxbyp7azwxmqc3lxv5lxrjqjaapl3q3096g5";
+    sha256 = "1vaw2m3yyfazj1x7xdwppmm0ch075q399g5vzrmhhrkzdrs53r1x";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig
+  ];
   buildInputs = [
     libX11 libXcomposite libXft libXmu pam
     apacheHttpd imagemagick pamtester
@@ -24,6 +26,12 @@ stdenv.mkDerivation rec {
     "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
   ];
 
+  preConfigure = ''
+    cat > version.c <<'EOF'
+      const char *const git_version = "${version}";
+    EOF
+  '';
+
   preInstall = ''
     substituteInPlace helpers/saver_blank \
       --replace 'protect xset' 'protect ${xset}/bin/xset'

From e2664ee3842fd7a3455e2f337b036efdd3ca318d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 00:57:11 -0800
Subject: [PATCH 2091/2793] deja-dup: 38.0 -> 38.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/deja-dup/versions
---
 pkgs/applications/backup/deja-dup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index c8fb4af3c4b..43cc171e05f 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "deja-dup-${version}";
-  version = "38.0";
+  version = "38.1";
 
   src = fetchurl {
     url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz";
-    sha256 = "1l3sa24v0v6xf312h36jikfi8zyx6z3nmc7pjzgdp7l89gkdm65v";
+    sha256 = "0wm7z72qbsljzsysxg8h5sbpg56ignn9mp8v3xynn12dv3gv6rba";
   };
 
   patches = [

From e26dc161c72f043e0d7934b1e21dcc2c28b2d3b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:17:35 -0800
Subject: [PATCH 2092/2793] containerd: 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/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 bd44b4fcbfe..d9056c4111d 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.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk";
+    sha256 = "16zn6p1ky3yrgn53z8h9wza53ch91fj47wj5xgz6w4c57j30f66p";
   };
 
   hardeningDisable = [ "fortify" ];

From 884095dcad94b18301302919c4b64b5761063a9a Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sun, 16 Dec 2018 01:23:52 -0800
Subject: [PATCH 2093/2793] jetbrains: 2018.3 -> 2018.3.1

---
 .../editors/jetbrains/default.nix             | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 3d905a83c8e..1cff72f5979 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.2.6"; /* updated by script */
+    version = "2018.3.1"; /* 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 = "1mgm3a6ph3j085bidl6vsy85kpscfspzxbzdmh3biklwfv3445rf"; /* updated by script */
+      sha256 = "0wv4hmh71ca9fl4pslf8nn6wppa98sc94272z4nb42jbs6dnb9ji"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* 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 = "0hd44flxqnnxg390mkf4ppjs2nxv0nwdc7a2i65f69bp5h61x783"; /* updated by script */
+      sha256 = "0z3z9hc7h3n63mfy7c5zh5sz8c0bzgxk79xamw08sxphrsjahasz"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand Release";
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* 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 = "01ccz5ksbv8xh8mnk3zxqpia8zgayy8bcgmbwqibrykz47y6r7yy"; /* updated by script */
+      sha256 = "1zi4aib1h4jfn241gsg83jsqfj99fpbci4pkh8xarap6xrallyiq"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA Release";
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* 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 = "16z0pqmxjn5dl42rbz7mx8gi13xs3220pzkdsdkh1k1ny9caqzvj"; /* updated by script */
+      sha256 = "0x0dplmv37gqdbrwxsx6xaix9dbaa6kqc09ganln5r4nl2bg64i8"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA Release";
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2018.2.5"; /* updated by script */
+    version = "2018.2.6"; /* 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 = "0crr3056hlv9x2q1i1n00aavj53xkwkfy4lgyyphk81c0gly4dg1"; /* updated by script */
+      sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm 2018.2";
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0kgrh3w4lpk7qkp5gss24in1nqahdfllvf97qz6r77zn9n5k1wq7"; /* updated by script */
+      sha256 = "02vs8nxxm139jl622nhxs59i9gw9rs5rjymkg8a0ajpybang24jk"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm Release";
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0q4scwnqy0h725g9z5hd145c3n10iaj04z790s4lixg1c63h3y8q"; /* updated by script */
+      sha256 = "0g4ag9lid2km69s5g31hhhvz3zjx52wxca1q4qz1h0s9km0ca1sq"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm Release";
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.2.5"; /* updated by script */
+    version = "2018.2.6"; /* 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 = "0b01fnifk5iawyf2zi7r5ffz8dxlh18g2ilrkc5746vmnsp0jxq4"; /* updated by script */
+      sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine 2018.2";
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.3"; /* updated by script */
+    version = "2018.3.1"; /* 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 = "0msvgdjbdipc4g8j705d1jya2mjmx4wwhb23nch3znh7grryr75s"; /* updated by script */
+      sha256 = "1l3jy1ifx82gdnvpgz77ycxbwymcwwd830i4mfidkr9gkndlxpsp"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm Release";

From c50c1da7a2b46de62acaf831d9e7ffe223d5e13c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:34:11 -0800
Subject: [PATCH 2094/2793] dfeet: 0.3.13 -> 0.3.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/d-feet/versions
---
 pkgs/development/tools/misc/d-feet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 6c4ff49d90f..ae27ff72c84 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -3,14 +3,14 @@
 
 let
   pname = "d-feet";
-  version = "0.3.13";
+  version = "0.3.14";
 in python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
+    sha256 = "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f";
   };
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];

From 14fbddc2322a968cc3eaff4d7cd38f8c07eb0c82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:42:33 -0800
Subject: [PATCH 2095/2793] dialog: 1.3-20180621 -> 1.3-20181107

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

diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index a433c4a338c..9d6c19516f2 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -9,14 +9,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "dialog-${version}";
-  version = "1.3-20180621";
+  version = "1.3-20181107";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
       "https://invisible-mirror.net/archives/dialog/${name}.tgz"
     ];
-    sha256 = "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a";
+    sha256 = "0mv4a31sz5kc1hyc51cvg9dq54vhlz0vbizn7jgkm9fx4y0cmspg";
   };
 
   buildInputs = [ ncurses ];

From cf2d35d8898c61e8d5c04bdc2806e2bffb99d17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sun, 16 Dec 2018 10:45:42 +0100
Subject: [PATCH 2096/2793] androidndk: Adds missing patch for 18b

---
 .../make_standalone_toolchain.py_18b.patch    | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch

diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch
new file mode 100644
index 00000000000..1f6bfac5b80
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch
@@ -0,0 +1,98 @@
+diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
+index b8172b28..95daa6a6 100755
+--- a/build/tools/make_standalone_toolchain.py
++++ b/build/tools/make_standalone_toolchain.py
+@@ -353,7 +353,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+                      platforms_path, host_tag):
+     """Create a standalone toolchain."""
+     copy_directory_contents(gcc_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     copy_directory_contents(clang_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     triple = get_triple(arch)
+     make_clang_scripts(
+         install_path, triple, api, host_tag.startswith('windows'))
+@@ -365,9 +367,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     install_headers = os.path.join(install_sysroot, 'usr/include')
+     os.makedirs(os.path.dirname(install_headers))
+     shutil.copytree(headers, install_headers)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(arch_headers, os.path.join(install_headers))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     for lib_suffix in ('', '64'):
+         lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix))
+@@ -375,20 +379,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             install_sysroot, 'usr/lib{}'.format(lib_suffix))
+         if os.path.exists(lib_path):
+             shutil.copytree(lib_path, lib_install)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
+     static_lib_install = os.path.join(install_sysroot, 'usr/lib')
+     if arch == 'x86_64':
+         static_lib_install += '64'
+     copy_directory_contents(static_lib_path, static_lib_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
+     copy_directory_contents(prebuilt_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     gdbserver_path = os.path.join(
+         NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
+     gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
+     shutil.copytree(gdbserver_path, gdbserver_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
+@@ -401,6 +409,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
+     support_dir = os.path.join(NDK_DIR, 'sources/android/support')
+     copy_directory_contents(os.path.join(libcxx_dir, 'include'), cxx_headers)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     if api < 21:
+         # For any libc header that is in libandroid_support, we actually have
+@@ -412,11 +421,13 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+         copy_directory_contents(
+             os.path.join(support_dir, 'include'),
+             os.path.join(install_path, 'sysroot/usr/local/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     # I have no idea why we need this, but the old one does it too.
+     copy_directory_contents(
+         os.path.join(libcxxabi_dir, 'include'),
+         os.path.join(install_path, 'include/llvm-libc++abi/include'))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     headers = [
+         'cxxabi.h',
+@@ -426,20 +437,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+         shutil.copy2(
+             os.path.join(libcxxabi_dir, 'include', header),
+             os.path.join(cxx_headers, header))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     for abi in get_abis(arch):
+         src_libdir = get_src_libdir(libcxx_dir, abi)
+         dest_libdir = get_dest_libdir(install_path, triple, abi)
+         copy_libcxx_libs(src_libdir, dest_libdir, abi, api)
++        os.system('chmod -R +w "{}"'.format(install_path))
+         if arch == 'arm':
+             thumb_libdir = os.path.join(dest_libdir, 'thumb')
+             copy_libcxx_libs(src_libdir, thumb_libdir, abi, api)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     # Not needed for every STL, but the old one does this. Keep it for the sake
+     # of diff. Done at the end so copytree works.
+     cxx_target_headers = os.path.join(cxx_headers, triple)
+     if not os.path.exists(cxx_target_headers):
+         os.makedirs(cxx_target_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+ 
+ def parse_args():

From 8d71f4a44ca89834a3ad53fa6d7bbfd088400ebe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:50:16 -0800
Subject: [PATCH 2097/2793] drumstick: 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/drumstick/versions
---
 pkgs/development/libraries/drumstick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index ab25a651844..c85f6de0405 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumstick-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
-    sha256 = "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn";
+    sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp";
   };
 
   outputs = [ "out" "dev" "man" ];

From fc5d1f48b45a80bf9980b4f0afcd03fb2326f4d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:59:44 -0800
Subject: [PATCH 2098/2793] cppcheck: 1.85 -> 1.86

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

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 2f82c1ee66a..e2b6d8e34fc 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.85";
+  version = "1.86";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1xjc0gna9hrqc6liyzkzkr2naapj5bldzad8qdxcjgqz5yd6rb7i";
+    sha256 = "0p4zdyc6l7x5611bybv7gwjdz1dvakb60xf0ya3dhvf9272iszf3";
   };
 
   buildInputs = [ pcre ];

From 66060d3bb0e390c76051a63f5f45d4993143bad3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 11:10:15 +0100
Subject: [PATCH 2099/2793] nextcloud: 14.0.4 -> 15.0.0

---
 pkgs/servers/nextcloud/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index ecd3a5e5c9b..0d9533b30f2 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,19 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "nextcloud-${version}";
-  version = "14.0.4";
+  version = "15.0.0";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag";
+    sha256 = "0y7bk1588n5rmmranmmrkajh50074460hr4v052ahg9mf60wbc2v";
   };
 
-  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 8ebabc3d9fa2a973843ab70827259652a28dd5ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:34:24 -0800
Subject: [PATCH 2100/2793] dar: 2.5.17 -> 2.5.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/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 a96326c76cf..9a842c45f9c 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.17";
+  version = "2.5.18";
   name = "dar-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "1pw6l9nh7w9n7ysh8m6wdzr3k4i9sd6fkmrprnssay5cz7rsbx3v";
+    sha256 = "14002ai4xji0dczgiargxs3z8yylswj8z94higcsw09xk13izlkk";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From a3b5010856575f392c67b8b9965d4ba1ceaa6aa3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:39:13 -0800
Subject: [PATCH 2101/2793] deepin.dde-calendar: 1.2.5 -> 1.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/dde-calendar/versions
---
 pkgs/desktops/deepin/dde-calendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 6d0abab2100..631471527f3 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-calendar";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "1a5zxpz7zncw6mrzv8zmn0j1vk0c8fq0m1xhmnwllffzybrhn4y7";
+    sha256 = "0k973rv0prvr7cg1xwg7kr14fkx13aslhiqc3q7vpakfk53qsw4n";
   };
 
   nativeBuildInputs = [

From abdc4c4e180e21afb9f86c1e16c0c1dd803b78dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:46:52 -0800
Subject: [PATCH 2102/2793] deepin.deepin-wm: 1.9.33 -> 1.9.34

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-wm/versions
---
 pkgs/desktops/deepin/deepin-wm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
index db60e7b499b..4eac01b666a 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-wm";
-  version = "1.9.33";
+  version = "1.9.34";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv";
+    sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f";
   };
 
   nativeBuildInputs = [

From f5c9ceaf43dc5a46dc485546f42253c00fd73667 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 12:44:39 +0100
Subject: [PATCH 2103/2793] nextcloud-client: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 3d54ff3a7c3..740a67bcf8d 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "nextcloud-client-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchgit {
     url = "git://github.com/nextcloud/desktop.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1wz5bz4nmni0qxzcvgmpg9ywrfixzvdd7ixgqmdm4d8g6dm8pk9k";
+    sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d";
     fetchSubmodules = true;
   };
 

From 2b3dda6c5118b8383eb741330423853bba5cf612 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 16 Dec 2018 12:51:49 +0100
Subject: [PATCH 2104/2793] geany: 1.33 -> 1.34

---
 pkgs/applications/editors/geany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 24954a602cc..d1499fc2180 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "1.33";
+  version = "1.34";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.geany.org/${name}.tar.bz2";
-    sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2";
+    sha256 = "63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];

From 7a97f697d53fd9802c919a0e2b94fb230f1337cb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 16 Dec 2018 12:28:32 +0100
Subject: [PATCH 2105/2793] dashing: enable on darwin

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

diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index a8a878b1998..5a82c766089 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -21,6 +21,6 @@ buildGoPackage rec {
     homepage    = https://github.com/technosophos/dashing;
     license     = licenses.mit;
     maintainers = [ ];
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
   };
 }

From ffc586cf49c0ded1026e92b0fa8d9cb2805be6ba Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sun, 16 Dec 2018 09:30:10 -0200
Subject: [PATCH 2106/2793] fluidsynth_1: init at 1.1.11

---
 .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 33ac7218778..8727c49398e 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,17 +1,32 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
 , alsaLib, glib, libjack2, libsndfile, libpulseaudio
 , AudioUnit, CoreAudio, CoreMIDI, CoreServices
+, version ? "2"
 }:
 
+let
+  versionMap = {
+    "1" = {
+      fluidsynthVersion = "1.1.11";
+      sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
+    };
+    "2" = {
+      fluidsynthVersion = "2.0.1";
+      sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
+    };
+  };
+in
+
+with versionMap.${version};
+
 stdenv.mkDerivation  rec {
-  name = "fluidsynth-${version}";
-  version = "2.0.1";
+  name = "fluidsynth-${fluidsynthVersion}";
 
   src = fetchFromGitHub {
     owner = "FluidSynth";
     repo = "fluidsynth";
-    rev = "v${version}";
-    sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
+    rev = "v${fluidsynthVersion}";
+    inherit sha256;
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64ef63f55ab..82db9a17f38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16836,6 +16836,7 @@ in
   fluidsynth = callPackage ../applications/audio/fluidsynth {
      inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
   };
+  fluidsynth_1 = fluidsynth.override { version = "1"; };
 
   fmit = libsForQt5.callPackage ../applications/audio/fmit { };
 

From 86fac8b52863dac169f92c9b5abb286244a8db28 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sun, 16 Dec 2018 09:30:16 -0200
Subject: [PATCH 2107/2793] csound: depend on fluidsynth_1

csound is incompatible with fluidsynth 2
https://github.com/csound/csound/issues/1078
---
 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 82db9a17f38..bb1be7dc2e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16267,7 +16267,9 @@ in
 
   csa = callPackage ../applications/audio/csa { };
 
-  csound = callPackage ../applications/audio/csound { };
+  csound = callPackage ../applications/audio/csound {
+    fluidsynth = fluidsynth_1;
+  };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {
     fltk = fltk13;

From d2048b0d7edcac82c199c0fb06f0f2359a2bb7ca Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Sun, 16 Dec 2018 13:41:48 +0100
Subject: [PATCH 2108/2793] nixos/kubernetes: don't enable all alpha feature
 gates for the test cases

---
 nixos/tests/kubernetes/kubernetes-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix
index 125c176f113..87c65b88365 100644
--- a/nixos/tests/kubernetes/kubernetes-common.nix
+++ b/nixos/tests/kubernetes/kubernetes-common.nix
@@ -3,7 +3,6 @@ with pkgs.lib;
 let
   base = {
     inherit roles;
-    featureGates = ["AllAlpha"];
     flannel.enable = true;
     addons.dashboard.enable = true;
 

From 116edb8e7b60f177309e8b33eaee43237e4c5160 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:48:02 -0800
Subject: [PATCH 2109/2793] python37Packages.rfc3986: 1.1.0 -> 1.2.0 (#52079)

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

diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 11792f4296a..b2675d04d5b 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "rfc3986";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
+    sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw";
   };
 
   buildInputs = [ pytest ];

From f6758780f58c48a06932ebba19292b66eaffe0fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:50:09 -0800
Subject: [PATCH 2110/2793] debootstrap: 1.0.110 -> 1.0.111

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 1b2cdf0402a..222a29a0d9c 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.110";
+  version = "1.0.111";
 
   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 = "11bqy2dbqsy9fyx1i6lj0aj1pvq15y8kkwjfrp18k3nvy74y80ca";
+    sha256 = "1m2678y2cswd2z7pksknv1cwlv3ww1fmhz4kkhvxlhpmyyc4260w";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c49358668de986b0645caabe054f860e8dd1eff4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:51:33 -0800
Subject: [PATCH 2111/2793] python37Packages.parver: 0.1.1 -> 0.2.0 (#52106)

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

diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index 7918c5bf6fa..a654e28c64a 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "parver";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc";
+    sha256 = "1nylv880zxnm9waw32y8dmdc435jv5gjcajv8qahafm7v1prgcmq";
   };
 
   propagatedBuildInputs = [ six attrs arpeggio ];

From 7f61a7814e961b9a363d3bfb74e3747613ae9a4e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:53:29 -0800
Subject: [PATCH 2112/2793] cryptsetup: 2.0.5 -> 2.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/cryptsetup/versions
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index ea255181e01..c6920eab855 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,13 +5,13 @@
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-2.0.5";
+  name = "cryptsetup-2.0.6";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz";
-    sha256 = "079hzvjyzbzaakzvqc1fmciwlzllzqyl2949viasb994r2i2rxx0";
+    sha256 = "0c1x125s7p4ps13spsqrcsd9dclz01vsrchmypq9msp7y3hgllbw";
   };
 
   # Disable 4 test cases that fail in a sandbox

From ac85a1ec47352806d803c392186abe4362e824cd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 16 Dec 2018 13:08:23 +0100
Subject: [PATCH 2113/2793] hwloc: 2.0.2 -> 2.0.3

Refactor version string and download link to make
it comatible with automatic updates.
---
 pkgs/development/libraries/hwloc/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 8f38170d87e..81e30d675d2 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -6,12 +6,17 @@ assert x11Support -> libX11 != null && cairo != null;
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  name = "hwloc-2.0.2";
+let
+  version = "2.0.3";
+  versmm = versions.major version + "." + versions.minor version;
+  name = "hwloc-${version}";
+
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2";
-    sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l";
+    url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
+    sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3";
   };
 
   configureFlags = [

From 93cde0b7c824f72cc4d8104bec88b100cdf293e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:10:57 -0800
Subject: [PATCH 2114/2793] python37Packages.billiard: 3.5.0.4 -> 3.5.0.5
 (#52121)

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

diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 42e38d0babe..3e301e03993 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "billiard";
-  version = "3.5.0.4";
+  version = "3.5.0.5";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84";
+    sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2";
   };
 
   buildInputs = [ pytest case ];

From da8276546d1b463e74640dc6bbf498ec7ff8ad43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:13:00 -0800
Subject: [PATCH 2115/2793] python37Packages.daphne: 2.2.2 -> 2.2.3 (#52123)

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

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 258fc746e4b..e797cbda8bd 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.2.2";
+  version = "2.2.3";
 
   disabled = !isPy3k;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1pr3b7zxjp2jx31lpiy1hfyprpmyiv2kd18n8x6kh6gd5nr0dgp8";
+    sha256 = "0v3krlqdv39y021dcyf6fl9zys0z1dpw5mqfmkryna5ngxwzlkwd";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From d2aaef9f002d0263c51d8ec017a2ffe026102646 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:14:50 -0800
Subject: [PATCH 2116/2793] python37Packages.dkimpy: 0.9.0 -> 0.9.1 (#52127)

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

diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index fbd94900212..5ebedf67b8d 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dkimpy";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfj2jsfqbwkrg9y5inz61wxf8z4rrs5js6dizjgsd4lyb3b5inj";
+    sha256 = "0rq3543m0q7kfl02l8ji4c35qbxb99h2mzjaxbaxfrlk6dcpk76j";
 };
 
   checkInputs = [ pytest ];

From 9903c859d9b6f56dc118b67f8f55332e24456072 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:42:31 -0800
Subject: [PATCH 2117/2793] easyloggingpp: 9.96.5 -> 9.96.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/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 96e294ab2fb..4ca9eab51bb 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.5";
+  version = "9.96.7";
   src = fetchFromGitHub {
     owner = "muflihun";
     repo = "easyloggingpp";
     rev = "v${version}";
-    sha256 = "03jycliki3h6lc8kci26s6lnx5bap47xsnsjd375qgr9l11g76f5";
+    sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz";
   };
 
   nativeBuildInputs = [cmake];

From 50500219af10d2bd7502d232d0bfc6a7f06b8c04 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 14:20:51 +0100
Subject: [PATCH 2118/2793] apache-httpd/limesurvey.nix: fix copypasta from
 owncloud

---
 nixos/modules/services/web-servers/apache-httpd/limesurvey.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
index 77194f34749..5c387700a5d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
@@ -85,7 +85,7 @@ in rec {
     id = mkOption {
       default = "main";
       description = ''
-        A unique identifier necessary to keep multiple owncloud server
+        A unique identifier necessary to keep multiple Limesurvey server
         instances on the same machine apart.  This is used to
         disambiguate the administrative scripts, which get names like
         mediawiki-$id-change-password.

From 91c65721f71b17bbc9c9faf45cdeb7aae5b78c69 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 14:22:32 +0100
Subject: [PATCH 2119/2793] owncloud: remove server

pkgs.owncloud still pointed to owncloud 7.0.15 (from May 13 2016)

Last owncloud server update in nixpkgs was in Jun 2016.
At the same time Nextcloud forked away from it, indicating users
switched over to that.

cc @matej (original maintainer)
---
 nixos/doc/manual/release-notes/rl-1903.xml    |   6 +
 .../web-servers/apache-httpd/owncloud.nix     | 608 ------------------
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/owncloud.nix                      |  39 --
 pkgs/servers/owncloud/default.nix             |  65 --
 pkgs/top-level/all-packages.nix               |  10 -
 6 files changed, 6 insertions(+), 723 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/apache-httpd/owncloud.nix
 delete mode 100644 nixos/tests/owncloud.nix
 delete mode 100644 pkgs/servers/owncloud/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 9405bf063d5..69e94fbccc5 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -364,6 +364,12 @@
        of maintainers.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The owncloud server packages and httpd subservice module were removed
+       from nixpkgs due to the lack of maintainers.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
deleted file mode 100644
index 6345a9a5693..00000000000
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ /dev/null
@@ -1,608 +0,0 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
-
-with lib;
-
-let
-
-  owncloudConfig = pkgs.writeText "config.php"
-    ''
-      <?php
-
-      /* Only enable this for local development and not in productive environments */
-      /* This will disable the minifier and outputs some additional debug informations */
-      define("DEBUG", false);
-
-      $CONFIG = array(
-      /* Flag to indicate ownCloud is successfully installed (true = installed) */
-      "installed" => true,
-
-      /* Type of database, can be sqlite, mysql or pgsql */
-      "dbtype" => "${config.dbType}",
-
-      /* Name of the ownCloud database */
-      "dbname" => "${config.dbName}",
-
-      /* User to access the ownCloud database */
-      "dbuser" => "${config.dbUser}",
-
-      /* Password to access the ownCloud database */
-      "dbpassword" => "${config.dbPassword}",
-
-      /* Host running the ownCloud database. To specify a port use "HOSTNAME:####"; to specify a unix sockets use "localhost:/path/to/socket". */
-      "dbhost" => "${config.dbServer}",
-
-      /* Prefix for the ownCloud tables in the database */
-      "dbtableprefix" => "",
-
-      /* Force use of HTTPS connection (true = use HTTPS) */
-      "forcessl" => ${config.forceSSL},
-
-      /* Blacklist a specific file and disallow the upload of files with this name - WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */
-      "blacklisted_files" => array('.htaccess'),
-
-      /* The automatic hostname detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the automatic detection. You can also add a port. For example "www.example.com:88" */
-      "overwritehost" => "${config.overwriteHost}",
-
-      /* The automatic protocol detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the protocol detection. For example "https" */
-      "overwriteprotocol" => "${config.overwriteProtocol}",
-
-      /* The automatic webroot detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the automatic detection. For example "/domain.tld/ownCloud". The value "/" can be used to remove the root. */
-      "overwritewebroot" => "${config.overwriteWebRoot}",
-
-      /* The automatic detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to define a manually override condition as regular expression for the remote ip address. For example "^10\.0\.0\.[1-3]$" */
-      "overwritecondaddr" => "",
-
-      /* A proxy to use to connect to the internet. For example "myproxy.org:88" */
-      "proxy" => "",
-
-      /* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
-      "proxyuserpwd" => "",
-
-      /* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */
-      ${if config.trustedDomain != "" then "'trusted_domains' => array('${config.trustedDomain}')," else ""}
-
-      /* Theme to use for ownCloud */
-      "theme" => "",
-
-      /* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user's language preference configured under "personal -> language" once they have logged in */
-      "default_language" => "${config.defaultLang}",
-
-      /* Path to the parent directory of the 3rdparty directory */
-      "3rdpartyroot" => "",
-
-      /* URL to the parent directory of the 3rdparty directory, as seen by the browser */
-      "3rdpartyurl" => "",
-
-      /* Default app to open on login.
-       * This can be a comma-separated list of app ids.
-       * If the first app is not enabled for the current user,
-       * it will try with the second one and so on. If no enabled app could be found,
-       * the "files" app will be displayed instead. */
-      "defaultapp" => "${config.defaultApp}",
-
-      /* Enable the help menu item in the settings */
-      "knowledgebaseenabled" => true,
-
-      /* Enable installing apps from the appstore */
-      "appstoreenabled" => ${config.appStoreEnable},
-
-      /* URL of the appstore to use, server should understand OCS */
-      "appstoreurl" => "https://api.owncloud.com/v1",
-
-      /* Domain name used by ownCloud for the sender mail address, e.g. no-reply@example.com */
-      "mail_domain" => "${config.mailFromDomain}",
-
-      /* FROM address used by ownCloud for the sender mail address, e.g. owncloud@example.com
-         This setting overwrites the built in 'sharing-noreply' and 'lostpassword-noreply'
-         FROM addresses, that ownCloud uses
-      */
-      "mail_from_address" => "${config.mailFrom}",
-
-      /* Enable SMTP class debugging */
-      "mail_smtpdebug" => false,
-
-      /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
-      "mail_smtpmode" => "${config.SMTPMode}",
-
-      /* Host to use for sending mail, depends on mail_smtpmode if this is used */
-      "mail_smtphost" => "${config.SMTPHost}",
-
-      /* Port to use for sending mail, depends on mail_smtpmode if this is used */
-      "mail_smtpport" => ${config.SMTPPort},
-
-      /* SMTP server timeout in seconds for sending mail, depends on mail_smtpmode if this is used */
-      "mail_smtptimeout" => ${config.SMTPTimeout},
-
-      /* SMTP connection prefix or sending mail, depends on mail_smtpmode if this is used.
-         Can be "", ssl or tls */
-      "mail_smtpsecure" => "${config.SMTPSecure}",
-
-      /* authentication needed to send mail, depends on mail_smtpmode if this is used
-       * (false = disable authentication)
-       */
-      "mail_smtpauth" => ${config.SMTPAuth},
-
-      /* authentication type needed to send mail, depends on mail_smtpmode if this is used
-       * Can be LOGIN (default), PLAIN or NTLM */
-      "mail_smtpauthtype" => "${config.SMTPAuthType}",
-
-      /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
-      "mail_smtpname" => "${config.SMTPUser}",
-
-      /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
-      "mail_smtppassword" => "${config.SMTPPass}",
-
-      /* memcached servers (Only used when xCache, APC and APCu are absent.) */
-      "memcached_servers" => array(
-          // hostname, port and optional weight. Also see:
-          // http://www.php.net/manual/en/memcached.addservers.php
-          // http://www.php.net/manual/en/memcached.addserver.php
-          //array('localhost', 11211),
-          //array('other.host.local', 11211),
-      ),
-
-      /* How long should ownCloud keep deleted files in the trash bin, default value:  30 days */
-      'trashbin_retention_obligation' => 30,
-
-      /* Disable/Enable auto expire for the trash bin, by default auto expire is enabled */
-      'trashbin_auto_expire' => true,
-
-      /* allow user to change his display name, if it is supported by the back-end */
-      'allow_user_to_change_display_name' => true,
-
-      /* Check 3rdparty apps for malicious code fragments */
-      "appcodechecker" => true,
-
-      /* Check if ownCloud is up to date */
-      "updatechecker" => true,
-
-      /* Are we connected to the internet or are we running in a closed network? */
-      "has_internet_connection" => true,
-
-      /* Check if the ownCloud WebDAV server is working correctly. Can be disabled if not needed in special situations*/
-      "check_for_working_webdav" => true,
-
-      /* Check if .htaccess protection of data is working correctly. Can be disabled if not needed in special situations*/
-      "check_for_working_htaccess" => true,
-
-      /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
-      "log_type" => "owncloud",
-
-      /* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
-      "logfile" => "${config.dataDir}/owncloud.log",
-
-      /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
-      "loglevel" => "2",
-
-      /* date format to be used while writing to the owncloud logfile */
-      'logdateformat' => 'F d, Y H:i:s',
-
-      ${tzSetting}
-
-      /* Append all database queries and parameters to the log file.
-       (watch out, this option can increase the size of your log file)*/
-      "log_query" => false,
-
-      /* Whether ownCloud should log the last successfull cron exec */
-      "cron_log" => true,
-
-      /*
-       * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
-       * This rotates the current owncloud logfile to a new name, this way the total log usage
-       * will stay limited and older entries are available for a while longer. The
-       * total disk usage is twice the configured size.
-       * WARNING: When you use this, the log entries will eventually be lost.
-       */
-      'log_rotate_size' => "104857600", // 104857600, // 100 MiB
-
-      /* Lifetime of the remember login cookie, default is 15 days */
-      "remember_login_cookie_lifetime" => 1296000,
-
-      /* Life time of a session after inactivity */
-      "session_lifetime" => 86400,
-
-      /*
-       * Enable/disable session keep alive when a user is logged in in the Web UI.
-       * This is achieved by sending a "heartbeat" to the server to prevent
-       * the session timing out.
-       */
-      "session_keepalive" => true,
-
-      /* Custom CSP policy, changing this will overwrite the standard policy */
-      "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
-
-      /* Enable/disable X-Frame-Restriction */
-      /* HIGH SECURITY RISK IF DISABLED*/
-      "xframe_restriction" => true,
-
-      /* The directory where the user data is stored, default to data in the owncloud
-       * directory. The sqlite database is also stored here, when sqlite is used.
-       */
-      "datadirectory" => "${config.dataDir}/storage",
-
-      /* 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.
-       */
-      // "skeletondirectory" => "",
-
-      /* Enable maintenance mode to disable ownCloud
-         If you want to prevent users to login to ownCloud before you start doing some maintenance work,
-         you need to set the value of the maintenance parameter to true.
-         Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
-      */
-      "maintenance" => false,
-
-      "apps_paths" => array(
-
-      /* Set an array of path for your apps directories
-       key 'path' is for the fs path and the key 'url' is for the http path to your
-       applications paths. 'writable' indicates whether the user can install apps in this folder.
-       You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
-      */
-          array(
-              'path'=> '${config.dataDir}/apps',
-              'url' => '/apps',
-              'writable' => true,
-          ),
-      ),
-      'user_backends'=>array(
-          /*
-          array(
-              'class'=>'OC_User_IMAP',
-              'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
-          )
-          */
-      ),
-      //links to custom clients
-      'customclient_desktop' => ''', //http://owncloud.org/sync-clients/
-      'customclient_android' => ''', //https://play.google.com/store/apps/details?id=com.owncloud.android
-      'customclient_ios' => ''', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
-
-      // PREVIEW
-      'enable_previews' => true,
-      /* the max width of a generated preview, if value is null, there is no limit */
-      'preview_max_x' => null,
-      /* the max height of a generated preview, if value is null, there is no limit */
-      'preview_max_y' => null,
-      /* the max factor to scale a preview, default is set to 10 */
-      'preview_max_scale_factor' => 10,
-      /* custom path for libreoffice / openoffice binary */
-      'preview_libreoffice_path' => '${config.libreofficePath}',
-      /* cl parameters for libreoffice / openoffice */
-      'preview_office_cl_parameters' => ''',
-
-      /* whether avatars should be enabled */
-      'enable_avatars' => true,
-
-      // Extra SSL options to be used for configuration
-      'openssl' => array(
-          'config' => '/etc/ssl/openssl.cnf',
-      ),
-
-      // default cipher used for file encryption, currently we support AES-128-CFB and AES-256-CFB
-      'cipher' => 'AES-256-CFB',
-
-      /* whether usage of the instance should be restricted to admin users only */
-      'singleuser' => false,
-
-      /* all css and js files will be served by the web server statically in one js file and ons css file*/
-      'asset-pipeline.enabled' => false,
-
-      /* where mount.json file should be stored, defaults to data/mount.json */
-      'mount_file' => ''',
-
-      /*
-       * Location of the cache folder, defaults to "data/$user/cache" where "$user" is the current user.
-       *
-       * When specified, the format will change to "$cache_path/$user" where "$cache_path" is the configured
-       * cache directory and "$user" is the user.
-       *
-       */
-      'cache_path' => ''',
-
-      /* EXPERIMENTAL: option whether to include external storage in quota calculation, defaults to false */
-      'quota_include_external_storage' => false,
-
-      /*
-       * specifies how often the filesystem is checked for changes made outside owncloud
-       * 0 -> never check the filesystem for outside changes, provides a performance increase when it's certain that no changes are made directly to the filesystem
-       * 1 -> check each file or folder at most once per request, recomended for general use if outside changes might happen
-       * 2 -> check every time the filesystem is used, causes a performance hit when using external storages, not recomended for regular use
-       */
-      'filesystem_check_changes' => 1,
-
-      /* If true, prevent owncloud from changing the cache due to changes in the filesystem for all storage */
-      'filesystem_cache_readonly' => false,
-
-      /**
-       * define default folder for shared files and folders
-       */
-      'share_folder' => '/',
-
-      'version' => '${config.package.version}',
-
-      'openssl' => '${pkgs.openssl.bin}/bin/openssl'
-
-      );
-
-    '';
-
-  tzSetting = let tz = serverInfo.fullConfig.time.timeZone; in optionalString (!isNull tz) ''
-    /* timezone used while writing to the owncloud logfile (default: UTC) */
-    'logtimezone' => '${tz}',
-  '';
-
-  postgresql = serverInfo.fullConfig.services.postgresql.package;
-
-  setupDb = pkgs.writeScript "setup-owncloud-db" ''
-    #!${pkgs.runtimeShell}
-    PATH="${postgresql}/bin"
-    createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
-    createdb "${config.dbName}" -O "${config.dbUser}" || true
-    psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true
-
-    QUERY="CREATE TABLE appconfig
-             ( appid       VARCHAR( 255 ) NOT NULL
-             , configkey   VARCHAR( 255 ) NOT NULL
-             , configvalue VARCHAR( 255 ) NOT NULL
-             );
-           GRANT ALL ON appconfig TO ${config.dbUser};
-           ALTER TABLE appconfig OWNER TO ${config.dbUser};"
-
-    psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
-  '';
-
-in
-
-rec {
-
-  extraConfig =
-    ''
-      ${if config.urlPrefix != "" then "Alias ${config.urlPrefix} ${config.package}" else ''
-
-        RewriteEngine On
-        RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
-        RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
-      ''}
-
-      <Directory ${config.package}>
-        Include ${config.package}/.htaccess
-      </Directory>
-    '';
-
-  globalEnvVars = [
-    { name = "OC_CONFIG_PATH"; value = "${config.dataDir}/config/"; }
-  ];
-
-  documentRoot = if config.urlPrefix == "" then config.package else null;
-
-  enablePHP = true;
-
-  options = {
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.owncloud70;
-      defaultText = "pkgs.owncloud70";
-      example = literalExample "pkgs.owncloud70";
-      description = ''
-          ownCloud package to use.
-      '';
-    };
-
-    urlPrefix = mkOption {
-      default = "";
-      example = "/owncloud";
-      description = ''
-        The URL prefix under which the owncloud service appears.
-      '';
-    };
-
-    id = mkOption {
-      default = "main";
-      description = ''
-        A unique identifier necessary to keep multiple owncloud server
-        instances on the same machine apart.  This is used to
-        disambiguate the administrative scripts, which get names like
-        mediawiki-$id-change-password.
-      '';
-    };
-
-    adminUser = mkOption {
-      default = "owncloud";
-      description = "The admin user name for accessing owncloud.";
-    };
-
-    adminPassword = mkOption {
-      description = "The admin password for accessing owncloud.";
-    };
-
-    dbType = mkOption {
-      default = "pgsql";
-      description = "Type of database, in NixOS, for now, only pgsql.";
-    };
-
-    dbName = mkOption {
-      default = "owncloud";
-      description = "Name of the database that holds the owncloud data.";
-    };
-
-    dbServer = mkOption {
-      default = "localhost:5432";
-      description = ''
-        The location of the database server.
-      '';
-    };
-
-    dbUser = mkOption {
-      default = "owncloud";
-      description = "The user name for accessing the database.";
-    };
-
-    dbPassword = mkOption {
-      example = "foobar";
-      description = ''
-        The password of the database user.  Warning: this is stored in
-        cleartext in the Nix store!
-      '';
-    };
-
-    forceSSL = mkOption {
-      default = "false";
-      description = "Force use of HTTPS connection.";
-    };
-
-    adminAddr = mkOption {
-      default = serverInfo.serverConfig.adminAddr;
-      example = "admin@example.com";
-      description = ''
-        Emergency contact e-mail address.  Defaults to the Apache
-        admin address.
-      '';
-    };
-
-    siteName = mkOption {
-      default = "owncloud";
-      example = "Foobar owncloud";
-      description = "Name of the owncloud";
-    };
-
-    trustedDomain = mkOption {
-      default = "";
-      description = "Trusted domain";
-    };
-
-    defaultLang = mkOption {
-      default = "";
-      description = "Default language";
-    };
-
-    defaultApp = mkOption {
-      default = "";
-      description = "Default application";
-    };
-
-    appStoreEnable = mkOption {
-      default = "true";
-      description = "Enable app store";
-    };
-
-    mailFrom = mkOption {
-      default = "no-reply";
-      description = "Mail from";
-    };
-
-    mailFromDomain = mkOption {
-      default = "example.xyz";
-      description = "Mail from domain";
-    };
-
-    SMTPMode = mkOption {
-      default = "smtp";
-      description = "Which mode to use for sending mail: sendmail, smtp, qmail or php.";
-    };
-
-    SMTPHost = mkOption {
-      default = "";
-      description = "SMTP host";
-    };
-
-    SMTPPort = mkOption {
-      default = "25";
-      description = "SMTP port";
-    };
-
-    SMTPTimeout = mkOption {
-      default = "10";
-      description = "SMTP mode";
-    };
-
-    SMTPSecure = mkOption {
-      default = "ssl";
-      description = "SMTP secure";
-    };
-
-    SMTPAuth = mkOption {
-      default = "true";
-      description = "SMTP auth";
-    };
-
-    SMTPAuthType = mkOption {
-      default = "LOGIN";
-      description = "SMTP auth type";
-    };
-
-    SMTPUser = mkOption {
-      default = "";
-      description = "SMTP user";
-    };
-
-    SMTPPass = mkOption {
-      default = "";
-      description = "SMTP pass";
-    };
-
-    dataDir = mkOption {
-      default = "/var/lib/owncloud";
-      description = "Data dir";
-    };
-
-    libreofficePath = mkOption {
-      default = "/usr/bin/libreoffice";
-      description = "Path for LibreOffice/OpenOffice binary.";
-    };
-
-    overwriteHost = mkOption {
-      default = "";
-      description = "The automatic hostname detection of ownCloud can fail in
-        certain reverse proxy and CLI/cron situations. This option allows to
-        manually override the automatic detection. You can also add a port.";
-    };
-
-    overwriteProtocol = mkOption {
-      default = "";
-      description = "The automatic protocol detection of ownCloud can fail in
-        certain reverse proxy and CLI/cron situations. This option allows to
-        manually override the protocol detection.";
-    };
-
-    overwriteWebRoot = mkOption {
-      default = "";
-      description = "The automatic webroot detection of ownCloud can fail in
-        certain reverse proxy and CLI/cron situations. This option allows to
-        manually override the automatic detection.";
-    };
-
-  };
-
-  startupScript = pkgs.writeScript "owncloud_startup.sh" ''
-
-    if [ ! -d ${config.dataDir}/config ]; then
-      mkdir -p ${config.dataDir}/config
-      cp ${owncloudConfig} ${config.dataDir}/config/config.php
-      mkdir -p ${config.dataDir}/storage
-      mkdir -p ${config.dataDir}/apps
-      cp -r ${config.package}/apps/* ${config.dataDir}/apps/
-      chmod -R ug+rw ${config.dataDir}
-      chmod -R o-rwx ${config.dataDir}
-      chown -R wwwrun:wwwrun ${config.dataDir}
-
-      ${pkgs.sudo}/bin/sudo -u postgres ${setupDb}
-    fi
-
-    if [ -e ${config.package}/config/ca-bundle.crt ]; then
-      cp -f ${config.package}/config/ca-bundle.crt ${config.dataDir}/config/
-    fi
-
-    ${php}/bin/php ${config.package}/occ upgrade >> ${config.dataDir}/upgrade.log || true
-
-    chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true
-
-    QUERY="INSERT INTO groups (gid) values('admin');
-           INSERT INTO users (uid,password)
-             values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}');
-           INSERT INTO group_user (gid,uid)
-             values('admin','${config.adminUser}');"
-    ${pkgs.sudo}/bin/sudo -u postgres ${postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
-  '';
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 10781168ee4..ca5015ded3e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -156,7 +156,6 @@ in
   openssh = handleTest ./openssh.nix {};
   osquery = handleTest ./osquery.nix {};
   ostree = handleTest ./ostree.nix {};
-  owncloud = handleTest ./owncloud.nix {};
   pam-oath-login = handleTest ./pam-oath-login.nix {};
   peerflix = handleTest ./peerflix.nix {};
   pgjwt = handleTest ./pgjwt.nix {};
diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix
deleted file mode 100644
index c968569f200..00000000000
--- a/nixos/tests/owncloud.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-import ./make-test.nix ({ ... }:
-
-{
-  name = "owncloud";
-  nodes =
-    { web =
-        { ... }:
-        {
-          services.postgresql.enable = true;
-          services.httpd = {
-            enable = true;
-            logPerVirtualHost = true;
-            adminAddr = "example@example.com";
-            virtualHosts = [
-              {
-                hostName = "owncloud";
-                extraSubservices =
-                  [
-                    {
-                      serviceType   = "owncloud";
-                      adminPassword = "secret";
-                      dbPassword    = "secret";
-                    }
-                  ];
-              }
-            ];
-          };
-        };
-    };
-
-  testScript = ''
-    startAll;
-
-    $web->waitForUnit("postgresql");
-    $web->waitForUnit("httpd");
-
-    $web->succeed("curl -L 127.0.0.1:80");
-  '';
-})
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
deleted file mode 100644
index 14a4a2868f0..00000000000
--- a/pkgs/servers/owncloud/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, fetchurl }:
-let
-  common = { versiona, sha256 }: stdenv.mkDerivation (rec {
-
-    name= "owncloud-${version}";
-    version= versiona;
-
-    src = fetchurl {
-      url = "https://download.owncloud.org/community/${name}.tar.bz2";
-      inherit sha256;
-    };
-
-    installPhase =
-      ''
-        mkdir -p $out
-        find . -maxdepth 1 -execdir cp -r '{}' $out \;
-
-        substituteInPlace $out/lib/base.php \
-          --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \
-                    'self::$configDir = getenv("OC_CONFIG_PATH"); OC_Config::$object = new \OC\Config(self::$configDir);'
-      '';
-
-    meta = {
-      description = "An enterprise file sharing solution for online collaboration and storage";
-      homepage = https://owncloud.org;
-      maintainers = with stdenv.lib.maintainers; [ matejc ];
-      license = stdenv.lib.licenses.agpl3Plus;
-      platforms = with stdenv.lib.platforms; unix;
-    };
-
-  });
-
-in {
-
-  owncloud70 = common {
-    versiona = "7.0.15";
-    sha256 = "1b2a0fccxlkqyyzsymx7qw8qbhsks3i6h1ybvxv8nn8hgw33nqv7";
-  };
-
-  owncloud80 = common {
-    versiona = "8.0.16";
-    sha256 = "1pgfawrmx6n02h7h6g5wk0sa1kgablqa8ljfiywyw8znxxa5lnrm";
-  };
-
-  owncloud81 = common {
-    versiona = "8.1.11";
-    sha256 = "04izfzj3ckcs0x882kkggp6y7zcrhdihm71wkd9vk6j5fn8k9am0";
-  };
-
-  owncloud82 = common {
-    versiona = "8.2.9";
-    sha256 = "09gzpxd9gjg8h57m8j0r6xnr85fdb951ykwmjby811c6730769pw";
-  };
-
-  owncloud90 = common {
-    versiona = "9.0.7";
-    sha256 = "1j6xrd4dhc0v0maa3z8n392nfc9hrnvbxxyqr8g8kz88w9vbqa6h";
-  };
-
-  owncloud91 = common {
-    versiona = "9.1.3";
-    sha256 = "1sgnsj2ng14lh05n5kc3jv03xk6xnkyx7xj1rasxlqgvzwsyp8g0";
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 092fefd429e..df5e40734b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4665,16 +4665,6 @@ in
 
   overmind = callPackage ../applications/misc/overmind { };
 
-  owncloud = owncloud70;
-
-  inherit (callPackages ../servers/owncloud { })
-    owncloud70
-    owncloud80
-    owncloud81
-    owncloud82
-    owncloud90
-    owncloud91;
-
   owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };
 
   oxidized = callPackage ../tools/admin/oxidized { };

From e04f56e8ccc222870b511311f274a3c89dc6f134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:50:39 -0800
Subject: [PATCH 2120/2793] checkstyle: 8.14 -> 8.15

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 6da3d067c3a..4149fb4233d 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.14";
+  version = "8.15";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "11lpyjh0rbz8821q0gcrll5ichf8hrmlfy66ary5jjiyxc85z762";
+    sha256 = "0zl064vx5gc6kglpw9lvd43v5zsdykr1whzy61bhijbbgnsrh9vb";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2ac6aa8a060fde416fbbaa941c1110b1b01bb550 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:19:44 -0800
Subject: [PATCH 2121/2793] baresip: 0.5.11 -> 0.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/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 db8eea64587..fd3bda35fd4 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.11";
+  version = "0.6.0";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1pv2fllg5z6q524k7dyqwm41kaj6bh2xjqg98p6v25n31v3gvy04";
+    sha256 = "0r073nv2hmkc00s0paa538by160mh511nidmxqzghkcyb4lx6gdb";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123

From 1c0ea01d8e9d86b3904ee3896b0dec1a0816babf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:25:54 -0800
Subject: [PATCH 2122/2793] hedgewars: 0.9.24.1 -> 0.9.25 (#52290)

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

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 2852c6869af..745b430a95e 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -10,11 +10,11 @@ let
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.24.1";
+  version = "0.9.25";
   name = "hedgewars-${version}";
   src = fetchurl {
     url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
-    sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1";
+    sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7840cb30f8b1b8e93c9512665e22d09e8c610dd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:01:47 -0800
Subject: [PATCH 2123/2793] aircrack-ng: 1.4 -> 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/aircrack-ng/versions
---
 pkgs/tools/networking/aircrack-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index a0c44b0341c..8bb092f122b 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -3,11 +3,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.4";
+  name = "aircrack-ng-1.5.2";
 
   src = fetchurl {
     url = "https://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "0fz1g6sd7dkfgcxrfrnqbygpx8d4ziyidm9wjb0ws9xgyy52l2cn";
+    sha256 = "0hc2x17bxk2n00z8jj5jfwq3z41681fd19n018724il0cpkjyncy";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];

From 70acb0d2d919ebe56668bf97da1f38ee6136d232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 19:11:52 -0800
Subject: [PATCH 2124/2793] google-drive-ocamlfuse: 0.7.0 -> 0.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/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 abf67a3b0ac..47270cbcba8 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.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";
     rev = "v${version}";
-    sha256 = "14r2y5blvid0640ixd0b4agpcfgkan5j9qdv3g0cn2q6ik39lfyl";
+    sha256 = "0sjjlfndz8s78fl7vb8alz3nsksjrm4hbnnj11xa0i6k16v6pv1y";
   };
 
   nativeBuildInputs = [ dune ];

From 67536060acd88b69ab1c1f851fba116e4702b54a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:44:09 -0800
Subject: [PATCH 2125/2793] calc: 2.12.7.1 -> 2.12.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/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 efa2b55499a..24cddfb9a1c 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.7.1";
+  version = "2.12.7.2";
 
   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 = "0k58vv8m26kq74b8p784d749mzir0pi6g48hch1f6680d3fwa7gb";
+    sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp";
   };
 
   patchPhase = ''

From 04fad1f36509e3e7fa5db52c87d3ff4d4817c0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 10:57:27 +0100
Subject: [PATCH 2126/2793] spidermonkey_60: 60.3.0 -> 60.4.0

- build with `--enable-optimize`
- remove unused nspr dependency
- cleanup a static library (saves ~20mb)
---
 .../interpreters/spidermonkey/60.nix          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index de65006be95..1dfaf9a2286 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip
+, which, readline, zlib, icu }:
 
 let
-  version = "60.3.0";
+  version = "60.4.0";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0qak5gmkx8xm88xgnxdmj4z7sivbbvmg2v029fp9q5ms38cg6rjm";
+    sha256 = "11gzxd82grc3kg1ha4yni6ag6b97n46qycvv6x15s91ziia5hli0";
   };
 
-  buildInputs = [ readline icu zlib nspr ];
+  buildInputs = [ readline zlib icu ];
   nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
 
   patches = [
@@ -31,8 +32,6 @@ in stdenv.mkDerivation rec {
     configureScript=../js/src/configure
   '';
 
-  # We need the flags specified here for gjs:
-  # https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/bc8829439a4f1019d0c56a293ddd84e936fdf9f9/org.gnome.Sdk.json.in#L744
   configureFlags = [
     "--with-system-zlib"
     "--with-system-icu"
@@ -41,9 +40,18 @@ in stdenv.mkDerivation rec {
     "--enable-shared-js"
     "--enable-posix-nspr-emulation"
     "--disable-jemalloc"
+    # Fedora and Arch disable optimize, but it doesn't seme to be necessary
+    # It turns on -O3 which some gcc version had a problem with:
+    # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
+    "--enable-optimize"
     "--enable-release"
   ];
 
+  # Remove unnecessary static lib
+  preFixup = ''
+    rm $out/lib/libjs_static.ajs
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 17af7d3182028cf8c33bb88d3c8fd7fb2299a357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 12:48:08 +0100
Subject: [PATCH 2127/2793] gnome3.gnome-shell-extensions: note tests need
 spidermonkey_52

Also move spidermonkey_52 to checkInputs as it's not a runtime dependency.
---
 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 92430125f7f..ff4263f74e3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
   ];
 
   doCheck = true;
+  # 52 is required for tests
+  # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25
+  checkInputs = [ spidermonkey_52 ];
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
-  buildInputs = [ spidermonkey_52 ];
 
   mesonFlags = [ "-Dextension_set=all" ];
 

From 77d593e2dab28cf43219cb2212978d6b25629831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 12:59:08 +0100
Subject: [PATCH 2128/2793] spidermonkey: set default to spidermonkey_38

52 and 60 doesn't include `bin/js` only `bin/js52` etc. Some derivations
depending on spidermonkey require `js` to a be a command (at least `jsawk`).
---
 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 df5e40734b6..6d88ff07330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8103,7 +8103,7 @@ in
   }));
   spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
   spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
-  spidermonkey = spidermonkey_31;
+  spidermonkey = spidermonkey_38;
 
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
 

From b63df3f2e066a3e1d1f6438a3375298151ca00fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 12:42:05 +0100
Subject: [PATCH 2129/2793] spidermonkey_{17,31}: remove

No longer in use.
---
 .../interpreters/spidermonkey/17.nix          | 88 -------------------
 .../interpreters/spidermonkey/31.nix          | 64 --------------
 pkgs/top-level/all-packages.nix               |  5 --
 3 files changed, 157 deletions(-)
 delete mode 100644 pkgs/development/interpreters/spidermonkey/17.nix
 delete mode 100644 pkgs/development/interpreters/spidermonkey/31.nix

diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix
deleted file mode 100644
index e2eef0fab69..00000000000
--- a/pkgs/development/interpreters/spidermonkey/17.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi
-, enableReadline ? (!stdenv.isDarwin), readline
-, libobjc }:
-
-stdenv.mkDerivation rec {
-  version = "17.0.0";
-  name = "spidermonkey-${version}";
-
-  src = fetchurl {
-    url = "mirror://mozilla/js/mozjs${version}.tar.gz";
-    sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
-  };
-
-  outputs = [ "out" "dev" "lib" ];
-
-  propagatedBuildInputs = [ nspr ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl python2 zip libffi readline ]
-             ++ stdenv.lib.optional enableReadline readline
-             ++ stdenv.lib.optional stdenv.isDarwin libobjc;
-
-  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
-  patches = [
-    (fetchurl {
-      name = "jsoptparse-gcc7.patch";
-      url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/"
-          + "mozjs17.0.0-gcc7.patch?id=43b846629a299f";
-      sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9";
-    })
-  ];
-  patchFlags = "-p3";
-
-  postPatch = ''
-    # Fixes an issue with version detection under perl 5.22.x
-    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
-  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
-    patch -p1 -d ../.. < ${./aarch64-double-conversion.patch}
-    patch -p1 -d ../.. < ${./aarch64-48bit-va-fix.patch}
-  '';
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    export LIBXUL_DIST=$out
-  '';
-
-  setOutputFlags = false;
-  configureFlags = [
-    "--libdir=$(lib)/lib"
-    "--includedir=$(dev)/include"
-    "--enable-threadsafe"
-    "--with-system-nspr"
-    "--with-system-ffi"
-    (if enableReadline then "--enable-readline" else "--disable-readline")
-  ];
-
-  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
-  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-  preCheck = ''
-    rm jit-test/tests/sunspider/check-date-format-tofte.js    # https://bugzil.la/600522
-
-    # Test broken on ARM. Fedora disables it.
-    # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html
-    echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls
-
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    paxmark m shell/js17
-    paxmark mr jsapi-tests/jsapi-tests
-  '';
-
-  postInstall = ''
-    rm "$lib"/lib/*.a # halve the output size
-    moveToOutput "bin/js*-config" "$dev" # break the cycle
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
-    # TODO: MPL/GPL/LGPL tri-license.
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix
deleted file mode 100644
index e64ab1b39a7..00000000000
--- a/pkgs/development/interpreters/spidermonkey/31.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }:
-
-stdenv.mkDerivation rec {
-  version = "31.5.0";
-  name = "spidermonkey-${version}";
-
-  # the release notes point to some guys home directory, see
-  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/31
-  # probably it would be more ideal to pull a particular tag/revision
-  # from the mercurial repo
-  src = fetchurl {
-    url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2";
-    sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
-  };
-
-  buildInputs = [ libffi readline nspr icu ];
-  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
-  preConfigure = ''
-    export CXXFLAGS="-fpermissive"
-    export LIBXUL_DIST=$out
-  '';
-
-  configureFlags = [
-    "--enable-threadsafe"
-    "--with-system-ffi"
-    "--with-system-nspr"
-    "--with-system-icu"
-    "--enable-readline"
-
-    # enabling these because they're wanted by 0ad. They may or may
-    # not be good defaults for other uses.
-    "--enable-gcgenerational"
-    "--enable-shared-js"
-
-    # Due to a build-system bug, this means the exact opposite of what it says.
-    # It is required by gcgenerational.
-    "--disable-exact-rooting"
-  ];
-
-  # This addresses some build system bug. It's quite likely to be safe
-  # to re-enable parallel builds if the source revision changes.
-  enableParallelBuilding = false;
-
-  postFixup = ''
-    # The headers are symlinks to a directory that doesn't get put
-    # into $out, so they end up broken. Fix that by just resolving the
-    # symlinks.
-    for i in $(find $out -type l); do
-      cp --remove-destination "$(readlink "$i")" "$i";
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
-    # TODO: MPL/GPL/LGPL tri-license.
-
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d88ff07330..f8cc825d6eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8091,11 +8091,6 @@ in
   spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
-  spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix {
-    inherit (darwin) libobjc;
-    stdenv = gccStdenv;
-  };
-  spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
     inherit (darwin) libobjc;
   } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {

From 0fb5e2f6f2afeb8d2e243a3e3ac877b659909fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 13 Dec 2018 18:09:11 +0100
Subject: [PATCH 2130/2793] spidermonkey_38: 38.2.1.rc0 -> 38.8.0

Update to the last version of 38
---
 pkgs/development/interpreters/spidermonkey/38.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 133679495a5..d48cf841b04 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -2,16 +2,12 @@
 , libobjc }:
 
 stdenv.mkDerivation rec {
-  version = "38.2.1.rc0";
+  version = "38.8.0";
   name = "spidermonkey-${version}";
 
-  # the release notes point to some guys home directory, see
-  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
-  # probably it would be more ideal to pull a particular tag/revision
-  # from the mercurial repo
   src = fetchurl {
-    url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-${version}.tar.bz2";
-    sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
+    url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
+    sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl";
   };
 
   buildInputs = [ libffi readline icu zlib nspr ]

From db250b9f84df291bd8565cfa77e3b1ce4eb87268 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:06:04 -0800
Subject: [PATCH 2131/2793] conky: 1.10.8 -> 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/conky/versions
---
 pkgs/os-specific/linux/conky/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index eb4e6a16e38..34a3e0a1287 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -66,13 +66,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.10.8";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "18kxjmaplqvn81vmvybvpc9qczm7wgcgd4af3a8vsqdv77cn5bwq";
+    sha256 = "164xa6s90zakkvwivl296z6v7w8xchgxap7ib6yx4g1bxa0143mi";
   };
 
   postPatch = ''

From 155e78514fdeaa9ca37e8ccd6055b31fef7014ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:19:23 -0800
Subject: [PATCH 2132/2793] duo-unix: 1.11.0 -> 1.11.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/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 6394eec1b63..88c570eb75e 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.11.0";
+  version = "1.11.1";
 
   src = fetchurl {
     url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "1i3dx7nim7xwlrjzcs9aqfyp87fangxqvhhpr16vpqklkz2zwmw4";
+    sha256 = "1krpk6ngl9vmvax8qax2iqcjdkvgdq5bxs079qy6c33ql40ra96i";
   };
 
   buildInputs = [ pam openssl zlib ];

From 4e6049bf8e3078a6af35e3b6f0907c59837f1839 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 08:17:13 -0800
Subject: [PATCH 2133/2793] arb: 2.15.1 -> 2.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/arb/versions
---
 pkgs/development/libraries/arb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index f94e0a3ee78..4c34e40586f 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -2,12 +2,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "arb";
-  version = "2.15.1";
+  version = "2.16.0";
   src = fetchFromGitHub {
     owner = "fredrik-johansson";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am";
+    sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd";
   };
   buildInputs = [mpir gmp mpfr flint];
   configureFlags = [

From 6788f036ee1749d40c0471545faa41fd8e3f8cf2 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 16 Dec 2018 13:36:56 +0100
Subject: [PATCH 2134/2793] sequeler: 0.6.4 -> 0.6.5

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.5
---
 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 51d6e5c2f7e..670e2be4716 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  version = "0.6.4";
+  version = "0.6.5";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "1np7554535vwkjlk5kq4fpighfw92l4j35pfn1b2mgnh7xd6zhaj";
+    sha256 = "18d0dwrsn69fx1lwm6ihhk2r4996pxiy4hfv608gc1kl4s4f4sqp";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];

From 6bbe1da8100cdfc9cb0c1a86484ad4dc464e3024 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 08:23:17 -0800
Subject: [PATCH 2135/2793] awslogs: 0.10 -> 0.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/awslogs/versions
---
 pkgs/tools/admin/awslogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix
index c4dbb39cdd8..d2b6a5dca9f 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/pkgs/tools/admin/awslogs/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "awslogs";
-  version = "0.10";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "jorgebastida";
     repo = "awslogs";
     rev = "${version}";
-    sha256 = "18s3xxdhhbz96mgj9ipgyrdcax3p9gy8gpmr0rblw8g0grj31dsp";
+    sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc";
   };
 
   doCheck = false;

From 92f9d5b7e514766a6d6ad21509fb4e136040c22b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:36:56 -0800
Subject: [PATCH 2136/2793] ddcutil: 0.9.2 -> 0.9.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/ddcutil/versions
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index ec2a2e4b7dd..ca006339d02 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.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "0mpd3j570yyfm9ki5in9i92nzg25ahmdfp2f7yby7xnqiy53zd8w";
+    sha256 = "02jl0mr5m3h839j3drrkdycnvlhji4xdmnjcqfglds0ir1q1yapi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From ae22d3dc85404d8341b9bc5af965827ceb39ddbe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:21:35 -0800
Subject: [PATCH 2137/2793] cubicle: 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/cubicle/versions
---
 pkgs/applications/science/logic/cubicle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index c7108d74906..91eaaeeb0e4 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cubicle-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
   src = fetchurl {
     url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
-    sha256 = "1sny9c4fm14k014pk62ibpwbrjjirkx8xmhs9jg7q1hk7y7x3q2h";
+    sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q";
   };
 
   postPatch = ''

From dc0cb47b5ed135cdd539d8bbec68e3a2ec9d4eb5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:10:31 -0800
Subject: [PATCH 2138/2793] drumkv1: 0.9.3 -> 0.9.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/drumkv1/versions
---
 pkgs/applications/audio/drumkv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 2348696dc86..fd5cc4a416e 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0a38vpyyppjdwifidrhgj4bnsx4jjx413657s59j0r4q8rg55jca";
+    sha256 = "02j10khl3wd17z0wfs3crr55wv7h9f0qhhg90xg0kvrxvw83vzy9";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

From c5c2924e92ea333510c39ea13f4a52d2b2e0d286 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:01:42 -0800
Subject: [PATCH 2139/2793] duperemove: 0.11 -> 0.11.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/duperemove/versions
---
 pkgs/tools/filesystems/duperemove/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 4e71d910a5d..56795332a96 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "duperemove-${version}";
-  version = "0.11";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
     rev = "v${version}";
-    sha256 = "09bwpsvnppl9bm2l5pym5673x04ah3hddb0xip61gdq8ws3ri5yj";
+    sha256 = "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3f4dbf5b41a5c0092e0a2ca8102f13894dba9c69 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:45:57 -0800
Subject: [PATCH 2140/2793] clamav: 0.100.2 -> 0.101.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/clamav/versions
---
 pkgs/tools/security/clamav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 5ab46a1d5e1..650ad6ff78d 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.100.2";
+  version = "0.101.0";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
-    sha256 = "1mkd41sxbjkfjinpx5b9kb85q529gj2s3d0klysssqhysh64ybja";
+    sha256 = "1ljs799xkd9ljj833rkwp961iaysqx4hrlyjrbkbvq64dgc5lapi";
   };
 
   # don't install sample config files into the absolute sysconfdir folder

From bc487da204802615249c4c9e84ddd83c2117559d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 16 Dec 2018 17:54:13 +0100
Subject: [PATCH 2141/2793] notmuch: use python 3

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 69de3ef5d51..46e32978f98 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gnupg
 , xapian, gmime, talloc, zlib
 , doxygen, perl
-, pythonPackages
+, python3Packages
 , bash-completion
 , emacs
 , ruby
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     gnupg # undefined dependencies
     xapian gmime talloc zlib  # dependencies described in INSTALL
     doxygen perl  # (optional) api docs
-    pythonPackages.sphinx pythonPackages.python  # (optional) documentation -> doc/INSTALL
+    python3Packages.sphinx python3Packages.python  # (optional) documentation -> doc/INSTALL
     bash-completion  # (optional) dependency to install bash completion
     emacs  # (optional) to byte compile emacs code, also needed for tests
     ruby  # (optional) ruby bindings

From c51a1b89c20a0125132271a05476b78fa5e72ab0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 08:59:25 -0800
Subject: [PATCH 2142/2793] cadvisor: 0.31.0 -> 0.32.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 dd56bc89c0d..ff0c926de59 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.31.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m";
+    sha256 = "1li2qgfi4lfa2i1m7ykjxy1xm9hlq42fgdkb2wh2db9chyg5r4qp";
   };
 
   nativeBuildInputs = [ go ];

From 18a5e4a5f619893cdb388e7dd958ff621f846735 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 16 Dec 2018 18:04:16 +0100
Subject: [PATCH 2143/2793] Revert "notmuch: use python 3"

This reverts commit bc487da204802615249c4c9e84ddd83c2117559d.

I messed up, branch was at a wrong ref..
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 46e32978f98..69de3ef5d51 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gnupg
 , xapian, gmime, talloc, zlib
 , doxygen, perl
-, python3Packages
+, pythonPackages
 , bash-completion
 , emacs
 , ruby
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     gnupg # undefined dependencies
     xapian gmime talloc zlib  # dependencies described in INSTALL
     doxygen perl  # (optional) api docs
-    python3Packages.sphinx python3Packages.python  # (optional) documentation -> doc/INSTALL
+    pythonPackages.sphinx pythonPackages.python  # (optional) documentation -> doc/INSTALL
     bash-completion  # (optional) dependency to install bash completion
     emacs  # (optional) to byte compile emacs code, also needed for tests
     ruby  # (optional) ruby bindings

From 51f9526460fd726018d835f3c7238a0521010381 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 09:22:15 -0800
Subject: [PATCH 2144/2793] ace: 6.5.2 -> 6.5.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/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 560ccb768b1..27997540c06 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.2";
+  version = "6.5.3";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh";
+    sha256 = "06lvy5ylcg4vsc58p1yqr5607n542a57n0whpchmrlab74bagmmi";
   };
 
   enableParallelBuilding = true;

From 4f73b718d1ae9a0b0ebfb41a5bbfef35ac756e5d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:07:16 -0800
Subject: [PATCH 2145/2793] ansible: 2.7.2 -> 2.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/python2.7-ansible/versions
---
 pkgs/tools/admin/ansible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 6ae089ac1d9..73d1929c703 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -63,8 +63,8 @@ in rec {
   };
 
   ansible_2_7 = generic {
-    version = "2.7.2";
-    sha256  = "1q0yxba57m18rfpc3syvj7vyqsb35081h6s33qr6h0jf3r9pj3d0";
+    version = "2.7.4";
+    sha256  = "0p1n6yyc632522fl2r247p0jg4mncc7z4hqngzbh1zxq3dcb12s9";
   };
 
   ansible2 = ansible_2_7;

From b6180444e701de6ff09289192c257e832138d0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Dec 2018 17:48:58 +0000
Subject: [PATCH 2146/2793] unclutter-xfixes: simplify build

---
 pkgs/tools/misc/unclutter-xfixes/default.nix | 36 ++++----------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix
index 31087dbf7eb..5e1661a6a29 100644
--- a/pkgs/tools/misc/unclutter-xfixes/default.nix
+++ b/pkgs/tools/misc/unclutter-xfixes/default.nix
@@ -2,12 +2,10 @@
   xlibsWrapper, libev, libXi, libXfixes,
   pkgconfig, asciidoc, libxslt, docbook_xsl }:
 
-let version = "1.4"; in
+stdenv.mkDerivation rec {
+  pname = "unclutter-xfixes";
+  version = "1.4";
 
-stdenv.mkDerivation {
-  name = "unclutter-xfixes-${version}";
-  version = version;
-  
   src = fetchFromGitHub {
     owner = "Airblader";
     repo = "unclutter-xfixes";
@@ -15,32 +13,12 @@ stdenv.mkDerivation {
     sha256 = "0anny6hvwf5nh7ghgi4gdcywhwyhgfvqvp7fjhm59kjc3qxnwf96";
   };
 
-  nativeBuildInputs = [pkgconfig];
-  buildInputs = [
-    xlibsWrapper libev libXi libXfixes
-    asciidoc libxslt docbook_xsl
-  ];
+  nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ];
+  buildInputs = [ xlibsWrapper libev libXi libXfixes ];
 
-  postPatch = ''
-    substituteInPlace Makefile --replace "CC = gcc" "CC = cc"
-  '';
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
-  preBuild = ''
-    # The Makefile calls git only to discover the package version,
-    # but that doesn't work right in the build environment,
-    # so we fake it.
-    git() { echo v${version}; }
-    export -f git
-  '';
-
-  preInstall = ''
-    export DESTDIR=$out MANDIR=/man/man1
-  '';
-  
-  postInstall = ''
-    mv $out/usr/bin $out/bin
-    mv $out/usr/share/man $out/man
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Rewrite of unclutter using the X11 Xfixes extension";

From ce709426ae6942544881a37ab6436fcfbfee869a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 09:52:13 -0800
Subject: [PATCH 2147/2793] backblaze-b2: 1.3.6 -> 1.3.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/backblaze-b2/versions
---
 pkgs/development/tools/backblaze-b2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 79041b05557..831ed1e97ac 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonApplication rec {
   pname = "backblaze-b2";
-  version = "1.3.6";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "Backblaze";
     repo = "B2_Command_Line_Tool";
     rev = "v${version}";
-    sha256 = "12axb0c56razfhrx1l62sjvdrbg6vz0yyqph2mxyjza1ywpb93b5";
+    sha256 = "1y4z4w6fj92rh9mrjsi0nmnzcmrj5jikarq2vs5qznvjdjm62igw";
   };
 
   propagatedBuildInputs = [ arrow futures logfury requests six tqdm ];

From 4c5738ee3ec6448c93bcdab82f8056b1644b7dc5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:53:42 -0800
Subject: [PATCH 2148/2793] acpica-tools: 20181031 -> 20181213

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 5bc8c7d945b..beb2e75b08b 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 = "20181031";
+  version = "20181213";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1zz1lfrl1rihs47a0cirdp32p53297kjm0l27b4kvibb5b7pa3h9";
+    sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From a477fefc43071c4e5c0212be83965f728d405438 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 05:46:47 -0800
Subject: [PATCH 2149/2793] deepin.deepin-menu: 3.4.0 -> 3.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/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 9ac61355c75..645abfedad7 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.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "15v2v7pg53csxmhmnkglxv5mj9cpn0ph8kv3hj44973sdwyrl51f";
+    sha256 = "0aga4d4qwd7av6aa4cynhk0sidns7m7y6x0rq1swnkpr9ksr80gi";
   };
 
   nativeBuildInputs = [

From c565746fdf10d58fc83fd4122072dedeaa365413 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sun, 16 Dec 2018 12:03:35 -0600
Subject: [PATCH 2150/2793] mpop: 1.2.6 -> 1.4.1 (#51692)

* mpop: 1.2.6 -> 1.4.0

Update homepage and license.

* mpop: 1.4.0 -> 1.4.1

https://marlam.de/mpop/news/mpop-1-4-1/

* mpop: don't use openssl per upstream's strong recommendation

https://github.com/NixOS/nixpkgs/pull/51692#pullrequestreview-182938501
---
 pkgs/applications/networking/mpop/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index 3d0d576bffb..912c23f107d 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -3,24 +3,23 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "1.4.1";
   name = "mpop-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mpop/${name}.tar.xz";
-    sha256 = "0p1ix63jh64dibrlccch8q7gxl9nn18wd2qpyr5z1h4gs2fpmv4z";
+    url = "https://marlam.de/mpop/releases/${name}.tar.xz";
+    sha256 = "1b9mj6yfa8vg5flxw1xb8xalifjg87dghbg523i6fbr7679zl9iy";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl gnutls gsasl libidn ]
+  buildInputs = [ gnutls gsasl libidn ]
     ++ optional stdenv.isDarwin Security;
 
-  configureFlags =
-    optional stdenv.isDarwin [ "--with-macosx-keyring" ];
+  configureFlags = optional stdenv.isDarwin [ "--with-macosx-keyring" ];
 
   meta = {
       description = "POP3 mail retrieval agent";
-      homepage = http://mpop.sourceforge.net/;
+      homepage = https://marlam.de/mpop;
       license = licenses.gpl3Plus;
       platforms = platforms.unix;
     };

From 6433f3b13b11c403065b86d43bb1d3ccceba6b71 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 16 Dec 2018 17:27:55 +0100
Subject: [PATCH 2151/2793] nixos/tests: add clamav test

---
 nixos/tests/all-tests.nix |  1 +
 nixos/tests/clamav.nix    | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 nixos/tests/clamav.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ca5015ded3e..ab1d32b911e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -39,6 +39,7 @@ in
   cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
   chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
   cjdns = handleTest ./cjdns.nix {};
+  clamav = handleTest ./clamav.nix {};
   cloud-init = handleTest ./cloud-init.nix {};
   codimd = handleTest ./codimd.nix {};
   containers-bridge = handleTest ./containers-bridge.nix {};
diff --git a/nixos/tests/clamav.nix b/nixos/tests/clamav.nix
new file mode 100644
index 00000000000..84a08bcc49f
--- /dev/null
+++ b/nixos/tests/clamav.nix
@@ -0,0 +1,37 @@
+import ./make-test.nix ({ pkgs, ... }: let
+
+  eicarTestFile = pkgs.fetchurl {
+    url = "http://2016.eicar.org/download/eicar.com.txt";
+    sha256 = "03zxa7vap2jkqjif4bzcjp33yrnip5yrz2bisia9wj5npwdh4ni7";
+  };
+
+  clamavMain = builtins.fetchurl "http://database.clamav.net/main.cvd";
+  clamavDaily = builtins.fetchurl "http://database.clamav.net/daily.cvd";
+  clamavBytecode = builtins.fetchurl "http://database.clamav.net/bytecode.cvd";
+
+in {
+  name = "clamav";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ fpletz ];
+  };
+
+  nodes.machine = { ... }: {
+    virtualisation.memorySize = 1024;
+
+    services.clamav.daemon.enable = true;
+    systemd.services.clamav-daemon.preStart = ''
+      mkdir -p /var/lib/clamav
+      ln -sf ${clamavMain} /var/lib/clamav/main.cvd
+      ln -sf ${clamavDaily} /var/lib/clamav/daily.cvd
+      ln -sf ${clamavBytecode} /var/lib/clamav/bytecode.cvd
+    '';
+  };
+
+  testScript = ''
+    startAll;
+    $machine->waitForUnit("multi-user.target");
+    $machine->waitForUnit("clamav-daemon.service");
+    $machine->waitForFile("/run/clamav/clamd.ctl");
+    $machine->fail("clamdscan ${eicarTestFile}");
+  '';
+})

From 1942f3c8f85b98c60c72b716a66d13ccf88a9c25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 04:37:34 -0800
Subject: [PATCH 2152/2793] rspamd: 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/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 c5dfc4a90fd..fda7a1a80ef 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -14,13 +14,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "0al4d8h3ssxcx191d4crywz7dsp61lklc9m5z36a90a8w97v76bv";
+    sha256 = "1aikmscb3hywac4sf4xkl4kw0x3syzphfrmxhigz2jjqzxn8f50k";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From 5aca804758ce7f7b0605e05fa711fd00751561f7 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sun, 16 Dec 2018 12:06:23 -0600
Subject: [PATCH 2153/2793] msmtp: 1.6.8 -> 1.8.1 (#51693)

* msmtp: 1.6.8 -> 1.8.0

https://marlam.de/msmtp/news/msmtp-1-8-0/

Uses libidn2 now instead of libidn.

* msmtp: 1.8.0 -> 1.8.1

* msmtp: drop openssl per upstream recommendation

... and reviewer request :)

See:
https://github.com/NixOS/nixpkgs/pull/51693#pullrequestreview-182938553
---
 .../applications/networking/msmtp/default.nix | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 4e2f9e636d5..a9c828a3fb1 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig
-, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
+, netcat-gnu, gnutls, gsasl, libidn2, Security
 , withKeyring ? true, libsecret ? null
 , systemd ? null }:
 
@@ -10,26 +10,18 @@ let
 in stdenv.mkDerivation rec {
   pname = "msmtp";
   name = "${pname}-${version}";
-  version = "1.6.8";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
-    sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm";
+    sha256 = "1nm4vizrnrrnknc4mc8nr7grz9q76m1vraa0hsl5rfm34gnsg8ph";
   };
 
   patches = [
     ./paths.patch
-
-    # To support passwordeval commands that do not print a final
-    # newline.
-    (fetchpatch {
-      name = "passwordeval-without-nl.patch";
-      url = "https://gitlab.marlam.de/marlam/msmtp/commit/df22dccf9d1af06fcd09dfdd0d6a38e1372dd5e8.patch";
-      sha256 = "06gbhvzi46zqigmmsin2aard7b9v3ihx62hbz5ljmfbj9rfs1x5y";
-    })
   ];
 
-  buildInputs = [ openssl gnutls gsasl libidn ]
+  buildInputs = [ gnutls gsasl libidn2 ]
     ++ stdenv.lib.optional stdenv.isDarwin Security
     ++ stdenv.lib.optional withKeyring libsecret;
 
@@ -61,7 +53,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
     homepage = https://marlam.de/msmtp/;
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ garbas peterhoeg ];
     platforms = platforms.unix;
   };

From 7da09859a745a0f0ab3284eea8683015284b62db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 22:39:25 -0800
Subject: [PATCH 2154/2793] vim: 8.1.0535 -> 8.1.0578

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 09361d7f4e7..e0ac32c54ec 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.0535";
+  version = "8.1.0578";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "0kgh213ca2qfrwdqfimrnhlxidjbrg26icxw00rivjiv1blii7ck";
+    sha256 = "0sawqxp2737y6mga9da36qya47h0idnnaxblzpsx8clw002piyv2";
   };
 
   enableParallelBuilding = true;

From 8a1f8952aa9ea4d8902b07ab56ed95e161addc30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 10:29:39 -0800
Subject: [PATCH 2155/2793] armadillo: 9.200.4 -> 9.200.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/armadillo/versions
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 7685a0d9eb4..b789d89c66b 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "9.200.4";
+  version = "9.200.6";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h";
+    sha256 = "1gm8dysb29f3p96bzjgdb5r70dc6y5jq1avg18sdixz0hgnxqq14";
   };
 
   nativeBuildInputs = [ cmake ];

From a746ee878ed42a115b8708df16cbb4882510a4f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 16:43:57 -0800
Subject: [PATCH 2156/2793] jhead: 3.00 -> 3.02

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

diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index 7bdb3444a4c..ce1d26e062c 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jhead-${version}";
-  version = "3.00";
+  version = "3.02";
 
   src = fetchurl {
     url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
-    sha256 = "0pl9s9ssb2a9di82f3ypin2hd098ns8kzdsxw3i2y94f07d03k48";
+    sha256 = "0apdqxqzssnlgn3z9ykvd487dvnbfsgxw1vklr0b916c7my77jc5";
   };
 
   buildInputs = [ libjpeg ];

From 4175f62a43e5b236af86e42726c228c6358ea76e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 15:58:18 +0100
Subject: [PATCH 2157/2793] gitlab-ce: 11.5.1 -> 11.5.4

---
 pkgs/applications/version-management/gitlab/data.json  | 10 +++++-----
 .../version-management/gitlab/rubyEnv-ce/Gemfile.lock  |  2 +-
 .../version-management/gitlab/rubyEnv-ce/gemset.nix    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index b748e7c49bd..1734770cd10 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,12 +1,12 @@
 {
   "ce": {
-    "version": "11.5.1",
-    "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5",
-    "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb",
+    "version": "11.5.4",
+    "repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8",
+    "deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ce",
-    "rev": "v11.5.1",
+    "rev": "v11.5.4",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
       "GITLAB_PAGES_VERSION": "1.3.1",
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index db8cc34060e..50e3ddef1e1 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -596,7 +596,7 @@ GEM
       get_process_mem (~> 0.2)
       puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.11)
+    rack (1.6.10)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.4.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 64fbac6d437..9a3944d6fea 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -2250,10 +2250,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+      sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
       type = "gem";
     };
-    version = "1.6.11";
+    version = "1.6.10";
   };
   rack-accept = {
     dependencies = ["rack"];

From 1812014215677d1c89654f33a3dd5afdbfbad239 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 15:58:49 +0100
Subject: [PATCH 2158/2793] gitlab-ee: 11.5.1 -> 11.5.4

---
 pkgs/applications/version-management/gitlab/data.json  | 10 +++++-----
 .../version-management/gitlab/rubyEnv-ee/Gemfile.lock  |  2 +-
 .../version-management/gitlab/rubyEnv-ee/gemset.nix    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 1734770cd10..1f8f627f5ed 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -15,13 +15,13 @@
     }
   },
   "ee": {
-    "version": "11.5.1",
-    "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp",
-    "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb",
+    "version": "11.5.4",
+    "repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc",
+    "deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ee",
-    "rev": "v11.5.1-ee",
+    "rev": "v11.5.4-ee",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
       "GITLAB_PAGES_VERSION": "1.3.1",
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 7c52bc32632..42b6f0cbc48 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -625,7 +625,7 @@ GEM
       get_process_mem (~> 0.2)
       puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.11)
+    rack (1.6.10)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.4.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index a15dae06fc0..460698bbb44 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -2371,10 +2371,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+      sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
       type = "gem";
     };
-    version = "1.6.11";
+    version = "1.6.10";
   };
   rack-accept = {
     dependencies = ["rack"];

From a9eae44ee5a290b16ae84af5f6f976d308f83a9a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 16 Dec 2018 17:03:57 +0100
Subject: [PATCH 2159/2793] gitlab: run test with 4096 bits if on 64bit, else
 the the maximum for 32bit

---
 nixos/tests/gitlab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index f401fe098dc..16e0dd723ec 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
 
   nodes = {
     gitlab = { ... }: {
-      virtualisation.memorySize = 2047;
+      virtualisation.memorySize = if pkgs.stdenv.is64bit then 4096 else 2047;
       systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
       systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
       systemd.services.gitaly.serviceConfig.Restart = mkForce "no";

From f47d3a0e608dd92894850fd79a35396cb73be2bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 01:11:09 -0800
Subject: [PATCH 2160/2793] stress-ng: 0.09.46 -> 0.09.49

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

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 57f2d60ddf5..557f2b7092e 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
-  version = "0.09.46";
+  version = "0.09.49";
 
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz";
-    sha256 = "0m1f46vqixx2mgqdrjwkl8w9did7n99sy96rbcgkkn9g99y59qjm";
+    sha256 = "1ll2i7vgnwpfhvq963m2aqwffkrmjggnscpmwn8qbdh0a82lmq2x";
   };
 
   # All platforms inputs then Linux-only ones

From 5b997fb126e7e9513ad7cc2ab1a43f06dd3ea442 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sun, 16 Dec 2018 19:11:16 +0100
Subject: [PATCH 2161/2793] stress-ng: use https for fetching and homepage

---
 pkgs/tools/system/stress-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 557f2b7092e..0c5a088daf9 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.09.49";
 
   src = fetchurl {
-    url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz";
+    url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz";
     sha256 = "1ll2i7vgnwpfhvq963m2aqwffkrmjggnscpmwn8qbdh0a82lmq2x";
   };
 
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
       hardware issues such as thermal overruns as well as operating system
       bugs that only occur when a system is being thrashed hard.
     '';
-    homepage = http://kernel.ubuntu.com/~cking/stress-ng/;
-    downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
+    homepage = https://kernel.ubuntu.com/~cking/stress-ng/;
+    downloadPage = https://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ c0bw3b ];
     platforms = platforms.linux; # TODO: fix https://github.com/NixOS/nixpkgs/pull/50506#issuecomment-439635963

From 1c2328751c36aa97dd95560c62e30b86d9585bd8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 06:18:36 -0800
Subject: [PATCH 2162/2793] deepin.dtkwidget: 2.0.9.9 -> 2.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/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 16125efff8e..b61f31e40ee 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkwidget";
-  version = "2.0.9.9";
+  version = "2.0.9.10";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb";
+    sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw";
   };
 
   nativeBuildInputs = [

From f6bcf08516333231d98b8932b1807e3e2a61e6ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:07:46 -0800
Subject: [PATCH 2163/2793] lxcfs: 3.0.2 -> 3.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/lxcfs/versions
---
 pkgs/os-specific/linux/lxcfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 5760db290a9..a32f99600cd 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -3,13 +3,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-3.0.2";
+  name = "lxcfs-3.0.3";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = name;
-    sha256 = "0llfvml9ww8gxa4g2a7b1gnxf9g5473pq1inrhvi4xkjx76x602k";
+    sha256 = "0imn031qpi1qfr1qw0ggpgcg8y6v0ykdr3m7f2czkiz3l7qqx2in";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];

From 51deb8951d8910e2706a3c48d9765fc8d410d5f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 07:41:10 -0800
Subject: [PATCH 2164/2793] kubectx: 0.6.1 -> 0.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/kubectx/versions
---
 pkgs/development/tools/kubectx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index e70cf409197..c2eaa28a2d9 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubectx";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg";
+    sha256 = "0kmzj8nmjzjfl5jgdnlizn3wmgp980xs6m9pvpplafjshx9k159c";
   };
 
   buildInputs = [ makeWrapper ];

From 0134db94d9e5623125d6e049c9c3da3c63e154e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 11:14:28 -0800
Subject: [PATCH 2165/2793] AgdaStdlib: 0.16.1 -> 0.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/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 12d35e27020..276e1531acd 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.1";
+  version = "0.17";
   name = "agda-stdlib-${version}";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n";
+    sha256 = "05c5zgj9fcaqz7z2l70jh48b3g4811vm7bccj0vd9r82wi02g3p1";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];

From 34a24d914e69405b371529a3f3317ed146848567 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 11:20:14 -0800
Subject: [PATCH 2166/2793] cfr: 0_134 -> 0.137

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

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 25f6a62fcb3..9534201d095 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0_134";
+  version = "0.137";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "185z1d03rgisn4p8qjilhlikdjb27xgh6vxkrlgmcm9c7kpms320";
+    sha256 = "1z704b31riyr3kv9cb2vqhd5gcha849g5k4zbvsh4yr9cdx226rz";
   };
 
   buildInputs = [ makeWrapper ];

From 5bc4f028ee38dd19b18220762af3dc464d619b94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 04:12:01 -0800
Subject: [PATCH 2167/2793] dqlite: 0.2.4 -> 0.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/dqlite/versions
---
 pkgs/development/libraries/dqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 8cc7a0bba62..edb8c968aae 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "dqlite-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "CanonicalLtd";
     repo = "dqlite";
     rev = "v${version}";
-    sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd";
+    sha256 = "0pv7nf4siijlcy5asrl8j1ib3viifk65yzqzckarm2mcl16y7fc3";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From f584316c12748fa905a0be9153de3eb24aef54f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:55:18 -0800
Subject: [PATCH 2168/2793] copyq: 3.7.0 -> 3.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/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 e05e140048b..fa5a9b46667 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.7.0";
+  version = "3.7.1";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "1dm02l1ry7ndn283774nzmg89wy1933f4iyf6n02p152zgx4llyf";
+    sha256 = "0b3lrhrffvq46n9xc0lzbxhhn1lzmq2lrijjdwizc52458d6h90y";
   };
 
   nativeBuildInputs = [ cmake ];

From 712c720985f506cecaf23ce75fc0590a917373b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 00:07:56 -0800
Subject: [PATCH 2169/2793] gcab: 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/gcab/versions
---
 pkgs/development/libraries/gcab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index 0b5f1002c23..2b9b59e7baf 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gcab-${version}";
-  version = "1.1";
+  version = "1.2";
 
   LC_ALL = "en_US.UTF-8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz";
-    sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr";
+    sha256 = "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas";
   };
 
   nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobject-introspection ];

From c9163c26a7638b1b83617d943cad49c614a72a20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 01:26:41 -0800
Subject: [PATCH 2170/2793] dnscrypt-wrapper: 0.4.1 -> 0.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/dnscrypt-wrapper/versions
---
 pkgs/tools/networking/dnscrypt-wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 7ed1dbf3220..a43900ea4a5 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "Cofyc";
     repo = "dnscrypt-wrapper";
     rev = "v${version}";
-    sha256 = "187sq99zxdfv3xhq939rybb0pps3l6wgyyvbj3zns5jr6mms64vd";
+    sha256 = "055vxpcfg80b1456p6p0p236pwykknph9x3c9psg8ya3i8qqywkl";
   };
 
   enableParallelBuilding = true;

From 3c53b3542a99fa23d227d46ff595a065db21728c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:19:10 -0800
Subject: [PATCH 2171/2793] closurecompiler: 20181008 -> 20181125

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 7f666cac68e..b3ef4853c85 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20181008";
+  version = "20181125";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1zh6q7fgwjk2p4bivvpcwgn1657jc557zrgibwpyvbwm87mb57wv";
+    sha256 = "1vg7cyya0r2sjrbcwf4pshg7jzgvb9ynpa0b41zkl4x1y0a16bkc";
   };
 
   sourceRoot = ".";

From aeff26bad44cc102e546633c1c3fde8fcc704d4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 10:33:38 -0800
Subject: [PATCH 2172/2793] btrbk: 0.27.0 -> 0.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/btrbk/versions
---
 pkgs/tools/backup/btrbk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 6ff43a94af9..9c749bd7bdd 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.27.0";
+  version = "0.27.1";
 
   src = fetchurl {
     url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "0nsqpmfymh9df32fy8qg6bhimd65yxdjpany97s1n08qb110zh2y";
+    sha256 = "040f6qzv188yd38n11zdiin3gaavrlld36xf1ks4hxhq921bh0jc";
   };
 
   nativeBuildInputs = [ asciidoc makeWrapper ];

From 4b00dfe1698345627df4a9b5478c7ca93c13eed6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 09:54:37 -0800
Subject: [PATCH 2173/2793] bwidget: 1.9.12 -> 1.9.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/bwidget/versions
---
 pkgs/development/libraries/bwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 99168fbe9e3..1e2bda285a7 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bwidget-${version}";
-  version = "1.9.12";
+  version = "1.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
-    sha256 = "0qrj8k4zzrnhwgdn5dpa6j0q5j739myhwn60ssnqrzq77sljss1g";
+    sha256 = "109s81hzd86vwzs18v4s03asn3l395wl64kd311045p7h0ig9n3n";
   };
 
   dontBuild = true;

From 42a3276e9ac19c1659e106127cac9ab38824a572 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 12:15:55 -0800
Subject: [PATCH 2174/2793] flyway: 5.2.1 -> 5.2.4

* flyway: 5.2.1 -> 5.2.4 (#52325)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flyway/versions

* flyway: makeWrapper is a build-time input

moved it from buildInputs to nativeBuildInputs
---
 pkgs/development/tools/flyway/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 7386dc0eeeb..4ad04ae0e43 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "5.2.1";
+    version = "5.2.4";
   in
     stdenv.mkDerivation {
       name = "flyway-${version}";
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "0lm536qc8pqj4s21dd47gi99nwwflk17gqzfwaflghw3fnhn7i1s";
+        sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc";
       };
-      buildInputs = [ makeWrapper ];
+      nativeBuildInputs = [ makeWrapper ];
       dontBuild = true;
       dontStrip = true;
       installPhase = ''

From 4e994f3fc213bd7bdeaaf992ebcd0292e8abda05 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 16 Dec 2018 22:37:46 +0100
Subject: [PATCH 2175/2793] osmium-tool: 1.9.1 -> 1.10.0

---
 pkgs/applications/misc/osmium-tool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 36e58cf5070..2b35cb77038 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osmium-tool-${version}";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "osmium-tool";
     rev = "v${version}";
-    sha256 = "1cwabjbrdpqbi2gl7448sgniiwwa73avi9l6pnvh4r0jia2wi5wk";
+    sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20";
   };
 
   nativeBuildInputs = [ cmake ];

From 97200e970c066f9d08ad5d6980166f6cc2d641e7 Mon Sep 17 00:00:00 2001
From: Matthew Harm Bekkema <mbekkema97@gmail.com>
Date: Mon, 17 Dec 2018 09:36:30 +1100
Subject: [PATCH 2176/2793] gem-config: add ruby-libvirt

Based on 1d9798c8591bbbed6e6b9ca5c1811ff507b88b9a and
90a804c50af327077e7a219a425e8536bb097e39
---
 pkgs/development/ruby-modules/gem-config/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 9a2aaa91ad8..6b4bfdef849 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -23,7 +23,7 @@
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
-, libselinux ? null, libsepol ? null
+, libselinux ? null, libsepol ? null, libvirt
 }@args:
 
 let
@@ -321,6 +321,14 @@ in
     buildInputs = [ imagemagick which ];
   };
 
+  ruby-libvirt = attrs: {
+    buildInputs = [ libvirt pkgconfig ];
+    buildFlags = [
+      "--with-libvirt-include=${libvirt}/include"
+      "--with-libvirt-lib=${libvirt}/lib"
+    ];
+  };
+
   ruby-lxc = attrs: {
     buildInputs = [ lxc ];
   };

From 1183ee645df7fb0a8e3b9411201c62ba6033675b Mon Sep 17 00:00:00 2001
From: Matthew Harm Bekkema <mbekkema97@gmail.com>
Date: Mon, 17 Dec 2018 10:07:35 +1100
Subject: [PATCH 2177/2793] vagrant: Add vagrant-libvirt to the gemset

With this, you can "install" the plugin just by adding the following to
~/vagrant.d/plugins.json:

  {
    "version":"1",
    "installed": {
      "vagrant-libvirt": {
        "ruby_version":"2.5.3",
        "vagrant_version":"2.2.0",
        "gem_version":"",
        "require":"",
        "sources":[]
      }
    }
  }
---
 .../tools/vagrant/gemset_libvirt.nix          | 113 ++++++++++++++++--
 1 file changed, 106 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix
index aeaf42341a8..2631833dc00 100644
--- a/pkgs/development/tools/vagrant/gemset_libvirt.nix
+++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix
@@ -1,19 +1,118 @@
 {
-  mini_portile2 = {
+  excon = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
+      type = "gem";
+    };
+    version = "0.62.0";
+  };
+  fog-core = {
+    dependencies = ["builder" "excon" "formatador"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6";
+      type = "gem";
+    };
+    version = "1.43.0";
+  };
+  fog-json = {
+    dependencies = ["fog-core" "multi_json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  fog-libvirt = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  fog-xml = {
+    dependencies = ["fog-core" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  formatador = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
       type = "gem";
     };
     version = "2.3.0";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
-      source = {
-        remotes = ["https://rubygems.org"];
-        sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
-        type = "gem";
-      };
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+      type = "gem";
+    };
     version = "1.8.5";
   };
+  ruby-libvirt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  vagrant-libvirt = {
+    dependencies = ["fog-core" "fog-libvirt" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym";
+      type = "gem";
+    };
+    version = "0.0.45";
+  };
 }

From b3beeab0149a548196e489a00232a12bc1dab91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 17 Dec 2018 00:31:45 +0100
Subject: [PATCH 2178/2793] python.pkgs.cmdtest: use pname

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

diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
index 73c05c01aed..0d0bc368295 100644
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ b/pkgs/development/python-modules/cmdtest/default.nix
@@ -9,7 +9,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "cmdtest-${version}";
+  pname = "cmdtest";
   version = "0.32";
   disabled = isPy3k || isPyPy;
 

From b961de9c4b7d4c2e88721fba920aae96f2baf5c4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 17 Dec 2018 00:50:34 +0100
Subject: [PATCH 2179/2793] gitAndTools.lab: fix name

---
 .../version-management/git-and-tools/lab/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index fdda6ff4e88..f2d1f1d8556 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hub-${version}";
+  name = "lab-${version}";
   version = "0.14.0";
 
   goPackagePath = "github.com/zaquestion/lab";

From 5b9aa055225c0e0a169f5ebf3c96b71b89c4961e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 17:32:41 -0800
Subject: [PATCH 2180/2793] prosody: 0.10.2 -> 0.11.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/prosody/versions
---
 pkgs/servers/xmpp/prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index ed6fef05a26..228c074bf7e 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -25,12 +25,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.10.2";
+  version = "0.11.1";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "https://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm";
+    sha256 = "1ak5bkx09kscyifxhzybgp5a73jr8nki6xi05c59wwlq0wzw9gli";
   };
 
   communityModules = fetchhg {

From 5a93f6149abb404e053f3759e64e93f20de312da Mon Sep 17 00:00:00 2001
From: Satoshi Shishiku <satoshi.shishiku@tuta.io>
Date: Thu, 26 Apr 2018 09:12:36 +0000
Subject: [PATCH 2181/2793] prosody service: set cafile

Fix s2s_secure_auth.
---
 nixos/modules/services/networking/prosody.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index a37ef98caec..25b7d6dbeba 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -228,6 +228,7 @@ let
 
   createSSLOptsStr = o: ''
     ssl = {
+      cafile = "/etc/ssl/certs/ca-bundle.crt";
       key = "${o.key}";
       certificate = "${o.cert}";
       ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}

From c32752fb129ab40699a83ab1ef2828a269c28dd0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 16 Dec 2018 19:07:48 -0500
Subject: [PATCH 2182/2793] gopass: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 88b15ebf43f..2242a9c109e 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.8.2";
+  version = "1.8.3";
   name = "gopass-${version}";
 
   goPackagePath = "github.com/gopasspw/gopass";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "gopasspw";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f";
+    sha256 = "1m4dmydgbpyrqv0blbrw66f2340c6hbz2wg22mpybf0zvd5i9ba6";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([

From 3ab361cb57b1c37a46b568e97d2e5025a1361c0c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 01:19:42 +0100
Subject: [PATCH 2183/2793] hwloc-nox: remove, x11 now disabled by default

---
 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 f8cc825d6eb..787e223bdfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10297,10 +10297,6 @@ in
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  hwloc-nox = hwloc.override {
-    x11Support = false;
-  };
-
   hydra = callPackage ../development/tools/misc/hydra { };
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
@@ -18135,7 +18131,6 @@ in
 
   xmr-stak = callPackage ../applications/misc/xmr-stak {
     stdenvGcc6 = overrideCC stdenv gcc6;
-    hwloc = hwloc-nox;
   };
 
   xmrig = callPackage ../applications/misc/xmrig { };

From 9be286ecb7aea4751a8a853e7a561176c2f7c60f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 00:19:40 -0800
Subject: [PATCH 2184/2793] fwup: 1.2.6 -> 1.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/fwup/versions
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 160ea2faab6..4a95563b2ec 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "1rbpa0dcm9w1anz2bhcpmj2b678807s8j43zzkbkwh71aymfwr14";
+    sha256 = "0r48l5jcb4pxb72ykigmaissm4ikadi7f6lkfma4jnd037w15bnl";
   };
 
   doCheck = true;

From 03fddb139eff8d83ad279c073029872ecf4cede4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 16 Dec 2018 19:37:12 -0500
Subject: [PATCH 2185/2793] libvncserver: add CVE-2018-7225 patch

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

diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index b325c9b246c..0a7819743e0 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl,
+{stdenv, fetchurl, fetchpatch,
  libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
  systemd
 }:
@@ -18,6 +18,13 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  patches = [
+    # CVE-2018-7225. Remove with the next release
+    (fetchpatch {
+      url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch;
+      sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3";
+    })
+  ];
   preConfigure = ''
     sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
   '';

From 8bb236c4d51536b8c28464ca300b30a6e870a2d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:54:06 -0800
Subject: [PATCH 2186/2793] libwebsockets: 3.0.1 -> 3.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/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 8c0db4a7396..023e08c336b 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.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
     rev = "v${version}";
-    sha256 = "1x3qrz2hqsrv2lg0y9irdx37c8r9j9vf9mwzgw61znzvk6hc9ymq";
+    sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
   };
 
   buildInputs = [ cmake openssl zlib libuv ];

From b439f9032b17bae5af2c368b54f7f499ac06608d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 06:08:53 -0800
Subject: [PATCH 2187/2793] libdap: 3.20.0 -> 3.20.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/libdap/versions
---
 pkgs/development/libraries/libdap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index d399998455e..c0ec9d927a8 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.20.0";
+  version = "3.20.2";
   name = "libdap-${version}";
 
   nativeBuildInputs = [ bison flex ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.opendap.org/pub/source/${name}.tar.gz";
-    sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92";
+    sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0";
   };
 
   meta = with stdenv.lib; {

From 44482c54ff9212808a541dee028e7328494f53b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 20:35:02 -0800
Subject: [PATCH 2188/2793] haproxy: 1.8.14 -> 1.8.15

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 381489cc436..785c22ff4f8 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.14";
+  version = "1.8.15";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
-    sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi";
+    sha256 = "0cm008i7cz4gq0j7wxmpyzvwfcrmmck5ix34is5xxms624pqc4vi";
   };
 
   buildInputs = [ openssl zlib ]

From 7c42da3a1e48ce74b79ec72f734cc624965427bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 16 Dec 2018 16:03:37 +0100
Subject: [PATCH 2189/2793] eccodes: 2.9.2 -> 2.10.0

Python3 is now officially supported as "beta", see relase notes at:
https://confluence.ecmwf.int/display/ECC/ecCodes+version+2.10.0+released
---
 pkgs/development/libraries/eccodes/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix             | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 57a55cfc39b..c26956f6ea2 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.9.2";
+  version = "2.10.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08";
+    sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4bb2c0ed0f..adafdb40e4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1613,11 +1613,10 @@ in {
 
   easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
 
-  eccodes = disabledIf (!isPy27)
-    (toPythonModule (pkgs.eccodes.override {
-      enablePython = true;
-      pythonPackages = self;
-    }));
+  eccodes = toPythonModule (pkgs.eccodes.override {
+    enablePython = true;
+    pythonPackages = self;
+  });
 
   EditorConfig = callPackage ../development/python-modules/editorconfig { };
 

From f554d4e40f80ca7a969e0607bd3e8d66e5c78e61 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 15 Dec 2018 22:52:25 -0500
Subject: [PATCH 2190/2793] raspberrypifw: 1.20180919 -> 1.20181112

---
 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 db1091e349d..8965e5d60d7 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.20180919";
+  version = "1.20181112";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4";
+    sha256 = "0jjxr8k8vdziynj8101ikcc9hmm61r2la51nrx6zv8a7j9a4m5zg";
   };
 
   installPhase = ''

From 6d7e94aa1e5c436aeaba1e56ff4c7e3a266c69aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 18:42:24 -0800
Subject: [PATCH 2191/2793] graphicsmagick: 1.3.30 -> 1.3.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/graphicsmagick/versions
---
 pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index ee58e9831e9..c93b4fe958d 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "graphicsmagick-${version}";
-  version = "1.3.30";
+  version = "1.3.31";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr";
+    sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9";
   };
 
   patches = [

From 374a672424f9407ac5c3f66578e42b7fa8775c34 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sun, 16 Dec 2018 00:18:39 +0100
Subject: [PATCH 2192/2793] firmware-linux-nonfree: 20181017 -> 20181213

---
 .../linux/firmware/firmware-linux-nonfree/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 43747aeaf0d..57135bf515b 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-10-17";
+  version = "2018-12-13";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "de9cefa74bba6fce3834144460868a468b8818f2";
-    sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk";
+    rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15";
+    sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw";
   };
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf";
+  outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b";
 
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";

From 2cbaaa55d53584be24a1a3c6e543d64599530b18 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 22:01:59 -0800
Subject: [PATCH 2193/2793] fswatch: 1.13.0 -> 1.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/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 0e8e0116a8b..0e4af134890 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.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
+    sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From cb6c9af457236013061ddc4b73691acd977396b2 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 16 Dec 2018 22:09:03 -0500
Subject: [PATCH 2194/2793] linux_testing: 4.20-rc6 -> 4.20-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 81945290bf6..1e810a12931 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.20-rc6";
-  modDirVersion = "4.20.0-rc6";
+  version = "4.20-rc7";
+  modDirVersion = "4.20.0-rc7";
   extraMeta.branch = "4.20";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1hmcwlf3lcim4z265pqz6v4na6072xcqzrnq57wacznmg31m7y0c";
+    sha256 = "0qga2x4rz1vphi7j044f4b4la24qyk5sm7lm8q991imq5wm5s2rl";
   };
 
   # Should the testing kernels ever be built on Hydra?

From f2b1f51a3242209cbfcf916dfe4aa8ac8ef2aa53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 22:38:27 -0800
Subject: [PATCH 2195/2793] opendht: 1.7.4 -> 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/opendht/versions
---
 pkgs/development/libraries/opendht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 49d70bc211a..17e2c9098a1 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "opendht-${version}";
-  version = "1.7.4";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "${version}";
-    sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp";
+    sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl";
   };
 
   nativeBuildInputs =

From f640a811986cabf503e663fb97681b45416579fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:42:32 -0800
Subject: [PATCH 2196/2793] libiio: 0.15 -> 0.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/libiio/versions
---
 pkgs/development/libraries/libiio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index 51cdc289d62..31225730442 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "libiio-${version}";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner  = "analogdevicesinc";
     repo   = "libiio";
     rev    = "refs/tags/v${version}";
-    sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
+    sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h";
   };
 
   outputs = [ "out" "lib" "dev" "python" ];

From 9e36eee829273f7a7a11a198ad03a345be6ec24a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 17 Dec 2018 04:41:16 +0000
Subject: [PATCH 2197/2793] libopenaptx: init at 0.1.0

---
 .../libraries/libopenaptx/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/libopenaptx/default.nix

diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix
new file mode 100644
index 00000000000..a29f8dc4a80
--- /dev/null
+++ b/pkgs/development/libraries/libopenaptx/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libopenaptx-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "pali";
+    repo = "libopenaptx";
+    rev = version;
+    sha256 = "0996qmkmbax7ccknxrd3bx8xibs79a1ffms69scsj59f3kgj6854";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Audio Processing Technology codec (aptX)";
+    license = licenses.lgpl21Plus;
+    homepage = https://github.com/pali/libopenaptx;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08523ba099f..2b3ce642bb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11207,6 +11207,8 @@ in
 
   liboop = callPackage ../development/libraries/liboop { };
 
+  libopenaptx = callPackage ../development/libraries/libopenaptx { };
+
   libopus = callPackage ../development/libraries/libopus { };
 
   libopusenc = callPackage ../development/libraries/libopusenc { };

From 28d85b274dbcd7267bda3e3cfb32b8f9e9ec6440 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 15 Dec 2018 23:47:09 -0600
Subject: [PATCH 2198/2793] boost169: init (at 1.69)

---
 pkgs/development/libraries/boost/1.69.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.69.nix

diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix
new file mode 100644
index 00000000000..798db8dd46e
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.69.nix
@@ -0,0 +1,11 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.69_0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_69_0.html
+    sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08523ba099f..0dfd9df6973 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9369,6 +9369,7 @@ in
   boost166 = callPackage ../development/libraries/boost/1.66.nix { };
   boost167 = callPackage ../development/libraries/boost/1.67.nix { };
   boost168 = callPackage ../development/libraries/boost/1.68.nix { };
+  boost169 = callPackage ../development/libraries/boost/1.69.nix { };
   boost16x = boost167;
   boost = boost16x;
 

From ea1db27e22a8f4b2fd3248ea5b3a58075d7c346a Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Mon, 17 Dec 2018 06:24:55 +0000
Subject: [PATCH 2199/2793] ut2004demo: fix download URL

http://treefort.icculus.org/ut2004/UT2004-LNX-Demo3334.run.gz is gone.
---
 pkgs/games/ut2004/demo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index 9aea992ac75..7039ff44a09 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   version = "3334";
 
   src = fetchurl {
-    url = "http://treefort.icculus.org/ut2004/UT2004-LNX-Demo${version}.run.gz";
+    url = "http://vlaai.snt.utwente.nl/pub/games/UT2004/demo/UT2004-LNX-Demo${version}.run.gz";
     sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7";
   };
 

From 9314c6a5633b703776c379f5c3ba36557b02d51f Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Mon, 17 Dec 2018 05:55:44 +0000
Subject: [PATCH 2200/2793] firejail: disable parallel building

firejail was frequently failing to build on my Hydra machine at -j16, and
the error looked like a typical parallel build problem:

<3>make[1]: Entering directory '/build/firejail-0.9.56/src/fcopy'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"'   -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"'  -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME  -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk   -c main.c -o main.o
<3>gcc  -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fcopy main.o
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fcopy'
<3>make -C src/fldd
<3>make[1]: Entering directory '/build/firejail-0.9.56/src/fldd'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"'   -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"'  -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME  -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk   -c main.c -o main.o
<3>gcc  -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fldd main.o ../lib/ldd_utils.o
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fldd'
<3>make -C src/libpostexecseccomp
<3>make[1]: Entering directory '/build/firejail-0.9.56/src/libpostexecseccomp'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security  -c libpostexecseccomp.c -o libpostexecseccomp.o
<3>gcc -pie -Wl,-z,relro -Wl,-z,now -shared -fPIC -z relro -o libpostexecseccomp.so libpostexecseccomp.o -ldl
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/libpostexecseccomp'
<3>src/fseccomp/fseccomp default seccomp
<3>src/fsec-optimize/fsec-optimize seccomp
<3>/nix/store/6abyjgibafsbhlc7v7lab50mb3dj81jg-bash-4.4-p23/bin/bash: src/fsec-optimize/fsec-optimize: No such file or directory
<3>make: *** [Makefile:43: filters] Error 127
<3>builder for '/nix/store/30srqmpqrjyr11nhx4jbpr84m9pnmyv5-firejail-0.9.56.drv' failed with exit code 2
---
 pkgs/os-specific/linux/firejail/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 0e982d54a9e..672ee823fe8 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation {
     sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile
   '';
 
-  enableParallelBuilding = true;
+  # At high parallelism, the build sometimes fails with:
+  # bash: src/fsec-optimize/fsec-optimize: No such file or directory
+  enableParallelBuilding = false;
 
   meta = {
     inherit (s) version;

From c761524f30b4ad35b95f0ca32c7c9fe360d32216 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 15 Dec 2018 18:06:43 -0600
Subject: [PATCH 2201/2793] efibootmgr: grab upstream commit as patch to fix
 w/efivar 37

(removes workaround for previous versions)
---
 pkgs/tools/system/efibootmgr/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index f23345fb71d..638b018fd41 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, efivar, popt }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }:
 
 stdenv.mkDerivation rec {
   name = "efibootmgr-${version}";
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "remove-extra-decl.patch";
+      url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch";
+      sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h";
+    })
+  ];
+
   makeFlags = [ "EFIDIR=nixos" ];
 
   installFlags = [ "prefix=$(out)" ];

From bf6678be01f71f7f92a58484c0325ae515f296c5 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Mon, 17 Dec 2018 13:40:43 +0300
Subject: [PATCH 2202/2793] parity-beta: 2.2.4 -> 2.2.5

---
 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 389bd820cc5..46985fd065e 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.2.4";
-  sha256      = "12qcfmc56vnay25nlflgwhm3iwlr7hd286wzzanlsalizaj5s5ja";
-  cargoSha256 = "11cwzqd459ld0apl2wnarfc4nb6j9j0dh26y3smvr0zsxvaz1r53";
+  version     = "2.2.5";
+  sha256      = "0q9vgwc0jlja73r4na7yil624iagq1607ac47wh8a7xgfjmjjai1";
+  cargoSha256 = "0ibdmyh1jvfq51vhwn4riyhilqwhf71hjd4vyj525smn95p75b14";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }

From bd8ee164c009bd4deff5fd11a4be54a9bfac53aa Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Mon, 17 Dec 2018 13:41:08 +0300
Subject: [PATCH 2203/2793] parity: 2.1.9 -> 2.1.10

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

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 2ce8c3e0520..81923849094 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.1.9";
-  sha256      = "1xxpv2cxfcjwxfxkn2732y1wxh9rpiwmlb2ij09cg5nph669hy0v";
-  cargoSha256 = "1v44l90bacw8d3ilnmrc49dxdpyckh7iamylkpa1pc0rrpiv5vy4";
+  version     = "2.1.10";
+  sha256      = "1l4yl8i24q8v4hzljzai37f587x8m3cz3byzifhvq3bjky7p8h80";
+  cargoSha256 = "04pni9cmz8nhlqznwafz9d81006808kh24aqnb8rjdcr84d11zis";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }

From 08488bcf946ed7bfa004d0c6fb128c3622493beb Mon Sep 17 00:00:00 2001
From: Matthew Harm Bekkema <mbekkema97@gmail.com>
Date: Mon, 17 Dec 2018 10:51:30 +1100
Subject: [PATCH 2204/2793] vagrant: Support system-installed plugins

Patch taken from Debian
---
 ...004-Support-system-installed-plugins.patch | 97 +++++++++++++++++++
 pkgs/development/tools/vagrant/default.nix    |  9 ++
 2 files changed, 106 insertions(+)
 create mode 100644 pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch

diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
new file mode 100644
index 00000000000..f87ff5135b3
--- /dev/null
+++ b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
@@ -0,0 +1,97 @@
+From: Antonio Terceiro <terceiro@debian.org>
+Date: Wed, 27 May 2015 09:36:17 -0300
+Subject: Support system-installed plugins
+Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch
+
+Plugins must be installed as regular Ruby libraries, and they must
+contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the
+following content:
+
+{
+  "${PLUGINNAME}": {
+    "ruby_version":"$(ruby -e 'puts RUBY_VERSION')",
+    "vagrant_version":"$(cat /usr/share/vagrant/version.txt)",
+    "gem_version":"",
+    "require":"",
+    "sources":[]
+  }
+}
+---
+ lib/vagrant/plugin/manager.rb    |  4 ++--
+ lib/vagrant/plugin/state_file.rb | 22 +++++++++++++++++++++-
+ 2 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb
+index 567347d..d9d76a0 100644
+--- a/lib/vagrant/plugin/manager.rb
++++ b/lib/vagrant/plugin/manager.rb
+@@ -18,7 +18,7 @@ module Vagrant
+ 
+       # Returns the path to the [StateFile] for system plugins.
+       def self.system_plugins_file
+-        dir = Vagrant.installer_embedded_dir
++        dir = '@system_plugin_dir@'
+         return nil if !dir
+         Pathname.new(dir).join("plugins.json")
+       end
+@@ -38,7 +38,7 @@ module Vagrant
+ 
+         system_path  = self.class.system_plugins_file
+         @system_file = nil
+-        @system_file = StateFile.new(system_path) if system_path && system_path.file?
++        @system_file = StateFile.new(system_path, true) if system_path && system_path.file?
+ 
+         @local_file = nil
+         @globalized = @localized = false
+diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb
+index c6872d4..935d431 100644
+--- a/lib/vagrant/plugin/state_file.rb
++++ b/lib/vagrant/plugin/state_file.rb
+@@ -11,8 +11,9 @@ module Vagrant
+       # @return [Pathname] path to file
+       attr_reader :path
+ 
+-      def initialize(path)
++      def initialize(path, system = false)
+         @path = path
++        @system = system
+ 
+         @data = {}
+         if @path.exist?
+@@ -28,6 +29,21 @@ module Vagrant
+ 
+         @data["version"] ||= "1"
+         @data["installed"] ||= {}
++        load_extra_plugins
++      end
++
++      def load_extra_plugins
++        extra_plugins = Dir.glob(@path.dirname.join('plugins.d', '*.json'))
++        extra_plugins.each do |filename|
++          json = File.read(filename)
++          begin
++            plugin_data = JSON.parse(json)
++            @data["installed"].merge!(plugin_data)
++          rescue JSON::ParserError => e
++            raise Vagrant::Errors::PluginStateFileParseError,
++              path: filename, message: e.message
++          end
++        end
+       end
+ 
+       # Add a plugin that is installed to the state file.
+@@ -107,6 +123,14 @@ module Vagrant
+           f.close
+           FileUtils.mv(f.path, @path)
+         end
++      rescue Errno::EACCES
++        # Ignore permission denied against system-installed plugins; regular
++        # users are not supposed to write there.
++        raise unless @system
++      rescue Errno::EROFS
++        # Ignore read-only filesystem against system-installed plugins; regular
++        # users are not supposed to write there.
++        raise unless @system
+       end
+ 
+       protected
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 74992560f3f..cdfdb9077a3 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -40,8 +40,14 @@ in buildRubyGem rec {
   patches = [
     ./unofficial-installation-nowarn.patch
     ./use-system-bundler-version.patch
+    ./0004-Support-system-installed-plugins.patch
   ];
 
+  postPatch = ''
+    substituteInPlace lib/vagrant/plugin/manager.rb --subst-var-by \
+      system_plugin_dir "$out/vagrant-plugins"
+  '';
+
   # PATH additions:
   #   - libarchive: Make `bsdtar` available for extracting downloaded boxes
   postInstall = ''
@@ -53,6 +59,9 @@ in buildRubyGem rec {
         --prefix PKG_CONFIG_PATH ':' \
           "${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}"
       ''}
+
+    mkdir -p "$out/vagrant-plugins/plugins.d"
+    echo '{}' > "$out/vagrant-plugins/plugins.json"
   '';
 
   installCheckPhase = ''

From 245ba973d9bbcf44deac8d6279ed2e2598ea4441 Mon Sep 17 00:00:00 2001
From: Matthew Harm Bekkema <mbekkema97@gmail.com>
Date: Mon, 17 Dec 2018 11:16:20 +1100
Subject: [PATCH 2205/2793] vagrant: Install vagrant-libvirt as system plugin

---
 pkgs/development/tools/vagrant/default.nix             | 5 +++++
 pkgs/development/tools/vagrant/vagrant-libvirt.json.in | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/tools/vagrant/vagrant-libvirt.json.in

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index cdfdb9077a3..84871f9bdef 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -62,6 +62,11 @@ in buildRubyGem rec {
 
     mkdir -p "$out/vagrant-plugins/plugins.d"
     echo '{}' > "$out/vagrant-plugins/plugins.json"
+  '' +
+  lib.optionalString withLibvirt ''
+    substitute ${./vagrant-libvirt.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \
+      --subst-var-by ruby_version ${ruby.version} \
+      --subst-var-by vagrant_version ${version}
   '';
 
   installCheckPhase = ''
diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
new file mode 100644
index 00000000000..22060e1c2db
--- /dev/null
+++ b/pkgs/development/tools/vagrant/vagrant-libvirt.json.in
@@ -0,0 +1,9 @@
+{
+  "vagrant-libvirt": {
+    "ruby_version":"@ruby_version@",
+    "vagrant_version":"@vagrant_version@",
+    "gem_version":"",
+    "require":"",
+    "sources":[]
+  }
+}

From c660f3d41964fb8da83d1938a58edf8801e0af0d Mon Sep 17 00:00:00 2001
From: Matthew Harm Bekkema <mbekkema97@gmail.com>
Date: Mon, 17 Dec 2018 14:13:24 +1100
Subject: [PATCH 2206/2793] vagrant: Remove unnecessary buildInputs

libvirt and pkgconfig are now buildInputs to ruby-libvirt instead.
---
 pkgs/development/tools/vagrant/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 84871f9bdef..f2e6b00c09b 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true, libvirt, pkgconfig }:
+{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}:
 
 let
   # NOTE: bumping the version and updating the hash is insufficient;
@@ -35,8 +35,6 @@ in buildRubyGem rec {
   dontBuild = false;
   src = fetchurl { inherit url sha256; };
 
-  buildInputs = lib.optional withLibvirt [ libvirt pkgconfig ];
-
   patches = [
     ./unofficial-installation-nowarn.patch
     ./use-system-bundler-version.patch
@@ -53,12 +51,7 @@ in buildRubyGem rec {
   postInstall = ''
     wrapProgram "$out/bin/vagrant" \
       --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
-      --prefix PATH ':' "${lib.getBin libarchive}/bin" \
-      ${lib.optionalString withLibvirt ''
-        --prefix PATH ':' "${pkgconfig}/bin" \
-        --prefix PKG_CONFIG_PATH ':' \
-          "${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}"
-      ''}
+      --prefix PATH ':' "${lib.getBin libarchive}/bin"
 
     mkdir -p "$out/vagrant-plugins/plugins.d"
     echo '{}' > "$out/vagrant-plugins/plugins.json"

From f106becb65d14a4207f107c9f58ce55db9a202f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:02:19 -0800
Subject: [PATCH 2207/2793] libsolv: 0.7.1 -> 0.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/libsolv/versions
---
 pkgs/development/libraries/libsolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 7d93b3f7d80..c2fa940d59a 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
-  version  = "0.7.1";
+  version  = "0.7.2";
   name = "libsolv-${version}";
 
   src = fetchFromGitHub {
     owner  = "openSUSE";
     repo   = "libsolv";
     rev    = version;
-    sha256 = "0ssiadh10d28gzmq9vpgvvwmkw5ccb5iglafzsx3pf33z1zp5a3b";
+    sha256 = "03zwf7zqz7ghd0bgs0wvlhnsd828z69kl28q2n6m4z57ai8zzqng";
   };
 
   cmakeFlags = [

From 65b679cd3cfbb175363d3692b54ad5ef2e72a6e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 06:16:46 -0800
Subject: [PATCH 2208/2793] libextractor: 1.7 -> 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/libextractor/versions
---
 pkgs/development/libraries/libextractor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index e3f3604f94e..b2d9af657a9 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.7";
+  name = "libextractor-1.8";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0";
+    sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2";
   };
 
   preConfigure =

From 78ccd6edc859429c2549207f6c723e3dd9aa4f23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 20:15:42 -0800
Subject: [PATCH 2209/2793] parallel: 20181022 -> 20181122

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 fec81b580f3..22a032a4a46 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-20181022";
+  name = "parallel-20181122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f";
+    sha256 = "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d8699a9a5b8f98c710bc5d4e78245e3007d82985 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Thu, 13 Dec 2018 20:05:54 +0000
Subject: [PATCH 2210/2793] libcxxabi: also install libc++abi.a

---
 pkgs/development/compilers/llvm/4/libc++abi.nix | 1 +
 pkgs/development/compilers/llvm/5/libc++abi.nix | 1 +
 pkgs/development/compilers/llvm/6/libc++abi.nix | 1 +
 pkgs/development/compilers/llvm/7/libc++abi.nix | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 5eeec395b97..735c5e9e743 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
     ''
     else ''
       install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $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
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 69970543674..227ecbeda19 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
     ''
     else ''
       install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $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
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 425b00c689e..df9c784a10f 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
     ''
     else ''
       install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $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
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 7dbda6c365e..04062b83f50 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
     ''
     else ''
       install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $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

From 1928f801a64b4c9e7a958a7bfb249dbdbb7ebfcd 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 2211/2793] tdesktop: 1.5.1 -> 1.5.2

tdesktopPackages.preview: 1.5.1 -> 1.5.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 7a9bef45b25..c74226e1e40 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.5.1";
-    sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar";
+    version = "1.5.2";
+    sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "415526";
     archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";

From ee9ba43a1cadb8b90681c1f1700daf0e47ed566a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Dec 2018 14:39:53 +0100
Subject: [PATCH 2212/2793] knot-resolver: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index ceefa542e6a..b4768f32bf1 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "8f3deba4695784a666cde317bc6af80ecf42ce1047b01f4b9c582fdc021c7492";
+    sha256 = "924f1aebad04cacbc4545571239914d2c42e9253784c0df0f391dfad97c59f42";
   };
 
   outputs = [ "out" "dev" ];

From 53c490a7eef249a17ff63d93be0095a71bc55a73 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 17 Dec 2018 09:18:30 -0500
Subject: [PATCH 2213/2793] linux: 4.9.145 -> 4.9.146

---
 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 97a730210d6..f1fa1baea37 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.145";
+  version = "4.9.146";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0pmwnnjk05xpw9qvzl59llf4ihjdicrm52ardkra41f3x0vwl0b9";
+    sha256 = "0ncf7yqavxqkkwdrapy72hb7rsj67fm1rvd2hdy12p88wf5ml6aq";
   };
 } // (args.argsOverride or {}))

From c5234d7dbd56ba9b922240b776724513535f61ca Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 17 Dec 2018 09:18:38 -0500
Subject: [PATCH 2214/2793] linux: 4.14.88 -> 4.14.89

---
 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 0f115476b5d..0e8215133ad 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.88";
+  version = "4.14.89";
 
   # 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 = "0bgm4vr1c4s4k8gyw8i92lxj82nl67jh55q0yg5bdsh8cz3viw5h";
+    sha256 = "098b38518va6hhv5114vkyhyr2xzx01wxwib4dm0vpfx8jn1cvnf";
   };
 } // (args.argsOverride or {}))

From 31ddf1f136ae25bb5008434b6c16577aef318bf3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 17 Dec 2018 09:18:45 -0500
Subject: [PATCH 2215/2793] linux: 4.19.9 -> 4.19.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 451af3f8c8d..4b33c121788 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.9";
+  version = "4.19.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 = "1wnvd4901ppzmx26fiav4glfkpb8qc7srcyk2m198wwwhb36q4gw";
+    sha256 = "151ync20fz8bmiw3826jznx8kd7fna85vygrfchsqgm9xk76isdg";
   };
 } // (args.argsOverride or {}))

From f7ec30328981a89e8c0a3facd1922a768f157aff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:31:12 -0800
Subject: [PATCH 2216/2793] ammonite: 1.4.2 -> 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/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 ab1f6c7706f..d80270f65b7 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.4.2";
+  version = "1.5.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "10m6nnvrwzkbyhiq77wlqgzvqfqmn16y4sp983dyihjljxalygax";
+    sha256 = "0ivfas9lfx3wsc2c4jxi1z54vn5f4cc4j1aqq53nxfl8sx2hbm3v";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 8e98e48a438b0f7b7fc87563910095468a232f17 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 17 Dec 2018 14:24:17 +0000
Subject: [PATCH 2217/2793] bundler: 1.17.1 -> 1.17.2

---
 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 d67c7bd7324..decde250ac2 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.17.1";
-  source.sha256 = "0jmj67r2677mq8hxkhvlgpbv8gzfgdhxra3x0gf0bywiyypl546c";
+  version = "1.17.2";
+  source.sha256 = "0dbnq6703mjvgsri45vaw7b4wjqr89z1h8xkzsacqcp24a706m5r";
   dontPatchShebangs = true;
 
   postFixup = ''

From 70b8ab6e7265561afa0f80a2f3cfb9c079579f2a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 17 Dec 2018 00:59:22 +0000
Subject: [PATCH 2218/2793] icu63: init at 63.1

---
 pkgs/development/libraries/icu/63.nix   | 14 ++++++++++++++
 pkgs/development/libraries/icu/base.nix |  4 ++--
 pkgs/top-level/all-packages.nix         |  5 +++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/icu/63.nix

diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix
new file mode 100644
index 00000000000..719318990c6
--- /dev/null
+++ b/pkgs/development/libraries/icu/63.nix
@@ -0,0 +1,14 @@
+{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }:
+
+import ./base.nix {
+  version = "63.1";
+  sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05";
+  patches = [
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
+    (fetchpatch {
+      url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch;
+      sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
+    })
+  ];
+  patchFlags = [ "-p3" ];
+} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; }
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 8ad58c5f90b..0a8cb7d4684 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -1,5 +1,5 @@
 { version, sha256, patches ? [], patchFlags ? "" }:
-{ stdenv, fetchurl, fixDarwinDylibNames
+{ stdenv, lib, fetchurl, fixDarwinDylibNames
   # Cross-compiled icu4c requires a build-root of a native compile
 , buildRootOnly ? false, nativeBuildRoot
 }:
@@ -20,7 +20,7 @@ let
     '';
 
     # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
-    postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")
+    postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1"
       then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
       else null; # won't find locale_t on darwin
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 787e223bdfd..398459415d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10321,6 +10321,11 @@ in
   } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
       stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
     }));
+  icu63 = callPackage ../development/libraries/icu/63.nix ({
+    nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; };
+  } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+      stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+    }));
 
   icu = icu59;
 

From 059920226802cc771fa1461286d6825fabc140dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Dec 2018 19:00:59 -0800
Subject: [PATCH 2219/2793] umockdev: 0.12 -> 0.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/umockdev/versions
---
 pkgs/development/libraries/umockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 0bf7fb59e32..b6f1136ea2b 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
-  version = "0.12";
+  version = "0.12.1";
 
   outputs = [ "bin" "out" "dev" "doc" ];
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "martinpitt";
     repo   = "umockdev";
     rev    = version;
-    sha256 = "1j7kkxpqs991w3qdlb779gzv38l1vpnlk3laabi2ndk83j1wl5k2";
+    sha256 = "0wnmz4jh04mvqzjnqvxrah969gg4x4v8d6ip61zc7jpbwnqb2fpg";
   };
 
   # autoreconfHook complains if we try to build the documentation

From 61bd0e851ede843b7f4cdc8fcc7d776f880ee5fb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 16:33:18 +0100
Subject: [PATCH 2220/2793] postgresql: branch 9.3 is not maintained anymore

See https://www.postgresql.org/support/versioning/.
---
 pkgs/servers/sql/postgresql/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 8c82385c1d8..2b56c32d635 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -106,6 +106,8 @@ let
       license     = licenses.postgresql;
       maintainers = with maintainers; [ ocharles thoughtpolice ];
       platforms   = platforms.unix;
+      knownVulnerabilities = optional (!atLeast "9.4")
+        "PostgreSQL versions older than 9.4 are not maintained anymore!";
     };
   });
 

From 4ae47a69de4af13c0d4325acc7d66a95f3397f6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 16:56:44 -0800
Subject: [PATCH 2221/2793] postgis: 2.5.0 -> 2.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/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 37cf29c8658..be7fc6f8c17 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -42,8 +42,8 @@
 
 
 let
-  version = "2.5.0";
-  sha256 = "1m9n1shhqhjrhbq6fd9fyfccxcgpng37s3lffhlmyrp98zbsnwxy";
+  version = "2.5.1";
+  sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv";
 in stdenv.mkDerivation rec {
   name = "postgis-${version}";
 

From cee81d59ac8c9ca834c97bd20b7529440040b5c6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 17 Dec 2018 08:32:50 -0600
Subject: [PATCH 2222/2793] libaom: create shared libraries, fix version
 reported in aom.pc

See added comment for explanation of version fix.
---
 pkgs/development/libraries/libaom/default.nix | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index a08a1e33523..77d75a8c1d3 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages }:
+{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages, writeText }:
 
 stdenv.mkDerivation rec {
   name = "libaom-${version}";
@@ -13,6 +13,32 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl yasm ];
   nativeBuildInputs = [ cmake pkgconfig python3Packages.python ];
 
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
+  # * libaom tries to detect what version it is
+  #   * I couldn't get it to grab this from git info,
+  #     (which needs at least leaveDotGit=true)
+  #   * it uses a perl script to parse from CHANGELOG,
+  #     but 1.0.0 doesn't contain an entry for itself :(
+  # * Upstream patch that adds the entry also nukes all of
+  #   the versions before a project change (open-sourcing?)
+  #   and as a result is 34K which is way too big just to fix this!
+  #   * A stable URL to fetch this from works, but...
+  # * Upon inspection the resulting CHANGELOG is shorter
+  #   than this comment, so while yes this is a bit gross
+  #   adding these 4 lines here does the job without
+  #   a huge patch in spirit of preferring upstream's fix
+  #   instead of `sed -i 's/v0\.1\.0/v1.0.0/g' aom.pc` or so.
+  postPatch = let actual_changelog = writeText "CHANGELOG" ''
+    2018-06-28 v1.0.0
+      AOMedia Codec Workgroup Approved version 1.0
+
+    2016-04-07 v0.1.0 "AOMedia Codec 1"
+      This release is the first Alliance for Open Media codec.
+  ''; in ''
+   cp ${actual_changelog} CHANGELOG
+  '';
+
   meta = with stdenv.lib; {
     description = "AV1 Bitstream and Decoding Library";
     homepage    = https://aomedia.org/av1-features/get-started/;

From 27e174c6789c97c903657d07c72b4fc02b1c164c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 00:04:46 -0800
Subject: [PATCH 2223/2793] mercurialFull: 4.8 -> 4.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/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 35d374866c8..d59b7241230 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.8";
+  version = "4.8.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 = "00rzjbf2blxkc0qwd9mdzx5fnzgpp4jxzijq6wgsjgmqscx40sy5";
+    sha256 = "08gsn0s5802bs8ks77xqg7c8dwpbsh8df47kvb1gn14ivrf5z928";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From 5256cb8353c120e7507aecb579ec60441fa9bfa9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 17 Dec 2018 17:15:28 +0100
Subject: [PATCH 2224/2793] love_11: fix hash

---
 pkgs/development/interpreters/love/11.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index 77cbd8a8245..7adaca7b865 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "rude";
     repo = "love";
     rev = "${version}";
-    sha256 = "0bp22mzkjy48gncj5vm9b7whzrggcbs5pd4cnb6k8jpl9j02dhdv";
+    sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f47b7d0213ecc19705f5971e63963622321917ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 17 Dec 2018 17:30:11 +0100
Subject: [PATCH 2225/2793] home-assistant: 0.84.2 -> 0.84.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 f79390442a6..b34355c88b6 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.84.2";
+  version = "0.84.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 e4a68fdfc69..68bb42f51fb 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -85,7 +85,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.84.2";
+  hassVersion = "0.84.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1w1p0w8bwajiz6dms5x1vdc9sxnxdrjflnxvflxg4kba0w1mxq9m";
+    sha256 = "0b7634niqqmcckhqb7vx1wimibfs4v042bwja7am90jy0hzafbji";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 006d242f841..0e1b327a264 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 = "20181211.0";
+  version = "20181211.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ebb5d96154590794e9df9b5b48ec0c122419762c7460c4e67c535b65b7a00487";
+    sha256 = "c3bb994e8e121d146fedc113b35ced0c007169fd70b489e9344df082f934dbdf";
   };
 
   propagatedBuildInputs = [ user-agents ];

From 3cca862a5f4ea8166d5b2968370cb49532e06ffc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 19:59:32 +0000
Subject: [PATCH 2226/2793] ocaml-ng.ocamlPackages_4_01_0.cstruct-lwt: fix
 evaluation

---
 pkgs/development/ocaml-modules/cstruct/lwt.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix
index fc621838966..5a10d7cae48 100644
--- a/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix
@@ -1,4 +1,8 @@
-{ buildDunePackage, cstruct, lwt }:
+{ lib, buildDunePackage, cstruct, lwt }:
+
+if !lib.versionAtLeast (cstruct.version or "1") "3"
+then cstruct
+else
 
 buildDunePackage {
 	pname = "cstruct-lwt";

From f41ac80d74d38321e60f8bc9efb431f498e5e31d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 19:59:40 +0000
Subject: [PATCH 2227/2793] ocaml-ng.ocamlPackages_4_01_0.cstruct-unix: fix
 evaluation

---
 pkgs/development/ocaml-modules/cstruct/unix.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix
index fb7612b5f05..604ad4fb083 100644
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/pkgs/development/ocaml-modules/cstruct/unix.nix
@@ -1,4 +1,8 @@
-{ buildDunePackage, cstruct }:
+{ lib, buildDunePackage, cstruct }:
+
+if !lib.versionAtLeast (cstruct.version or "1") "3"
+then cstruct
+else
 
 buildDunePackage {
 	pname = "cstruct-unix";

From 5e786dedc1b99f68542c0ec8824a87a8d544aaa5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 19:59:45 +0000
Subject: [PATCH 2228/2793] ocaml-ng.ocamlPackages_4_01_0.ppx_cstruct: fix
 evaluation

---
 pkgs/development/ocaml-modules/cstruct/ppx.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index 5f4130dc23f..78600b78306 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -1,4 +1,8 @@
-{ buildDunePackage, cstruct, ppx_tools_versioned }:
+{ lib, buildDunePackage, cstruct, ppx_tools_versioned }:
+
+if !lib.versionAtLeast (cstruct.version or "1") "3"
+then cstruct
+else
 
 buildDunePackage {
 	pname = "ppx_cstruct";

From b5f580fa2e146c9f326bd64938099a4b5c848a9c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 19:59:50 +0000
Subject: [PATCH 2229/2793] ocamlPackages.labltk: fix evaluation with OCaml <
 4.04

---
 pkgs/development/ocaml-modules/labltk/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 10555771fee..b4a4e012560 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl, ocaml, findlib, tcl, tk }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+then throw "labltk is not available for OCaml ${ocaml.version}"
+else
+
 let param = {
   "4.04" = {
     version = "8.06.2";

From 585b741cb72f34912b07a5234057dce47550b0eb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 19:59:56 +0000
Subject: [PATCH 2230/2793] ocaml: fix build when X11 is not available

---
 pkgs/development/compilers/ocaml/generic.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 1ed6d2c6db2..d1ee43c9152 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -24,11 +24,13 @@ let
    name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
 in
 
-stdenv.mkDerivation (args // rec {
-
+let
   x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
   x11lib = x11env + "/lib";
   x11inc = x11env + "/include";
+in
+
+stdenv.mkDerivation (args // rec {
 
   inherit name;
   inherit version;

From d9b1ae9eab8631292e647736fc98d8fd423b25fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Dec 2018 09:49:34 -0800
Subject: [PATCH 2231/2793] msitools: 0.97 -> 0.98

* msitools: 0.97 -> 0.98 (#52188)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/msitools/versions

* msitools: fetch from Gnome mirrors

+ misc cleanup
---
 pkgs/development/tools/misc/msitools/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix
index ebba56d56d3..4a5d87fb4f7 100644
--- a/pkgs/development/tools/misc/msitools/default.nix
+++ b/pkgs/development/tools/misc/msitools/default.nix
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}:
+{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.97";
+  version = "0.98";
   name = "msitools-${version}";
 
   src = fetchurl {
-    url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
-    sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs";
+    url = "mirror://gnome/sources/msitools/${version}/${name}.tar.xz";
+    sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [intltool glib libgsf libuuid gcab bzip2];
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ glib libgsf libuuid gcab bzip2 ];
 
   meta = with stdenv.lib; {
     description = "Set of programs to inspect and build Windows Installer (.MSI) files";
     homepage = https://wiki.gnome.org/msitools;
-    license = [licenses.gpl2 licenses.lgpl21];
+    license = [ licenses.gpl2 licenses.lgpl21 ];
     platforms = platforms.unix;
   };
 }

From 26f6c15a42e8015a5332925719f45c8992a2fc9c Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:13:35 +0300
Subject: [PATCH 2232/2793] fprintd: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index d0cf2f8091e..65eec89a09f 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fprintd-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://people.freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k";
+    url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
+    sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
   };
 
   buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/fprint/fprintd/;
+    homepage = https://fprint.freedesktop.org/;
     description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
     license = licenses.gpl2;
     platforms = platforms.linux;

From 024ad6c4d5899bbbd2841a7b41e9c2f81719badf Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 17 Dec 2018 21:04:26 +0300
Subject: [PATCH 2233/2793] libfprint: 0.7.0 -> 0.99.0

---
 .../libraries/libfprint/default.nix           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 8b384a51f01..3f3062e3c08 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
+, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 
 stdenv.mkDerivation rec {
-  name = "libfprint-0.7.0";
+  name = "libfprint-${version}";
+  version = "0.99.0";
 
   src = fetchurl {
-    url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz";
-    sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6";
+    url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
+    sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
   };
 
-  buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];
-  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libusb pixman glib nss gtk3 ];
+  nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
 
-  configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
+  mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
+
+  preConfigure = ''
+    substituteInPlace libfprint/meson.build \
+      --replace /bin/echo ${coreutils}/bin/echo
+  '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/;
+    homepage = https://fprint.freedesktop.org/;
     description = "A library designed to make it easy to add support for consumer fingerprint readers";
-    license = licenses.lgpl2;
+    license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };

From 18347fc05ca662c96c6fd85bd830d86da32981e0 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Tue, 11 Dec 2018 20:30:50 -0800
Subject: [PATCH 2234/2793] kubernetes: 1.12.3 -> 1.13.1

---
 .../networking/cluster/kubernetes/default.nix          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index bf42fb7da16..1a9df69fa59 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_10, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
 , components ? [
     "cmd/kubeadm"
     "cmd/kubectl"
@@ -15,16 +15,16 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.12.3";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
+    sha256 = "048ckirz7v1djari6l9ddkcd9i4yafcv57wk131dv0cs2zady9va";
   };
 
-  buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
+  buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
+    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
   '';
 
   meta = {

From 58db4c1a7e821d153ac0e1826a653498af83708d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 19:23:59 +0100
Subject: [PATCH 2235/2793] Revert "nixos/tests: add clamav test"

This reverts commit 6433f3b13b11c403065b86d43bb1d3ccceba6b71.

Fixes #52446.
---
 nixos/tests/all-tests.nix |  1 -
 nixos/tests/clamav.nix    | 37 -------------------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 nixos/tests/clamav.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ab1d32b911e..ca5015ded3e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -39,7 +39,6 @@ in
   cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
   chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
   cjdns = handleTest ./cjdns.nix {};
-  clamav = handleTest ./clamav.nix {};
   cloud-init = handleTest ./cloud-init.nix {};
   codimd = handleTest ./codimd.nix {};
   containers-bridge = handleTest ./containers-bridge.nix {};
diff --git a/nixos/tests/clamav.nix b/nixos/tests/clamav.nix
deleted file mode 100644
index 84a08bcc49f..00000000000
--- a/nixos/tests/clamav.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: let
-
-  eicarTestFile = pkgs.fetchurl {
-    url = "http://2016.eicar.org/download/eicar.com.txt";
-    sha256 = "03zxa7vap2jkqjif4bzcjp33yrnip5yrz2bisia9wj5npwdh4ni7";
-  };
-
-  clamavMain = builtins.fetchurl "http://database.clamav.net/main.cvd";
-  clamavDaily = builtins.fetchurl "http://database.clamav.net/daily.cvd";
-  clamavBytecode = builtins.fetchurl "http://database.clamav.net/bytecode.cvd";
-
-in {
-  name = "clamav";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ fpletz ];
-  };
-
-  nodes.machine = { ... }: {
-    virtualisation.memorySize = 1024;
-
-    services.clamav.daemon.enable = true;
-    systemd.services.clamav-daemon.preStart = ''
-      mkdir -p /var/lib/clamav
-      ln -sf ${clamavMain} /var/lib/clamav/main.cvd
-      ln -sf ${clamavDaily} /var/lib/clamav/daily.cvd
-      ln -sf ${clamavBytecode} /var/lib/clamav/bytecode.cvd
-    '';
-  };
-
-  testScript = ''
-    startAll;
-    $machine->waitForUnit("multi-user.target");
-    $machine->waitForUnit("clamav-daemon.service");
-    $machine->waitForFile("/run/clamav/clamd.ctl");
-    $machine->fail("clamdscan ${eicarTestFile}");
-  '';
-})

From c08ec87fe31e7314cfc4f7cbf00af93ff1594294 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Mon, 17 Dec 2018 12:34:39 -0600
Subject: [PATCH 2236/2793] Emacs site-start: Use correct feature name

* pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use
  correct feature name

Tramp upstream recently dropped the autoload cookie from
tramp-remote-path. This makes Emacs error when trying to load tramp.
Using the correct feature name fixes this.
---
 pkgs/applications/editors/emacs/site-start.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index cc1ab1d0e30..34addc33a59 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -30,7 +30,7 @@ least specific (the system profile)"
                  woman-manpath)))
 
 ;;; Make tramp work for remote NixOS machines
-(eval-after-load 'tramp
+(eval-after-load 'tramp-sh
   ;; TODO: We should also add the other `NIX_PROFILES' to this path.
   ;; However, these are user-specific, so we would need to discover
   ;; them dynamically after connecting via `tramp'

From 72e1764199805ab6e602fa3762a4d95bfdf80cb8 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 17 Dec 2018 18:59:05 +0000
Subject: [PATCH 2237/2793] libcxx: add linker scripts for libc++.a to ensure
 libc++abi.a is properly linked

---
 pkgs/development/compilers/llvm/4/libc++/default.nix | 5 +++++
 pkgs/development/compilers/llvm/4/libc++/libc++.a    | 1 +
 pkgs/development/compilers/llvm/5/libc++/default.nix | 5 +++++
 pkgs/development/compilers/llvm/5/libc++/libc++.a    | 1 +
 pkgs/development/compilers/llvm/6/libc++/default.nix | 5 +++++
 pkgs/development/compilers/llvm/6/libc++/libc++.a    | 1 +
 pkgs/development/compilers/llvm/7/libc++/default.nix | 5 +++++
 pkgs/development/compilers/llvm/7/libc++/libc++.a    | 1 +
 8 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/4/libc++/libc++.a
 create mode 100644 pkgs/development/compilers/llvm/5/libc++/libc++.a
 create mode 100644 pkgs/development/compilers/llvm/6/libc++/libc++.a
 create mode 100644 pkgs/development/compilers/llvm/7/libc++/libc++.a

diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 2b543b9d793..6344304b84b 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
+  postInstall = ''
+    mv $out/lib/libc++.a $out/lib/libc++_static.a
+    cp ${./libc++.a} $out/lib/libc++.a
+  '';
+
   setupHooks = [
     ../../../../../build-support/setup-hooks/role.bash
     ./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a
new file mode 100644
index 00000000000..f676948115e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/libc++/libc++.a
@@ -0,0 +1 @@
+INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index b182f1250e7..6dc81e10163 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
+  postInstall = ''
+    mv $out/lib/libc++.a $out/lib/libc++_static.a
+    cp ${./libc++.a} $out/lib/libc++.a
+  '';
+
   setupHooks = [
     ../../../../../build-support/setup-hooks/role.bash
     ./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a
new file mode 100644
index 00000000000..f676948115e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/libc++/libc++.a
@@ -0,0 +1 @@
+INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 3a165e9da7b..b90b6b7b58c 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
+  postInstall = ''
+    mv $out/lib/libc++.a $out/lib/libc++_static.a
+    cp ${./libc++.a} $out/lib/libc++.a
+  '';
+
   setupHooks = [
     ../../../../../build-support/setup-hooks/role.bash
     ./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a
new file mode 100644
index 00000000000..f676948115e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/libc++/libc++.a
@@ -0,0 +1 @@
+INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 76bfb34975e..f3b2f4df6cc 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
+  postInstall = ''
+    mv $out/lib/libc++.a $out/lib/libc++_static.a
+    cp ${./libc++.a} $out/lib/libc++.a
+  '';
+
   setupHooks = [
     ../../../../../build-support/setup-hooks/role.bash
     ./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a
new file mode 100644
index 00000000000..f676948115e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++/libc++.a
@@ -0,0 +1 @@
+INPUT(-lc++_static -lc++abi)

From ace1f064e865fc9e8946da7635ad3229c866ea2c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Dec 2018 11:04:10 -0800
Subject: [PATCH 2238/2793] glabels: 3.4.0 -> 3.4.1

* glabels: 3.4.0 -> 3.4.1 (#52285)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glabels/versions

* glabels: fetch from Gnome mirrors

+ corrected licensing - see https://github.com/jimevins/glabels/blob/glabels-3_4_1/COPYING.README_FIRST
---
 pkgs/applications/graphics/glabels/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index df8ebee020c..cf4ecf15523 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "glabels-${version}";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchurl {
-    url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
-    sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
+    url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Create labels and business cards";
-    homepage = http://glabels.org/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    homepage = https://glabels.org/;
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.nico202 ];
   };
 }

From dd99978853c9e18ad432efe097a291ea10c6ac1e Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sun, 16 Dec 2018 20:17:02 -0800
Subject: [PATCH 2239/2793] plata-theme: init at 0.4.9

---
 pkgs/data/themes/plata/default.nix | 80 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/data/themes/plata/default.nix

diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
new file mode 100644
index 00000000000..d839d4a3dd8
--- /dev/null
+++ b/pkgs/data/themes/plata/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
+, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine
+, cinnamonSupport ? true
+, gnomeFlashbackSupport ? true
+, gnomeShellSupport ? true
+, mateSupport ? true
+, openboxSupport ? true
+, xfceSupport ? true
+, gtkNextSupport ? false
+, plankSupport ? false
+, telegramSupport ? false
+, tweetdeckSupport ? false
+, selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500)
+, accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300)
+, suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500)
+, destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
+}:
+
+stdenv.mkDerivation rec {
+  name = "plata-theme-${version}";
+  version = "0.4.9";
+
+  src = fetchFromGitLab {
+    owner = "tista500";
+    repo = "plata-theme";
+    rev = version;
+    sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9";
+  };
+
+  preferLocalBuild = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    parallel
+    sassc
+    inkscape
+    libxml2
+    gnome2.glib.dev
+  ];
+
+  buildInputs = [
+    gdk_pixbuf
+    librsvg
+  ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  postPatch = "patchShebangs .";
+
+  configureFlags =
+    let
+      inherit (stdenv.lib) enableFeature optional;
+      withOptional = value: feat: optional (value != null) "--with-${feat}=${value}";
+    in [
+      "--enable-parallel"
+      (enableFeature cinnamonSupport "cinnamon")
+      (enableFeature gnomeFlashbackSupport "flashback")
+      (enableFeature gnomeShellSupport "gnome")
+      (enableFeature mateSupport "mate")
+      (enableFeature openboxSupport "openbox")
+      (enableFeature xfceSupport "xfce")
+      (enableFeature gtkNextSupport "gtk_next")
+      (enableFeature plankSupport "plank")
+      (enableFeature telegramSupport "telegram")
+      (enableFeature tweetdeckSupport "tweetdeck")
+    ]
+    ++ (withOptional selectionColor "selection_color")
+    ++ (withOptional accentColor "accent_color")
+    ++ (withOptional suggestionColor "suggestion_color")
+    ++ (withOptional destructionColor "destruction_color");
+
+  meta = with stdenv.lib; {
+    description = "A Gtk+ theme based on Material Design Refresh";
+    homepage = https://gitlab.com/tista500/plata-theme;
+    license = with licenses; [ gpl2 cc-by-sa-40 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.tadfisher ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b3ce642bb9..af2334e3df2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15653,6 +15653,8 @@ in
 
   penna = callPackage ../data/fonts/penna { };
 
+  plata-theme = callPackage ../data/themes/plata {};
+
   poly = callPackage ../data/fonts/poly { };
 
   polytopes_db = callPackage ../data/misc/polytopes_db { };

From 8f25e3d4cd58fcaadc26f9cdb2ea3fd8ba4ab392 Mon Sep 17 00:00:00 2001
From: Tom Smeets <tom@tsmeets.nl>
Date: Mon, 17 Dec 2018 21:37:34 +0100
Subject: [PATCH 2240/2793] gamecube-tools: init at v1.0.2

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

diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix
new file mode 100644
index 00000000000..0857a3d4a7c
--- /dev/null
+++ b/pkgs/development/tools/gamecube-tools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, which, autoconf, automake, fetchFromGitHub,
+  libtool, freeimage, mesa }:
+stdenv.mkDerivation rec {
+  version = "v1.0.2";
+  name = "gamecube-tools-${version}";
+
+  nativeBuildInputs = [ which autoconf automake libtool ];
+  buildInputs = [ freeimage mesa ];
+
+  src = fetchFromGitHub {
+    owner = "devkitPro";
+    repo  = "gamecube-tools";
+    rev = version;
+    sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca";
+  };
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Tools for gamecube/wii projects";
+    homepage = "https://github.com/devkitPro/gamecube-tools/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tomsmeets ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b3ce642bb9..69048c6b182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -730,6 +730,8 @@ in
 
   genymotion = callPackage ../development/mobile/genymotion { };
 
+  gamecube-tools = callPackage ../development/tools/gamecube-tools { };
+
   gams = callPackage ../tools/misc/gams {
     licenseFile = config.gams.licenseFile or null;
     optgamsFile = config.gams.optgamsFile or null;

From f0d3a6e7445e93a4becf58945dfa4bb08366dd95 Mon Sep 17 00:00:00 2001
From: Tom Smeets <tom@tsmeets.nl>
Date: Mon, 17 Dec 2018 21:45:43 +0100
Subject: [PATCH 2241/2793] wiiload: init at v0.5.1

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

diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix
new file mode 100644
index 00000000000..aaf1b20ea6f
--- /dev/null
+++ b/pkgs/development/tools/wiiload/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, zlib }:
+stdenv.mkDerivation rec {
+  version = "v0.5.1";
+  name = "wiiload-${version}";
+
+  nativeBuildInputs = [ autoconf automake ];
+  buildInputs = [ zlib ];
+
+  src = fetchFromGitHub {
+    owner = "devkitPro";
+    repo  = "wiiload";
+    rev = version;
+    sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3";
+  };
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Load homebrew apps over network/usbgecko to your Wii";
+    homepage = https://wiibrew.org/wiki/Wiiload;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tomsmeets ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b3ce642bb9..43c42e96660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -805,6 +805,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
+  wiiload = callPackage ../development/tools/wiiload { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   ssh-agents = callPackage ../tools/networking/ssh-agents { };

From 6620de7594cf2b4dd89c1b15c49495a52140d785 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Dec 2018 20:14:42 +0000
Subject: [PATCH 2242/2793] ocamlPackages.atdgen: init at 2.0.0

Atdgen is a command-line program that takes as input type definitions in the
ATD syntax and produces OCaml code suitable for data serialization and
deserialization.

Homepage: https://github.com/mjambon/atd
---
 .../ocaml-modules/atdgen/default.nix          | 26 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/atdgen/default.nix

diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
new file mode 100644
index 00000000000..d8ef2fec999
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -0,0 +1,26 @@
+{ buildDunePackage, atd, biniou, yojson }:
+
+let runtime =
+  buildDunePackage {
+    pname = "atdgen-runtime";
+    inherit (atd) version src;
+
+    propagatedBuildInputs = [ biniou yojson ];
+
+    meta = { inherit (atd.meta) license; };
+  }
+; in
+
+buildDunePackage {
+  pname = "atdgen";
+  inherit (atd) version src;
+
+  buildInputs = [ atd ];
+
+  propagatedBuildInputs = [ runtime ];
+
+  meta = {
+    description = "Generates efficient JSON serializers, deserializers and validators";
+    inherit (atd.meta) license;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0af48890ff1..9c3e81e3177 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -54,6 +54,8 @@ let
 
     atd = callPackage ../development/ocaml-modules/atd { };
 
+    atdgen = callPackage ../development/ocaml-modules/atdgen { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bap = callPackage ../development/ocaml-modules/bap {

From 5a44fef594ebffdbacc1b2fb94fe2b1617467f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 17 Dec 2018 23:08:56 +0100
Subject: [PATCH 2243/2793] adoptopenjdk: autogenerate sources + add support
 for aarch64

---
 .../adoptopenjdk-bin/generate-sources.py      | 69 ++++++++++++++
 .../adoptopenjdk-bin/jdk-darwin-base.nix      | 11 +--
 .../adoptopenjdk-bin/jdk-linux-base.nix       | 13 ++-
 .../adoptopenjdk-bin/jdk11-darwin.nix         | 44 +--------
 .../adoptopenjdk-bin/jdk11-linux.nix          | 44 +--------
 .../compilers/adoptopenjdk-bin/sources.json   | 94 +++++++++++++++++++
 6 files changed, 184 insertions(+), 91 deletions(-)
 create mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
new file mode 100755
index 00000000000..a410501de0a
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests
+
+import json
+import re
+import requests
+import sys
+
+releases = ["openjdk11"]
+oses = ["mac", "linux"]
+types = ["jre", "jdk"]
+impls = ["hotspot", "openj9"]
+
+arch_to_nixos = {
+    "x64": "x86_64",
+    "aarch64": "aarch64",
+}
+
+def get_sha256(url):
+    resp = requests.get(url)
+    if resp.status_code != 200:
+        print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr)
+        sys.exit(1)
+    return resp.text.strip().split(" ")[0]
+
+RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
+def generate_sources(release, assets):
+    out = {}
+    for asset in assets:
+        if asset["os"] not in oses: continue
+        if asset["binary_type"] not in types: continue
+        if asset["openjdk_impl"] not in impls: continue
+        if asset["heap_size"] != "normal": continue
+        if asset["architecture"] not in arch_to_nixos: continue
+
+        version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
+
+        type_map = out.setdefault(asset["os"], {})
+        impl_map = type_map.setdefault(asset["binary_type"], {})
+        arch_map = impl_map.setdefault(asset["openjdk_impl"], {
+            "version": version,
+            "build": build,
+            "packageType": asset["binary_type"],
+            "vmType": asset["openjdk_impl"],
+        })
+
+        if arch_map["version"] != version or arch_map["build"] != build:
+            print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
+                arch_map["version"], arch_map["build"], version, build
+            ), file=sys.stderr)
+            sys.exit(1)
+
+        arch_map[arch_to_nixos[asset["architecture"]]] = {
+            "url": asset["binary_link"],
+            "sha256": get_sha256(asset["checksum_link"]),
+        }
+
+    return out
+
+out = {}
+for release in releases:
+    resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
+    if resp.status_code != 200:
+        print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
+        sys.exit(1)
+    out[release] = generate_sources(release, resp.json())
+
+with open("sources.json", "w") as f:
+    json.dump(out, f, indent=2, sort_keys=True)
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index c2c13649f88..958f36d3928 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,7 +1,4 @@
-{ name
-, url
-, sha256
-}:
+sourcePerArch:
 
 { swingSupport ? true # not used for now
 , stdenv
@@ -9,10 +6,12 @@
 }:
 
 let result = stdenv.mkDerivation rec {
-  inherit name;
+  name = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
 
   src = fetchurl {
-    inherit url sha256;
+    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
   };
 
   # See: https://github.com/NixOS/patchelf/issues/10
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index cf38ca9eaeb..eb614b0784f 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,7 +1,4 @@
-{ name
-, url
-, sha256
-}:
+sourcePerArch:
 
 { swingSupport ? true
 , stdenv
@@ -48,10 +45,12 @@ let
 in
 
 let result = stdenv.mkDerivation rec {
-  inherit name;
+  name = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
 
   src = fetchurl {
-    inherit url sha256;
+    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
   };
 
   nativeBuildInputs = [ file ];
@@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+    platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
     maintainers = with stdenv.lib.maintainers; [ taku0 ];
   };
 
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index 573f5e175ec..d1db77215d1 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -1,43 +1,9 @@
 let
-  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
-    name = if packageType == "jdk"
-      then
-        "adoptopenjdk-${vmType}-bin-${version}"
-      else
-        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
-
-    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
-
-    inherit sha256;
-  };
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
 in
 {
-  jdk-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jdk";
-    vmType = "hotspot";
-    sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
-  };
-  jre-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jre";
-    vmType = "hotspot";
-    sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
-  };
-  jdk-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jdk";
-    vmType = "openj9";
-    sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
-  };
-  jre-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jre";
-    vmType = "openj9";
-    sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
-  };
+  jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
+  jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
+  jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
+  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
index f4990b6effc..755ffaab271 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -1,43 +1,9 @@
 let
-  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
-    name = if packageType == "jdk"
-      then
-        "adoptopenjdk-${vmType}-bin-${version}"
-      else
-        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
-
-    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
-
-    inherit sha256;
-  };
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
 in
 {
-  jdk-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jdk";
-    vmType = "hotspot";
-    sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
-  };
-  jre-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jre";
-    vmType = "hotspot";
-    sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
-  };
-  jdk-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jdk";
-    vmType = "openj9";
-    sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
-  };
-  jre-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jre";
-    vmType = "openj9";
-    sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
-  };
+  jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
+  jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
+  jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
+  jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
new file mode 100644
index 00000000000..bacb468c0ec
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -0,0 +1,94 @@
+{
+  "openjdk11": {
+    "linux": {
+      "jdk": {
+        "hotspot": {
+          "aarch64": {
+            "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
+          },
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "aarch64": {
+            "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
+          },
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
+          }
+        }
+      }
+    },
+    "mac": {
+      "jdk": {
+        "hotspot": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 28e9a1eef1668d86f744129a2055fd8bb62cc355 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 17 Dec 2018 23:10:39 +0100
Subject: [PATCH 2244/2793] youtube-dl: 2018.11.18 -> 2018.12.17

---
 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 d898813b0a9..fbf925516f3 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -19,11 +19,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2018.11.18";
+  version = "2018.12.17";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1wvvwyvxg9aadgpbcz0p6nzqmvnxzlbsqja3j6487l41s1ky1fyq";
+    sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8f525e762157f21914052869bbd5f025fd79d0c6 Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Mon, 17 Dec 2018 16:16:26 -0600
Subject: [PATCH 2245/2793] gnustep.base: Add explicit dependency on libbfd

Before beb063a, binutils included a libbfd install, which
is now being removed in postFixup
https://github.com/NixOS/nixpkgs/commit/beb063a1031c08df77996d97e4f6f9a2da1d911a#diff-c59ce5deea2f4002004fffdb11c5ed57R131

Fixes #52283
---
 pkgs/desktops/gnustep/base/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix
index 40c79274aae..9d1606ea6b7 100644
--- a/pkgs/desktops/gnustep/base/default.nix
+++ b/pkgs/desktops/gnustep/base/default.nix
@@ -3,7 +3,7 @@
 , cups
 , fetchurl
 , gmp, gnutls
-, libffi
+, libffi, libbfd
 , libjpeg, libtiff, libpng, giflib, libungif
 , libxml2, libxslt, libiconv
 , libobjc, libgcrypt
@@ -24,7 +24,7 @@ gsmakeDerivation {
     aspell audiofile
     cups
     gmp gnutls
-    libffi
+    libffi libbfd
     libjpeg libtiff libpng giflib libungif
     libxml2 libxslt libiconv
     libobjc libgcrypt

From 1720abc263384992c10587dc51f8635bfa4e2391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Dec 2018 23:22:17 +0100
Subject: [PATCH 2246/2793] libaom: use git stub instead of patching changelog

It probably needs less maintenance.
---
 pkgs/development/libraries/libaom/default.nix | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 77d75a8c1d3..f6ff7e75895 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages, writeText }:
+{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3, writeText }:
 
 stdenv.mkDerivation rec {
   name = "libaom-${version}";
@@ -10,33 +10,22 @@ stdenv.mkDerivation rec {
     sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82";
   };
 
-  buildInputs = [ perl yasm ];
-  nativeBuildInputs = [ cmake pkgconfig python3Packages.python ];
+  nativeBuildInputs = [
+    yasm perl cmake pkgconfig python3
+  ];
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
 
-  # * libaom tries to detect what version it is
-  #   * I couldn't get it to grab this from git info,
-  #     (which needs at least leaveDotGit=true)
-  #   * it uses a perl script to parse from CHANGELOG,
-  #     but 1.0.0 doesn't contain an entry for itself :(
-  # * Upstream patch that adds the entry also nukes all of
-  #   the versions before a project change (open-sourcing?)
-  #   and as a result is 34K which is way too big just to fix this!
-  #   * A stable URL to fetch this from works, but...
-  # * Upon inspection the resulting CHANGELOG is shorter
-  #   than this comment, so while yes this is a bit gross
-  #   adding these 4 lines here does the job without
-  #   a huge patch in spirit of preferring upstream's fix
-  #   instead of `sed -i 's/v0\.1\.0/v1.0.0/g' aom.pc` or so.
-  postPatch = let actual_changelog = writeText "CHANGELOG" ''
-    2018-06-28 v1.0.0
-      AOMedia Codec Workgroup Approved version 1.0
-
-    2016-04-07 v0.1.0 "AOMedia Codec 1"
-      This release is the first Alliance for Open Media codec.
-  ''; in ''
-   cp ${actual_changelog} CHANGELOG
+  preConfigure = ''
+    # build uses `git describe` to set the build version
+    cat > $NIX_BUILD_TOP/git << "EOF"
+    #!${stdenv.shell}
+    echo v${version}
+    EOF
+    chmod +x $NIX_BUILD_TOP/git
+    export PATH=$NIX_BUILD_TOP:$PATH
   '';
 
   meta = with stdenv.lib; {

From 5fc271257e8db26dd7c1a28f33c0184f195402b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 23:26:41 +0100
Subject: [PATCH 2247/2793] prometheus_2: 2.4.3 -> 2.6.0

---
 pkgs/servers/monitoring/prometheus/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 2430a8cf171..03080376ec2 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.4.3";
-    sha256 = "1kci2zhh4ixil0b72d138vm8006y117mw51wsyz8j0gyy4180msj";
+    version = "2.6.0";
+    sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59ac9b9bef5..7d0098a8cb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13855,10 +13855,10 @@ in
 
   inherit (callPackage ../servers/monitoring/prometheus {
     buildGoPackage = buildGo110Package;
-  })
-      prometheus_1
-      prometheus_2
-      ;
+  }) prometheus_1;
+
+  inherit (callPackage ../servers/monitoring/prometheus { })
+    prometheus_2;
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = prometheus_1;

From 5911d544574269792e18151835973957e1035f87 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 23:55:09 +0100
Subject: [PATCH 2248/2793] libressl_2_6: remove, not maintained anymore

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 154e84cfd0a..23361d03aa5 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -35,11 +35,6 @@ let
 
 in {
 
-  libressl_2_6 = generic {
-    version = "2.6.5";
-    sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5";
-  };
-
   libressl_2_7 = generic {
     version = "2.7.4";
     sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d0098a8cb1..dca33827561 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11859,11 +11859,10 @@ in
   openvdb = callPackage ../development/libraries/openvdb {};
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_2_6
     libressl_2_7
     libressl_2_8;
 
-  libressl = libressl_2_7;
+  libressl = libressl_2_8;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 

From b7254b6b2c8069495d497454c17ab42cfa98b049 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 23:56:08 +0100
Subject: [PATCH 2249/2793] libressl_2_7: 2.7.4 -> 2.7.5

---
 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 23361d03aa5..e74918d5715 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -36,8 +36,8 @@ let
 in {
 
   libressl_2_7 = generic {
-    version = "2.7.4";
-    sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy";
+    version = "2.7.5";
+    sha256 = "0h60bcx7k72171dwpx4vsbsrxxz9c18v75lh5fj600gghn6h7rdy";
   };
 
   libressl_2_8 = generic {

From 949dc60acc3d0f506bbbd7ef6f182ca3102a0279 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 23:57:13 +0100
Subject: [PATCH 2250/2793] libressl_2_8: 2.8.2 -> 2.8.3

---
 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 e74918d5715..260be3476f2 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -41,7 +41,7 @@ in {
   };
 
   libressl_2_8 = generic {
-    version = "2.8.2";
-    sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq";
+    version = "2.8.3";
+    sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v";
   };
 }

From 51c8e01676472b79721601af4e848031b2fc1485 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Dec 2018 23:59:24 +0100
Subject: [PATCH 2251/2793] libressl_2_9: init at 2.9.0

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 260be3476f2..631580aa7d1 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -44,4 +44,9 @@ in {
     version = "2.8.3";
     sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v";
   };
+
+  libressl_2_9 = generic {
+    version = "2.9.0";
+    sha256 = "1x1wl6b449m6hfhyxxzxbf2v8yfb5q92q6d01hdg28xp1222jpzb";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca33827561..c60ba0002a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11860,7 +11860,8 @@ in
 
   inherit (callPackages ../development/libraries/libressl { })
     libressl_2_7
-    libressl_2_8;
+    libressl_2_8
+    libressl_2_9;
 
   libressl = libressl_2_8;
 

From 9f6c85bd5e04c040970b8ae59f7150540cbe00a7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Dec 2018 00:03:56 +0100
Subject: [PATCH 2252/2793] lldpd: 1.0.1 -> 1.0.3

---
 pkgs/tools/networking/lldpd/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 81456c1b852..193f44a62e2 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -1,25 +1,15 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
+{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
 , libevent, readline, net_snmp }:
 
 stdenv.mkDerivation rec {
   name = "lldpd-${version}";
-  version = "1.0.1";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
-    sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5";
+    sha256 = "0q63wiaan85a6d204jgk87w6dw5c9x0rb2z7pwb580b8a4wyvz1r";
   };
 
-  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 a2080299e8a3e74754d29427890b598f0641bc99 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Dec 2018 00:04:31 +0100
Subject: [PATCH 2253/2793] aubio: 0.4.7 -> 0.4.8

---
 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 01ca9a3ec83..e6c4a8e0089 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.7";
+  name = "aubio-0.4.8";
 
   src = fetchurl {
     url = "https://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
+    sha256 = "1fjbz1l9axscrb7dl6jv4ifhvmq1g77ihvg0bbwwfg0j3qz4gxyw";
   };
 
   nativeBuildInputs = [ pkgconfig python wafHook ];

From 0ab65723240c47ea5c682a856417bb4c0d259c0c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 5 Nov 2018 20:11:42 +0000
Subject: [PATCH 2254/2793] libvirt: 4.7.0 -> 4.10.0

---
 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 733482ce268..9f183365aae 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.7.0";
+  version = "4.10.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "1r37aw1xxlwjkk4n6k503mw1caldijz8n7x86xdaq90n6bvpkhlj";
+        sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "17byylhx0bny4b771hqv92d87a5dg21a5qjv861y50sckgwwi6f1";
+        sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9";
         fetchSubmodules = true;
       };
 
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 063245c0d4d..d6924d9d65c 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.7.0";
+  version = "4.10.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "1zv3fgwmnkvqif0qsnvpx8hhb6bdfr2b4v55z3nh93bfg8s4rbm8";
+    sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 26f811bfb33..e3f02fa9728 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14428,12 +14428,12 @@ let
   };
 
   SysVirt = buildPerlModule rec {
-    version = "4.7.0";
+    version = "4.10.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
       rev = "v${version}";
-      sha256 = "14q8s6k3d9a1qh6sh618qp30ib4p9qma2z4p2ynyh223i4w3virg";
+      sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From 7722c43f0ad0b78bc810e874485cd7dd77baa51a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 21:32:34 -0800
Subject: [PATCH 2255/2793] olm: 2.3.0 -> 3.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/olm/versions
---
 pkgs/development/libraries/olm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 05888ad60bb..4749efb5f00 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "olm-${version}";
-  version = "2.3.0";
+  version = "3.0.0";
 
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
-    sha256 = "1y2yasq94zjw3nadn1915j85xwc5j3pic3brhp0h83l6hkxi8dsk";
+    sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c";
   };
 
   doCheck = true;

From 758f271fba854a25eef3ccd314b7e8a36407a765 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 14 Dec 2018 15:54:22 +0800
Subject: [PATCH 2256/2793] github-changelog-generator: init at v1.14.3

Signed-off-by: Fritz Otlinghaus <fritz@otlinghaus.it>
---
 .../tools/github-changelog-generator/Gemfile  |   4 +
 .../github-changelog-generator/Gemfile.lock   |  49 ++++++
 .../github-changelog-generator/default.nix    |  15 ++
 .../github-changelog-generator/gemset.nix     | 155 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 225 insertions(+)
 create mode 100644 pkgs/development/tools/github-changelog-generator/Gemfile
 create mode 100644 pkgs/development/tools/github-changelog-generator/Gemfile.lock
 create mode 100644 pkgs/development/tools/github-changelog-generator/default.nix
 create mode 100644 pkgs/development/tools/github-changelog-generator/gemset.nix

diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile b/pkgs/development/tools/github-changelog-generator/Gemfile
new file mode 100644
index 00000000000..5db8cdb7348
--- /dev/null
+++ b/pkgs/development/tools/github-changelog-generator/Gemfile
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "github_changelog_generator", "1.14.3"
diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock
new file mode 100644
index 00000000000..b1b955cba94
--- /dev/null
+++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock
@@ -0,0 +1,49 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    concurrent-ruby (1.1.4)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
+    github_changelog_generator (1.14.3)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (~> 2.1)
+    i18n (1.2.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    retriable (2.1.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github_changelog_generator (= 1.14.3)
+
+BUNDLED WITH
+   1.16.3
diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix
new file mode 100644
index 00000000000..9362ef3fe45
--- /dev/null
+++ b/pkgs/development/tools/github-changelog-generator/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, lib, bundlerApp}:
+
+bundlerApp rec {
+  pname = "github_changelog_generator";
+  gemdir = ./.;
+  exes = [ "github_changelog_generator" ];
+
+  meta = with lib; {
+    description = "Fully automated changelog generation - This gem generates a changelog file based on tags, issues and merged pull requests";
+    homepage    = https://github.com/github-changelog-generator/github-changelog-generator;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ Scriptkiddi ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/pkgs/development/tools/github-changelog-generator/gemset.nix
new file mode 100644
index 00000000000..3382557aaa5
--- /dev/null
+++ b/pkgs/development/tools/github-changelog-generator/gemset.nix
@@ -0,0 +1,155 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
+      type = "gem";
+    };
+    version = "5.2.2";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      type = "gem";
+    };
+    version = "0.15.4";
+  };
+  faraday-http-cache = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  github_changelog_generator = {
+    dependencies = ["activesupport" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" "retriable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ylqfmc78i6jf42ydkyng0gzvsl5w80wr3rjkhd6q4kgi96n70lr";
+      type = "gem";
+    };
+    version = "1.14.3";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      type = "gem";
+    };
+    version = "5.11.3";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  octokit = {
+    dependencies = ["sawyer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6";
+      type = "gem";
+    };
+    version = "4.13.0";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      type = "gem";
+    };
+    version = "3.0.3";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
+      type = "gem";
+    };
+    version = "12.3.2";
+  };
+  retriable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1123kqmy3yk7k3vidvcwa46lknmhilv8axpaiag1wifa576hkqy1";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  sawyer = {
+    dependencies = ["addressable" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c60ba0002a7..06dbf7c0bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -737,6 +737,8 @@ in
 
   git-fire = callPackage ../tools/misc/git-fire { };
 
+  github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
+
   gitless = callPackage ../applications/version-management/gitless { };
 
   gitter = callPackage  ../applications/networking/instant-messengers/gitter { };

From f64bc036a55bb387b60c879bed89a54afd2c7a89 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Tue, 4 Dec 2018 19:00:18 +0000
Subject: [PATCH 2257/2793] nixos: add XDG sounds module

---
 nixos/modules/config/xdg/sounds.nix | 22 ++++++++++++++++++++++
 nixos/modules/module-list.nix       |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 nixos/modules/config/xdg/sounds.nix

diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix
new file mode 100644
index 00000000000..148240d631c
--- /dev/null
+++ b/nixos/modules/config/xdg/sounds.nix
@@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+with lib;
+{
+  options = {
+    xdg.sounds.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to install files to support the
+        <link xlink:href="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/">XDG Sound Theme specification</link>.
+      '';
+    };
+  };
+
+  config = mkIf config.xdg.sounds.enable {
+    environment.pathsToLink = [
+      "/share/sounds"
+    ];
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 09ed55c0699..01eb766fb4d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -12,6 +12,7 @@
   ./config/xdg/menus.nix
   ./config/xdg/mime.nix
   ./config/appstream.nix
+  ./config/xdg/sounds.nix
   ./config/gtk/gtk-icon-cache.nix
   ./config/gnu.nix
   ./config/i18n.nix

From b4b67177b53c23c6fb77aea7f0bc5c559f8bebe5 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 17 Dec 2018 15:42:41 -0800
Subject: [PATCH 2258/2793] nixos/bash: Fix prompt regression in Emacs term
 mode

---
 nixos/modules/programs/bash/bash.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 2b01c9d26c4..d22f9dfa319 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -98,7 +98,12 @@ in
           if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
             PROMPT_COLOR="1;31m"
             let $UID && PROMPT_COLOR="1;32m"
-            PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
+            if [ -n "$INSIDE_EMACS" ]; then
+              # Emacs term mode doesn't support xterm title escape sequence (\e]0;)
+              PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+            else
+              PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
+            fi
             if test "$TERM" = "xterm"; then
               PS1="\[\033]2;\h:\u:\w\007\]$PS1"
             fi

From 3380db94b1c04158bdc66944c4fa36d074aae157 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 23:18:48 +0100
Subject: [PATCH 2259/2793] gtksourceviewmm: move from gnome3.gtksourceviewmm

---
 pkgs/desktops/gnome-3/default.nix                             | 4 +---
 .../libraries}/gtksourceviewmm/default.nix                    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome-3/core => development/libraries}/gtksourceviewmm/default.nix (86%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 626f4652ece..29b48873e72 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -36,7 +36,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   ];
 
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
-    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
+    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
     clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
 
@@ -155,8 +155,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gsound = callPackage ./core/gsound { };
 
-  gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
-
   gucharmap = callPackage ./core/gucharmap { };
 
   gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix
similarity index 86%
rename from pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
rename to pkgs/development/libraries/gtksourceviewmm/default.nix
index 6a0ee7fb56a..455cc4d4b81 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gtksourceviewmm-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glibmm gtkmm gtksourceview ];
+  buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74be1ef73ec..32b56794c59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10221,6 +10221,8 @@ in
 
   gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
 
+  gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { };
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From 26785ae6facfc2b2e8ed79f35d521aa97deceb70 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Tue, 18 Dec 2018 01:52:07 +0100
Subject: [PATCH 2260/2793] gotop: 1.5.0 -> 1.7.1

---
 pkgs/tools/system/gotop/default.nix |  6 +++--
 pkgs/tools/system/gotop/deps.nix    | 39 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/system/gotop/deps.nix

diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 3aba05f7aef..2b918d15581 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.5.0";
+  version = "1.7.1";
 
   goPackagePath = "github.com/cjbassi/gotop";
 
@@ -10,9 +10,11 @@ buildGoPackage rec {
     repo = "gotop";
     owner = "cjbassi";
     rev = version;
-    sha256 = "19kj7mziwkfcf9kkwph05jh5vlkfqpyrpxdk5gdf2swg07w1ld35";
+    sha256 = "0dxnhal10kv6ypsg6mildzpz6vi1iw996q47f4rv8hvfyrffhzc9";
   };
 
+  goDeps = ./deps.nix;
+
   meta = with stdenv.lib; {
     description = "A terminal based graphical activity monitor inspired by gtop and vtop";
     homepage = https://github.com/cjbassi/gotop;
diff --git a/pkgs/tools/system/gotop/deps.nix b/pkgs/tools/system/gotop/deps.nix
new file mode 100644
index 00000000000..ceae7857551
--- /dev/null
+++ b/pkgs/tools/system/gotop/deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/cjbassi/termui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cjbassi/termui";
+      rev = "e8dd23f6146c0e0d80f1be0163b8069abfbb921b";
+      sha256 = "0jds2mpa7whrwaznlkcn2y92q41zbf2rjj5267kl8zqllbia8cbx";
+    };
+  }
+  {
+    goPackagePath = "github.com/docopt/docopt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docopt/docopt-go";
+      rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1";
+      sha256 = "0hlra7rmi5pmd7d93rv56ahiy4qkgmq8a6mz0jpadvbi5qh8lq6j";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "51e6519305e4871657c291a6281fcddc6364bbef";
+      sha256 = "1pvvaj51m0w2v6bp5hhhzfy27hbicf4ga7r9m073vqcwjnfyz431";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89";
+      sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6";
+    };
+  }
+]

From 113a6b9325b92d483e6c2f12c35c2887ab175a8d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Sep 2018 23:08:43 +0200
Subject: [PATCH 2261/2793] nixos/testing: disallow special chars in machine
 names in network expressions

These names are referenced by Perl variables inside the testing
frameworks which don't allow chars like `-` as character inside. An exemplary
expression may look like this:

```
{
  x11-vm = {
    services.xserver.enable = true;
  };
}
```

This expression evaluates, e.g. when running `nixos-build-vms`, but when
trying to run `./result/bin/nixos-run-vms`, an error like this occurs:

```
starting VDE switch for network 1
running the VM test script
error: Can't modify subtraction (-) in scalar assignment at (eval 17) line 1, at EOF
Bareword "test" not allowed while "strict subs" in use at (eval 17) line 1.
Can't modify subtraction (-) in scalar assignment at (eval 17) line 1, at EOF
Bareword "test" not allowed while "strict subs" in use at (eval 17) line 1.
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
```

This can be very confusing for beginners, this change breaks evaluation
if such names are used for machines.
---
 nixos/lib/testing.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 42a0c60c7e1..3fb691409a0 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -149,9 +149,23 @@ in rec {
       test = passMeta (runTests driver);
       report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
 
-    in (if makeCoverageReport then report else test) // {
-      inherit nodes driver test;
-    };
+      nodeNames = builtins.attrNames nodes;
+      invalidNodeNames = lib.filter
+        (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
+
+    in
+      if lib.length invalidNodeNames > 0 then
+        throw ''
+          Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
+          All machines are references as perl variables in the testing framework which will break the
+          script when special characters are allowed.
+
+          Please stick to alphanumeric chars and underscores as separation.
+        ''
+      else
+        (if makeCoverageReport then report else test) // {
+          inherit nodes driver test;
+        };
 
   runInMachine =
     { drv

From fb66e2d7926eae8765b3dbbf11b385112174198b Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Mon, 17 Dec 2018 18:49:54 -0800
Subject: [PATCH 2262/2793] terraform_0_11: 0.11.10 -> 0.11.11

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8c97186b59a..dd0fe0a3eb1 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -88,8 +88,8 @@ let
   plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
 in rec {
   terraform_0_11 = pluggable (generic {
-    version = "0.11.10";
-    sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
+    version = "0.11.11";
+    sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From b4593b462985e445024bb375166b8f4f838a08eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 18 Dec 2018 03:55:02 +0100
Subject: [PATCH 2263/2793] buildGoPackage: also support pname

Following python-modules and stdenv.mkDerivation.
Hopefully zero rebuilds.

Motivation: https://github.com/NixOS/nixpkgs/pull/52409
---
 .../go-modules/generic/default.nix            | 281 +++++++++---------
 1 file changed, 142 insertions(+), 139 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 6af5f72f2b7..b282a49e8af 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,7 +1,10 @@
 { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
 , removeReferencesTo, fetchFromGitHub, stdenv }:
 
-{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+{ buildInputs ? []
+, nativeBuildInputs ? []
+, passthru ? {}
+, preFixup ? ""
 , shellHook ? ""
 
 # We want parallel builds by default
@@ -34,7 +37,6 @@
 
 , meta ? {}, ... } @ args':
 
-if disabled then throw "${name} not supported for go ${go.meta.branch}" else
 
 with builtins;
 
@@ -72,170 +74,171 @@ let
 
   goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
                              else extraSrcs;
-in
+  package = go.stdenv.mkDerivation (
+    (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
-go.stdenv.mkDerivation (
-  (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
+    nativeBuildInputs = [ removeReferencesTo go ]
+      ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
+    buildInputs = buildInputs;
 
-  inherit name;
-  nativeBuildInputs = [ removeReferencesTo go ]
-    ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
-  buildInputs = buildInputs;
+    inherit (go) GOOS GOARCH;
 
-  inherit (go) GOOS GOARCH;
+    configurePhase = args.configurePhase or ''
+      runHook preConfigure
 
-  configurePhase = args.configurePhase or ''
-    runHook preConfigure
+      # Extract the source
+      cd "$NIX_BUILD_TOP"
+      mkdir -p "go/src/$(dirname "$goPackagePath")"
+      mv "$sourceRoot" "go/src/$goPackagePath"
 
-    # Extract the source
-    cd "$NIX_BUILD_TOP"
-    mkdir -p "go/src/$(dirname "$goPackagePath")"
-    mv "$sourceRoot" "go/src/$goPackagePath"
+    '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
+      mkdir goPath
+      (cd goPath; unpackFile "${src}")
+      mkdir -p "go/src/$(dirname "${goPackagePath}")"
+      chmod -R u+w goPath/*
+      mv goPath/* "go/src/${goPackagePath}"
+      rmdir goPath
 
-  '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
-    mkdir goPath
-    (cd goPath; unpackFile "${src}")
-    mkdir -p "go/src/$(dirname "${goPackagePath}")"
-    chmod -R u+w goPath/*
-    mv goPath/* "go/src/${goPackagePath}"
-    rmdir goPath
+    '') + (lib.optionalString (extraSrcPaths != []) ''
+      ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go
 
-  '') + (lib.optionalString (extraSrcPaths != []) ''
-    ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go
+    '') + ''
+      export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+      export GOCACHE=$TMPDIR/go-cache
 
-  '') + ''
-    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-    export GOCACHE=$TMPDIR/go-cache
+      runHook postConfigure
+    '';
 
-    runHook postConfigure
-  '';
+    renameImports = args.renameImports or (
+      let
+        inputsWithAliases = lib.filter (x: x ? goPackageAliases)
+          (buildInputs ++ (args.propagatedBuildInputs or [ ]));
+        rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
+        renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
+      in lib.concatMapStringsSep "\n" renames inputsWithAliases);
 
-  renameImports = args.renameImports or (
-    let
-      inputsWithAliases = lib.filter (x: x ? goPackageAliases)
-        (buildInputs ++ (args.propagatedBuildInputs or [ ]));
-      rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
-      renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
-    in lib.concatMapStringsSep "\n" renames inputsWithAliases);
+    buildPhase = args.buildPhase or ''
+      runHook preBuild
 
-  buildPhase = args.buildPhase or ''
-    runHook preBuild
+      runHook renameImports
 
-    runHook renameImports
-
-    buildGoDir() {
-      local d; local cmd;
-      cmd="$1"
-      d="$2"
-      . $TMPDIR/buildFlagsArray
-      echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
-      [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
-      local OUT
-      if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
-        if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
-          echo "$OUT" >&2
-          return 1
+      buildGoDir() {
+        local d; local cmd;
+        cmd="$1"
+        d="$2"
+        . $TMPDIR/buildFlagsArray
+        echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
+        [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
+        local OUT
+        if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
+          if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
+            echo "$OUT" >&2
+            return 1
+          fi
         fi
-      fi
-      if [ -n "$OUT" ]; then
-        echo "$OUT" >&2
-      fi
-      return 0
-    }
+        if [ -n "$OUT" ]; then
+          echo "$OUT" >&2
+        fi
+        return 0
+      }
 
-    getGoDirs() {
-      local type;
-      type="$1"
-      if [ -n "$subPackages" ]; then
-        echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
+      getGoDirs() {
+        local type;
+        type="$1"
+        if [ -n "$subPackages" ]; then
+          echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
+        else
+          pushd "$NIX_BUILD_TOP/go/src" >/dev/null
+          find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
+          popd >/dev/null
+        fi
+      }
+
+      if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+        buildFlagsArray+=(-x)
+      fi
+
+      if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
+        declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
       else
-        pushd "$NIX_BUILD_TOP/go/src" >/dev/null
-        find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
-        popd >/dev/null
+        touch $TMPDIR/buildFlagsArray
       fi
-    }
-
-    if (( "''${NIX_DEBUG:-0}" >= 1 )); then
-      buildFlagsArray+=(-x)
-    fi
-
-    if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
-      declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
-    else
-      touch $TMPDIR/buildFlagsArray
-    fi
-    export -f buildGoDir # xargs needs to see the function
-    if [ -z "$enableParallelBuilding" ]; then
-        export NIX_BUILD_CORES=1
-    fi
-    getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
-  '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    # normalize cross-compiled builds w.r.t. native builds
-    (
-      dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
-      if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
-        mv $dir/* $dir/..
+      export -f buildGoDir # xargs needs to see the function
+      if [ -z "$enableParallelBuilding" ]; then
+          export NIX_BUILD_CORES=1
       fi
-      if [[ -d $dir ]]; then
-        rmdir $dir
-      fi
-    )
-  '' + ''
-    runHook postBuild
-  '';
+      getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
+    '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+      # normalize cross-compiled builds w.r.t. native builds
+      (
+        dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
+        if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
+          mv $dir/* $dir/..
+        fi
+        if [[ -d $dir ]]; then
+          rmdir $dir
+        fi
+      )
+    '' + ''
+      runHook postBuild
+    '';
 
-  doCheck = args.doCheck or false;
-  checkPhase = args.checkPhase or ''
-    runHook preCheck
+    doCheck = args.doCheck or false;
+    checkPhase = args.checkPhase or ''
+      runHook preCheck
 
-    getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
+      getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
 
-    runHook postCheck
-  '';
+      runHook postCheck
+    '';
 
-  installPhase = args.installPhase or ''
-    runHook preInstall
+    installPhase = args.installPhase or ''
+      runHook preInstall
 
-    mkdir -p $bin
-    dir="$NIX_BUILD_TOP/go/bin"
-    [ -e "$dir" ] && cp -r $dir $bin
+      mkdir -p $bin
+      dir="$NIX_BUILD_TOP/go/bin"
+      [ -e "$dir" ] && cp -r $dir $bin
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    '';
 
-  preFixup = preFixup + ''
-    find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
-  '';
+    preFixup = preFixup + ''
+      find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
+    '';
 
-  shellHook = ''
-    d=$(mktemp -d "--suffix=-$name")
-  '' + toString (map (dep: ''
-     mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
-     ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
-  ''
-  ) goPath) + ''
-    export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
-  '' + shellHook;
+    shellHook = ''
+      d=$(mktemp -d "--suffix=-$name")
+    '' + toString (map (dep: ''
+       mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
+       ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
+    ''
+    ) goPath) + ''
+      export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
+    '' + shellHook;
 
-  disallowedReferences = lib.optional (!allowGoReference) go
-    ++ lib.optional (!dontRenameImports) govers;
+    disallowedReferences = lib.optional (!allowGoReference) go
+      ++ lib.optional (!dontRenameImports) govers;
 
-  passthru = passthru //
-    { inherit go; } //
-    lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
+    passthru = passthru //
+      { inherit go; } //
+      lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
-  enableParallelBuilding = enableParallelBuilding;
+    enableParallelBuilding = enableParallelBuilding;
 
-  # I prefer to call this dev but propagatedBuildInputs expects $out to exist
-  outputs = args.outputs or [ "bin" "out" ];
+    # I prefer to call this dev but propagatedBuildInputs expects $out to exist
+    outputs = args.outputs or [ "bin" "out" ];
 
-  meta = {
-    # Add default meta information
-    homepage = "https://${goPackagePath}";
-    platforms = go.meta.platforms or lib.platforms.all;
-  } // meta // {
-    # add an extra maintainer to every package
-    maintainers = (meta.maintainers or []) ++
-                  [ lib.maintainers.ehmry lib.maintainers.lethalman ];
-  };
-})
+    meta = {
+      # Add default meta information
+      homepage = "https://${goPackagePath}";
+      platforms = go.meta.platforms or lib.platforms.all;
+    } // meta // {
+      # add an extra maintainer to every package
+      maintainers = (meta.maintainers or []) ++
+                    [ lib.maintainers.ehmry lib.maintainers.lethalman ];
+    };
+  });
+in if disabled then
+  throw "${package.name} not supported for go ${go.meta.branch}"
+else
+  package

From 7b884b68077f3c2a48595dc093aa0cd4d60e2597 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Mon, 17 Dec 2018 18:59:30 -0800
Subject: [PATCH 2264/2793] terraform-providers: bump versions

---
 .../cluster/terraform-providers/data.nix      | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index a69229735f8..3b22aa3b04d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -39,15 +39,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.51.0";
-      sha256  = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg";
+      version = "1.52.0";
+      sha256  = "037n26spp49r4b4f6cyv6d3sgqw2d80g97fqgz1j0hcwi0am56h1";
     };
   azurerm =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.19.0";
-      sha256  = "1b07g90vmdvlfyz2q40sjd14xnbjyf9c7hgg7rzyhnkfi7imjbbf";
+      version = "1.20.0";
+      sha256  = "0hfq5gk4bhmw65x1rsdpwv0massgr1sczvcbyh572qlkkhvm59xd";
     };
   azurestack =
     {
@@ -144,8 +144,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-digitalocean";
-      version = "1.0.2";
-      sha256  = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6";
+      version = "1.1.0";
+      sha256  = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4";
     };
   dme =
     {
@@ -221,8 +221,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.19.1";
-      sha256  = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0";
+      version = "1.20.0";
+      sha256  = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj";
     };
   grafana =
     {
@@ -242,15 +242,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-helm";
-      version = "0.6.2";
-      sha256  = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b";
+      version = "0.7.0";
+      sha256  = "172l5cpl6vfdz75s3s60iqcavi5m66gwbrm7aw47hby8lv5ivflc";
     };
   heroku =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-heroku";
-      version = "1.6.0";
-      sha256  = "0byz9prx2x3nz9dl65mjnp0f33in62am35kcsza3538jcvymkhk2";
+      version = "1.7.0";
+      sha256  = "0zk5w4xwbg631m7592gfmdbsmrr0r7vla5nd1p5frh6szg6psy6m";
     };
   http =
     {
@@ -396,8 +396,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      version = "3.9.0";
-      sha256  = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97";
+      version = "3.10.0";
+      sha256  = "0dhz3y62dp66jkn0q4x7v2cnqw8kiq34sgyfx8mw706hg9sdqb0l";
     };
   oneandone =
     {
@@ -410,8 +410,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.3.0";
-      sha256  = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p";
+      version = "1.3.1";
+      sha256  = "0rpkhaja6vq1y1xah136vjlp1d5v9adymq300ajssbjkqf93wzs6";
     };
   openstack =
     {
@@ -424,8 +424,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opentelekomcloud";
-      version = "1.3.0";
-      sha256  = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk";
+      version = "1.4.0";
+      sha256  = "0dv756npyhadzr08zlv28ghazaj1fdp3avcld7y6ri99hamncm95";
     };
   opsgenie =
     {
@@ -438,8 +438,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oraclepaas";
-      version = "1.3.2";
-      sha256  = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb";
+      version = "1.4.0";
+      sha256  = "1hhkijxnwmm21b0w9qc3lk5vfcg0ac0sg7v4g0ffjqv68mssrz6x";
     };
   ovh =
     {
@@ -599,8 +599,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tfe";
-      version = "0.4.0";
-      sha256  = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn";
+      version = "0.5.0";
+      sha256  = "1acmmsb4nj3l4d7zlzjrh97nhrkgm99wlazjrfavxwly253ck283";
     };
   tls =
     {
@@ -627,8 +627,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      version = "1.3.1";
-      sha256  = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh";
+      version = "1.4.1";
+      sha256  = "1nkhcgd2y7wyi179l2znjpakmjjcxarwc9j5mb7r191p2m27k27s";
     };
   vcd =
     {

From 87c5f36e6828f9e4fe140a76718b14356429991f Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Tue, 18 Dec 2018 05:57:15 +0100
Subject: [PATCH 2265/2793] wego: 20160407-81d72ff -> 20170403-415efdf

---
 pkgs/applications/misc/wego/default.nix |  6 +++---
 pkgs/applications/misc/wego/deps.nix    | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 7a09a804577..a3d3ace009e 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "wego-${version}";
-  version = "20160407-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
+  version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
   
   goPackagePath = "github.com/schachmat/wego";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/schachmat/wego";
-    sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
+    sha256 = "0w8sypwg0s2mvhk9cdibqr8bz5ipiiacs60a39sdswrpc4z486hg";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix
index 408b3908d8f..74ab69a30e1 100644
--- a/pkgs/applications/misc/wego/deps.nix
+++ b/pkgs/applications/misc/wego/deps.nix
@@ -1,11 +1,20 @@
 [
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.4";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/go-runewidth";
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "d6bea18f789704b5f83375793155289da36a3c7f";
-      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+      rev = "v0.0.4";
+      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
     };
   }
   {
@@ -13,8 +22,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-colorable";
-      rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";
-      sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";
+      rev = "v0.0.9";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
     };
   }
   {
@@ -22,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/schachmat/ingo";
-      rev = "fab41e4e62cbef5d92998746ec25f7e195100f38";
-      sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb";
+      rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33";
+      sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49";
     };
   }
 ]

From 3f1e222a8b5ed268e727ba9a0a944fabd41991d6 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Sat, 1 Dec 2018 23:14:24 +1100
Subject: [PATCH 2266/2793] llpp: 2018-03-02 -> 30

Remove unnecessary packages from derivation and use patches to fix
build.bash instead of sed commands.
---
 pkgs/applications/misc/llpp/default.nix       | 33 +++----
 .../misc/llpp/fix-build-bash.patch            | 88 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/misc/llpp/fix-build-bash.patch

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index f32509686c0..ed3aca996e1 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
-, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
+{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
+libGLU_combined, freetype, xclip }:
 
-assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
+assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
 
 stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "2018-03-02";
+  version = "30";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9";
-    sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis";
+    rev = "v${version}";
+    sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd";
     fetchSubmodules = false;
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
-  buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
+  patches = (substituteAll {
+    inherit version;
+    src = ./fix-build-bash.patch;
+  });
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ];
 
   dontStrip = true;
 
   configurePhase = ''
-    sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh
-    sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh
-    sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
-    sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
+    mkdir -p build/mupdf/thirdparty
+    ln -s ${freetype.dev} build/mupdf/thirdparty/freetype
   '';
 
   buildPhase = ''
-    sh ./build.sh build
+    bash ./build.bash build
   '';
 
   installPhase = ''
@@ -35,14 +38,14 @@ stdenv.mkDerivation rec {
     install build/llpp $out/bin
     wrapProgram $out/bin/llpp \
         --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
-        --prefix PATH ":" "${xsel}/bin"
+        --prefix PATH ":" "${xclip}/bin"
   '';
 
   meta = with stdenv.lib; {
     homepage = https://repo.or.cz/w/llpp.git;
     description = "A MuPDF based PDF pager written in OCaml";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub enzime ];
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch
new file mode 100644
index 00000000000..25d503290ce
--- /dev/null
+++ b/pkgs/applications/misc/llpp/fix-build-bash.patch
@@ -0,0 +1,88 @@
+From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Mon, 10 Dec 2018 15:08:01 +1100
+Subject: [PATCH] Patch build.bash for nixpkgs
+
+---
+ build.bash | 37 ++-----------------------------------
+ 1 file changed, 2 insertions(+), 35 deletions(-)
+
+diff --git a/build.bash b/build.bash
+index 1588011..72117d9 100755
+--- a/build.bash
++++ b/build.bash
+@@ -29,7 +29,6 @@ srcd="$(dirname $0)"
+ mudir=$outd/mupdf
+ muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
+ 
+-test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING
+ 
+ mkdir -p $outd/{$wsid,lablGL}
+ :>$outd/ordered
+@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
+ mbt=native
+ mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
+ 
+-keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs"
+-isfresh "$mulibs" "$(eval $keycmd)" || (
+-    make -C "$mudir" build=$mbt -j $mjobs libs
+-    echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past
+-) && vecho "fresh mupdf"
+-
+ oincs() {
+     local i=
+     local incs1=
+@@ -90,32 +83,6 @@ mflags() {
+ }
+ 
+ overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
+-test "$overs" = "4.07.0" || {
+-    url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
+-    txz=$outd/$(basename $url)
+-    isfresh $txz $url || {
+-        executable_p() { command -v "$1" >/dev/null 2>&1; }
+-        if executable_p wget; then dl() { wget -q "$1" -O "$2"; }
+-        elif executable_p curl; then dl() { curl -L "$1" -o "$2"; }
+-        else die "no program to fetch remote urls found"
+-        fi
+-        dl $url $txz
+-        echo "k=$url" >$txz.past
+-    } && vecho "fresh $txz"
+-    absprefix=$(cd $outd &>/dev/null; pwd -P)
+-    export PATH=$absprefix/bin:$PATH
+-    isfresh $absprefix/bin/ocamlc "$url" || (
+-        tar xf $txz -C $outd
+-        bn=$(basename $url)
+-        cd $outd/${bn%.tar.xz}
+-        ./configure -prefix $absprefix                                      \
+-                    -no-graph -no-debugger -no-ocamldoc -no-native-compiler
+-        make -j $mjobs world
+-        make install
+-        echo "k='$url'" >$absprefix/bin/ocamlc.past
+-    ) && vecho "fresh ocamlc"
+-    overs=$(ocamlc -vnum 2>/dev/null)
+-}
+ 
+ bocaml1() {
+     grep -q "$3" $outd/ordered || {
+@@ -224,7 +191,7 @@ bobjc() {
+     } && vecho "fresh $o"
+ }
+ 
+-ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown
++ver=@version@
+ 
+ cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
+ keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
+@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do
+ done
+ 
+ libs="str.cma unix.cma"
+-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
++clibs="-lmupdf -lfreetype -lpthread"
+ if $darwin; then
+     mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
+     clibs="$clibs -framework Cocoa -framework OpenGL"
+-- 
+2.19.2
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 292541df7e4..0683dd5d60a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17844,7 +17844,7 @@ in
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };
 
-  llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
+  llpp = ocaml-ng.ocamlPackages_4_07.callPackage ../applications/misc/llpp { };
 
   lmms = libsForQt5.callPackage ../applications/audio/lmms {
     lame = null;

From 7112cd88220dd53b95e8a5a43248f33328be357d Mon Sep 17 00:00:00 2001
From: Lana Black <lanablack@amok.cc>
Date: Mon, 24 Sep 2018 19:40:45 +0000
Subject: [PATCH 2267/2793] nixos/hardware/bladeRF: init at 2.0.2

This allows to easily enable bladerf-related udev rules with nixos
configuration.
---
 nixos/modules/hardware/bladeRF.nix            | 28 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 .../libraries/libbladeRF/default.nix          | 14 ++++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/hardware/bladeRF.nix

diff --git a/nixos/modules/hardware/bladeRF.nix b/nixos/modules/hardware/bladeRF.nix
new file mode 100644
index 00000000000..92544347714
--- /dev/null
+++ b/nixos/modules/hardware/bladeRF.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.hardware.bladeRF;
+
+in
+
+{
+  options.hardware.bladeRF = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enables udev rules for BladeRF devices. By default grants access
+        to users in the "bladerf" group. You may want to install the
+        libbladeRF package.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    services.udev.packages = [ pkgs.libbladeRF ];
+    users.groups.bladerf = {};
+  };
+}
\ No newline at end of file
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1a8f522a969..aba2b3b562c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -33,6 +33,7 @@
   ./config/vpnc.nix
   ./config/zram.nix
   ./hardware/all-firmware.nix
+  ./hardware/bladeRF.nix
   ./hardware/brightnessctl.nix
   ./hardware/ckb.nix
   ./hardware/cpu/amd-microcode.nix
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index ac8de886fad..45f24fc5fac 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
 , libusb1, udev }:
 
 stdenv.mkDerivation rec {
@@ -21,8 +21,17 @@ stdenv.mkDerivation rec {
   # Fixup shebang
   prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
 
+  # Fixes macos and freebsd compilation issue.
+  # https://github.com/Nuand/bladeRF/commit/0cb4ea888543b2dc75b876f7024e180854fbe9c3
+  patches = [ (fetchpatch {
+                name = "fix-OSX-and-FreeBSD-build.patch";
+                url = "https://github.com/Nuand/bladeRF/commit/0cb4ea88.diff";
+                sha256 = "1ccpa69vz2nlpdnxprh4rd1pgphk82z5lfmbrfdkn7srw6nxl469";
+              })
+            ];
+
   # Let us avoid nettools as a dependency.
-  patchPhase = ''
+  postPatch = ''
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
   '';
 
@@ -31,6 +40,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isLinux [
     "-DUDEV_RULES_PATH=etc/udev/rules.d"
     "-DINSTALL_UDEV_RULES=ON"
+    "-DBLADERF_GROUP=bladerf"
   ];
 
   hardeningDisable = [ "fortify" ];

From 6bdcc10767dd0c3c96ad1a3c24b4bae38bea3fe1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 18 Dec 2018 09:30:32 +0100
Subject: [PATCH 2268/2793] fluidsynth: keep version

This avoids a mass-rebuild for packages which depend on fluidsynth 2.x.
---
 pkgs/applications/audio/fluidsynth/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 8727c49398e..d40544a0fa4 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -21,6 +21,7 @@ with versionMap.${version};
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${fluidsynthVersion}";
+  version = fluidsynthVersion;
 
   src = fetchFromGitHub {
     owner = "FluidSynth";

From a532c6318ac2ad112f9c9ac9f6c5455db0633c9f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 18 Dec 2018 09:46:15 +0100
Subject: [PATCH 2269/2793] csound: document temp dependency on fluidsynth 1

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

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index da3cff0bac2..450ece6a12f 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,6 +14,9 @@
 
 stdenv.mkDerivation rec {
   name = "csound-${version}";
+  # When updating, please check if https://github.com/csound/csound/issues/1078
+  # has been fixed in the new version so we can use the normal fluidsynth
+  # version and remove fluidsynth 1.x from nixpkgs again.
   version = "6.12.0";
 
   enableParallelBuilding = true;

From 53a7d5ec99ca2df635b16ce4236af60ac19a01b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Dec 2018 03:28:01 -0800
Subject: [PATCH 2270/2793] squirrel-sql: 3.8.1 -> 3.9.0

* squirrel-sql: 3.8.1 -> 3.9.0 (#52029)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/squirrel-sql/versions

* squirrel-sql: cleanup

* squirrel-sql: don't pass stdenv as a build input
---
 .../tools/database/squirrel-sql/default.nix   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 7d4cf6ea5d5..548268bb762 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -5,29 +5,34 @@
 , drivers ? []
 }:
 let
-  version = "3.8.1";
+  version = "3.9.0";
 in stdenv.mkDerivation rec {
   name = "squirrel-sql-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
-    sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2";
+    sha256 = "0b16l7p7klagxnwkx2az4mbyd35kv4aj8xxbwm27pp3spz9dk8m0";
   };
 
-  buildInputs = [
-    jre makeWrapper stdenv unzip
-  ];
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ jre ];
 
   unpackPhase = ''
+    runHook preUnpack
     unzip ${src}
+    runHook postUnpack
   '';
 
   buildPhase = ''
+    runHook preBuild
     cd squirrelsql-${version}-standard
     chmod +x squirrel-sql.sh
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+    
     mkdir -p $out/share/squirrel-sql
     cp -r . $out/share/squirrel-sql
 
@@ -47,6 +52,8 @@ in stdenv.mkDerivation rec {
     ln -s $out/share/squirrel-sql/icons/acorn.png \
       $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
     ln -s ${desktopItem}/share/applications $out/share
+    
+    runHook postInstall
   '';
 
   desktopItem = makeDesktopItem {
@@ -59,11 +66,11 @@ in stdenv.mkDerivation rec {
     icon = "squirrel-sql";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Universal SQL Client";
     homepage = http://squirrel-sql.sourceforge.net/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ khumba ];
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ khumba ];
   };
 }

From 63576365fec31fa5defc1e58ac11fc8001dd6ade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Dec 2018 12:50:07 +0100
Subject: [PATCH 2271/2793] python-osc: update to latest git snapshot

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

diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index 87bd6ee258c..7e620769759 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage {
   pname = "osc";
-  version = "0.162.0-55-gb730f88";
-  disabled = isPy3k;
+  version = "0.163.0-40-gb4b1ec7";
+  disabled = isPy3k;    # urlgrabber doesn't support python-3.x
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "osc";
-    rev = "b730f880cfe85a8547f569355a21706f27ebfa78";
-    sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
+    rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c";
+    sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad";
   };
 
   buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper

From f09d369fa5fdc99bf84aeda196449876fa6c7165 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 18 Dec 2018 13:10:41 +0100
Subject: [PATCH 2272/2793] soapybladerf: 0.3.5 -> 0.4.0

resolves compatability issue with libbladerf-2.0.2
---
 pkgs/applications/misc/soapybladerf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix
index 4e1adc32946..bab829e05e3 100644
--- a/pkgs/applications/misc/soapybladerf/default.nix
+++ b/pkgs/applications/misc/soapybladerf/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.3.5";
+  version = "0.4.0";
 
 in stdenv.mkDerivation {
   name = "soapybladerf-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyBladeRF";
     rev = "soapy-bladerf-${version}";
-    sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg";
+    sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From a506fb228d553a91507c7d9be884cee19ae42aed Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Dec 2018 08:13:41 -0500
Subject: [PATCH 2273/2793] vimPlugins.Recover-vim: init at 2018-10-22

---
 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 4f73822b573..ebb8f1868ff 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1280,6 +1280,16 @@
     };
   };
 
+  Recover-vim = buildVimPluginFrom2Nix {
+    name = "Recover-vim-2018-10-22";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "Recover.vim";
+      rev = "28195f7d1047515438c43a3ae8ac39648376412b";
+      sha256 = "03jd3jzq0b1djym448vyg0bvrkfrhk86djkbkyzajrsfj46ygs8q";
+    };
+  };
+
   Rename = buildVimPluginFrom2Nix {
     name = "Rename-2011-08-31";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e914a3f4323..7bb07aa3e9d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -28,6 +28,7 @@ Chiel92/vim-autoformat
 chikatoike/concealedyank.vim
 chikatoike/sourcemap.vim
 chrisbra/CheckAttach
+chrisbra/Recover.vim
 chrisbra/csv.vim
 chrisgeo/sparkup
 chriskempson/base16-vim

From 685c4f56083272594a53143c19c08906961c4b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Delgado=20Kr=C3=A4mer?= <private@pablode.com>
Date: Mon, 17 Dec 2018 19:11:40 +0100
Subject: [PATCH 2274/2793] nixos/oh-my-zsh: fix wrong manual information

Manual still refers to 'programs.ohMyZsh' although it should be 'programs.zsh.ohMyZsh'.
---
 nixos/modules/programs/zsh/oh-my-zsh.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 5cf690c1a56..b26980daf06 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -19,7 +19,7 @@
    configuration format of <literal>oh-my-zsh</literal>.
 <programlisting>
 {
-  programs.ohMyZsh = {
+  programs.zsh.ohMyZsh = {
     enable = true;
     plugins = [ "git" "python" "man" ];
     theme = "agnoster";
@@ -51,7 +51,7 @@
    The module can do this as well:
 <programlisting>
 {
-  programs.ohMyZsh.custom = "~/path/to/custom/scripts";
+  programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";
 }
 </programlisting>
   </para>
@@ -73,7 +73,7 @@
 <programlisting>
 { pkgs, ... }:
 {
-  programs.ohMyZsh.customPkgs = with pkgs; [
+  programs.zsh.ohMyZsh.customPkgs = with pkgs; [
     pkgs.nix-zsh-completions
     # and even more...
   ];
@@ -87,7 +87,7 @@
 
   <para>
    <emphasis>Please keep in mind that this is not compatible with
-   <literal>programs.ohMyZsh.custom</literal> as it requires an immutable store
+   <literal>programs.zsh.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>

From db558b31b9af9db59a8000c85c21057c88efcc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 18 Dec 2018 14:44:37 +0100
Subject: [PATCH 2275/2793] python3.pkgs.git-annex-adapter: 0.2.0 -> 0.2.1

---
 .../git-annex-adapter/default.nix             | 38 ++-----------------
 .../not-a-git-repo-testcase.patch             | 13 -------
 2 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch

diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index f4d690eedc3..d8fc12b1c42 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -4,16 +4,16 @@
 
 buildPythonPackage rec {
   pname = "git-annex-adapter";
-  version = "0.2.0";
+  version = "0.2.1";
 
   disabled = !isPy3k;
 
-  # There is only a wheel on PyPI - build from source instead
+  # No tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz";
+    sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097";
   };
 
   prePatch = ''
@@ -22,38 +22,6 @@ buildPythonPackage rec {
       --replace "'git-annex'" "'${git-annex}/bin/git-annex'"
   '';
 
-  patches = [
-    # fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error.
-    ./not-a-git-repo-testcase.patch
-
-    # fixes the testcase which parses the output of `git-annex info` where several
-    # new lines are displayed that broke the test.
-    (fetchpatch {
-      url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch";
-      sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m";
-    })
-
-    # fixes the testcase which runs "git status" and complies with the
-    # slightly altered output.
-    (fetchpatch {
-      url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
-      sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
-    })
-
-    # fix test broken due to renaming of repository version 6 to 7
-    (fetchpatch {
-      url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch;
-      sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7";
-    })
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin:
-    # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b
-    (fetchpatch {
-      url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch";
-      sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7";
-    })
-  ];
-
   checkInputs = [
     utillinux # `rev` is needed in tests/test_process.py
   ];
diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch
deleted file mode 100644
index 2a386ee3f2f..00000000000
--- a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_process.py b/tests/test_process.py
-index 493fc8f..feb1833 100644
---- a/tests/test_process.py
-+++ b/tests/test_process.py
-@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase):
-         with self.assertRaises(subprocess.CalledProcessError) as cm:
-             runner('status', '-sb')
-         self.assertIn(
--            "fatal: Not a git repository",
-+            "fatal: not a git repository",
-             cm.exception.stderr,
-         )
- 

From fb227af6a079b5ec70e9996237d62850bdb59364 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Dec 2018 06:11:23 -0800
Subject: [PATCH 2276/2793] subsonic: 6.1.3 -> 6.1.5

* subsonic: 6.1.3 -> 6.1.5 (#52019)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subsonic/versions

* subsonic: license is unfree

Went closed-source since 6.0beta2
See: http://forum.subsonic.org/forum/viewtopic.php?f=4&t=16604#p71128
---
 pkgs/servers/misc/subsonic/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index f546b0b075e..50e754791e6 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, jre }:
 
-let version = "6.1.3"; in
-
 stdenv.mkDerivation rec {
   name = "subsonic-${version}";
-  inherit version;
+  version = "6.1.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz";
-    sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx";
+    sha256 = "1xz3flxd5hxcvvg1izzxpv5rxwb5zprk92vsgvmcniy7j7r66936";
   };
 
   inherit jre;
@@ -16,20 +14,24 @@ stdenv.mkDerivation rec {
   # Create temporary directory to extract tarball into to satisfy Nix's need
   # for a directory to be created in the unpack phase.
   unpackPhase = ''
+    runHook preUnpack
     mkdir ${name}
     tar -C ${name} -xzf $src
+    runHook postUnpack
   '';
   installPhase = ''
+    runHook preInstall
     mkdir $out
     cp -r ${name}/* $out
+    runHook postInstall
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://subsonic.org;
     description = "Personal media streamer";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ telotortium ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ telotortium ];
+    platforms = platforms.unix;
   };
 
   phases = ["unpackPhase" "installPhase"];

From 4d1487908195d8c0975a3aca0b7a3a2dbf7301a8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Dec 2018 09:11:56 -0500
Subject: [PATCH 2277/2793] linux: 4.4.167 -> 4.4.168

---
 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 9ef3768332d..5005e5b1d84 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.167";
+  version = "4.4.168";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pryjpih8js9640jhv74wzvka4199irnp7bzn33lyh35lll4rjik";
+    sha256 = "0zhmhccwki1r7p99ap772p3bknl4hm6zfwvzk97nas42anqc0ylg";
   };
 } // (args.argsOverride or {}))

From e60233db007a81eb846a39ca4a17db00d8d8cc26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Dec 2018 06:46:05 -0800
Subject: [PATCH 2278/2793] sundials: 3.2.1 -> 4.0.0

* sundials: 3.2.1 -> 4.0.0 (#52022)

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

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

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index f3cfc1e56e8..2a5acc31382 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,23 +3,24 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "3.2.1";
+  version = "4.0.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
-  url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-  sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
+    url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
+    sha256 = "06cspmhx9qn7x722lmy9q2jr80hnnv2h7n54da7y5m951p1xfgcm";
   };
 
   preConfigure = ''
     export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags"
   '';
   
-  buildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ python ];
 
   meta = with stdenv.lib; {
     description = "Suite of nonlinear differential/algebraic equation solvers";
-    homepage    = https://computation.llnl.gov/casc/sundials/main.html;
+    homepage    = https://computation.llnl.gov/projects/sundials;
     platforms   = platforms.all;
     maintainers = [ maintainers.idontgetoutmuch ];
     license     = licenses.bsd3;

From 3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 11:11:38 -0500
Subject: [PATCH 2279/2793] pagmo2: 2.8 -> 2.9 fix broken package

corrects the library nlopt location as well.
---
 pkgs/development/libraries/pagmo2/default.nix | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index c680efa95f8..842fae5ea93 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -11,32 +11,34 @@
 
 stdenv.mkDerivation rec {
   name = "pagmo2-${version}";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchFromGitHub {
      owner = "esa";
      repo = "pagmo2";
      rev = "v${version}";
-     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
+     sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400";
   };
 
-  buildInputs = [ cmake eigen nlopt ipopt boost ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ eigen nlopt ipopt boost ];
 
-  preBuild = ''
-    cp -r $src/* .
-  '';
+  cmakeFlags = [
+    "-DPAGMO_BUILD_TESTS=no"
+    "-DPAGMO_WITH_EIGEN3=yes"
+    "-DPAGMO_WITH_NLOPT=yes"
+    "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so"
+    "-DPAGMO_WITH_IPOPT=yes"
+    "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'"
+  ];
 
-  cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no"
-                 "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes"
-                 "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
-                 "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
-
-  # All but one test pass skip for now (tests also take about 30 min to compile)
+  # tests pass but take 30+ minutes
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://esa.github.io/pagmo2/;
     description = "Scientific library for massively parallel optimization";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.costrouc ];
   };
 }

From de6b13db63d3ff3cbc53d4152e31bc742ddf0991 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Dec 2018 12:32:19 -0500
Subject: [PATCH 2280/2793] liberationsansnarrow_binary: remove

---
 .../fonts/liberationsansnarrow/binary.nix     | 22 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/data/fonts/liberationsansnarrow/binary.nix

diff --git a/pkgs/data/fonts/liberationsansnarrow/binary.nix b/pkgs/data/fonts/liberationsansnarrow/binary.nix
deleted file mode 100644
index c7afc91af84..00000000000
--- a/pkgs/data/fonts/liberationsansnarrow/binary.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, liberationsansnarrow }:
-
-stdenv.mkDerivation rec {
-  version = "1.07.3";
-  name = "liberationsansnarrow-${version}";
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
-    sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
-
-    mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
-  '';
-
-  inherit (liberationsansnarrow) meta;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9be90a907ef..a24d8c84050 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15536,7 +15536,6 @@ in
   liberation_ttf = liberation_ttf_v2_binary;
 
   liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
-  liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { };
 
   liberastika = callPackage ../data/fonts/liberastika { };
 

From ec8d663d597204402a6deea6600a070870ecf2f7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Dec 2018 12:36:11 -0500
Subject: [PATCH 2281/2793] liberationsansnarrow: 1.07.3 -> 1.07.6, rename to
 liberation-sans-narrow

Upstream also moved to github
---
 .../default.nix                               | 24 +++++++++----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename pkgs/data/fonts/{liberationsansnarrow => liberation-sans-narrow}/default.nix (63%)

diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix
similarity index 63%
rename from pkgs/data/fonts/liberationsansnarrow/default.nix
rename to pkgs/data/fonts/liberation-sans-narrow/default.nix
index 0027d44d9db..97a1ff70f49 100644
--- a/pkgs/data/fonts/liberationsansnarrow/default.nix
+++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, fontforge, pythonPackages, python}:
+{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }:
 
 stdenv.mkDerivation rec {
-  pname = "liberationsansnarrow";
-  version = "1.07.3";
-  name = "${pname}-${version}";
+  pname = "liberation-sans-narrow";
+  version = "1.07.6";
 
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
-    sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";
+  src = fetchFromGitHub {
+    owner = "liberationfonts";
+    repo = pname;
+    rev = version;
+    sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm";
   };
 
   buildInputs = [ fontforge pythonPackages.fonttools python ];
@@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/fonts/truetype
     cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
 
-    mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+    mkdir -p "$out/doc/${pname}-${version}"
+    cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true
   '';
 
   meta = with stdenv.lib; {
@@ -32,8 +33,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.gpl2;
-    homepage = https://fedorahosted.org/liberation-fonts/;
-    maintainers = [ maintainers.leenaars
-    ];
+    homepage = https://github.com/liberationfonts;
+    maintainers = [ maintainers.leenaars ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8d29370c876..b92c02e9fa4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -161,6 +161,7 @@ mapAliases ({
   libcap_progs = libcap.out; # added 2016-04-29
   libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
   libdbusmenu-glib = libdbusmenu; # added 2018-05-01
+  liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
   libgumbo = gumbo; # added 2018-01-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a24d8c84050..4843d2e1a48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15535,7 +15535,7 @@ in
     liberation_ttf_v2_binary;
   liberation_ttf = liberation_ttf_v2_binary;
 
-  liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
+  liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
 
   liberastika = callPackage ../data/fonts/liberastika { };
 

From b2c6efeaed7a5897de33dae7ab632b9b582f6a2f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Dec 2018 12:54:38 -0500
Subject: [PATCH 2282/2793] liberation_ttf: drop binary packages

That means the following attributes are gone:
  - liberation_ttf_v1_binary
  - liberation_ttf_v2_binary

Because of this Libreoffice uses liberation source fonts

I've renamed these attributes because the binary form is gone:

  - liberation_ttf_v1_from_source -> liberation_ttf_v1
  - liberation_ttf_v2_from_source -> liberation_ttf_v2

They're aliases for these.
---
 .../fonts/redhat-liberation-fonts/default.nix  | 18 ++----------------
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/all-packages.nix                | 13 ++++++-------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 88d438096c1..bd83e16b89c 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -49,21 +49,14 @@ let
     };
 
 in {
-  liberation_ttf_v1_from_source = common rec {
+  liberation_ttf_v1 = common rec {
     version = "1.07.4";
     url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
     sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
     nativeBuildInputs = [ fontforge ];
     outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
   };
-  liberation_ttf_v1_binary = common rec {
-    version = "1.07.4";
-    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
-    sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
-    nativeBuildInputs = [ ];
-    outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
-  };
-  liberation_ttf_v2_from_source = common rec {
+  liberation_ttf_v2 = common rec {
     version = "2.00.1";
     url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
     sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
@@ -75,11 +68,4 @@ in {
     '';
     outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn";
   };
-  liberation_ttf_v2_binary = common rec {
-    version = "2.00.1";
-    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
-    sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
-    nativeBuildInputs = [ ];
-    outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
-  };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b92c02e9fa4..8360bf44706 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -161,6 +161,8 @@ mapAliases ({
   libcap_progs = libcap.out; # added 2016-04-29
   libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
   libdbusmenu-glib = libdbusmenu; # added 2018-05-01
+  liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
+  liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
   liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4843d2e1a48..0688b2853f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15529,11 +15529,10 @@ in
   league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
 
   inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
-    liberation_ttf_v1_from_source
-    liberation_ttf_v1_binary
-    liberation_ttf_v2_from_source
-    liberation_ttf_v2_binary;
-  liberation_ttf = liberation_ttf_v2_binary;
+    liberation_ttf_v1
+    liberation_ttf_v2
+    ;
+  liberation_ttf = liberation_ttf_v2;
 
   liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
 
@@ -17910,8 +17909,8 @@ in
       fontDirectories = [
         carlito dejavu_fonts
         freefont_ttf xorg.fontmiscmisc
-        liberation_ttf_v1_binary
-        liberation_ttf_v2_binary
+        liberation_ttf_v1
+        liberation_ttf_v2
       ];
     };
     clucene_core = clucene_core_2;

From 0adf200ad593273543c7be9ea9391bea56501ad9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Dec 2018 12:58:09 -0500
Subject: [PATCH 2283/2793] liberation_ttf: v1: 1.07.4 -> 1.07.5 v2: 2.00.1 ->
 2.00.4

Upstream moved to github. Using fetchFromGitHub.
---
 .../fonts/redhat-liberation-fonts/default.nix | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index bd83e16b89c..0ee2a0c308c 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, fontforge, python2}:
+{ stdenv, fetchFromGitHub, fontforge, python3 }:
 
 let
-  inherit (python2.pkgs) fonttools;
+  inherit (python3.pkgs) fonttools;
 
   common =
-    {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}:
+    { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }:
     stdenv.mkDerivation rec {
-      name = "liberation-fonts-${version}";
-      src = fetchurl {
-        inherit url sha256;
+      pname = "liberation-fonts";
+      inherit version;
+
+      src = fetchFromGitHub {
+        owner = "liberationfonts";
+        rev = version;
+        inherit repo sha256;
       };
 
       inherit nativeBuildInputs postPatch;
@@ -17,8 +21,8 @@ let
         mkdir -p $out/share/fonts/truetype
         cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
 
-        mkdir -p "$out/share/doc/${name}"
-        cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true
+        mkdir -p "$out/share/doc/${pname}-${version}"
+        cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true
       '';
 
       outputHashAlgo = "sha256";
@@ -40,7 +44,7 @@ let
         '';
 
         license = licenses.ofl;
-        homepage = https://pagure.io/liberation-fonts/;
+        homepage = https://github.com/liberationfonts;
         maintainers = [
           maintainers.raskin
         ];
@@ -50,22 +54,22 @@ let
 
 in {
   liberation_ttf_v1 = common rec {
-    version = "1.07.4";
-    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
-    sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
+    repo = "liberation-1.7-fonts";
+    version = "1.07.5";
     nativeBuildInputs = [ fontforge ];
-    outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
+    sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
+    outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4";
   };
   liberation_ttf_v2 = common rec {
-    version = "2.00.1";
-    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
-    sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
+    repo = "liberation-fonts";
+    version = "2.00.4";
     nativeBuildInputs = [ fontforge fonttools ];
     postPatch = ''
       substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
         'font = ttLib.TTFont(fontfile)' \
         'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
     '';
-    outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn";
+    sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
+    outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn";
   };
 }

From 19d077a157caabb65133e48fbd109e94932ffab3 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 2 Dec 2018 11:21:50 -0500
Subject: [PATCH 2284/2793] pythonPackages.pygmo: 2.8 -> 2.9 refactor fix
 broken package

Introduce a `pagmo2WithPython` which overrides the pagmo2 expression
and enables the pygmo build. Then hand it over to `buildPythonPackage`
by making it the src to produce a usable package.
---
 .../python-modules/pygmo/default.nix          | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix
index 2500121dc9e..30e4444f552 100644
--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
-, cmake
 , eigen
 , nlopt
 , ipopt
@@ -11,38 +10,44 @@
 , cloudpickle
 , ipyparallel
 , numba
+, python
 }:
 
-buildPythonPackage rec {
-  pname = "pygmo";
-  version = "2.8";
-
-  src = fetchFromGitHub {
-     owner = "esa";
-     repo = "pagmo2";
-     rev = "v${version}";
-     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
-  };
-
-  buildInputs = [ cmake eigen nlopt ipopt boost pagmo2 ];
+let
   propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ];
 
-  preBuild = ''
-    cp -v -r $src/* .
-    cmake -DCMAKE_INSTALL_PREFIX=$out -DPAGMO_BUILD_TESTS=no -DCMAKE_SYSTEM_NAME=Linux -DPagmo_DIR=${pagmo2} -DPAGMO_BUILD_PYGMO=yes -DPAGMO_BUILD_PAGMO=no -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so -DPAGMO_WITH_IPOPT=yes -DIPOPT=${ipopt}
+  pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: {
+    cmakeFlags = oldAttrs.cmakeFlags ++ [
+      "-DPAGMO_BUILD_PYGMO=yes"
+      "-DPAGMO_BUILD_PAGMO=no"
+      "-DPagmo_DIR=${pagmo2}"
+    ];
+    buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs;
+    postInstall = ''
+      mv wheel $out
+    '';
+  });
 
-    make install
-    mv $out/lib/python*/site-packages/pygmo wheel
+in buildPythonPackage rec {
+  pname = "pygmo";
+  version = pagmo2WithPython.version;
+
+  inherit propagatedBuildInputs;
+
+  src = pagmo2WithPython;
+
+  preBuild = ''
+    mv ${python.sitePackages}/pygmo wheel
     cd wheel
   '';
 
   # dont do tests
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Parallel optimisation for Python";
     homepage = https://esa.github.io/pagmo2/;
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ costrouc ];
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.costrouc ];
   };
 }

From 66a6445f6671bf55807ecdd61e99371b2a34a986 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Nov 2018 15:27:07 -0800
Subject: [PATCH 2285/2793] python36Packages.ase: 3.16.2 -> 3.17.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/python3.6-ase/versions
---
 pkgs/development/python-modules/ase/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 1f7b9419278..3a466170c77 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , numpy
 , scipy
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.16.2";
   pname = "ase";
+  version = "3.17.0";
 
-  src = fetchurl {
-     url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
-     sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
   };
 
   propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
@@ -27,10 +27,10 @@ buildPythonPackage rec {
   # tests just hang most likely due to something with subprocesses and cli
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Atomic Simulation Environment";
     homepage = https://wiki.fysik.dtu.dk/ase/;
-    license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ costrouc ];
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From f486f475e712750b91e9d97bf69c2f77dcfc2e65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 22:45:13 -0800
Subject: [PATCH 2286/2793] notejot: 1.4.7 -> 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/notejot/versions
---
 pkgs/applications/misc/notejot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index 7ad834f8172..a687e104605 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "1.4.7";
+  version = "1.5.2";
 
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb";
+    sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk";
   };
 
   nativeBuildInputs = [

From c2cde10f3086ff389b136636f812193532abfa62 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 3 Dec 2018 08:15:57 -0600
Subject: [PATCH 2287/2793] vivid: init at 0.4.0

---
 pkgs/tools/misc/vivid/default.nix | 33 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/misc/vivid/default.nix

diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
new file mode 100644
index 00000000000..7b1abd80758
--- /dev/null
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "${pname}-${version}";
+  pname = "vivid";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "sharkdp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "13x0295v5blvv8dxhimbdjh81l7xl0vm6zni3qjd85psfn61371q";
+  };
+
+  postPatch = ''
+    substituteInPlace src/main.rs --replace /usr/share $out/share
+  '';
+
+  cargoSha256 = "156wapa2ds7ij1jhrpa8mm6dicwq934qxl56sqw3bgz6pfa8fldz";
+
+  postInstall = ''
+    mkdir -p $out/share/${pname}
+    cp -rv config/* themes $out/share/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A generator for LS_COLORS with support for multiple color themes";
+    homepage = https://github.com/sharkdp/vivid;
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = [ maintainers.dtzWill ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73eaccda0ce..9cd79c98beb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22890,6 +22890,8 @@ in
 
   virglrenderer = callPackage ../development/libraries/virglrenderer { };
 
+  vivid = callPackage ../tools/misc/vivid { };
+
   vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
 
   wavegain = callPackage ../applications/audio/wavegain { };

From a375d4bfc35998aec36ee15b7c71d99a5b78fa2d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 18 Dec 2018 10:50:53 -0500
Subject: [PATCH 2288/2793] stdenv: shorten evaluation errors when in Hydra
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hydra's page showing evaluation errors is about a mile long, showing
buckets of user-friendly errors, like this:

    in job ‘seyren.aarch64-linux’:
    Package ‘oraclejre-8u191’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix:71 has an unfree license (‘unfree’), refusing to evaluate.

    a) For `nixos-rebuild` you can set
      { nixpkgs.config.allowUnfree = true; }
    in configuration.nix to override this.

    b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
      { allowUnfree = true; }
    to ~/.config/nixpkgs/config.nix.

    in job ‘jetbrains.webstorm.x86_64-linux’:
    Package ‘webstorm-2018.3.1’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/applications/editors/jetbrains/default.nix:230 has an unfree license (‘unfree’), refusing to evaluate.

    a) For `nixos-rebuild` you can set
      { nixpkgs.config.allowUnfree = true; }
    in configuration.nix to override this.

    b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
      { allowUnfree = true; }
    to ~/.config/nixpkgs/config.nix.

This makes it extremely hard to find actual issues in the output. This
patch set makes the output much more condensed in Hydra:

    Failed to evaluate nifticlib-2.0.0: «unsupported»: is not supported on ‘x86_64-apple-darwin’
    Failed to evaluate dmd-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
    Failed to evaluate dmdBuild-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
    Failed to evaluate ldc-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
    Failed to evaluate ldcBuild-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
    Failed to evaluate ldc-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
    Failed to evaluate ldcBuild-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’
---
 pkgs/stdenv/generic/check-meta.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index d09dff10b27..fe0c8cfad91 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -4,6 +4,10 @@
 { lib, config, hostPlatform, meta }:
 
 let
+  # If we're in hydra, we can dispense with the more verbose error
+  # messages and make problems easier to spot.
+  inHydra = config.inHydra or false;
+
   # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
   # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
   shouldCheckMeta = config.checkMeta or false;
@@ -141,10 +145,12 @@ let
 
   handleEvalIssue = attrs: { reason , errormsg ? "" }:
     let
-      msg = ''
-        Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
+      msg = if inHydra
+        then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}"
+        else ''
+          Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
 
-      '' + (builtins.getAttr reason remediation) attrs;
+        '' + (builtins.getAttr reason remediation) attrs;
 
       handler = if config ? "handleEvalIssue"
         then config.handleEvalIssue reason

From d268e3b2c07b9e99ab02c6d3f3241d5182675a21 Mon Sep 17 00:00:00 2001
From: Member Betty <45791182+memberbetty@users.noreply.github.com>
Date: Tue, 18 Dec 2018 12:03:10 +0100
Subject: [PATCH 2289/2793] aws-google-auth: use python3 (#52445)

---
 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 0688b2853f9..2d84dc296ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -622,7 +622,7 @@ in
 
   aws-env = callPackage ../tools/admin/aws-env { };
 
-  aws-google-auth = pythonPackages.callPackage ../tools/admin/aws-google-auth { };
+  aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { };
 
   aws-okta = callPackage ../tools/security/aws-okta { };
 

From 050dad2901375c1d6a21d7c8c019ce47fd1a4edf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 16:42:24 -0800
Subject: [PATCH 2290/2793] polar-bookshelf: 1.1.0 -> 1.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/polar-bookshelf/versions
---
 pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index f1325a6c6ac..e889a8fd8cb 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "polar-bookshelf-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   # fetching a .deb because there's no easy way to package this Electron app
   src = fetchurl {
     url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
-    sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw";
+    sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr";
   };
 
   buildInputs = [

From d8b5275d43e2517eda50490d1c245e22c5a4e741 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 16 Dec 2018 22:06:43 -0500
Subject: [PATCH 2291/2793] vscode-extensions.ms-python.python: 2018.11.0 ->
 2018.12.1

---
 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 6860a0d2ad0..65130da9095 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.11.0";
-    sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl";
+    version = "2018.12.1";
+    sha256 = "1cf3yll2hfililcwq6avscgi35caccv8m8fdsvzqdfrggn5h41h4";
   };
 
   postPatch = ''

From 2e64abd82f8bb85393a2e62f5238f788e8af2744 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 23:21:19 -0800
Subject: [PATCH 2292/2793] focuswriter: 1.6.16 -> 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/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 000797c9b70..2708c40d509 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.16";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m";
+    sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From a32c2f99ee6bca60e8635457cfd832680bc2413b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 05:09:51 -0800
Subject: [PATCH 2293/2793] libraw: 0.19.0 -> 0.19.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/libraw/versions
---
 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 e009a9f920b..e08cf3fe7a8 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.19.0";
+  version = "0.19.1";
 
   src = fetchurl {
     url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8";
+    sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From 2cb1949548531334d469aadba6a1c502935da96c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 17 Dec 2018 20:18:19 -0600
Subject: [PATCH 2294/2793] polar-bookshelf: 1.1.1 -> 1.5.1

---
 pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index e889a8fd8cb..bcff0db65ab 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "polar-bookshelf-${version}";
-  version = "1.1.1";
+  version = "1.5.1";
 
   # fetching a .deb because there's no easy way to package this Electron app
   src = fetchurl {
     url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
-    sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr";
+    sha256 = "1nnbybrzk1ms83490gbw5gakfim0j2c8gp83d9iaqwl4590qgwlg";
   };
 
   buildInputs = [

From 33fcf39a6e959b3f985b927b9f6a02b4766af218 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Tue, 18 Dec 2018 19:39:06 +0100
Subject: [PATCH 2295/2793] Geany: Taking over maintainership

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index d1499fc2180..caead872eb2 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://www.geany.org/;
     license = licenses.gpl2;
-    maintainers = [];
+    maintainers = with maintainers; [ frlan ];
     platforms = platforms.all;
   };
 }

From 6da82e7c35fa60d102cd6b0f6a4665531e93efae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 14:04:21 -0800
Subject: [PATCH 2296/2793] python37Packages.fonttools: 3.32.0 -> 3.33.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/python3.7-fonttools/versions
---
 pkgs/development/python-modules/fonttools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 0cab6fc18a5..d435cae9419 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.32.0";
+  version = "3.33.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16cg5v50x905c0dr34wqk70b0n3mqzp41iir2rd73f31d1z9jndq";
+    sha256 = "196yl6m3fycrbsclcmg550821j18ga6dpghmk5nb1xi4j4yb62gq";
     extension = "zip";
   };
 

From 96203f5fc3ab771d63fa2f01870a10a6783862b4 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 16 Dec 2018 22:08:16 -0500
Subject: [PATCH 2297/2793] wakatime: 10.2.1 -> 10.6.0

---
 pkgs/tools/misc/wakatime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 6d71a407239..710c6c61c64 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   name = "wakatime-${version}";
-  version = "10.2.1";
+  version = "10.6.0";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime";
     rev = version;
-    sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx";
+    sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln";
   };
 
   # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt

From ceb89f042ebecf50331a68231016483f41d88e5f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 16 Dec 2018 22:07:42 -0500
Subject: [PATCH 2298/2793] vscode-extensions.WakaTime.vscode-wakatime: 1.2.4
 -> 1.2.5

---
 pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index 48e7c9268ee..084a1e01375 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -7,8 +7,8 @@ in
     mktplcRef = {
       name = "vscode-wakatime";
       publisher = "WakaTime";
-      version = "1.2.4";
-      sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb";
+      version = "1.2.5";
+      sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra";
     };
 
     postPatch = ''

From 23859991e90acb8cbd111d8204e13030c1a77d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Tue, 18 Dec 2018 20:24:58 +0100
Subject: [PATCH 2299/2793] adoptopenjdk-bin: use python-withPackages for
 shebang

Co-Authored-By: bennofs <benno.fuenfstueck@gmail.com>
---
 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index a410501de0a..66e1abd05e9 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests
+#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
 
 import json
 import re

From 43dd779a8d019a0667e3eed1346f83ffe2004e05 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 14 Dec 2018 13:22:30 +0100
Subject: [PATCH 2300/2793] radarr: 0.2.0.1120 -> 0.2.0.1217

---
 pkgs/servers/radarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 8d920af654d..62cb2d7f348 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.1120";
+  version = "0.2.0.1217";
 
   src = fetchurl {
-    url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0vsjaza0k4djb3vnazl2py4qmbxqfyyr0x9p4flq78yn79hp3439";
+    url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz";
+    sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/{bin,share/${name}}
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A Usenet/BitTorrent movie downloader.";
+    description = "A Usenet/BitTorrent movie downloader";
     homepage = https://radarr.video/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ edwtjo ];

From 016d1a991d8d1ef284f0d0a97f82a75a28a5ef6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 07:49:24 -0800
Subject: [PATCH 2301/2793] jackett: 0.10.471 -> 0.10.504

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 b3328538496..41da87d4065 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.471";
+  version = "0.10.504";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0la05akvpvfg9jdgfd39wnc87zi7axzx7499w9m3py7qqqyvgyin";
+    sha256 = "1nqci6a9is0kf0vn8wlbfbynllf0pkndcb1z49d1n3wwc8dhji86";
   };
 
   buildInputs = [ makeWrapper ];

From f751f85b638611844f4d3e4476e2ccfeef53f713 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 02:41:03 -0800
Subject: [PATCH 2302/2793] shotcut: 18.10.08 -> 18.11.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/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 0c9d9757584..877d1a7525f 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.10.08";
+  version = "18.11.18";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08";
+    sha256 = "0yhrjqc5cby9vc81z5zh5xg34mvh6q8dd896p2izfcqcdhdz7cs3";
   };
 
   enableParallelBuilding = true;

From 61b435d8665d3e1ee2029e95b9934aed76fe0ef1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 04:36:18 -0800
Subject: [PATCH 2303/2793] librelp: 1.2.18 -> 1.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/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 e5d64c4143f..284b95b8a2b 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.18";
+  name = "librelp-1.3.0";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53";
+    sha256 = "1xg99ndn65984mrh30qvys5npc73ag4348whshghrcj9azya494z";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 59f8d67ec7bd70d6565ecbcf561b6eabf6cadda3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Dec 2018 15:01:49 -0500
Subject: [PATCH 2304/2793] playerctl: enable gtk-doc generation

---
 pkgs/tools/audio/playerctl/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index 9d30878daae..6bc15cb65d8 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobject-introspection }:
+{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
@@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ];
   buildInputs = [ glib ];
 
-  # docs somehow crashes the install phase:
-  # https://github.com/acrisci/playerctl/issues/85
-  mesonFlags = [ "-Dgtk-doc=false" ];
-
   meta = with stdenv.lib; {
     description = "Command-line utility and library for controlling media players that implement MPRIS";
     homepage = https://github.com/acrisci/playerctl;

From de9c97c0c872d06799075f18e263b5dd101bd839 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 03:25:01 -0800
Subject: [PATCH 2305/2793] libcouchbase: 2.10.0 -> 2.10.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/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 c4824bf7a05..00e080d8584 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.10.0";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
+    sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 2757ddb18221e1cad72dd4ca12930cfaf017ed6b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 28 Nov 2018 22:14:43 +0100
Subject: [PATCH 2306/2793] Separate androidndkpkgs from androidenv

---
 .../androidndk-pkgs.nix                       |  0
 pkgs/development/androidndk-pkgs/default.nix  | 36 +++++++++++++++++++
 .../development/mobile/androidenv/default.nix | 33 +----------------
 pkgs/stdenv/cross/default.nix                 |  2 +-
 pkgs/top-level/all-packages.nix               |  4 +++
 5 files changed, 42 insertions(+), 33 deletions(-)
 rename pkgs/development/{mobile/androidenv => androidndk-pkgs}/androidndk-pkgs.nix (100%)
 create mode 100644 pkgs/development/androidndk-pkgs/default.nix

diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
similarity index 100%
rename from pkgs/development/mobile/androidenv/androidndk-pkgs.nix
rename to pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
new file mode 100644
index 00000000000..1c34b1dff7d
--- /dev/null
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -0,0 +1,36 @@
+{ androidenv, buildPackages, pkgs, targetPackages
+, includeSources ? true, licenseAccepted ? false
+}:
+
+rec {
+
+  "17c" = import ./androidndk-pkgs.nix {
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      lib stdenv
+      runCommand wrapBintoolsWith wrapCCWith;
+    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+    # but for splicing messing up on infinite recursion for the variants we
+    # *dont't* use. Using this workaround, but also making a test to ensure
+    # these two really are the same.
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c;
+    androidndk = androidenv.androidndk_17c;
+    targetAndroidndkPkgs = targetPackages.androidndkPkgs_17c;
+  };
+
+  "10e" = import ./androidndk-pkgs.nix {
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      lib stdenv
+      runCommand wrapBintoolsWith wrapCCWith;
+    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+    # but for splicing messing up on infinite recursion for the variants we
+    # *dont't* use. Using this workaround, but also making a test to ensure
+    # these two really are the same.
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
+    androidndk = androidenv.androidndk_10e;
+    targetAndroidndkPkgs = targetPackages.androidndkPkgs_10e;
+  };
+}
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 282924047aa..071e17c325d 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,4 +1,4 @@
-{ buildPackages, pkgs, pkgs_i686, targetPackages
+{ pkgs, pkgs_i686, buildPackages
 , includeSources ? true, licenseAccepted ? false
 }:
 
@@ -341,37 +341,6 @@ rec {
     inherit androidsdk;
   };
 
-  androidndkPkgs_17c = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c;
-    androidndk = androidndk_17c;
-    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17c;
-  };
-  androidndkPkgs = androidndkPkgs_17c;
-
-  androidndkPkgs_10e = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
-    androidndk = androidndk_10e;
-    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
-  };
-
   buildGradleApp = import ./build-gradle-app.nix {
     inherit (pkgs) stdenv jdk gnumake gawk file runCommand
                    which gradle fetchurl buildEnv;
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index a6063049a3a..b8b1e4a258d 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -53,7 +53,7 @@ in lib.init bootStages ++ [
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
            else if crossSystem.useAndroidPrebuilt or false
-             then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
+             then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
 
       extraNativeBuildInputs = old.extraNativeBuildInputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0676f8af384..566a4d8b40a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -832,6 +832,10 @@ in
 
   inherit (androidenv) androidndk;
 
+  androidndkPkgs = androidndkPkgs_17c;
+  androidndkPkgs_17c = (callPackage ../development/androidndk-pkgs {})."17c";
+  androidndkPkgs_10e = (callPackage ../development/androidndk-pkgs {})."10e";
+
   androidsdk = androidenv.androidsdk_8_0;
 
   androidsdk_extras = res.androidenv.androidsdk_8_0_extras;

From 74750dc67d0b51d7eb8976a3ffb52d047490ed90 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 27 Nov 2018 20:36:27 +0100
Subject: [PATCH 2307/2793] Replace androidenv by new implementation

---
 .gitignore                                    |    3 +-
 pkgs/development/mobile/androidenv/addon.xml  | 1614 ----------
 pkgs/development/mobile/androidenv/addons.nix |  321 --
 .../mobile/androidenv/androidndk.nix          |  120 -
 .../mobile/androidenv/androidndk_r8e.nix      |   88 -
 .../mobile/androidenv/androidsdk.nix          |  296 --
 .../mobile/androidenv/build-app.nix           |   47 +-
 .../mobile/androidenv/build-gradle-app.nix    |  108 -
 .../androidenv/build-tools-srcs-linux.nix     |  376 ---
 .../androidenv/build-tools-srcs-macosx.nix    |  376 ---
 .../mobile/androidenv/build-tools.nix         |   68 +-
 pkgs/development/mobile/androidenv/cmake.nix  |   10 +
 .../androidenv/compose-android-packages.nix   |  255 ++
 .../mobile/androidenv/convertaddons.xsl       |  128 +
 .../mobile/androidenv/convertpackages.xsl     |  116 +
 .../mobile/androidenv/convertsystemimages.xsl |   47 +
 .../development/mobile/androidenv/default.nix |  346 +-
 .../androidenv/deploy-androidpackage.nix      |   44 +
 .../mobile/androidenv/emulate-app.nix         |   93 +-
 .../mobile/androidenv/emulator.nix            |   20 +
 pkgs/development/mobile/androidenv/fetch.sh   |   14 -
 .../mobile/androidenv/generate-addons.sh      |    3 -
 .../mobile/androidenv/generate-addons.xsl     |   82 -
 .../mobile/androidenv/generate-platforms.sh   |    4 -
 .../mobile/androidenv/generate-platforms.xsl  |   54 -
 .../mobile/androidenv/generate-sources.sh     |    3 -
 .../mobile/androidenv/generate-sources.xsl    |   52 -
 .../mobile/androidenv/generate-sysimages.sh   |   26 -
 .../mobile/androidenv/generate-sysimages.xsl  |   20 -
 .../mobile/androidenv/generate-tools.sh       |    4 -
 .../mobile/androidenv/generate-tools.xsl      |   43 -
 .../development/mobile/androidenv/generate.sh |   16 +
 .../mobile/androidenv/generated/addons.nix    | 1145 +++++++
 .../mobile/androidenv/generated/packages.nix  | 1910 +++++++++++
 .../generated/system-images-android-tv.nix    |  157 +
 .../system-images-android-wear-cn.nix         |   67 +
 .../generated/system-images-android-wear.nix  |   97 +
 .../generated/system-images-android.nix       |  547 ++++
 .../generated/system-images-google_apis.nix   |  502 +++
 .../system-images-google_apis_playstore.nix   |   97 +
 pkgs/development/mobile/androidenv/lldb.nix   |   12 +
 .../make-standalone-toolchain_r10e.patch      |   13 -
 .../make-standalone-toolchain_r8e.patch       |   13 -
 .../make_standalone_toolchain.py_16b.patch    |  119 -
 .../make_standalone_toolchain.py_17c.patch    |  119 -
 .../mobile/androidenv/ndk-bundle/default.nix  |   50 +
 .../make_standalone_toolchain.py_18.patch     |   44 +
 .../mobile/androidenv/platform-tools.nix      |   56 +-
 .../mobile/androidenv/platforms-linux.nix     |  343 --
 .../mobile/androidenv/platforms-macosx.nix    |  343 --
 .../mobile/androidenv/querypackages.sh        |   27 +
 .../mobile/androidenv/repository-11.xml       | 2834 -----------------
 .../development/mobile/androidenv/sources.nix |  184 --
 .../mobile/androidenv/support-repository.nix  |   18 -
 .../development/mobile/androidenv/support.nix |   18 -
 .../development/mobile/androidenv/sys-img.xml | 1026 ------
 .../mobile/androidenv/sysimages.nix           |  305 --
 pkgs/development/mobile/androidenv/tools.nix  |   26 +
 .../mobile/androidenv/tools/25.nix            |   62 +
 .../mobile/androidenv/tools/26.nix            |   40 +
 pkgs/top-level/all-packages.nix               |    2 +-
 61 files changed, 5536 insertions(+), 9437 deletions(-)
 delete mode 100644 pkgs/development/mobile/androidenv/addon.xml
 delete mode 100644 pkgs/development/mobile/androidenv/addons.nix
 delete mode 100644 pkgs/development/mobile/androidenv/androidndk.nix
 delete mode 100644 pkgs/development/mobile/androidenv/androidndk_r8e.nix
 delete mode 100644 pkgs/development/mobile/androidenv/androidsdk.nix
 delete mode 100644 pkgs/development/mobile/androidenv/build-gradle-app.nix
 delete mode 100644 pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
 delete mode 100644 pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix
 create mode 100644 pkgs/development/mobile/androidenv/cmake.nix
 create mode 100644 pkgs/development/mobile/androidenv/compose-android-packages.nix
 create mode 100644 pkgs/development/mobile/androidenv/convertaddons.xsl
 create mode 100644 pkgs/development/mobile/androidenv/convertpackages.xsl
 create mode 100644 pkgs/development/mobile/androidenv/convertsystemimages.xsl
 create mode 100644 pkgs/development/mobile/androidenv/deploy-androidpackage.nix
 create mode 100644 pkgs/development/mobile/androidenv/emulator.nix
 delete mode 100755 pkgs/development/mobile/androidenv/fetch.sh
 delete mode 100755 pkgs/development/mobile/androidenv/generate-addons.sh
 delete mode 100644 pkgs/development/mobile/androidenv/generate-addons.xsl
 delete mode 100755 pkgs/development/mobile/androidenv/generate-platforms.sh
 delete mode 100644 pkgs/development/mobile/androidenv/generate-platforms.xsl
 delete mode 100755 pkgs/development/mobile/androidenv/generate-sources.sh
 delete mode 100644 pkgs/development/mobile/androidenv/generate-sources.xsl
 delete mode 100755 pkgs/development/mobile/androidenv/generate-sysimages.sh
 delete mode 100644 pkgs/development/mobile/androidenv/generate-sysimages.xsl
 delete mode 100755 pkgs/development/mobile/androidenv/generate-tools.sh
 delete mode 100644 pkgs/development/mobile/androidenv/generate-tools.xsl
 create mode 100644 pkgs/development/mobile/androidenv/generate.sh
 create mode 100644 pkgs/development/mobile/androidenv/generated/addons.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/packages.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-android.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
 create mode 100644 pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
 create mode 100644 pkgs/development/mobile/androidenv/lldb.nix
 delete mode 100644 pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
 delete mode 100644 pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
 delete mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
 delete mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch
 create mode 100644 pkgs/development/mobile/androidenv/ndk-bundle/default.nix
 create mode 100644 pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
 delete mode 100644 pkgs/development/mobile/androidenv/platforms-linux.nix
 delete mode 100644 pkgs/development/mobile/androidenv/platforms-macosx.nix
 create mode 100644 pkgs/development/mobile/androidenv/querypackages.sh
 delete mode 100644 pkgs/development/mobile/androidenv/repository-11.xml
 delete mode 100644 pkgs/development/mobile/androidenv/sources.nix
 delete mode 100644 pkgs/development/mobile/androidenv/support-repository.nix
 delete mode 100644 pkgs/development/mobile/androidenv/support.nix
 delete mode 100644 pkgs/development/mobile/androidenv/sys-img.xml
 delete mode 100644 pkgs/development/mobile/androidenv/sysimages.nix
 create mode 100644 pkgs/development/mobile/androidenv/tools.nix
 create mode 100644 pkgs/development/mobile/androidenv/tools/25.nix
 create mode 100644 pkgs/development/mobile/androidenv/tools/26.nix

diff --git a/.gitignore b/.gitignore
index dba957f7662..b3ae9e6ea86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ result-*
 .DS_Store
 
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
+/pkgs/development/mobile/androidenv/xml/*
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
deleted file mode 100644
index 68792038d00..00000000000
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ /dev/null
@@ -1,1614 +0,0 @@
-<?xml version="1.0" ?>
-<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2018-09-27 12:07:52.862255 with ADRT.-->
-	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
-
-This is the Android Software Development Kit License Agreement
-
-1. Introduction
-
-1.1 The Android Software Development Kit (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 A &quot;compatible implementation&quot; means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-2. Accepting the License Agreement
-
-2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-3. SDK License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.
-
-3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement.  Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-4. Use of the SDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
-
-7. Third Party Applications
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.
-
-
-8. Using Android APIs
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-
-9. Terminating the License Agreement
-
-9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement with you if:
-(A) you have breached any provision of the License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.
-
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
-
-14. General Legal Terms
-
-14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-
-November 20, 2015</sdk:license>
-	<sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
-As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
-
-This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
-
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
-
-3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-June 2014.</sdk:license>
-	<sdk:license id="android-googletv-license" type="text">Terms and Conditions
-
-This is the Google TV Add-on for the Android Software Development Kit License Agreement.
-
-1. Introduction
-
-1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the &quot;Google TV Add-on&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.
-
-1.2 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting this License Agreement
-
-2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.
-
-2.2 You can accept this License Agreement by:
-
-(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or
-
-(B) by actually using the Google TV Add-on.  In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.
-
-2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.
-
-3. Google TV Add-on License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.
-
-3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.
-
-4. Use of the Google TV Add-on by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.
-
-7. Third Party Applications for the Google TV Platform
-
-7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-8. Using Google TV APIs
-
-8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.  Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services
-
-8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:
-
-(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;
-
-(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or
-
-(c)  not create any commercial audience measurement tool or service using the Google TV API Content
-
-9. Terminating this License Agreement
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-
-(A) you have breached any provision of this License Agreement; or
-
-(B) Google is required to do so by law; or
-
-(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or
-
-(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.
-
-14. General Legal Terms
-
-14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-
-August 15, 2011</sdk:license>
-	<sdk:license id="google-gdk-license" type="text">This is a Developer Preview of the GDK that is subject to change.
-
-Terms and Conditions
-
-This is the Glass Development Kit License Agreement.
-
-1. Introduction
-
-1.1 The Glass Development Kit (referred to in this License Agreement as the &quot;GDK&quot; and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.
-
-1.2 &quot;Glass&quot; means Glass devices and the Glass software stack for use on Glass devices.
-
-
-1.3 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting this License Agreement
-
-2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
-
-2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.
-
-3. GDK License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement.  Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.
-
-3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
-
-3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.
-
-
-3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.
-
-4. Use of the GDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-
-4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-
-6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.
-
-7. Third Party Applications
-
-7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating this License Agreement
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-(A) you have breached any provision of this License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or
-(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.
-
-14. General Legal Terms
-
-14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-November 19, 2013</sdk:license>
-	<sdk:license id="intel-android-extra-license" type="text">Intel (R) Hardware Accelerated Execution Manager
-End-User License Agreement
-
-Copyright (c) 2012 Intel Corporation.
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:
-
-1.Redistributions must reproduce the above copyright notice and the following disclaimer in the  documentation and/or other materials provided with the distribution.
-
-2.Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote  products derived from this software without specific prior written permission.
-
-3.No reverse engineering, de-compilation, or disassembly of this software is permitted. Limited patent license. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under  patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell (&quot;Utilize&quot;) this software, but solely to the extent that any such patent is necessary to Utilize the  software alone. The patent license shall not apply to any combinations which include this software. No  hardware per se is licensed hereunder.
-
-DISCLAIMER.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY EXPRESS OR  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE  POSSIBILITY OF SUCH DAMAGE.</sdk:license>
-	<sdk:add-on>
-		<!--Generated from bid:12617722, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 19 22:41:19 2018.-->
-				<sdk:size>34908058</sdk:size>
-				<sdk:checksum type="sha1">1f92abf3a76be66ae8032257fc7620acbd2b2e3a</sdk:checksum>
-				<sdk:url>google_apis-3-r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>3</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:13752552, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 14:03:04 2018.-->
-				<sdk:size>42435735</sdk:size>
-				<sdk:checksum type="sha1">9b6e86d8568558de4d606a7debc4f6049608dbd0</sdk:checksum>
-				<sdk:url>google_apis-4_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>4</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:13245770, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 17:50:33 2018.-->
-				<sdk:size>49123776</sdk:size>
-				<sdk:checksum type="sha1">46eaeb56b645ee7ffa24ede8fa17f3df70db0503</sdk:checksum>
-				<sdk:url>google_apis-5_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>5</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:13752552, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 12:37:49 2018.-->
-				<sdk:size>53382941</sdk:size>
-				<sdk:checksum type="sha1">5ff545d96e031e09580a6cf55713015c7d4936b2</sdk:checksum>
-				<sdk:url>google_apis-6_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>6</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:14140606, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 22:32:20 2018.-->
-				<sdk:size>53691339</sdk:size>
-				<sdk:checksum type="sha1">2e7f91e0fe34fef7f58aeced973c6ae52361b5ac</sdk:checksum>
-				<sdk:url>google_apis-7_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>7</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:16286500, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 03:39:55 2018.-->
-				<sdk:size>59505020</sdk:size>
-				<sdk:checksum type="sha1">3079958e7ec87222cac1e6b27bc471b27bf2c352</sdk:checksum>
-				<sdk:url>google_apis-8_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>8</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:19092731, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 23 15:52:14 2018.-->
-				<sdk:size>63401546</sdk:size>
-				<sdk:checksum type="sha1">78664645a1e9accea4430814f8694291a7f1ea5d</sdk:checksum>
-				<sdk:url>google_apis-9_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>9</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:21121559, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue May 29 03:55:38 2018.-->
-				<sdk:size>65781578</sdk:size>
-				<sdk:checksum type="sha1">cc0711857c881fa7534f90cf8cc09b8fe985484d</sdk:checksum>
-				<sdk:url>google_apis-10_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>10</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:19633933, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 15:13:30 2018.-->
-				<sdk:size>83477179</sdk:size>
-				<sdk:checksum type="sha1">5eab5e81addee9f3576d456d205208314b5146a5</sdk:checksum>
-				<sdk:url>google_apis-11_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>11</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:21121559, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 10:52:20 2018.-->
-				<sdk:size>86099835</sdk:size>
-				<sdk:checksum type="sha1">e9999f4fa978812174dfeceec0721c793a636e5d</sdk:checksum>
-				<sdk:url>google_apis-12_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>12</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:22531000, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 03:09:43 2018.-->
-				<sdk:size>88615525</sdk:size>
-				<sdk:checksum type="sha1">3b153edd211c27dc736c893c658418a4f9041417</sdk:checksum>
-				<sdk:url>google_apis-13_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>13</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:26085354, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 22:44:43 2018.-->
-				<sdk:size>106533714</sdk:size>
-				<sdk:checksum type="sha1">f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39</sdk:checksum>
-				<sdk:url>google_apis-14_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>14</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:95160078, branch:perforce-->
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 19:37:58 2018.-->
-				<sdk:size>106624396</sdk:size>
-				<sdk:checksum type="sha1">d0d2bf26805eb271693570a1aaec33e7dc3f45e9</sdk:checksum>
-				<sdk:url>google_apis-15_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:95160078, branch:perforce-->
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 20:07:39 2018.-->
-				<sdk:size>127341982</sdk:size>
-				<sdk:checksum type="sha1">ee6acf1b01020bfa8a8e24725dbc4478bee5e792</sdk:checksum>
-				<sdk:url>google_apis-16_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:94805340, branch:perforce-->
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 17:17:51 2018.-->
-				<sdk:size>137231243</sdk:size>
-				<sdk:checksum type="sha1">a076be0677f38df8ca5536b44dfb411a0c808c4f</sdk:checksum>
-				<sdk:url>google_apis-17_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:94805340, branch:perforce-->
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 23:13:56 2018.-->
-				<sdk:size>143195183</sdk:size>
-				<sdk:checksum type="sha1">6109603409debdd40854d4d4a92eaf8481462c8b</sdk:checksum>
-				<sdk:url>google_apis-18_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>18</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:2884604, branch:git_klp-emu-release-->
-		<sdk:revision>20</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 14:21:02 2018.-->
-				<sdk:size>147081</sdk:size>
-				<sdk:checksum type="sha1">5b933abe830b2f25b4c0f171d45e9e0651e56311</sdk:checksum>
-				<sdk:url>google_apis-19_r20.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>19</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:3249234, branch:git_nyc-emu-release-->
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun  1 04:12:18 2018.-->
-				<sdk:size>154865</sdk:size>
-				<sdk:checksum type="sha1">31361c2868f27343ee917fbd259c1463821b6145</sdk:checksum>
-				<sdk:url>google_apis-24_r1.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:3756122, branch:git_nyc-mr1-emu-release-->
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 20:09:06 2018.-->
-				<sdk:size>154871</sdk:size>
-				<sdk:checksum type="sha1">550e83eea9513ab11c44919ac6da54b36084a9f3</sdk:checksum>
-				<sdk:url>google_apis-25_r1.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:77907680, branch:perforce-->
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 05:08:59 2018.-->
-				<sdk:size>179499</sdk:size>
-				<sdk:checksum type="sha1">66a754efb24e9bb07cc51648426443c7586c9d4a</sdk:checksum>
-				<sdk:url>google_apis-21_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:87569863, branch:perforce-->
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 06:11:24 2018.-->
-				<sdk:size>179259</sdk:size>
-				<sdk:checksum type="sha1">5def0f42160cba8acff51b9c0c7e8be313de84f5</sdk:checksum>
-				<sdk:url>google_apis-22_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:100722913, branch:perforce-->
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 08:57:09 2018.-->
-				<sdk:size>179900</sdk:size>
-				<sdk:checksum type="sha1">04c5cc1a7c88967250ebba9561d81e24104167db</sdk:checksum>
-				<sdk:url>google_apis-23_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_apis</sdk:name-id>
-		<sdk:name-display>Google APIs</sdk:name-display>
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>Android + Google APIs</sdk:description>
-		<sdk:libs>
-			<sdk:lib>
-				<sdk:name>com.google.android.maps</sdk:name>
-				<sdk:description>API for Google Maps</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.android.future.usb.accessory</sdk:name>
-				<sdk:description>API for USB Accessories</sdk:description>
-			</sdk:lib>
-			<sdk:lib>
-				<sdk:name>com.google.android.media.effects</sdk:name>
-				<sdk:description>Collection of video effects</sdk:description>
-			</sdk:lib>
-		</sdk:libs>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:24379226, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 03:16:19 2018.-->
-				<sdk:size>78266751</sdk:size>
-				<sdk:checksum type="sha1">92128a12e7e8b0fb5bac59153d7779b717e7b840</sdk:checksum>
-				<sdk:url>google_tv-12_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-googletv-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_tv_addon</sdk:name-id>
-		<sdk:name-display>Google TV Addon</sdk:name-display>
-		<sdk:api-level>12</sdk:api-level>
-		<sdk:description></sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs/>
-	</sdk:add-on>
-	<sdk:add-on>
-		<!--Generated from bid:41196280, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 19 05:04:20 2018.-->
-				<sdk:size>87721879</sdk:size>
-				<sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum>
-				<sdk:url>google_tv-13_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-googletv-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:name-id>google_tv_addon</sdk:name-id>
-		<sdk:name-display>Google TV Addon</sdk:name-display>
-		<sdk:api-level>13</sdk:api-level>
-		<sdk:description></sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:libs/>
-	</sdk:add-on>
-	<sdk:extra>
-		<!--Generated from bid:3841166, branch:git_nyc-support-release-->
-		<sdk:revision>
-			<sdk:major>47</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 04:51:54 2018.-->
-				<sdk:size>355529608</sdk:size>
-				<sdk:checksum type="sha1">a0d22beacc106a6977321f2b07d692ce4979e96a</sdk:checksum>
-				<sdk:url>android_m2repository_r47.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>android</sdk:vendor-id>
-		<sdk:vendor-display>Android</sdk:vendor-display>
-		<sdk:description>Local Maven repository for Support Libraries</sdk:description>
-		<sdk:name-display>Android Support Repository</sdk:name-display>
-		<sdk:path>m2repository</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:167710051, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>58</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 11:10:27 2018.-->
-				<sdk:size>215426029</sdk:size>
-				<sdk:checksum type="sha1">05086add9e3a0eb1b67111108d7757a4337c3f10</sdk:checksum>
-				<sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Local Maven repository for Support Libraries</sdk:description>
-		<sdk:name-display>Google Repository</sdk:name-display>
-		<sdk:path>m2repository</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:28113395, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>1</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 01:20:16 2018.-->
-				<sdk:size>75109</sdk:size>
-				<sdk:checksum type="sha1">355e8dc304a92a5616db235af8ee7bd554356254</sdk:checksum>
-				<sdk:url>market_licensing-r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display></sdk:vendor-display>
-		<sdk:description>Android Market Licensing client library</sdk:description>
-		<sdk:desc-url>http://developer.android.com/guide/publishing/licensing.html</sdk:desc-url>
-		<sdk:name-display>Google Play Licensing Library</sdk:name-display>
-		<sdk:path>market_licensing</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:42096985, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>1</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 17 19:31:02 2018.-->
-				<sdk:size>110201</sdk:size>
-				<sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum>
-				<sdk:url>market_apk_expansion-r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Android Market APK Expansion library</sdk:description>
-		<sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url>
-		<sdk:name-display>Google Play APK Expansion library</sdk:name-display>
-		<sdk:path>market_apk_expansion</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:52571120, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>12</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 10:44:16 2018.-->
-				<sdk:size>5265389</sdk:size>
-				<sdk:checksum type="sha1">92558dbc380bba3d55d0ec181167fb05ce7c79d9</sdk:checksum>
-				<sdk:url>google_play_services_3265130_r12.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Google Play services client library and sample code</sdk:description>
-		<sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
-		<sdk:name-display>Google Play services for Froyo</sdk:name-display>
-		<sdk:path>google_play_services_froyo</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:189640690, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>49</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 08:08:54 2018.-->
-				<sdk:size>15456884</sdk:size>
-				<sdk:checksum type="sha1">f95bf19634e2ab0430923247fe2c50246432d2e9</sdk:checksum>
-				<sdk:url>google_play_services_v16_1_rc09.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Google Play services Javadocs and sample code</sdk:description>
-		<sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
-		<sdk:name-display>Google Play services</sdk:name-display>
-		<sdk:path>google_play_services</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:75820409, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>11</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jun  7 01:53:27 2018.-->
-				<sdk:size>8682859</sdk:size>
-				<sdk:checksum type="sha1">dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc</sdk:checksum>
-				<sdk:url>usb_driver_r11-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>USB Driver for Windows, revision 11</sdk:description>
-		<sdk:desc-url>http://developer.android.com/</sdk:desc-url>
-		<sdk:name-display>Google USB Driver</sdk:name-display>
-		<sdk:path>usb_driver</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:45484492, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>11</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jun  7 11:48:51 2018.-->
-				<sdk:size>704512</sdk:size>
-				<sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum>
-				<sdk:url>GoogleAdMobAdsSdkAndroid-6.4.1.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>AdMob Ads SDK</sdk:description>
-		<sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url>
-		<sdk:name-display>Google AdMob Ads SDK</sdk:name-display>
-		<sdk:path>admob_ads_sdk</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:44867123, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>3</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 05:29:27 2018.-->
-				<sdk:size>211432</sdk:size>
-				<sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum>
-				<sdk:url>GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Analytics App Tracking SDK</sdk:description>
-		<sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url>
-		<sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display>
-		<sdk:path>analytics_sdk_v2</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:25118237, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>2</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 31 20:21:33 2018.-->
-				<sdk:size>4055193</sdk:size>
-				<sdk:checksum type="sha1">13f3a3b2670a5fc04a7342861644be9a01b07e38</sdk:checksum>
-				<sdk:url>webdriver_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description></sdk:description>
-		<sdk:desc-url>http://selenium.googlecode.com</sdk:desc-url>
-		<sdk:name-display>Google Web Driver</sdk:name-display>
-		<sdk:path>webdriver</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:32432700, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>3</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 10:27:10 2018.-->
-				<sdk:size>5901400</sdk:size>
-				<sdk:checksum type="sha1">ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf</sdk:checksum>
-				<sdk:url>gcm_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported</sdk:description>
-		<sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url>
-		<sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display>
-		<sdk:path>gcm</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:80165500, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>1</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 14:06:56 2018.-->
-				<sdk:size>2167286</sdk:size>
-				<sdk:checksum type="sha1">4fb5344e34e8faab4db18af07dace44c50db26a7</sdk:checksum>
-				<sdk:url>simulator_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Android Auto API testing simulators</sdk:description>
-		<sdk:desc-url>http://developer.android.com/auto</sdk:desc-url>
-		<sdk:name-display>Android Auto API Simulators</sdk:name-display>
-		<sdk:path>simulators</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:107062527, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>1</sdk:major>
-			<sdk:minor>1</sdk:minor>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 20:44:31 2018.-->
-				<sdk:size>1346009</sdk:size>
-				<sdk:checksum type="sha1">202a6e1b3009a0eb815f8c672d2d5b3717de6169</sdk:checksum>
-				<sdk:url>desktop-head-unit-linux_r01.1.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 06:56:07 2018.-->
-				<sdk:size>2375533</sdk:size>
-				<sdk:checksum type="sha1">8179cbb3914493ebc5eb65b731cba061582f2e84</sdk:checksum>
-				<sdk:url>desktop-head-unit-macosx_r01.1.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 13:47:09 2018.-->
-				<sdk:size>2691901</sdk:size>
-				<sdk:checksum type="sha1">99c4a7172d73673552119347bc24c58b47da177b</sdk:checksum>
-				<sdk:url>desktop-head-unit-windows_r01.1.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Head unit emulator for developers targeting the Android Auto platform.</sdk:description>
-		<sdk:desc-url>http://developer.android.com/tools/help/desktop-head-unit.html</sdk:desc-url>
-		<sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display>
-		<sdk:path>auto</sdk:path>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:214678223, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>1</sdk:major>
-			<sdk:minor>5</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Sep 26 15:20:22 2018.-->
-				<sdk:size>33351418</sdk:size>
-				<sdk:checksum type="sha1">6c282b9c686e819fe7f5ac8f2249d2479acb63b4</sdk:checksum>
-				<sdk:url>iasdk-1.5.0-1538000167.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>google</sdk:vendor-id>
-		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
-		<sdk:description>Google Play Instant Development SDK</sdk:description>
-		<sdk:desc-url>https://developer.android.com/topic/google-play-instant/</sdk:desc-url>
-		<sdk:name-display>Google Play Instant Development SDK</sdk:name-display>
-		<sdk:path>instantapps</sdk:path>
-	</sdk:extra>
-</sdk:sdk-addon>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
deleted file mode 100644
index 1a8e2d32a4b..00000000000
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ /dev/null
@@ -1,321 +0,0 @@
-
-# This file is generated from generate-addons.sh. DO NOT EDIT.
-# Execute generate-addons.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildGoogleApis = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-      '';
-    });
-in
-{
-
-  google_apis_3 = buildGoogleApis {
-    name = "google_apis-3";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-3-r03.zip;
-        sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_4 = buildGoogleApis {
-    name = "google_apis-4";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-4_r02.zip;
-        sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_5 = buildGoogleApis {
-    name = "google_apis-5";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-5_r01.zip;
-        sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_6 = buildGoogleApis {
-    name = "google_apis-6";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-6_r01.zip;
-        sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_7 = buildGoogleApis {
-    name = "google_apis-7";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-7_r01.zip;
-        sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_8 = buildGoogleApis {
-    name = "google_apis-8";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-8_r02.zip;
-        sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_9 = buildGoogleApis {
-    name = "google_apis-9";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-9_r02.zip;
-        sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_10 = buildGoogleApis {
-    name = "google_apis-10";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-10_r02.zip;
-        sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_11 = buildGoogleApis {
-    name = "google_apis-11";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-11_r01.zip;
-        sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_12 = buildGoogleApis {
-    name = "google_apis-12";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-12_r01.zip;
-        sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_13 = buildGoogleApis {
-    name = "google_apis-13";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-13_r01.zip;
-        sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
-      };
-      meta = {
-        description = "Android + Google APIs";
-        url = http://developer.android.com/;
-      };
-    };
-
-  google_apis_14 = buildGoogleApis {
-    name = "google_apis-14";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-14_r02.zip;
-        sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_15 = buildGoogleApis {
-    name = "google_apis-15";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-15_r03.zip;
-        sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_16 = buildGoogleApis {
-    name = "google_apis-16";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-16_r04.zip;
-        sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_17 = buildGoogleApis {
-    name = "google_apis-17";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-17_r04.zip;
-        sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_18 = buildGoogleApis {
-    name = "google_apis-18";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-18_r04.zip;
-        sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_19 = buildGoogleApis {
-    name = "google_apis-19";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-19_r20.zip;
-        sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_21 = buildGoogleApis {
-    name = "google_apis-21";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-21_r01.zip;
-        sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_22 = buildGoogleApis {
-    name = "google_apis-22";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-22_r01.zip;
-        sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_23 = buildGoogleApis {
-    name = "google_apis-23";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-23_r01.zip;
-        sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_24 = buildGoogleApis {
-    name = "google_apis-24";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-24_r1.zip;
-        sha1 = "31361c2868f27343ee917fbd259c1463821b6145";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  google_apis_25 = buildGoogleApis {
-    name = "google_apis-25";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/google_apis-25_r1.zip;
-        sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
-      };
-      meta = {
-        description = "Android + Google APIs";
-
-      };
-    };
-
-  android_support_extra = buildGoogleApis {
-    name = "android_support_extra";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/support_r23.2.1.zip;
-      sha1 = "41121bbc412c2fce0be170d589d20cfa3e78e857";
-    };
-    meta = {
-      description = "Android Support Library";
-      url = http://developer.android.com/;
-    };
-  };
-
-
-  google_play_services = buildGoogleApis {
-    name = "google_play_services";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip;
-      sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9";
-    };
-    meta = {
-      description = "Google Play services client library and sample code";
-      url = http://developer.android.com/;
-    };
-  };
-
-  instant_apps = buildGoogleApis {
-    name = "instant_apps_sdk";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip;
-      sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4";
-    };
-    meta = {
-      description = "Android Instant Apps Development SDK";
-      url = "https://developer.android.com/";
-    };
-  };
-
-
-}
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
deleted file mode 100644
index 23ae4378dc6..00000000000
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
-, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, libcxx, version, sha1s, 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
-}:
-
-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 = fetchurl {
-      url = "https://dl.google.com/android/repository/${name}-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}.zip";
-      sha1 = sha1s.${stdenv.hostPlatform.system} or (throw "platform ${stdenv.hostPlatform.system} not supported!");
-    };
-
-    phases = "buildPhase";
-
-    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
-
-      # 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}"
-          ''
-      }
-
-      patchShebangs ${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*
-    '' +
-
-    ''
-      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
-
-      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-        for i in ${pkg_path}/prebuilt/linux-x86_64/bin/*
-        do
-            if ! isELF $i; then continue; fi
-            patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
-            patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i
-        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 = builtins.attrNames sha1s;
-      hydraPlatforms = [];
-      license = stdenv.lib.licenses.asl20;
-    };
-  };
-  passthru = {
-    inherit makeStandaloneToolchain;
-  };
-in lib.extendDerivation true passthru (ndk fullNDK)
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
deleted file mode 100644
index 68d2150f972..00000000000
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper
-, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools
-, 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-r8e";
-
-  src = if stdenv.hostPlatform.system == "i686-linux"
-    then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2";
-      sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98";
-    }
-    else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2";
-      sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7";
-    }
-    else throw "platform ${stdenv.hostPlatform.system} not supported!";
-
-  phases = "buildPhase";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = let
-    bin_path = "$out/bin";
-    pkg_path = "$out/libexec/${name}";
-    sed_script_1 =
-      "'s|^PROGDIR=`dirname $0`" +
-      "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
-    sed_script_2 =
-      "'s|^MYNDKDIR=`dirname $0`" +
-      "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
-    runtime_paths = (lib.makeBinPath [
-      coreutils file findutils
-      gawk gnugrep gnused
-      jdk
-      which
-    ]) + ":${platformTools}/platform-tools";
-  in ''
-    set -x
-    mkdir -pv $out/libexec
-    cd $out/libexec
-    tar -xjf $src
-
-    # so that it doesn't fail because of read-only permissions set
-    cd -
-    patch -p1 \
-        --no-backup-if-mismatch \
-        -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
-    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-*
-
-  '' + ''
-    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 [ zlib ncurses ]} {} \;
-    # fix ineffective PROGDIR / MYNDKDIR determination
-    for i in ndk-build ndk-gdb ndk-gdb-py
-    do
-        sed -i -e ${sed_script_1} $i
-    done
-    sed -i -e ${sed_script_2} ndk-which
-    # a bash script
-    patchShebangs ndk-which
-    # wrap
-    for i in ndk-build 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 ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which
-    do
-        ln -sf ${pkg_path}/$i ${bin_path}/$i
-    done
-  '';
-}
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
deleted file mode 100644
index 26750aed6cf..00000000000
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ /dev/null
@@ -1,296 +0,0 @@
-{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper
-, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources
-, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib
-, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus
-, zlib, glxinfo, xkeyboardconfig
-, includeSources
-, licenseAccepted
-}:
-{ platformVersions, abiVersions, useGoogleAPIs, buildToolsVersions ? [], useExtraSupportLibs ? false
-, useGooglePlayServices ? false, useInstantApps ? false }:
-
-if !licenseAccepted then throw ''
-    You must accept the Android Software Development Kit License Agreement at
-    https://developer.android.com/studio/terms
-    by setting nixpkgs config option 'android_sdk.accept_license = true;'
-  ''
-else assert licenseAccepted;
-
-let inherit (stdenv.lib) makeLibraryPath;
-
-    googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6";
-      in fetchzip rec {
-        url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip";
-        sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx";
-      };
-
-in
-
-stdenv.mkDerivation rec {
-  name = "android-sdk-${version}";
-  version = "26.1.1";
-
-  src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-    then fetchurl {
-      url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip";
-      sha256 = "1yfy0qqxz1ixpsci1pizls1nrncmi8p16wcb9rimdn4q3mdfxzwj";
-    }
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip";
-      sha256 = "0gl5c30m40kx0vvrpbaa8cw8wq2vb89r14hgzb1df4qgpic97cpc";
-    }
-    else throw "platform not ${stdenv.hostPlatform.system} supported!";
-
-  emulator = fetchurl {
-     url = "https://dl.google.com/android/repository/emulator-linux-4969155.zip";
-     sha256 = "0iw0j6j3w9zpfalsa7xq2czz4vzgq96zk2zddjhanwwx4p8fhrfd";
-  };
-
-  buildCommand = ''
-    mkdir -p $out/libexec
-    cd $out/libexec
-    unpackFile $src
-    unpackFile $emulator
-    cd tools
-
-    for f in monitor bin/monkeyrunner bin/uiautomatorviewer
-    do
-        sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
-    done
-
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-    ''
-      # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
-
-      for i in mksdcard
-      do
-          patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
-          patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i
-      done
-
-      # The following scripts used SWT and wants to dynamically load some GTK+ stuff.
-      # Creating these wrappers ensure that they can be found:
-
-      wrapProgram `pwd`/android \
-        --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]}
-
-      wrapProgram `pwd`/bin/uiautomatorviewer \
-        --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
-
-      # The emulators need additional libraries, which are dynamically loaded => let's wrap them
-
-      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-        cd ..
-        for i in emulator/emulator* emulator/qemu/linux-x86_64/qemu-system-*
-        do
-            patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
-            wrapProgram `pwd`/$i \
-              --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
-              --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \
-              --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb
-        done
-        cd tools
-      ''}
-    ''}
-
-    patchShebangs .
-
-    ${if stdenv.hostPlatform.system == "i686-linux" then
-      ''
-        # The monitor requires some more patching
-
-        cd lib/monitor-x86
-        patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 monitor
-        patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
-
-        wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
-
-        cd ../..
-      ''
-      else if stdenv.hostPlatform.system == "x86_64-linux" then
-      ''
-        # The monitor requires some more patching
-
-        cd lib/monitor-x86_64
-        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
-        patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
-
-        wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
-
-        cd ../..
-      ''
-      else ""}
-
-    # Symlink the other sub packages
-
-    cd ..
-    ln -s ${platformTools}/platform-tools
-    ln -s ${support}/support
-
-    mkdir -p build-tools
-    cd build-tools
-
-    ${stdenv.lib.concatMapStrings
-       (v: "ln -s ${builtins.getAttr "v${builtins.replaceStrings ["."] ["_"] v}" buildTools}/build-tools/*")
-       (if (builtins.length buildToolsVersions) == 0 then platformVersions else buildToolsVersions)}
-
-    cd ..
-
-    # Symlink required Google API add-ons
-
-    mkdir -p add-ons
-    cd add-ons
-
-    ${if useGoogleAPIs then
-        stdenv.lib.concatMapStrings (platformVersion:
-        if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then
-          let
-            googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons;
-          in
-          "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n"
-        else "") platformVersions
-      else ""}
-
-    cd ..
-
-    # Symlink required extras
-
-    mkdir -p extras/android
-    cd extras/android
-
-    ln -s ${supportRepository}/m2repository
-
-    ${if useExtraSupportLibs then
-       "ln -s ${addons.android_support_extra}/support ."
-     else ""}
-
-    cd ..
-    mkdir -p google
-    cd google
-
-    ${if useGooglePlayServices then
-       "ln -s ${addons.google_play_services}/google-play-services google_play_services"
-     else ""}
-
-    ${stdenv.lib.optionalString useInstantApps
-       "ln -s ${addons.instant_apps}/whsdk instantapps"}
-
-    ln -s ${googleRepository} m2repository
-
-    cd ../..
-
-    # Symlink required sources
-    mkdir -p sources
-    cd sources
-
-    ${if includeSources then
-        stdenv.lib.concatMapStrings (platformVersion:
-        if (builtins.hasAttr ("source_"+platformVersion) sources) then
-          let
-            source = builtins.getAttr ("source_"+platformVersion) sources;
-          in
-          "ln -s ${source}/* android-${platformVersion}\n"
-        else "") platformVersions
-      else ""}
-
-    cd ..
-
-    # Symlink required platforms
-
-    mkdir -p platforms
-    cd platforms
-
-    ${stdenv.lib.concatMapStrings (platformVersion:
-      if (builtins.hasAttr ("platform_"+platformVersion) platforms) then
-        let
-          platform = builtins.getAttr ("platform_"+platformVersion) platforms;
-        in
-        "ln -s ${platform}/* android-${platformVersion}\n"
-      else ""
-    ) platformVersions}
-
-    cd ..
-
-    # Symlink required system images
-
-    mkdir -p system-images
-    cd system-images
-
-    ${stdenv.lib.concatMapStrings (abiVersion:
-      stdenv.lib.concatMapStrings (platformVersion:
-        if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then
-          let
-            sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages;
-          in
-          ''
-            mkdir -p android-${platformVersion}
-            cd android-${platformVersion}
-            ln -s ${sysimg}/*
-            cd ..
-          ''
-        else ""
-      ) platformVersions
-    ) abiVersions}
-
-    # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
-
-    mkdir -p $out/bin
-
-    for i in $out/libexec/tools/*
-    do
-        if [ ! -d $i ] && [ -x $i ]
-        then
-            ln -sf $i $out/bin/$(basename $i)
-        fi
-    done
-
-    for i in $out/libexec/tools/bin/*
-    do
-        if [ ! -d $i ] && [ -x $i ]
-        then
-            ln -sf $i $out/bin/$(basename $i)
-        fi
-    done
-
-    for i in $out/libexec/platform-tools/*
-    do
-        if [ ! -d $i ] && [ -x $i ]
-        then
-            ln -sf $i $out/bin/$(basename $i)
-        fi
-    done
-
-    for i in $out/libexec/build-tools/*/*
-    do
-        if [ ! -d $i ] && [ -x $i ]
-        then
-            ln -sf $i $out/bin/$(basename $i)
-        fi
-    done
-
-    for i in $out/libexec/emulator/*
-    do
-        if [ ! -d $i ] && [ -x $i ]
-        then
-            ln -sf $i $out/bin/$(basename $i)
-        fi
-    done
-
-    wrapProgram $out/bin/sdkmanager \
-      --set JAVA_HOME ${jdk}
-
-    yes | ANDROID_SDK_HOME=$(mktemp -d) $out/bin/sdkmanager --licenses || true
-  '';
-
-  buildInputs = [ unzip makeWrapper ];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-    hydraPlatforms = [];
-    license = stdenv.lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 20b3ff3b8f5..62cdeb43032 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,28 +1,26 @@
-{ stdenv, androidsdk, jdk, ant, androidndk, gnumake, gawk, file, which }:
-args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
+{ composeAndroidPackages, stdenv, ant, jdk, gnumake, gawk }:
+
+{ name
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
-, useNDK ? false, ...
-}:
+, antFlags ? ""
+, ...
+}@args:
 
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
 
 let
-  androidsdkComposition = androidsdk {
-    inherit platformVersions useGoogleAPIs;
-    abiVersions = [];
-  };
+  androidSdkFormalArgs = builtins.functionArgs composeAndroidPackages;
+  androidArgs = builtins.intersectAttrs androidSdkFormalArgs args;
+  androidsdk = (composeAndroidPackages androidArgs).androidsdk;
+
+  extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs);
 in
 stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name;
-
-  ANDROID_HOME = "${androidsdkComposition}/libexec";
-
-  buildInputs = [ jdk ant ] ++
-    stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ];
-
+  name = stdenv.lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
+  ANDROID_HOME = "${androidsdk}/libexec/android-sdk";
+  buildInputs = [ jdk ant ];
   buildPhase = ''
     ${stdenv.lib.optionalString release ''
-    
       # Provide key singing attributes
       ( echo "key.store=${keyStore}"
         echo "key.alias=${keyAlias}"
@@ -32,20 +30,19 @@ stdenv.mkDerivation ({
     ''}
 
     export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
-    ${if useNDK then ''
-        export GNUMAKE=${gnumake}/bin/make
-        export NDK_HOST_AWK=${gawk}/bin/gawk
-        ${androidndk}/bin/ndk-build
-      '' else ""}
+
+    ${stdenv.lib.optionalString (args ? includeNDK && args.includeNDK) ''
+      export GNUMAKE=${gnumake}/bin/make
+      export NDK_HOST_AWK=${gawk}/bin/gawk
+      ${androidsdk}/libexec/android-sdk/ndk-bundle/ndk-build
+    ''}
     ant ${antFlags} ${if release then "release" else "debug"}
   '';
-
   installPhase = ''
     mkdir -p $out
     mv bin/*-${if release then "release" else "debug"}.apk $out
-    
+
     mkdir -p $out/nix-support
     echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
   '';
-} //
-builtins.removeAttrs args ["name"])
+} // extraArgs)
diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix
deleted file mode 100644
index d6a39146324..00000000000
--- a/pkgs/development/mobile/androidenv/build-gradle-app.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file
-, which, gradle, fetchurl, buildEnv, runCommand }:
-
-args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false
-     , useExtraSupportLibs ? false, useGooglePlayServices ? false
-     , release ? false, keyStore ? null, keyAlias ? null
-     , keyStorePassword ? null, keyAliasPassword ? null
-     , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask
-     , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }:
-
-assert release -> keyStore != null;
-assert release -> keyAlias != null;
-assert release -> keyStorePassword != null;
-assert release -> keyAliasPassword != null;
-assert acceptAndroidSdkLicenses;
-
-let
-  inherit (stdenv.lib) optionalString;
-
-  m2install = { repo, version, artifactId, groupId
-              , jarSha256, pomSha256, aarSha256, suffix ? "" }:
-    let m2Name = "${artifactId}-${version}";
-        m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
-    in runCommand m2Name {} (''
-         mkdir -p $out/m2/${m2Path}
-       '' + optionalString (jarSha256 != null) ''
-         install -D ${fetchurl {
-                        url = "${repo}${m2Path}/${m2Name}${suffix}.jar";
-                        sha256 = jarSha256;
-                      }} $out/m2/${m2Path}/${m2Name}${suffix}.jar
-       '' + optionalString (pomSha256 != null) ''
-         install -D ${fetchurl {
-                        url = "${repo}${m2Path}/${m2Name}${suffix}.pom";
-                        sha256 = pomSha256;
-                      }} $out/m2/${m2Path}/${m2Name}${suffix}.pom
-       '' + optionalString (aarSha256 != null) ''
-         install -D ${fetchurl {
-                        url = "${repo}${m2Path}/${m2Name}${suffix}.aar";
-                        sha256 = aarSha256;
-                      }} $out/m2/${m2Path}/${m2Name}${suffix}.aar
-       '');
-
-  androidsdkComposition = androidsdk {
-    inherit platformVersions useGoogleAPIs
-            useExtraSupportLibs useGooglePlayServices;
-    abiVersions = [ "armeabi-v7a" ];
-  };
-in
-stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name;
-
-  ANDROID_HOME = "${androidsdkComposition}/libexec";
-  ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}";
-
-  buildInputs = [ jdk gradle ] ++
-    stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++
-      buildInputs;
-
-  DEPENDENCIES = buildEnv { name = "${name}-maven-deps";
-                            paths = map m2install mavenDeps;
-                          };
-
-  buildPhase = ''
-    ${optionalString release ''
-      # Provide key signing attributes
-      ( echo "RELEASE_STORE_FILE=${keyStore}"
-        echo "RELEASE_KEY_ALIAS=${keyAlias}"
-        echo "RELEASE_STORE_PASSWORD=${keyStorePassword}"
-        echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}"
-      ) >> gradle.properties
-    ''}
-    buildDir=`pwd`
-    cp -r $ANDROID_HOME $buildDir/local_sdk
-    chmod -R 755 local_sdk
-    export ANDROID_HOME=$buildDir/local_sdk
-    # Key files cannot be stored in the user's home directory. This
-    # overrides it.
-    export ANDROID_SDK_HOME=`pwd`
-
-    mkdir -p "$ANDROID_HOME/licenses"
-    echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-    echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-
-    export APP_HOME=`pwd`
-
-    mkdir -p .m2/repository
-    if [ -d "$DEPENDENCIES/m2" ] ; then
-      cp -RL "$DEPENDENCIES"/m2/* .m2/repository/
-    fi
-    chmod -R 755 .m2
-    mkdir -p .m2/repository/com/android/support
-    cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/
-    cp -RL local_sdk/extras/google/m2repository/* .m2/repository/
-    gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv ${buildDirectory}/build/outputs/apk/*.apk $out
-
-    mkdir -p $out/nix-support
-    echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.unfree;
-  };
-} // builtins.removeAttrs args ["name" "mavenDeps"])
diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
deleted file mode 100644
index 3c2960755e7..00000000000
--- a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
+++ /dev/null
@@ -1,376 +0,0 @@
-
-# This file is generated from generate-tools.sh. DO NOT EDIT.
-# Execute generate-tools.sh or fetch.sh to update the file.
-{ fetchurl }:
-
-{
-    
-  v17 = {
-    version = "17.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r17-linux.zip;
-      sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d";
-    };
-  };
-
-  v18_0_1 = {
-    version = "18.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
-      sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
-    };
-  };
-
-  v18_1_0 = {
-    version = "18.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip;
-      sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
-    };
-  };
-
-  v18_1_1 = {
-    version = "18.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip;
-      sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998";
-    };
-  };
-
-  v19 = {
-    version = "19.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19-linux.zip;
-      sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83";
-    };
-  };
-
-  v19_0_1 = {
-    version = "19.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip;
-      sha1 = "18d2312dc4368858914213087f4e61445aca4517";
-    };
-  };
-
-  v19_0_2 = {
-    version = "19.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip;
-      sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd";
-    };
-  };
-
-  v19_0_3 = {
-    version = "19.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip;
-      sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c";
-    };
-  };
-
-  v19_1_0 = {
-    version = "19.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip;
-      sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89";
-    };
-  };
-
-  v20 = {
-    version = "20.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r20-linux.zip;
-      sha1 = "b688905526a5584d1327a662d871a635ff502758";
-    };
-  };
-
-  v21 = {
-    version = "21.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21-linux.zip;
-      sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4";
-    };
-  };
-
-  v21_0_1 = {
-    version = "21.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip;
-      sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a";
-    };
-  };
-
-  v21_0_2 = {
-    version = "21.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip;
-      sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5";
-    };
-  };
-
-  v21_1_0 = {
-    version = "21.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip;
-      sha1 = "b7455e543784d52a8925f960bc880493ed1478cb";
-    };
-  };
-
-  v21_1_1 = {
-    version = "21.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip;
-      sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d";
-    };
-  };
-
-  v21_1_2 = {
-    version = "21.1.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
-      sha1 = "5e35259843bf2926113a38368b08458735479658";
-    };
-  };
-
-  v22 = {
-    version = "22.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r22-linux.zip;
-      sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b";
-    };
-  };
-
-  v22_0_1 = {
-    version = "22.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip;
-      sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646";
-    };
-  };
-
-  v23 = {
-    version = "23.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23-linux.zip;
-      sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060";
-    };
-  };
-
-  v23_0_1 = {
-    version = "23.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip;
-      sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
-    };
-  };
-
-  v23_0_2 = {
-    version = "23.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip;
-      sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3";
-    };
-  };
-
-  v23_0_3 = {
-    version = "23.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip;
-      sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3";
-    };
-  };
-
-  v24 = {
-    version = "24.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24-linux.zip;
-      sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1";
-    };
-  };
-
-  v24_0_1 = {
-    version = "24.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip;
-      sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4";
-    };
-  };
-
-  v24_0_2 = {
-    version = "24.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip;
-      sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf";
-    };
-  };
-
-  v24_0_3 = {
-    version = "24.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip;
-      sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304";
-    };
-  };
-
-  v25 = {
-    version = "25.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25-linux.zip;
-      sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44";
-    };
-  };
-
-  v25_0_1 = {
-    version = "25.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip;
-      sha1 = "ff063d252ab750d339f5947d06ff782836f22bac";
-    };
-  };
-
-  v25_0_2 = {
-    version = "25.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip;
-      sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae";
-    };
-  };
-
-  v25_0_3 = {
-    version = "25.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip;
-      sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509";
-    };
-  };
-
-  v26 = {
-    version = "26.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-linux.zip;
-      sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59";
-    };
-  };
-
-  v26_rc1 = {
-    version = "26.0.0-rc1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip;
-      sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04";
-    };
-  };
-
-  v26_rc2 = {
-    version = "26.0.0-rc2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip;
-      sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0";
-    };
-  };
-
-  v26_0_1 = {
-    version = "26.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip;
-      sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365";
-    };
-  };
-
-  v26_0_2 = {
-    version = "26.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip;
-      sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592";
-    };
-  };
-
-  v26_0_3 = {
-    version = "26.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip;
-      sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c";
-    };
-  };
-
-  v27 = {
-    version = "27.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27-linux.zip;
-      sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260";
-    };
-  };
-
-  v27_0_1 = {
-    version = "27.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip;
-      sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a";
-    };
-  };
-
-  v27_0_2 = {
-    version = "27.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip;
-      sha1 = "b687ddf6be84f11607871138aad32cf857d0b837";
-    };
-  };
-
-  v27_0_3 = {
-    version = "27.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip;
-      sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca";
-    };
-  };
-
-  v28 = {
-    version = "28.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-linux.zip;
-      sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb";
-    };
-  };
-
-  v28_rc1 = {
-    version = "28.0.0-rc1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip;
-      sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840";
-    };
-  };
-
-  v28_rc2 = {
-    version = "28.0.0-rc2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip;
-      sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc";
-    };
-  };
-
-  v28_0_1 = {
-    version = "28.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip;
-      sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0";
-    };
-  };
-
-  v28_0_2 = {
-    version = "28.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip;
-      sha1 = "b4492209810a3fd48deaa982f9852fef12433d55";
-    };
-  };
-
-  v28_0_3 = {
-    version = "28.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip;
-      sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165";
-    };
-  };
-
-}
diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix
deleted file mode 100644
index 1e15aa7c873..00000000000
--- a/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix
+++ /dev/null
@@ -1,376 +0,0 @@
-
-# This file is generated from generate-tools.sh. DO NOT EDIT.
-# Execute generate-tools.sh or fetch.sh to update the file.
-{ fetchurl }:
-
-{
-    
-  v17 = {
-    version = "17.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip;
-      sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930";
-    };
-  };
-
-  v18_0_1 = {
-    version = "18.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
-      sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
-    };
-  };
-
-  v18_1_0 = {
-    version = "18.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip;
-      sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
-    };
-  };
-
-  v18_1_1 = {
-    version = "18.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip;
-      sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4";
-    };
-  };
-
-  v19 = {
-    version = "19.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip;
-      sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90";
-    };
-  };
-
-  v19_0_1 = {
-    version = "19.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip;
-      sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b";
-    };
-  };
-
-  v19_0_2 = {
-    version = "19.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip;
-      sha1 = "145bc43065d45f756d99d87329d899052b9a9288";
-    };
-  };
-
-  v19_0_3 = {
-    version = "19.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip;
-      sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4";
-    };
-  };
-
-  v19_1_0 = {
-    version = "19.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip;
-      sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1";
-    };
-  };
-
-  v20 = {
-    version = "20.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip;
-      sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
-    };
-  };
-
-  v21 = {
-    version = "21.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip;
-      sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa";
-    };
-  };
-
-  v21_0_1 = {
-    version = "21.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip;
-      sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7";
-    };
-  };
-
-  v21_0_2 = {
-    version = "21.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip;
-      sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1";
-    };
-  };
-
-  v21_1_0 = {
-    version = "21.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip;
-      sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246";
-    };
-  };
-
-  v21_1_1 = {
-    version = "21.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip;
-      sha1 = "836a146eab0504aa9387a5132e986fe7c7381571";
-    };
-  };
-
-  v21_1_2 = {
-    version = "21.1.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
-      sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
-    };
-  };
-
-  v22 = {
-    version = "22.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip;
-      sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d";
-    };
-  };
-
-  v22_0_1 = {
-    version = "22.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip;
-      sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf";
-    };
-  };
-
-  v23 = {
-    version = "23.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip;
-      sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03";
-    };
-  };
-
-  v23_0_1 = {
-    version = "23.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip;
-      sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
-    };
-  };
-
-  v23_0_2 = {
-    version = "23.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip;
-      sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf";
-    };
-  };
-
-  v23_0_3 = {
-    version = "23.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip;
-      sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0";
-    };
-  };
-
-  v24 = {
-    version = "24.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip;
-      sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de";
-    };
-  };
-
-  v24_0_1 = {
-    version = "24.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip;
-      sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848";
-    };
-  };
-
-  v24_0_2 = {
-    version = "24.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip;
-      sha1 = "8bb8fc575477491d5957de743089df412de55cda";
-    };
-  };
-
-  v24_0_3 = {
-    version = "24.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip;
-      sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c";
-    };
-  };
-
-  v25 = {
-    version = "25.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip;
-      sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606";
-    };
-  };
-
-  v25_0_1 = {
-    version = "25.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip;
-      sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f";
-    };
-  };
-
-  v25_0_2 = {
-    version = "25.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip;
-      sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16";
-    };
-  };
-
-  v25_0_3 = {
-    version = "25.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip;
-      sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e";
-    };
-  };
-
-  v26 = {
-    version = "26.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip;
-      sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086";
-    };
-  };
-
-  v26_rc1 = {
-    version = "26.0.0-rc1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip;
-      sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137";
-    };
-  };
-
-  v26_rc2 = {
-    version = "26.0.0-rc2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip;
-      sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70";
-    };
-  };
-
-  v26_0_1 = {
-    version = "26.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip;
-      sha1 = "cbde59de198916b390777dd0227921bfa2120832";
-    };
-  };
-
-  v26_0_2 = {
-    version = "26.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip;
-      sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0";
-    };
-  };
-
-  v26_0_3 = {
-    version = "26.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip;
-      sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df";
-    };
-  };
-
-  v27 = {
-    version = "27.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip;
-      sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1";
-    };
-  };
-
-  v27_0_1 = {
-    version = "27.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip;
-      sha1 = "1edd07bfdbadd95652d093040e16d858f7489594";
-    };
-  };
-
-  v27_0_2 = {
-    version = "27.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip;
-      sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be";
-    };
-  };
-
-  v27_0_3 = {
-    version = "27.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip;
-      sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d";
-    };
-  };
-
-  v28 = {
-    version = "28.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip;
-      sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade";
-    };
-  };
-
-  v28_rc1 = {
-    version = "28.0.0-rc1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip;
-      sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc";
-    };
-  };
-
-  v28_rc2 = {
-    version = "28.0.0-rc2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip;
-      sha1 = "0d0314b353589feb10e528b44c5a685b6658d797";
-    };
-  };
-
-  v28_0_1 = {
-    version = "28.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip;
-      sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462";
-    };
-  };
-
-  v28_0_2 = {
-    version = "28.0.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip;
-      sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9";
-    };
-  };
-
-  v28_0_3 = {
-    version = "28.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip;
-      sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a";
-    };
-  };
-
-}
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index b362dc2dca5..976ef141627 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,53 +1,19 @@
-{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}:
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}:
 
-let buildBuildTools = name: { version, src }:
-  stdenv.mkDerivation rec {
-    inherit version src;
-    name = "android-build-tools-r${version}";
-    buildCommand = ''
-      mkdir -p $out/build-tools
-      cd $out/build-tools
-      unzip $src
-      mv android-* ${version}
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook makeWrapper ] ++
+    lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ];
+  patchInstructions = ''
+    ${lib.optionalString (os == "linux") ''
+      addAutoPatchelfSearchPath $packageBaseDir/lib
+      addAutoPatchelfSearchPath $packageBaseDir/lib64
+      autoPatchelf --no-recurse $packageBaseDir/lib64
+      autoPatchelf --no-recurse $packageBaseDir
+    ''}
 
-      cd ${version}
-
-      for f in $(grep -Rl /bin/ls .); do
-        sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
-      done
-
-      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-        ''
-
-          ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5
-
-          find . -type f -print0 | while IFS= read -r -d "" file
-          do
-            type=$(file "$file")
-            ## Patch 64-bit binaries
-            if grep -q "ELF 64-bit" <<< "$type"
-            then
-              if grep -q "interpreter" <<< "$type"
-              then
-                patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file"
-              fi
-              patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file"
-            ## Patch 32-bit binaries
-            elif grep -q "ELF 32-bit" <<< "$type"
-            then
-              if grep -q "interpreter" <<< "$type"
-              then
-                patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file"
-              fi
-              patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file"
-            fi
-          done
-        ''}
-
-        patchShebangs .
-    '';
-
-    buildInputs = [ unzip file ];
-  };
-in
-  lib.mapAttrs buildBuildTools buildToolsSources
+    wrapProgram $PWD/mainDexClasses \
+      --prefix PATH : ${pkgs.jdk8}/bin
+  '';
+  noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
+}
diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix
new file mode 100644
index 00000000000..1aeef467642
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/cmake.nix
@@ -0,0 +1,10 @@
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
+
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook ]
+    ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ];
+  patchInstructions = lib.optionalString (os == "linux") ''
+    autoPatchelf $packageBaseDir/bin
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
new file mode 100644
index 00000000000..d90ddfcadec
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -0,0 +1,255 @@
+{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686}:
+
+{ toolsVersion ? "25.2.5"
+, platformToolsVersion ? "28.0.1"
+, buildToolsVersions ? [ "28.0.3" ]
+, includeEmulator ? false
+, emulatorVersion ? "28.0.14"
+, platformVersions ? []
+, includeSources ? false
+, includeDocs ? false
+, includeSystemImages ? false
+, systemImageTypes ? [ "default" ]
+, abiVersions ? [ "armeabi-v7a" ]
+, lldbVersions ? [ ]
+, cmakeVersions ? [ ]
+, includeNDK ? false
+, ndkVersion ? "18.1.5063045"
+, useGoogleAPIs ? false
+, useGoogleTVAddOns ? false
+, includeExtras ? []
+}:
+
+let
+  inherit (pkgs) stdenv fetchurl makeWrapper unzip;
+
+  # Determine the Android os identifier from Nix's system identifier
+  os = if stdenv.system == "x86_64-linux" then "linux"
+    else if stdenv.system == "x86_64-darwin" then "macosx"
+    else "No tarballs found for system architecture: ${stdenv.system}";
+
+  # Generated Nix packages
+  packages = import ./generated/packages.nix {
+    inherit fetchurl;
+  };
+
+  # Generated system images
+  system-images-packages-android = import ./generated/system-images-android.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages-android-tv = import ./generated/system-images-android-tv.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages-android-wear = import ./generated/system-images-android-wear.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages-google_apis = import ./generated/system-images-google_apis.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix {
+    inherit fetchurl;
+  };
+
+  system-images-packages =
+    stdenv.lib.recursiveUpdate
+      system-images-packages-android
+      (stdenv.lib.recursiveUpdate system-images-packages-android-tv
+        (stdenv.lib.recursiveUpdate system-images-packages-android-wear
+          (stdenv.lib.recursiveUpdate system-images-packages-android-wear-cn
+            (stdenv.lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore))));
+
+  # Generated addons
+  addons = import ./generated/addons.nix {
+    inherit fetchurl;
+  };
+in
+rec {
+  deployAndroidPackage = import ./deploy-androidpackage.nix {
+    inherit stdenv unzip;
+  };
+
+  platform-tools = import ./platform-tools.nix {
+    inherit deployAndroidPackage os autoPatchelfHook pkgs;
+    inherit (stdenv) lib;
+    package = packages.platform-tools."${platformToolsVersion}";
+  };
+
+  build-tools = map (version:
+    import ./build-tools.nix {
+      inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
+      inherit (stdenv) lib;
+      package = packages.build-tools."${version}";
+    }
+  ) buildToolsVersions;
+
+  docs = deployAndroidPackage {
+    inherit os;
+    package = packages.docs."1";
+  };
+
+  emulator = import ./emulator.nix {
+    inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
+    inherit (stdenv) lib;
+    package = packages.emulator."${emulatorVersion}"."${os}";
+  };
+
+  platforms = map (version:
+    deployAndroidPackage {
+      inherit os;
+      package = packages.platforms."${version}";
+    }
+  ) platformVersions;
+
+  sources = stdenv.lib.optional includeSources (map (version:
+    deployAndroidPackage {
+      inherit os;
+      package = packages.sources."${version}";
+    }
+  ) platformVersions);
+
+  system-images = stdenv.lib.flatten (map (apiVersion:
+    map (type:
+      map (abiVersion:
+        deployAndroidPackage {
+          inherit os;
+          package = system-images-packages.${apiVersion}.${type}.${abiVersion};
+        }
+      ) abiVersions
+    ) systemImageTypes
+  ) platformVersions);
+
+  lldb = map (version:
+    import ./lldb.nix {
+      inherit deployAndroidPackage os autoPatchelfHook pkgs;
+      inherit (stdenv) lib;
+      package = packages.lldb."${version}";
+    }
+  ) lldbVersions;
+
+  cmake = map (version:
+    import ./cmake.nix {
+      inherit deployAndroidPackage os autoPatchelfHook pkgs;
+      inherit (stdenv) lib;
+      package = packages.cmake."${version}";
+    }
+  ) cmakeVersions;
+
+  ndk-bundle = import ./ndk-bundle {
+    inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools;
+    inherit (stdenv) lib;
+    package = packages.ndk-bundle."${ndkVersion}";
+  };
+
+  google-apis = map (version:
+    deployAndroidPackage {
+      inherit os;
+      package = addons.addons."${version}".google_apis;
+    }
+  ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
+
+  google-tv-addons = map (version:
+    deployAndroidPackage {
+      inherit os;
+      package = addons.addons."${version}".google_tv_addon;
+    }
+  ) platformVersions;
+
+  # Function that automatically links all plugins for which multiple versions can coexist
+  linkPlugins = {name, plugins}:
+    stdenv.lib.optionalString (plugins != []) ''
+      mkdir -p ${name}
+      ${stdenv.lib.concatMapStrings (plugin: ''
+        ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
+      '') plugins}
+    '';
+
+  # Function that automatically links a plugin for which only one version exists
+  linkPlugin = {name, plugin, check ? true}:
+    stdenv.lib.optionalString check ''
+      ln -s ${plugin}/libexec/android-sdk/* ${name}
+    '';
+
+  # Links all plugins related to a requested platform
+  linkPlatformPlugins = {name, plugins, check}:
+    stdenv.lib.optionalString check ''
+      mkdir -p ${name}
+      ${stdenv.lib.concatMapStrings (plugin: ''
+        ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
+      '') plugins}
+    ''; # */
+
+  # This derivation deploys the tools package and symlinks all the desired
+  # plugins that we want to use.
+
+  androidsdk = import ./tools.nix {
+    inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686;
+    inherit (stdenv) lib;
+
+    postInstall = ''
+      # Symlink all requested plugins
+
+      ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
+      ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
+      ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
+      ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }}
+      ${linkPlugins { name = "platforms"; plugins = platforms; }}
+      ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
+      ${linkPlugins { name = "lldb"; plugins = lldb; }}
+      ${linkPlugins { name = "cmake"; plugins = cmake; }}
+      ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
+
+      ${stdenv.lib.optionalString includeSystemImages ''
+        mkdir -p system-images
+        ${stdenv.lib.concatMapStrings (system-image: ''
+          apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))
+          type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))
+          mkdir -p system-images/$apiVersion/$type
+          ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type
+        '') system-images}
+      ''}
+
+      ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }}
+      ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }}
+
+      # Link extras
+      ${stdenv.lib.concatMapStrings (identifier:
+        let
+          path = addons.extras."${identifier}".path;
+          addon = deployAndroidPackage {
+            inherit os;
+            package = addons.extras."${identifier}";
+          };
+        in
+        ''
+          targetDir=$(dirname ${path})
+          mkdir -p $targetDir
+          ln -s ${addon}/libexec/android-sdk/${path} $targetDir
+        '') includeExtras}
+
+      # Expose common executables in bin/
+      mkdir -p $out/bin
+      find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i
+      do
+          ln -s $i $out/bin
+      done
+
+      find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i
+      do
+          ln -s $i $out/bin
+      done
+
+      for i in ${platform-tools}/bin/*
+      do
+          ln -s $i $out/bin
+      done
+    '';
+  };
+}
diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl
new file mode 100644
index 00000000000..73f58ff5cde
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/convertaddons.xsl
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:addon="http://schemas.android.com/sdk/android/repo/addon2/01"
+  xmlns:sdk="http://schemas.android.com/repository/android/common/01"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <xsl:output omit-xml-declaration="yes" indent="no" />
+
+  <!-- Template that puts a google HTTP prefix in front of relative URLs -->
+  <xsl:template name="repository-url">
+    <xsl:variable name="raw-url" select="complete/url"/>
+    <xsl:choose>
+      <xsl:when test="starts-with($raw-url, 'http')">
+        <xsl:value-of select="$raw-url"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
+        <xsl:value-of select="$raw-url"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/addon:sdk-addon">
+{fetchurl}:
+
+{
+  addons = {
+    <!-- Convert all addons, but skip the entry for google APIs version 25 because it is inconsistent with the spec -->
+    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url != 'google_apis-25_r1.zip' ]"><xsl:sort select="@path" />
+    "<xsl:value-of select="type-details/api-level" />"."<xsl:value-of select="type-details/tag/id" />" = {
+      name = "<xsl:value-of select="type-details/tag/id" />";
+      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
+      revision = "<xsl:value-of select="type-details/api-level" />";
+      displayName = "<xsl:value-of select="display-name" />";
+      archives = {
+      <xsl:for-each select="archives/archive[not(host-os)]">
+        all = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
+        <xsl:value-of select="host-os" /> = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      };
+    };
+    </xsl:for-each>
+
+    <!-- Workaround to make google APIs version 25 work. Hopefully, we can get rid of this at some point -->
+    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url = 'google_apis-25_r1.zip' ]">
+    "<xsl:value-of select="25" />"."<xsl:value-of select="type-details/tag/id" />" = {
+      name = "<xsl:value-of select="type-details/tag/id" />";
+      path = "add-ons/addon-google_apis-google-25";
+      revision = "<xsl:value-of select="25" />";
+      displayName = "<xsl:value-of select="display-name" />";
+      archives = {
+      <xsl:for-each select="archives/archive[not(host-os)]">
+        all = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
+        <xsl:value-of select="host-os" /> = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      };
+    };
+    </xsl:for-each>
+  };
+
+  extras = {
+    <!-- Convert all extras and maven artefacts -->
+    <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:extraDetailsType' or type-details/@xsi:type='addon:mavenType']"><xsl:sort select="@path" />
+    
+    <!-- Compose revision string from revision attributes -->
+    <xsl:variable name="revision">
+      <xsl:choose>
+        <xsl:when test="revision/major">
+          <xsl:value-of select="revision/major" />
+        </xsl:when>
+      </xsl:choose>
+      <xsl:choose>
+        <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
+        </xsl:when>
+      </xsl:choose>
+      <xsl:choose>
+        <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
+        </xsl:when>
+      </xsl:choose>
+      <xsl:choose>
+        <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
+        </xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+
+    "<xsl:value-of select="@path" />" = {
+      name = "<xsl:value-of select="translate(@path, ';', '-')" />";
+      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
+      revision = "<xsl:value-of select="$revision" />";
+      displayName = "<xsl:value-of select="display-name" />";
+      archives = {
+      <xsl:for-each select="archives/archive[not(host-os)]">
+        all = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
+        <xsl:value-of select="host-os" /> = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      };
+    };
+    </xsl:for-each>
+  };
+}
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl
new file mode 100644
index 00000000000..9623e01abcd
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/convertpackages.xsl
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:common="http://schemas.android.com/repository/android/common/01"
+  xmlns:generic="http://schemas.android.com/repository/android/generic/01"
+  xmlns:sdk="http://schemas.android.com/sdk/android/repo/repository2/01"
+  xmlns:sdk-common="http://schemas.android.com/sdk/android/repo/common/01"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <xsl:output omit-xml-declaration="yes" indent="no" />
+
+  <!-- Template that puts a google HTTP prefix in front of relative URLs -->
+  <xsl:template name="repository-url">
+    <xsl:variable name="raw-url" select="complete/url"/>
+    <xsl:choose>
+      <xsl:when test="starts-with($raw-url, 'http')">
+        <xsl:value-of select="$raw-url"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
+        <xsl:value-of select="$raw-url"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/sdk:sdk-repository">
+{fetchurl}:
+
+{
+  <!-- Convert all remote packages -->
+  <xsl:for-each select="remotePackage"><xsl:sort select="@path" />
+
+  <!-- Extract the package name from the path -->
+  <xsl:variable name="name">
+    <xsl:choose>
+      <xsl:when test="contains(@path, ';')">
+        <xsl:value-of select="substring-before(@path, ';')" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="@path" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <!-- Compose version string from version attributes -->
+  <xsl:variable name="revision">
+    <xsl:choose>
+      <!-- Compose revision for a generic package from the revision attributes -->
+      <xsl:when test="type-details/@xsi:type='generic:genericDetailsType'">
+        <xsl:choose>
+          <xsl:when test="revision/major">
+            <xsl:value-of select="revision/major" />
+          </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
+          </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
+          </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
+          </xsl:when>
+        </xsl:choose>
+      </xsl:when>
+      <!-- Compose revision of a platform SDK from the API-level or codename if the latter exists -->
+      <xsl:when test="type-details/@xsi:type='sdk:platformDetailsType'">
+        <xsl:choose>
+          <xsl:when test="not(type-details/codename='')">
+            <xsl:value-of select="type-details/codename" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="type-details/api-level" />
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <!-- Compose revision of a source SDK from the API-level -->
+      <xsl:when test="type-details/@xsi:type='sdk:sourceDetailsType'">
+        <xsl:value-of select="type-details/api-level" />
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:choose>
+    <xsl:when test="@path='emulator'"> <!-- An emulator package provides one archive per operating system but the same versions -->
+  "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />".<xsl:value-of select="archives/archive/host-os" /> = {
+    </xsl:when>
+    <xsl:otherwise>
+  "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />" = {
+    </xsl:otherwise>
+  </xsl:choose>
+    name = "<xsl:value-of select="$name" />";
+    path = "<xsl:value-of select="translate(@path, ';', '/')" />";
+    revision = "<xsl:value-of select="$revision" />";
+    displayName = "<xsl:value-of select="display-name" />";
+    archives = {
+      <xsl:for-each select="archives/archive[not(host-os)]">
+        all = fetchurl {
+          url = <xsl:call-template name="repository-url"/>;
+          sha1 = "<xsl:value-of select="complete/checksum" />";
+        };
+      </xsl:for-each>
+      <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
+        <xsl:value-of select="host-os" /> = fetchurl {
+        url = <xsl:call-template name="repository-url"/>;
+        sha1 = "<xsl:value-of select="complete/checksum" />";
+      };
+      </xsl:for-each>
+    };
+  };
+  </xsl:for-each>
+}
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
new file mode 100644
index 00000000000..42d19cb6965
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:sys-img="http://schemas.android.com/sdk/android/repo/sys-img2/01"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <xsl:param name="imageType" />
+
+  <xsl:output omit-xml-declaration="yes" indent="no" />
+
+  <xsl:template name="repository-url">
+    <xsl:variable name="raw-url" select="complete/url"/>
+    <xsl:choose>
+      <xsl:when test="starts-with($raw-url, 'http')">
+        <xsl:value-of select="$raw-url"/>
+      </xsl:when>
+      <xsl:otherwise>
+        https://dl.google.com/android/repository/sys-img/<xsl:value-of select="$imageType" />/<xsl:value-of select="$raw-url"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/sys-img:sdk-sys-img">
+{fetchurl}:
+
+{
+  <xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]">
+    <xsl:variable name="revision">
+      <xsl:value-of select="type-details/api-level" />-<xsl:value-of select="type-details/tag/id" />-<xsl:value-of select="type-details/abi" />
+    </xsl:variable>
+
+    "<xsl:value-of select="type-details/api-level" />".<xsl:value-of select="type-details/tag/id" />."<xsl:value-of select="type-details/abi" />" = {
+      name = "system-image-<xsl:value-of select="$revision" />";
+      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
+      revision = "<xsl:value-of select="$revision" />";
+      displayName = "<xsl:value-of select="display-name" />";
+      archives.all = fetchurl {
+      <xsl:for-each select="archives/archive">
+        url = <xsl:call-template name="repository-url"/>;
+        sha1 = "<xsl:value-of select="complete/checksum" />";
+      </xsl:for-each>
+      };
+  };
+  </xsl:for-each>
+}
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 071e17c325d..b7aaccd3763 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,349 +1,25 @@
-{ pkgs, pkgs_i686, buildPackages
-, includeSources ? true, licenseAccepted ? false
+{ pkgs ? import <nixpkgs> {}
+, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
 }:
 
-# TODO: use callPackage instead of import to avoid so many inherits
-
 rec {
-  platformTools = import ./platform-tools.nix {
-    inherit buildPackages pkgs;
-  };
-
-  buildToolsSources = let
-    system = pkgs.stdenv.hostPlatform.system;
-    path = if (system == "i686-linux" || system == "x86_64-linux")
-      then ./build-tools-srcs-linux.nix
-      else if system == "x86_64-darwin"
-      then ./build-tools-srcs-macosx.nix
-      else throw "System: ${system} not supported!";
-  in
-    import path { inherit (pkgs) fetchurl; };
-
-  buildTools = import ./build-tools.nix {
-    inherit (pkgs) stdenv lib fetchurl unzip zlib file coreutils;
-    inherit buildToolsSources;
-    stdenv_32bit = pkgs_i686.stdenv;
-    zlib_32bit = pkgs_i686.zlib;
-    ncurses_32bit = pkgs_i686.ncurses5;
-    ncurses = pkgs.ncurses5;
-  };
-
-  support = import ./support.nix {
-    inherit (pkgs) stdenv fetchurl unzip;
-  };
-
-  supportRepository = import ./support-repository.nix {
-    inherit (pkgs) stdenv fetchurl unzip;
-  };
-
-  platforms = if (pkgs.stdenv.hostPlatform.system == "i686-linux" || pkgs.stdenv.hostPlatform.system == "x86_64-linux")
-    then import ./platforms-linux.nix {
-      inherit (pkgs) stdenv fetchurl unzip;
-    }
-    else if pkgs.stdenv.hostPlatform.system == "x86_64-darwin"
-    then import ./platforms-macosx.nix {
-      inherit (pkgs) stdenv fetchurl unzip;
-    }
-    else throw "Platform: ${pkgs.stdenv.hostPlatform.system} not supported!";
-
-  sysimages = import ./sysimages.nix {
-    inherit (pkgs) stdenv fetchurl unzip;
-  };
-
-  addons = import ./addons.nix {
-    inherit (pkgs) stdenv fetchurl unzip;
-  };
-
-  sources = import ./sources.nix {
-    inherit (pkgs) stdenv fetchurl unzip;
-  };
-
-  androidsdk = import ./androidsdk.nix {
-    inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib
-                   glxinfo freetype fontconfig glib gtk2 atk
-                   libGLU_combined file alsaLib jdk coreutils
-                   libpulseaudio dbus fetchzip;
-    inherit (pkgs.xorg) libX11 libXext libXrender
-                        libxcb libXau libXdmcp libXtst xkeyboardconfig;
-
-    inherit platformTools buildTools support
-            supportRepository platforms sysimages
-            addons sources includeSources licenseAccepted;
-
-    stdenv_32bit = pkgs_i686.stdenv;
-  };
-
-  androidsdk_2_1 = androidsdk {
-    platformVersions = [ "7" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_2_2 = androidsdk {
-    platformVersions = [ "8" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_2_3_3 = androidsdk {
-    platformVersions = [ "10" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_3_0 = androidsdk {
-    platformVersions = [ "11" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_3_1 = androidsdk {
-    platformVersions = [ "12" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_3_2 = androidsdk {
-    platformVersions = [ "13" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_0 = androidsdk {
-    platformVersions = [ "14" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_0_3 = androidsdk {
-    platformVersions = [ "15" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_1 = androidsdk {
-    platformVersions = [ "16" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_2 = androidsdk {
-    platformVersions = [ "17" ];
-    abiVersions = [ "armeabi-v7a" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_3 = androidsdk {
-    platformVersions = [ "18" ];
-    abiVersions = [ "armeabi-v7a" "x86" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_4_4 = androidsdk {
-    platformVersions = [ "19" ];
-    abiVersions = [ "armeabi-v7a" "x86" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_5_0_1 = androidsdk {
-    platformVersions = [ "21" ];
-    abiVersions = [ "armeabi-v7a" "x86" ];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_5_0_1_extras = androidsdk {
-    platformVersions = [ "21" ];
-    abiVersions = [ "armeabi-v7a" "x86" ];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-  };
-
-  androidsdk_5_1_1 = androidsdk {
-    platformVersions = [ "22" ];
-    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_5_1_1_extras = androidsdk {
-    platformVersions = [ "22" ];
-    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-  };
-
-  androidsdk_6_0 = androidsdk {
-    platformVersions = [ "23" ];
-    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_6_0_extras = androidsdk {
-    platformVersions = [ "23" ];
-    abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_7_0 = androidsdk {
-    platformVersions = [ "24" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_7_0_extras = androidsdk {
-    platformVersions = [ "24" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_7_1_1 = androidsdk {
-    platformVersions = [ "25" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_7_1_1_extras = androidsdk {
-    platformVersions = [ "25" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_8_0 = androidsdk {
-    platformVersions = [ "26" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_8_0_extras = androidsdk {
-    platformVersions = [ "26" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_8_1 = androidsdk {
-    platformVersions = [ "27" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_8_1_extras = androidsdk {
-    platformVersions = [ "27" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_9_0 = androidsdk {
-    platformVersions = [ "28" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-  };
-
-  androidsdk_9_0_extras = androidsdk {
-    platformVersions = [ "28" ];
-    abiVersions = [ "x86" "x86_64"];
-    useGoogleAPIs = true;
-    useExtraSupportLibs = true;
-    useGooglePlayServices = true;
-    useInstantApps = true;
-  };
-
-  androidsdk_latest = androidsdk_9_0;
-
-  androidndk_10e = pkgs.callPackage ./androidndk.nix {
-    inherit (buildPackages)
-      unzip makeWrapper;
-    inherit (pkgs)
-      stdenv fetchurl zlib ncurses5 lib python3 libcxx
-      coreutils file findutils gawk gnugrep gnused jdk which;
-    inherit platformTools;
-    version = "10e";
-    sha1s = {
-      x86_64-darwin = "6be8598e4ed3d9dd42998c8cb666f0ee502b1294";
-      x86_64-linux = "f692681b007071103277f6edc6f91cb5c5494a32";
-    };
-  };
-
-  androidndk_16b = pkgs.callPackage ./androidndk.nix {
-    inherit (buildPackages)
-       unzip makeWrapper;
-    inherit (pkgs)
-      stdenv fetchurl zlib ncurses5 lib python3 libcxx
-      coreutils file findutils gawk gnugrep gnused jdk which;
-    inherit platformTools;
-    version = "16b";
-    sha1s = {
-      x86_64-darwin = "e51e615449b98c716cf912057e2682e75d55e2de";
-      x86_64-linux = "42aa43aae89a50d1c66c3f9fdecd676936da6128";
-    };
-  };
-
-  androidndk_17c = pkgs.callPackage ./androidndk.nix {
-    inherit (buildPackages)
-      unzip makeWrapper;
-    inherit (pkgs)
-      stdenv fetchurl zlib ncurses5 lib python3 libcxx
-      coreutils file findutils gawk gnugrep gnused jdk which;
-    inherit platformTools;
-    version = "17c";
-    sha1s = {
-      x86_64-darwin = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c";
-      x86_64-linux = "12cacc70c3fd2f40574015631c00f41fb8a39048";
-    };
-  };
-
-  androidndk_18b = pkgs.callPackage ./androidndk.nix {
-    inherit (buildPackages)
-      unzip makeWrapper;
-    inherit (pkgs)
-      stdenv fetchurl zlib ncurses5 lib python3 libcxx
-      coreutils file findutils gawk gnugrep gnused jdk which;
-    inherit platformTools;
-    version = "18b";
-    sha1s = {
-      x86_64-darwin = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
-      x86_64-linux = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
-    };
-  };
-  androidndk = androidndk_18b;
-
-  androidndk_r8e = import ./androidndk_r8e.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib
-      coreutils file findutils gawk gnugrep gnused jdk which;
-    inherit platformTools;
+  composeAndroidPackages = import ./compose-android-packages.nix {
+    inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook;
+    inherit pkgs pkgs_i686;
   };
 
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv jdk ant gnumake gawk file which;
-    inherit androidsdk androidndk;
+    inherit (pkgs) stdenv jdk ant gnumake gawk;
+    inherit composeAndroidPackages;
   };
 
   emulateApp = import ./emulate-app.nix {
     inherit (pkgs) stdenv;
-    inherit androidsdk;
+    inherit composeAndroidPackages;
   };
 
-  buildGradleApp = import ./build-gradle-app.nix {
-    inherit (pkgs) stdenv jdk gnumake gawk file runCommand
-                   which gradle fetchurl buildEnv;
-    inherit androidsdk androidndk;
+  androidPkgs_9_0 = composeAndroidPackages {
+    platformVersions = [ "28" ];
+    abiVersions = [ "x86" "x86_64"];
   };
 }
diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix
new file mode 100644
index 00000000000..97fd197cb7d
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix
@@ -0,0 +1,44 @@
+{stdenv, unzip}:
+{package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:
+
+let
+  extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ];
+in
+stdenv.mkDerivation ({
+  name = package.name + "-" + package.revision;
+  src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all;
+  buildInputs = [ unzip ] ++ buildInputs;
+
+  # Most Android Zip packages have a root folder, but some don't. We unpack
+  # the zip file in a folder and we try to discover whether it has a single root
+  # folder. If this is the case, we adjust the current working folder.
+  unpackPhase = ''
+    mkdir extractedzip
+    cd extractedzip
+    unpackFile "$src"
+    if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]
+    then
+        cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
+    fi
+    sourceRoot="$PWD"
+  '';
+
+  installPhase = ''
+    packageBaseDir=$out/libexec/android-sdk/${package.path}
+    mkdir -p $packageBaseDir
+    cd $packageBaseDir
+    cp -av $sourceRoot/* .
+    ${patchInstructions}
+  '';
+
+  # We never attempt to strip. This is not required since we're doing binary
+  # deployments. Moreover, some executables that have been patched with patchelf
+  # may not work any longer after they have been stripped.
+  dontStrip = true;
+  dontPatchELF = true;
+  dontAutoPatchelf = true;
+
+  meta = {
+    description = package.displayName;
+  } // meta;
+} // extraParams)
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 2fc753c047a..01669024b3b 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -1,33 +1,41 @@
-{stdenv, androidsdk}:
+{ composeAndroidPackages, stdenv }:
 { name, app ? null
-, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
+, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false
 , enableGPU ? false, extraAVDFiles ? []
 , package ? null, activity ? null
 , avdHomeDir ? null
-}:
+}@args:
 
 let
-  androidsdkComposition = androidsdk {
-    inherit useGoogleAPIs;
+  androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages);
+  extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames);
+
+  # Extract the parameters meant for the Android SDK
+  androidParams = {
     platformVersions = [ platformVersion ];
+    includeEmulator = true;
+    includeSystemImages = true;
+    systemImageTypes = [ systemImageType ];
     abiVersions = [ abiVersion ];
   };
+
+  androidsdkComposition = (composeAndroidPackages androidParams).androidsdk;
 in
 stdenv.mkDerivation {
   inherit name;
-  
+
   buildCommand = ''
     mkdir -p $out/bin
-    
+
     cat > $out/bin/run-test-emulator << "EOF"
     #! ${stdenv.shell} -e
-    
+
     # We need a TMPDIR
     if [ "$TMPDIR" = "" ]
     then
         export TMPDIR=/tmp
     fi
-    
+
     ${if avdHomeDir == null then ''
       # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
       export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
@@ -35,20 +43,23 @@ stdenv.mkDerivation {
       mkdir -p "${avdHomeDir}"
       export ANDROID_SDK_HOME="${avdHomeDir}"
     ''}
-    
+
+    # We need to specify the location of the Android SDK root folder
+    export ANDROID_SDK_ROOT=${androidsdkComposition}/libexec/android-sdk
+
     # We have to look for a free TCP port
-    
+
     echo "Looking for a free TCP port in range 5554-5584" >&2
-    
+
     for i in $(seq 5554 2 5584)
     do
-        if [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb devices | grep emulator-$i)" ]
+        if [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ]
         then
             port=$i
             break
         fi
     done
-    
+
     if [ -z "$port" ]
     then
         echo "Unfortunately, the emulator port space is exhausted!" >&2
@@ -56,57 +67,57 @@ stdenv.mkDerivation {
     else
         echo "We have a free TCP port: $port" >&2
     fi
-    
+
     export ANDROID_SERIAL="emulator-$port"
-    
+
     # Create a virtual android device for testing if it does not exists
-    
-    if [ "$(${androidsdkComposition}/libexec/tools/android list avd | grep 'Name: device')" = "" ]
+    ${androidsdkComposition}/libexec/android-sdk/tools/android list targets
+
+    if [ "$(${androidsdkComposition}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ]
     then
         # Create a virtual android device
-        yes "" | ${androidsdkComposition}/libexec/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
-    
+        yes "" | ${androidsdkComposition}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS
+
         ${stdenv.lib.optionalString enableGPU ''
           # Enable GPU acceleration
           echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
         ''}
-    
+
         ${stdenv.lib.concatMapStrings (extraAVDFile: ''
           ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
         '') extraAVDFiles}
     fi
-    
+
     # Launch the emulator
-    ${androidsdkComposition}/libexec/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
+    ${androidsdkComposition}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
 
     # Wait until the device has completely booted
-    
     echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
-    
-    ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port wait-for-device
-    
+
+    ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device
+
     echo "Device state has been reached" >&2
-    
-    while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
+
+    while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
     do
         sleep 5
     done
-    
+
     echo "dev.bootcomplete property is 1" >&2
-    
-    #while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
+
+    #while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
     #do
         #sleep 5
     #done
-    
+
     #echo "sys.boot_completed property is 1" >&2
-    
+
     echo "ready" >&2
-    
+
     ${stdenv.lib.optionalString (app != null) ''
       # Install the App through the debugger, if it has not been installed yet
-      
-      if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
+
+      if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
       then
           if [ -d "${app}" ]
           then
@@ -114,13 +125,13 @@ stdenv.mkDerivation {
           else
               appPath="${app}"
           fi
-          
-          ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port install "$appPath"
+
+          ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath"
       fi
-    
+
       # Start the application
       ${stdenv.lib.optionalString (package != null && activity != null) ''
-          ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity}
+          ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity}
       ''}
     ''}
     EOF
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
new file mode 100644
index 00000000000..7ba74eb900f
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -0,0 +1,20 @@
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}:
+
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook makeWrapper ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libXfixes pkgs.xlibs.libxcb pkgs.libGL pkgs.libpulseaudio pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc pkgs_i686.glibc ];
+  patchInstructions = lib.optionalString (os == "linux") ''
+    addAutoPatchelfSearchPath $packageBaseDir/lib
+    addAutoPatchelfSearchPath $packageBaseDir/lib64
+    addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
+    autoPatchelf $out
+
+    # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps
+    wrapProgram $out/libexec/android-sdk/emulator/emulator \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus ]} \
+      --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
+      --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
+  '';
+  dontMoveLib64 = true;
+}
diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh
deleted file mode 100755
index ef15e8eaeda..00000000000
--- a/pkgs/development/mobile/androidenv/fetch.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash --pure -p curl libxslt
-
-# we skip the intel addons, as they are Windows+osX only
-# we skip the default sys-img (arm?) because it is empty
-curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml
-curl -o addon.xml         https://dl.google.com/android/repository/addon.xml
-curl -o sys-img.xml       https://dl.google.com/android/repository/sys-img/android/sys-img.xml
-
-./generate-addons.sh
-./generate-platforms.sh
-./generate-sysimages.sh
-./generate-sources.sh
-./generate-tools.sh
diff --git a/pkgs/development/mobile/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh
deleted file mode 100755
index 9b2cf34eabc..00000000000
--- a/pkgs/development/mobile/androidenv/generate-addons.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-xsltproc generate-addons.xsl addon.xml > addons.nix
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
deleted file mode 100644
index d32ad717cd7..00000000000
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/addon/7">
-
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-  <xsl:template match="/sdk:sdk-addon">
-# This file is generated from generate-addons.sh. DO NOT EDIT.
-# Execute generate-addons.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildGoogleApis = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-      '';
-    });
-in
-{
-<xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:revision" data-type="number"/>
-  google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis {
-    name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />";
-      src = fetchurl {
-        url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
-        sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-      };
-      meta = {
-        description = "<xsl:value-of select="sdk:description" />";
-<xsl:for-each select="sdk:desc-url">        url = <xsl:value-of select="." />;</xsl:for-each>
-      };
-    };
-</xsl:for-each>
-
-<xsl:for-each select="sdk:extra[sdk:path='support']">
-  android_support_extra = buildGoogleApis {
-    name = "android_support_extra";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-    };
-    meta = {
-      description = "Android Support Library";
-      url = http://developer.android.com/;
-    };
-  };
-</xsl:for-each><xsl:for-each select="sdk:extra[sdk:path='google_play_services']">
-  google_play_services = buildGoogleApis {
-    name = "google_play_services";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-    };
-    meta = {
-      description = "Google Play services client library and sample code";
-      url = http://developer.android.com/;
-    };
-  };
-</xsl:for-each>
-
-<!-- Instant apps -->
-<xsl:for-each select="sdk:extra[sdk:path='instantapps']">
-  instant_apps = buildGoogleApis {
-    name = "instant_apps_sdk";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-    };
-    meta = {
-      description = "Android Instant Apps Development SDK";
-      url = "https://developer.android.com/";
-    };
-  };
-</xsl:for-each>
-
-}
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
deleted file mode 100755
index ce89f6a8036..00000000000
--- a/pkgs/development/mobile/androidenv/generate-platforms.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix
-xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
deleted file mode 100644
index 54a165d21e4..00000000000
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
-
-  <xsl:param name="os" />
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
-        <xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="/sdk:sdk-repository">
-# This file is generated from generate-platforms.sh. DO NOT EDIT.
-# Execute generate-platforms.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildPlatform = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-    <xsl:for-each select="sdk:platform"><xsl:sort select="sdk:api-level" data-type="number"/>
-  platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform {
-    name = "android-platform-<xsl:value-of select="sdk:version" />";
-    src = fetchurl {
-      url = <xsl:call-template name="repository-url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
-    };
-    meta = {
-      description = "<xsl:value-of select="sdk:description" />";
-<xsl:for-each select="sdk:desc-url">      homepage = <xsl:value-of select="." />;</xsl:for-each>
-    };
-  };
-</xsl:for-each>
-}
-</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-sources.sh b/pkgs/development/mobile/androidenv/generate-sources.sh
deleted file mode 100755
index 861fbbf9d2e..00000000000
--- a/pkgs/development/mobile/androidenv/generate-sources.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-xsltproc generate-sources.xsl repository-11.xml > sources.nix
diff --git a/pkgs/development/mobile/androidenv/generate-sources.xsl b/pkgs/development/mobile/androidenv/generate-sources.xsl
deleted file mode 100644
index ad76369b2be..00000000000
--- a/pkgs/development/mobile/androidenv/generate-sources.xsl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
-
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="sdk:archives/sdk:archive/sdk:url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
-        <xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="/sdk:sdk-repository">
-# This file is generated from generate-sources.sh. DO NOT EDIT.
-# Execute generate-sources.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSource = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-<xsl:for-each select="sdk:source"><xsl:sort select="sdk:api-level" data-type="number"/>
-  source_<xsl:value-of select="sdk:api-level" /> = buildSource {
-    name = "android-source-<xsl:value-of select="sdk:api-level" />";
-    src = fetchurl {
-      url = <xsl:call-template name="repository-url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-    };
-    meta = {
-      description = "Source code for Android API <xsl:value-of select="sdk:api-level" />";
-    };
-  };
-</xsl:for-each>
-}
-</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
deleted file mode 100755
index 586381e8ba6..00000000000
--- a/pkgs/development/mobile/androidenv/generate-sysimages.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-cat > sysimages.nix << "EOF"
-# This file is generated from generate-sysimages.sh. DO NOT EDIT.
-# Execute generate-sysimages.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSystemImage = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-EOF
-
-xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix
-
-cat >> sysimages.nix << "EOF"
-}
-EOF
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
deleted file mode 100644
index 302c7d9deea..00000000000
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template match="/sdk:sdk-sys-img">
-    <xsl:for-each select="sdk:system-image"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:abi"/>
-  sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
-    name = "sysimg-<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
-    src = fetchurl {
-      url = <xsl:if test="not(starts-with(sdk:archives/sdk:archive/sdk:url, 'https://'))">https://dl.google.com/android/repository/sys-img/android/</xsl:if><xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
-    };
-  };
-</xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-tools.sh b/pkgs/development/mobile/androidenv/generate-tools.sh
deleted file mode 100755
index 5799894fd45..00000000000
--- a/pkgs/development/mobile/androidenv/generate-tools.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-xsltproc --stringparam os linux generate-tools.xsl repository-11.xml > build-tools-srcs-linux.nix
-xsltproc --stringparam os macosx generate-tools.xsl repository-11.xml > build-tools-srcs-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-tools.xsl b/pkgs/development/mobile/androidenv/generate-tools.xsl
deleted file mode 100644
index 814bad12988..00000000000
--- a/pkgs/development/mobile/androidenv/generate-tools.xsl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
-
-  <xsl:param name="os" />
-  <xsl:output omit-xml-declaration="yes" indent="no" />
-
-  <xsl:template name="repository-url">
-    <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($raw-url, 'http')">
-        <xsl:value-of select="$raw-url"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
-        <xsl:value-of select="$raw-url"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="/sdk:sdk-repository">
-# This file is generated from generate-tools.sh. DO NOT EDIT.
-# Execute generate-tools.sh or fetch.sh to update the file.
-{ fetchurl }:
-
-{
-    <xsl:for-each select="sdk:build-tool">
-      <xsl:sort select="sdk:revision/sdk:major" data-type="number"/>
-      <xsl:sort select="sdk:revision/sdk:minor" data-type="number"/>
-      <xsl:sort select="sdk:revision/sdk:micro" data-type="number"/>
-      <xsl:sort select="sdk:revision/sdk:preview" data-type="number"/>
-  v<xsl:value-of select="sdk:revision/sdk:major"/><xsl:if test="sdk:revision/sdk:minor + sdk:revision/sdk:micro > 0">_<xsl:value-of select="sdk:revision/sdk:minor" />_<xsl:value-of select="sdk:revision/sdk:micro"/></xsl:if><xsl:if test="sdk:revision/sdk:preview > 0">_rc<xsl:value-of select="sdk:revision/sdk:preview"/></xsl:if> = {
-    version = "<xsl:value-of select="sdk:revision/sdk:major"/>.<xsl:value-of select="sdk:revision/sdk:minor" />.<xsl:value-of select="sdk:revision/sdk:micro"/><xsl:if test="sdk:revision/sdk:preview > 0">-rc<xsl:value-of select="sdk:revision/sdk:preview"/></xsl:if>";
-    src = fetchurl {
-      url = <xsl:call-template name="repository-url"/>;
-      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
-    };
-  };
-</xsl:for-each>
-}
-</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh
new file mode 100644
index 00000000000..1c55734f5f4
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate.sh
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+# Convert base packages
+curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml
+xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix
+
+# Convert system images
+for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore
+do
+    curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml
+    xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix
+done
+
+# Convert system addons
+curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml
+xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix
diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix
new file mode 100644
index 00000000000..d902b111665
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/addons.nix
@@ -0,0 +1,1145 @@
+
+{fetchurl}:
+
+{
+  addons = {
+    
+    "10"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-10";
+      revision = "10";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-10_r02.zip;
+          sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
+        };
+      
+      };
+    };
+    
+    "11"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-11";
+      revision = "11";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-11_r01.zip;
+          sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
+        };
+      
+      };
+    };
+    
+    "12"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-12";
+      revision = "12";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-12_r01.zip;
+          sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
+        };
+      
+      };
+    };
+    
+    "13"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-13";
+      revision = "13";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-13_r01.zip;
+          sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
+        };
+      
+      };
+    };
+    
+    "14"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-14";
+      revision = "14";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-14_r02.zip;
+          sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
+        };
+      
+      };
+    };
+    
+    "15"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-15";
+      revision = "15";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-15_r03.zip;
+          sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
+        };
+      
+      };
+    };
+    
+    "16"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-16";
+      revision = "16";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-16_r04.zip;
+          sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
+        };
+      
+      };
+    };
+    
+    "17"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-17";
+      revision = "17";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-17_r04.zip;
+          sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
+        };
+      
+      };
+    };
+    
+    "18"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-18";
+      revision = "18";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-18_r04.zip;
+          sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
+        };
+      
+      };
+    };
+    
+    "19"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-19";
+      revision = "19";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-19_r20.zip;
+          sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
+        };
+      
+      };
+    };
+    
+    "21"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-21";
+      revision = "21";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-21_r01.zip;
+          sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
+        };
+      
+      };
+    };
+    
+    "22"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-22";
+      revision = "22";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-22_r01.zip;
+          sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
+        };
+      
+      };
+    };
+    
+    "23"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-23";
+      revision = "23";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-23_r01.zip;
+          sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
+        };
+      
+      };
+    };
+    
+    "24"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-24";
+      revision = "24";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-24_r1.zip;
+          sha1 = "31361c2868f27343ee917fbd259c1463821b6145";
+        };
+      
+      };
+    };
+    
+    "3"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-3";
+      revision = "3";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-3-r03.zip;
+          sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
+        };
+      
+      };
+    };
+    
+    "4"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-4";
+      revision = "4";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-4_r02.zip;
+          sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
+        };
+      
+      };
+    };
+    
+    "5"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-5";
+      revision = "5";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-5_r01.zip;
+          sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
+        };
+      
+      };
+    };
+    
+    "6"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-6";
+      revision = "6";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-6_r01.zip;
+          sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
+        };
+      
+      };
+    };
+    
+    "7"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-7";
+      revision = "7";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-7_r01.zip;
+          sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
+        };
+      
+      };
+    };
+    
+    "8"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-8";
+      revision = "8";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-8_r02.zip;
+          sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
+        };
+      
+      };
+    };
+    
+    "9"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-9";
+      revision = "9";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-9_r02.zip;
+          sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
+        };
+      
+      };
+    };
+    
+    "12"."google_tv_addon" = {
+      name = "google_tv_addon";
+      path = "add-ons/addon-google_tv_addon-google-12";
+      revision = "12";
+      displayName = "Google TV Addon";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_tv-12_r02.zip;
+          sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840";
+        };
+      
+      };
+    };
+    
+    "13"."google_tv_addon" = {
+      name = "google_tv_addon";
+      path = "add-ons/addon-google_tv_addon-google-13";
+      revision = "13";
+      displayName = "Google TV Addon";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_tv-13_r01.zip;
+          sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09";
+        };
+      
+      };
+    };
+    
+    "25"."google_apis" = {
+      name = "google_apis";
+      path = "add-ons/addon-google_apis-google-25";
+      revision = "25";
+      displayName = "Google APIs";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_apis-25_r1.zip;
+          sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
+        };
+      
+      };
+    };
+    
+  };
+
+  extras = {
+    
+
+    "extras;android;gapid;1" = {
+      name = "extras-android-gapid-1";
+      path = "extras/android/gapid/1";
+      revision = "1.0.3";
+      displayName = "GPU Debugging tools";
+      archives = {
+      linux = fetchurl {
+          url = https://dl.google.com/android/repository/gapid_r01_linux.zip;
+          sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653";
+        };
+      macosx = fetchurl {
+          url = https://dl.google.com/android/repository/gapid_r01_osx.zip;
+          sha1 = "597eb271349d890566274861eba2770a84ee4c69";
+        };
+      
+      };
+    };
+    
+
+    "extras;android;gapid;3" = {
+      name = "extras-android-gapid-3";
+      path = "extras/android/gapid/3";
+      revision = "3.1.0";
+      displayName = "GPU Debugging tools";
+      archives = {
+      linux = fetchurl {
+          url = https://dl.google.com/android/repository/gapid_2994895_linux.zip;
+          sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46";
+        };
+      macosx = fetchurl {
+          url = https://dl.google.com/android/repository/gapid_2994895_osx.zip;
+          sha1 = "ad86a2350b7b9908300277bf03d41649659de384";
+        };
+      
+      };
+    };
+    
+
+    "extras;android;m2repository" = {
+      name = "extras-android-m2repository";
+      path = "extras/android/m2repository";
+      revision = "47.0.0";
+      displayName = "Android Support Repository";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android_m2repository_r47.zip;
+          sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;admob_ads_sdk" = {
+      name = "extras-google-admob_ads_sdk";
+      path = "extras/google/admob_ads_sdk";
+      revision = "11";
+      displayName = "Google AdMob Ads SDK";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip;
+          sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;analytics_sdk_v2" = {
+      name = "extras-google-analytics_sdk_v2";
+      path = "extras/google/analytics_sdk_v2";
+      revision = "3";
+      displayName = "Google Analytics App Tracking SDK";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip;
+          sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;auto" = {
+      name = "extras-google-auto";
+      path = "extras/google/auto";
+      revision = "1.1";
+      displayName = "Android Auto Desktop Head Unit emulator";
+      archives = {
+      linux = fetchurl {
+          url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip;
+          sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169";
+        };
+      macosx = fetchurl {
+          url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip;
+          sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;gcm" = {
+      name = "extras-google-gcm";
+      path = "extras/google/gcm";
+      revision = "3";
+      displayName = "Google Cloud Messaging for Android Library";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/gcm_r03.zip;
+          sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;google_play_services" = {
+      name = "extras-google-google_play_services";
+      path = "extras/google/google_play_services";
+      revision = "49";
+      displayName = "Google Play services";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip;
+          sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;google_play_services_froyo" = {
+      name = "extras-google-google_play_services_froyo";
+      path = "extras/google/google_play_services_froyo";
+      revision = "12";
+      displayName = "Google Play services for Froyo";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip;
+          sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;instantapps" = {
+      name = "extras-google-instantapps";
+      path = "extras/google/instantapps";
+      revision = "1.5.0";
+      displayName = "Google Play Instant Development SDK";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip;
+          sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;m2repository" = {
+      name = "extras-google-m2repository";
+      path = "extras/google/m2repository";
+      revision = "58";
+      displayName = "Google Repository";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip;
+          sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;market_apk_expansion" = {
+      name = "extras-google-market_apk_expansion";
+      path = "extras/google/market_apk_expansion";
+      revision = "1";
+      displayName = "Google Play APK Expansion library";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip;
+          sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;market_licensing" = {
+      name = "extras-google-market_licensing";
+      path = "extras/google/market_licensing";
+      revision = "1";
+      displayName = "Google Play Licensing Library";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/market_licensing-r02.zip;
+          sha1 = "355e8dc304a92a5616db235af8ee7bd554356254";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;simulators" = {
+      name = "extras-google-simulators";
+      path = "extras/google/simulators";
+      revision = "1";
+      displayName = "Android Auto API Simulators";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/simulator_r01.zip;
+          sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7";
+        };
+      
+      };
+    };
+    
+
+    "extras;google;usb_driver" = {
+      name = "extras-google-usb_driver";
+      path = "extras/google/usb_driver";
+      revision = "11";
+      displayName = "Google USB Driver";
+      archives = {
+      
+      };
+    };
+    
+
+    "extras;google;webdriver" = {
+      name = "extras-google-webdriver";
+      path = "extras/google/webdriver";
+      revision = "2";
+      displayName = "Google Web Driver";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/webdriver_r02.zip;
+          sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip;
+          sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip;
+          sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip;
+          sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip;
+          sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-alpha5";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip;
+          sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-alpha6";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip;
+          sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-alpha7";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip;
+          sha1 = "f08be3c306bf878de31c465e46a266c52014a13f";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-alpha8";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip;
+          sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-alpha9";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip;
+          sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-beta1";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip;
+          sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-beta2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip;
+          sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-beta3";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip;
+          sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-beta4";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip;
+          sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.0-beta5";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip;
+          sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.1";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip;
+          sha1 = "76f8823def9a6da8954a54737762a6820bc1d043";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2";
+      revision = "1";
+      displayName = "Solver for ConstraintLayout 1.0.2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip;
+          sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip;
+          sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip;
+          sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip;
+          sha1 = "1a26fb79d98421f315ead7ad15be167727533026";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
+      revision = "1";
+      displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip;
+          sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-alpha5";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip;
+          sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-alpha6";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip;
+          sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-alpha7";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip;
+          sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-alpha8";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip;
+          sha1 = "7912ba03b04831f918f523648f118c4ee4da7604";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-alpha9";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip;
+          sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-beta1";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip;
+          sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-beta2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip;
+          sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-beta3";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip;
+          sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-beta4";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip;
+          sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.0-beta5";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip;
+          sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.1";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip;
+          sha1 = "342b0894b8651fff37586f80f383733e97aba9f9";
+        };
+      
+      };
+    };
+    
+
+    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = {
+      name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2";
+      path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2";
+      revision = "1";
+      displayName = "ConstraintLayout for Android 1.0.2";
+      archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip;
+          sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4";
+        };
+      
+      };
+    };
+    
+  };
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix
new file mode 100644
index 00000000000..db1f7f1b8d3
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/packages.nix
@@ -0,0 +1,1910 @@
+
+{fetchurl}:
+
+{
+  
+  "build-tools"."17.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/17.0.0";
+    revision = "17.0.0";
+    displayName = "Android SDK Build-Tools 17";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r17-linux.zip;
+        sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip;
+        sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930";
+      };
+      
+    };
+  };
+  
+  "build-tools"."18.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/18.0.1";
+    revision = "18.0.1";
+    displayName = "Android SDK Build-Tools 18.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
+        sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
+        sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
+      };
+      
+    };
+  };
+  
+  "build-tools"."18.1.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/18.1.0";
+    revision = "18.1.0";
+    displayName = "Android SDK Build-Tools 18.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip;
+        sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip;
+        sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
+      };
+      
+    };
+  };
+  
+  "build-tools"."18.1.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/18.1.1";
+    revision = "18.1.1";
+    displayName = "Android SDK Build-Tools 18.1.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip;
+        sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip;
+        sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4";
+      };
+      
+    };
+  };
+  
+  "build-tools"."19.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/19.0.0";
+    revision = "19.0.0";
+    displayName = "Android SDK Build-Tools 19";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19-linux.zip;
+        sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip;
+        sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90";
+      };
+      
+    };
+  };
+  
+  "build-tools"."19.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/19.0.1";
+    revision = "19.0.1";
+    displayName = "Android SDK Build-Tools 19.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip;
+        sha1 = "18d2312dc4368858914213087f4e61445aca4517";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip;
+        sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b";
+      };
+      
+    };
+  };
+  
+  "build-tools"."19.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/19.0.2";
+    revision = "19.0.2";
+    displayName = "Android SDK Build-Tools 19.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip;
+        sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip;
+        sha1 = "145bc43065d45f756d99d87329d899052b9a9288";
+      };
+      
+    };
+  };
+  
+  "build-tools"."19.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/19.0.3";
+    revision = "19.0.3";
+    displayName = "Android SDK Build-Tools 19.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip;
+        sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip;
+        sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4";
+      };
+      
+    };
+  };
+  
+  "build-tools"."19.1.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/19.1.0";
+    revision = "19.1.0";
+    displayName = "Android SDK Build-Tools 19.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip;
+        sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip;
+        sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1";
+      };
+      
+    };
+  };
+  
+  "build-tools"."20.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/20.0.0";
+    revision = "20.0.0";
+    displayName = "Android SDK Build-Tools 20";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r20-linux.zip;
+        sha1 = "b688905526a5584d1327a662d871a635ff502758";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip;
+        sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.0.0";
+    revision = "21.0.0";
+    displayName = "Android SDK Build-Tools 21";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21-linux.zip;
+        sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip;
+        sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.0.1";
+    revision = "21.0.1";
+    displayName = "Android SDK Build-Tools 21.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip;
+        sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip;
+        sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.0.2";
+    revision = "21.0.2";
+    displayName = "Android SDK Build-Tools 21.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip;
+        sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip;
+        sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.1.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.1.0";
+    revision = "21.1.0";
+    displayName = "Android SDK Build-Tools 21.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip;
+        sha1 = "b7455e543784d52a8925f960bc880493ed1478cb";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip;
+        sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.1.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.1.1";
+    revision = "21.1.1";
+    displayName = "Android SDK Build-Tools 21.1.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip;
+        sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip;
+        sha1 = "836a146eab0504aa9387a5132e986fe7c7381571";
+      };
+      
+    };
+  };
+  
+  "build-tools"."21.1.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/21.1.2";
+    revision = "21.1.2";
+    displayName = "Android SDK Build-Tools 21.1.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
+        sha1 = "5e35259843bf2926113a38368b08458735479658";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
+        sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
+      };
+      
+    };
+  };
+  
+  "build-tools"."22.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/22.0.0";
+    revision = "22.0.0";
+    displayName = "Android SDK Build-Tools 22";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r22-linux.zip;
+        sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip;
+        sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d";
+      };
+      
+    };
+  };
+  
+  "build-tools"."22.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/22.0.1";
+    revision = "22.0.1";
+    displayName = "Android SDK Build-Tools 22.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip;
+        sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip;
+        sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf";
+      };
+      
+    };
+  };
+  
+  "build-tools"."23.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/23.0.0";
+    revision = "23.0.0";
+    displayName = "Android SDK Build-Tools 23";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23-linux.zip;
+        sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip;
+        sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03";
+      };
+      
+    };
+  };
+  
+  "build-tools"."23.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/23.0.1";
+    revision = "23.0.1";
+    displayName = "Android SDK Build-Tools 23.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip;
+        sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip;
+        sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
+      };
+      
+    };
+  };
+  
+  "build-tools"."23.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/23.0.2";
+    revision = "23.0.2";
+    displayName = "Android SDK Build-Tools 23.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip;
+        sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip;
+        sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf";
+      };
+      
+    };
+  };
+  
+  "build-tools"."23.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/23.0.3";
+    revision = "23.0.3";
+    displayName = "Android SDK Build-Tools 23.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip;
+        sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip;
+        sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0";
+      };
+      
+    };
+  };
+  
+  "build-tools"."24.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/24.0.0";
+    revision = "24.0.0";
+    displayName = "Android SDK Build-Tools 24";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24-linux.zip;
+        sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip;
+        sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de";
+      };
+      
+    };
+  };
+  
+  "build-tools"."24.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/24.0.1";
+    revision = "24.0.1";
+    displayName = "Android SDK Build-Tools 24.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip;
+        sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip;
+        sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848";
+      };
+      
+    };
+  };
+  
+  "build-tools"."24.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/24.0.2";
+    revision = "24.0.2";
+    displayName = "Android SDK Build-Tools 24.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip;
+        sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip;
+        sha1 = "8bb8fc575477491d5957de743089df412de55cda";
+      };
+      
+    };
+  };
+  
+  "build-tools"."24.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/24.0.3";
+    revision = "24.0.3";
+    displayName = "Android SDK Build-Tools 24.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip;
+        sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip;
+        sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c";
+      };
+      
+    };
+  };
+  
+  "build-tools"."25.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/25.0.0";
+    revision = "25.0.0";
+    displayName = "Android SDK Build-Tools 25";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25-linux.zip;
+        sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip;
+        sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606";
+      };
+      
+    };
+  };
+  
+  "build-tools"."25.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/25.0.1";
+    revision = "25.0.1";
+    displayName = "Android SDK Build-Tools 25.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip;
+        sha1 = "ff063d252ab750d339f5947d06ff782836f22bac";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip;
+        sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f";
+      };
+      
+    };
+  };
+  
+  "build-tools"."25.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/25.0.2";
+    revision = "25.0.2";
+    displayName = "Android SDK Build-Tools 25.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip;
+        sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip;
+        sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16";
+      };
+      
+    };
+  };
+  
+  "build-tools"."25.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/25.0.3";
+    revision = "25.0.3";
+    displayName = "Android SDK Build-Tools 25.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip;
+        sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip;
+        sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.0";
+    revision = "26.0.0";
+    displayName = "Android SDK Build-Tools 26";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-linux.zip;
+        sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip;
+        sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.0-rc1" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.0-rc1";
+    revision = "26.0.0-rc1";
+    displayName = "Android SDK Build-Tools 26-rc1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip;
+        sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip;
+        sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.0-rc2" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.0-rc2";
+    revision = "26.0.0-rc2";
+    displayName = "Android SDK Build-Tools 26-rc2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip;
+        sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip;
+        sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.1";
+    revision = "26.0.1";
+    displayName = "Android SDK Build-Tools 26.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip;
+        sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip;
+        sha1 = "cbde59de198916b390777dd0227921bfa2120832";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.2";
+    revision = "26.0.2";
+    displayName = "Android SDK Build-Tools 26.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip;
+        sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip;
+        sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0";
+      };
+      
+    };
+  };
+  
+  "build-tools"."26.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/26.0.3";
+    revision = "26.0.3";
+    displayName = "Android SDK Build-Tools 26.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip;
+        sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip;
+        sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df";
+      };
+      
+    };
+  };
+  
+  "build-tools"."27.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/27.0.0";
+    revision = "27.0.0";
+    displayName = "Android SDK Build-Tools 27";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27-linux.zip;
+        sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip;
+        sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1";
+      };
+      
+    };
+  };
+  
+  "build-tools"."27.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/27.0.1";
+    revision = "27.0.1";
+    displayName = "Android SDK Build-Tools 27.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip;
+        sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip;
+        sha1 = "1edd07bfdbadd95652d093040e16d858f7489594";
+      };
+      
+    };
+  };
+  
+  "build-tools"."27.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/27.0.2";
+    revision = "27.0.2";
+    displayName = "Android SDK Build-Tools 27.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip;
+        sha1 = "b687ddf6be84f11607871138aad32cf857d0b837";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip;
+        sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be";
+      };
+      
+    };
+  };
+  
+  "build-tools"."27.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/27.0.3";
+    revision = "27.0.3";
+    displayName = "Android SDK Build-Tools 27.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip;
+        sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip;
+        sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.0" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.0";
+    revision = "28.0.0";
+    displayName = "Android SDK Build-Tools 28";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-linux.zip;
+        sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip;
+        sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.0-rc1" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.0-rc1";
+    revision = "28.0.0-rc1";
+    displayName = "Android SDK Build-Tools 28-rc1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip;
+        sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip;
+        sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.0-rc2" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.0-rc2";
+    revision = "28.0.0-rc2";
+    displayName = "Android SDK Build-Tools 28-rc2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip;
+        sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip;
+        sha1 = "0d0314b353589feb10e528b44c5a685b6658d797";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.1" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.1";
+    revision = "28.0.1";
+    displayName = "Android SDK Build-Tools 28.0.1";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip;
+        sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip;
+        sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.2" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.2";
+    revision = "28.0.2";
+    displayName = "Android SDK Build-Tools 28.0.2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip;
+        sha1 = "b4492209810a3fd48deaa982f9852fef12433d55";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip;
+        sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9";
+      };
+      
+    };
+  };
+  
+  "build-tools"."28.0.3" = {
+    
+    name = "build-tools";
+    path = "build-tools/28.0.3";
+    revision = "28.0.3";
+    displayName = "Android SDK Build-Tools 28.0.3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip;
+        sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip;
+        sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a";
+      };
+      
+    };
+  };
+  
+  "cmake"."3.10.2" = {
+    
+    name = "cmake";
+    path = "cmake/3.10.2.4988404";
+    revision = "3.10.2";
+    displayName = "CMake 3.10.2.4988404";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip;
+        sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip;
+        sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561";
+      };
+      
+    };
+  };
+  
+  "cmake"."3.6.4111459" = {
+    
+    name = "cmake";
+    path = "cmake/3.6.4111459";
+    revision = "3.6.4111459";
+    displayName = "CMake 3.6.4111459";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip;
+        sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip;
+        sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782";
+      };
+      
+    };
+  };
+  
+  "docs"."1" = {
+    
+    name = "docs";
+    path = "docs";
+    revision = "1";
+    displayName = "Documentation for Android SDK";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/docs-24_r01.zip;
+          sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d";
+        };
+      
+    };
+  };
+  
+  "emulator"."27.3.10".linux = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "27.3.10";
+    displayName = "Android Emulator";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/emulator-linux-4969155.zip;
+        sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8";
+      };
+      
+    };
+  };
+  
+  "emulator"."27.3.10".macosx = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "27.3.10";
+    displayName = "Android Emulator";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip;
+        sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66";
+      };
+      
+    };
+  };
+  
+  "emulator"."27.3.10".windows = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "27.3.10";
+    displayName = "Android Emulator";
+    archives = {
+      
+    };
+  };
+  
+  "emulator"."28.0.14".linux = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "28.0.14";
+    displayName = "Android Emulator";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/emulator-linux-5092175.zip;
+        sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b";
+      };
+      
+    };
+  };
+  
+  "emulator"."28.0.14".macosx = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "28.0.14";
+    displayName = "Android Emulator";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip;
+        sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c";
+      };
+      
+    };
+  };
+  
+  "emulator"."28.0.14".windows = {
+    
+    name = "emulator";
+    path = "emulator";
+    revision = "28.0.14";
+    displayName = "Android Emulator";
+    archives = {
+      
+    };
+  };
+  
+  "lldb"."2.0.2558144" = {
+    
+    name = "lldb";
+    path = "lldb/2.0";
+    revision = "2.0.2558144";
+    displayName = "LLDB 2.0";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip;
+        sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip;
+        sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326";
+      };
+      
+    };
+  };
+  
+  "lldb"."2.1.2852477" = {
+    
+    name = "lldb";
+    path = "lldb/2.1";
+    revision = "2.1.2852477";
+    displayName = "LLDB 2.1";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip;
+        sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip;
+        sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240";
+      };
+      
+    };
+  };
+  
+  "lldb"."2.2.3271982" = {
+    
+    name = "lldb";
+    path = "lldb/2.2";
+    revision = "2.2.3271982";
+    displayName = "LLDB 2.2";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip;
+        sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip;
+        sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113";
+      };
+      
+    };
+  };
+  
+  "lldb"."2.3.3614996" = {
+    
+    name = "lldb";
+    path = "lldb/2.3";
+    revision = "2.3.3614996";
+    displayName = "LLDB 2.3";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip;
+        sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip;
+        sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13";
+      };
+      
+    };
+  };
+  
+  "lldb"."3.0.4213617" = {
+    
+    name = "lldb";
+    path = "lldb/3.0";
+    revision = "3.0.4213617";
+    displayName = "LLDB 3.0";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip;
+        sha1 = "2492651690a215317b86c755cd4d584ec9838677";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip;
+        sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db";
+      };
+      
+    };
+  };
+  
+  "lldb"."3.1.4508709" = {
+    
+    name = "lldb";
+    path = "lldb/3.1";
+    revision = "3.1.4508709";
+    displayName = "LLDB 3.1";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip;
+        sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip;
+        sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f";
+      };
+      
+    };
+  };
+  
+  "ndk-bundle"."18.1.5063045" = {
+    
+    name = "ndk-bundle";
+    path = "ndk-bundle";
+    revision = "18.1.5063045";
+    displayName = "NDK";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip;
+        sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip;
+        sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
+      };
+      
+    };
+  };
+  
+  "patcher"."1" = {
+    
+    name = "patcher";
+    path = "patcher/v4";
+    revision = "1";
+    displayName = "SDK Patch Applier v4";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak;
+          sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e";
+        };
+      
+    };
+  };
+  
+  "platform-tools"."28.0.1" = {
+    
+    name = "platform-tools";
+    path = "platform-tools";
+    revision = "28.0.1";
+    displayName = "Android SDK Platform-Tools";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip;
+        sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip;
+        sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1";
+      };
+      
+    };
+  };
+  
+  "platforms"."10" = {
+    
+    name = "platforms";
+    path = "platforms/android-10";
+    revision = "10";
+    displayName = "Android SDK Platform 10";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
+          sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
+        };
+      
+    };
+  };
+  
+  "platforms"."11" = {
+    
+    name = "platforms";
+    path = "platforms/android-11";
+    revision = "11";
+    displayName = "Android SDK Platform 11";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-3.0_r02.zip;
+          sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
+        };
+      
+    };
+  };
+  
+  "platforms"."12" = {
+    
+    name = "platforms";
+    path = "platforms/android-12";
+    revision = "12";
+    displayName = "Android SDK Platform 12";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-3.1_r03.zip;
+          sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
+        };
+      
+    };
+  };
+  
+  "platforms"."13" = {
+    
+    name = "platforms";
+    path = "platforms/android-13";
+    revision = "13";
+    displayName = "Android SDK Platform 13";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-3.2_r01.zip;
+          sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
+        };
+      
+    };
+  };
+  
+  "platforms"."14" = {
+    
+    name = "platforms";
+    path = "platforms/android-14";
+    revision = "14";
+    displayName = "Android SDK Platform 14";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-14_r04.zip;
+          sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
+        };
+      
+    };
+  };
+  
+  "platforms"."15" = {
+    
+    name = "platforms";
+    path = "platforms/android-15";
+    revision = "15";
+    displayName = "Android SDK Platform 15";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-15_r05.zip;
+          sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
+        };
+      
+    };
+  };
+  
+  "platforms"."16" = {
+    
+    name = "platforms";
+    path = "platforms/android-16";
+    revision = "16";
+    displayName = "Android SDK Platform 16";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-16_r05.zip;
+          sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
+        };
+      
+    };
+  };
+  
+  "platforms"."17" = {
+    
+    name = "platforms";
+    path = "platforms/android-17";
+    revision = "17";
+    displayName = "Android SDK Platform 17";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-17_r03.zip;
+          sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
+        };
+      
+    };
+  };
+  
+  "platforms"."18" = {
+    
+    name = "platforms";
+    path = "platforms/android-18";
+    revision = "18";
+    displayName = "Android SDK Platform 18";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-18_r03.zip;
+          sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
+        };
+      
+    };
+  };
+  
+  "platforms"."19" = {
+    
+    name = "platforms";
+    path = "platforms/android-19";
+    revision = "19";
+    displayName = "Android SDK Platform 19";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-19_r04.zip;
+          sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
+        };
+      
+    };
+  };
+  
+  "platforms"."2" = {
+    
+    name = "platforms";
+    path = "platforms/android-2";
+    revision = "2";
+    displayName = "Android SDK Platform 2";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip;
+        sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip;
+        sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
+      };
+      
+    };
+  };
+  
+  "platforms"."20" = {
+    
+    name = "platforms";
+    path = "platforms/android-20";
+    revision = "20";
+    displayName = "Android SDK Platform 20";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-20_r02.zip;
+          sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
+        };
+      
+    };
+  };
+  
+  "platforms"."21" = {
+    
+    name = "platforms";
+    path = "platforms/android-21";
+    revision = "21";
+    displayName = "Android SDK Platform 21";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-21_r02.zip;
+          sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
+        };
+      
+    };
+  };
+  
+  "platforms"."22" = {
+    
+    name = "platforms";
+    path = "platforms/android-22";
+    revision = "22";
+    displayName = "Android SDK Platform 22";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-22_r02.zip;
+          sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
+        };
+      
+    };
+  };
+  
+  "platforms"."23" = {
+    
+    name = "platforms";
+    path = "platforms/android-23";
+    revision = "23";
+    displayName = "Android SDK Platform 23";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-23_r03.zip;
+          sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
+        };
+      
+    };
+  };
+  
+  "platforms"."24" = {
+    
+    name = "platforms";
+    path = "platforms/android-24";
+    revision = "24";
+    displayName = "Android SDK Platform 24";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-24_r02.zip;
+          sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee";
+        };
+      
+    };
+  };
+  
+  "platforms"."25" = {
+    
+    name = "platforms";
+    path = "platforms/android-25";
+    revision = "25";
+    displayName = "Android SDK Platform 25";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-25_r03.zip;
+          sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
+        };
+      
+    };
+  };
+  
+  "platforms"."26" = {
+    
+    name = "platforms";
+    path = "platforms/android-26";
+    revision = "26";
+    displayName = "Android SDK Platform 26";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-26_r02.zip;
+          sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
+        };
+      
+    };
+  };
+  
+  "platforms"."27" = {
+    
+    name = "platforms";
+    path = "platforms/android-27";
+    revision = "27";
+    displayName = "Android SDK Platform 27";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-27_r03.zip;
+          sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353";
+        };
+      
+    };
+  };
+  
+  "platforms"."28" = {
+    
+    name = "platforms";
+    path = "platforms/android-28";
+    revision = "28";
+    displayName = "Android SDK Platform 28";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-28_r06.zip;
+          sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6";
+        };
+      
+    };
+  };
+  
+  "platforms"."3" = {
+    
+    name = "platforms";
+    path = "platforms/android-3";
+    revision = "3";
+    displayName = "Android SDK Platform 3";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip;
+        sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip;
+        sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
+      };
+      
+    };
+  };
+  
+  "platforms"."4" = {
+    
+    name = "platforms";
+    path = "platforms/android-4";
+    revision = "4";
+    displayName = "Android SDK Platform 4";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip;
+        sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip;
+        sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
+      };
+      
+    };
+  };
+  
+  "platforms"."5" = {
+    
+    name = "platforms";
+    path = "platforms/android-5";
+    revision = "5";
+    displayName = "Android SDK Platform 5";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip;
+        sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip;
+        sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
+      };
+      
+    };
+  };
+  
+  "platforms"."6" = {
+    
+    name = "platforms";
+    path = "platforms/android-6";
+    revision = "6";
+    displayName = "Android SDK Platform 6";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip;
+        sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
+        sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
+      };
+      
+    };
+  };
+  
+  "platforms"."7" = {
+    
+    name = "platforms";
+    path = "platforms/android-7";
+    revision = "7";
+    displayName = "Android SDK Platform 7";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-2.1_r03.zip;
+          sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
+        };
+      
+    };
+  };
+  
+  "platforms"."8" = {
+    
+    name = "platforms";
+    path = "platforms/android-8";
+    revision = "8";
+    displayName = "Android SDK Platform 8";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-2.2_r03.zip;
+          sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
+        };
+      
+    };
+  };
+  
+  "platforms"."9" = {
+    
+    name = "platforms";
+    path = "platforms/android-9";
+    revision = "9";
+    displayName = "Android SDK Platform 9";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
+          sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
+        };
+      
+    };
+  };
+  
+  "sources"."14" = {
+    
+    name = "sources";
+    path = "sources/android-14";
+    revision = "14";
+    displayName = "Sources for Android 14";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-14_r01.zip;
+          sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555";
+        };
+      
+    };
+  };
+  
+  "sources"."15" = {
+    
+    name = "sources";
+    path = "sources/android-15";
+    revision = "15";
+    displayName = "Sources for Android 15";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-15_r02.zip;
+          sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa";
+        };
+      
+    };
+  };
+  
+  "sources"."16" = {
+    
+    name = "sources";
+    path = "sources/android-16";
+    revision = "16";
+    displayName = "Sources for Android 16";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-16_r02.zip;
+          sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84";
+        };
+      
+    };
+  };
+  
+  "sources"."17" = {
+    
+    name = "sources";
+    path = "sources/android-17";
+    revision = "17";
+    displayName = "Sources for Android 17";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-17_r01.zip;
+          sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a";
+        };
+      
+    };
+  };
+  
+  "sources"."18" = {
+    
+    name = "sources";
+    path = "sources/android-18";
+    revision = "18";
+    displayName = "Sources for Android 18";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-18_r01.zip;
+          sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78";
+        };
+      
+    };
+  };
+  
+  "sources"."19" = {
+    
+    name = "sources";
+    path = "sources/android-19";
+    revision = "19";
+    displayName = "Sources for Android 19";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-19_r02.zip;
+          sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7";
+        };
+      
+    };
+  };
+  
+  "sources"."20" = {
+    
+    name = "sources";
+    path = "sources/android-20";
+    revision = "20";
+    displayName = "Sources for Android 20";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-20_r01.zip;
+          sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76";
+        };
+      
+    };
+  };
+  
+  "sources"."21" = {
+    
+    name = "sources";
+    path = "sources/android-21";
+    revision = "21";
+    displayName = "Sources for Android 21";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-21_r01.zip;
+          sha1 = "137a5044915d32bea297a8c1552684802bbc2e25";
+        };
+      
+    };
+  };
+  
+  "sources"."22" = {
+    
+    name = "sources";
+    path = "sources/android-22";
+    revision = "22";
+    displayName = "Sources for Android 22";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-22_r01.zip;
+          sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6";
+        };
+      
+    };
+  };
+  
+  "sources"."23" = {
+    
+    name = "sources";
+    path = "sources/android-23";
+    revision = "23";
+    displayName = "Sources for Android 23";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-23_r01.zip;
+          sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2";
+        };
+      
+    };
+  };
+  
+  "sources"."24" = {
+    
+    name = "sources";
+    path = "sources/android-24";
+    revision = "24";
+    displayName = "Sources for Android 24";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-24_r01.zip;
+          sha1 = "6b96115830a83d654479f32ce4b724ca9011148b";
+        };
+      
+    };
+  };
+  
+  "sources"."25" = {
+    
+    name = "sources";
+    path = "sources/android-25";
+    revision = "25";
+    displayName = "Sources for Android 25";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-25_r01.zip;
+          sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
+        };
+      
+    };
+  };
+  
+  "sources"."26" = {
+    
+    name = "sources";
+    path = "sources/android-26";
+    revision = "26";
+    displayName = "Sources for Android 26";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-26_r01.zip;
+          sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9";
+        };
+      
+    };
+  };
+  
+  "sources"."27" = {
+    
+    name = "sources";
+    path = "sources/android-27";
+    revision = "27";
+    displayName = "Sources for Android 27";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-27_r01.zip;
+          sha1 = "7b714670561d08f54751af42aca929867b806596";
+        };
+      
+    };
+  };
+  
+  "sources"."28" = {
+    
+    name = "sources";
+    path = "sources/android-28";
+    revision = "28";
+    displayName = "Sources for Android 28";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/sources-28_r01.zip;
+          sha1 = "5610e0c24235ee3fa343c899ddd551be30315255";
+        };
+      
+    };
+  };
+  
+  "tools"."25.2.5" = {
+    
+    name = "tools";
+    path = "tools";
+    revision = "25.2.5";
+    displayName = "Android SDK Tools 25.2.5";
+    archives = {
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip;
+        sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1";
+      };
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip;
+        sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659";
+      };
+      
+    };
+  };
+  
+  "tools"."26.1.1" = {
+    
+    name = "tools";
+    path = "tools";
+    revision = "26.1.1";
+    displayName = "Android SDK Tools";
+    archives = {
+      macosx = fetchurl {
+        url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip;
+        sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad";
+      };
+      linux = fetchurl {
+        url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip;
+        sha1 = "8c7c28554a32318461802c1291d76fccfafde054";
+      };
+      
+    };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
new file mode 100644
index 00000000000..1aa49545254
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix
@@ -0,0 +1,157 @@
+
+{fetchurl}:
+
+{
+  
+
+    "21".android-tv."x86" = {
+      name = "system-image-21-android-tv-x86";
+      path = "system-images/android-21/android-tv/x86";
+      revision = "21-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip;
+        sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8";
+      
+      };
+  };
+  
+
+    "21".android-tv."armeabi-v7a" = {
+      name = "system-image-21-android-tv-armeabi-v7a";
+      path = "system-images/android-21/android-tv/armeabi-v7a";
+      revision = "21-android-tv-armeabi-v7a";
+      displayName = "Android TV ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip;
+        sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331";
+      
+      };
+  };
+  
+
+    "22".android-tv."x86" = {
+      name = "system-image-22-android-tv-x86";
+      path = "system-images/android-22/android-tv/x86";
+      revision = "22-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip;
+        sha1 = "c78efd5a155622eb490be9d326f5783993375c35";
+      
+      };
+  };
+  
+
+    "23".android-tv."x86" = {
+      name = "system-image-23-android-tv-x86";
+      path = "system-images/android-23/android-tv/x86";
+      revision = "23-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip;
+        sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b";
+      
+      };
+  };
+  
+
+    "23".android-tv."armeabi-v7a" = {
+      name = "system-image-23-android-tv-armeabi-v7a";
+      path = "system-images/android-23/android-tv/armeabi-v7a";
+      revision = "23-android-tv-armeabi-v7a";
+      displayName = "Android TV ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip;
+        sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52";
+      
+      };
+  };
+  
+
+    "24".android-tv."x86" = {
+      name = "system-image-24-android-tv-x86";
+      path = "system-images/android-24/android-tv/x86";
+      revision = "24-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip;
+        sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a";
+      
+      };
+  };
+  
+
+    "25".android-tv."x86" = {
+      name = "system-image-25-android-tv-x86";
+      path = "system-images/android-25/android-tv/x86";
+      revision = "25-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip;
+        sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d";
+      
+      };
+  };
+  
+
+    "26".android-tv."x86" = {
+      name = "system-image-26-android-tv-x86";
+      path = "system-images/android-26/android-tv/x86";
+      revision = "26-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip;
+        sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7";
+      
+      };
+  };
+  
+
+    "27".android-tv."x86" = {
+      name = "system-image-27-android-tv-x86";
+      path = "system-images/android-27/android-tv/x86";
+      revision = "27-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip;
+        sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54";
+      
+      };
+  };
+  
+
+    "28".android-tv."x86" = {
+      name = "system-image-28-android-tv-x86";
+      path = "system-images/android-28/android-tv/x86";
+      revision = "28-android-tv-x86";
+      displayName = "Android TV Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip;
+        sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
new file mode 100644
index 00000000000..372a751f41c
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix
@@ -0,0 +1,67 @@
+
+{fetchurl}:
+
+{
+  
+
+    "25".android-wear."armeabi-v7a" = {
+      name = "system-image-25-android-wear-armeabi-v7a";
+      path = "system-images/android-25/android-wear-cn/armeabi-v7a";
+      revision = "25-android-wear-armeabi-v7a";
+      displayName = "China version of Android Wear ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip;
+        sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41";
+      
+      };
+  };
+  
+
+    "25".android-wear."x86" = {
+      name = "system-image-25-android-wear-x86";
+      path = "system-images/android-25/android-wear-cn/x86";
+      revision = "25-android-wear-x86";
+      displayName = "China version of Android Wear Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip;
+        sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d";
+      
+      };
+  };
+  
+
+    "26".android-wear."x86" = {
+      name = "system-image-26-android-wear-x86";
+      path = "system-images/android-26/android-wear-cn/x86";
+      revision = "26-android-wear-x86";
+      displayName = "China version of Android Wear Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip;
+        sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096";
+      
+      };
+  };
+  
+
+    "28".android-wear."x86" = {
+      name = "system-image-28-android-wear-x86";
+      path = "system-images/android-P/android-wear-cn/x86";
+      revision = "28-android-wear-x86";
+      displayName = "China version of Wear OS Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip;
+        sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
new file mode 100644
index 00000000000..0c45a1162fe
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix
@@ -0,0 +1,97 @@
+
+{fetchurl}:
+
+{
+  
+
+    "23".android-wear."armeabi-v7a" = {
+      name = "system-image-23-android-wear-armeabi-v7a";
+      path = "system-images/android-23/android-wear/armeabi-v7a";
+      revision = "23-android-wear-armeabi-v7a";
+      displayName = "Android Wear ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip;
+        sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71";
+      
+      };
+  };
+  
+
+    "23".android-wear."x86" = {
+      name = "system-image-23-android-wear-x86";
+      path = "system-images/android-23/android-wear/x86";
+      revision = "23-android-wear-x86";
+      displayName = "Android Wear Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip;
+        sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e";
+      
+      };
+  };
+  
+
+    "25".android-wear."armeabi-v7a" = {
+      name = "system-image-25-android-wear-armeabi-v7a";
+      path = "system-images/android-25/android-wear/armeabi-v7a";
+      revision = "25-android-wear-armeabi-v7a";
+      displayName = "Android Wear ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip;
+        sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c";
+      
+      };
+  };
+  
+
+    "25".android-wear."x86" = {
+      name = "system-image-25-android-wear-x86";
+      path = "system-images/android-25/android-wear/x86";
+      revision = "25-android-wear-x86";
+      displayName = "Android Wear Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip;
+        sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6";
+      
+      };
+  };
+  
+
+    "26".android-wear."x86" = {
+      name = "system-image-26-android-wear-x86";
+      path = "system-images/android-26/android-wear/x86";
+      revision = "26-android-wear-x86";
+      displayName = "Android Wear Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip;
+        sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c";
+      
+      };
+  };
+  
+
+    "28".android-wear."x86" = {
+      name = "system-image-28-android-wear-x86";
+      path = "system-images/android-P/android-wear/x86";
+      revision = "28-android-wear-x86";
+      displayName = "Wear OS Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip;
+        sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix
new file mode 100644
index 00000000000..915cceec546
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix
@@ -0,0 +1,547 @@
+
+{fetchurl}:
+
+{
+  
+
+    "10".default."armeabi-v7a" = {
+      name = "system-image-10-default-armeabi-v7a";
+      path = "system-images/android-10/default/armeabi-v7a";
+      revision = "10-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip;
+        sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69";
+      
+      };
+  };
+  
+
+    "14".default."armeabi-v7a" = {
+      name = "system-image-14-default-armeabi-v7a";
+      path = "system-images/android-14/default/armeabi-v7a";
+      revision = "14-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
+        sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
+      
+      };
+  };
+  
+
+    "15".default."armeabi-v7a" = {
+      name = "system-image-15-default-armeabi-v7a";
+      path = "system-images/android-15/default/armeabi-v7a";
+      revision = "15-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip;
+        sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1";
+      
+      };
+  };
+  
+
+    "16".default."armeabi-v7a" = {
+      name = "system-image-16-default-armeabi-v7a";
+      path = "system-images/android-16/default/armeabi-v7a";
+      revision = "16-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
+        sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
+      
+      };
+  };
+  
+
+    "17".default."armeabi-v7a" = {
+      name = "system-image-17-default-armeabi-v7a";
+      path = "system-images/android-17/default/armeabi-v7a";
+      revision = "17-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip;
+        sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9";
+      
+      };
+  };
+  
+
+    "18".default."armeabi-v7a" = {
+      name = "system-image-18-default-armeabi-v7a";
+      path = "system-images/android-18/default/armeabi-v7a";
+      revision = "18-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip;
+        sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642";
+      
+      };
+  };
+  
+
+    "19".default."armeabi-v7a" = {
+      name = "system-image-19-default-armeabi-v7a";
+      path = "system-images/android-19/default/armeabi-v7a";
+      revision = "19-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip;
+        sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
+      
+      };
+  };
+  
+
+    "21".default."armeabi-v7a" = {
+      name = "system-image-21-default-armeabi-v7a";
+      path = "system-images/android-21/default/armeabi-v7a";
+      revision = "21-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip;
+        sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
+      
+      };
+  };
+  
+
+    "22".default."armeabi-v7a" = {
+      name = "system-image-22-default-armeabi-v7a";
+      path = "system-images/android-22/default/armeabi-v7a";
+      revision = "22-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip;
+        sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
+      
+      };
+  };
+  
+
+    "23".default."armeabi-v7a" = {
+      name = "system-image-23-default-armeabi-v7a";
+      path = "system-images/android-23/default/armeabi-v7a";
+      revision = "23-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip;
+        sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
+      
+      };
+  };
+  
+
+    "24".default."armeabi-v7a" = {
+      name = "system-image-24-default-armeabi-v7a";
+      path = "system-images/android-24/default/armeabi-v7a";
+      revision = "24-default-armeabi-v7a";
+      displayName = "ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip;
+        sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033";
+      
+      };
+  };
+  
+
+    "24".default."arm64-v8a" = {
+      name = "system-image-24-default-arm64-v8a";
+      path = "system-images/android-24/default/arm64-v8a";
+      revision = "24-default-arm64-v8a";
+      displayName = "ARM 64 v8a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip;
+        sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f";
+      
+      };
+  };
+  
+
+    "16".default."mips" = {
+      name = "system-image-16-default-mips";
+      path = "system-images/android-16/default/mips";
+      revision = "16-default-mips";
+      displayName = "MIPS System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
+        sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
+      
+      };
+  };
+  
+
+    "17".default."mips" = {
+      name = "system-image-17-default-mips";
+      path = "system-images/android-17/default/mips";
+      revision = "17-default-mips";
+      displayName = "MIPS System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
+        sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
+      
+      };
+  };
+  
+
+    "10".default."x86" = {
+      name = "system-image-10-default-x86";
+      path = "system-images/android-10/default/x86";
+      revision = "10-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip;
+        sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb";
+      
+      };
+  };
+  
+
+    "15".default."x86" = {
+      name = "system-image-15-default-x86";
+      path = "system-images/android-15/default/x86";
+      revision = "15-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip;
+        sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1";
+      
+      };
+  };
+  
+
+    "16".default."x86" = {
+      name = "system-image-16-default-x86";
+      path = "system-images/android-16/default/x86";
+      revision = "16-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip;
+        sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd";
+      
+      };
+  };
+  
+
+    "17".default."x86" = {
+      name = "system-image-17-default-x86";
+      path = "system-images/android-17/default/x86";
+      revision = "17-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip;
+        sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec";
+      
+      };
+  };
+  
+
+    "18".default."x86" = {
+      name = "system-image-18-default-x86";
+      path = "system-images/android-18/default/x86";
+      revision = "18-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip;
+        sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458";
+      
+      };
+  };
+  
+
+    "19".default."x86" = {
+      name = "system-image-19-default-x86";
+      path = "system-images/android-19/default/x86";
+      revision = "19-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip;
+        sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
+      
+      };
+  };
+  
+
+    "21".default."x86" = {
+      name = "system-image-21-default-x86";
+      path = "system-images/android-21/default/x86";
+      revision = "21-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip;
+        sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
+      
+      };
+  };
+  
+
+    "22".default."x86" = {
+      name = "system-image-22-default-x86";
+      path = "system-images/android-22/default/x86";
+      revision = "22-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip;
+        sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
+      
+      };
+  };
+  
+
+    "23".default."x86" = {
+      name = "system-image-23-default-x86";
+      path = "system-images/android-23/default/x86";
+      revision = "23-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip;
+        sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
+      
+      };
+  };
+  
+
+    "24".default."x86" = {
+      name = "system-image-24-default-x86";
+      path = "system-images/android-24/default/x86";
+      revision = "24-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip;
+        sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
+      
+      };
+  };
+  
+
+    "25".default."x86" = {
+      name = "system-image-25-default-x86";
+      path = "system-images/android-25/default/x86";
+      revision = "25-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip;
+        sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f";
+      
+      };
+  };
+  
+
+    "26".default."x86" = {
+      name = "system-image-26-default-x86";
+      path = "system-images/android-26/default/x86";
+      revision = "26-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip;
+        sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90";
+      
+      };
+  };
+  
+
+    "27".default."x86" = {
+      name = "system-image-27-default-x86";
+      path = "system-images/android-27/default/x86";
+      revision = "27-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip;
+        sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582";
+      
+      };
+  };
+  
+
+    "28".default."x86" = {
+      name = "system-image-28-default-x86";
+      path = "system-images/android-28/default/x86";
+      revision = "28-default-x86";
+      displayName = "Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip;
+        sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780";
+      
+      };
+  };
+  
+
+    "21".default."x86_64" = {
+      name = "system-image-21-default-x86_64";
+      path = "system-images/android-21/default/x86_64";
+      revision = "21-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip;
+        sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
+      
+      };
+  };
+  
+
+    "22".default."x86_64" = {
+      name = "system-image-22-default-x86_64";
+      path = "system-images/android-22/default/x86_64";
+      revision = "22-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip;
+        sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
+      
+      };
+  };
+  
+
+    "23".default."x86_64" = {
+      name = "system-image-23-default-x86_64";
+      path = "system-images/android-23/default/x86_64";
+      revision = "23-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip;
+        sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
+      
+      };
+  };
+  
+
+    "24".default."x86_64" = {
+      name = "system-image-24-default-x86_64";
+      path = "system-images/android-24/default/x86_64";
+      revision = "24-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip;
+        sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
+      
+      };
+  };
+  
+
+    "25".default."x86_64" = {
+      name = "system-image-25-default-x86_64";
+      path = "system-images/android-25/default/x86_64";
+      revision = "25-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip;
+        sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37";
+      
+      };
+  };
+  
+
+    "26".default."x86_64" = {
+      name = "system-image-26-default-x86_64";
+      path = "system-images/android-26/default/x86_64";
+      revision = "26-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip;
+        sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3";
+      
+      };
+  };
+  
+
+    "27".default."x86_64" = {
+      name = "system-image-27-default-x86_64";
+      path = "system-images/android-27/default/x86_64";
+      revision = "27-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip;
+        sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60";
+      
+      };
+  };
+  
+
+    "28".default."x86_64" = {
+      name = "system-image-28-default-x86_64";
+      path = "system-images/android-28/default/x86_64";
+      revision = "28-default-x86_64";
+      displayName = "Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip;
+        sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
new file mode 100644
index 00000000000..3b0303b86b4
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix
@@ -0,0 +1,502 @@
+
+{fetchurl}:
+
+{
+  
+
+    "10".google_apis."armeabi-v7a" = {
+      name = "system-image-10-google_apis-armeabi-v7a";
+      path = "system-images/android-10/google_apis/armeabi-v7a";
+      revision = "10-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip;
+        sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f";
+      
+      };
+  };
+  
+
+    "10".google_apis."x86" = {
+      name = "system-image-10-google_apis-x86";
+      path = "system-images/android-10/google_apis/x86";
+      revision = "10-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip;
+        sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e";
+      
+      };
+  };
+  
+
+    "15".google_apis."armeabi-v7a" = {
+      name = "system-image-15-google_apis-armeabi-v7a";
+      path = "system-images/android-15/google_apis/armeabi-v7a";
+      revision = "15-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip;
+        sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f";
+      
+      };
+  };
+  
+
+    "15".google_apis."x86" = {
+      name = "system-image-15-google_apis-x86";
+      path = "system-images/android-15/google_apis/x86";
+      revision = "15-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip;
+        sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b";
+      
+      };
+  };
+  
+
+    "16".google_apis."x86" = {
+      name = "system-image-16-google_apis-x86";
+      path = "system-images/android-16/google_apis/x86";
+      revision = "16-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip;
+        sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2";
+      
+      };
+  };
+  
+
+    "17".google_apis."armeabi-v7a" = {
+      name = "system-image-17-google_apis-armeabi-v7a";
+      path = "system-images/android-17/google_apis/armeabi-v7a";
+      revision = "17-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip;
+        sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae";
+      
+      };
+  };
+  
+
+    "17".google_apis."x86" = {
+      name = "system-image-17-google_apis-x86";
+      path = "system-images/android-17/google_apis/x86";
+      revision = "17-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip;
+        sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6";
+      
+      };
+  };
+  
+
+    "18".google_apis."armeabi-v7a" = {
+      name = "system-image-18-google_apis-armeabi-v7a";
+      path = "system-images/android-18/google_apis/armeabi-v7a";
+      revision = "18-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip;
+        sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b";
+      
+      };
+  };
+  
+
+    "18".google_apis."x86" = {
+      name = "system-image-18-google_apis-x86";
+      path = "system-images/android-18/google_apis/x86";
+      revision = "18-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip;
+        sha1 = "2b34741693eba9419cb6bf1a467596783234d37a";
+      
+      };
+  };
+  
+
+    "19".google_apis."x86" = {
+      name = "system-image-19-google_apis-x86";
+      path = "system-images/android-19/google_apis/x86";
+      revision = "19-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip;
+        sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8";
+      
+      };
+  };
+  
+
+    "19".google_apis."armeabi-v7a" = {
+      name = "system-image-19-google_apis-armeabi-v7a";
+      path = "system-images/android-19/google_apis/armeabi-v7a";
+      revision = "19-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip;
+        sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b";
+      
+      };
+  };
+  
+
+    "21".google_apis."x86" = {
+      name = "system-image-21-google_apis-x86";
+      path = "system-images/android-21/google_apis/x86";
+      revision = "21-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip;
+        sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e";
+      
+      };
+  };
+  
+
+    "21".google_apis."x86_64" = {
+      name = "system-image-21-google_apis-x86_64";
+      path = "system-images/android-21/google_apis/x86_64";
+      revision = "21-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip;
+        sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517";
+      
+      };
+  };
+  
+
+    "21".google_apis."armeabi-v7a" = {
+      name = "system-image-21-google_apis-armeabi-v7a";
+      path = "system-images/android-21/google_apis/armeabi-v7a";
+      revision = "21-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip;
+        sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45";
+      
+      };
+  };
+  
+
+    "22".google_apis."x86" = {
+      name = "system-image-22-google_apis-x86";
+      path = "system-images/android-22/google_apis/x86";
+      revision = "22-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip;
+        sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33";
+      
+      };
+  };
+  
+
+    "22".google_apis."armeabi-v7a" = {
+      name = "system-image-22-google_apis-armeabi-v7a";
+      path = "system-images/android-22/google_apis/armeabi-v7a";
+      revision = "22-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip;
+        sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792";
+      
+      };
+  };
+  
+
+    "22".google_apis."x86_64" = {
+      name = "system-image-22-google_apis-x86_64";
+      path = "system-images/android-22/google_apis/x86_64";
+      revision = "22-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip;
+        sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125";
+      
+      };
+  };
+  
+
+    "23".google_apis."x86" = {
+      name = "system-image-23-google_apis-x86";
+      path = "system-images/android-23/google_apis/x86";
+      revision = "23-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip;
+        sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240";
+      
+      };
+  };
+  
+
+    "23".google_apis."x86_64" = {
+      name = "system-image-23-google_apis-x86_64";
+      path = "system-images/android-23/google_apis/x86_64";
+      revision = "23-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip;
+        sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546";
+      
+      };
+  };
+  
+
+    "23".google_apis."armeabi-v7a" = {
+      name = "system-image-23-google_apis-armeabi-v7a";
+      path = "system-images/android-23/google_apis/armeabi-v7a";
+      revision = "23-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip;
+        sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619";
+      
+      };
+  };
+  
+
+    "24".google_apis."x86" = {
+      name = "system-image-24-google_apis-x86";
+      path = "system-images/android-24/google_apis/x86";
+      revision = "24-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip;
+        sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d";
+      
+      };
+  };
+  
+
+    "24".google_apis."x86_64" = {
+      name = "system-image-24-google_apis-x86_64";
+      path = "system-images/android-24/google_apis/x86_64";
+      revision = "24-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip;
+        sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2";
+      
+      };
+  };
+  
+
+    "24".google_apis."armeabi-v7a" = {
+      name = "system-image-24-google_apis-armeabi-v7a";
+      path = "system-images/android-24/google_apis/armeabi-v7a";
+      revision = "24-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip;
+        sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28";
+      
+      };
+  };
+  
+
+    "24".google_apis."arm64-v8a" = {
+      name = "system-image-24-google_apis-arm64-v8a";
+      path = "system-images/android-24/google_apis/arm64-v8a";
+      revision = "24-google_apis-arm64-v8a";
+      displayName = "Google APIs ARM 64 v8a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip;
+        sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9";
+      
+      };
+  };
+  
+
+    "25".google_apis."x86" = {
+      name = "system-image-25-google_apis-x86";
+      path = "system-images/android-25/google_apis/x86";
+      revision = "25-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip;
+        sha1 = "5948473077341265a0b21a53a7e0afc2f980187c";
+      
+      };
+  };
+  
+
+    "25".google_apis."x86_64" = {
+      name = "system-image-25-google_apis-x86_64";
+      path = "system-images/android-25/google_apis/x86_64";
+      revision = "25-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip;
+        sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443";
+      
+      };
+  };
+  
+
+    "25".google_apis."armeabi-v7a" = {
+      name = "system-image-25-google_apis-armeabi-v7a";
+      path = "system-images/android-25/google_apis/armeabi-v7a";
+      revision = "25-google_apis-armeabi-v7a";
+      displayName = "Google APIs ARM EABI v7a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip;
+        sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf";
+      
+      };
+  };
+  
+
+    "25".google_apis."arm64-v8a" = {
+      name = "system-image-25-google_apis-arm64-v8a";
+      path = "system-images/android-25/google_apis/arm64-v8a";
+      revision = "25-google_apis-arm64-v8a";
+      displayName = "Google APIs ARM 64 v8a System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip;
+        sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303";
+      
+      };
+  };
+  
+
+    "26".google_apis."x86" = {
+      name = "system-image-26-google_apis-x86";
+      path = "system-images/android-26/google_apis/x86";
+      revision = "26-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip;
+        sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff";
+      
+      };
+  };
+  
+
+    "26".google_apis."x86_64" = {
+      name = "system-image-26-google_apis-x86_64";
+      path = "system-images/android-26/google_apis/x86_64";
+      revision = "26-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip;
+        sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db";
+      
+      };
+  };
+  
+
+    "27".google_apis."x86" = {
+      name = "system-image-27-google_apis-x86";
+      path = "system-images/android-27/google_apis/x86";
+      revision = "27-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip;
+        sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade";
+      
+      };
+  };
+  
+
+    "28".google_apis."x86" = {
+      name = "system-image-28-google_apis-x86";
+      path = "system-images/android-28/google_apis/x86";
+      revision = "28-google_apis-x86";
+      displayName = "Google APIs Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip;
+        sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1";
+      
+      };
+  };
+  
+
+    "28".google_apis."x86_64" = {
+      name = "system-image-28-google_apis-x86_64";
+      path = "system-images/android-28/google_apis/x86_64";
+      revision = "28-google_apis-x86_64";
+      displayName = "Google APIs Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip;
+        sha1 = "068468683a56725326f741f75b6913ee1e7955ff";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
new file mode 100644
index 00000000000..a8bea61ff54
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
@@ -0,0 +1,97 @@
+
+{fetchurl}:
+
+{
+  
+
+    "24".google_apis_playstore."x86" = {
+      name = "system-image-24-google_apis_playstore-x86";
+      path = "system-images/android-24/google_apis_playstore/x86";
+      revision = "24-google_apis_playstore-x86";
+      displayName = "Google Play Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip;
+        sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22";
+      
+      };
+  };
+  
+
+    "25".google_apis_playstore."x86" = {
+      name = "system-image-25-google_apis_playstore-x86";
+      path = "system-images/android-25/google_apis_playstore/x86";
+      revision = "25-google_apis_playstore-x86";
+      displayName = "Google Play Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip;
+        sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c";
+      
+      };
+  };
+  
+
+    "26".google_apis_playstore."x86" = {
+      name = "system-image-26-google_apis_playstore-x86";
+      path = "system-images/android-26/google_apis_playstore/x86";
+      revision = "26-google_apis_playstore-x86";
+      displayName = "Google Play Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip;
+        sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19";
+      
+      };
+  };
+  
+
+    "27".google_apis_playstore."x86" = {
+      name = "system-image-27-google_apis_playstore-x86";
+      path = "system-images/android-27/google_apis_playstore/x86";
+      revision = "27-google_apis_playstore-x86";
+      displayName = "Google Play Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip;
+        sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d";
+      
+      };
+  };
+  
+
+    "28".google_apis_playstore."x86" = {
+      name = "system-image-28-google_apis_playstore-x86";
+      path = "system-images/android-28/google_apis_playstore/x86";
+      revision = "28-google_apis_playstore-x86";
+      displayName = "Google Play Intel x86 Atom System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip;
+        sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a";
+      
+      };
+  };
+  
+
+    "28".google_apis_playstore."x86_64" = {
+      name = "system-image-28-google_apis_playstore-x86_64";
+      path = "system-images/android-28/google_apis_playstore/x86_64";
+      revision = "28-google_apis_playstore-x86_64";
+      displayName = "Google Play Intel x86 Atom_64 System Image";
+      archives.all = fetchurl {
+      
+        url = 
+        https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip;
+        sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1";
+      
+      };
+  };
+  
+}
+  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/pkgs/development/mobile/androidenv/lldb.nix
new file mode 100644
index 00000000000..d812a679c02
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/lldb.nix
@@ -0,0 +1,12 @@
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
+
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl.out pkgs.ncurses5 ];
+  patchInstructions = lib.optionalString (os == "linux") ''
+    addAutoPatchelfSearchPath $packageBaseDir/lib
+    autoPatchelf $packageBaseDir/lib
+    autoPatchelf $packageBaseDir/bin
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
deleted file mode 100644
index 5eeadbbd12d..00000000000
--- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh
---- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh	2014-10-16 03:46:32.000000000 +0200
-+++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh	2014-10-24 23:46:22.544928306 +0200
-@@ -310,6 +310,9 @@
- # Now copy the GCC toolchain prebuilt binaries
- run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
- 
-+# Making it writable again
-+chmod -R +w "$TMPDIR"
-+
- # Replace soft-link mcld by real file
- ALL_LDS=`find $TMPDIR -name "*mcld"`
- for LD in $ALL_LDS; do
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
deleted file mode 100644
index 4a9f9a4a9dd..00000000000
--- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh
---- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh	2014-10-16 03:46:32.000000000 +0200
-+++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh	2014-10-24 23:46:22.544928306 +0200
-@@ -194,6 +194,9 @@
- # Now copy the GCC toolchain prebuilt binaries
- run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
- 
-+# Making it writable again
-+chmod -R +w "$TMPDIR"
-+
- if [ -n "$LLVM_VERSION" ]; then
-   # Copy the clang/llvm toolchain prebuilt binaries
-   run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR"
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
deleted file mode 100644
index 70b1f7e7f4a..00000000000
--- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
-index a6ae8448..2739912e 100755
---- a/build/tools/make_standalone_toolchain.py
-+++ b/build/tools/make_standalone_toolchain.py
-@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-                      sysroot_path, stl, host_tag):
-     """Create a standalone toolchain."""
-     copy_directory_contents(gcc_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
-     copy_directory_contents(clang_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
-     triple = get_triple(arch)
-     make_clang_scripts(
-         install_path, triple, api, host_tag.startswith('windows'))
-@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-     sysroot = os.path.join(NDK_DIR, 'sysroot')
-     install_sysroot = os.path.join(install_path, 'sysroot')
-     shutil.copytree(sysroot, install_sysroot)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     arch_headers = os.path.join(sysroot, 'usr/include', triple)
-     copy_directory_contents(
-         arch_headers, os.path.join(install_sysroot, 'usr/include'))
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     lib_path = os.path.join(sysroot_path, 'usr/lib')
-     lib_install = os.path.join(install_sysroot, 'usr/lib')
-     if os.path.exists(lib_path):
-         shutil.copytree(lib_path, lib_install)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-     lib64_path = os.path.join(sysroot_path, 'usr/lib64')
-     lib64_install = os.path.join(install_sysroot, 'usr/lib64')
-     if os.path.exists(lib64_path):
-         shutil.copytree(lib64_path, lib64_install)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
-     copy_directory_contents(prebuilt_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
-     dirs = os.listdir(toolchain_lib_dir)
-@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-     if stl == 'gnustl':
-         gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9')
-         shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         for abi in get_abis(arch):
-             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
-                                     abi)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             if arch == 'arm':
-                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
-                                         triple, abi, thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
-                                  thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     elif stl == 'libc++':
-         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
-         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
-         support_dir = os.path.join(NDK_DIR, 'sources/android/support')
-         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
-                                 cxx_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
-         copy_directory_contents(os.path.join(support_dir, 'include'),
-                                 support_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         # I have no idea why we need this, but the old one does it too.
-         copy_directory_contents(
-             os.path.join(libcxxabi_dir, 'include'),
-             os.path.join(install_path, 'include/llvm-libc++abi/include'))
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         headers = [
-             'cxxabi.h',
-@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-             dest_libdir = get_dest_libdir(install_path, triple, abi)
-             include_libunwind = arch == 'arm'
-             copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             if arch == 'arm':
-                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
-                 copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     elif stl == 'stlport':
-         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
-         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
- 
-         copy_directory_contents(
-             os.path.join(stlport_dir, 'stlport'), cxx_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         # Same as for libc++. Not sure why we have this extra directory, but
-         # keep the cruft for diff.
-         copy_directory_contents(
-             os.path.join(gabixx_dir, 'include'),
-             os.path.join(install_path, 'include/gabi++/include'))
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         headers = [
-             'cxxabi.h',
-@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
- 
-         for abi in get_abis(arch):
-             copy_stlport_libs(stlport_dir, install_path, triple, abi)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             if arch == 'arm':
-                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
-                                   thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     else:
-         raise ValueError(stl)
- 
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch
deleted file mode 100644
index 88ce69be3e8..00000000000
--- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
-index daba3351..424b7fef 100755
---- a/build/tools/make_standalone_toolchain.py
-+++ b/build/tools/make_standalone_toolchain.py
-@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-                      platforms_path, stl, host_tag):
-     """Create a standalone toolchain."""
-     copy_directory_contents(gcc_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
-     copy_directory_contents(clang_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
-     triple = get_triple(arch)
-     make_clang_scripts(
-         install_path, triple, api, host_tag.startswith('windows'))
-@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-     install_headers = os.path.join(install_sysroot, 'usr/include')
-     os.makedirs(os.path.dirname(install_headers))
-     shutil.copytree(headers, install_headers)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     arch_headers = os.path.join(sysroot, 'usr/include', triple)
-     copy_directory_contents(arch_headers, os.path.join(install_headers))
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     for lib_suffix in ('', '64'):
-         lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix))
-@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-             install_sysroot, 'usr/lib{}'.format(lib_suffix))
-         if os.path.exists(lib_path):
-             shutil.copytree(lib_path, lib_install)
-+            os.system('chmod -R +w "{}"'.format(install_path))
- 
-     static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
-     static_lib_install = os.path.join(install_sysroot, 'usr/lib')
-     if arch == 'x86_64':
-         static_lib_install += '64'
-     copy_directory_contents(static_lib_path, static_lib_install)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
-     copy_directory_contents(prebuilt_path, install_path)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     gdbserver_path = os.path.join(
-         NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
-     gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
-     shutil.copytree(gdbserver_path, gdbserver_install)
-+    os.system('chmod -R +w "{}"'.format(install_path))
- 
-     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
-     dirs = os.listdir(toolchain_lib_dir)
-@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-         for abi in get_abis(arch):
-             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
-                                     abi)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             if arch == 'arm':
-                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
-                                         triple, abi, thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
-                                  thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     elif stl == 'libc++':
-         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
-         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
-         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
-                                 cxx_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
-         if api < 21:
-             support_dir = os.path.join(NDK_DIR, 'sources/android/support')
-             copy_directory_contents(os.path.join(support_dir, 'include'),
-                                     support_headers)
-+            os.system('chmod -R +w "{}"'.format(install_path))
- 
-         # I have no idea why we need this, but the old one does it too.
-         copy_directory_contents(
-             os.path.join(libcxxabi_dir, 'include'),
-             os.path.join(install_path, 'include/llvm-libc++abi/include'))
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         headers = [
-             'cxxabi.h',
-@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-             src_libdir = get_src_libdir(libcxx_dir, abi)
-             dest_libdir = get_dest_libdir(install_path, triple, abi)
-             copy_libcxx_libs(src_libdir, dest_libdir, abi, api)
-+            os.system('chmod -R +w "{}"'.format(install_path))
-             if arch == 'arm':
-                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
-                 copy_libcxx_libs(src_libdir, thumb_libdir, abi, api)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     elif stl == 'stlport':
-         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
-         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
- 
-         copy_directory_contents(
-             os.path.join(stlport_dir, 'stlport'), cxx_headers)
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         # Same as for libc++. Not sure why we have this extra directory, but
-         # keep the cruft for diff.
-         copy_directory_contents(
-             os.path.join(gabixx_dir, 'include'),
-             os.path.join(install_path, 'include/gabi++/include'))
-+        os.system('chmod -R +w "{}"'.format(install_path))
- 
-         headers = [
-             'cxxabi.h',
-@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
-             if arch == 'arm':
-                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
-                                   thumb=True)
-+                os.system('chmod -R +w "{}"'.format(install_path))
-     else:
-         raise ValueError(stl)
- 
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
new file mode 100644
index 00000000000..a0ec8bb7b92
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -0,0 +1,50 @@
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}:
+
+let
+  runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools";
+in
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook makeWrapper ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
+  patchInstructions = lib.optionalString (os == "linux") ''
+    patchShebangs .
+
+    patch -p1 \
+      --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
+    wrapProgram build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+
+    # TODO: allow this stuff
+    rm -rf docs tests
+
+    # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
+
+    addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
+    find toolchains -type d -name bin | while read dir
+    do
+        autoPatchelf "$dir"
+    done
+
+    # fix ineffective PROGDIR / MYNDKDIR determination
+    for i in ndk-build
+    do
+        sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i
+    done
+
+    # Patch executables
+    autoPatchelf prebuilt/linux-x86_64
+
+    # wrap
+    for i in ndk-build
+    do
+        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    done
+
+    # make some executables available in PATH
+    mkdir -p $out/bin
+    for i in ndk-build
+    do
+        ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
+    done
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
new file mode 100644
index 00000000000..7af2d44a0f2
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
@@ -0,0 +1,44 @@
+diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py
+--- android-ndk-r18b/build/tools/make_standalone_toolchain.py	2018-10-11 12:49:38.000000000 +0200
++++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py	2018-11-20 21:55:52.689991420 +0100
+@@ -30,7 +30,7 @@
+ import sys
+ import tempfile
+ import textwrap
+-
++import subprocess
+ 
+ THIS_DIR = os.path.realpath(os.path.dirname(__file__))
+ NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..'))
+@@ -173,6 +173,7 @@
+                 logger().debug('Copying %s', src_file)
+                 shutil.copy2(src_file, dst_dir)
+ 
++    subprocess.check_call(["chmod", "-R", "+w", dst])
+ 
+ def make_clang_scripts(install_dir, triple, api, windows):
+     """Creates Clang wrapper scripts.
+@@ -365,6 +366,7 @@
+     install_headers = os.path.join(install_sysroot, 'usr/include')
+     os.makedirs(os.path.dirname(install_headers))
+     shutil.copytree(headers, install_headers)
++    subprocess.check_call(["chmod", "-R", "+w", install_path])
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(arch_headers, os.path.join(install_headers))
+@@ -375,6 +377,7 @@
+             install_sysroot, 'usr/lib{}'.format(lib_suffix))
+         if os.path.exists(lib_path):
+             shutil.copytree(lib_path, lib_install)
++            subprocess.check_call(["chmod", "-R", "+w", install_path])
+ 
+     static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
+     static_lib_install = os.path.join(install_sysroot, 'usr/lib')
+@@ -389,6 +392,7 @@
+         NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
+     gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
+     shutil.copytree(gdbserver_path, gdbserver_install)
++    subprocess.check_call(["chmod", "-R", "+w", install_path])
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 2cfb11bffbc..9d2f6eb6075 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,51 +1,19 @@
-{ buildPackages, pkgs }:
+{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
 
-let
-  inherit (buildPackages) fetchurl unzip;
-  inherit (pkgs) stdenv zlib;
-in
-
-stdenv.mkDerivation rec {
-  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 = "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 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v";
-    }
-    else throw "System ${stdenv.hostPlatform.system} not supported!";
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    cd platform-tools
-
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-      ''
-        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
-        done
-
-        for i in etc1tool
-        do
-            patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
-            patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:${zlib.out}/lib:`pwd`/lib64 $i
-        done
-    ''}
+deployAndroidPackage {
+  inherit package os;
+  buildInputs = [ autoPatchelfHook ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
+  patchInstructions = lib.optionalString (os == "linux") ''
+    addAutoPatchelfSearchPath $packageBaseDir/lib64
+    autoPatchelf --no-recurse $packageBaseDir/lib64
+    autoPatchelf --no-recurse $packageBaseDir
 
     mkdir -p $out/bin
-    for i in adb fastboot
+    cd $out/bin
+    find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
     do
-        ln -sf $out/platform-tools/$i $out/bin/$i
+        ln -s $i
     done
   '';
-
-  nativeBuildInputs = [ unzip ];
 }
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
deleted file mode 100644
index dbb295f8cf5..00000000000
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ /dev/null
@@ -1,343 +0,0 @@
-
-# This file is generated from generate-platforms.sh. DO NOT EDIT.
-# Execute generate-platforms.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildPlatform = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-    
-  platform_2 = buildPlatform {
-    name = "android-platform-1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip;
-      sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
-    };
-    meta = {
-      description = "Android SDK Platform 2";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_3 = buildPlatform {
-    name = "android-platform-1.5";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip;
-      sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
-    };
-    meta = {
-      description = "Android SDK Platform 3";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_4 = buildPlatform {
-    name = "android-platform-1.6";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip;
-      sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
-    };
-    meta = {
-      description = "Android SDK Platform 4";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_5 = buildPlatform {
-    name = "android-platform-2.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip;
-      sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
-    };
-    meta = {
-      description = "Android SDK Platform 5";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_6 = buildPlatform {
-    name = "android-platform-2.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip;
-      sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
-    };
-    meta = {
-      description = "Android SDK Platform 6";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_7 = buildPlatform {
-    name = "android-platform-2.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.1_r03.zip;
-      sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
-    };
-    meta = {
-      description = "Android SDK Platform 7";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_8 = buildPlatform {
-    name = "android-platform-2.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.2_r03.zip;
-      sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
-    };
-    meta = {
-      description = "Android SDK Platform 8";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_9 = buildPlatform {
-    name = "android-platform-2.3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
-      sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
-    };
-    meta = {
-      description = "Android SDK Platform 9";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_10 = buildPlatform {
-    name = "android-platform-2.3.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
-      sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
-    };
-    meta = {
-      description = "Android SDK Platform 10";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_11 = buildPlatform {
-    name = "android-platform-3.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.0_r02.zip;
-      sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
-    };
-    meta = {
-      description = "Android SDK Platform 11";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_12 = buildPlatform {
-    name = "android-platform-3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.1_r03.zip;
-      sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
-    };
-    meta = {
-      description = "Android SDK Platform 12";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_13 = buildPlatform {
-    name = "android-platform-3.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.2_r01.zip;
-      sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
-    };
-    meta = {
-      description = "Android SDK Platform 13";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_14 = buildPlatform {
-    name = "android-platform-4.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-14_r04.zip;
-      sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
-    };
-    meta = {
-      description = "Android SDK Platform 14";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_15 = buildPlatform {
-    name = "android-platform-4.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-15_r05.zip;
-      sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
-    };
-    meta = {
-      description = "Android SDK Platform 15";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_16 = buildPlatform {
-    name = "android-platform-4.1.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-16_r05.zip;
-      sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
-    };
-    meta = {
-      description = "Android SDK Platform 16";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_17 = buildPlatform {
-    name = "android-platform-4.2.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-17_r03.zip;
-      sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
-    };
-    meta = {
-      description = "Android SDK Platform 17";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_18 = buildPlatform {
-    name = "android-platform-4.3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-18_r03.zip;
-      sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
-    };
-    meta = {
-      description = "Android SDK Platform 18";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_19 = buildPlatform {
-    name = "android-platform-4.4.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-19_r04.zip;
-      sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
-    };
-    meta = {
-      description = "Android SDK Platform 19";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_20 = buildPlatform {
-    name = "android-platform-4.4W.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-20_r02.zip;
-      sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
-    };
-    meta = {
-      description = "Android SDK Platform 20";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_21 = buildPlatform {
-    name = "android-platform-5.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-21_r02.zip;
-      sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
-    };
-    meta = {
-      description = "Android SDK Platform 21";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_22 = buildPlatform {
-    name = "android-platform-5.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-22_r02.zip;
-      sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
-    };
-    meta = {
-      description = "Android SDK Platform 22";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_23 = buildPlatform {
-    name = "android-platform-6.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-23_r03.zip;
-      sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
-    };
-    meta = {
-      description = "Android SDK Platform 23";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_24 = buildPlatform {
-    name = "android-platform-7.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-24_r02.zip;
-      sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee";
-    };
-    meta = {
-      description = "Android SDK Platform 24";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_25 = buildPlatform {
-    name = "android-platform-7.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-25_r03.zip;
-      sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
-    };
-    meta = {
-      description = "Android SDK Platform 25";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_26 = buildPlatform {
-    name = "android-platform-8.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r02.zip;
-      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
-    };
-    meta = {
-      description = "Android SDK Platform 26";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_27 = buildPlatform {
-    name = "android-platform-8.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-27_r03.zip;
-      sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353";
-    };
-    meta = {
-      description = "Android SDK Platform 27";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_28 = buildPlatform {
-    name = "android-platform-9";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-28_r06.zip;
-      sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6";
-    };
-    meta = {
-      description = "Android SDK Platform 28";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-}
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
deleted file mode 100644
index 30ed94e516a..00000000000
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ /dev/null
@@ -1,343 +0,0 @@
-
-# This file is generated from generate-platforms.sh. DO NOT EDIT.
-# Execute generate-platforms.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildPlatform = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-    
-  platform_2 = buildPlatform {
-    name = "android-platform-1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip;
-      sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
-    };
-    meta = {
-      description = "Android SDK Platform 2";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_3 = buildPlatform {
-    name = "android-platform-1.5";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip;
-      sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
-    };
-    meta = {
-      description = "Android SDK Platform 3";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_4 = buildPlatform {
-    name = "android-platform-1.6";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip;
-      sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
-    };
-    meta = {
-      description = "Android SDK Platform 4";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_5 = buildPlatform {
-    name = "android-platform-2.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip;
-      sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
-    };
-    meta = {
-      description = "Android SDK Platform 5";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_6 = buildPlatform {
-    name = "android-platform-2.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
-      sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
-    };
-    meta = {
-      description = "Android SDK Platform 6";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_7 = buildPlatform {
-    name = "android-platform-2.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.1_r03.zip;
-      sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
-    };
-    meta = {
-      description = "Android SDK Platform 7";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_8 = buildPlatform {
-    name = "android-platform-2.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.2_r03.zip;
-      sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
-    };
-    meta = {
-      description = "Android SDK Platform 8";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_9 = buildPlatform {
-    name = "android-platform-2.3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
-      sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
-    };
-    meta = {
-      description = "Android SDK Platform 9";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_10 = buildPlatform {
-    name = "android-platform-2.3.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
-      sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
-    };
-    meta = {
-      description = "Android SDK Platform 10";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_11 = buildPlatform {
-    name = "android-platform-3.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.0_r02.zip;
-      sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
-    };
-    meta = {
-      description = "Android SDK Platform 11";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_12 = buildPlatform {
-    name = "android-platform-3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.1_r03.zip;
-      sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
-    };
-    meta = {
-      description = "Android SDK Platform 12";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_13 = buildPlatform {
-    name = "android-platform-3.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-3.2_r01.zip;
-      sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
-    };
-    meta = {
-      description = "Android SDK Platform 13";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_14 = buildPlatform {
-    name = "android-platform-4.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-14_r04.zip;
-      sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
-    };
-    meta = {
-      description = "Android SDK Platform 14";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_15 = buildPlatform {
-    name = "android-platform-4.0.3";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-15_r05.zip;
-      sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
-    };
-    meta = {
-      description = "Android SDK Platform 15";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_16 = buildPlatform {
-    name = "android-platform-4.1.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-16_r05.zip;
-      sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
-    };
-    meta = {
-      description = "Android SDK Platform 16";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_17 = buildPlatform {
-    name = "android-platform-4.2.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-17_r03.zip;
-      sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
-    };
-    meta = {
-      description = "Android SDK Platform 17";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_18 = buildPlatform {
-    name = "android-platform-4.3.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-18_r03.zip;
-      sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
-    };
-    meta = {
-      description = "Android SDK Platform 18";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_19 = buildPlatform {
-    name = "android-platform-4.4.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-19_r04.zip;
-      sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
-    };
-    meta = {
-      description = "Android SDK Platform 19";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_20 = buildPlatform {
-    name = "android-platform-4.4W.2";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-20_r02.zip;
-      sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
-    };
-    meta = {
-      description = "Android SDK Platform 20";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_21 = buildPlatform {
-    name = "android-platform-5.0.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-21_r02.zip;
-      sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
-    };
-    meta = {
-      description = "Android SDK Platform 21";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_22 = buildPlatform {
-    name = "android-platform-5.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/android-22_r02.zip;
-      sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
-    };
-    meta = {
-      description = "Android SDK Platform 22";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_23 = buildPlatform {
-    name = "android-platform-6.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-23_r03.zip;
-      sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
-    };
-    meta = {
-      description = "Android SDK Platform 23";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_24 = buildPlatform {
-    name = "android-platform-7.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-24_r02.zip;
-      sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee";
-    };
-    meta = {
-      description = "Android SDK Platform 24";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_25 = buildPlatform {
-    name = "android-platform-7.1.1";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-25_r03.zip;
-      sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
-    };
-    meta = {
-      description = "Android SDK Platform 25";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_26 = buildPlatform {
-    name = "android-platform-8.0.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r02.zip;
-      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
-    };
-    meta = {
-      description = "Android SDK Platform 26";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_27 = buildPlatform {
-    name = "android-platform-8.1.0";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-27_r03.zip;
-      sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353";
-    };
-    meta = {
-      description = "Android SDK Platform 27";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-  platform_28 = buildPlatform {
-    name = "android-platform-9";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-28_r06.zip;
-      sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6";
-    };
-    meta = {
-      description = "Android SDK Platform 28";
-      homepage = http://developer.android.com/sdk/;
-    };
-  };
-
-}
diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/pkgs/development/mobile/androidenv/querypackages.sh
new file mode 100644
index 00000000000..0f31396b876
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/querypackages.sh
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+if [ "$1" = "" ]
+then
+    echo "Please select a package set: 'packages', 'addons', 'system-images'" >&2
+    exit 1
+fi
+
+if [ "$2" = "" ]
+then
+    echo "Please select a package group:" >&2
+    ( cat <<EOF
+builtins.attrNames (import ./generated/$1.nix {
+  fetchurl = null;
+})
+EOF
+) | nix-instantiate --eval-only -
+
+    exit 1
+fi
+
+( cat <<EOF
+builtins.attrNames (import ./generated/$1.nix {
+  fetchurl = null;
+}).$2
+EOF
+) | nix-instantiate --eval-only -
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
deleted file mode 100644
index 45ad16be57b..00000000000
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ /dev/null
@@ -1,2834 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2018-10-17 16:21:19.063228 with ADRT.-->
-	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
-
-This is the Android Software Development Kit License Agreement
-
-1. Introduction
-
-1.1 The Android Software Development Kit (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 A &quot;compatible implementation&quot; means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-2. Accepting the License Agreement
-
-2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-3. SDK License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.
-
-3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement.  Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-4. Use of the SDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
-
-7. Third Party Applications
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.
-
-
-8. Using Android APIs
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-
-9. Terminating the License Agreement
-
-9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement with you if:
-(A) you have breached any provision of the License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.
-
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
-
-14. General Legal Terms
-
-14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-
-November 20, 2015</sdk:license>
-	<sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
-As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
-
-This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
-
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
-
-3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-June 2014.</sdk:license>
-	<sdk:ndk>
-		<!--Generated from bid:5063045, branch:aosp-ndk-release-r18-->
-		<sdk:description>NDK</sdk:description>
-		<sdk:revision>18</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Oct 11 14:06:10 2018.-->
-				<sdk:size>542911996</sdk:size>
-				<sdk:checksum type="sha1">98cb9909aa8c2dab32db188bbdc3ac6207e09440</sdk:checksum>
-				<sdk:url>android-ndk-r18b-darwin-x86_64.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Oct 11 14:06:26 2018.-->
-				<sdk:size>557038702</sdk:size>
-				<sdk:checksum type="sha1">500679655da3a86aecf67007e8ab230ea9b4dd7b</sdk:checksum>
-				<sdk:url>android-ndk-r18b-linux-x86_64.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Oct 11 14:05:37 2018.-->
-				<sdk:size>504605336</sdk:size>
-				<sdk:checksum type="sha1">4b8b6a4edc0fa967b429c1d6d25adf69acc28803</sdk:checksum>
-				<sdk:url>android-ndk-r18b-windows-x86.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-				<sdk:host-bits>32</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Oct 11 14:05:53 2018.-->
-				<sdk:size>522489470</sdk:size>
-				<sdk:checksum type="sha1">6b6d4138aaaad7166679fdfa4780e177f95cee6f</sdk:checksum>
-				<sdk:url>android-ndk-r18b-windows-x86_64.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:ndk>
-	<sdk:platform>
-		<!--Generated from bid:4913185, branch:pi-sdk-release-->
-		<sdk:version>9</sdk:version>
-		<sdk:api-level>28</sdk:api-level>
-		<sdk:description>Android SDK Platform 28</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jul 25 20:19:20 2018.-->
-				<sdk:size>75565084</sdk:size>
-				<sdk:checksum type="sha1">9a4e52b1d55bd2e24216b150aafae2503d3efba6</sdk:checksum>
-				<sdk:url>platform-28_r06.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>15</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:4774931, branch:git_oc-mr1-sdk-release-->
-		<sdk:version>8.1.0</sdk:version>
-		<sdk:api-level>27</sdk:api-level>
-		<sdk:description>Android SDK Platform 27</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 11 15:44:04 2018.-->
-				<sdk:size>65635348</sdk:size>
-				<sdk:checksum type="sha1">35f747e7e70b2d16e0e4246876be28d15ea1c353</sdk:checksum>
-				<sdk:url>platform-27_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>15</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:4187382, branch:git_oc-release-->
-		<sdk:version>8.0.0</sdk:version>
-		<sdk:api-level>26</sdk:api-level>
-		<sdk:description>Android SDK Platform 26</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 23 00:35:53 2018.-->
-				<sdk:size>63623734</sdk:size>
-				<sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum>
-				<sdk:url>platform-26_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>15</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:version>7.1.1</sdk:version>
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:description>Android SDK Platform 25</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 06:47:38 2018.-->
-				<sdk:size>85424763</sdk:size>
-				<sdk:checksum type="sha1">00c2c5765e8988504be10a1eb66ed71fcdbd7fe8</sdk:checksum>
-				<sdk:url>platform-25_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>16</sdk:api>
-			<sdk:revision>2</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
-		<sdk:version>7.0</sdk:version>
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>Android SDK Platform 24</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 15:00:21 2018.-->
-				<sdk:size>82648154</sdk:size>
-				<sdk:checksum type="sha1">8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee</sdk:checksum>
-				<sdk:url>platform-24_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>16</sdk:api>
-			<sdk:revision>2</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:2704002, branch:git_mnc-sdk-release-->
-		<sdk:version>6.0</sdk:version>
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>Android SDK Platform 23</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 21 15:53:43 2018.-->
-				<sdk:size>70433421</sdk:size>
-				<sdk:checksum type="sha1">027fede3de6aa1649115bbd0bffff30ccd51c9a0</sdk:checksum>
-				<sdk:url>platform-23_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>16</sdk:api>
-			<sdk:revision>3</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1819727, branch:git_lmp-mr1-sdk-release-->
-		<sdk:version>5.1.1</sdk:version>
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Android SDK Platform 22</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 21 03:54:34 2018.-->
-				<sdk:size>66852371</sdk:size>
-				<sdk:checksum type="sha1">5d1bd10fea962b216a0dece1247070164760a9fc</sdk:checksum>
-				<sdk:url>android-22_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>14</sdk:api>
-			<sdk:revision>2</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1624448, branch:git_lmp-dev-->
-		<sdk:version>5.0.1</sdk:version>
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:description>Android SDK Platform 21</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 19 02:28:04 2018.-->
-				<sdk:size>65897960</sdk:size>
-				<sdk:checksum type="sha1">53536556059bb29ae82f414fd2e14bc335a4eb4c</sdk:checksum>
-				<sdk:url>android-21_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>2</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1537038, branch:git_klp-modular-dev-->
-		<sdk:version>4.4W.2</sdk:version>
-		<sdk:api-level>20</sdk:api-level>
-		<sdk:description>Android SDK Platform 20</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 18:11:51 2018.-->
-				<sdk:size>63567784</sdk:size>
-				<sdk:checksum type="sha1">a9251f8a3f313ab05834a07a963000927637e01d</sdk:checksum>
-				<sdk:url>android-20_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1456859, branch:git_klp-sdk-release-->
-		<sdk:version>4.4.2</sdk:version>
-		<sdk:api-level>19</sdk:api-level>
-		<sdk:description>Android SDK Platform 19</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 25 15:40:05 2018.-->
-				<sdk:size>63871092</sdk:size>
-				<sdk:checksum type="sha1">2ff20d89e68f2f5390981342e009db5a2d456aaa</sdk:checksum>
-				<sdk:url>android-19_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>22</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1425645, branch:git_jb-mr2-dev-->
-		<sdk:version>4.3.1</sdk:version>
-		<sdk:api-level>18</sdk:api-level>
-		<sdk:description>Android SDK Platform 18</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 18 13:24:37 2018.-->
-				<sdk:size>57771739</sdk:size>
-				<sdk:checksum type="sha1">e6b09b3505754cbbeb4a5622008b907262ee91cb</sdk:checksum>
-				<sdk:url>android-18_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>21</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1425461, branch:git_jb-mr1.1-dev-->
-		<sdk:version>4.2.2</sdk:version>
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>Android SDK Platform 17</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 21:15:56 2018.-->
-				<sdk:size>57030216</sdk:size>
-				<sdk:checksum type="sha1">dbe14101c06e6cdb34e300393e64e64f8c92168a</sdk:checksum>
-				<sdk:url>android-17_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>21</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1425332, branch:git_jb-dev-->
-		<sdk:version>4.1.2</sdk:version>
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>Android SDK Platform 16</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 23 08:20:21 2018.-->
-				<sdk:size>48128695</sdk:size>
-				<sdk:checksum type="sha1">12a5ce6235a76bc30f62c26bda1b680e336abd07</sdk:checksum>
-				<sdk:url>android-16_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>21</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1406430, branch:git_ics-mr1-->
-		<sdk:version>4.0.3</sdk:version>
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>Android SDK Platform 15</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 14:02:31 2018.-->
-				<sdk:size>44533475</sdk:size>
-				<sdk:checksum type="sha1">69ab4c443b37184b2883af1fd38cc20cbeffd0f3</sdk:checksum>
-				<sdk:url>android-15_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>21</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1406408, branch:git_ics-mr0-->
-		<sdk:version>4.0</sdk:version>
-		<sdk:api-level>14</sdk:api-level>
-		<sdk:description>Android SDK Platform 14</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 10:33:42 2018.-->
-				<sdk:size>46038082</sdk:size>
-				<sdk:checksum type="sha1">d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c</sdk:checksum>
-				<sdk:url>android-14_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>12</sdk:api>
-			<sdk:revision>1</sdk:revision>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:140714, branch:honeycomb-mr2-release-->
-		<sdk:version>3.2</sdk:version>
-		<sdk:api-level>13</sdk:api-level>
-		<sdk:description>Android SDK Platform 13</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 07:27:36 2018.-->
-				<sdk:size>108426536</sdk:size>
-				<sdk:checksum type="sha1">6189a500a8c44ae73a439604363de93591163cd9</sdk:checksum>
-				<sdk:url>android-3.2_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>12</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:123685, branch:honeycomb-mr1-->
-		<sdk:version>3.1</sdk:version>
-		<sdk:api-level>12</sdk:api-level>
-		<sdk:description>Android SDK Platform 12</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 24 23:42:26 2018.-->
-				<sdk:size>106472351</sdk:size>
-				<sdk:checksum type="sha1">4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf</sdk:checksum>
-				<sdk:url>android-3.1_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>11</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:104254, branch:honeycomb-->
-		<sdk:version>3.0</sdk:version>
-		<sdk:api-level>11</sdk:api-level>
-		<sdk:description>Android SDK Platform 11</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 17 05:58:58 2018.-->
-				<sdk:size>104513908</sdk:size>
-				<sdk:checksum type="sha1">2c7d4bd13f276e76f6bbd87315fe27aba351dd37</sdk:checksum>
-				<sdk:url>android-3.0_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>10</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:101070, branch:gingerbread-release-->
-		<sdk:version>2.3.3</sdk:version>
-		<sdk:api-level>10</sdk:api-level>
-		<sdk:description>Android SDK Platform 10</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 04:35:13 2018.-->
-				<sdk:size>85470907</sdk:size>
-				<sdk:checksum type="sha1">887e37783ec32f541ea33c2c649dda648e8e6fb3</sdk:checksum>
-				<sdk:url>android-2.3.3_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>4</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:93351, branch:gingerbread-sdk-release-->
-		<sdk:version>2.3.1</sdk:version>
-		<sdk:api-level>9</sdk:api-level>
-		<sdk:description>Android SDK Platform 9</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 19 00:10:28 2018.-->
-				<sdk:size>78732563</sdk:size>
-				<sdk:checksum type="sha1">209f8a7a8b2cb093fce858b8b55fed3ba5206773</sdk:checksum>
-				<sdk:url>android-2.3.1_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>4</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:43546, branch:froyo-release-->
-		<sdk:version>2.2</sdk:version>
-		<sdk:api-level>8</sdk:api-level>
-		<sdk:description>Android SDK Platform 8</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 13:26:30 2018.-->
-				<sdk:size>74652366</sdk:size>
-				<sdk:checksum type="sha1">231262c63eefdff8fd0386e9ccfefeb27a8f9202</sdk:checksum>
-				<sdk:url>android-2.2_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>4</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:35983, branch:eclair-->
-		<sdk:version>2.1</sdk:version>
-		<sdk:api-level>7</sdk:api-level>
-		<sdk:description>Android SDK Platform 7</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 25 18:43:17 2018.-->
-				<sdk:size>70142829</sdk:size>
-				<sdk:checksum type="sha1">5ce51b023ac19f8738500b1007a1da5de2349a1e</sdk:checksum>
-				<sdk:url>android-2.1_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>8</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:20723, branch:unknown-->
-		<sdk:version>2.0.1</sdk:version>
-		<sdk:api-level>6</sdk:api-level>
-		<sdk:description>Android SDK Platform 6</sdk:description>
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 03:48:57 2018.-->
-				<sdk:size>79192618</sdk:size>
-				<sdk:checksum type="sha1">ce2c971dce352aa28af06bda92a070116aa5ae1a</sdk:checksum>
-				<sdk:url>android-2.0.1_r01-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 10:07:34 2018.-->
-				<sdk:size>79035527</sdk:size>
-				<sdk:checksum type="sha1">c3096f80d75a6fc8cb38ef8a18aec920e53d42c0</sdk:checksum>
-				<sdk:url>android-2.0.1_r01-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 14:23:45 2018.-->
-				<sdk:size>80385601</sdk:size>
-				<sdk:checksum type="sha1">255781ebe4509d9707d0e77edda2815e2bc216e6</sdk:checksum>
-				<sdk:url>android-2.0.1_r01-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>4</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:17704, branch:unknown-->
-		<sdk:version>2.0</sdk:version>
-		<sdk:api-level>5</sdk:api-level>
-		<sdk:description>Android SDK Platform 5</sdk:description>
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 19 10:03:45 2018.-->
-				<sdk:size>75095268</sdk:size>
-				<sdk:checksum type="sha1">be9be6a99ca32875c96ec7f91160ca9fce7e3c7d</sdk:checksum>
-				<sdk:url>android-2.0_r01-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 19 16:50:28 2018.-->
-				<sdk:size>74956356</sdk:size>
-				<sdk:checksum type="sha1">2a866d0870dbba18e0503cd41e5fae988a21b314</sdk:checksum>
-				<sdk:url>android-2.0_r01-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 00:45:58 2018.-->
-				<sdk:size>76288040</sdk:size>
-				<sdk:checksum type="sha1">aeb623217ff88b87216d6eb7dbc846ed53f68f57</sdk:checksum>
-				<sdk:url>android-2.0_r01-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>3</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:3, branch:unknown-->
-		<sdk:version>1.6</sdk:version>
-		<sdk:api-level>4</sdk:api-level>
-		<sdk:description>Android SDK Platform 4</sdk:description>
-		<sdk:obsolete/>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 23:29:51 2018.-->
-				<sdk:size>63454485</sdk:size>
-				<sdk:checksum type="sha1">483ed088e45bbdf3444baaf9250c8b02e5383cb0</sdk:checksum>
-				<sdk:url>android-1.6_r03-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 07:57:24 2018.-->
-				<sdk:size>62418496</sdk:size>
-				<sdk:checksum type="sha1">bdafad44f5df9f127979bdb21a1fdd87ee3cd625</sdk:checksum>
-				<sdk:url>android-1.6_r03-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 04:34:06 2018.-->
-				<sdk:size>64654625</sdk:size>
-				<sdk:checksum type="sha1">ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22</sdk:checksum>
-				<sdk:url>android-1.6_r03-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>6</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:2, branch:unknown-->
-		<sdk:version>1.5</sdk:version>
-		<sdk:api-level>3</sdk:api-level>
-		<sdk:description>Android SDK Platform 3</sdk:description>
-		<sdk:obsolete/>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 17 22:23:16 2018.-->
-				<sdk:size>53348669</sdk:size>
-				<sdk:checksum type="sha1">5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c</sdk:checksum>
-				<sdk:url>android-1.5_r04-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 15:31:36 2018.-->
-				<sdk:size>52440607</sdk:size>
-				<sdk:checksum type="sha1">d3a67c2369afa48b6c3c7624de5031c262018d1e</sdk:checksum>
-				<sdk:url>android-1.5_r04-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 02:58:08 2018.-->
-				<sdk:size>54624370</sdk:size>
-				<sdk:checksum type="sha1">5bb106d2e40d481edd337b0833093843e15fe49a</sdk:checksum>
-				<sdk:url>android-1.5_r04-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>6</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:platform>
-		<!--Generated from bid:1, branch:unknown-->
-		<sdk:version>1.1</sdk:version>
-		<sdk:api-level>2</sdk:api-level>
-		<sdk:description>Android SDK Platform 2</sdk:description>
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 20 23:48:42 2018.-->
-				<sdk:size>45476658</sdk:size>
-				<sdk:checksum type="sha1">c054d25c9b4c6251fa49c2f9c54336998679d3fe</sdk:checksum>
-				<sdk:url>android-1.1_r1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 19 16:29:20 2018.-->
-				<sdk:size>45584305</sdk:size>
-				<sdk:checksum type="sha1">e21dbcff45b7356657449ebb3c7e941be2bb5ebe</sdk:checksum>
-				<sdk:url>android-1.1_r1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 18:57:19 2018.-->
-				<sdk:size>46828615</sdk:size>
-				<sdk:checksum type="sha1">a4060f29ed39fc929c302836d488998c53c3002e</sdk:checksum>
-				<sdk:url>android-1.1_r1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-tools-rev>
-			<sdk:major>6</sdk:major>
-		</sdk:min-tools-rev>
-		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
-		<sdk:layoutlib>
-			<sdk:api>4</sdk:api>
-		</sdk:layoutlib>
-	</sdk:platform>
-	<sdk:source>
-		<!--Generated from bid:4898911, branch:git_pi-release-->
-		<sdk:api-level>28</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Aug  8 15:54:23 2018.-->
-				<sdk:size>42552241</sdk:size>
-				<sdk:checksum type="sha1">5610e0c24235ee3fa343c899ddd551be30315255</sdk:checksum>
-				<sdk:url>sources-28_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:4402310, branch:git_oc-mr1-release-->
-		<sdk:api-level>27</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 01:46:30 2018.-->
-				<sdk:size>36997618</sdk:size>
-				<sdk:checksum type="sha1">7b714670561d08f54751af42aca929867b806596</sdk:checksum>
-				<sdk:url>sources-27_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:4187382, branch:git_oc-release-->
-		<sdk:api-level>26</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 01:15:38 2018.-->
-				<sdk:size>35138547</sdk:size>
-				<sdk:checksum type="sha1">2af701ee3223d580409288540b1d06932fd8f9b9</sdk:checksum>
-				<sdk:url>sources-26_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 06:06:13 2018.-->
-				<sdk:size>30822685</sdk:size>
-				<sdk:checksum type="sha1">bbc72efd1a9bad87cc507e308f0d29aad438c52c</sdk:checksum>
-				<sdk:url>sources-25_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 14:43:03 2018.-->
-				<sdk:size>30270410</sdk:size>
-				<sdk:checksum type="sha1">6b96115830a83d654479f32ce4b724ca9011148b</sdk:checksum>
-				<sdk:url>sources-24_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:2166767, branch:git_mnc-release-->
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 14:12:23 2018.-->
-				<sdk:size>31771965</sdk:size>
-				<sdk:checksum type="sha1">b0f15da2762b42f543c5e364c2b15b198cc99cc2</sdk:checksum>
-				<sdk:url>sources-23_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:1737576, branch:git_lmp-mr1-sdk-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 23:43:02 2018.-->
-				<sdk:size>28861236</sdk:size>
-				<sdk:checksum type="sha1">98320e13976d11597a4a730a8d203ac9a03ed5a6</sdk:checksum>
-				<sdk:url>sources-22_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:1521886, branch:git_lmp-release-->
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 09:12:37 2018.-->
-				<sdk:size>28274751</sdk:size>
-				<sdk:checksum type="sha1">137a5044915d32bea297a8c1552684802bbc2e25</sdk:checksum>
-				<sdk:url>sources-21_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:1246132, branch:git_klp-modular-release-->
-		<sdk:api-level>20</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 19:46:05 2018.-->
-				<sdk:size>23367603</sdk:size>
-				<sdk:checksum type="sha1">8da3e40f2625f9f7ef38b7e403f49f67226c0d76</sdk:checksum>
-				<sdk:url>sources-20_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:938007, branch:git_klp-dev-->
-		<sdk:api-level>19</sdk:api-level>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue May 29 10:39:58 2018.-->
-				<sdk:size>21819439</sdk:size>
-				<sdk:checksum type="sha1">433a1d043ef77561571250e94cb7a0ef24a202e7</sdk:checksum>
-				<sdk:url>sources-19_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:737497, branch:git_jb-mr2-release-->
-		<sdk:api-level>18</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 18 03:14:54 2018.-->
-				<sdk:size>20226735</sdk:size>
-				<sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum>
-				<sdk:url>sources-18_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:526865, branch:git_jb-mr1-dev-->
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 17 17:14:50 2018.-->
-				<sdk:size>18976816</sdk:size>
-				<sdk:checksum type="sha1">6f1f18cd2d2b1852d7f6892df9cee3823349d43a</sdk:checksum>
-				<sdk:url>sources-17_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:403059, branch:git_jb-release-->
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 05:17:35 2018.-->
-				<sdk:size>17876720</sdk:size>
-				<sdk:checksum type="sha1">0f83c14ed333c45d962279ab5d6bc98a0269ef84</sdk:checksum>
-				<sdk:url>sources-16_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:302030, branch:git_ics-mr1-->
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 23:00:27 2018.-->
-				<sdk:size>16468746</sdk:size>
-				<sdk:checksum type="sha1">e5992a5747c9590783fbbdd700337bf0c9f6b1fa</sdk:checksum>
-				<sdk:url>sources-15_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:source>
-		<!--Generated from bid:234950, branch:git_ics-mr0-->
-		<sdk:api-level>14</sdk:api-level>
-		<sdk:obsolete/>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 09:00:50 2018.-->
-				<sdk:size>16152383</sdk:size>
-				<sdk:checksum type="sha1">eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555</sdk:checksum>
-				<sdk:url>sources-14_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:source>
-	<sdk:build-tool>
-		<!--Generated from bid:5016651, branch:pi-sdk-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Sep 18 17:02:14 2018.-->
-				<sdk:size>57830695</sdk:size>
-				<sdk:checksum type="sha1">ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165</sdk:checksum>
-				<sdk:url>build-tools_r28.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Sep 18 17:02:10 2018.-->
-				<sdk:size>57133581</sdk:size>
-				<sdk:checksum type="sha1">f8c333a2991b1ab05a671bc6248b78e00edcd83a</sdk:checksum>
-				<sdk:url>build-tools_r28.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Sep 18 17:02:07 2018.-->
-				<sdk:size>58393729</sdk:size>
-				<sdk:checksum type="sha1">05bd35bb48d11c848da2b393c6f864eb609aacba</sdk:checksum>
-				<sdk:url>build-tools_r28.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4913185, branch:pi-sdk-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jul 25 20:19:09 2018.-->
-				<sdk:size>57754663</sdk:size>
-				<sdk:checksum type="sha1">b4492209810a3fd48deaa982f9852fef12433d55</sdk:checksum>
-				<sdk:url>build-tools_r28.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jul 25 20:19:05 2018.-->
-				<sdk:size>57057554</sdk:size>
-				<sdk:checksum type="sha1">c10dd5a7825578622fb362a8a34f76eb3ba0c0a9</sdk:checksum>
-				<sdk:url>build-tools_r28.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jul 25 20:19:01 2018.-->
-				<sdk:size>58317692</sdk:size>
-				<sdk:checksum type="sha1">e9c570c568a0c2a32e88ee3204279019ebefd949</sdk:checksum>
-				<sdk:url>build-tools_r28.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4860066, branch:pi-preview4-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 26 16:23:22 2018.-->
-				<sdk:size>57610954</sdk:size>
-				<sdk:checksum type="sha1">ee70dfa1fccb58b37cebc9544830511f36a137a0</sdk:checksum>
-				<sdk:url>build-tools_r28.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 26 16:23:20 2018.-->
-				<sdk:size>56913869</sdk:size>
-				<sdk:checksum type="sha1">aeef42ad953f1630dd6f5d71eefdc0b825211462</sdk:checksum>
-				<sdk:url>build-tools_r28.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 26 16:23:17 2018.-->
-				<sdk:size>58173989</sdk:size>
-				<sdk:checksum type="sha1">29c6342835734be25b9e458ab3fad5750ad6a355</sdk:checksum>
-				<sdk:url>build-tools_r28.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4799589, branch:pi-preview3-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 23 16:22:51 2018.-->
-				<sdk:size>37157769</sdk:size>
-				<sdk:checksum type="sha1">d9f8a754d833ccd334f56fcc6089c5925cd82abb</sdk:checksum>
-				<sdk:url>build-tools_r28-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed May 23 16:22:49 2018.-->
-				<sdk:size>36458977</sdk:size>
-				<sdk:checksum type="sha1">72088d32d1d82cc3c2cf7cf6618b6130c0c84ade</sdk:checksum>
-				<sdk:url>build-tools_r28-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed May 23 16:22:47 2018.-->
-				<sdk:size>37718995</sdk:size>
-				<sdk:checksum type="sha1">d4b0638a877ed570e07876264e69fdbd86409610</sdk:checksum>
-				<sdk:url>build-tools_r28-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4758566, branch:pi-preview2-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-			<sdk:preview>2</sdk:preview>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May  3 14:26:31 2018.-->
-				<sdk:size>37151124</sdk:size>
-				<sdk:checksum type="sha1">efe9c0dde0646a07544c864276390ca6e96b24dc</sdk:checksum>
-				<sdk:url>build-tools_r28-rc2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May  3 14:26:27 2018.-->
-				<sdk:size>36449480</sdk:size>
-				<sdk:checksum type="sha1">0d0314b353589feb10e528b44c5a685b6658d797</sdk:checksum>
-				<sdk:url>build-tools_r28-rc2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May  3 14:26:24 2018.-->
-				<sdk:size>37716459</sdk:size>
-				<sdk:checksum type="sha1">a94bfb52b4ec74b95c116236c3e382e923cad6c4</sdk:checksum>
-				<sdk:url>build-tools_r28-rc2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4614665, branch:git_pi-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-			<sdk:preview>1</sdk:preview>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 20:06:20 2018.-->
-				<sdk:size>38703535</sdk:size>
-				<sdk:checksum type="sha1">1601977fae25fd478bcfaa0481ca5ea3c609d840</sdk:checksum>
-				<sdk:url>build-tools_r28-rc1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 21:05:54 2018.-->
-				<sdk:size>38004795</sdk:size>
-				<sdk:checksum type="sha1">2c77821967a2330b7b227072d0b1c02ef19fe2fc</sdk:checksum>
-				<sdk:url>build-tools_r28-rc1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 11:13:53 2018.-->
-				<sdk:size>39273232</sdk:size>
-				<sdk:checksum type="sha1">fbf46c33d1268f6532911707b2a05033fd5c5b41</sdk:checksum>
-				<sdk:url>build-tools_r28-rc1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4507799, branch:git_oc-mr1-sdk-release-->
-		<sdk:revision>
-			<sdk:major>27</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 01:14:40 2018.-->
-				<sdk:size>54478554</sdk:size>
-				<sdk:checksum type="sha1">d85e7a6320eddffe7eeace3437605079dac938ca</sdk:checksum>
-				<sdk:url>build-tools_r27.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 02:46:10 2018.-->
-				<sdk:size>53867966</sdk:size>
-				<sdk:checksum type="sha1">61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d</sdk:checksum>
-				<sdk:url>build-tools_r27.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 18 21:09:43 2018.-->
-				<sdk:size>55194255</sdk:size>
-				<sdk:checksum type="sha1">0df61e11713a2838d2cc9a911219dddf5e6a2749</sdk:checksum>
-				<sdk:url>build-tools_r27.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4458339, branch:git_oc-mr1-sdk-release-->
-		<sdk:revision>
-			<sdk:major>27</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 08:42:16 2018.-->
-				<sdk:size>54458153</sdk:size>
-				<sdk:checksum type="sha1">b687ddf6be84f11607871138aad32cf857d0b837</sdk:checksum>
-				<sdk:url>build-tools_r27.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 15:49:30 2018.-->
-				<sdk:size>53846615</sdk:size>
-				<sdk:checksum type="sha1">6d5d9cf2a47877f273f4b742b19e712a051a31be</sdk:checksum>
-				<sdk:url>build-tools_r27.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon May 21 01:11:23 2018.-->
-				<sdk:size>55173070</sdk:size>
-				<sdk:checksum type="sha1">b80466c13b75e3ebf3c546964f40775db5898b2a</sdk:checksum>
-				<sdk:url>build-tools_r27.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4429804, branch:git_oc-mr1-release-->
-		<sdk:revision>
-			<sdk:major>27</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 21:53:36 2018.-->
-				<sdk:size>54450260</sdk:size>
-				<sdk:checksum type="sha1">7f4eedb1077ef948b848040dcd15de9e8a759f4a</sdk:checksum>
-				<sdk:url>build-tools_r27.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May 17 21:44:36 2018.-->
-				<sdk:size>53838762</sdk:size>
-				<sdk:checksum type="sha1">1edd07bfdbadd95652d093040e16d858f7489594</sdk:checksum>
-				<sdk:url>build-tools_r27.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 07:28:26 2018.-->
-				<sdk:size>55171114</sdk:size>
-				<sdk:checksum type="sha1">18109db020c6d088d0157d1df201d31bc6970875</sdk:checksum>
-				<sdk:url>build-tools_r27.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4402310, branch:git_oc-mr1-release-->
-		<sdk:revision>
-			<sdk:major>27</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 03:24:44 2018.-->
-				<sdk:size>54441725</sdk:size>
-				<sdk:checksum type="sha1">28542332ba97cf4a08c3eddfcf5edd70e3cf1260</sdk:checksum>
-				<sdk:url>build-tools_r27-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 15:50:22 2018.-->
-				<sdk:size>53831513</sdk:size>
-				<sdk:checksum type="sha1">fb4e8d7e6b8d29a77090e34024077a80458d5ae1</sdk:checksum>
-				<sdk:url>build-tools_r27-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 05:13:49 2018.-->
-				<sdk:size>55163097</sdk:size>
-				<sdk:checksum type="sha1">4f1df22a6d99261d2160d624b81445da0a027dbe</sdk:checksum>
-				<sdk:url>build-tools_r27-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4420879, branch:git_oc-mr1-release-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 18 19:01:05 2018.-->
-				<sdk:size>54449983</sdk:size>
-				<sdk:checksum type="sha1">8a2e6c1bcd845844523a68aa17e5442f0dce328c</sdk:checksum>
-				<sdk:url>build-tools_r26.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 11:11:32 2018.-->
-				<sdk:size>53839758</sdk:size>
-				<sdk:checksum type="sha1">5bb90ed935d99e5bc90686f43b852e68c5ad40df</sdk:checksum>
-				<sdk:url>build-tools_r26.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 23:32:18 2018.-->
-				<sdk:size>55170919</sdk:size>
-				<sdk:checksum type="sha1">460e511a9616b4661cc8dba0102d9d990ae60160</sdk:checksum>
-				<sdk:url>build-tools_r26.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4355572, branch:git_oc-mr1-release-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 23 14:33:19 2018.-->
-				<sdk:size>54440678</sdk:size>
-				<sdk:checksum type="sha1">5b2b7b66c7bf2151f2af183b5b50a17808850592</sdk:checksum>
-				<sdk:url>build-tools_r26.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun  6 07:17:54 2018.-->
-				<sdk:size>53830573</sdk:size>
-				<sdk:checksum type="sha1">d9ed7c7f149ce38be5dc08979aea8acec1459ca0</sdk:checksum>
-				<sdk:url>build-tools_r26.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 07:41:38 2018.-->
-				<sdk:size>55161474</sdk:size>
-				<sdk:checksum type="sha1">39ca02d3faa49859cd9d1bc0adc2f331017b699b</sdk:checksum>
-				<sdk:url>build-tools_r26.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4187382, branch:git_oc-release-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 18:48:52 2018.-->
-				<sdk:size>54113329</sdk:size>
-				<sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum>
-				<sdk:url>build-tools_r26.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 12:42:53 2018.-->
-				<sdk:size>53266653</sdk:size>
-				<sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum>
-				<sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 10:41:28 2018.-->
-				<sdk:size>54936185</sdk:size>
-				<sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum>
-				<sdk:url>build-tools_r26.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 02:59:29 2018.-->
-				<sdk:size>53854197</sdk:size>
-				<sdk:checksum type="sha1">1cbe72929876f8a872ab1f1b1040a9f720261f59</sdk:checksum>
-				<sdk:url>build-tools_r26-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 20:38:32 2018.-->
-				<sdk:size>53010814</sdk:size>
-				<sdk:checksum type="sha1">d01a1aeca03747245f1f5936b3cb01759c66d086</sdk:checksum>
-				<sdk:url>build-tools_r26-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May 31 06:40:23 2018.-->
-				<sdk:size>54681641</sdk:size>
-				<sdk:checksum type="sha1">896ebd31117c09db220f7a3116cc0e5121c78b9d</sdk:checksum>
-				<sdk:url>build-tools_r26-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:4004883, branch:git_oc-preview2-sdk-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-			<sdk:preview>2</sdk:preview>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue May 22 14:01:05 2018.-->
-				<sdk:size>53847560</sdk:size>
-				<sdk:checksum type="sha1">629bbd8d2e415bf64871fb0b4c0540fd6d0347a0</sdk:checksum>
-				<sdk:url>build-tools_r26-rc2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 08:16:12 2018.-->
-				<sdk:size>53003874</sdk:size>
-				<sdk:checksum type="sha1">cb1eb738a1f7003025af267a9b8cc2d259533c70</sdk:checksum>
-				<sdk:url>build-tools_r26-rc2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 18 00:43:07 2018.-->
-				<sdk:size>54678375</sdk:size>
-				<sdk:checksum type="sha1">ddaba77db0557a98f6330fbd579ad0bd12cbb152</sdk:checksum>
-				<sdk:url>build-tools_r26-rc2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3821161, branch:git_oc-preview-release-->
-		<sdk:revision>
-			<sdk:major>26</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-			<sdk:preview>1</sdk:preview>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 22:43:40 2018.-->
-				<sdk:size>53648603</sdk:size>
-				<sdk:checksum type="sha1">8cd6388dc96db2d7a49d06159cf990d3bbc78d04</sdk:checksum>
-				<sdk:url>build-tools_r26-rc1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 18:41:58 2018.-->
-				<sdk:size>52821129</sdk:size>
-				<sdk:checksum type="sha1">5c5a1de7d5f4f000d36ae349229fe0be846d6137</sdk:checksum>
-				<sdk:url>build-tools_r26-rc1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 12:23:48 2018.-->
-				<sdk:size>54379108</sdk:size>
-				<sdk:checksum type="sha1">43c2ddad3b67a5c33712ae14331a60673e69be91</sdk:checksum>
-				<sdk:url>build-tools_r26-rc1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3907386, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>25</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 10:03:34 2018.-->
-				<sdk:size>50757258</sdk:size>
-				<sdk:checksum type="sha1">db95f3a0ae376534d4d69f4cdb6fad20649f3509</sdk:checksum>
-				<sdk:url>build-tools_r25.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 17:57:45 2018.-->
-				<sdk:size>50545085</sdk:size>
-				<sdk:checksum type="sha1">160d2fefb5ce68e443427fc30a793a703b63e26e</sdk:checksum>
-				<sdk:url>build-tools_r25.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 16:26:03 2018.-->
-				<sdk:size>51337442</sdk:size>
-				<sdk:checksum type="sha1">1edcb109ae5133aebfed573cf0bc84e0c353c28d</sdk:checksum>
-				<sdk:url>build-tools_r25.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>25</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 09:54:19 2018.-->
-				<sdk:size>49880329</sdk:size>
-				<sdk:checksum type="sha1">ff953c0177e317618fda40516f3e9d95fd43c7ae</sdk:checksum>
-				<sdk:url>build-tools_r25.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 29 08:01:46 2018.-->
-				<sdk:size>49667185</sdk:size>
-				<sdk:checksum type="sha1">12a5204bb3b6e39437535469fde7ddf42da46b16</sdk:checksum>
-				<sdk:url>build-tools_r25.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun  7 23:11:35 2018.-->
-				<sdk:size>50458908</sdk:size>
-				<sdk:checksum type="sha1">2fee3c0704d6ecc480570450d8b8069b2c4a2dd4</sdk:checksum>
-				<sdk:url>build-tools_r25.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>25</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri May 25 11:51:28 2018.-->
-				<sdk:size>49880178</sdk:size>
-				<sdk:checksum type="sha1">ff063d252ab750d339f5947d06ff782836f22bac</sdk:checksum>
-				<sdk:url>build-tools_r25.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon May 21 03:26:16 2018.-->
-				<sdk:size>49667353</sdk:size>
-				<sdk:checksum type="sha1">7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f</sdk:checksum>
-				<sdk:url>build-tools_r25.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed May 30 20:26:28 2018.-->
-				<sdk:size>50458759</sdk:size>
-				<sdk:checksum type="sha1">c6c61393565ccf46349e7f44511e5db7c1c6169d</sdk:checksum>
-				<sdk:url>build-tools_r25.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3359293, branch:git_nyc-mr1-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>25</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 08:35:42 2018.-->
-				<sdk:size>49872921</sdk:size>
-				<sdk:checksum type="sha1">f2bbda60403e75cabd0f238598c3b4dfca56ea44</sdk:checksum>
-				<sdk:url>build-tools_r25-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 22:55:37 2018.-->
-				<sdk:size>49659466</sdk:size>
-				<sdk:checksum type="sha1">273c5c29a65cbed00e44f3aa470bbd7dce556606</sdk:checksum>
-				<sdk:url>build-tools_r25-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  1 02:28:01 2018.-->
-				<sdk:size>50451378</sdk:size>
-				<sdk:checksum type="sha1">f9258f2308ff8b62cfc4513d40cb961612d07b6a</sdk:checksum>
-				<sdk:url>build-tools_r25-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3303571, branch:git_nyc-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>24</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 09:52:06 2018.-->
-				<sdk:size>49779151</sdk:size>
-				<sdk:checksum type="sha1">9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304</sdk:checksum>
-				<sdk:url>build-tools_r24.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 22 10:05:55 2018.-->
-				<sdk:size>49568967</sdk:size>
-				<sdk:checksum type="sha1">a01c15f1b105c34595681075e1895d58b3fff48c</sdk:checksum>
-				<sdk:url>build-tools_r24.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May 17 23:44:20 2018.-->
-				<sdk:size>50354788</sdk:size>
-				<sdk:checksum type="sha1">8b960d693fd4163caeb8dc5f5f5f80b10987089c</sdk:checksum>
-				<sdk:url>build-tools_r24.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
-		<sdk:revision>
-			<sdk:major>24</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 23:52:09 2018.-->
-				<sdk:size>48936295</sdk:size>
-				<sdk:checksum type="sha1">f199a7a788c3fefbed102eea34d6007737b803cf</sdk:checksum>
-				<sdk:url>build-tools_r24.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 05:11:05 2018.-->
-				<sdk:size>48726190</sdk:size>
-				<sdk:checksum type="sha1">8bb8fc575477491d5957de743089df412de55cda</sdk:checksum>
-				<sdk:url>build-tools_r24.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 23:26:15 2018.-->
-				<sdk:size>49512513</sdk:size>
-				<sdk:checksum type="sha1">09586a1f1c39bcfa7db5205c9a07837247deb67e</sdk:checksum>
-				<sdk:url>build-tools_r24.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:3208200, branch:git_nyc-dev-->
-		<sdk:revision>
-			<sdk:major>24</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 28 07:24:53 2018.-->
-				<sdk:size>48936286</sdk:size>
-				<sdk:checksum type="sha1">84f18c392919a074fcbb9b1d967984e6b2fef8b4</sdk:checksum>
-				<sdk:url>build-tools_r24.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 02:41:05 2018.-->
-				<sdk:size>48726085</sdk:size>
-				<sdk:checksum type="sha1">5c6457fcdfa07724fb086d8ff4e8316fc0742848</sdk:checksum>
-				<sdk:url>build-tools_r24.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 21:59:52 2018.-->
-				<sdk:size>49511883</sdk:size>
-				<sdk:checksum type="sha1">ac4a7cea42c3ef74d7fbf1b992fad311c550034e</sdk:checksum>
-				<sdk:url>build-tools_r24.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:2964546, branch:git_nyc-preview-release-->
-		<sdk:revision>
-			<sdk:major>24</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 31 15:18:44 2018.-->
-				<sdk:size>48960919</sdk:size>
-				<sdk:checksum type="sha1">c6271c4d78a5612ea6c7150688bcd5b7313de8d1</sdk:checksum>
-				<sdk:url>build-tools_r24-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 20:05:01 2018.-->
-				<sdk:size>48747930</sdk:size>
-				<sdk:checksum type="sha1">97fc4ed442f23989cc488d02c1d1de9bdde241de</sdk:checksum>
-				<sdk:url>build-tools_r24-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 15:13:01 2018.-->
-				<sdk:size>49535326</sdk:size>
-				<sdk:checksum type="sha1">dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7</sdk:checksum>
-				<sdk:url>build-tools_r24-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:2355899, branch:git_mnc-dev-->
-		<sdk:revision>
-			<sdk:major>23</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 19 00:00:21 2018.-->
-				<sdk:size>39071201</sdk:size>
-				<sdk:checksum type="sha1">8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3</sdk:checksum>
-				<sdk:url>build-tools_r23.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun May 27 14:18:27 2018.-->
-				<sdk:size>38060914</sdk:size>
-				<sdk:checksum type="sha1">482c4cbceef8ff58aefd92d8155a38610158fdaf</sdk:checksum>
-				<sdk:url>build-tools_r23.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 18 16:23:02 2018.-->
-				<sdk:size>38217626</sdk:size>
-				<sdk:checksum type="sha1">fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96</sdk:checksum>
-				<sdk:url>build-tools_r23.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:2679779, branch:git_mnc-dev-->
-		<sdk:revision>
-			<sdk:major>23</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 12:39:27 2018.-->
-				<sdk:size>40733174</sdk:size>
-				<sdk:checksum type="sha1">368f2600feac7e9b511b82f53d1f2240ae4a91a3</sdk:checksum>
-				<sdk:url>build-tools_r23.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 14:28:55 2018.-->
-				<sdk:size>39679533</sdk:size>
-				<sdk:checksum type="sha1">fbc98cd303fd15a31d472de6c03bd707829f00b0</sdk:checksum>
-				<sdk:url>build-tools_r23.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 16:05:42 2018.-->
-				<sdk:size>39869945</sdk:size>
-				<sdk:checksum type="sha1">c6d8266c6a3243c8f1e41b786c0e3cee4c781263</sdk:checksum>
-				<sdk:url>build-tools_r23.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:2201634, branch:git_mnc-sdk-release-->
-		<sdk:revision>
-			<sdk:major>23</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 17 12:24:05 2018.-->
-				<sdk:size>39069295</sdk:size>
-				<sdk:checksum type="sha1">b6ba7c399d5fa487d95289d8832e4ad943aed556</sdk:checksum>
-				<sdk:url>build-tools_r23.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 04:52:07 2018.-->
-				<sdk:size>38059328</sdk:size>
-				<sdk:checksum type="sha1">d96ec1522721e9a179ae2c591c99f75d31d39718</sdk:checksum>
-				<sdk:url>build-tools_r23.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 01:11:05 2018.-->
-				<sdk:size>38558889</sdk:size>
-				<sdk:checksum type="sha1">cc1d37231d228f7a6f130e1f8d8c940052f0f8ab</sdk:checksum>
-				<sdk:url>build-tools_r23.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:2166767, branch:git_mnc-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>23</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 10:17:50 2018.-->
-				<sdk:size>39080519</sdk:size>
-				<sdk:checksum type="sha1">c1d6209212b01469f80fa804e0c1d39a06bc9060</sdk:checksum>
-				<sdk:url>build-tools_r23-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 23:09:27 2018.-->
-				<sdk:size>38070540</sdk:size>
-				<sdk:checksum type="sha1">90ba6e716f7703a236cd44b2e71c5ff430855a03</sdk:checksum>
-				<sdk:url>build-tools_r23-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 19 18:49:10 2018.-->
-				<sdk:size>38570715</sdk:size>
-				<sdk:checksum type="sha1">3874948f35f2f8946597679cc6e9151449f23b5d</sdk:checksum>
-				<sdk:url>build-tools_r23-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1793126, branch:git_lmp-mr1-sdk-release-->
-		<sdk:revision>
-			<sdk:major>22</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 19:03:49 2018.-->
-				<sdk:size>33104577</sdk:size>
-				<sdk:checksum type="sha1">da8b9c5c3ede39298e6cf0283c000c2ee9029646</sdk:checksum>
-				<sdk:url>build-tools_r22.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 09:42:44 2018.-->
-				<sdk:size>33646102</sdk:size>
-				<sdk:checksum type="sha1">53dad7f608e01d53b17176ba11165acbfccc5bbf</sdk:checksum>
-				<sdk:url>build-tools_r22.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 09:57:53 2018.-->
-				<sdk:size>33254137</sdk:size>
-				<sdk:checksum type="sha1">61d8cbe069d9e0a57872a83e5e5abe164b7d52cf</sdk:checksum>
-				<sdk:url>build-tools_r22.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1764203, branch:git_lmp-mr1-sdk-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>22</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 05:04:37 2018.-->
-				<sdk:size>33104280</sdk:size>
-				<sdk:checksum type="sha1">a8a1619dd090e44fac957bce6842e62abf87965b</sdk:checksum>
-				<sdk:url>build-tools_r22-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 11:13:48 2018.-->
-				<sdk:size>33646090</sdk:size>
-				<sdk:checksum type="sha1">af95429b24088d704bc5db9bd606e34ac1b82c0d</sdk:checksum>
-				<sdk:url>build-tools_r22-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 26 03:19:55 2018.-->
-				<sdk:size>33254114</sdk:size>
-				<sdk:checksum type="sha1">08fcca41e81b172bd9f570963b90d3a84929e043</sdk:checksum>
-				<sdk:url>build-tools_r22-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1635773, branch:git_lmp-sdk-release-->
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 11:02:29 2018.-->
-				<sdk:size>32637678</sdk:size>
-				<sdk:checksum type="sha1">5e35259843bf2926113a38368b08458735479658</sdk:checksum>
-				<sdk:url>build-tools_r21.1.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 29 13:57:42 2018.-->
-				<sdk:size>33152878</sdk:size>
-				<sdk:checksum type="sha1">e7c906b4ba0eea93b32ba36c610dbd6b204bff48</sdk:checksum>
-				<sdk:url>build-tools_r21.1.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 29 12:10:34 2018.-->
-				<sdk:size>32792587</sdk:size>
-				<sdk:checksum type="sha1">1d944759c47f60e634d2b8a1f3a4259be2f8d652</sdk:checksum>
-				<sdk:url>build-tools_r21.1.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1559046, branch:git_lmp-sdk-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 21:41:00 2018.-->
-				<sdk:size>32642454</sdk:size>
-				<sdk:checksum type="sha1">1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d</sdk:checksum>
-				<sdk:url>build-tools_r21.1.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon May 28 13:35:06 2018.-->
-				<sdk:size>33157676</sdk:size>
-				<sdk:checksum type="sha1">836a146eab0504aa9387a5132e986fe7c7381571</sdk:checksum>
-				<sdk:url>build-tools_r21.1.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 17:16:57 2018.-->
-				<sdk:size>32797356</sdk:size>
-				<sdk:checksum type="sha1">53fc4201237f899d5cd92f0b76ad41fb89da188b</sdk:checksum>
-				<sdk:url>build-tools_r21.1.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1552913, branch:git_lmp-sdk-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 23:37:47 2018.-->
-				<sdk:size>32642820</sdk:size>
-				<sdk:checksum type="sha1">b7455e543784d52a8925f960bc880493ed1478cb</sdk:checksum>
-				<sdk:url>build-tools_r21.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun  3 03:22:22 2018.-->
-				<sdk:size>33158159</sdk:size>
-				<sdk:checksum type="sha1">df619356c2359aa5eacdd48699d15b335d9bd246</sdk:checksum>
-				<sdk:url>build-tools_r21.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 10:53:39 2018.-->
-				<sdk:size>32797810</sdk:size>
-				<sdk:checksum type="sha1">c79d63ac6b713a1e326ad4dae43f2ee76708a2f4</sdk:checksum>
-				<sdk:url>build-tools_r21.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1532339, branch:git_lmp-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 15:43:32 2018.-->
-				<sdk:size>22153122</sdk:size>
-				<sdk:checksum type="sha1">e1236ab8897b62b57414adcf04c132567b2612a5</sdk:checksum>
-				<sdk:url>build-tools_r21.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 08:07:31 2018.-->
-				<sdk:size>22668597</sdk:size>
-				<sdk:checksum type="sha1">f17471c154058f3734729ef3cc363399b1cd3de1</sdk:checksum>
-				<sdk:url>build-tools_r21.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 04:34:43 2018.-->
-				<sdk:size>22306371</sdk:size>
-				<sdk:checksum type="sha1">37496141b23cbe633167927b7abe6e22d9f1a1c1</sdk:checksum>
-				<sdk:url>build-tools_r21.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1525922, branch:git_lmp-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 21 01:06:40 2018.-->
-				<sdk:size>22153013</sdk:size>
-				<sdk:checksum type="sha1">e573069eea3e5255e7a65bedeb767f4fd0a5f49a</sdk:checksum>
-				<sdk:url>build-tools_r21.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat Jun  9 12:04:35 2018.-->
-				<sdk:size>22668616</sdk:size>
-				<sdk:checksum type="sha1">b60c8f9b810c980abafa04896706f3911be1ade7</sdk:checksum>
-				<sdk:url>build-tools_r21.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun 11 17:48:54 2018.-->
-				<sdk:size>22306243</sdk:size>
-				<sdk:checksum type="sha1">d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df</sdk:checksum>
-				<sdk:url>build-tools_r21.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1521886, branch:git_lmp-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>21</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 23:16:22 2018.-->
-				<sdk:size>22153145</sdk:size>
-				<sdk:checksum type="sha1">4933328fdeecbd554a29528f254f4993468e1cf4</sdk:checksum>
-				<sdk:url>build-tools_r21-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 10:47:41 2018.-->
-				<sdk:size>22668456</sdk:size>
-				<sdk:checksum type="sha1">9bef7989b51436bd4e5114d8a0330359f077cbfa</sdk:checksum>
-				<sdk:url>build-tools_r21-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 08:31:36 2018.-->
-				<sdk:size>22306371</sdk:size>
-				<sdk:checksum type="sha1">5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32</sdk:checksum>
-				<sdk:url>build-tools_r21-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1246132, branch:git_klp-modular-release-->
-		<sdk:revision>
-			<sdk:major>20</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 04:41:59 2018.-->
-				<sdk:size>21445463</sdk:size>
-				<sdk:checksum type="sha1">b688905526a5584d1327a662d871a635ff502758</sdk:checksum>
-				<sdk:url>build-tools_r20-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun  7 14:45:22 2018.-->
-				<sdk:size>21650508</sdk:size>
-				<sdk:checksum type="sha1">1240f629411c108a714c4ddd756937c7fab93f83</sdk:checksum>
-				<sdk:url>build-tools_r20-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 07:14:07 2018.-->
-				<sdk:size>20828006</sdk:size>
-				<sdk:checksum type="sha1">cf20720e452b642d5eb59dabe05c0c729b36ec75</sdk:checksum>
-				<sdk:url>build-tools_r20-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1153987, branch:git_klp-sdk-release-->
-		<sdk:revision>
-			<sdk:major>19</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 21 21:37:00 2018.-->
-				<sdk:size>21490972</sdk:size>
-				<sdk:checksum type="sha1">1ff20ac15fa47a75d00346ec12f180d531b3ca89</sdk:checksum>
-				<sdk:url>build-tools_r19.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 29 05:26:30 2018.-->
-				<sdk:size>21590160</sdk:size>
-				<sdk:checksum type="sha1">0d11aae3417de1efb4b9a0e0a7855904a61bcec1</sdk:checksum>
-				<sdk:url>build-tools_r19.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  1 00:37:10 2018.-->
-				<sdk:size>20812533</sdk:size>
-				<sdk:checksum type="sha1">13b367fbdbff8132cb4356f716e8dc8a8df745c5</sdk:checksum>
-				<sdk:url>build-tools_r19.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1035858, branch:git_klp-sdk-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>19</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>3</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat May 26 14:59:05 2018.-->
-				<sdk:size>21462150</sdk:size>
-				<sdk:checksum type="sha1">c2d6055478e9d2d4fba476ee85f99181ddd1160c</sdk:checksum>
-				<sdk:url>build-tools_r19.0.3-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun May 20 19:28:53 2018.-->
-				<sdk:size>21563992</sdk:size>
-				<sdk:checksum type="sha1">651cf8754373b2d52e7f6aab2c52eabffe4e9ea4</sdk:checksum>
-				<sdk:url>build-tools_r19.0.3-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 12:26:28 2018.-->
-				<sdk:size>20730715</sdk:size>
-				<sdk:checksum type="sha1">cb46b433b67a0a6910ff00db84be8b527ea3102f</sdk:checksum>
-				<sdk:url>build-tools_r19.0.3-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:1009316, branch:git_klp-sdk-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>19</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 07:15:16 2018.-->
-				<sdk:size>21352552</sdk:size>
-				<sdk:checksum type="sha1">a03a6bdea0091aea32e1b35b90a7294c9f04e3dd</sdk:checksum>
-				<sdk:url>build-tools_r19.0.2-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 06:24:09 2018.-->
-				<sdk:size>21453726</sdk:size>
-				<sdk:checksum type="sha1">145bc43065d45f756d99d87329d899052b9a9288</sdk:checksum>
-				<sdk:url>build-tools_r19.0.2-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sat May 19 22:57:09 2018.-->
-				<sdk:size>20621117</sdk:size>
-				<sdk:checksum type="sha1">af664672d0d709c9ae30937b1062317d3ade7f95</sdk:checksum>
-				<sdk:url>build-tools_r19.0.2-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:938007, branch:git_klp-dev-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>19</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 09:30:45 2018.-->
-				<sdk:size>21229048</sdk:size>
-				<sdk:checksum type="sha1">18d2312dc4368858914213087f4e61445aca4517</sdk:checksum>
-				<sdk:url>build-tools_r19.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 19:07:47 2018.-->
-				<sdk:size>21450597</sdk:size>
-				<sdk:checksum type="sha1">efaf50fb19a3edb8d03efbff76f89a249ad2920b</sdk:checksum>
-				<sdk:url>build-tools_r19.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 05:45:57 2018.-->
-				<sdk:size>20500648</sdk:size>
-				<sdk:checksum type="sha1">5ef422bac5b28f4ced108319ed4a6bc7050a6234</sdk:checksum>
-				<sdk:url>build-tools_r19.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:886418, branch:git_klp-release-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>19</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed May 30 04:04:22 2018.-->
-				<sdk:size>21339943</sdk:size>
-				<sdk:checksum type="sha1">55c1a6cf632e7d346f0002b275ec41fd3137fd83</sdk:checksum>
-				<sdk:url>build-tools_r19-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun 15 01:37:33 2018.-->
-				<sdk:size>21441270</sdk:size>
-				<sdk:checksum type="sha1">86ec1c12db1bc446b7bcaefc5cc14eb361044e90</sdk:checksum>
-				<sdk:url>build-tools_r19-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Wed Jun  6 05:47:57 2018.-->
-				<sdk:size>20611447</sdk:size>
-				<sdk:checksum type="sha1">6edf505c20f5ece9c48fa0aff9a90488f9654d52</sdk:checksum>
-				<sdk:url>build-tools_r19-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:867478, branch:git_jb-mr2-dev-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>18</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu May 24 00:01:04 2018.-->
-				<sdk:size>20229760</sdk:size>
-				<sdk:checksum type="sha1">68c9acbfc0cec2d51b19efaed39831a17055d998</sdk:checksum>
-				<sdk:url>build-tools_r18.1.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue May 22 07:45:01 2018.-->
-				<sdk:size>20452157</sdk:size>
-				<sdk:checksum type="sha1">a9d9d37f6ddf859e57abc78802a77aaa166e48d4</sdk:checksum>
-				<sdk:url>build-tools_r18.1.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun May 27 16:32:56 2018.-->
-				<sdk:size>19660000</sdk:size>
-				<sdk:checksum type="sha1">c4605066e2f851387ea70bc1442b1968bd7b4a15</sdk:checksum>
-				<sdk:url>build-tools_r18.1.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:819563, branch:git_jb-mr2-dev-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>18</sdk:major>
-			<sdk:minor>1</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Jun  4 05:17:04 2018.-->
-				<sdk:size>20229298</sdk:size>
-				<sdk:checksum type="sha1">f314a0599e51397f0886fe888b50dd98f2f050d8</sdk:checksum>
-				<sdk:url>build-tools_r18.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Sun Jun 17 12:29:46 2018.-->
-				<sdk:size>20451524</sdk:size>
-				<sdk:checksum type="sha1">16ddb299b8b43063e5bb3387ec17147c5053dfd8</sdk:checksum>
-				<sdk:url>build-tools_r18.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 15:56:37 2018.-->
-				<sdk:size>19659547</sdk:size>
-				<sdk:checksum type="sha1">3a9810fc8559ab03c09378f07531e8cae2f1db30</sdk:checksum>
-				<sdk:url>build-tools_r18.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:754669, branch:git_jb-mr2-dev-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>18</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun Jun 10 13:17:31 2018.-->
-				<sdk:size>16627330</sdk:size>
-				<sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum>
-				<sdk:url>build-tools_r18.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Mon May 21 16:08:02 2018.-->
-				<sdk:size>16633121</sdk:size>
-				<sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum>
-				<sdk:url>build-tools_r18.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  1 08:16:51 2018.-->
-				<sdk:size>15413527</sdk:size>
-				<sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum>
-				<sdk:url>build-tools_r18.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:build-tool>
-		<!--Generated from bid:673949, branch:git_jb-mr1.1-dev-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>17</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun  2 14:13:23 2018.-->
-				<sdk:size>11696007</sdk:size>
-				<sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum>
-				<sdk:url>build-tools_r17-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Jun 19 09:33:42 2018.-->
-				<sdk:size>12208114</sdk:size>
-				<sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum>
-				<sdk:url>build-tools_r17-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Jun  8 13:26:17 2018.-->
-				<sdk:size>11004914</sdk:size>
-				<sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum>
-				<sdk:url>build-tools_r17-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:build-tool>
-	<sdk:platform-tool>
-		<!--Generated from bid:4986621, branch:aosp-sdk-release-->
-		<sdk:revision>
-			<sdk:major>28</sdk:major>
-			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Aug 31 09:51:45 2018.-->
-				<sdk:size>6848749</sdk:size>
-				<sdk:checksum type="sha1">ed1edad4a48c27655ce98d0a5821e7296e9de145</sdk:checksum>
-				<sdk:url>platform-tools_r28.0.1-darwin.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Aug 31 09:51:40 2018.-->
-				<sdk:size>6843966</sdk:size>
-				<sdk:checksum type="sha1">74ff83bc203f01c4f04bd9316ab5a2573f023fd1</sdk:checksum>
-				<sdk:url>platform-tools_r28.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Fri Aug 31 09:51:43 2018.-->
-				<sdk:size>6183783</sdk:size>
-				<sdk:checksum type="sha1">5a44d10d41725aa718c71b6e44bc2dea6f1a7f49</sdk:checksum>
-				<sdk:url>platform-tools_r28.0.1-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:platform-tool>
-	<sdk:tool>
-		<!--Generated from bid:3567187, branch:aosp-emu-2.2-release-->
-		<sdk:revision>
-			<sdk:major>25</sdk:major>
-			<sdk:minor>2</sdk:minor>
-			<sdk:micro>5</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon May 21 14:06:04 2018.-->
-				<sdk:size>277894900</sdk:size>
-				<sdk:checksum type="sha1">72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1</sdk:checksum>
-				<sdk:url>tools_r25.2.5-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu May 31 17:55:03 2018.-->
-				<sdk:size>200529982</sdk:size>
-				<sdk:checksum type="sha1">d2168d963ac5b616e3d3ddaf21511d084baf3659</sdk:checksum>
-				<sdk:url>tools_r25.2.5-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Thu Jun  7 09:09:48 2018.-->
-				<sdk:size>306785944</sdk:size>
-				<sdk:checksum type="sha1">a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca</sdk:checksum>
-				<sdk:url>tools_r25.2.5-windows.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:min-platform-tools-rev>
-			<sdk:major>20</sdk:major>
-		</sdk:min-platform-tools-rev>
-	</sdk:tool>
-	<sdk:doc>
-		<!--Generated from bid:3249234, branch:git_nyc-emu-release-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jun 14 09:35:24 2018.-->
-				<sdk:size>419477967</sdk:size>
-				<sdk:checksum type="sha1">eef58238949ee9544876cb3e002f2d58e4ee7b5d</sdk:checksum>
-				<sdk:url>docs-24_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-	</sdk:doc>
-</sdk:sdk-repository>
diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix
deleted file mode 100644
index cca132e2774..00000000000
--- a/pkgs/development/mobile/androidenv/sources.nix
+++ /dev/null
@@ -1,184 +0,0 @@
-
-# This file is generated from generate-sources.sh. DO NOT EDIT.
-# Execute generate-sources.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSource = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-
-  source_14 = buildSource {
-    name = "android-source-14";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-14_r01.zip;
-      sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555";
-    };
-    meta = {
-      description = "Source code for Android API 14";
-    };
-  };
-
-  source_15 = buildSource {
-    name = "android-source-15";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-15_r02.zip;
-      sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa";
-    };
-    meta = {
-      description = "Source code for Android API 15";
-    };
-  };
-
-  source_16 = buildSource {
-    name = "android-source-16";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-16_r02.zip;
-      sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84";
-    };
-    meta = {
-      description = "Source code for Android API 16";
-    };
-  };
-
-  source_17 = buildSource {
-    name = "android-source-17";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-17_r01.zip;
-      sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a";
-    };
-    meta = {
-      description = "Source code for Android API 17";
-    };
-  };
-
-  source_18 = buildSource {
-    name = "android-source-18";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-18_r01.zip;
-      sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78";
-    };
-    meta = {
-      description = "Source code for Android API 18";
-    };
-  };
-
-  source_19 = buildSource {
-    name = "android-source-19";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-19_r02.zip;
-      sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7";
-    };
-    meta = {
-      description = "Source code for Android API 19";
-    };
-  };
-
-  source_20 = buildSource {
-    name = "android-source-20";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-20_r01.zip;
-      sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76";
-    };
-    meta = {
-      description = "Source code for Android API 20";
-    };
-  };
-
-  source_21 = buildSource {
-    name = "android-source-21";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-21_r01.zip;
-      sha1 = "137a5044915d32bea297a8c1552684802bbc2e25";
-    };
-    meta = {
-      description = "Source code for Android API 21";
-    };
-  };
-
-  source_22 = buildSource {
-    name = "android-source-22";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-22_r01.zip;
-      sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6";
-    };
-    meta = {
-      description = "Source code for Android API 22";
-    };
-  };
-
-  source_23 = buildSource {
-    name = "android-source-23";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-23_r01.zip;
-      sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2";
-    };
-    meta = {
-      description = "Source code for Android API 23";
-    };
-  };
-
-  source_24 = buildSource {
-    name = "android-source-24";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-24_r01.zip;
-      sha1 = "6b96115830a83d654479f32ce4b724ca9011148b";
-    };
-    meta = {
-      description = "Source code for Android API 24";
-    };
-  };
-
-  source_25 = buildSource {
-    name = "android-source-25";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-25_r01.zip;
-      sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
-    };
-    meta = {
-      description = "Source code for Android API 25";
-    };
-  };
-
-  source_26 = buildSource {
-    name = "android-source-26";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-26_r01.zip;
-      sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9";
-    };
-    meta = {
-      description = "Source code for Android API 26";
-    };
-  };
-
-  source_27 = buildSource {
-    name = "android-source-27";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-27_r01.zip;
-      sha1 = "7b714670561d08f54751af42aca929867b806596";
-    };
-    meta = {
-      description = "Source code for Android API 27";
-    };
-  };
-
-  source_28 = buildSource {
-    name = "android-source-28";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sources-28_r01.zip;
-      sha1 = "5610e0c24235ee3fa343c899ddd551be30315255";
-    };
-    meta = {
-      description = "Source code for Android API 28";
-    };
-  };
-
-}
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
deleted file mode 100644
index 55c1b60e965..00000000000
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation rec {
-  version = "47";
-  name = "android-support-repository-r${version}";
-  src = fetchurl {
-    url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
-    sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3";
-  };
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-  '';
-
-  buildInputs = [ unzip ];
-}
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
deleted file mode 100644
index 8198e96f7e7..00000000000
--- a/pkgs/development/mobile/androidenv/support.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation rec {
-  version = "23.2.1";
-  name = "android-support-r${version}";
-  src = fetchurl {
-    url = "https://dl.google.com/android/repository/support_r${version}.zip";
-    sha1 = "azl7hgps1k98kmbhw45wwbrc86y1n4j1";
-  };
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-  '';
-  
-  buildInputs = [ unzip ];
-}
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
deleted file mode 100644
index d7c8dd9de9b..00000000000
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ /dev/null
@@ -1,1026 +0,0 @@
-<?xml version="1.0" ?>
-<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2018-09-27 12:07:51.414125 with ADRT.-->
-	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
-
-This is the Android Software Development Kit License Agreement
-
-1. Introduction
-
-1.1 The Android Software Development Kit (referred to in the License Agreement as the &quot;SDK&quot; and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 A &quot;compatible implementation&quot; means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).
-
-1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-
-2. Accepting the License Agreement
-
-2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
-
-2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-
-
-3. SDK License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.
-
-3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.
-
-3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement.  Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
-
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
-
-3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-
-4. Use of the SDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
-
-
-7. Third Party Applications
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.
-
-
-8. Using Android APIs
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-
-9. Terminating the License Agreement
-
-9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement with you if:
-(A) you have breached any provision of the License Agreement; or
-(B) Google is required to do so by law; or
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
-(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
-
-9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.
-
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
-
-
-14. General Legal Terms
-
-14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-
-November 20, 2015</sdk:license>
-	<sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions.
-As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk.  The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data.
-
-This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
-
-1. Introduction
-
-1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview.
-
-1.2 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
-
-1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting the License Agreement
-
-2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement.
-
-2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
-
-2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview.
-
-2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity.
-
-3. Preview License from Google
-
-3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform.
-
-3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview.
-
-3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview.
-
-3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.
-
-3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you.
-
-3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview.
-
-4. Use of the Preview by You
-
-4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
-
-4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected.
-
-6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/.
-
-7. Third Party Applications
-
-7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party.
-
-8. Using Google APIs
-
-8.1 Google APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-
-9. Terminating the License Agreement
-
-9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
-
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials.
-
-9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
-
-9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
-(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and
-(B) Google issues a final release version of the Android SDK.
-
-9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely.
-
-10. DISCLAIMERS
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available.
-
-14. General Legal Terms
-
-14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google.
-
-14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-June 2014.</sdk:license>
-	<sdk:license id="intel-android-sysimage-license" type="text">Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK)
-This Internal Evaluation License Agreement (this &quot;Agreement&quot;) is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.
-
-Definitions.
-These terms shall have the following meanings:
-
-&quot;Intel&quot; or &quot;INTEL&quot;
-Intel Corporation
-With an Address of:
-2200 Mission College Blvd.
-Santa Clara, CA 95052
-Office of the General Counsel
-Mail Stop: RNB-4-51
-Attn: Software and Services Group Legal
-
-&quot;Evaluation Software&quot;
-The x86 Android* emulator system images for Android  Software Development Kit (SDK), as provided by Intel.
-
-INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS
-
-1. DEFINITIONS.
-
-1.1 Additional Defined Terms. &quot;Agreement&quot;, &quot;Evaluation Software&quot;,  &quot;Intel&quot;, &quot;Non-disclosure Agreement&quot;, &quot;Recipient&quot;, and &quot;Effective Date&quot; shall have the meanings ascribed to them on the signature page(s) of this Agreement.
-
-1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.
-
-1.3 &quot;Open Source Software&quot; means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
-
-1.4 &quot;Pre-Release Materials&quot; means &quot;alpha&quot; or &quot;beta&quot; designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.
-
-2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials.
-THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.
-
-3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
-
-4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a &quot;Release&quot;) the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form.
-EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.
-
-5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
-
-6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.
-
-7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
-
-8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.
-
-9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.
-
-10. GENERAL.
-
-10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
-
-10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.
-
-10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
-
-10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all &quot;click-to-accept&quot; or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.
-
-10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.
-
-10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is &quot;deemed&quot; to take place when information is released to a foreign national wherever located.
-
-10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
-
-10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
-ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS</sdk:license>
-	<sdk:license id="mips-android-sysimage-license" type="text">MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK):
-This Internal Evaluation License Agreement (this &quot;Agreement&quot;) is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.
-
-By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.
-
-1. DEFINITIONS. These terms shall have the following meanings:
-
-1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085
-
-1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.
-
-1.3 “Evaluation Materials&quot; means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.
-
-1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
-
-1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.
-
-2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.
-
-THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.
-
-3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
-
-4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.
-
-
-EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.
-
-5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
-
-6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.
-
-7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.
-
-8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.
-
-9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.
-
-10. GENERAL.
-
-10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
-
-10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.
-
-10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
-
-10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.
-
-10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.
-
-10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is &quot;deemed&quot; to take place when information is released to a foreign national wherever located.
-
-10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
-
-ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.
-
-10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
-</sdk:license>
-	<sdk:system-image>
-		<!--Generated from bid:3093079, branch:git_gb-emu-release-->
-		<sdk:api-level>10</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:50:45 2018.-->
-				<sdk:size>67918042</sdk:size>
-				<sdk:checksum type="sha1">54680383118eb5c95a11e1cc2a14aa572c86ee69</sdk:checksum>
-				<sdk:url>armv7-10_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:229537, branch:git_ics-mr0-->
-		<sdk:api-level>14</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jul 26 20:46:32 2018.-->
-				<sdk:size>99621822</sdk:size>
-				<sdk:checksum type="sha1">d8991b0c06b18d7d6ed4169d67460ee1add6661b</sdk:checksum>
-				<sdk:url>sysimg_armv7a-14_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3462039, branch:git_ics-mr1-emu-release-->
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:17 2018.-->
-				<sdk:size>102079727</sdk:size>
-				<sdk:checksum type="sha1">363223bd62f5afc0b2bd760b54ce9d26b31eacf1</sdk:checksum>
-				<sdk:url>armeabi-v7a-15_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1741836, branch:git_jb-dev-->
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jul 26 16:01:22 2018.-->
-				<sdk:size>112608076</sdk:size>
-				<sdk:checksum type="sha1">39c093ea755098f0ee79f607be7df9e54ba4943f</sdk:checksum>
-				<sdk:url>sysimg_armv7a-16_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3453820, branch:git_jb-mr1.1-emu-release-->
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:02 2018.-->
-				<sdk:size>124238679</sdk:size>
-				<sdk:checksum type="sha1">7460e8110f4a87f9644f1bdb5511a66872d50fd9</sdk:checksum>
-				<sdk:url>armeabi-v7a-17_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3462034, branch:git_jb-mr2-emu-release-->
-		<sdk:api-level>18</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:09 2018.-->
-				<sdk:size>130394401</sdk:size>
-				<sdk:checksum type="sha1">0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642</sdk:checksum>
-				<sdk:url>armeabi-v7a-18_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3462041, branch:git_klp-emu-release-->
-		<sdk:api-level>19</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:25 2018.-->
-				<sdk:size>159871567</sdk:size>
-				<sdk:checksum type="sha1">d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa</sdk:checksum>
-				<sdk:url>armeabi-v7a-19_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:50:26 2018.-->
-				<sdk:size>187163871</sdk:size>
-				<sdk:checksum type="sha1">8c606f81306564b65e41303d2603e4c42ded0d10</sdk:checksum>
-				<sdk:url>armeabi-v7a-21_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:50:08 2018.-->
-				<sdk:size>194596267</sdk:size>
-				<sdk:checksum type="sha1">2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1</sdk:checksum>
-				<sdk:url>armeabi-v7a-22_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:50:36 2018.-->
-				<sdk:size>238333358</sdk:size>
-				<sdk:checksum type="sha1">7cf2ad756e54a3acfd81064b63cb0cb9dff2798d</sdk:checksum>
-				<sdk:url>armeabi-v7a-23_r06.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:51:39 2018.-->
-				<sdk:size>283677512</sdk:size>
-				<sdk:checksum type="sha1">3454546b4eed2d6c3dd06d47757d6da9f4176033</sdk:checksum>
-				<sdk:url>armeabi-v7a-24_r07.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>armeabi-v7a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>ARM 64 v8a System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:51:37 2018.-->
-				<sdk:size>384556503</sdk:size>
-				<sdk:checksum type="sha1">e8ab2e49e4efe4b064232b33b5eeaded61437d7f</sdk:checksum>
-				<sdk:url>arm64-v8a-24_r07.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>arm64-v8a</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1741836, branch:git_jb-dev-->
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>MIPS System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jul 26 16:01:28 2018.-->
-				<sdk:size>122482530</sdk:size>
-				<sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum>
-				<sdk:url>sysimg_mips-16_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="mips-android-sysimage-license"/>
-		<sdk:abi>mips</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1742939, branch:git_jb-mr1.1-dev-->
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>MIPS System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Thu Jul 26 16:01:38 2018.-->
-				<sdk:size>131781761</sdk:size>
-				<sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum>
-				<sdk:url>sysimg_mips-17_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="mips-android-sysimage-license"/>
-		<sdk:abi>mips</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3093079, branch:git_gb-emu-release-->
-		<sdk:api-level>10</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:50:47 2018.-->
-				<sdk:size>75382637</sdk:size>
-				<sdk:checksum type="sha1">655ffc5cc89dd45a3aca154b254009016e473aeb</sdk:checksum>
-				<sdk:url>x86-10_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3462039, branch:git_ics-mr1-emu-release-->
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:18 2018.-->
-				<sdk:size>115324561</sdk:size>
-				<sdk:checksum type="sha1">e45c728b64881c0e86529a8f7ea9c103a3cd14c1</sdk:checksum>
-				<sdk:url>x86-15_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4875369, branch:git_jb-emu-release-->
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jul 17 16:27:13 2018.-->
-				<sdk:size>134926152</sdk:size>
-				<sdk:checksum type="sha1">bf1bf8c5591346118d2235da1ad20e7be8a3e9cd</sdk:checksum>
-				<sdk:url>x86-16_r06.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4875371, branch:git_jb-mr1.1-emu-release-->
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jul 17 16:30:45 2018.-->
-				<sdk:size>143278662</sdk:size>
-				<sdk:checksum type="sha1">03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec</sdk:checksum>
-				<sdk:url>x86-17_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3462034, branch:git_jb-mr2-emu-release-->
-		<sdk:api-level>18</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Jul 27 08:53:12 2018.-->
-				<sdk:size>149657535</sdk:size>
-				<sdk:checksum type="sha1">03a0cb23465c3de15215934a1dbc9715b56e9458</sdk:checksum>
-				<sdk:url>x86-18_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174703, branch:git_klp-emu-release-->
-		<sdk:api-level>19</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun 13 18:42:22 2018.-->
-				<sdk:size>185886274</sdk:size>
-				<sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum>
-				<sdk:url>x86-19_r06.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue May 22 03:41:51 2018.-->
-				<sdk:size>208212529</sdk:size>
-				<sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum>
-				<sdk:url>x86-21_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 20 00:45:19 2018.-->
-				<sdk:size>214268954</sdk:size>
-				<sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum>
-				<sdk:url>x86-22_r06.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>10</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun  5 22:05:27 2018.-->
-				<sdk:size>260804863</sdk:size>
-				<sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum>
-				<sdk:url>x86-23_r10.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>8</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue May 22 10:30:01 2018.-->
-				<sdk:size>313489224</sdk:size>
-				<sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum>
-				<sdk:url>x86-24_r08.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931657, branch:git_nyc-mr1-emu-release-->
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:04:45 2018.-->
-				<sdk:size>316695942</sdk:size>
-				<sdk:checksum type="sha1">78ce7eb1387d598685633b9f7cbb300c3d3aeb5f</sdk:checksum>
-				<sdk:url>x86-25_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931640, branch:git_oc-emu-release-->
-		<sdk:api-level>26</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:05:14 2018.-->
-				<sdk:size>350195807</sdk:size>
-				<sdk:checksum type="sha1">e613d6e0da668e30daf547f3c6627a6352846f90</sdk:checksum>
-				<sdk:url>x86-26_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931629, branch:git_oc-mr1-emu-release-->
-		<sdk:api-level>27</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:05:43 2018.-->
-				<sdk:size>360984187</sdk:size>
-				<sdk:checksum type="sha1">4ec990fac7b62958decd12e18a4cd389dfe7c582</sdk:checksum>
-				<sdk:url>x86-27_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4923214, branch:git_pi-emu-release-->
-		<sdk:api-level>28</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jul 31 17:43:13 2018.-->
-				<sdk:size>437320152</sdk:size>
-				<sdk:checksum type="sha1">ce03c42d80c0fc6dc47f6455dbee7aa275d02780</sdk:checksum>
-				<sdk:url>x86-28_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
-		<sdk:api-level>21</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Wed Jun  6 04:05:38 2018.-->
-				<sdk:size>292623982</sdk:size>
-				<sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum>
-				<sdk:url>x86_64-21_r05.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>6</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sun May 27 01:45:29 2018.-->
-				<sdk:size>299976630</sdk:size>
-				<sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum>
-				<sdk:url>x86_64-22_r06.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
-		<sdk:api-level>23</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>10</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jun 12 05:59:42 2018.-->
-				<sdk:size>365009313</sdk:size>
-				<sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum>
-				<sdk:url>x86_64-23_r10.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
-		<sdk:api-level>24</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>8</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Sat Jun 16 05:29:19 2018.-->
-				<sdk:size>419261998</sdk:size>
-				<sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum>
-				<sdk:url>x86_64-24_r08.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931657, branch:git_nyc-mr1-emu-release-->
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:06:13 2018.-->
-				<sdk:size>422702097</sdk:size>
-				<sdk:checksum type="sha1">7093d7b39216020226ff430a3b7b81c94d31ad37</sdk:checksum>
-				<sdk:url>x86_64-25_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931640, branch:git_oc-emu-release-->
-		<sdk:api-level>26</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:06:52 2018.-->
-				<sdk:size>474178332</sdk:size>
-				<sdk:checksum type="sha1">432f149c048bffce7f9de526ec65b336daf7a0a3</sdk:checksum>
-				<sdk:url>x86_64-26_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4931629, branch:git_oc-mr1-emu-release-->
-		<sdk:api-level>27</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Aug  7 14:07:35 2018.-->
-				<sdk:size>491675204</sdk:size>
-				<sdk:checksum type="sha1">2878261011a59ca3de29dc5b457a495fdb268d60</sdk:checksum>
-				<sdk:url>x86_64-27_r01.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:4923214, branch:git_pi-emu-release-->
-		<sdk:api-level>28</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Jul 31 17:43:48 2018.-->
-				<sdk:size>564792723</sdk:size>
-				<sdk:checksum type="sha1">d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0</sdk:checksum>
-				<sdk:url>x86_64-28_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-		<sdk:tag-display>Default Android System Image</sdk:tag-display>
-	</sdk:system-image>
-</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
deleted file mode 100644
index 0ad09a02556..00000000000
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ /dev/null
@@ -1,305 +0,0 @@
-# This file is generated from generate-sysimages.sh. DO NOT EDIT.
-# Execute generate-sysimages.sh or fetch.sh to update the file.
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSystemImage = args:
-    stdenv.mkDerivation (args // {
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
-
-  sysimg_armeabi-v7a_10 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-10";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip;
-      sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69";
-    };
-  };
-
-  sysimg_x86_10 = buildSystemImage {
-    name = "sysimg-x86-10";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip;
-      sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb";
-    };
-  };
-
-  sysimg_armeabi-v7a_14 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-14";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
-      sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
-    };
-  };
-
-  sysimg_armeabi-v7a_15 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-15";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip;
-      sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1";
-    };
-  };
-
-  sysimg_x86_15 = buildSystemImage {
-    name = "sysimg-x86-15";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip;
-      sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1";
-    };
-  };
-
-  sysimg_armeabi-v7a_16 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-16";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
-      sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
-    };
-  };
-
-  sysimg_mips_16 = buildSystemImage {
-    name = "sysimg-mips-16";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
-      sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
-    };
-  };
-
-  sysimg_x86_16 = buildSystemImage {
-    name = "sysimg-x86-16";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip;
-      sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd";
-    };
-  };
-
-  sysimg_armeabi-v7a_17 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-17";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip;
-      sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9";
-    };
-  };
-
-  sysimg_mips_17 = buildSystemImage {
-    name = "sysimg-mips-17";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
-      sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
-    };
-  };
-
-  sysimg_x86_17 = buildSystemImage {
-    name = "sysimg-x86-17";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip;
-      sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec";
-    };
-  };
-
-  sysimg_armeabi-v7a_18 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-18";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip;
-      sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642";
-    };
-  };
-
-  sysimg_x86_18 = buildSystemImage {
-    name = "sysimg-x86-18";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip;
-      sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458";
-    };
-  };
-
-  sysimg_armeabi-v7a_19 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-19";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip;
-      sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
-    };
-  };
-
-  sysimg_x86_19 = buildSystemImage {
-    name = "sysimg-x86-19";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip;
-      sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
-    };
-  };
-
-  sysimg_armeabi-v7a_21 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-21";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip;
-      sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
-    };
-  };
-
-  sysimg_x86_21 = buildSystemImage {
-    name = "sysimg-x86-21";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip;
-      sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
-    };
-  };
-
-  sysimg_x86_64_21 = buildSystemImage {
-    name = "sysimg-x86_64-21";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip;
-      sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
-    };
-  };
-
-  sysimg_armeabi-v7a_22 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-22";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip;
-      sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
-    };
-  };
-
-  sysimg_x86_22 = buildSystemImage {
-    name = "sysimg-x86-22";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip;
-      sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
-    };
-  };
-
-  sysimg_x86_64_22 = buildSystemImage {
-    name = "sysimg-x86_64-22";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip;
-      sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
-    };
-  };
-
-  sysimg_armeabi-v7a_23 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-23";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip;
-      sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
-    };
-  };
-
-  sysimg_x86_23 = buildSystemImage {
-    name = "sysimg-x86-23";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip;
-      sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
-    };
-  };
-
-  sysimg_x86_64_23 = buildSystemImage {
-    name = "sysimg-x86_64-23";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip;
-      sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
-    };
-  };
-
-  sysimg_arm64-v8a_24 = buildSystemImage {
-    name = "sysimg-arm64-v8a-24";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip;
-      sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f";
-    };
-  };
-
-  sysimg_armeabi-v7a_24 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-24";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip;
-      sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033";
-    };
-  };
-
-  sysimg_x86_24 = buildSystemImage {
-    name = "sysimg-x86-24";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip;
-      sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
-    };
-  };
-
-  sysimg_x86_64_24 = buildSystemImage {
-    name = "sysimg-x86_64-24";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip;
-      sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
-    };
-  };
-
-  sysimg_x86_25 = buildSystemImage {
-    name = "sysimg-x86-25";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip;
-      sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f";
-    };
-  };
-
-  sysimg_x86_64_25 = buildSystemImage {
-    name = "sysimg-x86_64-25";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip;
-      sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37";
-    };
-  };
-
-  sysimg_x86_26 = buildSystemImage {
-    name = "sysimg-x86-26";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip;
-      sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90";
-    };
-  };
-
-  sysimg_x86_64_26 = buildSystemImage {
-    name = "sysimg-x86_64-26";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip;
-      sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3";
-    };
-  };
-
-  sysimg_x86_27 = buildSystemImage {
-    name = "sysimg-x86-27";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip;
-      sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582";
-    };
-  };
-
-  sysimg_x86_64_27 = buildSystemImage {
-    name = "sysimg-x86_64-27";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip;
-      sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60";
-    };
-  };
-
-  sysimg_x86_28 = buildSystemImage {
-    name = "sysimg-x86-28";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip;
-      sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780";
-    };
-  };
-
-  sysimg_x86_64_28 = buildSystemImage {
-    name = "sysimg-x86_64-28";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip;
-      sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0";
-    };
-  };
-}
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix
new file mode 100644
index 00000000000..9957168f7af
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/tools.nix
@@ -0,0 +1,26 @@
+{deployAndroidPackage, requireFile, lib, packages, toolsVersion, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
+
+if toolsVersion == "26.0.1" then import ./tools/26.nix {
+  inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
+  package = {
+    name = "tools";
+    path = "tools";
+    revision = "26.0.1";
+    archives = {
+      linux = requireFile {
+        url = https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip;
+        sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4";
+      };
+      macosx = requireFile {
+        url = https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip;
+        sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa";
+      };
+    };
+  };
+} else if toolsVersion == "26.1.1" then import ./tools/26.nix {
+  inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
+  package = packages.tools."${toolsVersion}";
+} else import ./tools/25.nix {
+  inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
+  package = packages.tools."${toolsVersion}";
+}
diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix
new file mode 100644
index 00000000000..80b5858031d
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/tools/25.nix
@@ -0,0 +1,62 @@
+{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
+
+deployAndroidPackage {
+  name = "androidsdk";
+  buildInputs = [ autoPatchelfHook makeWrapper ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
+  inherit package os;
+
+  patchInstructions = ''
+    ${lib.optionalString (os == "linux") ''
+      # Auto patch all binaries
+      addAutoPatchelfSearchPath $PWD/lib64
+      addAutoPatchelfSearchPath $PWD/lib64/libstdc++
+      addAutoPatchelfSearchPath $PWD/lib64/qt/lib
+      addAutoPatchelfSearchPath $PWD/lib
+      addAutoPatchelfSearchPath $PWD/lib/libstdc++
+      autoPatchelf .
+    ''}
+
+    # Wrap all scripts that require JAVA_HOME
+    for i in bin
+    do
+        find $i -maxdepth 1 -type f -executable | while read program
+        do
+            if grep -q "JAVA_HOME" $program
+            then
+                wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin
+            fi
+        done
+    done
+
+    # Wrap programs that require java
+    for i in draw9patch jobb lint screenshot2
+    do
+        wrapProgram $PWD/$i \
+          --prefix PATH : ${pkgs.jdk8}/bin
+    done
+
+    # Wrap programs that require java and SWT
+    for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer
+    do
+        wrapProgram $PWD/$i \
+          --prefix PATH : ${pkgs.jdk8}/bin \
+          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]}
+    done
+
+    ${lib.optionalString (os == "linux") ''
+      wrapProgram $PWD/emulator \
+        --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \
+        --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
+        --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
+    ''}
+
+    # Patch all script shebangs
+    patchShebangs .
+
+    cd ..
+    ${postInstall}
+  '';
+
+  meta.licenses = lib.licenses.unfree;
+}
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix
new file mode 100644
index 00000000000..ed1dfe3d263
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/tools/26.nix
@@ -0,0 +1,40 @@
+{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}:
+
+deployAndroidPackage {
+  name = "androidsdk";
+  inherit os package;
+  buildInputs = [ autoPatchelfHook makeWrapper ]
+    ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];
+
+  patchInstructions = ''
+    ${lib.optionalString (os == "linux") ''
+      # Auto patch all binaries
+      autoPatchelf .
+    ''}
+
+    # Wrap all scripts that require JAVA_HOME
+    for i in bin
+    do
+        find $i -maxdepth 1 -type f -executable | while read program
+        do
+            if grep -q "JAVA_HOME" $program
+            then
+                wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin
+            fi
+        done
+    done
+
+    # Wrap monitor script
+    wrapProgram $PWD/monitor \
+      --prefix PATH : ${pkgs.jdk8}/bin \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]}
+
+    # Patch all script shebangs
+    patchShebangs .
+
+    cd ..
+    ${postInstall}
+  '';
+
+  meta.licenses = lib.licenses.unfree;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 566a4d8b40a..50f7aa50778 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -827,7 +827,7 @@ in
 
   androidenv = callPackage ../development/mobile/androidenv {
     pkgs_i686 = pkgsi686Linux;
-    licenseAccepted = (config.android_sdk.accept_license or false);
+    #licenseAccepted = (config.android_sdk.accept_license or false);
   };
 
   inherit (androidenv) androidndk;

From 907216a57d1c478486d71f8b085f7019114c6fce Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 17 Nov 2018 21:55:49 +0100
Subject: [PATCH 2308/2793] Replace xcodeenv with new implementation

---
 .../development/mobile/xcodeenv/build-app.nix | 97 ++++++++++---------
 ...dewrapper.nix => compose-xcodewrapper.nix} |  6 +-
 pkgs/development/mobile/xcodeenv/default.nix  | 10 +-
 .../mobile/xcodeenv/install.html.template     |  6 +-
 .../mobile/xcodeenv/simulate-app.nix          | 59 ++++++-----
 5 files changed, 97 insertions(+), 81 deletions(-)
 rename pkgs/development/mobile/xcodeenv/{xcodewrapper.nix => compose-xcodewrapper.nix} (85%)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index d7dd2d1190d..90fa307fbf2 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -1,14 +1,13 @@
-{stdenv, xcodewrapper}:
+{stdenv, composeXcodeWrapper}:
 { name
 , src
-, sdkVersion ? "11.2"
+, sdkVersion ? "11.3"
 , target ? null
 , configuration ? null
 , scheme ? null
 , sdk ? null
 , xcodeFlags ? ""
 , release ? false
-, codeSignIdentity ? null
 , certificateFile ? null
 , certificatePassword ? null
 , provisioningProfile ? null
@@ -18,24 +17,23 @@
 , enableWirelessDistribution ? false
 , installURL ? null
 , bundleId ? null
-, version ? null
-, title ? null
-, meta ? {}
-}:
+, appVersion ? null
+, ...
+}@args:
 
-assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null;
-assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null;
+assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null;
+assert enableWirelessDistribution -> installURL != null && bundleId != null && appVersion != null;
 
 let
   # Set some default values here
-  
+
   _target = if target == null then name else target;
 
   _configuration = if configuration == null
     then
       if release then "Release" else "Debug"
     else configuration;
-    
+
   _sdk = if sdk == null
     then
       if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion
@@ -46,41 +44,45 @@ let
     security default-keychain -s login.keychain
     security delete-keychain $keychainName
   '';
+
+  xcodewrapperFormalArgs = builtins.functionArgs composeXcodeWrapper;
+  xcodewrapperArgs = builtins.intersectAttrs xcodewrapperFormalArgs args;
+  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
+
+  extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
 in
-stdenv.mkDerivation {
-  name = stdenv.lib.replaceChars [" "] [""] name;
-  inherit src;
-  inherit meta;
+stdenv.mkDerivation ({
+  name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
   buildInputs = [ xcodewrapper ];
   buildPhase = ''
     ${stdenv.lib.optionalString release ''
-        export HOME=/Users/$(whoami)
-        keychainName="$(basename $out)"
-        
-        # Create a keychain
-        security create-keychain -p "" $keychainName
-        security default-keychain -s $keychainName
-        security unlock-keychain -p "" $keychainName
-        
-        # Import the certificate into the keychain
-        security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A 
+      export HOME=/Users/$(whoami)
+      keychainName="$(basename $out)"
 
-        # Grant the codesign utility permissions to read from the keychain
-        security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
-        
-        # Determine provisioning ID
-        PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
+      # Create a keychain
+      security create-keychain -p "" $keychainName
+      security default-keychain -s $keychainName
+      security unlock-keychain -p "" $keychainName
 
-        if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
-        then
-            # Copy provisioning profile into the home directory
-            mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-            cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision"
-        fi
-        
-        # Check whether the identity can be found
-        security find-identity -p codesigning $keychainName
-      ''}
+      # Import the certificate into the keychain
+      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A 
+
+      # Grant the codesign utility permissions to read from the keychain
+      security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
+
+      # Determine provisioning ID
+      PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
+
+      if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
+      then
+          # Copy provisioning profile into the home directory
+          mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+          cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision"
+      fi
+
+      # Check whether the identity can be found
+      security find-identity -p codesigning $keychainName
+    ''}
 
     # Do the building
     export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works
@@ -116,10 +118,11 @@ stdenv.mkDerivation {
         # Add IPA to Hydra build products
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
-        
+
         ${stdenv.lib.optionalString enableWirelessDistribution ''
-          appname=$(basename $out/*.ipa .ipa)
-          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${version}\&amp;title=$appname|" ${./install.html.template} > $out/$appname.html
+          # Add another hacky build product that enables wireless adhoc installations
+          appname="$(basename "$out/*.ipa" .ipa)"
+          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${appVersion}\&amp;title=$appname|" ${./install.html.template} > $out/$appname.html
           echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
         ''}
       ''}
@@ -127,13 +130,13 @@ stdenv.mkDerivation {
         mkdir -p $out
         mv "${name}.xcarchive" $out
       ''}
-      
+
       # Delete our temp keychain
       ${deleteKeychain}
     ''}
   '';
-  
+
   failureHook = stdenv.lib.optionalString release deleteKeychain;
-  
+
   installPhase = "true";
-}
+} // extraArgs)
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
similarity index 85%
rename from pkgs/development/mobile/xcodeenv/xcodewrapper.nix
rename to pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
index 38afe86c5aa..d0093ffac91 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
@@ -1,4 +1,7 @@
-{stdenv, version, xcodeBaseDir}:
+{stdenv}:
+{version ? "9.3", xcodeBaseDir ? "/Applications/Xcode.app"}:
+
+assert stdenv.isDarwin;
 
 stdenv.mkDerivation {
   name = "xcode-wrapper-"+version;
@@ -9,6 +12,7 @@ stdenv.mkDerivation {
     ln -s /usr/bin/security
     ln -s /usr/bin/codesign
     ln -s /usr/bin/xcrun
+    ln -s /usr/bin/plutil
     ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
     ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
 
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index b3b9dbdf07a..47686e6d69e 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,15 +1,15 @@
-{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{stdenv}:
 
 rec {
-  xcodewrapper = import ./xcodewrapper.nix {
-    inherit stdenv version xcodeBaseDir;
+  composeXcodeWrapper = import ./compose-xcodewrapper.nix {
+    inherit stdenv;
   };
 
   buildApp = import ./build-app.nix {
-    inherit stdenv xcodewrapper;
+    inherit stdenv composeXcodeWrapper;
   };
 
   simulateApp = import ./simulate-app.nix {
-    inherit stdenv xcodewrapper;
+    inherit stdenv composeXcodeWrapper;
   };
 }
diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template
index 833b1994162..d48fda7f38b 100644
--- a/pkgs/development/mobile/xcodeenv/install.html.template
+++ b/pkgs/development/mobile/xcodeenv/install.html.template
@@ -4,14 +4,14 @@
     <head>
         <title>Install IPA</title>
     </head>
-    
+
     <body>
         <a id="forwardlink" href="@INSTALL_URL@">Go to the install page or wait a second</a>
-        
+
         <script type="text/javascript">
             setTimeout(function() {
                 var link = document.getElementById('forwardlink');
-                
+
                 if(document.createEvent) {
                     var eventObj = document.createEvent('MouseEvents');
                     eventObj.initEvent('click', true, false);
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 04b6f2cbc83..1a55f8366a3 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -1,47 +1,56 @@
-{stdenv, xcodewrapper}:
-{name, bundleId, app}:
+{stdenv, composeXcodeWrapper}:
+{name, app ? null, bundleId ? null, ...}@args:
 
+assert app != null -> bundleId != null;
+
+let
+  xcodewrapperArgs = builtins.intersectAttrs (builtins.functionArgs composeXcodeWrapper) args;
+
+  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
+in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   buildCommand = ''
     mkdir -p $out/bin
     cat > $out/bin/run-test-simulator << "EOF"
     #! ${stdenv.shell} -e
-    
+
     if [ "$1" = "" ]
     then
         # Show the user the possibile UDIDs and let him pick one, if none is provided as a command-line parameter
         xcrun simctl list
-        
+
         echo "Please provide a UDID of a simulator:"
         read udid
     else
         # If a parameter has been provided, consider that a device UDID and use that
         udid="$1"
     fi
-    
+
     # Open the simulator instance
     open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
-    
-    # Copy the app and restore the write permissions
-    appTmpDir=$(mktemp -d -t appTmpDir)
-    cp -r "$(echo ${app}/*.app)" "$appTmpDir"
-    chmod -R 755 "$(echo $appTmpDir/*.app)"
-    
-    # Wait for the simulator to start
-    echo "Press enter when the simulator is started..."
-    read
-    
-    # Install the app
-    xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)"
-    
-    # Remove the app tempdir
-    rm -Rf $appTmpDir
-    
-    # Launch the app in the simulator
-    xcrun simctl launch $udid "${bundleId}"
-    EOF
 
-    chmod +x $out/bin/run-test-simulator
+    ${stdenv.lib.optionalString (app != null) ''
+      # Copy the app and restore the write permissions
+      appTmpDir=$(mktemp -d -t appTmpDir)
+      cp -r "$(echo ${app}/*.app)" "$appTmpDir"
+      chmod -R 755 "$(echo $appTmpDir/*.app)"
+
+      # Wait for the simulator to start
+      echo "Press enter when the simulator is started..."
+      read
+
+      # Install the app
+      xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)"
+
+      # Remove the app tempdir
+      rm -Rf $appTmpDir
+
+      # Launch the app in the simulator
+      xcrun simctl launch $udid "${bundleId}"
+      EOF
+
+      chmod +x $out/bin/run-test-simulator
+    ''}
   '';
 }

From 27f8b6b89e431ba7c1c98231ff297022d928e2ef Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 17 Nov 2018 23:13:44 +0100
Subject: [PATCH 2309/2793] Replace titaniumenv with new implementation

---
 .../mobile/titaniumenv/build-app.nix          | 319 ++++++++----------
 .../mobile/titaniumenv/default.nix            |  24 +-
 .../mobile/titaniumenv/examples/default.nix   |  91 -----
 .../examples/emulate-kitchensink/default.nix  |  10 -
 .../examples/kitchensink/default.nix          |  44 ---
 .../examples/kitchensink/generatekeystore.sh  |  10 -
 .../titaniumenv/examples/kitchensink/keystore | Bin 1315 -> 0 bytes
 .../examples/simulate-kitchensink/default.nix |   7 -
 .../mobile/titaniumenv/titaniumsdk-6.3.nix    |  43 ---
 .../mobile/titaniumenv/titaniumsdk-7.1.nix    |  12 +-
 pkgs/top-level/all-packages.nix               |   4 +-
 11 files changed, 167 insertions(+), 397 deletions(-)
 delete mode 100644 pkgs/development/mobile/titaniumenv/examples/default.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
 delete mode 100755 pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh
 delete mode 100644 pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore
 delete mode 100644 pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 0250e5bf2e2..472f85fbc45 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,200 +1,181 @@
-{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}:
-{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
+{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
+{ name, src, preBuild ? "", target, tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2"
-, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null
-}:
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.3", iosBuildStore ? false
+, enableWirelessDistribution ? false, installURL ? null
+, xcodeBaseDir ? "/Applications/Xcode.app"
+, androidsdkArgs ? {}
+, xcodewrapperArgs ? {}
+, ...
+}@args:
 
 assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
 assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
 assert enableWirelessDistribution -> installURL != null;
 
 let
-  androidsdkComposition = androidsdk {
-    platformVersions = androidPlatformVersions;
-    abiVersions = androidAbiVersions;
-    useGoogleAPIs = true;
-  };
+  realAndroidsdkArgs = {
+    platformVersions = [ "26" ];
+  } // androidsdkArgs;
+
+  androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk;
+
+  realXcodewrapperArgs = {
+    inherit xcodeBaseDir;
+  } // xcodewrapperArgs;
+
+  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
 
   deleteKeychain = ''
-    security default-keychain -s login.keychain
-    security delete-keychain $keychainName
-    rm -f $HOME/lock-keychain
+    if [ -f $HOME/lock-keychain ]
+    then
+        security default-keychain -s login.keychain
+        security delete-keychain $keychainName
+        rm -f $HOME/lock-keychain
+    fi
   '';
-in
-stdenv.mkDerivation {
-  name = stdenv.lib.replaceChars [" "] [""] name;
-  inherit src;
 
-  buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") xcodewrapper;
-  
+  extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
+in
+stdenv.mkDerivation ({
+  name = stdenv.lib.replaceChars [" "] [""] name;
+
+  buildInputs = [ nodejs titanium alloy python which file jdk ]
+    ++ stdenv.lib.optional (target == "iphone") xcodewrapper;
+
   buildPhase = ''
     ${preBuild}
 
-    export HOME=$TMPDIR
-    
+    export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
+
     ${stdenv.lib.optionalString (tiVersion != null) ''
       # Replace titanium version by the provided one
       sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
     ''}
-    
+
     # Simulate a login
     mkdir -p $HOME/.titanium
     cat > $HOME/.titanium/auth_session.json <<EOF
     { "loggedIn": true }
     EOF
-    
+
+    # Configure the paths to the Titanium SDK and modules
     echo "{}" > $TMPDIR/config.json
     titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
     titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
-    
+
     mkdir -p $out
-    
-    ${if target == "android" then
-        ''
-          titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec
 
-          export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH
-          export GRADLE_USER_HOME=$TMPDIR/gradle
-
-          ${if release then
-            ''
-              ${stdenv.lib.optionalString stdenv.isDarwin ''
-                # Signing the app does not work with OpenJDK on macOS, use host SDK instead
-                export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-              ''}
-              titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out
-            ''
-          else
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''}
-        ''
-      else if target == "iphone" then
-        ''
-          ${if release then
-            ''
-              export HOME=/Users/$(whoami)
-              export keychainName=$(basename $out)
-            
-              # Create a keychain with the component hash name (should always be unique)
-              security create-keychain -p "" $keychainName
-              security default-keychain -s $keychainName
-              security unlock-keychain -p "" $keychainName
-              security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-              security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
-              provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
-   
-              # Ensure that the requested provisioning profile can be found
-        
-              if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-              then
-                  mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-                  cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-              fi
-            
-              # Simulate a login
-              mkdir -p $HOME/.titanium
-              cat > $HOME/.titanium/auth_session.json <<EOF
-              { "loggedIn": true }
-              EOF
-              
-              # Configure the path to Xcode
-              titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
-              
-              # Make plutil available
-              mkdir -p $TMPDIR/bin
-              ln -s /usr/bin/plutil $TMPDIR/bin
-              export PATH=$TMPDIR/bin:$PATH
-              
-              # Link the modules folder
-              if [ ! -e modules ]
-              then
-                  ln -s ${titaniumsdk}/modules modules
-              fi
-
-              # Take precautions to prevent concurrent builds blocking the keychain
-              while [ -f $HOME/lock-keychain ]
-              do
-                  echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..."
-                  sleep 3
-              done
-
-              touch $HOME/lock-keychain
-
-              security default-keychain -s $keychainName
-
-              # Do the actual build
-              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
-            
-              # Remove our generated keychain
-              ${deleteKeychain}
-            ''
-          else
-            ''
-              # Copy all sources to the output store directory.
-              # Why? Debug application include *.js files, which are symlinked into their
-              # sources. If they are not copied, we have dangling references to the
-              # temp folder.
-            
-              cp -av * $out
-              cd $out
-              
-              # We need to consult a real home directory to find the available simulators
-              export HOME=/Users/$(whoami)
-              
-              # Configure the path to Xcode
-              titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
-              
-              # Link the modules folder
-              if [ ! -e modules ]
-              then
-                  ln -s ${titaniumsdk}/modules modules
-                  createdModulesSymlink=1
-              fi
-              
-              # Execute the build
-              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
-              
-              # Remove the modules symlink
-              if [ "$createdModulesSymlink" = "1" ]
-              then
-                  rm $out/modules
-              fi
-          ''}
-        ''
-
-      else throw "Target: ${target} is not supported!"}
-  '';
-  
-  installPhase = ''
-    mkdir -p $out
-    
-    ${if target == "android" && release then ""
-      else
-        if target == "android" then
-          ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out''
-        else if target == "iphone" && release then
-           ''
-             cp -av build/iphone/build/* $out
-             mkdir -p $out/nix-support
-             echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
-             
-             ${stdenv.lib.optionalString enableWirelessDistribution ''
-               appname=$(basename $out/*.ipa .ipa)
-               bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
-               version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
-               
-               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
-               echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
-             ''}
-           ''
-        else if target == "iphone" then ""
-        else throw "Target: ${target} is not supported!"}
-    
     ${if target == "android" then ''
-        mkdir -p $out/nix-support
-        echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
-    '' else ""}
+      titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdk}/libexec/android-sdk
+
+      export PATH=${androidsdk}/libexec/android-sdk/tools:$(echo ${androidsdk}/libexec/android-sdk/build-tools/android-*):$PATH
+      export GRADLE_USER_HOME=$TMPDIR/gradle
+
+      ${if release then ''
+        ${stdenv.lib.optionalString stdenv.isDarwin ''
+          # Signing the app does not work with OpenJDK on macOS, use host SDK instead
+          export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+        ''}
+        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias "${androidKeyAlias}" --store-password "${androidKeyStorePassword}" --output-dir $out
+      '' else ''
+        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out
+      ''}
+    ''
+    else if target == "iphone" then ''
+      # Configure the path to Xcode
+      titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
+
+      # Link the modules folder
+      if [ ! -e modules ]
+      then
+          ln -s ${titaniumsdk}/modules modules
+          createdModulesSymlink=1
+      fi
+
+      ${if release then ''
+        # Create a keychain with the component hash name (should always be unique)
+        export keychainName=$(basename $out)
+
+        security create-keychain -p "" $keychainName
+        security default-keychain -s $keychainName
+        security unlock-keychain -p "" $keychainName
+        security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
+        security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
+        provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
+
+        # Ensure that the requested provisioning profile can be found
+
+        if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
+        then
+            mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+            cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
+        fi
+
+        # Take precautions to prevent concurrent builds blocking the keychain
+        while [ -f $HOME/lock-keychain ]
+        do
+            echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..."
+            sleep 3
+        done
+
+        touch $HOME/lock-keychain
+
+        security default-keychain -s $keychainName
+
+        # Do the actual build
+        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
+
+        # Remove our generated keychain
+        ${deleteKeychain}
+      '' else ''
+        # Copy all sources to the output store directory.
+        # Why? Debug application include *.js files, which are symlinked into their
+        # sources. If they are not copied, we have dangling references to the
+        # temp folder.
+
+        cp -av * $out
+        cd $out
+
+        # Execute the build
+        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
+
+        # Remove the modules symlink
+        if [ "$createdModulesSymlink" = "1" ]
+        then
+            rm $out/modules
+        fi
+      ''}
+    '' else throw "Target: ${target} is not supported!"}
   '';
-  
+
+  installPhase = ''
+    ${if target == "android" then ''
+      ${if release then ""
+      else ''
+        cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out
+      ''}
+
+      mkdir -p $out/nix-support
+      echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
+    ''
+    else if target == "iphone" then
+      if release then ''
+        mkdir -p $out/nix-support
+        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
+
+        ${stdenv.lib.optionalString enableWirelessDistribution ''
+          appname="$(basename "$out/*.ipa" .ipa)"
+          bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
+          version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
+
+          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
+          echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
+        ''}
+      ''
+      else ""
+    else throw "Target: ${target} is not supported!"}
+  '';
+
   failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
-}
+} // extraArgs)
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index f411a8d61fd..e9f6344680b 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,27 +1,19 @@
-{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
+{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}:
 
 rec {
-  androidenv = pkgs.androidenv;
-
-  xcodeenv = if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then pkgs.xcodeenv.override {
-    version = xcodeVersion;
-    inherit xcodeBaseDir;
-  } else null;
-  
   titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix
-      else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
+    titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
-      inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
+      inherit (pkgs) stdenv fetchurl unzip makeWrapper;
     };
-  
+
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv python which file jdk nodejs;
-    inherit (pkgs.nodePackages_6_x) alloy titanium;
-    inherit (androidenv) androidsdk;
-    inherit (xcodeenv) xcodewrapper;
-    inherit titaniumsdk xcodeBaseDir;
+    inherit (pkgs.nodePackages_8_x) alloy titanium;
+    inherit (androidenv) composeAndroidPackages;
+    inherit (xcodeenv) composeXcodeWrapper;
+    inherit titaniumsdk;
   };
 }
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
deleted file mode 100644
index 78f91dd39fb..00000000000
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ nixpkgs ? <nixpkgs>
-, systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "9.2"
-, xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "7.1.0.GA"
-, rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2"
-, enableWirelessDistribution ? false, installURL ? null
-}:
-
-let
-  pkgs = import nixpkgs {};
-in
-rec {
-  kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
-    inherit tiVersion;
-    target = "android";
-  });
-  
-  kitchensink_android_release = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
-    inherit tiVersion;
-    target = "android";
-    release = true;
-  });
-  
-  emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./emulate-kitchensink {
-    inherit (pkgs) androidenv;
-    kitchensink = builtins.getAttr system kitchensink_android_debug;
-  });
-  
-  emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./emulate-kitchensink {
-    inherit (pkgs) androidenv;
-    kitchensink = builtins.getAttr system kitchensink_android_release;
-  });
-  
-} // (if builtins.elem "x86_64-darwin" systems then 
-  let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
-  in
-  rec {
-  kitchensink_ios_development = import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
-    inherit tiVersion iosVersion;
-    target = "iphone";
-  };
-
-  simulate_kitchensink = import ./simulate-kitchensink {
-    inherit (pkgs) stdenv;
-    xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
-    kitchensink = kitchensink_ios_development;
-    bundleId = if rename then newBundleId else "com.appcelerator.kitchensink";
-  };
-} else {}) // (if rename then
-  let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
-  in
-  {
-    kitchensink_ipa = import ./kitchensink {
-      inherit (pkgs) stdenv fetchgit;
-      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
-      target = "iphone";
-      inherit tiVersion;
-      release = true;
-      rename = true;
-      inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
-      inherit enableWirelessDistribution installURL;
-    };
-  }
-  
-else {})
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
deleted file mode 100644
index cad4503dc96..00000000000
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{androidenv, kitchensink}:
-
-androidenv.emulateApp {
-  name = "emulate-${kitchensink.name}";
-  app = kitchensink;
-  platformVersion = "16";
-  useGoogleAPIs = true;
-  package = "com.appcelerator.kitchensink";
-  activity = ".KitchensinkActivity";
-}
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
deleted file mode 100644
index 70ab1b168c4..00000000000
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false
-, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2"
-, enableWirelessDistribution ? false, installURL ? null
-}:
-
-assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null);
-
-let
-  src = fetchgit {
-    url = https://github.com/appcelerator/kitchensink-v2.git;
-    rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537";
-    sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf";
-  };
-
-  # Rename the bundle id to something else
-  renamedSrc = stdenv.mkDerivation {
-    name = "KitchenSink-renamedsrc";
-    inherit src;
-    buildPhase = ''
-      sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv * $out
-    '';
-  };
-in
-titaniumenv.buildApp {
-  name = "KitchenSink-${target}-${if release then "release" else "debug"}";
-  src = if rename then renamedSrc else src;
-  preBuild = ''
-    sed -i -e "s|23|25|" tiapp.xml
-  ''; # Raise minimum android SDK from 23 to 25
-  inherit tiVersion;
-
-  inherit target androidPlatformVersions release;
-
-  androidKeyStore = ./keystore;
-  androidKeyAlias = "myfirstapp";
-  androidKeyStorePassword = "mykeystore";
-
-  inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
-  inherit enableWirelessDistribution installURL;
-}
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh b/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh
deleted file mode 100755
index 57451e8a507..00000000000
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-( echo "John Doe"
-  echo "My Company"
-  echo "My Organization"
-  echo "My City"
-  echo "My State"
-  echo "US"
-  echo "yes"
-) | keytool --genkeypair --alias myfirstapp --keystore ./keystore --storepass mykeystore
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore b/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore
deleted file mode 100644
index ee0a9c7989badede112afd57b011d1d53206425b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1315
zcmezO_TO6u1_mYu1_nkj=E|*1%PcA`Nh~N}U|@9aGkP<Rfq}8#poy{DfRBw!n~jl$
zQHx2Ck&%^wrHQe;hQr{Dc&%*3-@Z8~*lc%fvhh7=yH3qT>ZGYU<Az@DlO7ozpRUd*
zv1c~U>91qmZWr0|J9S~S;fLt;eb*}E*fgAO#JFsH{hPU6_$9yAt4!w?n*YkYSi*T6
zw;il`$8Y7fd`HV+wlh99n|Y^*M4mW5+b92D1AmyY=P8+W^CxKLEPu!~h2N*OTKu<}
zUY^)<kJ!VP7R!aLx%02NU*GAzh;Q?@kkylPZdBhtcrd2D|NpGW9+Rq4-L>Hh%z2BF
z4()KBJS9ikf1j6cd*b2^|86ejyq&LJ_0x}GZer`fWu?b&P8HnU^lo1w|HH%CxgyE8
zOpk2YXumtc>Fzq4`EnV%7scQ9;t*n7z+`Wo=J`bDSzfBkmQuMdYqfLg5}WzfhVFdP
z(A_8fZ^N>yHCDCm6SEnoE&BSc!^W}UOv}QnM?U|W-nHr7iDfx?4}LH24qP?U{r>r5
zTZIL7&2zfUEZnvFWslSXSM%51&aNL~rM$d3e{uY@WHp$2x3a-DzzZBztPy&q29^vA
z%$^2K%&rDa%*+dznHZUvSjsDm*$lYZ*tOa`&RMW9voaWz7;+nMvN4CUun9AT1{(?*
z@PjxU!W_Pp3c)3bC8>r227DkPc42nkN(JZ4l1f7f12K>YmoUF?rGkG^dSYH?RbokI
zex9MQfgnhRTbK)^Hb1u@F|QJ4CbKYySAIsGf=hm?ft)z6p^1T^p^1TkiIJg26qsuQ
z=MIponizK&G%@PHf``$diBX=Zv610#eQ={}sgP#SeXlusZ=O8=Cb&Jw=DiEUVLAJT
zZGmc;uCWeEfxjbddn11BKl*i-!MD@1LvyY-S~tj=<bO&_*q%KzVCj<i^Ix!33n(4(
z-@WqszwO7Qe^`e<Kel3-C_l^Z=5Lpe${l7h4H1qKn`rc{^z%CH#Oqq`KPfRw&b{ct
zc$`U;VR}M9zo;_znN5>+HZ6MH!u=sa<}1i)-ybe$y*AtS-swH7W6XAh@2s4%e)lh{
zS4}^|eYkDeo6-X#!~1q!iS&O~$S%;>u*FlXQ2B+AhM4g7^PEOKCzd_55v%GBsp-{t
zuy~!E_U2`!6Z00=bN^B_P5Ssdsftm>`plA#`&I-_=v>i!|6$bA`D~NA)8ZPcLse54
zeXReT_tau;Y-Iqs<Iej0q}iSA5`rIBEWUO`;?>7(uh-46c)_@u<@wz#<3;RC`VJa9
zaPiy6Gxf?`kouQ(zT^J&g|)AI&;RGzed%8x->>*dMQ5g*zx2t;@Y+YMvNu0;_gg-8
z`uIxhT;Okq1~uDVGn-beI{)(Uz2bGpuG(yhc<rFXXL4@4Omvk=#<|}T+KUwp<PBum
zm_udxSj1RFf;YDnhqv?#<W0$Z6;W2rwC4IEF_d)Atj}Pe!z5B;Dy`*`Y1k2}RTJZ_
zW2e<?KfjDgB-u-tTOr`G&mP5D77D#xZyFCZ)X#abwA*<1*Qb9cRq$)`tPo9_F0~N=
D?AQWF

diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
deleted file mode 100644
index bbd94cb7882..00000000000
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{xcodeenv, kitchensink, bundleId}:
-
-xcodeenv.simulateApp {
-  name = "simulate-${kitchensink.name}";
-  inherit bundleId;
-  app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator";
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
deleted file mode 100644
index b8c2688708b..00000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-6.3.1.GA";
-  src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip;
-    sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj";
-  }
-  else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip;
-    sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj";
-  }
-  else throw "Platform: ${stdenv.hostPlatform.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    (yes y | unzip $src) || true
-    
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 6.3.1.GA
-    cd *
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") ''
-      # Fixes a bad archive copying error when generating an IPA file
-      sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js
-    ''}
-
-    # Patch some executables
-    
-    ${if stdenv.hostPlatform.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
-      ''
-      else if stdenv.hostPlatform.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
-      ''
-      else ""}
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
index 4d3bd420969..13abc18f76e 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
@@ -35,7 +35,7 @@ let
     sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
   };
 
-  # Put the download plugins in a fake Maven repository
+  # Put the downloaded plugins in a fake Maven repository
   fakeMavenRepo = stdenv.mkDerivation {
     name = "fake-maven-repo";
     buildCommand = ''
@@ -54,15 +54,15 @@ let
 in
 stdenv.mkDerivation {
   name = "mobilesdk-7.1.0.GA";
-  src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl {
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
     url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
     sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
   }
-  else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
     url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
     sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
   }
-  else throw "Platform: ${stdenv.hostPlatform.system} not supported!";
+  else throw "Platform: ${stdenv.system} not supported!";
 
   buildInputs = [ unzip makeWrapper ];
 
@@ -89,11 +89,11 @@ stdenv.mkDerivation {
 
     # Patch some executables
 
-    ${if stdenv.hostPlatform.system == "i686-linux" then
+    ${if stdenv.system == "i686-linux" then
       ''
         patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
       ''
-      else if stdenv.hostPlatform.system == "x86_64-linux" then
+      else if stdenv.system == "x86_64-linux" then
       ''
         patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
       ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50f7aa50778..69446ff6ea7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -815,7 +815,9 @@ in
 
   ssh-agents = callPackage ../tools/networking/ssh-agents { };
 
-  titaniumenv = callPackage ../development/mobile/titaniumenv { };
+  titaniumenv = callPackage ../development/mobile/titaniumenv {
+    pkgs_i686 = pkgsi686Linux;
+  };
 
   abootimg = callPackage ../development/mobile/abootimg {};
 

From 53550c826df9f46397ac4f28283db32bd9285e48 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 18 Nov 2018 13:51:06 +0100
Subject: [PATCH 2310/2793] Port packages with Android dependencies to new
 androidenv

---
 pkgs/development/mobile/flashtool/default.nix |  6 +++---
 pkgs/development/tools/apktool/default.nix    |  4 ++--
 pkgs/misc/scrcpy/default.nix                  |  4 ++--
 pkgs/tools/networking/gnirehtet/default.nix   |  2 +-
 pkgs/top-level/all-packages.nix               | 14 +++++---------
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index 601b0b319bc..f78a10d8266 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }:
+{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
 
 # TODO:
 #
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux
-    ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux
+    ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux
+    ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux
     ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
 
     chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 17b0265fddd..c811b8a99e9 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, buildTools }:
+{ stdenv, fetchurl, makeWrapper, jre, build-tools }:
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
         --add-flags "-jar $out/libexec/apktool/apktool.jar" \
-        --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/"
+        --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index afe8c0b7b67..87762eb4b25 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -3,7 +3,7 @@
 , ninja
 , pkgconfig
 
-, platformTools
+, platform-tools
 , ffmpeg
 , SDL2
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"
 
     # runtime dep on `adb` to push the server
-    wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platformTools}/bin"
+    wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index d40b85591b5..69ad0e39c94 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   patches = [
     (substituteAll {
       src = ./paths.patch;
-      adb = "${androidenv.platformTools}/bin/adb";
+      adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb";
       inherit apk;
     })
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69446ff6ea7..cb4ecf8a574 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -539,7 +539,7 @@ in
   ansifilter = callPackage ../tools/text/ansifilter {};
 
   apktool = callPackage ../development/tools/apktool {
-    buildTools = androidenv.buildTools;
+    inherit (androidenv.androidPkgs_9_0) build-tools;
   };
 
   appimage-run = callPackage ../tools/package-management/appimage-run {};
@@ -822,7 +822,7 @@ in
   abootimg = callPackage ../development/mobile/abootimg {};
 
   adbfs-rootless = callPackage ../development/mobile/adbfs-rootless {
-    adb = androidenv.platformTools;
+    adb = androidenv.androidPkgs_9_0.platform-tools;
   };
 
   adb-sync = callPackage ../development/mobile/adb-sync { };
@@ -832,15 +832,11 @@ in
     #licenseAccepted = (config.android_sdk.accept_license or false);
   };
 
-  inherit (androidenv) androidndk;
-
   androidndkPkgs = androidndkPkgs_17c;
   androidndkPkgs_17c = (callPackage ../development/androidndk-pkgs {})."17c";
   androidndkPkgs_10e = (callPackage ../development/androidndk-pkgs {})."10e";
 
-  androidsdk = androidenv.androidsdk_8_0;
-
-  androidsdk_extras = res.androidenv.androidsdk_8_0_extras;
+  androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;
 
   webos = recurseIntoAttrs {
     cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };
@@ -2678,7 +2674,7 @@ in
   flamerobin = callPackage ../applications/misc/flamerobin { };
 
   flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool {
-    platformTools = androidenv.platformTools;
+    inherit (androidenv.androidPkgs_9_0) platform-tools;
   };
 
   flashrom = callPackage ../tools/misc/flashrom { };
@@ -5311,7 +5307,7 @@ in
   };
 
   scrcpy = callPackage ../misc/scrcpy {
-    inherit (androidenv) platformTools;
+    inherit (androidenv.androidPkgs_9_0) platform-tools;
   };
 
   screen-message = callPackage ../tools/X11/screen-message { };

From 676d07af3f92c84e9556bad00f4cdc55350c6866 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 18 Nov 2018 14:44:23 +0100
Subject: [PATCH 2311/2793] Add documentation section for Android

---
 doc/languages-frameworks/android.section.md | 240 ++++++++++++++++++++
 doc/languages-frameworks/index.xml          |   1 +
 2 files changed, 241 insertions(+)
 create mode 100644 doc/languages-frameworks/android.section.md

diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
new file mode 100644
index 00000000000..237f3441874
--- /dev/null
+++ b/doc/languages-frameworks/android.section.md
@@ -0,0 +1,240 @@
+---
+title: Android
+author: Sander van der Burg
+date: 2018-11-18
+---
+# Android
+
+The Android build environment provides three major features and a number of
+supporting features.
+
+Deploying an Android SDK installation with plugins
+--------------------------------------------------
+The first use case is deploying the SDK with a desired set of plugins or subsets
+of an SDK.
+
+```nix
+with import <nixpkgs> {};
+
+let
+  androidComposition = androidenv.composeAndroidPackages {
+    toolsVersion = "25.2.5";
+    platformToolsVersion = "27.0.1";
+    buildToolsVersions = [ "27.0.3" ];
+    includeEmulator = false;
+    emulatorVersion = "27.2.0";
+    platformVersions = [ "24" ];
+    includeSources = false;
+    includeDocs = false;
+    includeSystemImages = false;
+    systemImageTypes = [ "default" ];
+    abiVersions = [ "armeabi-v7a" ];
+    lldbVersions = [ "2.0.2558144" ];
+    cmakeVersions = [ "3.6.4111459" ];
+    includeNDK = false;
+    ndkVersion = "16.1.4479499";
+    useGoogleAPIs = false;
+    useGoogleTVAddOns = false;
+    includeExtras = [
+      "extras;google;gcm"
+    ];
+  };
+in
+androidComposition.androidsdk
+```
+
+The above function invocation states that we want an Android SDK with the above
+specified plugin versions. By default, most plugins are disabled. Notable
+exceptions are the tools, platform-tools and build-tools sub packages.
+
+The following parameters are supported:
+
+* `toolsVersion`, specifies the version of the tools package to use
+* `platformsToolsVersion` specifies the version of the `platform-tools` plugin
+* `buildToolsVersion` specifies the versions of the `build-tools` plugins to
+  use.
+* `includeEmulator` specifies whether to deploy the emulator package (`false`
+  by default). When enabled, the version of the emulator to deploy can be
+  specified by setting the `emulatorVersion` parameter.
+* `includeDocs` specifies whether the documentation catalog should be included.
+* `lldbVersions` specifies what LLDB versions should be deployed.
+* `cmakeVersions` specifies which CMake versions should be deployed.
+* `includeNDK` specifies that the Android NDK bundle should be included.
+  Defaults to: `false`.
+* `ndkVersion` specifies the NDK version that we want to use.
+* `includeExtras` is an array of identifier strings referring to arbitrary
+  add-on packages that should be installed.
+* `platformVersions` specifies which platform SDK versions should be included.
+
+For each platform version that has been specified, we can apply the following
+options:
+
+* `includeSystemImages` specifies whether a system image for each platform SDK
+  should be included.
+* `includeSources` specifies whether the sources for each SDK version should be
+  included.
+* `useGoogleAPIs` specifies that for each selected platform version the
+  Google API should be included.
+* `useGoogleTVAddOns` specifies that for each selected platform version the
+  Google TV add-on should be included.
+
+For each requested system image we can specify the following options:
+
+* `systemImageTypes` specifies what kind of system images should be included.
+  Defaults to: `default`.
+* `abiVersions` specifies what kind of ABI version of each system image should
+  be included. Defaults to: `armeabi-v7a`.
+
+Most of the function arguments have reasonable default settings.
+
+When building the above expression with:
+
+```bash
+$ nix-build
+```
+
+The Android SDK gets deployed with all desired plugin versions.
+
+We can also deploy subsets of the Android SDK. For example, to only the the
+`platform-tools` package, you can evaluate the following expression:
+
+```nix
+with import <nixpkgs> {};
+
+let
+  androidComposition = androidenv.composeAndroidPackages {
+    # ...
+  };
+in
+androidComposition.platform-tools
+```
+
+Using predefine Android package compositions
+--------------------------------------------
+In addition to composing an Android package set manually, it is also possible
+to use a predefined composition that contains all basic packages for a specific
+Android version, such as version 9.0 (API-level 28).
+
+The following Nix expression can be used to deploy the entire SDK with all basic
+plugins:
+
+```nix
+with import <nixpkgs> {};
+
+androidenv.androidPkgs_9_0.androidsdk
+```
+
+It is also possible to use one plugin only:
+
+```nix
+with import <nixpkgs> {};
+
+androidenv.androidPkgs_9_0.platform-tools
+```
+
+Building an Android application
+-------------------------------
+In addition to the SDK, it is also possible to build an Ant-based Android
+project and automatically deploy all the Android plugins that a project
+requires.
+
+```nix
+with import <nixpkgs> {};
+
+androidenv.buildApp {
+  name = "MyAndroidApp";
+  src = ./myappsources;
+  release = true;
+
+  # If release is set to true, you need to specify the following parameters
+  keyStore = ./keystore;
+  keyAlias = "myfirstapp";
+  keyStorePassword = "mykeystore";
+  keyAliasPassword = "myfirstapp";
+
+  # Any Android SDK parameters that install all the relevant plugins that a
+  # build requires
+  platformVersions = [ "24" ];
+
+  # When we include the NDK, then ndk-build is invoked before Ant gets invoked
+  includeNDK = true;
+}
+```
+
+Aside from the app-specific build parameters (`name`, `src`, `release` and
+keystore parameters), the `buildApp {}` function supports all the function
+parameters that the SDK composition function (the function shown in the
+previous section) supports.
+
+This build function is particularly useful when it is desired to use
+[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution
+to build Android apps. An Android APK gets exposed as a build product and can be
+installed on any Android device with a web browser by navigating to the build
+result page.
+
+Spawning emulator instances
+---------------------------
+For testing purposes, it can also be quite convenient to automatically generate
+scripts that spawn emulator instances with all desired configuration settings.
+
+An emulator spawn script can be configured by invoking the `emulateApp {}`
+function:
+
+```nix
+with import <nixpkgs> {};
+
+androidenv.emulateApp {
+  name = "emulate-MyAndroidApp";
+  platformVersion = "24";
+  abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
+  systemImageType = "default";
+  useGoogleAPIs = false;
+}
+```
+
+It is also possible to specify an APK to deploy inside the emulator
+and the package and activity names to launch it:
+
+```nix
+with import <nixpkgs> {};
+
+androidenv.emulateApp {
+  name = "emulate-MyAndroidApp";
+  platformVersion = "24";
+  abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
+  systemImageType = "default";
+  useGoogleAPIs = false;
+  app = ./MyApp.apk;
+  package = "MyApp";
+  activity = "MainActivity";
+}
+```
+
+In addition to prebuilt APKs, you can also bind the APK parameter to a
+`buildApp {}` function invocation shown in the previous example.
+
+Querying the available versions of each plugin
+----------------------------------------------
+When using any of the previously shown functions, it may be a bit inconvenient
+to find out what options are supported, since the Android SDK provides many
+plugins.
+
+A shell script in the `pkgs/development/mobile/androidenv/` sub directory can be used to retrieve all
+possible options:
+
+```bash
+sh ./querypackages.sh packages build-tools
+```
+
+The above command-line instruction queries all build-tools versions in the
+generated `packages.nix` expression.
+
+Updating the generated expressions
+----------------------------------
+Most of the Nix expressions are generated from XML files that the Android
+package manager uses. To update the expressions run the `generate.sh` script
+that is stored in the `pkgs/development/mobile/androidenv/` sub directory:
+
+```bash
+sh ./generate.sh
+```
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index ac0ad712532..a67c6bbc8bd 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -10,6 +10,7 @@
   Nixpkgs to easily build packages for other programming languages, such as
   Perl or Haskell. These are described in this chapter.
  </para>
+ <xi:include href="android.section.xml" />
  <xi:include href="beam.xml" />
  <xi:include href="bower.xml" />
  <xi:include href="coq.xml" />

From 56e112e8746fd365858af8b5a7957b82b8ff47ae Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 27 Nov 2018 20:48:48 +0100
Subject: [PATCH 2312/2793] Add documentation for building iOS apps

---
 doc/languages-frameworks/index.xml      |   1 +
 doc/languages-frameworks/ios.section.md | 219 ++++++++++++++++++++++++
 2 files changed, 220 insertions(+)
 create mode 100644 doc/languages-frameworks/ios.section.md

diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index a67c6bbc8bd..4d2a0489243 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -17,6 +17,7 @@
  <xi:include href="go.xml" />
  <xi:include href="haskell.section.xml" />
  <xi:include href="idris.section.xml" />
+ <xi:include href="ios.section.xml" />
  <xi:include href="java.xml" />
  <xi:include href="lua.xml" />
  <xi:include href="node.section.xml" />
diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md
new file mode 100644
index 00000000000..6684b809ffe
--- /dev/null
+++ b/doc/languages-frameworks/ios.section.md
@@ -0,0 +1,219 @@
+---
+title: iOS
+author: Sander van der Burg
+date: 2018-11-18
+---
+# iOS
+
+This component is basically a wrapper/workaround that makes it possible to
+expose an Xcode installation as a Nix package by means of symlinking to the
+relevant executables on the host system.
+
+Since Xcode can't be packaged with Nix, nor we can publish it as a Nix package
+(because of its license) this is basically the only integration strategy
+making it possible to do iOS application builds that integrate with other
+components of the Nix ecosystem
+
+The primary objective of this project is to use the Nix expression language to
+specify how iOS apps can be built from source code, and to automatically spawn
+iOS simulator instances for testing.
+
+This component also makes it possible to use [Hydra](http://nixos.org/hydra),
+the Nix-based continuous integration server to regularly build iOS apps and to
+do wireless ad-hoc installations of enterprise IPAs on iOS devices through
+Hydra.
+
+The Xcode build environment implements a number of features.
+
+Deploying a proxy component wrapper exposing Xcode
+--------------------------------------------------
+The first use case is deploying a Nix package that provides symlinks to the Xcode
+installation on the host system. This package can be used as a build input to
+any build function implemented in the Nix expression language that requires
+Xcode.
+
+```nix
+let
+  pkgs = import <nixpkgs> {};
+
+  xcodeenv = import ./xcodeenv {
+    inherit (pkgs) stdenv;
+  };
+in
+xcodeenv.composeXcodeWrapper {
+  version = "9.2";
+  xcodeBaseDir = "/Applications/Xcode.app";
+}
+```
+
+By deploying the above expression with `nix-build` and inspecting its content
+you will notice that several Xcode-related executables are exposed as a Nix
+package:
+
+```bash
+$ ls result/bin
+lrwxr-xr-x  1 sander  staff  94  1 jan  1970 Simulator -> /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator
+lrwxr-xr-x  1 sander  staff  17  1 jan  1970 codesign -> /usr/bin/codesign
+lrwxr-xr-x  1 sander  staff  17  1 jan  1970 security -> /usr/bin/security
+lrwxr-xr-x  1 sander  staff  21  1 jan  1970 xcode-select -> /usr/bin/xcode-select
+lrwxr-xr-x  1 sander  staff  61  1 jan  1970 xcodebuild -> /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
+lrwxr-xr-x  1 sander  staff  14  1 jan  1970 xcrun -> /usr/bin/xcrun
+```
+
+Building an iOS application
+---------------------------
+We can build an iOS app executable for the simulator, or an IPA/xcarchive file
+for release purposes, e.g. ad-hoc, enterprise or store installations, by
+executing the `xcodeenv.buildApp {}` function:
+
+```nix
+let
+  pkgs = import <nixpkgs> {};
+
+  xcodeenv = import ./xcodeenv {
+    inherit (pkgs) stdenv;
+  };
+in
+xcodeenv.buildApp {
+  name = "MyApp";
+  src = ./myappsources;
+  sdkVersion = "11.2";
+
+  target = null; # Corresponds to the name of the app by default
+  configuration = null; # Release for release builds, Debug for debug builds
+  scheme = null; # -scheme will correspond to the app name by default
+  sdk = null; # null will set it to 'iphonesimulator` for simulator builds or `iphoneos` to real builds
+  xcodeFlags = "";
+
+  release = true;
+  certificateFile = ./mycertificate.p12;
+  certificatePassword = "secret";
+  provisioningProfile = ./myprovisioning.profile;
+  signMethod = "ad-hoc"; # 'enterprise' or 'store'
+  generateIPA = true;
+  generateXCArchive = false;
+
+  enableWirelessDistribution = true;
+  installURL = "/installipa.php";
+  bundleId = "mycompany.myapp";
+  appVersion = "1.0";
+
+  # Supports all xcodewrapper parameters as well
+  xcodeBaseDir = "/Applications/Xcode.app";
+}
+```
+
+The above function takes a variety of parameters:
+* The `name` and `src` parameters are mandatory and specify the name of the app
+  and the location where the source code resides
+* `sdkVersion` specifies which version of the iOS SDK to use.
+
+It also possile to adjust the `xcodebuild` parameters. This is only needed in
+rare circumstances. In most cases the default values should suffice:
+
+* Specifies which `xcodebuild` target to build. By default it takes the target
+  that has the same name as the app.
+* The `configuration` parameter can be overridden if desired. By default, it
+  will do a debug build for the simulator and a release build for real devices.
+* The `scheme` parameter specifies which `-scheme` parameter to propagate to
+  `xcodebuild`. By default, it corresponds to the app name.
+* The `sdk` parameter specifies which SDK to use. By default, it picks
+  `iphonesimulator` for simulator builds and `iphoneos` for release builds.
+* The `xcodeFlags` parameter specifies arbitrary command line parameters that
+  should be propagated to `xcodebuild`.
+
+By default, builds are carried out for the iOS simulator. To do release builds
+(builds for real iOS devices), you must set the `release` parameter to `true`.
+In addition, you need to set the following parameters:
+
+* `certificateFile` refers to a P12 certificate file.
+* `certificatePassword` specifies the password of the P12 certificate.
+* `provisioningProfile` refers to the provision profile needed to sign the app
+* `signMethod` should refer to `ad-hoc` for signing the app with an ad-hoc
+  certificate, `enterprise` for enterprise certificates and `app-store` for App
+  store certificates.
+* `generateIPA` specifies that we want to produce an IPA file (this is probably
+  what you want)
+* `generateXCArchive` specifies thet we want to produce an xcarchive file.
+
+When building IPA files on Hydra and when it is desired to allow iOS devices to
+install IPAs by browsing to the Hydra build products page, you can enable the
+`enableWirelessDistribution` parameter.
+
+When enabled, you need to configure the following options:
+
+* The `installURL` parameter refers to the URL of a PHP script that composes the
+  `itms-services://` URL allowing iOS devices to install the IPA file.
+* `bundleId` refers to the bundle ID value of the app
+* `appVersion` refers to the app's version number
+
+To use wireless adhoc distributions, you must also install the corresponding
+PHP script on a web server (see section: 'Installing the PHP script for wireless
+ad hoc installations from Hydra' for more information).
+
+In addition to the build parameters, you can also specify any parameters that
+the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the
+`xcodeBaseDir` parameter can be overridden to refer to a different Xcode
+version.
+
+Spawning simulator instances
+----------------------------
+In addition to building iOS apps, we can also automatically spawn simulator
+instances:
+
+```nix
+let
+  pkgs = import <nixpkgs> {};
+
+  xcodeenv = import ./xcodeenv {
+    inherit (pkgs) stdenv;
+  };
+in
+xcode.simulateApp {
+  name = "simulate";
+
+  # Supports all xcodewrapper parameters as well
+  xcodeBaseDir = "/Applications/Xcode.app";
+}
+```
+
+The above expression produces a script that starts the simulator from the
+provided Xcode installation. The script can be started as follows:
+
+```bash
+./result/bin/run-test-simulator
+```
+
+By default, the script will show an overview of UDID for all available simulator
+instances and asks you to pick one. You can also provide a UDID as a
+command-line parameter to launch an instance automatically:
+
+```bash
+./result/bin/run-test-simulator 5C93129D-CF39-4B1A-955F-15180C3BD4B8
+```
+
+You can also extend the simulator script to automatically deploy and launch an
+app in the requested simulator instance:
+
+```nix
+let
+  pkgs = import <nixpkgs> {};
+
+  xcodeenv = import ./xcodeenv {
+    inherit (pkgs) stdenv;
+  };
+in
+xcode.simulateApp {
+  name = "simulate";
+  bundleId = "mycompany.myapp";
+  app = xcode.buildApp {
+    # ...
+  };
+
+  # Supports all xcodewrapper parameters as well
+  xcodeBaseDir = "/Applications/Xcode.app";
+}
+```
+
+By providing the result of an `xcode.buildApp {}` function and configuring the
+app bundle id, the app gets deployed automatically and started.

From c68974117b83529ec3fa7295ae45641b5a4097cf Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 18 Nov 2018 15:29:51 +0100
Subject: [PATCH 2313/2793] Add Titanium documentation section

---
 doc/languages-frameworks/index.xml           |   1 +
 doc/languages-frameworks/titanium.section.md | 115 +++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 doc/languages-frameworks/titanium.section.md

diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 4d2a0489243..4564df98fe9 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -29,6 +29,7 @@
  <xi:include href="ruby.xml" />
  <xi:include href="rust.section.xml" />
  <xi:include href="texlive.xml" />
+ <xi:include href="titanium.section.xml" />
  <xi:include href="vim.section.xml" />
  <xi:include href="emscripten.section.xml" />
 </chapter>
diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md
new file mode 100644
index 00000000000..7a97664ec59
--- /dev/null
+++ b/doc/languages-frameworks/titanium.section.md
@@ -0,0 +1,115 @@
+---
+title: Titanium
+author: Sander van der Burg
+date: 2018-11-18
+---
+# Titanium
+
+The Nixpkgs repository contains facilities to deploy a variety of versions of
+the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
+mobile app development framework using JavaScript as an implementation language,
+and includes a function abstraction making it possible to build Titanium
+applications for Android and iOS devices from source code.
+
+Not all Titanium features supported -- currently, it can only be used to build
+Android and iOS apps.
+
+Building a Titanium app
+-----------------------
+We can build a Titanium app from source for Android or iOS and for debugging or
+release purposes by invoking the `titaniumenv.buildApp {}` function:
+
+```nix
+titaniumenv.buildApp {
+  name = "myapp";
+  src = ./myappsource;
+
+  preBuild = "";
+  target = "android"; # or 'iphone'
+  tiVersion = "7.1.0.GA";
+  release = true;
+
+  androidsdkArgs = {
+    platformVersions = [ "25" "26" ];
+  };
+  androidKeyStore = ./keystore;
+  androidKeyAlias = "myfirstapp";
+  androidKeyStorePassword = "secret";
+
+  xcodeBaseDir = "/Applications/Xcode.app";
+  xcodewrapperArgs = {
+    version = "9.3";
+  };
+  iosMobileProvisioningProfile = ./myprovisioning.profile;
+  iosCertificateName = "My Company";
+  iosCertificate = ./mycertificate.p12;
+  iosCertificatePassword = "secret";
+  iosVersion = "11.3";
+  iosBuildStore = false;
+
+  enableWirelessDistribution = true;
+  installURL = "/installipa.php";
+}
+```
+
+The `titaniumenv.buildApp {}` function takes the following parameters:
+
+* The `name` parameter refers to the name in the Nix store.
+* The `src` parameter refers to the source code location of the app that needs
+  to be built.
+* `preRebuild` contains optional build instructions that are carried out before
+  the build starts.
+* `target` indicates for which device the app must be built. Currently only
+  'android' and 'iphone' (for iOS) are supported.
+* `tiVersion` can be used to optionally override the requested Titanium version
+  in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
+* `release` should be set to true when building an app for submission to the
+  Google Playstore or Apple Appstore. Otherwise, it should be false.
+
+When the `target` has been set to `android`, we can configure the following
+parameters:
+
+* The `androidSdkArgs` parameter refers to an attribute set that propagates all
+  parameters to the `androidenv.composeAndroidPackages {}` function. This can
+  be used to install all relevant Android plugins that may be needed to perform
+  the Android build. If no parameters are given, it will deploy the platform
+  SDKs for API-levels 25 and 26 by default.
+
+When the `release` parameter has been set to true, you need to provide
+parameters to sign the app:
+
+* `androidKeyStore` is the path to the keystore file
+* `androidKeyAlias` is the key alias
+* `androidKeyStorePassword` refers to the password to open the keystore file.
+
+When the `target` has been set to `iphone`, we can configure the following
+parameters:
+
+* The `xcodeBaseDir` parameter refers to the location where Xcode has been
+  installed. When none value is given, the above value is the default.
+* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
+  `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
+  to adjust the default version of Xcode.
+
+When `release` has been set to true, you also need to provide the following
+parameters:
+
+* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
+  for signing.
+* `iosCertificateName` refers to the company name in the P12 certificate.
+* `iosCertificate` refers to the path to the P12 file.
+* `iosCertificatePassword` contains the password to open the P12 file.
+* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
+  version.
+* `iosBuildStore` should be set to `true` when building for the Apple Appstore
+  submission. For enterprise or ad-hoc builds it should be set to `false`.
+
+When `enableWirelessDistribution` has been enabled, you must also provide the
+path of the PHP script (`installURL`) (that is included with the iOS build
+environment) to enable wireless ad-hoc installations.
+
+Emulating or simulating the app
+-------------------------------
+It is also possible to simulate the correspond iOS simulator build by using
+`xcodeenv.simulateApp {}` and emulate an Android APK by using
+`androidenv.emulateApp {}`.

From cb42643b9597e54f2e9018252a362b46cf9740f1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 27 Nov 2018 22:31:35 +0100
Subject: [PATCH 2314/2793] Fix inclusion of sources

---
 .../mobile/androidenv/compose-android-packages.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index d90ddfcadec..9125d3140e2 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -108,12 +108,12 @@ rec {
     }
   ) platformVersions;
 
-  sources = stdenv.lib.optional includeSources (map (version:
+  sources = map (version:
     deployAndroidPackage {
       inherit os;
       package = packages.sources."${version}";
     }
-  ) platformVersions);
+  ) platformVersions;
 
   system-images = stdenv.lib.flatten (map (apiVersion:
     map (type:

From 074c7e99e02d3529ea1bd592575dab1b32f5bdf7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 1 Dec 2018 00:08:21 +0100
Subject: [PATCH 2315/2793] Fix standalone generation script

---
 pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index a0ec8bb7b92..5d70a9f0a1c 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -5,14 +5,14 @@ let
 in
 deployAndroidPackage {
   inherit package os;
-  buildInputs = [ autoPatchelfHook makeWrapper ]
+  buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
     ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
   patchInstructions = lib.optionalString (os == "linux") ''
     patchShebangs .
 
     patch -p1 \
       --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
-    wrapProgram build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+    wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
 
     # TODO: allow this stuff
     rm -rf docs tests
@@ -47,4 +47,5 @@ deployAndroidPackage {
         ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
     done
   '';
+  noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
 }

From 5e690b47fd6c2ae9e3d5157f91532cdcfd20679b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 4 Dec 2018 21:42:17 +0100
Subject: [PATCH 2316/2793] adb-sync: fix to make it work with platform-tools

---
 pkgs/development/mobile/adb-sync/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index ee6ff3cecd5..b6d35051733 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python3, androidsdk, makeWrapper }:
+{ stdenv, fetchgit, python3, platform-tools, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "adb-sync-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d";
   };
 
-  buildInputs = [ python3 androidsdk makeWrapper ];
+  buildInputs = [ python3 platform-tools makeWrapper ];
 
   phases = "installPhase";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp $src/adb-channel $src/adb-sync $out/bin/
     patchShebangs $out/bin
-    wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin
+    wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb4ecf8a574..ba6d60fef87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -825,7 +825,9 @@ in
     adb = androidenv.androidPkgs_9_0.platform-tools;
   };
 
-  adb-sync = callPackage ../development/mobile/adb-sync { };
+  adb-sync = callPackage ../development/mobile/adb-sync {
+    inherit (androidenv.androidPkgs_9_0) platform-tools;
+  };
 
   androidenv = callPackage ../development/mobile/androidenv {
     pkgs_i686 = pkgsi686Linux;

From b99ac1c9044809fa0fec342fceaaadeb08d4a669 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 5 Dec 2018 20:59:39 +0100
Subject: [PATCH 2317/2793] Remove redundant getBin function

---
 pkgs/development/mobile/adbfs-rootless/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
index 18ad3048d83..fffe2fbbcbe 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # very ugly way of replacing the adb calls
-    sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \
+    sed -e 's|"adb |"${adb}/bin/adb |g' \
         -i adbfs.cpp
   '';
 

From 3bfd3e73bfd46a112b8054bdd705f3afae7f71bf Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 5 Dec 2018 21:37:13 +0100
Subject: [PATCH 2318/2793] Reintroduce licenseAccepted option

---
 .../mobile/androidenv/compose-android-packages.nix       | 9 ++++++++-
 pkgs/development/mobile/androidenv/default.nix           | 3 ++-
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 9125d3140e2..690f9712a10 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686}:
+{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}:
 
 { toolsVersion ? "25.2.5"
 , platformToolsVersion ? "28.0.1"
@@ -20,6 +20,13 @@
 , includeExtras ? []
 }:
 
+if !licenseAccepted then throw ''
+    You must accept the Android Software Development Kit License Agreement at
+    https://developer.android.com/studio/terms
+    by setting nixpkgs config option 'android_sdk.accept_license = true;'
+  ''
+else assert licenseAccepted;
+
 let
   inherit (pkgs) stdenv fetchurl makeWrapper unzip;
 
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index b7aaccd3763..92560105422 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,11 +1,12 @@
 { pkgs ? import <nixpkgs> {}
 , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
+, licenseAccepted ? false
 }:
 
 rec {
   composeAndroidPackages = import ./compose-android-packages.nix {
     inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook;
-    inherit pkgs pkgs_i686;
+    inherit pkgs pkgs_i686 licenseAccepted;
   };
 
   buildApp = import ./build-app.nix {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba6d60fef87..679a9b05919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -831,7 +831,7 @@ in
 
   androidenv = callPackage ../development/mobile/androidenv {
     pkgs_i686 = pkgsi686Linux;
-    #licenseAccepted = (config.android_sdk.accept_license or false);
+    licenseAccepted = config.android_sdk.accept_license or false;
   };
 
   androidndkPkgs = androidndkPkgs_17c;

From 8122431953d5908024357ba3eeaed61a95d1a7cd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 5 Dec 2018 21:55:01 +0100
Subject: [PATCH 2319/2793] Fix adb program module

---
 nixos/modules/programs/adb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 942572cef9d..43700526ce9 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -16,7 +16,7 @@ with lib;
           To grant access to a user, it must be part of adbusers group:
           <code>users.users.alice.extraGroups = ["adbusers"];</code>
         '';
-        relatedPackages = [ ["androidenv" "platformTools"] ];
+        relatedPackages = [ ["androidenv" "androidPkgs_9_0" "platform-tools"] ];
       };
     };
   };
@@ -24,7 +24,7 @@ with lib;
   ###### implementation
   config = mkIf config.programs.adb.enable {
     services.udev.packages = [ pkgs.android-udev-rules ];
-    environment.systemPackages = [ pkgs.androidenv.platformTools ];
+    environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ];
     users.groups.adbusers = {};
   };
 }

From 47cc83dcc81e00e453c9f621098ee0f4a1697ad7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Dec 2018 16:00:00 -0500
Subject: [PATCH 2320/2793] playerctl: mark as broken on darwin

Build fails with:
../playerctl/playerctl-player.c:274:19: error: use of undeclared identifier 'CLOCK_MONOTONIC'
    clock_gettime(CLOCK_MONOTONIC, &player->priv->cached_position_monotonic);
---
 pkgs/tools/audio/playerctl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index 6bc15cb65d8..d1edbf94fe0 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ puffnfresh ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 51428627ebfdc7a98f6ab1a3d6e321eb57850b9a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 18 Dec 2018 22:58:12 +0100
Subject: [PATCH 2321/2793] Initial attempt to restore Android NDK cross
 building

---
 lib/systems/examples.nix                      |  6 +--
 .../androidndk-pkgs/androidndk-pkgs.nix       | 27 ++++++----
 pkgs/development/androidndk-pkgs/default.nix  | 54 +++++++++----------
 pkgs/top-level/all-packages.nix               |  7 ++-
 4 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 608db00a968..ac1633a1a15 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -47,7 +47,7 @@ rec {
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
     sdkVer = "21";
-    ndkVer = "10e";
+    ndkVer = "18b";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
@@ -55,7 +55,7 @@ rec {
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
     sdkVer = "24";
-    ndkVer = "17c";
+    ndkVer = "18b";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
@@ -63,7 +63,7 @@ rec {
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     sdkVer = "24";
-    ndkVer = "17c";
+    ndkVer = "18b";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index d4189fe8455..d423ae5f1c4 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -38,14 +38,16 @@ let
 
   hostInfo = ndkInfoFun stdenv.hostPlatform;
   targetInfo = ndkInfoFun stdenv.targetPlatform;
-
 in
 
 rec {
   # Misc tools
   binaries = let
       ndkBinDir =
-        "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
+        "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
+      ndkGCCLibDir =
+        "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x";
+
     in runCommand "ndk-gcc-binutils" {
       isGNU = true; # for cc-wrapper
       nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +56,15 @@ rec {
       mkdir -p $out/bin
       for prog in ${ndkBinDir}/${targetInfo.triple}-*; do
         prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
-        ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
+        cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF
+      #! ${stdenv.shell} -e
+      $prog "\$@"
+      EOF
+        chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
       done
+
+      ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld
+      ln -s ${ndkGCCLibDir} $out/lib
     '';
 
   binutils = wrapBintoolsWith {
@@ -109,18 +118,16 @@ rec {
   # anyways.
   libraries =
     let
-      includePath = if buildAndroidndk.version == "10e" then
-          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/"
-        else
-          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include";
-      libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
+      includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include";
+      asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}";
+      libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
     in
     runCommand "bionic-prebuilt" {} ''
       mkdir -p $out
       cp -r ${includePath} $out/include
+      chmod u+w $out/include
+      cp -r ${asmIncludePath}/* $out/include
       chmod +w $out/include
-      ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version)
-        "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"}
       ln -s ${libPath} $out/lib
     '';
 }
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index 1c34b1dff7d..341cdf72028 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -3,34 +3,32 @@
 }:
 
 rec {
+  "18b" =
+    let
+      ndkVersion = "18.1.5063045";
 
-  "17c" = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c;
-    androidndk = androidenv.androidndk_17c;
-    targetAndroidndkPkgs = targetPackages.androidndkPkgs_17c;
-  };
+      buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
+        includeNDK = true;
+        inherit ndkVersion;
+      };
 
-  "10e" = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
-    androidndk = androidenv.androidndk_10e;
-    targetAndroidndkPkgs = targetPackages.androidndkPkgs_10e;
-  };
+      androidComposition = androidenv.composeAndroidPackages {
+        includeNDK = true;
+        inherit ndkVersion;
+      };
+    in
+    import ./androidndk-pkgs.nix {
+      inherit (buildPackages)
+        makeWrapper;
+      inherit (pkgs)
+        lib stdenv
+        runCommand wrapBintoolsWith wrapCCWith;
+      # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+      # but for splicing messing up on infinite recursion for the variants we
+      # *dont't* use. Using this workaround, but also making a test to ensure
+      # these two really are the same.
+      buildAndroidndk = buildAndroidComposition.ndk-bundle;
+      androidndk = androidComposition.ndk-bundle;
+      targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b;
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679a9b05919..7ce0aed7670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -834,9 +834,8 @@ in
     licenseAccepted = config.android_sdk.accept_license or false;
   };
 
-  androidndkPkgs = androidndkPkgs_17c;
-  androidndkPkgs_17c = (callPackage ../development/androidndk-pkgs {})."17c";
-  androidndkPkgs_10e = (callPackage ../development/androidndk-pkgs {})."10e";
+  androidndkPkgs = androidndkPkgs_18b;
+  androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b";
 
   androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;
 
@@ -9353,7 +9352,7 @@ in
 
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = assert stdenv.hostPlatform.useAndroidPrebuilt;
-    androidenv."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries;
+    pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries;
 
   bobcat = callPackage ../development/libraries/bobcat { };
 

From b513231dc643f65db55bb32a5b25f67925b2fd94 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Fri, 30 Nov 2018 18:33:46 -0500
Subject: [PATCH 2322/2793] servant: Sphinx is a build-time dependency

---
 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 d2b9d566786..9e71044d823 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -736,7 +736,7 @@ self: super: {
           rev = "v${ver}";
           sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
         }}/doc";
-        buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
+        nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
         makeFlags = "html";
         installPhase = ''
           mv _build/html $out

From 6c6341335b26ac668a3c63c4f1c0c78ec5365138 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Dec 2018 23:44:23 +0100
Subject: [PATCH 2323/2793] nixos/test-driver: fix wording in error message
 about invalid node names

Since 113a6b9325b92d483e6c2f12c35c2887ab175a8d the test driver
explicitly ensures if the node names won't break the resulting Perl
script at runtime. This slightly improves the correctness of the error
message.
---
 nixos/lib/testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 96a42c2f305..57b4412d9bb 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -164,8 +164,8 @@ in rec {
       if lib.length invalidNodeNames > 0 then
         throw ''
           Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
-          All machines are references as perl variables in the testing framework which will break the
-          script when special characters are allowed.
+          All machines are referenced as perl variables in the testing framework which will break the
+          script when special characters are used.
 
           Please stick to alphanumeric chars and underscores as separation.
         ''

From 9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Wed, 19 Dec 2018 00:24:51 +0100
Subject: [PATCH 2324/2793] oxidized: 0.21.0 -> 0.25.0, drop obsolete patch
 (#52492)

This removes the patch for support of Dell X-series because
oxidized now includes a model for these switches.
---
 .../ruby-modules/gem-config/default.nix       |   7 -
 pkgs/tools/admin/oxidized/Gemfile             |   6 +-
 pkgs/tools/admin/oxidized/Gemfile.lock        |  51 +++---
 pkgs/tools/admin/oxidized/gemset.nix          | 146 ++++++++++++++----
 .../admin/oxidized/temporary-x-series.patch   |  22 ---
 5 files changed, 150 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/tools/admin/oxidized/temporary-x-series.patch

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 9a2aaa91ad8..3671605a407 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -270,13 +270,6 @@ in
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
   };
 
-  oxidized = attrs: {
-    postInstall = ''
-      cd "$(cat "$out/nix-support/gem-meta/install-path")"
-      patch -p1 < ${../../../tools/admin/oxidized/temporary-x-series.patch}
-    '';
-  };
-
   pango = attrs: {
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile
index 6a9a4254b11..dd41b89ad43 100644
--- a/pkgs/tools/admin/oxidized/Gemfile
+++ b/pkgs/tools/admin/oxidized/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'oxidized'
-gem 'oxidized-web'
-gem 'oxidized-script'
+gem 'oxidized', '0.25.0'
+gem 'oxidized-web', '0.12.0'
+gem 'oxidized-script', '0.6.0'
diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock
index e4bdf5ccf39..d0c808fd2cd 100644
--- a/pkgs/tools/admin/oxidized/Gemfile.lock
+++ b/pkgs/tools/admin/oxidized/Gemfile.lock
@@ -2,43 +2,51 @@ GEM
   remote: https://rubygems.org/
   specs:
     asetus (0.3.0)
-    backports (3.11.2)
+    backports (3.11.4)
+    charlock_holmes (0.7.6)
     emk-sinatra-url-for (0.2.1)
       sinatra (>= 0.9.1.1)
-    ffi (1.9.23)
-    haml (4.0.7)
+    ffi (1.9.25)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
     htmlentities (4.3.4)
+    json (2.1.0)
     multi_json (1.13.1)
     net-ssh (4.1.0)
-    oxidized (0.21.0)
+    net-telnet (0.1.1)
+    oxidized (0.25.0)
       asetus (~> 0.1)
       net-ssh (~> 4.1.0)
+      net-telnet (~> 0.1.1)
       rugged (~> 0.21, >= 0.21.4)
       slop (~> 3.5)
-    oxidized-script (0.5.0)
-      oxidized (~> 0.21.0)
+    oxidized-script (0.6.0)
+      oxidized (~> 0.25)
       slop (~> 3.5)
-    oxidized-web (0.9.3)
+    oxidized-web (0.12.0)
+      charlock_holmes (~> 0.7.5)
       emk-sinatra-url-for (~> 0.2)
-      haml (~> 4.0)
+      haml (~> 5.0)
       htmlentities (~> 4.3)
-      oxidized (~> 0.21.0)
-      puma (~> 3)
+      json (>= 1.7.0)
+      oxidized (~> 0.25)
+      puma (~> 3.11.4)
+      rack-test (~> 0.7.0)
       sass (~> 3.3)
       sinatra (~> 1.4, >= 1.4.6)
       sinatra-contrib (~> 1.4, >= 1.4.6)
-    puma (3.11.3)
+    puma (3.11.4)
     rack (1.6.11)
     rack-protection (1.5.5)
       rack
-    rack-test (1.0.0)
+    rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rugged (0.27.0)
-    sass (3.5.6)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rugged (0.27.7)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -55,15 +63,16 @@ GEM
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    tilt (2.0.8)
+    temple (0.8.0)
+    tilt (2.0.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  oxidized
-  oxidized-script
-  oxidized-web
+  oxidized (= 0.25.0)
+  oxidized-script (= 0.6.0)
+  oxidized-web (= 0.12.0)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1
diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix
index 5a8b2ecefdc..e965e40530b 100644
--- a/pkgs/tools/admin/oxidized/gemset.nix
+++ b/pkgs/tools/admin/oxidized/gemset.nix
@@ -1,5 +1,7 @@
 {
   asetus = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790";
@@ -8,15 +10,29 @@
     version = "0.3.0";
   };
   backports = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz";
+      sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g";
       type = "gem";
     };
-    version = "3.11.2";
+    version = "3.11.4";
+  };
+  charlock_holmes = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      type = "gem";
+    };
+    version = "0.7.6";
   };
   emk-sinatra-url-for = {
     dependencies = ["sinatra"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
@@ -25,23 +41,29 @@
     version = "0.2.1";
   };
   ffi = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
       type = "gem";
     };
-    version = "1.9.23";
+    version = "1.9.25";
   };
   haml = {
-    dependencies = ["tilt"];
+    dependencies = ["temple" "tilt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
       type = "gem";
     };
-    version = "4.0.7";
+    version = "5.0.4";
   };
   htmlentities = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@@ -49,7 +71,19 @@
     };
     version = "4.3.4";
   };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
   multi_json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
@@ -58,6 +92,8 @@
     version = "1.13.1";
   };
   net-ssh = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
@@ -65,42 +101,62 @@
     };
     version = "4.1.0";
   };
-  oxidized = {
-    dependencies = ["asetus" "net-ssh" "rugged" "slop"];
+  net-telnet = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0";
+      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
       type = "gem";
     };
-    version = "0.21.0";
+    version = "0.1.1";
+  };
+  oxidized = {
+    dependencies = ["asetus" "net-ssh" "net-telnet" "rugged" "slop"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i8lbzjay60jpk6g86rpk59j4r0kyd1nnm79qdh64qvx6hy02ylq";
+      type = "gem";
+    };
+    version = "0.25.0";
   };
   oxidized-script = {
     dependencies = ["oxidized" "slop"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp";
+      sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.6.0";
   };
   oxidized-web = {
-    dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"];
+    dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9";
+      sha256 = "12ib7380sh9ca7qirw1yhs8di2vv38l09imqaamibdzgmk0rvs1r";
       type = "gem";
     };
-    version = "0.9.3";
+    version = "0.12.0";
   };
   puma = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd";
+      sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10";
       type = "gem";
     };
-    version = "3.11.3";
+    version = "3.11.4";
   };
   rack = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
@@ -110,6 +166,8 @@
   };
   rack-protection = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
@@ -119,14 +177,18 @@
   };
   rack-test = {
     dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1";
+      sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "0.7.0";
   };
   rb-fsevent = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
@@ -136,32 +198,40 @@
   };
   rb-inotify = {
     dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
       type = "gem";
     };
-    version = "0.9.10";
+    version = "0.10.0";
   };
   rugged = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
+      sha256 = "0znb9n1grdsqf22jqzwin58kyq7x7ml57h6pf48j219f8by21sj6";
       type = "gem";
     };
-    version = "0.27.0";
+    version = "0.27.7";
   };
   sass = {
     dependencies = ["sass-listen"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      sha256 = "1phs6hnd8b95m7n5wbh5bsclmwaajd1sqlgw9fmj72bfqldbmcqa";
       type = "gem";
     };
-    version = "3.5.6";
+    version = "3.7.2";
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
@@ -171,6 +241,8 @@
   };
   sinatra = {
     dependencies = ["rack" "rack-protection" "tilt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -180,6 +252,8 @@
   };
   sinatra-contrib = {
     dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr";
@@ -188,6 +262,8 @@
     version = "1.4.7";
   };
   slop = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
@@ -195,12 +271,24 @@
     };
     version = "3.6.0";
   };
-  tilt = {
+  temple = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
       type = "gem";
     };
-    version = "2.0.8";
+    version = "0.8.0";
+  };
+  tilt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+      type = "gem";
+    };
+    version = "2.0.9";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch
deleted file mode 100644
index bf7ee992db1..00000000000
--- a/pkgs/tools/admin/oxidized/temporary-x-series.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
-index f602a36..3bac2d1 100644
---- a/lib/oxidized/model/powerconnect.rb
-+++ b/lib/oxidized/model/powerconnect.rb
-@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model
- 
-   comment  '! '
- 
--  expect /^\s*--More--\s+.*$/ do |data, re|
-+  expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re|
-      send ' '
-      data.sub re, ''
-   end
-@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model
-     skip_blocks = 0
-     cfg.each_line do |line|
-       # If this is a stackable switch we should skip this block of information
--      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
-+      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i)
-         skip_blocks = 1
-         # Some switches have another empty line. This is identified by this line having a colon
-         skip_blocks = 2 if line.match /:/

From f500a83e93864a5b5641be49959932dd598b1a1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Dec 2018 15:49:02 -0800
Subject: [PATCH 2325/2793] qtbitcointrader: 1.40.23 -> 1.40.30

* qtbitcointrader: 1.40.23 -> 1.40.30 (#52077)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qtbitcointrader/versions

* qtbitcointrader: cleanup
use fetchzip on GitHub archive tarball
---
 .../misc/qtbitcointrader/default.nix          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 4865ed7ee00..444c72602d3 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, qt5 }:
+{ stdenv, fetchzip, qt5 }:
 
 let
-  version = "1.40.23";
+  version = "1.40.30";
 in
 stdenv.mkDerivation {
   name = "qtbitcointrader-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
-    sha256 = "11r2jzb09a62hf9fkg6aw8pg2js8c87k6lba9xz2q8n6d6jv44r1";
+    sha256 = "0xbgdmwb8d3lrddcnx2amfsknd3g408f5gy5mdydcm3vqqfi9a0c";
   };
 
   buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ];
@@ -25,11 +25,11 @@ stdenv.mkDerivation {
     runHook postConfigure
   '';
 
-  meta = with stdenv.lib;
-    { description = "Bitcoin trading client";
-      homepage = https://centrabit.com/;
-      license = licenses.lgpl3;
-      platforms = qt5.qtbase.meta.platforms;
-      maintainers = [ maintainers.ehmry ];
-    };
+  meta = with stdenv.lib; {
+    description = "Bitcoin trading client";
+    homepage = https://centrabit.com/;
+    license = licenses.gpl3;
+    platforms = qt5.qtbase.meta.platforms;
+    maintainers = [ maintainers.ehmry ];
+  };
 }

From 04405f65f96d8d753fb21335759587cd7b897d3f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 18 Dec 2018 23:25:53 +0100
Subject: [PATCH 2326/2793] brlaser: fix $out

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

diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 08cc222e4a5..39a115298f5 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib cups ];
 
-  cmakeFlags = [ "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ];
+  cmakeFlags = [ "-DCUPS_SERVER_BIN=${placeholder "out"}/lib/cups" "-DCUPS_DATA_DIR=${placeholder "out"}/share/cups" ];
 
   meta = with stdenv.lib; {
     description = "A CUPS driver for Brother laser printers";

From e5d6f9e329e32280dc0a57e659b84e9c32a59506 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 03:11:18 -0800
Subject: [PATCH 2327/2793] clickhouse: 18.14.9 -> 18.14.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/clickhouse/versions
---
 pkgs/servers/clickhouse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 88907231d6e..b53c6388d18 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
-  version = "18.14.9";
+  version = "18.14.18";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "1dsqwihh48fgsjy3jmfjk5271dw3052agw5wpfdm054nkkych86i";
+    sha256 = "0nivnmlnamcjxwc66ja9fagi5fqzzjsnrrfk32f4g8sxffx2rjy3";
   };
 
   nativeBuildInputs = [ cmake libtool ninja ];

From 0c06faef52a763821c7e586cad87c652656ad6a1 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Dec 2018 16:44:12 -0500
Subject: [PATCH 2328/2793] vscode: 1.30.0 -> 1.30.1

---
 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 35fe273cdac..167a8fe7b70 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -12,9 +12,9 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "0bd2jdn67vnbhrsqy54bymz4di3fw3p18ni5j2wikqkl4d9h4jj1";
-    "x86_64-linux" = "1zbnyff0q15xkvkrs14rfgyn6xb9v0xivcnbl8yckl71s45vb2l1";
-    "x86_64-darwin" = "1qgzhpfzcwym1qyzx2v14336l106hzhs7ii84g356vxkm219x7kw";
+    "i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b";
+    "x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a";
+    "x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4";
   }.${stdenv.hostPlatform.system};
 
   archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -31,7 +31,7 @@ let
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
-    version = "1.30.0";
+    version = "1.30.1";
 
     src = fetchurl {
       name = "VSCode_${version}_${plat}.${archive_fmt}";

From 88f22c34845ceb4dad42ed49ae0334a6bef1f6bf Mon Sep 17 00:00:00 2001
From: Tristan Konolige <tristan.konolige@gmail.com>
Date: Tue, 18 Dec 2018 17:53:18 -0700
Subject: [PATCH 2329/2793] mpich: Add darwin support

---
 pkgs/development/libraries/mpich/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index bab52e0fbe0..ffe6b5edf96 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -23,17 +23,18 @@ stdenv.mkDerivation  rec {
   doCheck = true;
 
   preFixup = ''
+    # Ensure the default compilers are the ones mpich was built with
+    sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
+    sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
+    sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
+  ''
+  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     # /tmp/nix-build... ends up in the RPATH, fix it manually
     for entry in $out/bin/mpichversion $out/bin/mpivars; do
       echo "fix rpath: $entry"
       patchelf --set-rpath "$out/lib" $entry
     done
-
-    # Ensure the default compilers are the ones mpich was built with
-    sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
-    sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
-    sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
-  '';
+    '';
 
   meta = with stdenv.lib; {
     description = "Implementation of the Message Passing Interface (MPI) standard";
@@ -49,6 +50,6 @@ stdenv.mkDerivation  rec {
       fullName = "MPICH license (permissive)";
     };
     maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From a0d15a0c684f1e493237f014325fbf9de46c754e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 19 Dec 2018 01:19:08 +0000
Subject: [PATCH 2330/2793] mirrors.nix: remove bad cpan mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 2d29728dd95..6ee9ceb5286 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -159,12 +159,8 @@ rec {
 
   # CPAN mirrors.
   cpan = [
-    https://ftp.gwdg.de/pub/languages/perl/CPAN/
-    https://download.xs4all.nl/mirror/CPAN/
     https://cpan.metacpan.org/
     https://cpan.perl.org/
-    http://ftp.tuwien.ac.at/pub/CPAN/
-    http://ftp.funet.fi/pub/CPAN/
     http://backpan.perl.org/  # for old releases
   ];
 

From 946e6af857e84c723ad98e3882242c5e9968e0f2 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 1 Dec 2018 18:52:13 +0200
Subject: [PATCH 2331/2793] wine{Unstable,Staging}: 3.20 -> 4.0-rc2

Disabling the build of regression tests was proposed in #51341
but this change has been postponed until we reach a concensus.
---
 pkgs/misc/emulators/wine/sources.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 6ca22e261ee..5533c8d54a5 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.20";
-    url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik";
+    version = "4.0-rc2";
+    url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
+    sha256 = "0apqavsk1y56b6c4zkjpi014xwgn6gjg6pzjx94qy4nfr1gz63n4";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p";
+    sha256 = "1vqvy44h9rwfx32pad831kdyhazn68s8r14w8765ly42rixc6dgj";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 825c7d7f402bf0cef7d518a12c575e649aed8518 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 07:58:59 -0800
Subject: [PATCH 2332/2793] brave: 0.56.15 -> 0.57.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/brave/versions
---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index f167980f0bf..409196715d6 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -74,11 +74,11 @@ let rpath = lib.makeLibraryPath [
 
 in stdenv.mkDerivation rec {
     pname = "brave";
-    version = "0.56.15";
+    version = "0.57.18";
 
     src = fetchurl {
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        sha256 = "1d18fgnxcgl95bhkgfqjyv4p81q6fciqibd3ss4vwh1ljjy1fv76";
+        sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7";
     };
 
     dontConfigure = true;

From e3a931c41eca8ccb988ceba2395b973568d991fc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Dec 2018 11:27:21 -0500
Subject: [PATCH 2333/2793] brave: add at-spi2-core

Also correct the style.
---
 .../networking/browsers/brave/default.nix     | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 409196715d6..ec5b34da0a6 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -1,44 +1,46 @@
-{ stdenv, lib, fetchurl,
-  dpkg,
-  alsaLib,
-  at-spi2-atk,
-  atk,
-  cairo,
-  cups,
-  dbus,
-  expat,
-  fontconfig,
-  freetype,
-  gdk_pixbuf,
-  glib,
-  gnome2,
-  gnome3,
-  gtk3,
-  libuuid,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libXtst,
-  nspr,
-  nss,
-  pango,
-  udev,
-  xorg,
-  zlib,
-  xdg_utils,
-  wrapGAppsHook
+{ stdenv, lib, fetchurl
+, dpkg
+, alsaLib
+, at-spi2-atk
+, at-spi2-core
+, atk
+, cairo
+, cups
+, dbus
+, expat
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gnome2
+, gnome3
+, gtk3
+, libuuid
+, libX11
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXrandr
+, libXrender
+, libXScrnSaver
+, libXtst
+, nspr
+, nss
+, pango
+, udev
+, xorg
+, zlib
+, xdg_utils
+, wrapGAppsHook
 }:
 
 let rpath = lib.makeLibraryPath [
     alsaLib
     at-spi2-atk
+    at-spi2-core
     atk
     cairo
     cups
@@ -50,8 +52,8 @@ let rpath = lib.makeLibraryPath [
     glib
     gnome2.GConf
     gtk3
-    libuuid
     libX11
+    libXScrnSaver
     libXcomposite
     libXcursor
     libXdamage
@@ -60,15 +62,15 @@ let rpath = lib.makeLibraryPath [
     libXi
     libXrandr
     libXrender
-    libXScrnSaver
     libXtst
+    libuuid
     nspr
     nss
     pango
     udev
+    xdg_utils
     xorg.libxcb
     zlib
-    xdg_utils
 ];
 
 

From b9307eddd67e0e3f087dec608ccc84fec72deda5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 18 Dec 2018 12:05:33 +0100
Subject: [PATCH 2334/2793] zeroad: fix build with spidermonkey-38.8.0

---
 pkgs/games/0ad/game.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index d05f19d3171..ab9ffd0470b 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -33,11 +33,15 @@ stdenv.mkDerivation rec {
     "-I${SDL2}/include/SDL2"
   ];
 
-  patches = [ ./rootdir_env.patch ];
-
-  postPatch = ''
-    sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
-  '';
+  patches = [
+    ./rootdir_env.patch
+    # Fixes build with spidermonkey-38.8.0, includes the minor version check:
+    # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b
+    (fetchurl {
+      url = https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch;
+      sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa";
+    })
+  ];
 
   configurePhase = ''
     # Delete shipped libraries which we don't need.

From 7c2d6388022cd53622e3bb558c0c8706f7564279 Mon Sep 17 00:00:00 2001
From: Eamonn Coughlan <eamonn+nix@rxd4.com>
Date: Wed, 12 Dec 2018 11:52:34 +0100
Subject: [PATCH 2335/2793] ipykernel: fix permissions when installing kernels

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

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 43b1c9fd034..b4daf5a6ecb 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , ipython
 , jupyter_client
 , traitlets
@@ -23,6 +24,14 @@ buildPythonPackage rec {
   checkInputs = [ pytest nose ];
   propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
 
+  # https://github.com/ipython/ipykernel/pull/377
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/ipython/ipykernel/commit/a3bf849dbd368a1826deb9dfc94c2bd3e5ed04fe.patch";
+      sha256 = "1yhpwqixlf98a3n620z92mfips3riw6psijqnc5jgs2p58fgs2yc";
+    })
+  ];
+
   checkPhase = ''
     HOME=$(mktemp -d) pytest ipykernel
   '';

From 6e87da96c34f56cb764db9627477acd2e251339f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Dec 2018 00:01:34 -0800
Subject: [PATCH 2336/2793] fdk_aac: 0.1.6 -> 2.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/fdk-aac/versions
---
 pkgs/development/libraries/fdk-aac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 903f43b1e68..9b7cea3ebbc 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "fdk-aac-${version}";
-  version = "0.1.6";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
-    sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma";
+    sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
   };
 
   configureFlags = [ ]

From 857737036704b71ebcb5a70b09d7b87d86477330 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 23:03:40 -0800
Subject: [PATCH 2337/2793] flrig: 1.3.40 -> 1.3.41

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

diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix
index baee3010d69..64d2677d4e1 100644
--- a/pkgs/applications/misc/flrig/default.nix
+++ b/pkgs/applications/misc/flrig/default.nix
@@ -6,13 +6,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.40";
+  version = "1.3.41";
   pname = "flrig";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${name}.tar.gz";
-    sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9";
+    sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4";
   };
 
   buildInputs = [

From 58f1f9f0fc56e1013b713db059e071b4cc65ea45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 22:40:54 -0800
Subject: [PATCH 2338/2793] freetds: 1.00.104 -> 1.00.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/freetds/versions
---
 pkgs/development/libraries/freetds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 03324d54899..7ad5680c75c 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
   name = "freetds-${version}";
-  version = "1.00.104";
+  version = "1.00.109";
 
   src = fetchurl {
     url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
-    sha256 = "0mlg027mppv2348f4wwdpxpac9baqkdsg7xqx21kyx5dx5kmr71g";
+    sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry";
   };
 
   buildInputs = [

From 28fdb4eb115719135625ffa500640cd8a320a4b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 17:26:27 -0800
Subject: [PATCH 2339/2793] pipenv: 2018.11.14 -> 2018.11.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/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 46b77a2b998..30d8992bb98 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.11.14";
+    version = "2018.11.26";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1ni2cjgm04dwi8a0376nzwwy3gklqk9d0hkl8d9j760lvqshsxjz";
+      sha256 = "0ip8zsrwmhrankrix0shig9g8q2knmr7b63sh7lqa8a5x03fcwx6";
     };
 
     LC_ALL = "en_US.UTF-8";

From 4b06edd148fcc3ac74a2c7dc6295d660a4553f6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 16:09:19 -0800
Subject: [PATCH 2340/2793] python37Packages.aioconsole: 0.1.10 -> 0.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/python3.7-aioconsole/versions
---
 pkgs/development/python-modules/aioconsole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 0f2740a90d8..bbfd08e03aa 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a";
+    sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio

From 85379a29ec289dff040e1f8e3f4cec9374af70ef Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 15 May 2018 01:46:47 -0400
Subject: [PATCH 2341/2793] pypy3: init at 6.0.0

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 doc/languages-frameworks/python.section.md    |  10 +-
 maintainers/maintainer-list.nix               |   5 +
 .../interpreters/python/pypy/3/default.nix    | 138 ++++++++++++++++++
 .../python/pypy/3/tk_tcl_paths.patch          |  17 +++
 pkgs/top-level/all-packages.nix               |  11 +-
 pkgs/top-level/python-packages.nix            |   2 +-
 6 files changed, 177 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/pypy/3/default.nix
 create mode 100644 pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index eefe46b15de..3e4e12665bd 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -484,10 +484,12 @@ and in this case the `python35` interpreter is automatically used.
 ### Interpreters
 
 Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
-respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
-interpreter is available as `pypy`. The aliases `python2` and `python3`
-correspond to respectively `python27` and `python37`. The default interpreter,
-`python`, maps to `python2`. The Nix expressions for the interpreters can be
+respectively `python27`, `python35`, `python36` and `python37`. The aliases
+`python2` and `python3` correspond to respectively `python27` and
+`python37`. The default interpreter, `python`, maps to `python2`. The PyPy
+interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
+`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to
+`pypy2`. The Nix expressions for the interpreters can be
 found in `pkgs/development/interpreters/python`.
 
 All packages depending on any Python interpreter get appended
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9c47599b73e..60cb3cd5c7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -256,6 +256,11 @@
     github = "AndrewMorsillo";
     name = "Andrew Morsillo";
   };
+  andersk = {
+    email = "andersk@mit.edu";
+    github = "andersk";
+    name = "Anders Kaseorg";
+  };
   AndersonTorres = {
     email = "torres.anderson.85@protonmail.com";
     github = "AndersonTorres";
diff --git a/pkgs/development/interpreters/python/pypy/3/default.nix b/pkgs/development/interpreters/python/pypy/3/default.nix
new file mode 100644
index 00000000000..23e239d925b
--- /dev/null
+++ b/pkgs/development/interpreters/python/pypy/3/default.nix
@@ -0,0 +1,138 @@
+{ stdenv, substituteAll, fetchurl
+, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
+, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
+, makeWrapper, callPackage, self, gdbm, db, lzma
+, python-setup-hook
+# For the Python package set
+, packageOverrides ? (self: super: {})
+}:
+
+assert zlibSupport -> zlib != null;
+
+let
+  version = "6.0.0";
+  pythonVersion = "3.5";
+  libPrefix = "pypy${pythonVersion}";
+  sitePackages = "site-packages";
+
+  pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
+
+in stdenv.mkDerivation rec {
+  name = "pypy3-${version}";
+  inherit version pythonVersion;
+
+  src = fetchurl {
+    url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
+    sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg";
+  };
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [
+    bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db lzma
+  ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
+    ++ stdenv.lib.optional zlibSupport zlib;
+
+  hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+
+  C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs;
+  LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs;
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
+
+  patches = [
+    (substituteAll {
+      src = ./tk_tcl_paths.patch;
+      inherit tk tcl;
+      tk_dev = tk.dev;
+      tcl_dev = tcl;
+      tk_libprefix = tk.libPrefix;
+      tcl_libprefix = tcl.libPrefix;
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace "lib-python/3/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+
+    # hint pypy to find nix ncurses
+    substituteInPlace pypy/module/_minimal_curses/fficurses.py \
+      --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
+      --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
+      --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
+      --replace "libraries=['curses']" "libraries=['ncurses']"
+
+    sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
+  '';
+
+  buildPhase = ''
+    ${pythonForPypy.interpreter} rpython/bin/rpython \
+      --make-jobs="$NIX_BUILD_CORES" \
+      -Ojit \
+      --batch pypy/goal/targetpypystandalone.py
+  '';
+
+  setupHook = python-setup-hook sitePackages;
+
+  doCheck = true;
+  checkPhase = ''
+    export TERMINFO="${ncurses.out}/share/terminfo/";
+    export TERM="xterm";
+    export HOME="$TMPDIR";
+    # disable asyncio due to https://github.com/NixOS/nix/issues/1238
+    # disable os due to https://github.com/NixOS/nixpkgs/issues/10496
+    # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594
+    # disable shutils because it assumes gid 0 exists
+    # disable socket because it has two actual network tests that fail
+    # disable tarfile because it assumes gid 0 exists
+    ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./pypy3-c -k 'not ( test_asyncio or test_os or test_pathlib or test_shutil or test_socket or test_tarfile )' lib-python
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,include,lib,pypy3-c}
+
+    cp -R {include,lib_pypy,lib-python,pypy3-c} $out/pypy3-c
+    cp libpypy3-c.so $out/lib/
+    ln -s $out/pypy3-c/pypy3-c $out/bin/pypy3
+
+    # other packages expect to find stuff according to libPrefix
+    ln -s $out/pypy3-c/include $out/include/${libPrefix}
+    ln -s $out/pypy3-c/lib-python/3 $out/lib/${libPrefix}
+
+    # We must wrap the original, not the symlink.
+    # PyPy uses argv[0] to find its standard library, and while it knows
+    # how to follow symlinks, it doesn't know about wrappers. So, it
+    # will think the wrapper is the original. As long as the wrapper has
+    # the same path as the original, this is OK.
+    wrapProgram "$out/pypy3-c/pypy3-c" \
+      --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \
+      --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib"
+
+    # verify cffi modules
+    $out/bin/pypy3 -c "import tkinter;import sqlite3;import curses;import lzma"
+
+    # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
+    echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+  '';
+
+  passthru = let
+    pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+  in rec {
+    inherit zlibSupport libPrefix sitePackages;
+    executable = "pypy3";
+    isPypy = true;
+    isPy3 = true;
+    isPy35 = true;
+    buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
+    interpreter = "${self}/bin/${executable}";
+    withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+    pkgs = pythonPackages;
+  };
+
+  enableParallelBuilding = true;  # almost no parallelization without STM
+
+  meta = with stdenv.lib; {
+    homepage = http://pypy.org/;
+    description = "Fast, compliant alternative implementation of the Python language (3.5.3)";
+    license = licenses.mit;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = with maintainers; [ andersk ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch
new file mode 100644
index 00000000000..92bbfc557b3
--- /dev/null
+++ b/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch
@@ -0,0 +1,17 @@
+--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py	2017-10-03 11:49:20.000000000 +0100
++++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py	2017-11-21 13:20:51.398607530 +0000
+@@ -24,11 +24,11 @@
+ else:
+     # On some Linux distributions, the tcl and tk libraries are
+     # stored in /usr/include, so we must check this case also
+-    libdirs = []
++    libdirs = ["@tcl@/lib", "@tk@/lib"]
+     found = False
+     for _ver in ['', '8.6', '8.5']:
+-        incdirs = ['/usr/include/tcl' + _ver]
+-        linklibs = ['tcl' + _ver, 'tk' + _ver]
++        incdirs = ['@tcl_dev@/include', '@tk_dev@/include']
++        linklibs = ['@tcl_libprefix@', '@tk_libprefix@']
+         if os.path.isdir(incdirs[0]):
+             found = True
+             break
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90f9372a916..933f83c90d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7950,7 +7950,8 @@ in
   python = python2;
   python2 = python27;
   python3 = python37;
-  pypy = pypy27;
+  pypy = pypy2;
+  pypy2 = pypy27;
 
   # Python interpreter that is build with all modules, including tkinter.
   # These are for compatibility and should not be used inside Nixpkgs.
@@ -7989,6 +7990,11 @@ in
     python = python27.override{x11Support=true;};
     db = db.override { dbmSupport = true; };
   };
+  pypy3 = callPackage ../development/interpreters/python/pypy/3 {
+    self = pypy3;
+    python = python27;
+    db = db.override { dbmSupport = true; };
+  };
 
   # Python package sets.
   python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
@@ -7996,6 +8002,9 @@ in
   python36Packages = python36.pkgs;
   python37Packages = recurseIntoAttrs python37.pkgs;
   pypyPackages = pypy.pkgs;
+  pypy2Packages = pypy2.pkgs;
+  pypy27Packages = pypy27.pkgs;
+  pypy3Packages = pypy3.pkgs;
 
   update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 735718b96ce..66ca01dc7b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26,7 +26,7 @@ let
   isPy35 = python.pythonVersion == "3.5";
   isPy36 = python.pythonVersion == "3.6";
   isPy37 = python.pythonVersion == "3.7";
-  isPyPy = python.executable == "pypy";
+  isPyPy = strings.substring 0 4 python.executable == "pypy";
   isPy3k = strings.substring 0 1 python.pythonVersion == "3";
 
   callPackage = pkgs.newScope self;

From a06b90a7dc683f303f2135c8dc849616a11b161a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 19 Dec 2018 09:59:32 +0100
Subject: [PATCH 2342/2793] lapp: change postgresql version, fixes metrics

---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index e6abd003e88..ec3f411e8e7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -273,7 +273,7 @@ in rec {
       { services.httpd.enable = true;
         services.httpd.adminAddr = "foo@example.org";
         services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql_9_3;
+        services.postgresql.package = pkgs.postgresql;
         environment.systemPackages = [ pkgs.php ];
       });
   };

From a9e654e1bd4fff55e54a49aebcd700da3cf7594e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 19 Dec 2018 10:11:17 +0100
Subject: [PATCH 2343/2793] Revert "adoptopenjdk: autogenerate sources + add
 support for aarch64 (#52454)"

This reverts commit f2dfe8b9e61a17a68190e11e6d1153a264144605, reversing
changes made to e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.

The `openj9` attribute is missing for `jre` in case of `mac`. This missing
attribute is now blocking the channels from updating.

cc @bennofs
---
 .../adoptopenjdk-bin/generate-sources.py      | 69 --------------
 .../adoptopenjdk-bin/jdk-darwin-base.nix      | 11 ++-
 .../adoptopenjdk-bin/jdk-linux-base.nix       | 13 +--
 .../adoptopenjdk-bin/jdk11-darwin.nix         | 44 ++++++++-
 .../adoptopenjdk-bin/jdk11-linux.nix          | 44 ++++++++-
 .../compilers/adoptopenjdk-bin/sources.json   | 94 -------------------
 6 files changed, 91 insertions(+), 184 deletions(-)
 delete mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
deleted file mode 100755
index 66e1abd05e9..00000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
-
-import json
-import re
-import requests
-import sys
-
-releases = ["openjdk11"]
-oses = ["mac", "linux"]
-types = ["jre", "jdk"]
-impls = ["hotspot", "openj9"]
-
-arch_to_nixos = {
-    "x64": "x86_64",
-    "aarch64": "aarch64",
-}
-
-def get_sha256(url):
-    resp = requests.get(url)
-    if resp.status_code != 200:
-        print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr)
-        sys.exit(1)
-    return resp.text.strip().split(" ")[0]
-
-RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
-def generate_sources(release, assets):
-    out = {}
-    for asset in assets:
-        if asset["os"] not in oses: continue
-        if asset["binary_type"] not in types: continue
-        if asset["openjdk_impl"] not in impls: continue
-        if asset["heap_size"] != "normal": continue
-        if asset["architecture"] not in arch_to_nixos: continue
-
-        version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
-
-        type_map = out.setdefault(asset["os"], {})
-        impl_map = type_map.setdefault(asset["binary_type"], {})
-        arch_map = impl_map.setdefault(asset["openjdk_impl"], {
-            "version": version,
-            "build": build,
-            "packageType": asset["binary_type"],
-            "vmType": asset["openjdk_impl"],
-        })
-
-        if arch_map["version"] != version or arch_map["build"] != build:
-            print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
-                arch_map["version"], arch_map["build"], version, build
-            ), file=sys.stderr)
-            sys.exit(1)
-
-        arch_map[arch_to_nixos[asset["architecture"]]] = {
-            "url": asset["binary_link"],
-            "sha256": get_sha256(asset["checksum_link"]),
-        }
-
-    return out
-
-out = {}
-for release in releases:
-    resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
-    if resp.status_code != 200:
-        print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
-        sys.exit(1)
-    out[release] = generate_sources(release, resp.json())
-
-with open("sources.json", "w") as f:
-    json.dump(out, f, indent=2, sort_keys=True)
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 958f36d3928..c2c13649f88 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,4 +1,7 @@
-sourcePerArch:
+{ name
+, url
+, sha256
+}:
 
 { swingSupport ? true # not used for now
 , stdenv
@@ -6,12 +9,10 @@ sourcePerArch:
 }:
 
 let result = stdenv.mkDerivation rec {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
+  inherit name;
 
   src = fetchurl {
-    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
+    inherit url sha256;
   };
 
   # See: https://github.com/NixOS/patchelf/issues/10
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index eb614b0784f..cf38ca9eaeb 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,4 +1,7 @@
-sourcePerArch:
+{ name
+, url
+, sha256
+}:
 
 { swingSupport ? true
 , stdenv
@@ -45,12 +48,10 @@ let
 in
 
 let result = stdenv.mkDerivation rec {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
+  inherit name;
 
   src = fetchurl {
-    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
+    inherit url sha256;
   };
 
   nativeBuildInputs = [ file ];
@@ -111,7 +112,7 @@ let result = stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
+    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
     maintainers = with stdenv.lib.maintainers; [ taku0 ];
   };
 
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index d1db77215d1..573f5e175ec 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -1,9 +1,43 @@
 let
-  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+
+    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
+
+    inherit sha256;
+  };
 in
 {
-  jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
-  jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
-  jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
-  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
+  jdk-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
+  };
+  jre-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
+  };
+  jdk-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jdk";
+    vmType = "openj9";
+    sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
+  };
+  jre-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jre";
+    vmType = "openj9";
+    sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
+  };
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
index 755ffaab271..f4990b6effc 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -1,9 +1,43 @@
 let
-  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+
+    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
+
+    inherit sha256;
+  };
 in
 {
-  jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
-  jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
-  jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
-  jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
+  jdk-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
+  };
+  jre-hotspot = makePackage {
+    version = "11";
+    buildNumber = "28";
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
+  };
+  jdk-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jdk";
+    vmType = "openj9";
+    sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
+  };
+  jre-openj9 = makePackage {
+    version = "11.0.1";
+    buildNumber = "13";
+    packageType = "jre";
+    vmType = "openj9";
+    sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
+  };
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
deleted file mode 100644
index bacb468c0ec..00000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "openjdk11": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
-          },
-          "build": "13",
-          "packageType": "jdk",
-          "version": "11.0.1",
-          "vmType": "hotspot",
-          "x86_64": {
-            "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
-          }
-        },
-        "openj9": {
-          "build": "13",
-          "packageType": "jdk",
-          "version": "11.0.1",
-          "vmType": "openj9",
-          "x86_64": {
-            "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
-          },
-          "build": "28",
-          "packageType": "jre",
-          "version": "11",
-          "vmType": "hotspot",
-          "x86_64": {
-            "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
-          }
-        },
-        "openj9": {
-          "build": "28",
-          "packageType": "jre",
-          "version": "11",
-          "vmType": "openj9",
-          "x86_64": {
-            "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "build": "13",
-          "packageType": "jdk",
-          "version": "11.0.1",
-          "vmType": "hotspot",
-          "x86_64": {
-            "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
-          }
-        },
-        "openj9": {
-          "build": "13",
-          "packageType": "jdk",
-          "version": "11.0.1",
-          "vmType": "openj9",
-          "x86_64": {
-            "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "build": "28",
-          "packageType": "jre",
-          "version": "11",
-          "vmType": "hotspot",
-          "x86_64": {
-            "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file

From 5fda32e6f1a683d4670a8b497f2feac3cf13fedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 19 Dec 2018 10:23:40 +0100
Subject: [PATCH 2344/2793] python.pkgs.mt-940: 4.10.0 -> 4.12.2

---
 .../python-modules/mt-940/default.nix         | 30 ++++++++++---------
 .../python-modules/mt-940/no-coverage.patch   | 26 ----------------
 2 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mt-940/no-coverage.patch

diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index 9b1a2df48bb..5c323068ddd 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -1,35 +1,37 @@
-{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34
-, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales
+{ buildPythonPackage, stdenv, pyyaml, pytest, enum34
+, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales
 }:
 
 buildPythonPackage rec {
-  version = "4.10.0";
-  pname = "mt940";
+  version = "4.12.2";
+  pname = "mt-940";
 
   src = fetchFromGitHub {
     owner = "WoLpH";
-    repo = pname;
+    repo = "mt940";
     rev = "v${version}";
-    sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65";
+    sha256 = "0l7q8v00dhpbc9mh6baaaqc55kf44rszygx28dq3pwp5b5x33nir";
   };
 
-  patches = [
-    ./no-coverage.patch
-  ];
+  postPatch = ''
+    # No coverage report
+    sed -i "/--\(no-\)\?cov/d" pytest.ini
+  '';
 
-  propagatedBuildInputs = [ pyyaml pytestrunner ]
-    ++ lib.optional (!isPy3k) enum34;
+  propagatedBuildInputs = lib.optional (!isPy3k) enum34;
 
   LC_ALL="en_US.UTF-8";
 
-  checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ];
+  checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ];
+
+  # See https://github.com/WoLpH/mt940/issues/64 for the disabled test
   checkPhase = ''
-    py.test
+    py.test -k "not mt940.models.FixedOffset"
   '';
 
   meta = with stdenv.lib; {
     description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
-    homepage = https://pythonhosted.org/mt-940/;
+    inherit (src.meta) homepage;
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/mt-940/no-coverage.patch b/pkgs/development/python-modules/mt-940/no-coverage.patch
deleted file mode 100644
index 1617e6dd394..00000000000
--- a/pkgs/development/python-modules/mt-940/no-coverage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/pytest.ini b/pytest.ini
-index fef28f5..f366331 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -4,10 +4,6 @@ python_files =
-     tests/*.py
- 
- addopts =
--    --cov mt940
--    --cov-report term-missing
--    --cov-report html
--    --no-cov-on-fail
-     --doctest-modules
-     --pep8
-     --flakes
-diff --git a/tests/requirements.txt b/tests/requirements.txt
-index fc55572..e52cc28 100644
---- a/tests/requirements.txt
-+++ b/tests/requirements.txt
-@@ -3,6 +3,5 @@
- -r ../docs/requirements.txt
- pytest
- pytest-cache
--pytest-cover
- pytest-flakes
- pytest-pep8

From f6ab103cf13e401abeeac39a657732408c3a9021 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 19 Dec 2018 10:58:53 +0100
Subject: [PATCH 2345/2793] Revert "brlaser: fix $out"

This reverts commit 04405f65f96d8d753fb21335759587cd7b897d3f.

This was already fixed in https://github.com/NixOS/nixpkgs/pull/49180,
but never got backported to 18.09.
---
 pkgs/misc/cups/drivers/brlaser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 39a115298f5..08cc222e4a5 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib cups ];
 
-  cmakeFlags = [ "-DCUPS_SERVER_BIN=${placeholder "out"}/lib/cups" "-DCUPS_DATA_DIR=${placeholder "out"}/share/cups" ];
+  cmakeFlags = [ "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ];
 
   meta = with stdenv.lib; {
     description = "A CUPS driver for Brother laser printers";

From 857853d5f10c81663dbc5844f0074efb903361a0 Mon Sep 17 00:00:00 2001
From: Jose San Leandro <rydnr@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:16:06 +0100
Subject: [PATCH 2346/2793] pharo: Simple fix for Iceberg (#52466)

* Simple fix for Iceberg
* Avoiding explicit libgit2 version assumption and removed libgit2 from buildInputs
---
 pkgs/development/pharo/vm/build-vm.nix | 51 ++++++++++++++++++++++++--
 pkgs/development/pharo/vm/vms.nix      | 21 ++++++++++-
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index b59be96bb62..c67e5a9489b 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,19 @@
-{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
+{ stdenv
+, fetchurl
+, bash
+, unzip
+, glibc
+, openssl
+, libgit2
+, libGLU_combined
+, freetype
+, xorg
+, alsaLib
+, cairo
+, libuuid
+, autoreconfHook
+, gcc48
+, ... }:
 
 { name, src, version, source-date, source-url, ... }:
 
@@ -65,7 +80,19 @@ stdenv.mkDerivation rec {
 
   # (No special build phase.)
 
-  installPhase = ''
+  installPhase = let
+    libs = [
+      cairo
+      libgit2
+      libGLU_combined
+      freetype
+      openssl
+      libuuid
+      alsaLib
+      xorg.libICE
+      xorg.libSM
+    ];
+  in ''
     # Install in working directory and then copy
     make install-squeak install-plugins prefix=$(pwd)/products
 
@@ -83,7 +110,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
 
     # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
-    libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib
+    libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs}
 
     # Create the script
     cat > "$out/bin/${cmd}" <<EOF
@@ -92,6 +119,7 @@ stdenv.mkDerivation rec {
     LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@"
     EOF
     chmod +x "$out/bin/${cmd}"
+    ln -s ${libgit2}/lib/libgit2.so* "$out/"
   '';
 
   enableParallelBuilding = true;
@@ -104,7 +132,22 @@ stdenv.mkDerivation rec {
   #
   # (stack protection is disabled above for gcc 4.8 compatibility.)
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ bash unzip glibc openssl gcc48 libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ];
+  buildInputs = [
+    bash
+    unzip
+    glibc
+    openssl
+    gcc48
+    libGLU_combined
+    freetype
+    xorg.libX11
+    xorg.libICE
+    xorg.libSM
+    alsaLib
+    cairo
+    pharo-share
+    libuuid
+  ];
 
   meta = with stdenv.lib; {
     description = "Clean and innovative Smalltalk-inspired environment";
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index 9a7a1ebd06f..19065f972a4 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -1,4 +1,23 @@
-{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args:
+{ cmake
+, stdenv
+, fetchurl
+, bash
+, unzip
+, glibc
+, openssl
+, gcc
+, libgit2
+, libGLU_combined
+, freetype
+, xorg
+, alsaLib
+, cairo
+, libuuid
+, autoreconfHook
+, gcc48
+, fetchFromGitHub
+, makeWrapper
+} @args:
 
 let
   pharo-vm-build = import ./build-vm.nix args;

From 91e1e2fd9267feaae70bf3f26289b58cbb9713fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Dec 2018 10:28:40 -0200
Subject: [PATCH 2347/2793] plano-theme: 3.28-3 -> 3.30-1

---
 pkgs/{misc => data}/themes/plano/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{misc => data}/themes/plano/default.nix (89%)

diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix
similarity index 89%
rename from pkgs/misc/themes/plano/default.nix
rename to pkgs/data/themes/plano/default.nix
index e1d319ba8c1..f876fbb933b 100644
--- a/pkgs/misc/themes/plano/default.nix
+++ b/pkgs/data/themes/plano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "plano-theme-${version}";
-  version = "3.28-3";
+  version = "3.30-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
     rev = "v${version}";
-    sha256 = "0k9jgnifc2s8vsw9fanknx1mg8vlh6qa1cbb910nm4vgrxsbrc74";
+    sha256 = "152iqfhwxmxx817n05j603263nbmry626zxq8hiljww8zpmqh8j2";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 933f83c90d2..d7392bc8c9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22653,7 +22653,7 @@ in
 
   pjsip = callPackage ../applications/networking/pjsip { };
 
-  plano-theme = callPackage ../misc/themes/plano { };
+  plano-theme = callPackage ../data/themes/plano { };
 
   ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { };
 

From 1fc12ef70277a80b4cdcd8411f44943443ef97c4 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 19 Dec 2018 13:29:47 +0100
Subject: [PATCH 2348/2793] nomachine-client: 6.3.6_1 -> 6.4.6_1

---
 pkgs/tools/admin/nomachine-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index be616c1bf9e..bc718aeb48c 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }:
 let
-  versionMajor = "6.3";
+  versionMajor = "6.4";
   versionMinor = "6_1";
 in
   stdenv.mkDerivation rec {
@@ -11,12 +11,12 @@ in
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz";
-          sha256 = "1035j2z2rqmdfb8cfm1pakd05c575640604b8lkljmilpky9mw5d";
+          sha256 = "141pv277kl5ij1pmc0iadc0hnslxri2qaqvsjkmmvls4432jh0yi";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz";
-          sha256 = "07j9f6mlq9m01ch8ik5dybi283vrp5dlv156jr5n7n2chzk34kf3";
+          sha256 = "0a2vi4ygw34yw8rcjhw17mqx5qbjnym4jkap8paik8lisb5mhnyj";
         }
       else
         throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";

From 9f934e8efcf013da159246569c8b99c4c1a40a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Dec 2018 10:48:29 -0200
Subject: [PATCH 2349/2793] shades-of-gray-theme: 1.1.1 -> 1.1.3

---
 pkgs/{misc => data}/themes/shades-of-gray/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{misc => data}/themes/shades-of-gray/default.nix (80%)

diff --git a/pkgs/misc/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix
similarity index 80%
rename from pkgs/misc/themes/shades-of-gray/default.nix
rename to pkgs/data/themes/shades-of-gray/default.nix
index 009a45b39dd..64cc2be5998 100644
--- a/pkgs/misc/themes/shades-of-gray/default.nix
+++ b/pkgs/data/themes/shades-of-gray/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "shades-of-gray-theme-${version}";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = "Shades-of-gray-theme";
     rev = version;
-    sha256 = "1m75m6aq4hh39m8qrmbkaw31j4gzkh63ial4xnhw2habf31av682";
+    sha256 = "14p1s1pmzqnn9j9vwqfxfd4i045p356a6d9rwzzs0gx3c6ibqx3a";
   };
 
   buildInputs = [ gtk_engines ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/themes
-    cp -a Shades-of-gray* README.md preview_01.png $out/share/themes/
+    cp -a Shades-of-gray* $out/share/themes/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 933f83c90d2..d8dc92a776b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15708,6 +15708,8 @@ in
 
   shaderc = callPackage ../development/compilers/shaderc { };
 
+  shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
+
   mime-types = callPackage ../data/misc/mime-types { };
 
   shared-mime-info = callPackage ../data/misc/shared-mime-info { };
@@ -22776,8 +22778,6 @@ in
     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 5bbfc0cc37f5f9b607678102883c6f1156abc305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 17 Dec 2018 23:08:56 +0100
Subject: [PATCH 2350/2793] adoptopenjdk: autogenerate sources + add support
 for aarch64

---
 .../adoptopenjdk-bin/generate-sources.py      | 69 ++++++++++++++
 .../adoptopenjdk-bin/jdk-darwin-base.nix      | 11 +--
 .../adoptopenjdk-bin/jdk-linux-base.nix       | 13 ++-
 .../adoptopenjdk-bin/jdk11-darwin.nix         | 44 +--------
 .../adoptopenjdk-bin/jdk11-linux.nix          | 44 +--------
 .../compilers/adoptopenjdk-bin/sources.json   | 94 +++++++++++++++++++
 6 files changed, 184 insertions(+), 91 deletions(-)
 create mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
new file mode 100755
index 00000000000..a410501de0a
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests
+
+import json
+import re
+import requests
+import sys
+
+releases = ["openjdk11"]
+oses = ["mac", "linux"]
+types = ["jre", "jdk"]
+impls = ["hotspot", "openj9"]
+
+arch_to_nixos = {
+    "x64": "x86_64",
+    "aarch64": "aarch64",
+}
+
+def get_sha256(url):
+    resp = requests.get(url)
+    if resp.status_code != 200:
+        print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr)
+        sys.exit(1)
+    return resp.text.strip().split(" ")[0]
+
+RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
+def generate_sources(release, assets):
+    out = {}
+    for asset in assets:
+        if asset["os"] not in oses: continue
+        if asset["binary_type"] not in types: continue
+        if asset["openjdk_impl"] not in impls: continue
+        if asset["heap_size"] != "normal": continue
+        if asset["architecture"] not in arch_to_nixos: continue
+
+        version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
+
+        type_map = out.setdefault(asset["os"], {})
+        impl_map = type_map.setdefault(asset["binary_type"], {})
+        arch_map = impl_map.setdefault(asset["openjdk_impl"], {
+            "version": version,
+            "build": build,
+            "packageType": asset["binary_type"],
+            "vmType": asset["openjdk_impl"],
+        })
+
+        if arch_map["version"] != version or arch_map["build"] != build:
+            print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
+                arch_map["version"], arch_map["build"], version, build
+            ), file=sys.stderr)
+            sys.exit(1)
+
+        arch_map[arch_to_nixos[asset["architecture"]]] = {
+            "url": asset["binary_link"],
+            "sha256": get_sha256(asset["checksum_link"]),
+        }
+
+    return out
+
+out = {}
+for release in releases:
+    resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
+    if resp.status_code != 200:
+        print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
+        sys.exit(1)
+    out[release] = generate_sources(release, resp.json())
+
+with open("sources.json", "w") as f:
+    json.dump(out, f, indent=2, sort_keys=True)
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index c2c13649f88..958f36d3928 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,7 +1,4 @@
-{ name
-, url
-, sha256
-}:
+sourcePerArch:
 
 { swingSupport ? true # not used for now
 , stdenv
@@ -9,10 +6,12 @@
 }:
 
 let result = stdenv.mkDerivation rec {
-  inherit name;
+  name = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
 
   src = fetchurl {
-    inherit url sha256;
+    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
   };
 
   # See: https://github.com/NixOS/patchelf/issues/10
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index cf38ca9eaeb..eb614b0784f 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,7 +1,4 @@
-{ name
-, url
-, sha256
-}:
+sourcePerArch:
 
 { swingSupport ? true
 , stdenv
@@ -48,10 +45,12 @@ let
 in
 
 let result = stdenv.mkDerivation rec {
-  inherit name;
+  name = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
 
   src = fetchurl {
-    inherit url sha256;
+    inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
   };
 
   nativeBuildInputs = [ file ];
@@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+    platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
     maintainers = with stdenv.lib.maintainers; [ taku0 ];
   };
 
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index 573f5e175ec..d1db77215d1 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -1,43 +1,9 @@
 let
-  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
-    name = if packageType == "jdk"
-      then
-        "adoptopenjdk-${vmType}-bin-${version}"
-      else
-        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
-
-    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
-
-    inherit sha256;
-  };
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
 in
 {
-  jdk-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jdk";
-    vmType = "hotspot";
-    sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
-  };
-  jre-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jre";
-    vmType = "hotspot";
-    sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
-  };
-  jdk-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jdk";
-    vmType = "openj9";
-    sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
-  };
-  jre-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jre";
-    vmType = "openj9";
-    sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
-  };
+  jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
+  jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
+  jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
+  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
index f4990b6effc..755ffaab271 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -1,43 +1,9 @@
 let
-  makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
-    name = if packageType == "jdk"
-      then
-        "adoptopenjdk-${vmType}-bin-${version}"
-      else
-        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
-
-    url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
-
-    inherit sha256;
-  };
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
 in
 {
-  jdk-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jdk";
-    vmType = "hotspot";
-    sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
-  };
-  jre-hotspot = makePackage {
-    version = "11";
-    buildNumber = "28";
-    packageType = "jre";
-    vmType = "hotspot";
-    sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
-  };
-  jdk-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jdk";
-    vmType = "openj9";
-    sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
-  };
-  jre-openj9 = makePackage {
-    version = "11.0.1";
-    buildNumber = "13";
-    packageType = "jre";
-    vmType = "openj9";
-    sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
-  };
+  jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
+  jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
+  jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
+  jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
 }
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
new file mode 100644
index 00000000000..bacb468c0ec
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -0,0 +1,94 @@
+{
+  "openjdk11": {
+    "linux": {
+      "jdk": {
+        "hotspot": {
+          "aarch64": {
+            "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
+          },
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "aarch64": {
+            "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
+          },
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
+          }
+        }
+      }
+    },
+    "mac": {
+      "jdk": {
+        "hotspot": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
+          }
+        },
+        "openj9": {
+          "build": "13",
+          "packageType": "jdk",
+          "version": "11.0.1",
+          "vmType": "openj9",
+          "x86_64": {
+            "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "build": "28",
+          "packageType": "jre",
+          "version": "11",
+          "vmType": "hotspot",
+          "x86_64": {
+            "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 682d1befd9cd1b044b945e47a1d92d2761dac443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Tue, 18 Dec 2018 20:24:58 +0100
Subject: [PATCH 2351/2793] adoptopenjdk-bin: use python-withPackages for
 shebang

Co-Authored-By: bennofs <benno.fuenfstueck@gmail.com>
---
 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index a410501de0a..66e1abd05e9 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests
+#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
 
 import json
 import re

From 6972c433ab8b591707aabe4d0ae5055e71821949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Dec 2018 13:56:28 +0100
Subject: [PATCH 2352/2793] adoptopenjdk-bin: disable openj9 jre for mac due to
 missing upstream

---
 .../compilers/adoptopenjdk-bin/jdk11-darwin.nix          | 3 ++-
 pkgs/top-level/all-packages.nix                          | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index d1db77215d1..f9d4b81d989 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -5,5 +5,6 @@ in
   jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
   jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
   jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
-  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
+  # openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796
+  #jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 933f83c90d2..8e73eb71ece 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6557,9 +6557,12 @@ in
   adoptopenjdk-openj9-bin-11 = if stdenv.isLinux
     then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}
     else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {};
-  adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
-    then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
-    else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
+
+  # openj9 jre builds for mac are currently missing (upstream)
+  #adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
+  #  then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
+  #  else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
+  adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {};
 
   adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
   adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;

From aaf353e7ad5f1519a884a8066f60bd49c66cb2f7 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 19 Dec 2018 14:14:09 +0100
Subject: [PATCH 2353/2793] nomachine-client: Fix audio support

libnxcau.so needs libpulse.so.0 for audio to work, but doesn't
have a DT_NEEDED entry for it, so it's not automatically
detected. This adds the missing entry and libpulseaudio to
buildInputs, enabling autoPatchelfHook to fix the RPATH.
---
 pkgs/tools/admin/nomachine-client/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index bc718aeb48c..32d0e584f31 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }:
+{ stdenv, lib, file, fetchurl, makeWrapper,
+  autoPatchelfHook, jsoncpp, libpulseaudio }:
 let
   versionMajor = "6.4";
   versionMinor = "6_1";
@@ -31,7 +32,7 @@ in
     '';
   
     nativeBuildInputs = [ file makeWrapper autoPatchelfHook ];
-    buildInputs = [ jsoncpp ];
+    buildInputs = [ jsoncpp libpulseaudio ];
 
     installPhase = ''
       rm bin/nxplayer bin/nxclient
@@ -63,6 +64,10 @@ in
     postFixup = ''
       makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX
       makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX
+
+      # libnxcau.so needs libpulse.so.0 for audio to work, but doesn't
+      # have a DT_NEEDED entry for it.
+      patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so
     '';
   
     dontBuild = true;

From 407f9ba5c9ec325c43fb466e9e51cab9e1713eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 19 Dec 2018 14:13:16 +0100
Subject: [PATCH 2354/2793] python.pkgs.objgraph: fix build

Fixes https://github.com/NixOS/nixpkgs/issues/52518.
---
 pkgs/development/python-modules/objgraph/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index c7e924569ba..16dc60fc28a 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -1,8 +1,9 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgs
 , isPyPy
+, graphviz
+, mock
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,9 @@ buildPythonPackage rec {
   # Tests fail with PyPy.
   disabled = isPyPy;
 
-  propagatedBuildInputs = [pkgs.graphviz];
+  propagatedBuildInputs = [ graphviz ];
+
+  checkInputs = [ mock ];
 
   meta = with stdenv.lib; {
     description = "Draws Python object reference graphs with graphviz";

From 52b1973283aca1c36852e25da97a8e8f06e6d642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 12 Dec 2018 14:00:44 +0100
Subject: [PATCH 2355/2793] home-assistant-cli: init at 0.3.0

---
 nixos/tests/home-assistant.nix      |  8 ++++++-
 pkgs/servers/home-assistant/cli.nix | 35 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/home-assistant/cli.nix

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 7627bb07901..73c1e71eb51 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -4,6 +4,7 @@ let
   configDir = "/var/lib/foobar";
   apiPassword = "some_secret";
   mqttPassword = "another_secret";
+  hassCli = "hass-cli --server http://hass:8123 --password '${apiPassword}'";
 
 in {
   name = "home-assistant";
@@ -16,7 +17,7 @@ in {
       { pkgs, ... }:
       {
         environment.systemPackages = with pkgs; [
-          mosquitto
+          mosquitto home-assistant-cli
         ];
         services.home-assistant = {
           inherit configDir;
@@ -71,6 +72,11 @@ in {
     $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light");
     $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
 
+    # Toggle a binary sensor using hass-cli
+    $hass->succeed("${hassCli} entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'");
+    $hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'");
+    $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'");
+
     # Print log to ease debugging
     my $log = $hass->succeed("cat ${configDir}/home-assistant.log");
     print "\n### home-assistant.log ###\n";
diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix
new file mode 100644
index 00000000000..c889610963d
--- /dev/null
+++ b/pkgs/servers/home-assistant/cli.nix
@@ -0,0 +1,35 @@
+{ lib, python3 }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "homeassistant-cli";
+  version = "0.3.0";
+
+  src = python3.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "42d7cb008801d7a448b62aed1fc46dd450ee67397bf16faabb02f691417db4b2";
+  };
+
+  postPatch = ''
+    # Ignore pinned versions
+    sed -i "s/'\(.*\)==.*'/'\1'/g" setup.py
+  '';
+
+  propagatedBuildInputs = with python3.pkgs; [
+    requests pyyaml netdisco click click-log tabulate idna jsonpath_rw jinja2
+  ];
+
+  checkInputs = with python3.pkgs; [
+    pytest requests-mock
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Command-line tool for Home Asssistant";
+    homepage = https://github.com/home-assistant/home-assistant-cli;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e73eb71ece..44e7b5a934f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13553,6 +13553,8 @@ in
     python = python36;
   };
 
+  home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { };
+
   hydron = callPackage ../servers/hydron { };
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };

From 721f3b7abde906f0b166134de7e411fee6ee9a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 19 Dec 2018 16:31:20 +0100
Subject: [PATCH 2356/2793] abcm2ps: 8.14.1 -> 8.14.2

---
 pkgs/tools/audio/abcm2ps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index eefb8160cbb..8fe445fedbe 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.14.1";
+  version = "8.14.2";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "1i39wfrnjflhfbqhcphr9dw08q4si5i724wv423996whk5xni61l";
+    sha256 = "15hka82zps3rfp4xdbzlf23wz4hqjk084awzfjh357qn168bwwid";
   };
 
   prePatch = ''

From c5ef5c9137deeded568fd8ca1bf6754a59abc437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 19 Dec 2018 17:10:07 +0100
Subject: [PATCH 2357/2793] python.pkgs.cherrypy: disable on python2

---
 pkgs/development/python-modules/cherrypy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 8e35c7c2d37..cbb8774f55f 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , cheroot, contextlib2, portend, routes, six
 , setuptools_scm, zc_lockfile
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
@@ -9,6 +9,8 @@ buildPythonPackage rec {
   pname = "CherryPy";
   version = "18.0.1";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";

From 0aa798c589e6d8a712de81e70f2c5f6e40c556a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Dec 2018 08:50:15 -0800
Subject: [PATCH 2358/2793] pulumi-bin: 0.16.2 -> 0.16.7

* pulumi-bin: 0.16.2 -> 0.16.7 (#52151)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulumi/versions

* pulumi-bin: fix Darwin hash for 0.16.7
---
 pkgs/tools/admin/pulumi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index b24b88fa96a..e2e1980dad9 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -2,17 +2,17 @@
 
 let
 
-  version = "0.16.2";
+  version = "0.16.7";
 
   # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
   pulumiArchPackage = {
     "x86_64-linux" = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
-      sha256 = "16qgy2pj3xkf1adi3882fpsl99jwsm19111fi5vzh1xqf39sg549";
+      sha256 = "1l1cn8pk05vl7vpmhny9rlz1hj0iqclqjj1r2q12qip7f4qkgsfw";
     };
     "x86_64-darwin" = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
-      sha256 = "18ck9khspa0x798bdlwk8dzylbsq7s35xmla8yasd9qqlab1yy1a";
+      sha256 = "0p07jvgy0xl524fgb5d9wijxa91isv4h4mcn9qghycqj90yqnjhx";
     };
   };
 

From 45d2a2dd910b9595929e740525f4fa28c5cdc69e Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 18 Dec 2018 19:02:12 +0100
Subject: [PATCH 2359/2793] tesseract: change file layout

Rename default.nix -> tesseract3.nix
Rename 4.x.nix -> tesseract4.nix

This is needed for the following commits.
---
 .../graphics/tesseract/default.nix            | 70 ++-----------------
 .../graphics/tesseract/tesseract3.nix         | 67 ++++++++++++++++++
 .../tesseract/{4.x.nix => tesseract4.nix}     |  0
 pkgs/top-level/all-packages.nix               |  5 +-
 4 files changed, 77 insertions(+), 65 deletions(-)
 create mode 100644 pkgs/applications/graphics/tesseract/tesseract3.nix
 rename pkgs/applications/graphics/tesseract/{4.x.nix => tesseract4.nix} (100%)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 7940079d099..6da6931eea3 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,67 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
-, leptonica, libpng, libtiff, icu, pango, opencl-headers
-# Supported list of languages or `null' for all available languages
-, enableLanguages ? null
-# if you want just a specific list of languages, optionally specify a hash
-# to make tessdata a fixed output derivation.
-, enableLanguagesHash ? (if enableLanguages == null # all languages
-                         then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
-                         else null)
-}:
+{ callPackage, lowPrio }:
 
-let tessdata = stdenv.mkDerivation ({
-  name = "tessdata";
-  src = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tessdata";
-    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
-    # when updating don't forget to update the default value fo enableLanguagesHash
-    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
-  };
-  buildCommand = ''
-    cd $src;
-    for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
-      install -Dt $out/share/tessdata $src/$lang ;
-    done;
-  '';
-  preferLocalBuild = true;
-  } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
-  # when a hash is given, we make this a fixed output derivation.
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  outputHash = enableLanguagesHash;
-  }));
+let
+  tesseract3 = callPackage ./tesseract3.nix {};
+  tesseract4 = callPackage ./tesseract4.nix {};
 in
+{
+  tesseract = tesseract3;
 
-stdenv.mkDerivation rec {
-  name = "tesseract-${version}";
-  version = "3.05.00";
-
-  src = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tesseract";
-    rev = version;
-    sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
-  };
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
-
-  LIBLEPT_HEADERSDIR = "${leptonica}/include";
-
-  postInstall = ''
-    for i in ${tessdata}/share/tessdata/*; do
-      ln -s $i $out/share/tessdata;
-    done
-  '';
-
-  meta = {
-    description = "OCR engine";
-    homepage = https://github.com/tesseract-ocr/tesseract;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-  };
+  tesseract_4 = lowPrio tesseract4;
 }
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
new file mode 100644
index 00000000000..7940079d099
--- /dev/null
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, leptonica, libpng, libtiff, icu, pango, opencl-headers
+# Supported list of languages or `null' for all available languages
+, enableLanguages ? null
+# if you want just a specific list of languages, optionally specify a hash
+# to make tessdata a fixed output derivation.
+, enableLanguagesHash ? (if enableLanguages == null # all languages
+                         then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
+                         else null)
+}:
+
+let tessdata = stdenv.mkDerivation ({
+  name = "tessdata";
+  src = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tessdata";
+    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
+    # when updating don't forget to update the default value fo enableLanguagesHash
+    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
+  };
+  buildCommand = ''
+    cd $src;
+    for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
+      install -Dt $out/share/tessdata $src/$lang ;
+    done;
+  '';
+  preferLocalBuild = true;
+  } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
+  # when a hash is given, we make this a fixed output derivation.
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  outputHash = enableLanguagesHash;
+  }));
+in
+
+stdenv.mkDerivation rec {
+  name = "tesseract-${version}";
+  version = "3.05.00";
+
+  src = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tesseract";
+    rev = version;
+    sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
+
+  LIBLEPT_HEADERSDIR = "${leptonica}/include";
+
+  postInstall = ''
+    for i in ${tessdata}/share/tessdata/*; do
+      ln -s $i $out/share/tessdata;
+    done
+  '';
+
+  meta = {
+    description = "OCR engine";
+    homepage = https://github.com/tesseract-ocr/tesseract;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
similarity index 100%
rename from pkgs/applications/graphics/tesseract/4.x.nix
rename to pkgs/applications/graphics/tesseract/tesseract4.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df5e40734b6..e1205b36b0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19485,8 +19485,9 @@ in
 
   termtosvg = callPackage ../tools/misc/termtosvg { };
 
-  tesseract = callPackage ../applications/graphics/tesseract { };
-  tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { });
+  inherit (callPackage ../applications/graphics/tesseract {})
+    tesseract
+    tesseract_4;
 
   tetraproc = callPackage ../applications/audio/tetraproc { };
 

From aaaed1307765910c66a46361023e357dd3ad6021 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 18 Dec 2018 19:02:13 +0100
Subject: [PATCH 2360/2793] tesseract: add a wrapper to setup languages

Tesseract is now decoupled from the tessdata language corpus.

This avoids recompilation when building Tesseract with a custom set
of languages.

Update k2pdfopt to use the new wrapper interface.
---
 .../graphics/tesseract/default.nix            | 15 ++--
 .../graphics/tesseract/languages.nix          | 43 ++++++++++++
 .../graphics/tesseract/tesseract3.nix         | 44 +-----------
 .../graphics/tesseract/tesseract4.nix         | 42 ++---------
 .../graphics/tesseract/wrapper.nix            | 69 +++++++++++++++++++
 pkgs/applications/misc/k2pdfopt/default.nix   | 28 ++++----
 6 files changed, 145 insertions(+), 96 deletions(-)
 create mode 100644 pkgs/applications/graphics/tesseract/languages.nix
 create mode 100644 pkgs/applications/graphics/tesseract/wrapper.nix

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 6da6931eea3..969402bf7c5 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,11 +1,18 @@
 { callPackage, lowPrio }:
 
 let
-  tesseract3 = callPackage ./tesseract3.nix {};
-  tesseract4 = callPackage ./tesseract4.nix {};
+  base3 = callPackage ./tesseract3.nix {};
+  base4 = callPackage ./tesseract4.nix {};
+  languages = callPackage ./languages.nix {};
 in
 {
-  tesseract = tesseract3;
+  tesseract = callPackage ./wrapper.nix {
+    tesseractBase = base3;
+    languages = languages.v3;
+  };
 
-  tesseract_4 = lowPrio tesseract4;
+  tesseract_4 = lowPrio (callPackage ./wrapper.nix {
+    tesseractBase = base4;
+    languages = languages.v4;
+  });
 }
diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix
new file mode 100644
index 00000000000..d06793ac417
--- /dev/null
+++ b/pkgs/applications/graphics/tesseract/languages.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub }:
+
+rec {
+  makeLanguages = { tessdataRev, tessdata ? null, all ? null, languages ? {} }:
+    let
+      tessdataSrc = fetchFromGitHub {
+        owner = "tesseract-ocr";
+        repo = "tessdata";
+        rev = tessdataRev;
+        sha256 = tessdata;
+      };
+
+      languageFile = lang: sha256: fetchurl {
+        url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata";
+        inherit sha256;
+      };
+    in
+      {
+        all = stdenv.mkDerivation {
+          name = "all";
+          buildCommand = ''
+            mkdir $out
+            cd ${tessdataSrc}
+            cp *.traineddata $out
+          '';
+          outputHashMode = "recursive";
+          outputHashAlgo = "sha256";
+          outputHash = all;
+        };
+      };
+
+  v3 = makeLanguages {
+    tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
+    tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
+    all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn";
+  };
+
+  v4 = makeLanguages {
+    tessdataRev = "4.0.0";
+    tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
+    all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg";
+  };
+}
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 7940079d099..db0e06434aa 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -1,37 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
-, leptonica, libpng, libtiff, icu, pango, opencl-headers
-# Supported list of languages or `null' for all available languages
-, enableLanguages ? null
-# if you want just a specific list of languages, optionally specify a hash
-# to make tessdata a fixed output derivation.
-, enableLanguagesHash ? (if enableLanguages == null # all languages
-                         then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
-                         else null)
-}:
-
-let tessdata = stdenv.mkDerivation ({
-  name = "tessdata";
-  src = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tessdata";
-    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
-    # when updating don't forget to update the default value fo enableLanguagesHash
-    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
-  };
-  buildCommand = ''
-    cd $src;
-    for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
-      install -Dt $out/share/tessdata $src/$lang ;
-    done;
-  '';
-  preferLocalBuild = true;
-  } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
-  # when a hash is given, we make this a fixed output derivation.
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  outputHash = enableLanguagesHash;
-  }));
-in
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig
+, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
@@ -51,17 +19,11 @@ stdenv.mkDerivation rec {
 
   LIBLEPT_HEADERSDIR = "${leptonica}/include";
 
-  postInstall = ''
-    for i in ${tessdata}/share/tessdata/*; do
-      ln -s $i $out/share/tessdata;
-    done
-  '';
-
   meta = {
     description = "OCR engine";
     homepage = https://github.com/tesseract-ocr/tesseract;
     license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric earvstedt ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index 2ebca09b831..df321023c74 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -1,9 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig
-, leptonica, libpng, libtiff, icu, pango, opencl-headers
-
-# Supported list of languages or `null' for all available languages
-, enableLanguages ? null
-}:
+, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
 
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
@@ -16,46 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8";
   };
 
-  tessdata = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tessdata";
-    rev = version;
-    sha256 = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
-  };
+  enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];
   buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
 
-  # Copy the .traineddata files of the languages specified in enableLanguages
-  # into `$out/share/tessdata' and check afterwards if copying was successful.
-  postInstall = let
-    mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
-    mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
-    findLangArgs = if enableLanguages != null
-                   then "\\( ${mkFindArgs enableLanguages} \\)"
-                   else "-iname '*.traineddata'";
-  in ''
-    numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
-      ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
-
-    ${if enableLanguages != null then ''
-      expected=${toString (builtins.length enableLanguages)}
-    '' else ''
-      expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
-    ''}
-
-    if [ "$numLangs" -ne "$expected" ]; then
-      echo "Expected $expected languages, but $numLangs" \
-           "were copied to \`$out/share/tessdata'" >&2
-      exit 1
-    fi
-  '';
-
   meta = {
     description = "OCR engine";
     homepage = https://github.com/tesseract-ocr/tesseract;
     license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ viric earvstedt ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix
new file mode 100644
index 00000000000..6645cd9bfe9
--- /dev/null
+++ b/pkgs/applications/graphics/tesseract/wrapper.nix
@@ -0,0 +1,69 @@
+{ stdenv, makeWrapper, tesseractBase, languages
+
+# A list of languages like [ "eng" "spa" … ] or `null` for all available languages
+, enableLanguages ? null
+
+# A list of files or a directory containing files
+, tessdata ? (
+    if enableLanguages == null then
+       languages.all
+    else stdenv.mkDerivation ({
+      name = "tessdata";
+      buildCommand = ''
+        for lang in ${stdenv.lib.concatMapStringsSep " " (x: x + ".traineddata") enableLanguages}; do
+          install -Dt $out ${languages.all}/$lang
+        done
+      '';
+      preferLocalBuild = true;
+      } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
+        # when a hash is given, we make this a fixed output derivation.
+        outputHashMode = "recursive";
+        outputHashAlgo = "sha256";
+        outputHash = enableLanguagesHash;
+      }))
+  )
+
+, enableLanguagesHash ? null
+}:
+
+let
+  passthru = { inherit tesseractBase languages tessdata; };
+
+  tesseractWithData = tesseractBase.overrideAttrs (_: {
+    inherit tesseractBase tessdata;
+
+    buildInputs = [ makeWrapper ];
+
+    buildCommand = ''
+      makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata
+
+      # Recursively link include, share
+      cp -rs --no-preserve=mode $tesseractBase/{include,share} $out
+
+      cp -r --no-preserve=mode $tesseractBase/lib $out
+      # Fixup the store paths in lib so that the tessdata from this derivation is used.
+      if (( ''${#tesseractBase} != ''${#out} )); then
+        echo "Can't replace store paths due to differing lengths"
+        exit 1
+      fi
+      find $out/lib -type f -exec sed -i "s|$tesseractBase|$out|g" {} \;
+
+      if [[ -d "$tessdata" ]]; then
+        ln -s $tessdata/* $out/share/tessdata
+      else
+        for lang in $tessdata; do
+          ln -s $lang $out/share/tessdata/''${lang#/nix/store*-}
+        done
+      fi
+
+      if [[ ! -e $out/share/tessdata/eng.traineddata ]]; then
+         # This is a bug in Tesseract's internal tessdata discovery mechanism
+         echo "eng.traineddata must be present in tessdata for Tesseract to work"
+         exit 1
+      fi
+    '';
+  });
+
+  tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru;
+in
+  tesseract
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 0e84283a9ef..8f69abd3a98 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -75,19 +75,21 @@ stdenv.mkDerivation rec {
         cp ${src}/leptonica_mod/* src/
       '';
     });
-    tesseract_modded = tesseract.overrideAttrs (attrs: {
-      prePatch = ''
-        cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/
-        cp ${src}/tesseract_mod/dawg.cpp api/
-        cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/
-        cp ${src}/tesseract_mod/openclwrapper.h opencl/
-        cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/
-        cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/
-        cp ${src}/tesseract_mod/tesscapi.cpp api/
-        cp ${src}/include_mod/{tesseract.h,leptonica.h} api/
-      '';
-      patches = [ ./tesseract.patch ];
-    });
+    tesseract_modded = tesseract.override {
+      tesseractBase = tesseract.tesseractBase.overrideAttrs (_: {
+        prePatch = ''
+          cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/
+          cp ${src}/tesseract_mod/dawg.cpp api/
+          cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/
+          cp ${src}/tesseract_mod/openclwrapper.h opencl/
+          cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/
+          cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/
+          cp ${src}/tesseract_mod/tesscapi.cpp api/
+          cp ${src}/include_mod/{tesseract.h,leptonica.h} api/
+        '';
+        patches = [ ./tesseract.patch ];
+      });
+    };
   in
     [ zlib libpng ] ++
     optional enableGSL gsl ++

From b818997807b94f67560dfc319b84cc1a35fbdd82 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 18 Dec 2018 19:02:14 +0100
Subject: [PATCH 2361/2793] tesseract: add separate language derivations

This frees users from downloading all languages when building
Tesseract with a custom set of languages.

`enableLanguagesHash` is now obsolete.
---
 .../graphics/tesseract/fetch-language-hashes  |  35 +++
 .../graphics/tesseract/languages.nix          | 248 +++++++++++++++++-
 .../graphics/tesseract/wrapper.nix            |  27 +-
 3 files changed, 290 insertions(+), 20 deletions(-)
 create mode 100755 pkgs/applications/graphics/tesseract/fetch-language-hashes

diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes
new file mode 100755
index 00000000000..c431f1d97c2
--- /dev/null
+++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Usage:
+#   ./fetch-language-hashes <tessdataRev> [<language code>…]
+#
+#   Fetches all languages if no language codes are given.
+#
+# Example:
+#   ./fetch-language-hashes 4.0.0 eng spa
+#
+#   Output:
+#     eng = "0iy0...";
+#     spa = "15kw...";
+
+set -e
+
+(( $# >= 1 )) || exit 1
+tessdataRev=$1
+shift
+
+if (( $# > 0 )); then
+    langCodes="$@"
+else
+    repoPage=$(curl -fs https://github.com/tesseract-ocr/tessdata/tree/$tessdataRev || {
+                   >&2 echo "Invalid tessdataRev: $tessdataRev"
+                   exit 1
+               })
+    langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort))
+fi
+
+for lang in $langCodes; do
+    url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata
+    hash=$(nix-prefetch-url $url 2>/dev/null)
+    echo "$lang = \"$hash\";"
+done
diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix
index d06793ac417..08512a5cdd9 100644
--- a/pkgs/applications/graphics/tesseract/languages.nix
+++ b/pkgs/applications/graphics/tesseract/languages.nix
@@ -16,6 +16,7 @@ rec {
       };
     in
       {
+        # Use a simple fixed-output derivation for all languages to increase nix eval performance
         all = stdenv.mkDerivation {
           name = "all";
           buildCommand = ''
@@ -27,17 +28,262 @@ rec {
           outputHashAlgo = "sha256";
           outputHash = all;
         };
-      };
+      } // (lib.mapAttrs languageFile languages);
 
   v3 = makeLanguages {
     tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
     tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
     all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn";
+
+    # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
+    languages = {
+      afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf";
+      amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4";
+      ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91";
+      asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh";
+      aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw";
+      aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq";
+      bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2";
+      ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m";
+      bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan";
+      bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4";
+      bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya";
+      cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9";
+      ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1";
+      ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0";
+      chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij";
+      chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp";
+      chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb";
+      cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07";
+      dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr";
+      dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi";
+      deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb";
+      deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb";
+      dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm";
+      ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v";
+      eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0";
+      enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46";
+      epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964";
+      equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s";
+      est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g";
+      eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw";
+      fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx";
+      fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q";
+      fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6";
+      frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp";
+      frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn";
+      gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa";
+      glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z";
+      grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb";
+      guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al";
+      hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8";
+      heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag";
+      hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf";
+      hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3";
+      hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56";
+      iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db";
+      ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p";
+      isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz";
+      ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs";
+      ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z";
+      jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp";
+      jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w";
+      kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg";
+      kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3";
+      kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh";
+      kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm";
+      khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s";
+      kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3";
+      kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv";
+      kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic";
+      lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf";
+      lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj";
+      lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg";
+      lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm";
+      mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a";
+      mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik";
+      mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73";
+      mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h";
+      msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj";
+      mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l";
+      nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc";
+      nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x";
+      nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459";
+      ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac";
+      osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw";
+      pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv";
+      pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx";
+      por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8";
+      pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b";
+      ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl";
+      rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q";
+      san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g";
+      sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm";
+      slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds";
+      slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy";
+      slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h";
+      spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj";
+      spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx";
+      sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf";
+      srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm";
+      srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr";
+      swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f";
+      swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a";
+      syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0";
+      tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz";
+      tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv";
+      tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0";
+      tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577";
+      tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna";
+      tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h";
+      tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w";
+      uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv";
+      ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg";
+      urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18";
+      uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l";
+      uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855";
+      vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff";
+      yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd";
+    };
   };
 
   v4 = makeLanguages {
     tessdataRev = "4.0.0";
     tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
     all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg";
+
+    # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
+    languages = {
+      afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y";
+      amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0";
+      ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190";
+      asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf";
+      aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf";
+      aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg";
+      bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c";
+      ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0";
+      bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar";
+      bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd";
+      bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk";
+      bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj";
+      cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv";
+      ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r";
+      ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf";
+      chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw";
+      chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7";
+      chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m";
+      chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4";
+      chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l";
+      cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx";
+      cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d";
+      dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2";
+      dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0";
+      deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9";
+      deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7";
+      div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41";
+      dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b";
+      ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg";
+      eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s";
+      enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm";
+      epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9";
+      equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg";
+      est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl";
+      eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp";
+      fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a";
+      fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb";
+      fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz";
+      fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g";
+      fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a";
+      frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp";
+      frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2";
+      fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h";
+      gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar";
+      gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk";
+      glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4";
+      grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl";
+      guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154";
+      hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss";
+      heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx";
+      hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc";
+      hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp";
+      hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi";
+      hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf";
+      iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn";
+      ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5";
+      isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq";
+      ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r";
+      ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6";
+      jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m";
+      jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg";
+      jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn";
+      kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd";
+      kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia";
+      kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai";
+      kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi";
+      khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb";
+      kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3";
+      kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m";
+      kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8";
+      kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25";
+      kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6";
+      lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5";
+      lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr";
+      lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2";
+      lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv";
+      ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc";
+      mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd";
+      mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44";
+      mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg";
+      mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz";
+      mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh";
+      mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i";
+      msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an";
+      mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1";
+      nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563";
+      nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi";
+      nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq";
+      oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv";
+      ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78";
+      osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1";
+      pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h";
+      pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp";
+      por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01";
+      pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr";
+      que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5";
+      ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m";
+      rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8";
+      san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx";
+      sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964";
+      slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k";
+      slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki";
+      slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf";
+      snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7";
+      spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb";
+      spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3";
+      sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701";
+      srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l";
+      srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz";
+      sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa";
+      swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0";
+      swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4";
+      syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38";
+      tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf";
+      tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76";
+      tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx";
+      tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67";
+      tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn";
+      tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8";
+      tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk";
+      ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq";
+      tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8";
+      uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548";
+      ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334";
+      urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40";
+      uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n";
+      uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7";
+      vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n";
+      yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z";
+      yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv";
+    };
   };
 }
diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix
index 6645cd9bfe9..365d68a9ee7 100644
--- a/pkgs/applications/graphics/tesseract/wrapper.nix
+++ b/pkgs/applications/graphics/tesseract/wrapper.nix
@@ -4,25 +4,10 @@
 , enableLanguages ? null
 
 # A list of files or a directory containing files
-, tessdata ? (
-    if enableLanguages == null then
-       languages.all
-    else stdenv.mkDerivation ({
-      name = "tessdata";
-      buildCommand = ''
-        for lang in ${stdenv.lib.concatMapStringsSep " " (x: x + ".traineddata") enableLanguages}; do
-          install -Dt $out ${languages.all}/$lang
-        done
-      '';
-      preferLocalBuild = true;
-      } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
-        # when a hash is given, we make this a fixed output derivation.
-        outputHashMode = "recursive";
-        outputHashAlgo = "sha256";
-        outputHash = enableLanguagesHash;
-      }))
-  )
+, tessdata ? (if enableLanguages == null then languages.all
+              else map (lang: languages.${lang}) enableLanguages)
 
+# This argument is obsolete
 , enableLanguagesHash ? null
 }:
 
@@ -66,4 +51,8 @@ let
 
   tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru;
 in
-  tesseract
+  if enableLanguagesHash == null then
+    tesseract
+  else
+    stdenv.lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed."
+    tesseract

From 8d1ba999cb1a82a61c70d6176407c1c4c0d29df1 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 19 Dec 2018 14:42:32 +0100
Subject: [PATCH 2362/2793] tesseract: rename to tesseract4, add alias

This is more consistent with the naming of the most popular versioned pkgs.
---
 nixos/lib/testing.nix                            | 2 +-
 pkgs/applications/graphics/tesseract/default.nix | 2 +-
 pkgs/top-level/aliases.nix                       | 1 +
 pkgs/top-level/all-packages.nix                  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 0bb3fd53e85..f9430886f7c 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -116,7 +116,7 @@ in rec {
 
       vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
 
-      ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };
+      ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
 
       imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
 
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 969402bf7c5..1b6a5556c78 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -11,7 +11,7 @@ in
     languages = languages.v3;
   };
 
-  tesseract_4 = lowPrio (callPackage ./wrapper.nix {
+  tesseract4 = lowPrio (callPackage ./wrapper.nix {
     tesseractBase = base4;
     languages = languages.v4;
   });
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8d29370c876..2c66878ba81 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -303,6 +303,7 @@ mapAliases ({
   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
+  tesseract_4 = tesseract4; # added 2018-12-19
   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 e1205b36b0a..c886f62aa18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19487,7 +19487,7 @@ in
 
   inherit (callPackage ../applications/graphics/tesseract {})
     tesseract
-    tesseract_4;
+    tesseract4;
 
   tetraproc = callPackage ../applications/audio/tetraproc { };
 

From 0289f4adf032d402d95a438ed18a966eeffda5cd Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 19 Dec 2018 15:09:41 +0100
Subject: [PATCH 2363/2793] tesseract: add tesseract3 top-level attr

---
 pkgs/applications/graphics/tesseract/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index 1b6a5556c78..840c87de216 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -6,7 +6,7 @@ let
   languages = callPackage ./languages.nix {};
 in
 {
-  tesseract = callPackage ./wrapper.nix {
+  tesseract3 = callPackage ./wrapper.nix {
     tesseractBase = base3;
     languages = languages.v3;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c886f62aa18..4a4bab56835 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19486,8 +19486,9 @@ in
   termtosvg = callPackage ../tools/misc/termtosvg { };
 
   inherit (callPackage ../applications/graphics/tesseract {})
-    tesseract
+    tesseract3
     tesseract4;
+  tesseract = tesseract3;
 
   tetraproc = callPackage ../applications/audio/tetraproc { };
 

From ddeb896744c36a541a0d96afe5998e0db8ca979b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Dec 2018 09:51:55 -0800
Subject: [PATCH 2364/2793] pig: 0.16.0 -> 0.17.0

* pig: 0.16.0 -> 0.17.0 (#52132)

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

diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index 45dcfb1738c..26c39f8cbe2 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
 
-  name = "pig-0.16.0";
+  name = "pig-0.17.0";
 
   src = fetchurl {
     url = "mirror://apache/pig/${name}/${name}.tar.gz";
-    sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508";
+    sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd";
 
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://pig.apache.org/;
+    homepage = https://pig.apache.org/;
     description = "High-level language for Apache Hadoop";
     license = licenses.asl20;
 

From 36a0c13cf3bf405533a41c0fe10964e63b1be6e3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 19 Dec 2018 12:57:17 -0500
Subject: [PATCH 2365/2793] nixos/release-combined: adds aarch64-linux as
 supported

This was previously removed in 74c4e30842657d09ec1cf000af89f95df27c6632.

This will allow hydra to build iso and sd images for aarch64-linux, and
share a common channel with the x86-based platforms.
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 66b253c230f..73f785173c2 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,7 @@
 
 { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
 , limitedSupportedSystems ? [ "i686-linux" ]
 }:
 

From 8ab5ef773b3c33219cad4aa10ce195e44a558934 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 19 Dec 2018 13:10:48 -0500
Subject: [PATCH 2366/2793] nixos/release: build iso_minimal_new_kernel for
 aarch64-linux too

---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index e6abd003e88..1fcceed1261 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -157,7 +157,7 @@ in rec {
 
   # A variant with a more recent (but possibly less stable) kernel
   # that might support more hardware.
-  iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
     type = "minimal-new-kernel";
     inherit system;

From 783957c72bb0a9c1346cd0638a9ddfeba30a35b9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Dec 2018 13:18:54 -0600
Subject: [PATCH 2367/2793] zsh-completions; 0.29.0 -> 0.30.0

https://github.com/zsh-users/zsh-completions/releases/tag/0.30.0
---
 pkgs/shells/zsh/zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 29a2a653265..726f2b7ad73 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-completions-${version}";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
     rev = "${version}";
-    sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv";
+    sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
   };
 
   installPhase= ''

From 926965d4b1f5bb0251cdca363ff0fcc3aa7f63be Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Dec 2018 13:00:15 -0600
Subject: [PATCH 2368/2793] fwts: 18.11.00 -> 18.12.00

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

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 1e16725af3f..5623b8a8a6b 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fwts-${version}";
-  version = "18.11.00";
+  version = "18.12.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    sha256 = "14dxw0ny5z681kz4dpm2phyanr2q4c8fqml3mhdr1mb2ndrrwqgz";
+    sha256 = "10kzn5r099i4b8m5l7s68fs885d126l9cingq9gj1g574c18hg2s";
     stripRoot = false;
   };
 

From 76127c322da35a6d12962c45be8a534aeeceb18f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Dec 2018 13:37:57 -0600
Subject: [PATCH 2369/2793] fwts: enable parallel building

---
 pkgs/os-specific/linux/fwts/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 5623b8a8a6b..daeda5fa8c0 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl"       "${iasl}/bin/iasl"
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
     description = "Firmware Test Suite";

From 59e665838171cccfd419eab4a51ddcd685d67a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 14 Dec 2018 09:54:41 +0100
Subject: [PATCH 2370/2793] valgrind: fix build on darwin

We fixed a race condition in #51505 and #51107. This required running
autoreconfHook to pick up the `coregrind-makefile-race.patch` patch.

Unfortunately this broke darwin's postPatch fixes as autoreconfHook would run
afterwards regenerating the fixed makefiles.

Moving the postPatch fixes to preConfigure should resolve the issue.

I left `postPatch = ""` in to avoid a rebuild on linux.

(cherry picked from commit a6d4a0c53c88bf47482b17665fe2675f4cc82bb2)
---
 pkgs/development/tools/analysis/valgrind/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index ca8d64f9132..d70ec0ed9ac 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -31,12 +31,8 @@ stdenv.mkDerivation rec {
     in ''
       echo "Don't derive our xnu version using uname -r."
       substituteInPlace configure --replace "uname -r" "echo ${OSRELEASE}"
-    ''
-  );
 
-  postPatch = stdenv.lib.optionalString (stdenv.isDarwin)
-    # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
-    ''
+      # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
       echo "getting rid of the \`-arch' GCC option..."
       find -name Makefile\* -exec \
         sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
@@ -60,7 +56,10 @@ stdenv.mkDerivation rec {
       echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld"
       substituteInPlace coregrind/link_tool_exe_darwin.in \
         --replace /usr/bin/ld ${cctools}/bin/ld
-    '';
+    '');
+
+  # To prevent rebuild on linux when moving darwin's postPatch fixes to preConfigure
+  postPatch = "";
 
   configureFlags =
     stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit";

From 6206a342e0c409de25d3573f7f444434ab75d0ed Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 23 Oct 2018 17:33:49 -0400
Subject: [PATCH 2371/2793] mkl: include Intel's libiomp.so in the MKL RPM
 unpack

Since Intel's default openmp implementation is available in the same src
tarball, we can just include it in the package. This means that `mkl` now "just
works" without any environment variables, fragile setup-hooks, or forced
propagation.

Since the openmp implementation is only needed at runtime (and for test cases),
users can substitute a different one if they prefer by exporting it with
`LD_PRELOAD`, which is how Intel recommends handling this. If they do not do so,
`libiomp.so` lives next to `libmkl_rt.so` and thus will be in the RPATH as a
sane default.

Since this still comes from the same src tarball, we can ship it without losing
the fixed-output derivation; likewise, since Hydra is not building or caching
these, shipping these proprietary packages costs no bandwidth for the nix
community.
---
 doc/languages-frameworks/python.section.md    | 11 +++++-
 .../libraries/science/math/mkl/default.nix    | 34 ++++++++-----------
 .../python-modules/numexpr/default.nix        |  8 +----
 .../python-modules/numpy/default.nix          |  2 --
 4 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 3e4e12665bd..acd2bf769b0 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1104,7 +1104,7 @@ on `numpy` will be built with `mkl`.
 The following is an overlay that configures `numpy` to use `mkl`:
 ```nix
 self: super: {
-  python36 = super.python36.override {
+  python37 = super.python37.override {
     packageOverrides = python-self: python-super: {
       numpy = python-super.numpy.override {
         blas = super.pkgs.mkl;
@@ -1114,6 +1114,15 @@ self: super: {
 }
 ```
 
+`mkl` requires an `openmp` implementation when running with multiple processors.
+By default, `mkl` will use Intel's `iomp` implementation if no other is
+specified, but this is a runtime-only dependency and binary compatible with the
+LLVM implementation. To use that one instead, Intel recommends users set it with
+`LD_PRELOAD`.
+
+Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
+moreover, Hydra is not building and distributing pre-compiled binaries using it.
+
 ## Contributing
 
 ### Contributing guidelines
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 37814047f97..0eecb2012f1 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,21 +1,8 @@
 { 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.
- */
-
+  For details on using mkl as a blas provider for python packages such as numpy,
+  numexpr, scipy, etc., see the Python section of the NixPkgs manual.
+*/
 stdenvNoCC.mkDerivation rec {
   name = "mkl-${version}";
   version = "${date}.${rel}";
@@ -43,16 +30,23 @@ 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
+    rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${rel}.x86_64.rpm
   '';
 
   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/
+      cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
+      cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $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/compiler/lib/intel64_lin/* $out/lib/
       cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
       cp license.txt $out/lib/
   '';
@@ -66,8 +60,8 @@ stdenvNoCC.mkDerivation rec {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = if stdenvNoCC.isDarwin
-    then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12"
-    else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx";
+    then "0000000000000000000000000000000000000000000000000000"
+    else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a";
 
   meta = with stdenvNoCC.lib; {
     description = "Intel Math Kernel Library";
@@ -78,7 +72,7 @@ stdenvNoCC.mkDerivation rec {
       threading models.
     '';
     homepage = https://software.intel.com/en-us/mkl;
-    license = [ licenses.issl licenses.unfreeRedistributable ];
+    license = licenses.issl;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.bhipple ];
   };
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index acf41fb539e..280b11706a1 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , python
 , numpy
-, llvmPackages ? null
 }:
 
 buildPythonPackage rec {
@@ -16,16 +15,11 @@ buildPythonPackage rec {
   };
 
   # Remove existing site.cfg, use the one we built for numpy.
-  # Somehow openmp needs to be added to LD_LIBRARY_PATH
-  # https://software.intel.com/en-us/forums/intel-system-studio/topic/611682
   preBuild = ''
     rm site.cfg
     ln -s ${numpy.cfg} site.cfg
-    export LD_LIBRARY_PATH=${llvmPackages.openmp}/lib
   '';
 
-  buildInputs = [] ++ lib.optional (numpy.blasImplementation == "mkl") llvmPackages.openmp;
-
   propagatedBuildInputs = [ numpy ];
 
   # Run the test suite.
@@ -47,4 +41,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/pydata/numexpr";
     license = lib.licenses.mit;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 8a3879f1982..d66cbd77bbc 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -71,8 +71,6 @@ in buildPythonPackage rec {
     inherit blasImplementation cfg;
   };
 
-  doCheck = blasImplementation != "mkl";
-
   # Disable two tests
   # - test_f2py: f2py isn't yet on path.
   # - test_large_file_support: takes a long time and can cause the machine to run out of disk space

From 7a5a370c25743790786563aee6990bcaa0afbddd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 19 Dec 2018 22:45:48 +0100
Subject: [PATCH 2372/2793] Remove redundant chmod

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

diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index d423ae5f1c4..e43dacce625 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -125,9 +125,8 @@ rec {
     runCommand "bionic-prebuilt" {} ''
       mkdir -p $out
       cp -r ${includePath} $out/include
-      chmod u+w $out/include
-      cp -r ${asmIncludePath}/* $out/include
       chmod +w $out/include
+      cp -r ${asmIncludePath}/* $out/include
       ln -s ${libPath} $out/lib
     '';
 }

From 80a1d934b83796fa0ad75ec001a7dec45eb178ee Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Fri, 7 Dec 2018 22:59:30 +0100
Subject: [PATCH 2373/2793] winetricks: 20180815 -> 20181203

---
 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 5533c8d54a5..1290a852e37 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 = "20180815";
-    sha256 = "0ksz2jkpqq8vnsc511zag9zcx8486hs8mwlmkkygljc8ylb1ibn5";
+    version = "20181203";
+    sha256 = "1as5h5xibpplm619b1i73g974p96q2jnd7fqm28xj3zkqy7qjdm3";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From a960696f711b6b68518ca18e67ea876fcedbb466 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Fri, 7 Dec 2018 22:58:56 +0100
Subject: [PATCH 2374/2793] wineStable: 3.0.3 -> 3.0.4

---
 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 1290a852e37..8b80dd838ae 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.3";
+    version = "3.0.4";
     url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
-    sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b";
+    sha256 = "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From af83f8b3986792e6b2b74a2fb12756d2abebdcbd Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 19 Dec 2018 23:19:16 +0100
Subject: [PATCH 2375/2793] pythonPackages.absl-py: fix python2 build (#52544)

---
 pkgs/development/python-modules/absl-py/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 60a704f5610..a80cd99f73f 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -1,7 +1,9 @@
 { buildPythonPackage
 , lib
+, pythonOlder
 , fetchPypi
 , six
+, enum34
 }:
 
 buildPythonPackage rec {
@@ -13,7 +15,11 @@ buildPythonPackage rec {
     sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [
+    six
+  ] ++ lib.optionals (pythonOlder "3.4") [
+    enum34
+  ];
 
   # checks use bazel; should be revisited
   doCheck = false;

From d60b9b10101020ddbab0cb400d16977acedae502 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Wed, 19 Dec 2018 23:28:03 +0100
Subject: [PATCH 2376/2793] soapysdr: fix extraPackages support

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

diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
index 90639fc5705..f14b560bf52 100644
--- a/pkgs/applications/misc/soapysdr/default.nix
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libusb ncurses numpy swig2 python ];
+  buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ];
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
@@ -33,8 +33,8 @@ in stdenv.mkDerivation {
     done
 
     # Needed for at least the remote plugin server
-    for file in out/bin/*; do
-        ${makeWrapper}/bin/wrapProgram "$file" \
+    for file in $out/bin/*; do
+        wrapProgram "$file" \
             --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
     done
   '';

From 29f25b22df37c151e900333c77f661a4ebbee27d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 17:39:03 -0800
Subject: [PATCH 2377/2793] pmd: 6.9.0 -> 6.10.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
---
 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 3724494da11..e60729dc8b9 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.9.0";
+  version = "6.10.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "13w07f68gfcjy3a2zk4z4b0f95qscbkjlylckphmyxhw7vmgzlmn";
+    sha256 = "1yzgin2lbhfswb07mm14wq8rn129kpfjidd8nv9pg77ywhnbwqmb";
   };
 
   installPhase = ''

From 1f99218b61f4f07d512e107a7df0ef082e105951 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 14:07:48 -0800
Subject: [PATCH 2378/2793] python37Packages.elpy: 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/python3.7-elpy/versions
---
 pkgs/development/python-modules/elpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix
index a08616b7cb7..6c22236892e 100644
--- a/pkgs/development/python-modules/elpy/default.nix
+++ b/pkgs/development/python-modules/elpy/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "elpy";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1m3dk609sn1j8zk8xwrlgcw82vkpws4q4aypv2ljpky9lm36npv6";
+    sha256 = "0fpxxmxjzcam3kharbmvprf4kagspya1rx9piacmxbgcp6w2lc4s";
   };
 
   propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]

From 53ea46b45059282369c0da605a94500fa0e0b3ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 15:13:53 -0800
Subject: [PATCH 2379/2793] python37Packages.facebook-sdk: 3.0.0 -> 3.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/python3.7-facebook-sdk/versions
---
 pkgs/development/python-modules/facebook-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix
index 249acb262fb..d74c6e57470 100644
--- a/pkgs/development/python-modules/facebook-sdk/default.nix
+++ b/pkgs/development/python-modules/facebook-sdk/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "facebook-sdk";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f3d450ec313b62d3716fadc4e5098183760e1d2a9e0434a94b74e59ea6ea3e4d";
+    sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a";
   };
 
   propagatedBuildInputs = [ requests ];

From 979b88b2bc7a3242b489008c72c7a3eba5bdf7eb Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 19 Dec 2018 23:53:17 +0100
Subject: [PATCH 2380/2793] pythonPackages.pathpy: skip performance test
 (#52548)

The test may fail non-deterministically, as it does right now on hydra.
---
 pkgs/development/python-modules/path.py/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index f9f74858149..fc20624e3fa 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
   checkPhase = ''
     # Ignore pytest configuration
     rm pytest.ini
-    py.test test_path.py
+    # ignore performance test which may fail when the system is under load
+    py.test -v -k 'not TestPerformance' test_path.py
   '';
 }

From 1e0d7f99f15ac047ae93fa4884beca2b22bc059c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 13:08:24 -0800
Subject: [PATCH 2381/2793] python37Packages.google_cloud_vision: 0.34.0 ->
 0.35.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/python3.7-google-cloud-vision/versions
---
 .../python-modules/google_cloud_vision/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix
index 6a52016311b..da01147f645 100644
--- a/pkgs/development/python-modules/google_cloud_vision/default.nix
+++ b/pkgs/development/python-modules/google_cloud_vision/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vision";
-  version = "0.34.0";
+  version = "0.35.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "50392b2c68e40dbf725c531ba4d325bd910da6441a472ed0a3fadfd0ab8548f7";
+    sha256 = "0hx80q8rcgs0kvhv0xix2dhr3n19abac4sj4k5pfqxh6qzdxm3d8";
   };
 
   checkInputs = [ pytest mock ];

From fb61d7a70bd8b9bd963ace89a8ea4c225d50c96e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 06:37:48 -0800
Subject: [PATCH 2382/2793] python37Packages.sphinxcontrib-bibtex: 0.4.0 ->
 0.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/python3.7-sphinxcontrib-bibtex/versions
---
 .../python-modules/sphinxcontrib-bibtex/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 8f3724e97ca..700a7fad4aa 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -3,12 +3,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   pname = "sphinxcontrib-bibtex";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cb9fb4526642fc080204fccd5cd8f41e9e95387278e17b1d6969b1e27c2d3e0c";
+    sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr";
   };
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];

From e388eb974c95a25111b4f0a446c2a0e994f33996 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Dec 2018 23:31:23 +0100
Subject: [PATCH 2383/2793] Revert "python: azure-mgmt-compute: 0.20.0 ->
 4.3.1"

This reverts commit 2e2916b6472cad57392ccc8331ed9a9e16d46c48.

https://github.com/NixOS/nixpkgs/issues/52547
---
 .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index e460b0ac625..4ea60f2f29a 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.3.1";
+  version = "0.20.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "5b0c2390af3e29d910e3d6e7a72b0be59d6e15933740dd193129217c000e4fed";
+    sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
   };
 
   preConfigure = ''

From ab88bd38eb2e7965b24ea59afa55ab2cfe70beea Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Dec 2018 23:36:42 +0100
Subject: [PATCH 2384/2793] Revert "python: azure-mgmt-network: 0.20.1 ->
 2.2.1"

This reverts commit a944d0fcc824360a7abc992b33abbe5518a3a3e7.

https://github.com/NixOS/nixpkgs/issues/52547
---
 .../development/python-modules/azure-mgmt-network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index beb0a7f895d..fd47f8895fd 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.2.1";
+  version = "0.20.1";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "a4327bccc435ca4f829ac18f82f17923b490958c202af7a86044ccabeaaa5401";
+    sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
   };
 
   preConfigure = ''

From cda0e2b7ecbe8a2c4ff937fb4dceccfee684f216 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Dec 2018 23:36:48 +0100
Subject: [PATCH 2385/2793] Revert "python: azure-mgmt-nspkg: 1.0.0 -> 3.0.2"

This reverts commit 8d58469a61b7df300e77818a2e1dab7bb4902ba5.

https://github.com/NixOS/nixpkgs/issues/52547
---
 pkgs/development/python-modules/azure-mgmt-nspkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index cf977539d5d..aa037b48b4f 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.0.2";
+  version = "1.0.0";
   pname = "azure-mgmt-nspkg";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
+    sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
   };
 
   propagatedBuildInputs = [ azure-nspkg ];

From 88559cb49e1a646984edd7a98140caffcf3516bd Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Dec 2018 23:36:53 +0100
Subject: [PATCH 2386/2793] Revert "python: azure-mgmt-resource: 0.20.1 ->
 2.0.0"

This reverts commit 4218dc2ba7e5a80455172e5d6b209f7ebb29ec2f.

https://github.com/NixOS/nixpkgs/issues/52547
---
 .../python-modules/azure-mgmt-resource/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 557cf8e315a..b60e3aee340 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -7,13 +7,13 @@
 
 
 buildPythonPackage rec {
-  version = "2.0.0";
+  version = "0.20.1";
   pname = "azure-mgmt-resource";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "2e83289369be88d0f06792118db5a7d4ed7150f956aaae64c528808da5518d7f";
+    sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
   };
 
   preConfigure = ''

From 77293ac160ec601719f9bb66bc79079d65bf5d5c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Dec 2018 23:36:59 +0100
Subject: [PATCH 2387/2793] Revert "python: azure-mgmt-storage: 0.20.0 ->
 3.0.0"

This reverts commit 95569262bb178273719abab189ae045ef21651ad.

https://github.com/NixOS/nixpkgs/issues/52547
---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index ec45d5ae8f6..2e0523bb25c 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.0.0";
+  version = "0.20.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "24c52b9dcb5e224ca9572d6ec39b53d332bdfe01818e85ec1cc1b5bedf16ce07";
+    sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
   };
 
   preConfigure = ''

From eeb00cc5700dae6589816c436e5ca35eedcde94c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 13:24:14 -0800
Subject: [PATCH 2388/2793] python37Packages.dominate: 2.3.4 -> 2.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/python3.7-dominate/versions
---
 pkgs/development/python-modules/dominate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 4e918968f44..94c67afe164 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dominate";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8dfcca2bde3937a2d03db6e55efcb0c0dea0d4ab0923dc983d794b19e9247328";
+    sha256 = "0lda2a4nxxh9wp727vhn31rl5v7y9fxkscdjawg7gzj50xf76xj0";
   };
 
   doCheck = !isPy3k;

From ca5ee6dfb74656a50646990225a54fdfa6aa9a56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 13:42:17 -0800
Subject: [PATCH 2389/2793] python37Packages.kafka-python: 1.4.3 -> 1.4.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/python3.7-kafka-python/versions
---
 pkgs/development/python-modules/kafka-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index db0fda6584c..0f257fb13c2 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
 
 buildPythonPackage rec {
-  version = "1.4.3";
+  version = "1.4.4";
   pname = "kafka-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88";
+    sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510";
   };
 
   checkInputs = [ pytest six mock ];

From e69ee9b53e7a840afd2deabbdf3f8e0758aa6da4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 18 Dec 2018 16:02:08 +0100
Subject: [PATCH 2390/2793] buildPython*: simplify updateScript

updateScript accepts a list, in which case, it will execute the head with the
tail as arguments. Switching to this style will allow us to get rid of the need
to create extra script doing just that.
---
 .../development/interpreters/python/mk-python-derivation.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index eb913e1a375..72a2805a300 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -113,9 +113,6 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
 passthru = {
   updateScript = let
     filename = builtins.head (lib.splitString ":" self.meta.position);
-  in writeScript "update-python" ''
-    #!${python.stdenv.shell}
-    ${update-python-libraries} ${filename}
-  '';
+  in [ update-python-libraries filename ];
 };
 in lib.extendDerivation true passthru self

From ef165916b337910f6fe5c36a15e69222a1f077c7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 18 Dec 2018 16:07:04 +0100
Subject: [PATCH 2391/2793] =?UTF-8?q?gnome-builder:=203.30.0=20=E2=86=92?=
 =?UTF-8?q?=203.30.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index a66b3ba6322..5a4be5eb448 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -30,14 +30,14 @@
 , wrapGAppsHook
 }:
 let
-  version = "3.30.0";
+  version = "3.30.2";
   pname = "gnome-builder";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak";
+    sha256 = "05yax7iv9g831xvw9xdc01qc0l7qpmh6rfd692x8cbg76hljxdrr";
   };
 
   nativeBuildInputs = [

From 52be9fbba0e425c02fc8e59a36faf10ce8adde0a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 19 Dec 2018 01:06:43 +0100
Subject: [PATCH 2392/2793] =?UTF-8?q?gnome3.gnome-software:=203.30.5=20?=
 =?UTF-8?q?=E2=86=92=203.30.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index fc822be4e0e..3c45842fdd4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.30.5";
+  version = "3.30.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0d2x208qbkx8szkrfddv1bz4rd9awfhbxvh078j7zrrfmzvq7892";
+    sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl";
   };
 
   patches = [

From d0546f0a1bdbb9c86e8dacc751e2841ee9873d54 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 20 Dec 2018 00:26:05 +0100
Subject: [PATCH 2393/2793] libgrss: fix updateScript

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

diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix
index 430ebcfd309..8fc44fb6a8d 100644
--- a/pkgs/development/libraries/libgrss/default.nix
+++ b/pkgs/development/libraries/libgrss/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
+      versionPolicy = "none";
     };
   };
 

From 31d3a99aed405c420cae2999244ff8c9de1fd92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Dec 2018 16:39:11 -0200
Subject: [PATCH 2394/2793] plano-theme: 3.30-1 -> 3.30-2

---
 pkgs/data/themes/plano/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix
index f876fbb933b..e878943ff62 100644
--- a/pkgs/data/themes/plano/default.nix
+++ b/pkgs/data/themes/plano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "plano-theme-${version}";
-  version = "3.30-1";
+  version = "3.30-2";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
     rev = "v${version}";
-    sha256 = "152iqfhwxmxx817n05j603263nbmry626zxq8hiljww8zpmqh8j2";
+    sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3568ee84a..bd139f8b8f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15676,6 +15676,8 @@ in
 
   penna = callPackage ../data/fonts/penna { };
 
+  plano-theme = callPackage ../data/themes/plano { };
+
   plata-theme = callPackage ../data/themes/plata {};
 
   poly = callPackage ../data/fonts/poly { };
@@ -22656,8 +22658,6 @@ in
 
   pjsip = callPackage ../applications/networking/pjsip { };
 
-  plano-theme = callPackage ../data/themes/plano { };
-
   ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { };
 
   pt = callPackage ../applications/misc/pt { };

From bf53bea9e492cc995b0f3c2ea3405f5aa558f1e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 21:02:53 -0800
Subject: [PATCH 2395/2793] opencollada: 1.6.67 -> 1.6.68

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

diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index d3e1482feb4..cd3da4a7960 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "opencollada-${version}";
 
-  version = "1.6.67";
+  version = "1.6.68";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     rev = "v${version}";
-    sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj";
+    sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3b17e17b510184ec22403afc49185f332a03ad57 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Tue, 18 Dec 2018 23:10:12 -0800
Subject: [PATCH 2396/2793] miniflux: 2.0.12 -> 2.0.13

Adds support for unix socket listening, amongst other things :)
---
 pkgs/servers/miniflux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index 80fb5575e4d..910b2aa2c02 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -5,7 +5,7 @@
 
 buildGoPackage rec {
   name = "miniflux-${version}";
-  version = "2.0.12";
+  version = "2.0.13";
 
   goPackagePath = "miniflux.app";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "miniflux";
     repo = "miniflux";
     rev = "refs/tags/${version}";
-    sha256 = "13d1dwcwig7b5phymgxqm227k5l3zzzvx997cywarbl953ji2y1d";
+    sha256 = "16c9jszrz3153kr0xyj7na09hpqvnjsrmsbic7qkp5a9aa839b9s";
   };
     
   goDeps = ./deps.nix;

From ee97905791b0a97c9ebb4800c1845b53680ced60 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 19 Dec 2018 19:27:14 -0500
Subject: [PATCH 2397/2793] miniflux: correct description

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

diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index 910b2aa2c02..5000e4c396c 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "miniflux-${version}";
+  pname = "miniflux";
   version = "2.0.13";
 
   goPackagePath = "miniflux.app";
@@ -29,7 +29,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Miniflux is a minimalist and opinionated feed reader.";
+    description = "Minimalist and opinionated feed reader";
     homepage = https://miniflux.app/;
     license = licenses.asl20;
     maintainers = with maintainers; [ benpye ];

From ee929c7299ee67eadfdda88d81d13e2a602dcdd9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 19 Dec 2018 19:51:08 -0500
Subject: [PATCH 2398/2793] lollypop: 0.9.611 -> 0.9.906

Changelog: https://gitlab.gnome.org/World/lollypop/tags/0.9.900

Releases after that were just bug fixes from things
introduced in 0.9.900
---
 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 a268c155a0f..5fbf9108ed7 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "0.9.611";
+  version = "0.9.906";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "1k78a26sld0xd14c9hr4qv8c7qaq1m8zqk1mzrh4pl7ysqqg9p20";
+    sha256 = "1blfq3vdzs3ji3sr1z6dn5c2f8w93zv2k7aa5xpfpfnds4zfd3q6";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 42e7e39cd3f3ef654c0484af7ccb9e81735a19ea Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 19 Dec 2018 21:28:04 -0500
Subject: [PATCH 2399/2793] nixos/release-combined.nix: Filters failing tests

And filters out JDK which can't be built on aarch64-linux.
---
 nixos/release-combined.nix | 41 ++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 73f785173c2..429afe2b145 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -46,7 +46,9 @@ in rec {
     };
     constituents =
       let
-        all = x: map (system: x.${system}) supportedSystems;
+        # Except for the given systems, return the system-specific constituent
+        except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
+        all = x: except [] x;
       in [
         nixos.channel
         (all nixos.dummy)
@@ -63,24 +65,24 @@ in rec {
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
-        (all nixos.tests.gnome3)
+        (except ["aarch64-linux"] nixos.tests.gnome3)
         nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
-        (all nixos.tests.installer.lvm)
-        (all nixos.tests.installer.luksroot)
-        (all nixos.tests.installer.separateBoot)
-        (all nixos.tests.installer.separateBootFat)
-        (all nixos.tests.installer.simple)
-        (all nixos.tests.installer.simpleLabels)
-        (all nixos.tests.installer.simpleProvided)
-        (all nixos.tests.installer.simpleUefiSystemdBoot)
-        (all nixos.tests.installer.swraid)
-        (all nixos.tests.installer.btrfsSimple)
-        (all nixos.tests.installer.btrfsSubvols)
-        (all nixos.tests.installer.btrfsSubvolDefault)
-        (all nixos.tests.boot.biosCdrom)
-        #(all nixos.tests.boot.biosUsb) # disabled due to issue #15690
-        (all nixos.tests.boot.uefiCdrom)
-        (all nixos.tests.boot.uefiUsb)
+        (except ["aarch64-linux"] nixos.tests.installer.lvm)
+        (except ["aarch64-linux"] nixos.tests.installer.luksroot)
+        (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
+        (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
+        (except ["aarch64-linux"] nixos.tests.installer.simple)
+        (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
+        (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
+        (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
+        (except ["aarch64-linux"] nixos.tests.installer.swraid)
+        (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
+        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
+        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
+        (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
+        #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
+        (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
+        (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         (all nixos.tests.hibernate)
         nixos.tests.docker.x86_64-linux or []
@@ -132,7 +134,8 @@ in rec {
 
         nixpkgs.tarball
         (all allSupportedNixpkgs.emacs)
-        (all allSupportedNixpkgs.jdk)
+        # The currently available aarch64 JDK is unfree
+        (except ["aarch64-linux"] allSupportedNixpkgs.jdk)
       ];
   });
 

From 654c3124b267bb39c23c4c4aedeffe97809afffe Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Wed, 19 Dec 2018 22:37:25 -0800
Subject: [PATCH 2400/2793] shairport-sync: don't daemonize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This flag causes the shairport-sync server to attempt to daemonize, but it looks like systemd is already handling that. With the `-d` argument, shairport-sync immediately exits—it seems that something (systemd I'm guessing?) is sending it SIGINT or SIGTERM.

The [upstream systemd unit](https://github.com/mikebrady/shairport-sync/blob/master/scripts/shairport-sync.service.in#L10) doesn't pass `-d`.
---
 nixos/modules/services/networking/shairport-sync.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix
index 36ecb74ffc9..90c0689dc7b 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 -d pulse";
+        default = "-v pulse";
         description = ''
           Arguments to pass to the daemon. Defaults to a local pulseaudio
           server.

From 5f7a34a2645a795832a453a2d5581750d7a0b9ba Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 20 Dec 2018 08:22:13 +0100
Subject: [PATCH 2401/2793] cni: migrate to using buildGoPackage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../networking/cluster/cni/default.nix         | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 130ccdc8311..3f342ea04a0 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, go, removeReferencesTo }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "cni-${version}";
   version = "0.6.0";
 
@@ -11,29 +11,23 @@ stdenv.mkDerivation rec {
     sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
   };
 
-  buildInputs = [ removeReferencesTo go ];
-
-  GOCACHE = "off";
+  goPackagePath = "github.com/containernetworking/cni";
 
   buildPhase = ''
+    cd "go/src/${goPackagePath}"
     patchShebangs build.sh
     ./build.sh
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    mv bin/cnitool $out/bin
-  '';
-
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+    install -Dm555 bin/cnitool $bin/bin/cnitool
   '';
 
   meta = with stdenv.lib; {
     description = "Container Network Interface - networking for Linux containers";
     license = licenses.asl20;
     homepage = https://github.com/containernetworking/cni;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline vdemeester ];
     platforms = [ "x86_64-linux" ];
   };
 }

From c95909721ed43e648d6325207f32c6d5f7437803 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 20 Dec 2018 09:43:19 +0100
Subject: [PATCH 2402/2793] phpPackages.phpcs: 3.3.2 -> 3.4.0

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.4.0
---
 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 2fddf4787b2..daa5c4efe40 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -357,11 +357,11 @@ let
 
   phpcs = pkgs.stdenv.mkDerivation rec {
     name = "phpcs-${version}";
-    version = "3.3.2";
+    version = "3.4.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-      sha256 = "0np3bsj32mwyrcccw5pgypz7wchd5l89bq951w9a7bxh80gjhak9";
+      sha256 = "1d6zf0ab76r5ibb80q46silhy87hrwh50gfvhd0i25wzad7r09mw";
     };
 
     phases = [ "installPhase" ];

From 6337cbfd30014c860df0df3bcbb53924c413eb32 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 20 Dec 2018 09:43:59 +0100
Subject: [PATCH 2403/2793] phpPackages.phpcbf: 3.3.2 -> 3.4.0

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.4.0
---
 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 daa5c4efe40..cb425b14e1d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -384,11 +384,11 @@ let
 
   phpcbf = pkgs.stdenv.mkDerivation rec {
     name = "phpcbf-${version}";
-    version = "3.3.2";
+    version = "3.4.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-      sha256 = "1qxcd7lkqrfjibkrqq1f5szrcjmd6682mwaxha7v93pj9f92wgn4";
+      sha256 = "0iscs4hg1msk8198pmkdmbxn1g53gbq3i5qgszs0bi6hz3ng9ag9";
     };
 
     phases = [ "installPhase" ];

From 19056fa6f7429fd261fc652a82b33657f933f921 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 20 Dec 2018 10:28:45 +0100
Subject: [PATCH 2404/2793]  albert: 0.14.22 -> 0.15.0  (#52532)

---
 pkgs/applications/misc/albert/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index d1a62dad6c9..39dae0db125 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,24 +1,22 @@
 { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase,
-  qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }:
+  qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3,
+  qtcharts }:
 
-let
-  pname = "albert";
-  version = "0.14.22";
-in
 mkDerivation rec {
-  name = "${pname}-${version}";
+  pname = "albert";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg";
+    sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
-  buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ];
+  buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ];
 
   enableParallelBuilding = true;
 

From 881bec3238f7db5ca406d0aaeef4fae3dd80f843 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Dec 2018 09:20:24 +0000
Subject: [PATCH 2405/2793] coqPackages.coqprime: enable for Coq 8.9

---
 pkgs/development/coq-modules/coqprime/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 54cb7c50e40..191812b3f2e 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchFromGitHub, coq, bignums }:
 
 let params =
+  let v_8_8 = {
+      version = "8.8";
+      sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
+    };
+  in
   {
     "8.7" = {
       version = "8.7.2";
       sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
     };
-    "8.8" = {
-      version = "8.8";
-      sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
+    "8.8" = v_8_8;
+    "8.9" = v_8_8;
     };
-  };
   param = params."${coq.coq-version}"
 ; in
 

From 49965e61d70529ced38560dab2b822ecaa5aa40d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 20 Dec 2018 09:26:17 +0100
Subject: [PATCH 2406/2793] opencv3: fix OpenCV issue 13207

See: https://github.com/opencv/opencv/pull/13232

This also fixes the test of haskell-opencv HEAD where we got the
following error:

    Feature Detection
      houghLinesP:
libgomp: Out of memory allocating 927712937064 bytes
Test suite test-opencv: FAIL
---
 pkgs/development/libraries/opencv/3.x.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index f948cbb062f..01d15416dd7 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -147,7 +147,15 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
   '';
 
-  patches =
+  patches = [
+    # https://github.com/opencv/opencv/pull/13232
+    # This also fixes the test of haskell-opencv HEAD where we got the following error:
+    # libgomp: Out of memory allocating 927712937064 bytes
+    (fetchpatch {
+      url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch;
+      sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj";
+    })
+  ] ++
     # https://github.com/opencv/opencv/pull/13254
     lib.optional enablePython (fetchpatch {
       url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;

From 6267a02d9c3980c105c8633ec5e7f43d27e7bb8a Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 20 Dec 2018 09:45:37 +0100
Subject: [PATCH 2407/2793] opencv4: fix OpenCV issue 13207

This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
---
 pkgs/development/libraries/opencv/4.x.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 407070506ab..c90ed76b534 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -160,7 +160,15 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
   '';
 
-  patches =
+  patches = [
+    # https://github.com/opencv/opencv/pull/13232
+    # This also fixes the test of haskell-opencv HEAD where we got the following error:
+    # libgomp: Out of memory allocating 927712937064 bytes
+    (fetchpatch {
+      url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch;
+      sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj";
+    })
+  ] ++
     # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
     # PR: https://github.com/opencv/opencv_contrib/pull/1913
     lib.optional buildContrib (fetchpatch {

From e5277cf8292bbd1fafa3ef5eca57e5f988132b17 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 20 Dec 2018 10:54:14 +0100
Subject: [PATCH 2408/2793] runc: migrate to using buildGoPackage

This means `runc` becomes a multi-output derivation : `runc.bin` and `runc.man`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../virtualization/runc/default.nix           | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index be5b8f62108..b89ef1dd7bf 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man
-, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
+{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man
+, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:
 
 with lib;
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "runc-${version}";
   version = "1.0.0-rc6";
 
@@ -14,32 +14,26 @@ stdenv.mkDerivation rec {
     sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
   };
 
-  outputs = [ "out" "man" ];
+  goPackagePath = "github.com/opencontainers/runc";
+  outputs = [ "bin" "out" "man" ];
 
   hardeningDisable = ["fortify"];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ];
+  buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ];
 
   makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
 
-  preConfigure = ''
-    # Extract the source
-    cd "$NIX_BUILD_TOP"
-    mkdir -p "go/src/github.com/opencontainers"
-    mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
-    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-  '';
-
-  preBuild = ''
-    cd go/src/github.com/opencontainers/runc
+  buildPhase = ''
+    cd go/src/${goPackagePath}
     patchShebangs .
     substituteInPlace libcontainer/apparmor/apparmor.go \
       --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
+    make ${makeFlags} runc
   '';
 
   installPhase = ''
-    install -Dm755 runc $out/bin/runc
+    install -Dm755 runc $bin/bin/runc
 
     # Include contributed man pages
     man/md2man-all.sh -q
@@ -55,10 +49,6 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
-  '';
-
   meta = {
     homepage = https://runc.io/;
     description = "A CLI tool for spawning and running containers according to the OCI specification";

From f9c06d41ddcf1cdd22febb1ad14f9e7db97971bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Dec 2018 10:59:57 +0100
Subject: [PATCH 2409/2793] yabar-unstable: patch for playerctl-2.0 support

---
 pkgs/applications/window-managers/yabar/unstable.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix
index 77abc0c7ed4..47c8f6c5e56 100644
--- a/pkgs/applications/window-managers/yabar/unstable.nix
+++ b/pkgs/applications/window-managers/yabar/unstable.nix
@@ -1,4 +1,4 @@
-{ playerctl, libxkbcommon, callPackage, attrs ? {} }:
+{ fetchpatch, playerctl, libxkbcommon, callPackage, attrs ? {} }:
 
 let
   pkg = callPackage ./build.nix ({
@@ -15,4 +15,11 @@ in pkg.overrideAttrs (o: {
   makeFlags = o.makeFlags ++ [
     "PLAYERCTL=1"
   ];
+
+  patches = (o.patches or []) ++ [
+    (fetchpatch {
+      url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch";
+      sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv";
+    })
+  ];
 })

From 0fc60dff30741d70a548d34017c272eb9896074f Mon Sep 17 00:00:00 2001
From: Aiken Cairncross <acairncross@gmail.com>
Date: Thu, 20 Dec 2018 10:09:42 +0000
Subject: [PATCH 2410/2793] git-secret: Add gawk to wrapper

The `git-secret` script(s) use `gawk`.
---
 .../version-management/git-and-tools/git-secret/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 4993910634a..5c6c22ac9cc 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:
 
 let
   version = "0.2.4";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
     install -D git-secret $out/bin/git-secret
 
     wrapProgram $out/bin/git-secret \
-      --prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
+      --prefix PATH : "${lib.makeBinPath [ git gnupg gawk ]}"
 
     mkdir $out/share
     cp -r man $out/share

From 32f4166c6746ec2825c269b1e5429977b7b0bf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Dec 2018 11:52:10 +0100
Subject: [PATCH 2411/2793] nix-review: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 0409df7906c..5481182fbd1 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh";
+    sha256 = "0vgar8sb2471zipxa1cw0n90mrnn5da7wqdlxhamnkrylbh0mc0d";
   };
 
   makeWrapperArgs = [

From 51fdee8b9299a66e2ae1a6a6deab4c2f67eb13e0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 20 Dec 2018 12:18:30 +0100
Subject: [PATCH 2412/2793] pythonPackages.jupytext: init at 0.8.4 (#52545)

---
 .../python-modules/jupytext/default.nix       | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupytext/default.nix

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
new file mode 100644
index 00000000000..5622ee1669d
--- /dev/null
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, testfixtures
+, pyyaml
+, mock
+, nbformat
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "jupytext";
+  version = "0.8.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1m35m9z4vy480d2200nd4lk9n5s4z3zcnq0d9rdlh4yv5264mrgf";
+  };
+
+  propagatedBuildInputs = [
+    pyyaml
+    nbformat
+    testfixtures
+  ];
+  checkInputs = [
+    pytest
+  ];
+  # setup.py checks for those even though they're not needed at runtime (only
+  # for tests), thus not propagated
+  buildInputs = [
+    mock
+    pytest
+  ];
+
+  # requires test notebooks which are not shipped with the pypi release
+  doCheck = false;
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts";
+    homepage = https://github.com/mwouts/jupytext;
+    license = licenses.mit;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66ca01dc7b4..3f5ae962697 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1871,6 +1871,8 @@ in {
 
   jupyterlab = callPackage ../development/python-modules/jupyterlab {};
 
+  jupytext = callPackage ../development/python-modules/jupytext { };
+
   PyLTI = callPackage ../development/python-modules/pylti { };
 
   lmdb = callPackage ../development/python-modules/lmdb { };

From 64d05bbdd2a745885f195b4f54fc518b07b9db7c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 19 Dec 2018 15:06:53 +0100
Subject: [PATCH 2413/2793] clickhouse: fix module and package runtime

Although the package itself builds fine, the module fails because it
tries to log into a non-existant file in `/var/log` which breaks the
service. Patching to default config to log to stdout by default fixes
the issue. Additionally this is the better solution as NixOS heavily
relies on systemd (and thus journald) for logging.

Also, the runtime relies on `/etc/localtime` to start, as it's not
required by the module system we set UTC as sensitive default when using
the module.

To ensure that the service's basic functionality is available, a simple
NixOS test has been added.
---
 .../modules/services/databases/clickhouse.nix |  5 ++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/clickhouse.nix                    | 25 +++++++++++++++++++
 pkgs/servers/clickhouse/default.nix           |  5 ++++
 4 files changed, 36 insertions(+)
 create mode 100644 nixos/tests/clickhouse.nix

diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 1b8771cec39..21e0cee3415 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -70,6 +70,11 @@ with lib;
       };
     };
 
+    environment.systemPackages = [ pkgs.clickhouse ];
+
+    # startup requires a `/etc/localtime` which only if exists if `time.timeZone != null`
+    time.timeZone = mkDefault "UTC";
+
   };
 
 }
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ca5015ded3e..1e8e2213fac 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -39,6 +39,7 @@ in
   cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
   chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
   cjdns = handleTest ./cjdns.nix {};
+  clickhouse = handleTest ./clickhouse.nix {};
   cloud-init = handleTest ./cloud-init.nix {};
   codimd = handleTest ./codimd.nix {};
   containers-bridge = handleTest ./containers-bridge.nix {};
diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix
new file mode 100644
index 00000000000..7d835069ec4
--- /dev/null
+++ b/nixos/tests/clickhouse.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "clickhouse";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+  machine = {
+    services.clickhouse.enable = true;
+  };
+
+  testScript =
+    let
+      # work around quote/substitution complexity by Nix, Perl, bash and SQL.
+      tableDDL = pkgs.writeText "ddl.sql" "CREATE TABLE `demo` (`value` FixedString(10)) engine = MergeTree PARTITION BY value ORDER BY tuple();";
+      insertQuery = pkgs.writeText "insert.sql" "INSERT INTO `demo` (`value`) VALUES ('foo');";
+      selectQuery = pkgs.writeText "select.sql" "SELECT * from `demo`";
+    in
+      ''
+        $machine->start();
+        $machine->waitForUnit("clickhouse.service");
+        $machine->waitForOpenPort(9000);
+
+        $machine->succeed("cat ${tableDDL} | clickhouse-client");
+        $machine->succeed("cat ${insertQuery} | clickhouse-client");
+        $machine->succeed("cat ${selectQuery} | clickhouse-client | grep foo");
+      '';
+})
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index b53c6388d18..bddffc52fd7 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm -rf $out/share/clickhouse-test
+
+    sed -i -e '\!<log>/var/log/clickhouse-server/clickhouse-server\.log</log>!d' \
+      $out/etc/clickhouse-server/config.xml
+    substituteInPlace $out/etc/clickhouse-server/config.xml \
+      --replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>"
   '';
 
   meta = with stdenv.lib; {

From 72eae722235bfba72f2d4bc29094209c9882fc5d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 20 Dec 2018 13:25:44 +0100
Subject: [PATCH 2414/2793] openblas: fix build on x86_64-darwin

See: https://github.com/xianyi/OpenBLAS/issues/1926
---
 .../libraries/science/math/openblas/default.nix       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 532a26481af..120fa25090a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -89,6 +89,15 @@ stdenv.mkDerivation rec {
 
   inherit blas64;
 
+  patches = [
+    # Fixes build on x86_64-darwin. See:
+    # https://github.com/xianyi/OpenBLAS/issues/1926
+    (fetchpatch {
+      url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch;
+      sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9";
+    })
+  ];
+
   # Some hardening features are disabled due to sporadic failures in
   # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but
   # with how these flags interact with hardening measures used downstream.
@@ -118,8 +127,6 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
     ++ mapAttrsToList (var: val: var + "=" + val) config;
 
-    patches = [];
-
   doCheck = true;
   checkTarget = "tests";
 

From 2141b4add142866c07e06a54de27b8916e92166f Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 20 Dec 2018 14:46:41 +0100
Subject: [PATCH 2415/2793] gcompris: 0.91 -> 0.95

---
 pkgs/games/gcompris/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index e4f8c4fd8b3..52d0bf778f9 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -2,12 +2,12 @@
   gst_all_1, ninja
 }:
 stdenv.mkDerivation rec {
-  version = "0.91";
+  version = "0.95";
   name = "gcompris-${version}";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
-    sha256 = "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg";
+    sha256 = "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl";
   };
 
   cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fccd863b9c7..fff6328ab39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20613,7 +20613,7 @@ in
 
   gcs = callPackage ../games/gcs { };
 
-  gcompris = libsForQt59.callPackage ../games/gcompris { };
+  gcompris = libsForQt5.callPackage ../games/gcompris { };
 
   gemrb = callPackage ../games/gemrb { };
 

From 53e8258a450ac92d998cab9f59a3fff0851c01a6 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Mon, 17 Dec 2018 23:21:14 +0100
Subject: [PATCH 2416/2793] bazel: fix sandbox execution

Bazel runs actions in a sandbox by default on Darwin and Linux.
However, the sandboxing was always and *silently* disabled previously,
because a Bazel feature test was always failing. The feature test
involved running `/bin/true` inside a sandbox. But on NixOS,
`/bin/true` does not exist...
---
 pkgs/development/tools/build-managers/bazel/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 15a14be7b13..9aff59f3497 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -119,7 +119,8 @@ stdenv.mkDerivation rec {
       find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
         substituteInPlace "$path" \
           --replace /bin/bash ${customBash}/bin/bash \
-          --replace /usr/bin/env ${coreutils}/bin/env
+          --replace /usr/bin/env ${coreutils}/bin/env \
+          --replace /bin/true ${coreutils}/bin/true
       done
       # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
       substituteInPlace scripts/bootstrap/compile.sh \

From 82dbdad6546bc6f05d92a5b74c2d1e723aae3efd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Dec 2018 06:28:50 -0800
Subject: [PATCH 2417/2793] python37Packages.flask_migrate: 2.3.0 -> 2.3.1
 (#52117)

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

diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 1f9177832c3..90c2349ae53 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19rxhva9i5n643vm3d11f8p98jwai2pavysa217p5w5h5cnksnx2";
+    sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3";
   };
 
   checkInputs = optional isPy3k glibcLocales;

From ce66baaf71d36fa61d8466f54b63afdaf540b3ad Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 20 Dec 2018 14:29:32 +0000
Subject: [PATCH 2418/2793] CODEOWNERS: add @alyssais (me) to Ruby

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 80485eb1352..0fee7ba7df2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -69,8 +69,8 @@
 /pkgs/development/r-modules         @peti
 
 # Ruby
-/pkgs/development/interpreters/ruby @zimbatm
-/pkgs/development/ruby-modules      @zimbatm
+/pkgs/development/interpreters/ruby @alyssais @zimbatm
+/pkgs/development/ruby-modules      @alyssais @zimbatm
 
 # Rust
 /pkgs/development/compilers/rust @Mic92 @LnL7

From 843b40ff6b3818903c89cf49964b33430ab52990 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 20 Dec 2018 14:31:13 +0000
Subject: [PATCH 2419/2793] bundix: add qyliss (me) to maintainers

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

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 45be83f6ebe..92f14114cf1 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -38,7 +38,7 @@ buildRubyGem rec {
     '';
     homepage = https://github.com/manveru/bundix;
     license = "MIT";
-    maintainers = with lib.maintainers; [ manveru zimbatm ];
+    maintainers = with lib.maintainers; [ manveru qyliss zimbatm ];
     platforms = lib.platforms.all;
   };
 }

From 256deeb33e41b1c4b84df16058aa944db4d39b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 20 Dec 2018 15:42:41 +0100
Subject: [PATCH 2420/2793] python.pkgs.pathpy: improve expression

---
 pkgs/development/python-modules/path.py/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index fc20624e3fa..a94d495310f 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
-, pytestrunner
 , pytest
+, pytest-flake8
 , glibcLocales
 , packaging
 , isPy27
@@ -14,14 +14,13 @@
 buildPythonPackage rec {
   pname = "path.py";
   version = "11.5.0";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb";
   };
 
-  checkInputs = [ pytest pytestrunner glibcLocales packaging ];
+  checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [
     importlib-metadata
@@ -37,9 +36,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = ''
-    # Ignore pytest configuration
-    rm pytest.ini
     # ignore performance test which may fail when the system is under load
-    py.test -v -k 'not TestPerformance' test_path.py
+    py.test -v -k 'not TestPerformance'
   '';
 }

From 551ffccf9824369b55ed0f6e935ad7589637275a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net>
Date: Thu, 20 Dec 2018 15:52:20 +0100
Subject: [PATCH 2421/2793] idrisPackages.tparsec: 2018-06-26 -> 2018-11-09

---
 pkgs/development/idris-modules/tparsec.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 00d4adba5dc..fcf25f0fb93 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -4,15 +4,15 @@
 }:
 build-idris-package  {
   name = "tparsec";
-  version = "2018-06-26";
+  version = "2018-11-09";
 
   ipkgName = "TParsec";
 
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "idris-tparsec";
-    rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2";
-    sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30";
+    rev = "fc5bc1e0bf21a53ec854990ed799c4c73e304b06";
+    sha256 = "0ladks6x1qhs884w4rsxnzpq8dpijyqfqbvhk55kq10xh6w1smrz";
   };
 
   meta = {

From 4043e157f5b200df6096851b22315ff8b05864ef Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 20 Dec 2018 16:08:53 +0100
Subject: [PATCH 2422/2793] qml-box2d: 2018-03-16 -> 2018-04-06

---
 pkgs/development/libraries/qmlbox2d/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 630f606c2e5..083e0a51b81 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,11 +1,11 @@
 {stdenv, qtdeclarative, fetchFromGitHub, qmake }:
 stdenv.mkDerivation rec {
-  name = "qml-box2d-2018-03-16";
+  name = "qml-box2d-2018-04-06";
   src = fetchFromGitHub {
     owner = "qml-box2d";
     repo = "qml-box2d";
-    sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2";
-    rev = "21e57f1";
+    sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7";
+    rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff6328ab39..cf2fe0e37bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12243,7 +12243,7 @@ in
     qmltermwidget = callPackage ../development/libraries/qmltermwidget {
       inherit (darwin.apple_sdk.libs) utmp;
     };
-    qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };
+    qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { };
 
     qscintilla = callPackage ../development/libraries/qscintilla {
       withQt5 = true;

From 1b84b9f7252205750246eeea56abcff765d56805 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Dec 2018 10:46:17 -0500
Subject: [PATCH 2423/2793] linux: 4.19.10 -> 4.19.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 4b33c121788..5ce1206c4c9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.10";
+  version = "4.19.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 = "151ync20fz8bmiw3826jznx8kd7fna85vygrfchsqgm9xk76isdg";
+    sha256 = "1v3rbkf0vby9qav2d73zqzb4ch3vm4w8b54davmkz003452v6phs";
   };
 } // (args.argsOverride or {}))

From ca0c253a8066d32518e015e1befa27879fffcde0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 16:41:00 +0100
Subject: [PATCH 2424/2793] monkeysphere: Patch OpenSSH to run the tests in the
 sandbox

---
 pkgs/tools/security/monkeysphere/default.nix  | 32 +++++++++++++------
 .../monkeysphere/openssh-nixos-sandbox.patch  | 17 ++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index b1c36871fe6..46be3b98c55 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -2,13 +2,23 @@
 , perl, libassuan, libgcrypt
 , perlPackages, lockfileProgs, gnupg, coreutils
 # For the tests:
-, bash, openssh, which, socat, cpio, hexdump
+, bash, openssh, which, socat, cpio, hexdump, openssl
 }:
 
-stdenv.mkDerivation rec {
+let
+  # A patch is needed to run the tests inside the Nix sandbox:
+  # /etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell"
+  # sshd: "User nixbld not allowed because shell /noshell does not exist"
+  opensshUnsafe = openssh.overrideAttrs (oldAttrs: {
+    patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ];
+  });
+in stdenv.mkDerivation rec {
   name = "monkeysphere-${version}";
   version = "0.42";
 
+  # The patched OpenSSH binary MUST NOT be used (except in the check phase):
+  disallowedRequisites = [ opensshUnsafe ];
+
   src = fetchurl {
     url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
     sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1";
@@ -23,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perl libassuan libgcrypt ]
     ++ stdenv.lib.optional doCheck
-      ([ gnupg openssh which socat cpio hexdump lockfileProgs ] ++
+      ([ gnupg opensshUnsafe which socat cpio hexdump lockfileProgs ] ++
       (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
 
   makeFlags = ''
@@ -31,15 +41,19 @@ stdenv.mkDerivation rec {
     DESTDIR=$(out)
   '';
 
-  # The tests "drain" entropy (GnuPG still uses /dev/random) and they don't run
-  # inside of the sandbox, because nixbld isn't allowed to login via SSH
-  # (/etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell",
-  # sshd: "User nixbld not allowed because shell /noshell does not exist").
+  # The tests should be run (and succeed) when making changes to this package
+  # but they aren't enabled by default because they "drain" entropy (GnuPG
+  # still uses /dev/random).
   doCheck = false;
-  preCheck = ''
+  preCheck = stdenv.lib.optionalString doCheck ''
     patchShebangs tests/
     patchShebangs src/
-    sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
+    sed -i \
+      -e "s,/usr/sbin/sshd,${opensshUnsafe}/bin/sshd," \
+      -e "s,/bin/true,${coreutils}/bin/true," \
+      -e "s,/bin/false,${coreutils}/bin/false," \
+      -e "s,openssl\ req,${openssl}/bin/openssl req," \
+      tests/basic
     sed -i "s/<(hd/<(hexdump/" tests/keytrans
   '';
 
diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
new file mode 100644
index 00000000000..2a9a1fc8dfa
--- /dev/null
+++ b/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
@@ -0,0 +1,17 @@
+diff --git a/auth.c b/auth.c
+index d2a8cd65..811a129f 100644
+--- a/auth.c
++++ b/auth.c
+@@ -580,6 +580,12 @@ getpwnamallow(const char *user)
+ #endif
+ 
+ 	pw = getpwnam(user);
++        if (pw != NULL) {
++		// This is only for testing purposes,
++		// DO NOT USE THIS PATCH IN PRODUCTION!
++		char *shell = "/bin/sh";
++		pw->pw_shell = shell;
++        }
+ 
+ #if defined(_AIX) && defined(HAVE_SETAUTHDB)
+ 	aix_restoreauthdb();

From d5fe4665667c730204c0276b2db176cfb21faf55 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 20 Dec 2018 04:38:17 -0500
Subject: [PATCH 2425/2793] openspades: Fix Darwin build

---
 pkgs/games/openspades/default.nix | 15 +++++++++++++--
 pkgs/top-level/all-packages.nix   |  4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index b4757265555..f218ba762ca 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file
 , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick
 , openal , opusfile, libogg
+, Cocoa
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +20,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+    Cocoa
+  ];
+
+  patches = [
+    # https://github.com/yvt/openspades/pull/793 fix Darwin build
+    (fetchpatch {
+      url = "https://github.com/yvt/openspades/commit/2d13704fefc475b279337e89057b117f711a35d4.diff";
+      sha256 = "1i7rcpjzkjhbv5pp6byzrxv7sb1iamqq5k1vyqlvkbr38k2dz0rv";
+    })
   ];
 
   cmakeFlags = [
@@ -43,6 +54,6 @@ stdenv.mkDerivation rec {
     description = "A compatible client of Ace of Spades 0.75";
     homepage    = "https://github.com/yvt/openspades/";
     license     = licenses.gpl3;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd7559ead14..190176c0b04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20034,7 +20034,9 @@ with pkgs;
 
   openrw = callPackage ../games/openrw { };
 
-  openspades = callPackage ../games/openspades { };
+  openspades = callPackage ../games/openspades {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;

From e37f0454acf7cf22e70deba47ea64401f035676c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 20 Dec 2018 19:29:00 +0100
Subject: [PATCH 2426/2793] Remove relatedPackages to fix ofborg evaluation

---
 nixos/modules/programs/adb.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 43700526ce9..250d8c252a3 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -16,7 +16,6 @@ with lib;
           To grant access to a user, it must be part of adbusers group:
           <code>users.users.alice.extraGroups = ["adbusers"];</code>
         '';
-        relatedPackages = [ ["androidenv" "androidPkgs_9_0" "platform-tools"] ];
       };
     };
   };

From d06770b9a03b6fe1e2fe34c2026337c58c326af5 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 20 Dec 2018 20:03:26 +0100
Subject: [PATCH 2427/2793] allegro5: fix build for mesa 18.2.5

mesa 18.2.5, introduced in 6b490ee2964662d69f0d38e71f0dc3565ad49515
changed some private headers, that allegro is relying on. This fix backports
the relevant commit from allegro upstream

cc @7c6f434c
---
 pkgs/development/libraries/allegro/5.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 5e82a1a3c6b..269a139a3d6 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto
+{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
 , xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
@@ -28,7 +28,15 @@ stdenv.mkDerivation rec {
     libpulseaudio libpthreadstubs
   ];
 
-  patchPhase = ''
+  patches = [
+   # fix compilation with mesa 18.2.5
+   (fetchpatch {
+     url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch";
+     sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m";
+   })
+  ];
+
+  postPatch = ''
     sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
   '';
 

From 010b1c391d998fa9ef1ef9aea2d60a68df5c27a6 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Tue, 18 Dec 2018 20:13:48 +0100
Subject: [PATCH 2428/2793] add elohmeier to maintainers

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 60cb3cd5c7e..48474b21235 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1329,6 +1329,11 @@
     github = "ellis";
     name = "Ellis Whitehead";
   };
+  elohmeier = {
+    email = "elo-nixos@nerdworks.de";
+    github = "elohmeier";
+    name = "Enno Lohmeier";
+  };
   elseym = {
     email = "elseym@me.com";
     github = "elseym";

From 16071bb5cde0d97b9cc3479fff5c35fc6a8297b3 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Thu, 20 Dec 2018 18:45:23 +0100
Subject: [PATCH 2429/2793] pythonPackages.sepaxml: init at 2.0.0

---
 .../python-modules/sepaxml/default.nix        | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/sepaxml/default.nix

diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
new file mode 100644
index 00000000000..deb24a7130a
--- /dev/null
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  version = "2.0.0";
+  pname = "sepaxml";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc";
+  };
+
+  # no tests included in PyPI package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/raphaelm/python-sepaxml/;
+    description = "SEPA Direct Debit XML generation in python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f5ae962697..c468e39f19b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -702,6 +702,8 @@ in {
 
   selectors2 = callPackage ../development/python-modules/selectors2 { };
 
+  sepaxml = callPackage ../development/python-modules/sepaxml { };
+
   serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
 
   shellingham = callPackage ../development/python-modules/shellingham {};

From 49406530b6ed3d248446a31f4d1e5045f0ad4913 Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Thu, 20 Dec 2018 18:46:04 +0100
Subject: [PATCH 2430/2793] pythonPackages.fints: init at 2.0.0

---
 .../python-modules/fints/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/fints/default.nix

diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
new file mode 100644
index 00000000000..4f6d8d0dc17
--- /dev/null
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  requests, mt-940, sepaxml, bleach, isPy3k }:
+
+buildPythonPackage rec {
+  version = "2.0.0";
+  pname = "fints";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1";
+  };
+
+  propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
+
+  # no tests included in PyPI package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/raphaelm/python-fints/;
+    description = "Pure-python FinTS (formerly known as HBCI) implementation";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c468e39f19b..2a7b48b006d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -358,6 +358,8 @@ in {
 
   filterpy = callPackage ../development/python-modules/filterpy { };
 
+  fints = callPackage ../development/python-modules/fints { };
+
   fire = callPackage ../development/python-modules/fire { };
 
   fdint = callPackage ../development/python-modules/fdint { };

From 202008bbb42f197d3e47bcbb1cdda68e6060f5e0 Mon Sep 17 00:00:00 2001
From: Lassi Haasio <ilikeavocadoes@hush.com>
Date: Thu, 20 Dec 2018 21:10:21 +0200
Subject: [PATCH 2431/2793] syncthing: 0.14.52 -> 0.14.54

---
 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 16649653eb3..b084e4af972 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoPackage rec {
-      version = "0.14.52";
+      version = "0.14.54";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd";
+        sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza";
       };
 
       goPackagePath = "github.com/syncthing/syncthing";

From 7d270d993b9e06040793411ecff11b409e3752b7 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 20 Dec 2018 20:40:34 +0100
Subject: [PATCH 2432/2793] liquibase: fix missing dependencies

---
 .../tools/database/liquibase/default.nix           | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 46104e78d1d..4589e6ff4e5 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -6,7 +6,18 @@ assert mysqlSupport -> mysql_jdbc != null;
 with stdenv.lib;
 let
   extraJars = optional mysqlSupport mysql_jdbc;
-
+  logback-core = fetchurl {
+    url = "http://central.maven.org/maven2/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar";
+    sha256 = "5946d837fe6f960c02a53eda7a6926ecc3c758bbdd69aa453ee429f858217f22";
+  };
+  logback-classic = fetchurl {
+    url = "http://central.maven.org/maven2/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar";
+    sha256 = "fb53f8539e7fcb8f093a56e138112056ec1dc809ebb020b59d8a36a5ebac37e0";
+  };
+  slf4j = fetchurl {
+    url = "http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar";
+    sha256 = "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79";
+  };
 in
 
 stdenv.mkDerivation rec {
@@ -34,6 +45,7 @@ stdenv.mkDerivation rec {
     in ''
       mkdir -p $out/{bin,lib,sdk}
       mv ./* $out/
+      cp ${logback-core} ${logback-classic} ${slf4j} $out/lib
 
       # Clean up documentation.
       mkdir -p $out/share/doc/${name}

From 327f7da2607dcea4b0ca5f57fefe06f24bd3cdf2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 14 Dec 2018 22:13:08 +0100
Subject: [PATCH 2433/2793] chromium: 71.0.3578.80 -> 71.0.3578.98

CVE-2018-17481
---
 .../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 a6dc397cbc5..add3cd6a4a7 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 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
-    sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay";
-    version = "71.0.3578.80";
+    sha256 = "1xcdbf5yia3xm0kil0gyd1mlj3m902w1px3lzpdqv31mr2lzaz08";
+    sha256bin64 = "0pcbz3201nyl07psdxwphb3z9shqj4crj16f97xclyvjnwpl1jnp";
+    version = "72.0.3626.28";
   };
   dev = {
-    sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4";
-    sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87";
-    version = "72.0.3622.0";
+    sha256 = "1vlpcafg3xx6bpnf74xs6ifqjbpb5bpxp10r55w4784yr57pmhq3";
+    sha256bin64 = "02y974zbxy1gbiv9q8hp7nfl0l5frn35ggmgc44g90pbry48h8rg";
+    version = "73.0.3642.0";
   };
   stable = {
-    sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
-    sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4";
-    version = "71.0.3578.80";
+    sha256 = "0icxdg4fvz30jzq0xvl11zlwc9anb3lr9lb8sn1lqxr513isjmhw";
+    sha256bin64 = "07kiqx5bpk54il0ynxl61bs5yscxb470q2bw3sx6cxjbhmnvbcn2";
+    version = "71.0.3578.98";
   };
 }

From ba8dbbd010e4ec1fb2b4bfc87624a55fbddcda61 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 11:40:07 +0100
Subject: [PATCH 2434/2793] pythonPackages.raven: 6.9.0 -> 6.10.0

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

diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 07632662d26..9ea04fa8bdf 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.9.0";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
     rev = version;
-    sha256 = "1kggp34i8gqi47khca2v5n2i32zrg66m1pga6c00yqmlbv74d84v";
+    sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8";
   };
 
   # way too many dependencies to run tests

From b07a70312567cd945d75199addaa3f141cb37f29 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 20:49:40 +0100
Subject: [PATCH 2435/2793] androidStudioPackages.{dev,canary}: 3.4.0.7 ->
 3.4.0.8

---
 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 fbed3b432c0..4931a46b358 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.7"; # "Android Studio 3.4 Canary 8"
-    build = "183.5173923";
-    sha256Hash = "0bf96c9db15rw1k1znz6yxhbrn9q990zy3pkq0nsirnqfpgllvpi";
+    version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"
+    build = "183.5186062";
+    sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9";
   };
 in rec {
   # Old alias

From 542a7d4ca682e860ba249676c6d28471bd417696 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 20:52:49 +0100
Subject: [PATCH 2436/2793] androidStudioPackages.beta: 3.3.0.18 -> 3.3.0.19

---
 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 4931a46b358..96e39cdc629 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
   };
   betaVersion = {
-    version = "3.3.0.18"; # "Android Studio 3.3 RC 2"
-    build = "182.5160847";
-    sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
+    version = "3.3.0.19"; # "Android Studio 3.3 RC 3"
+    build = "182.5183351";
+    sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy";
   };
   latestVersion = { # canary & dev
     version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"

From 0410537561decd5fc2751bb675a2e10bb931bd6c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Dec 2018 18:36:06 -0500
Subject: [PATCH 2437/2793] hyperledger-fabric: init at 1.3.0

---
 .../tools/misc/hyperledger-fabric/default.nix | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/misc/hyperledger-fabric/default.nix

diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix
new file mode 100644
index 00000000000..a66923b03f4
--- /dev/null
+++ b/pkgs/tools/misc/hyperledger-fabric/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "hyperledger-fabric";
+  version = "1.3.0";
+
+  goPackagePath = "github.com/hyperledger/fabric";
+
+  # taken from https://github.com/hyperledger/fabric/blob/v1.3.0/Makefile#L108
+  subPackages = [
+    "common/tools/configtxgen"
+    "common/tools/configtxlator"
+    "common/tools/cryptogen"
+    "common/tools/idemixgen"
+    "cmd/discover"
+    "peer"
+    "orderer"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "hyperledger";
+    repo = "fabric";
+    rev = "v${version}";
+    sha256 = "08qrrxzgkqg9v7n3y8f2vggyqx9j65wisxi17hrabz5mzaq299xs";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "An implementation of blockchain technology, leveraging familiar and proven technologies";
+    homepage = https://wiki.hyperledger.org/projects/Fabric;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afbaaa9a3eb..7082c1ff536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17525,6 +17525,8 @@ in
     extra-packages = [ csound ];
   };
 
+  hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
+
   jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };

From 7b26a5843e3719b2268c8c1664102c7994f82926 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 21:40:21 +0100
Subject: [PATCH 2438/2793] gns3-server: Fix the build

This solution isn't optimal but it seems like typing has problems with
Python 3.7 and prompt_toolkit 1.0.15 is still required.
---
 pkgs/applications/networking/gns3/server.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 7717862f6a0..f3927d8cdd2 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,9 +1,9 @@
 { stable, branch, version, sha256Hash }:
 
-{ stdenv, python3Packages, fetchFromGitHub, fetchurl }:
+{ stdenv, python36Packages, fetchFromGitHub, fetchurl }:
 
 let
-  pythonPackages = python3Packages;
+  pythonPackages = python36Packages;
   async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
     (oldAttrs:
       rec {
@@ -24,8 +24,7 @@ let
           sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
         };
         propagatedBuildInputs = [ async-timeout ]
-          ++ (with pythonPackages; [ attrs chardet multidict yarl ])
-          ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
+          ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]);
       }));
   aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
     (oldAttrs:
@@ -57,7 +56,7 @@ in pythonPackages.buildPythonPackage rec {
     ++ (with pythonPackages; [
       yarl aiohttp multidict
       jinja2 psutil zipstream raven jsonschema typing
-      prompt_toolkit
+      (pythonPackages.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
     ]);
 
   # Requires network access

From 0aac84e1c30000b3706c186d8a22662cb1825d3d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Dec 2018 22:10:07 +0100
Subject: [PATCH 2439/2793] gitRepo: 1.13.0 -> 1.13.1

---
 pkgs/applications/version-management/git-repo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 242c06138eb..8df7c3700a2 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-repo-${version}";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0078nyz2j3ci9rs0h104xh046n0mcls3xcw5mysi2r7453xj8fkn";
+    sha256 = "09p0xv8x7mkmibri7rcl1k4dwh2gj3c7dipkrwrsir6hrwsispd1";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 64b9df085d90078f2db958bf413cc3df4e224629 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 20 Dec 2018 23:51:48 +0100
Subject: [PATCH 2440/2793] Revert "python: cypari2: 1.3.1 -> 2.0.0" (#52596)

This reverts commit 7c9ca654801d472563ddac4bf488ebdabc2bb491. The
cypari2 update is not ready. The package is pretty much only used for
sage and the update causes problems:
https://trac.sagemath.org/ticket/26442#comment:33
I've already reverted this once before.
---
 pkgs/development/python-modules/cypari2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 9a9be578ca8..a77e98dae4c 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.0.1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32fad615d773e9b5a9394c078ddc2c868e64e35f1ac9633ff90b456901b9d886";
+    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs

From 19a297c099bffc4db9004b1b4593c1a1d115bbe8 Mon Sep 17 00:00:00 2001
From: Liam Dawson <liam@ldaws.com>
Date: Fri, 21 Dec 2018 10:35:41 +1100
Subject: [PATCH 2441/2793] plex: 1.14.0.5470 -> 1.14.1.5488

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 9561af537e3..cce1f5c6ab0 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.14.0.5470";
-    vsnHash = "9d51fdfaa";
-    sha256 = "cf547d286c731e98b19b70954f2777653fe77c30c329faab260c460374984010";
+    version = "1.14.1.5488";
+    vsnHash = "cc260c476";
+    sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40";
   };
 
 in stdenv.mkDerivation rec {

From a0838372b7976bb75ad83d14156e6d7c135a7961 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Dec 2018 02:37:39 +0000
Subject: [PATCH 2442/2793] CODEOWNERS: add @volth to Perl

---
 .github/CODEOWNERS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0fee7ba7df2..3a2761204d6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -64,6 +64,11 @@
 /pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk
 /pkgs/development/haskell-modules/hoogle.nix          @peti @ryantm @basvandijk
 
+# Perl
+/pkgs/development/interpreters/perl @volth
+/pkgs/top-level/perl-packages.nix   @volth
+/pkgs/development/perl-modules      @volth
+
 # R
 /pkgs/applications/science/math/R   @peti
 /pkgs/development/r-modules         @peti

From 7c995f12273bfe0627e85e472d7ad885624d60ac Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 20 Dec 2018 21:44:37 -0500
Subject: [PATCH 2443/2793] pythonPackages.github3_py: cleanup

---
 .../python-modules/github3_py/default.nix     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
index 7b378660cff..cab7ca68ef6 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -1,18 +1,19 @@
-{ stdenv
+{ lib
+, pythonOlder
 , buildPythonPackage
 , fetchPypi
-, unittest2
-, pytest
-, mock
 , betamax
+, pytest
 , betamax-matchers
-, dateutil
+, unittest2
+, mock
 , requests
-, pyopenssl
 , uritemplate
+, dateutil
+, jwcrypto
+, pyopenssl
 , ndg-httpsclient
 , pyasn1
-, jwcrypto
 }:
 
 buildPythonPackage rec {
@@ -24,18 +25,19 @@ buildPythonPackage rec {
     sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af";
   };
 
-  buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];
+  checkInputs = [ betamax pytest betamax-matchers ]
+    ++ lib.optional (pythonOlder "3") unittest2
+    ++ lib.optional (pythonOlder "3.3") mock;
   propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ];
 
   postPatch = ''
-    sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py
     sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py
   '';
 
   # TODO: only disable the tests that require network
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://github3py.readthedocs.org/en/master/;
     description = "A wrapper for the GitHub API written in python";
     license = licenses.bsd3;

From 306a07f8d4c176a51ead2f47059917bc1d0f0d67 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 20 Dec 2018 22:02:20 -0500
Subject: [PATCH 2444/2793] pythonPackages.behave: fix build on Python 2.7

---
 pkgs/development/python-modules/behave/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 6fc3f16b3ad..7ad3489553c 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi
+{ stdenv, fetchPypi, fetchpatch
 , buildPythonApplication, python, pythonOlder
 , mock, nose, pathpy, pyhamcrest, pytest
 , glibcLocales, parse, parse-type, six
@@ -13,6 +13,14 @@ buildPythonApplication rec {
     sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
   };
 
+  patches = [
+    # Fix tests on Python 2.7
+    (fetchpatch {
+      url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch;
+      sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy";
+    })
+  ];
+
   checkInputs = [ mock nose pathpy pyhamcrest pytest ];
   buildInputs = [ glibcLocales ];
   propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;

From 679e8fa932c497eca8163dd4275010e9c4a61bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Dec 2018 10:22:20 +0100
Subject: [PATCH 2445/2793] nss-pam-ldapd: fix build by disabling kerberos

---
 pkgs/tools/networking/nss-pam-ldapd/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index fc961675c7f..b199d850f97 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, openldap, python, pam, makeWrapper }:
+{ stdenv, fetchurl
+, pkgconfig, makeWrapper, autoreconfHook
+, openldap, python, pam
+}:
 
 stdenv.mkDerivation rec {
   name = "nss-pam-ldapd-${version}";
   version = "0.9.10";
-  
+
   src = fetchurl {
     url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
     sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
   };
-  
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper python openldap pam ];
+
+  nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
+  buildInputs = [ openldap pam python ];
 
   preConfigure = ''
     substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
     "--with-nslcd-socket=/run/nslcd/socket"
     "--with-nslcd-pidfile=/run/nslcd/nslcd.pid"
     "--with-pam-seclib-dir=$(out)/lib/security"
+    "--enable-kerberos=no"
   ];
 
   postInstall = ''

From 3facb3bf793b9bf6514cb55bbae6c398adb8b386 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 9 Dec 2018 19:47:14 +0100
Subject: [PATCH 2446/2793] dsview: init at 0.99

---
 .../science/electronics/dsview/default.nix    | 47 +++++++++++++++++++
 .../science/electronics/dsview/install.patch  | 15 ++++++
 .../electronics/dsview/libsigrok4dsl.nix      | 28 +++++++++++
 .../dsview/libsigrokdecode4dsl.nix            | 27 +++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 5 files changed, 123 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/dsview/default.nix
 create mode 100644 pkgs/applications/science/electronics/dsview/install.patch
 create mode 100644 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
 create mode 100644 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix

diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
new file mode 100644
index 00000000000..af3844f4731
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, autoreconfHook,
+glib, libzip, boost, fftw, qtbase,
+libusb, makeWrapper, libsigrok4dsl, libsigrokdecode4dsl
+}:
+
+stdenv.mkDerivation rec {
+  name = "dsview-${version}";
+
+  version = "0.99";
+
+  src = fetchFromGitHub {
+      owner = "DreamSourceLab";
+      repo = "DSView";
+      rev = version;
+      sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2";
+  };
+
+  postUnpack = ''
+    export sourceRoot=$sourceRoot/DSView
+  '';
+
+  patches = [
+    # Fix absolute install paths
+    ./install.patch
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
+  buildInputs = [
+   boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl
+  ];
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    wrapProgram $out/bin/DSView --suffix QT_PLUGIN_PATH : \
+      ${qtbase.bin}/${qtbase.qtPluginPrefix}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
+    homepage = http://www.dreamsourcelab.com/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bachp ];
+  };
+}
diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch
new file mode 100644
index 00000000000..e30a28d80fa
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/install.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1c33e1..208a184 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
+ install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
+ install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS)
+ install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf)
+-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
+-install(FILES DSView.desktop DESTINATION /usr/share/applications/)
++install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)
++install(FILES DSView.desktop DESTINATION share/applications/)
+ 
+ #===============================================================================
+ #= Packaging (handled by CPack)
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
new file mode 100644
index 00000000000..4a681907e19
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgconfig, autoreconfHook,
+glib, libzip, libserialport, check, libusb, libftdi,
+systemd, alsaLib, dsview
+}:
+
+stdenv.mkDerivation rec {
+  inherit (dsview) version src;
+
+  name = "libsigrok4dsl-${version}";
+
+  postUnpack = ''
+    export sourceRoot=$sourceRoot/libsigrok4DSL
+  '';
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  buildInputs = [
+    glib libzip libserialport libusb libftdi systemd check alsaLib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A fork of the sigrok library for usage with DSView";
+    homepage = http://www.dreamsourcelab.com/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bachp ];
+  };
+}
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
new file mode 100644
index 00000000000..58f32f2ae6c
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
@@ -0,0 +1,27 @@
+{ stdenv, pkgconfig, autoreconfHook,
+glib, check, python3, dsview
+}:
+
+stdenv.mkDerivation rec {
+  inherit (dsview) version src;
+
+  name = "libsigrokdecode4dsl-${version}";
+
+  postUnpack = ''
+    export sourceRoot=$sourceRoot/libsigrokdecode4DSL
+  '';
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  buildInputs = [
+    python3 glib check
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A fork of the sigrokdecode library for usage with DSView";
+    homepage = http://www.dreamsourcelab.com/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bachp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b3ce642bb9..55b2c982ef6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2353,6 +2353,8 @@ in
 
   dropbear = callPackage ../tools/networking/dropbear { };
 
+  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
+
   dtach = callPackage ../tools/misc/dtach { };
 
   dtc = callPackage ../development/compilers/dtc { };
@@ -8520,6 +8522,10 @@ in
 
   libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
 
+  # special forks used for dsview
+  libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };
+  libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { };
+
   dcadec = callPackage ../development/tools/dcadec { };
 
   dejagnu = callPackage ../development/tools/misc/dejagnu { };

From 61fad2cdceb6dc6181d3208fc5acced2515f36e0 Mon Sep 17 00:00:00 2001
From: Robert Scott <robert.scott@digital.cabinet-office.gov.uk>
Date: Tue, 18 Dec 2018 17:53:01 +0000
Subject: [PATCH 2447/2793] cloudfoundry-cli: fix build on multiple platforms,
 notably darwin, to produce correct binary for target

---
 .../development/tools/cloudfoundry-cli/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 3ce9e64c0f7..bdcc8b18d21 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -17,9 +17,20 @@ buildGoPackage rec {
 
   outputs = [ "out" ];
 
+  makeTarget = let hps = stdenv.hostPlatform.system; in
+    if hps == "x86_64-darwin" then
+      "out/cf-cli_osx"
+    else if hps == "x86_64-linux" then
+      "out/cf-cli_linux_x86-64"
+    else if hps == "i686-linux" then
+      "out/cf-cli_linux_i686"
+    else
+      throw "make target for this platform unknown";
+
   buildPhase = ''
     cd go/src/${goPackagePath}
-    CF_BUILD_DATE="1970-01-01" make build
+    CF_BUILD_DATE="1970-01-01" make $makeTarget
+    cp $makeTarget out/cf
   '';
 
   installPhase = ''
@@ -33,5 +44,6 @@ buildGoPackage rec {
     homepage = https://github.com/cloudfoundry/cli;
     maintainers = with maintainers; [ ris ];
     license = licenses.asl20;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 8e5c4a4c1d10fad4fa8e0dc96fae7516fdc8ba29 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 20 Dec 2018 22:49:13 +0000
Subject: [PATCH 2448/2793] cloudfoundry-cli: output to "bin" output, don't
 "remove-references-to"

---
 pkgs/development/tools/cloudfoundry-cli/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index bdcc8b18d21..283b17378e3 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -15,8 +15,6 @@ buildGoPackage rec {
     sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv";
   };
 
-  outputs = [ "out" ];
-
   makeTarget = let hps = stdenv.hostPlatform.system; in
     if hps == "x86_64-darwin" then
       "out/cf-cli_osx"
@@ -34,9 +32,8 @@ buildGoPackage rec {
   '';
 
   installPhase = ''
-    install -Dm555 out/cf "$out/bin/cf"
-    remove-references-to -t ${go} "$out/bin/cf"
-    install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
+    install -Dm555 out/cf "$bin/bin/cf"
+    install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
   '';
 
   meta = with stdenv.lib; {

From 9046038d6cded077ed3553f0c008a9939b78bcb4 Mon Sep 17 00:00:00 2001
From: Robert Scott <robert.scott@digital.cabinet-office.gov.uk>
Date: Wed, 19 Dec 2018 12:50:42 +0000
Subject: [PATCH 2449/2793] cloudfoundry-cli: 6.37.0 -> 6.41.0

---
 pkgs/development/tools/cloudfoundry-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 283b17378e3..4f285fa6961 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "cloudfoundry-cli-${version}";
-  version = "6.37.0";
+  version = "6.41.0";
 
   goPackagePath = "code.cloudfoundry.org/cli";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv";
+    sha256 = "1dkd0lfq55qpnxsrigffaqm2nlcxr0bm0jsl4rsjlmb8p2vgpx8b";
   };
 
   makeTarget = let hps = stdenv.hostPlatform.system; in

From 469a36cdb9a4c5616a119a44b4f4ed2baaa63705 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 21 Dec 2018 11:02:59 +0100
Subject: [PATCH 2450/2793] gns3-server: Switch to overrideAttrs

---
 pkgs/applications/networking/gns3/server.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index f3927d8cdd2..24e641abc82 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,7 +4,7 @@
 
 let
   pythonPackages = python36Packages;
-  async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
+  async-timeout = pythonPackages.async-timeout.overrideAttrs
     (oldAttrs:
       rec {
         pname = "async-timeout";
@@ -13,8 +13,8 @@ let
           inherit pname version;
           sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
         };
-      }));
-  aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
+      });
+  aiohttp = pythonPackages.aiohttp.overrideAttrs
     (oldAttrs:
       rec {
         pname = "aiohttp";
@@ -25,8 +25,8 @@ let
         };
         propagatedBuildInputs = [ async-timeout ]
           ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]);
-      }));
-  aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
+      });
+  aiohttp-cors = pythonPackages.aiohttp-cors.overrideAttrs
     (oldAttrs:
       rec {
         pname = "aiohttp-cors";
@@ -40,7 +40,7 @@ let
           ++ stdenv.lib.optional
                (pythonPackages.pythonOlder "3.5")
                pythonPackages.typing;
-      }));
+      });
 in pythonPackages.buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "gns3-server";

From 46b75db767c72fc191ea4f8ecf360598f21a60dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Dec 2018 11:18:22 +0100
Subject: [PATCH 2451/2793] collectd: fix build with lm_sensors

---
 pkgs/tools/system/collectd/default.nix | 93 ++++++++++++++------------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 8b99f1c7ca9..781a813c095 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -1,41 +1,44 @@
 { stdenv, fetchurl, fetchpatch, darwin
-# optional:
-, pkgconfig ? null  # most of the extra deps need pkgconfig to be found
-, curl ? null
-, iptables ? null
-, jdk ? null
-, libatasmart ? null
-, libcredis ? null
-, libdbi ? null
-, libgcrypt ? null
-, libmemcached ? null, cyrus_sasl ? null
-, libmicrohttpd ? null
-, libmodbus ? null
-, libnotify ? null, gdk_pixbuf ? null
-, liboping ? null
-, libpcap ? null
-, libsigrok ? null
-, libvirt ? null
-, libxml2 ? null
-, libtool ? null
-, lm_sensors ? null
-, lvm2 ? null
-, mysql ? null
-, postgresql ? null
-, protobufc ? null
-, python ? null
-, rabbitmq-c ? null
-, riemann_c_client ? null
-, rrdtool ? null
-, udev ? null
-, varnish ? null
-, yajl ? null
-, net_snmp ? null
-, hiredis ? null
-, libmnl ? null
-, mosquitto ? null
-, rdkafka ? null
-, mongoc ? null
+, autoreconfHook
+, pkgconfig
+, curl
+, iptables
+, jdk
+, libapparmor
+, libatasmart
+, libcap_ng
+, libcredis
+, libdbi
+, libgcrypt
+, libmemcached, cyrus_sasl
+, libmicrohttpd
+, libmodbus
+, libnotify, gdk_pixbuf
+, liboping
+, libpcap
+, libsigrok
+, libvirt
+, libxml2
+, libtool
+, lm_sensors
+, lvm2
+, mysql
+, numactl
+, postgresql
+, protobufc
+, python
+, rabbitmq-c
+, riemann_c_client
+, rrdtool
+, udev
+, varnish
+, yajl
+, net_snmp
+, hiredis
+, libmnl
+, mosquitto
+, rdkafka
+, mongoc
 }:
 stdenv.mkDerivation rec {
   version = "5.8.1";
@@ -46,10 +49,14 @@ stdenv.mkDerivation rec {
     sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
   };
 
-  # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
+      sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
+    })
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     curl libdbi libgcrypt libmemcached
     cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
@@ -60,12 +67,16 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
+    libapparmor numactl libcap_ng
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.IOKit
     darwin.apple_sdk.frameworks.ApplicationServices
   ];
 
-  configureFlags = [ "--localstatedir=/var" ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--disable-werror"
+  ];
 
   # do not create directories in /var during installPhase
   postConfigure = ''

From ba055b698b94664117d3d4724a787acfd643d1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 21 Dec 2018 12:22:27 +0100
Subject: [PATCH 2452/2793] strongswan: ad-hoc fix build

Simply add libpcap to buildInputs until iptables with pruned libtool files lands
in master.
---
 pkgs/tools/networking/strongswan/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index eac1ccb253f..c0ec4eb9b95 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -6,6 +6,7 @@
 , curl
 , enableTNC            ? false, trousers, sqlite, libxml2
 , enableNetworkManager ? false, networkmanager
+, libpcap
 }:
 
 # Note on curl support: If curl is built with gnutls as its backend, the
@@ -30,7 +31,10 @@ stdenv.mkDerivation rec {
     [ curl gmp python iptables ldns unbound openssl pcsclite ]
     ++ optionals enableTNC [ trousers sqlite libxml2 ]
     ++ optionals stdenv.isLinux [ systemd.dev pam ]
-    ++ optionals enableNetworkManager [ networkmanager ];
+    ++ optionals enableNetworkManager [ networkmanager ]
+    # ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787
+    # Remove when the above PR lands in master
+    ++ [ libpcap ];
 
   patches = [
     ./ext_auth-path.patch

From 5a12bedbfa2dae4412986363d7e1a4aba1416a77 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Dec 2018 10:52:14 +0000
Subject: [PATCH 2453/2793] coqPackages.StructTact: fix build

---
 .../coq-modules/StructTact/default.nix        | 39 +++----------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index 1fd6187e049..55d59b93140 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -1,38 +1,11 @@
 { stdenv, fetchFromGitHub, coq, mathcomp }:
 
-let params =
+let param =
   {
-    "8.5" = {
       version = "20181102";
       rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
       sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-    };
-
-    "8.6" = {
-      version = "20181102";
-      rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
-      sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-    };
-
-    "8.7" = {
-      version = "20181102";
-      rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
-      sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-    };
-
-    "8.8" = {
-      version = "20181102";
-      rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
-      sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-    };
-
-    "8.9" = {
-      version = "20181102";
-      rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
-      sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
-    };
   };
-  param = params."${coq.coq-version}";
 in
 
 stdenv.mkDerivation rec {
@@ -44,15 +17,15 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = [
-    coq coq.ocaml coq.camlp5 coq.findlib
-  ];
+  buildInputs = [ coq ];
+
   enableParallelBuilding = true;
 
-  buildPhase = "make -j$NIX_BUILD_CORES";
+  preConfigure = "patchShebangs ./configure";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
  };
 }

From 954bc20786ad3299dfc0c32dc608e9ed28d4926e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Dec 2018 10:52:20 +0000
Subject: [PATCH 2454/2793] coqPackages.Cheerios: fix build

---
 .../coq-modules/Cheerios/default.nix          | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index 217c2ad5344..2429ccf3cf6 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -1,32 +1,11 @@
 { stdenv, fetchFromGitHub, coq, StructTact }:
 
-let params =
+let param =
   {
-    "8.6" = {
       version = "20181102";
       rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
       sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
-    };
-
-    "8.7" = {
-      version = "20181102";
-      rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
-      sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
-    };
-
-    "8.8" = {
-      version = "20181102";
-      rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
-      sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
-    };
-
-    "8.9" = {
-      version = "20181102";
-      rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
-      sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
-    };
   };
-  param = params."${coq.coq-version}";
 in
 
 stdenv.mkDerivation rec {
@@ -38,15 +17,16 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = [
-    coq coq.ocaml coq.camlp5 coq.findlib StructTact
-  ];
+  buildInputs = [ coq ];
+
+  propagatedBuildInputs = [ StructTact ];
   enableParallelBuilding = true;
 
-  buildPhase = "make -j$NIX_BUILD_CORES";
+  preConfigure = "patchShebangs ./configure";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
  };
 }

From 1d5059c5e65e3a1b952885aabb0b9ea02290aebb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Dec 2018 10:52:25 +0000
Subject: [PATCH 2455/2793] coqPackages.InfSeqExt: fix build

---
 .../coq-modules/InfSeqExt/default.nix         | 41 ++++---------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 355b9e43927..6b908f5a09a 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -1,38 +1,11 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp }:
+{ stdenv, fetchFromGitHub, coq }:
 
-let params =
+let param =
   {
-    "8.5" = {
       version = "20180918";
       rev = "243d6be45666da73a9da6c37d451327165275798";
       sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
-    };
-
-    "8.6" = {
-      version = "20180918";
-      rev = "243d6be45666da73a9da6c37d451327165275798";
-      sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
-    };
-
-    "8.7" = {
-      version = "20180918";
-      rev = "243d6be45666da73a9da6c37d451327165275798";
-      sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
-    };
-
-    "8.8" = {
-      version = "20180918";
-      rev = "243d6be45666da73a9da6c37d451327165275798";
-      sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
-    };
-
-    "8.9" = {
-      version = "20180918";
-      rev = "243d6be45666da73a9da6c37d451327165275798";
-      sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
-    };
   };
-  param = params."${coq.coq-version}";
 in
 
 stdenv.mkDerivation rec {
@@ -44,15 +17,15 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = [
-    coq coq.ocaml coq.camlp5 coq.findlib mathcomp
-  ];
+  buildInputs = [ coq ];
+
   enableParallelBuilding = true;
 
-  buildPhase = "make -j$NIX_BUILD_CORES";
+  preConfigure = "patchShebangs ./configure";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
  };
 }

From e0561cbaddce35618cc941fb55e4964b85e45746 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Dec 2018 10:52:31 +0000
Subject: [PATCH 2456/2793] coqPackages.Verdi: fix build

---
 .../development/coq-modules/Verdi/default.nix | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index 9f54eb67c72..8eaa2bdfae7 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -1,32 +1,11 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }:
+{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }:
 
-let params =
+let param =
   {
-    "8.6" = {
       version = "20181102";
       rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
       sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
-    };
-
-    "8.7" = {
-      version = "20181102";
-      rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
-      sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
-    };
-
-    "8.8" = {
-      version = "20181102";
-      rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
-      sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
-    };
-
-    "8.9" = {
-      version = "20181102";
-      rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
-      sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
-    };
   };
-  param = params."${coq.coq-version}";
 in
 
 stdenv.mkDerivation rec {
@@ -38,15 +17,16 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = [
-    coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios
-  ];
+  buildInputs = [ coq ];
+  propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ];
+
   enableParallelBuilding = true;
 
-  buildPhase = "make -j$NIX_BUILD_CORES";
+  preConfigure = "patchShebangs ./configure";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
  };
 }

From c5398741e05000eb5139dcdfd22ac85b75b82dc5 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 21 Dec 2018 13:11:22 +0100
Subject: [PATCH 2457/2793] Revert "collectd: fix build with lm_sensors"
 (#52619)

---
 pkgs/tools/system/collectd/default.nix | 93 ++++++++++++--------------
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 781a813c095..8b99f1c7ca9 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -1,44 +1,41 @@
 { stdenv, fetchurl, fetchpatch, darwin
-, autoreconfHook
-, pkgconfig
-, curl
-, iptables
-, jdk
-, libapparmor
-, libatasmart
-, libcap_ng
-, libcredis
-, libdbi
-, libgcrypt
-, libmemcached, cyrus_sasl
-, libmicrohttpd
-, libmodbus
-, libnotify, gdk_pixbuf
-, liboping
-, libpcap
-, libsigrok
-, libvirt
-, libxml2
-, libtool
-, lm_sensors
-, lvm2
-, mysql
-, numactl
-, postgresql
-, protobufc
-, python
-, rabbitmq-c
-, riemann_c_client
-, rrdtool
-, udev
-, varnish
-, yajl
-, net_snmp
-, hiredis
-, libmnl
-, mosquitto
-, rdkafka
-, mongoc
+# optional:
+, pkgconfig ? null  # most of the extra deps need pkgconfig to be found
+, curl ? null
+, iptables ? null
+, jdk ? null
+, libatasmart ? null
+, libcredis ? null
+, libdbi ? null
+, libgcrypt ? null
+, libmemcached ? null, cyrus_sasl ? null
+, libmicrohttpd ? null
+, libmodbus ? null
+, libnotify ? null, gdk_pixbuf ? null
+, liboping ? null
+, libpcap ? null
+, libsigrok ? null
+, libvirt ? null
+, libxml2 ? null
+, libtool ? null
+, lm_sensors ? null
+, lvm2 ? null
+, mysql ? null
+, postgresql ? null
+, protobufc ? null
+, python ? null
+, rabbitmq-c ? null
+, riemann_c_client ? null
+, rrdtool ? null
+, udev ? null
+, varnish ? null
+, yajl ? null
+, net_snmp ? null
+, hiredis ? null
+, libmnl ? null
+, mosquitto ? null
+, rdkafka ? null
+, mongoc ? null
 }:
 stdenv.mkDerivation rec {
   version = "5.8.1";
@@ -49,14 +46,10 @@ stdenv.mkDerivation rec {
     sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
-      sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
-    })
-  ];
+  # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     curl libdbi libgcrypt libmemcached
     cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
@@ -67,16 +60,12 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
-    libapparmor numactl libcap_ng
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.IOKit
     darwin.apple_sdk.frameworks.ApplicationServices
   ];
 
-  configureFlags = [
-    "--localstatedir=/var"
-    "--disable-werror"
-  ];
+  configureFlags = [ "--localstatedir=/var" ];
 
   # do not create directories in /var during installPhase
   postConfigure = ''

From 14b3e7c0044bebefe831d1ca82996c6171f125e1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Dec 2018 12:33:05 +0100
Subject: [PATCH 2458/2793] mozlz4a: 2015-07-24 -> 2018-08-23; fixes
 compatibility with newer python3Packages.lz4

---
 pkgs/tools/compression/mozlz4a/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index 16455fe3588..abd09483666 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "mozlz4a";
-  version = "2015-07-24";
+  version = "2018-08-23";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5/raw/2483756c55ed34be565aea269f05bd5eeb6b0a33/mozlz4a.py";
-    sha256 = "1y52zqkdyfacl2hr5adkjphgqfyfylp8ksrkh165bq48zlbf00s8";
+    url = "https://gist.githubusercontent.com/kaefer3000/73febe1eec898cd50ce4de1af79a332a/raw/a266410033455d6b4af515d7a9d34f5afd35beec/mozlz4a.py";
+    sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6";
   };
 
   unpackPhase = "true;";

From 02ce974d04a8b00ad8d002a513ebf99fb4e187bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Dec 2018 12:36:03 +0100
Subject: [PATCH 2459/2793] python2Packages.wptserve: fix build

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

diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index 8ae617830f1..7258ec30f9f 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, six, h2
 , isPy3k
 }:
 
@@ -15,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a";
   };
 
-  propagatedBuildInputs = [ ];
+  propagatedBuildInputs = [ six h2 ];
 
   meta = {
     description = "A webserver intended for web browser testing";

From e7ad85552e8788d574a02a1cc77586be1eee8d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Dec 2018 13:39:23 +0100
Subject: [PATCH 2460/2793] Revert "Revert "collectd: fix build with
 lm_sensors" (#52619)"

This reverts commit c5398741e05000eb5139dcdfd22ac85b75b82dc5.
---
 pkgs/tools/system/collectd/default.nix | 93 ++++++++++++++------------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 8b99f1c7ca9..781a813c095 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -1,41 +1,44 @@
 { stdenv, fetchurl, fetchpatch, darwin
-# optional:
-, pkgconfig ? null  # most of the extra deps need pkgconfig to be found
-, curl ? null
-, iptables ? null
-, jdk ? null
-, libatasmart ? null
-, libcredis ? null
-, libdbi ? null
-, libgcrypt ? null
-, libmemcached ? null, cyrus_sasl ? null
-, libmicrohttpd ? null
-, libmodbus ? null
-, libnotify ? null, gdk_pixbuf ? null
-, liboping ? null
-, libpcap ? null
-, libsigrok ? null
-, libvirt ? null
-, libxml2 ? null
-, libtool ? null
-, lm_sensors ? null
-, lvm2 ? null
-, mysql ? null
-, postgresql ? null
-, protobufc ? null
-, python ? null
-, rabbitmq-c ? null
-, riemann_c_client ? null
-, rrdtool ? null
-, udev ? null
-, varnish ? null
-, yajl ? null
-, net_snmp ? null
-, hiredis ? null
-, libmnl ? null
-, mosquitto ? null
-, rdkafka ? null
-, mongoc ? null
+, autoreconfHook
+, pkgconfig
+, curl
+, iptables
+, jdk
+, libapparmor
+, libatasmart
+, libcap_ng
+, libcredis
+, libdbi
+, libgcrypt
+, libmemcached, cyrus_sasl
+, libmicrohttpd
+, libmodbus
+, libnotify, gdk_pixbuf
+, liboping
+, libpcap
+, libsigrok
+, libvirt
+, libxml2
+, libtool
+, lm_sensors
+, lvm2
+, mysql
+, numactl
+, postgresql
+, protobufc
+, python
+, rabbitmq-c
+, riemann_c_client
+, rrdtool
+, udev
+, varnish
+, yajl
+, net_snmp
+, hiredis
+, libmnl
+, mosquitto
+, rdkafka
+, mongoc
 }:
 stdenv.mkDerivation rec {
   version = "5.8.1";
@@ -46,10 +49,14 @@ stdenv.mkDerivation rec {
     sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
   };
 
-  # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
+      sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
+    })
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     curl libdbi libgcrypt libmemcached
     cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
@@ -60,12 +67,16 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
+    libapparmor numactl libcap_ng
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.IOKit
     darwin.apple_sdk.frameworks.ApplicationServices
   ];
 
-  configureFlags = [ "--localstatedir=/var" ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--disable-werror"
+  ];
 
   # do not create directories in /var during installPhase
   postConfigure = ''

From 652248e0e5b0a6e04693e8b6604547a7a682350e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Dec 2018 13:40:40 +0100
Subject: [PATCH 2461/2793] libcollectdclient: fix evaluation

---
 pkgs/development/libraries/libcollectdclient/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index 4f4007649d0..0f1cbeb2f96 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -5,11 +5,7 @@ collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
-  NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [
-    "-Wno-error=unused-function"
-  ];
-
-  configureFlags = oldAttrs.configureFlags ++ [
+  configureFlags = (oldAttrs.configureFlags or []) ++ [
     "--disable-daemon"
     "--disable-all-plugins"
   ];

From ce2cea80bfbe7bb9b17a3ada61dc77b26c440795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Dec 2018 13:43:10 +0100
Subject: [PATCH 2462/2793] collectd: add comment regarding propagated
 libraries

---
 pkgs/tools/system/collectd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 781a813c095..3fdc8780888 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     iptables libatasmart libcredis libmodbus libsigrok
     lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
+    # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767
+    # is merged
     libapparmor numactl libcap_ng
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.IOKit

From a5fc51307922c859cbd97cece953b8c0f9ec91d0 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 20 Dec 2018 09:04:32 -0600
Subject: [PATCH 2463/2793] R: 3.5.1 -> 3.5.2

Closes https://github.com/NixOS/nixpkgs/pull/52571.
---
 pkgs/applications/science/math/R/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 5cd6bbf4bdd..4283ebd931a 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -8,11 +8,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.5.1";
+  name = "R-3.5.2";
 
   src = fetchurl {
     url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
+    sha256 = "0qjvdic1qd5vndc4f0wjndpm0x18lbvbcc8nkix8saqgy8y8qgg5";
   };
 
   dontUseImakeConfigure = true;

From 2018654322acefa7e9fcbe45d2541489b0a88fdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 16 Dec 2018 20:15:54 +0100
Subject: [PATCH 2464/2793] LTS Haskell 12.23

---
 .../configuration-hackage2nix.yaml            | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 18a6c1ea12b..75d1884b0e8 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 don't work in LTS-12.x
   - cassava-megaparsec < 2
-  # LTS Haskell 12.22
+  # LTS Haskell 12.23
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.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.8.0
+  - alg ==0.2.9.0
   - algebra ==4.3.1
   - algebraic-graphs ==0.2
   - Allure ==0.8.3.0
@@ -182,7 +182,7 @@ default-package-overrides:
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - api-field-json-th ==0.1.0.2
-  - appar ==0.1.5
+  - appar ==0.1.7
   - apply-refact ==0.5.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.1
@@ -281,7 +281,7 @@ default-package-overrides:
   - blake2 ==0.2.0
   - blank-canvas ==0.6.3
   - blas-carray ==0.0.1.1
-  - blas-ffi ==0.0.1.1
+  - blas-ffi ==0.0.2
   - blas-hs ==0.1.1.0
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
@@ -701,7 +701,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.13
+  - extra ==1.6.14
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
   - facts ==0.0.1.0
@@ -730,8 +730,8 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
+  - Fin ==0.2.6.1
   - fin ==0.0.1
-  - Fin ==0.2.6.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.2
@@ -870,12 +870,12 @@ default-package-overrides:
   - GLUT ==2.7.0.14
   - gnuplot ==0.5.5.3
   - goggles ==0.3.2
-  - google-oauth2-jwt ==0.3.0
+  - google-oauth2-jwt ==0.3.1
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
   - graphviz ==2999.20.0.2
-  - graph-wrapper ==0.2.5.1
+  - graph-wrapper ==0.2.5.2
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
   - greskell ==0.2.2.0
@@ -907,7 +907,7 @@ default-package-overrides:
   - hapistrano ==0.3.7.0
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
-  - hasbolt ==0.1.3.1
+  - hasbolt ==0.1.3.2
   - hashable ==1.2.7.0
   - hashids ==1.0.2.4
   - hashing ==0.1.0.1
@@ -1122,7 +1122,7 @@ default-package-overrides:
   - iff ==0.0.6
   - ihaskell ==0.9.1.0
   - ihaskell-hvega ==0.1.0.3
-  - ihs ==0.1.0.2
+  - ihs ==0.1.0.3
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
@@ -1154,7 +1154,7 @@ default-package-overrides:
   - invariant ==0.5.1
   - invertible ==0.2.0.5
   - invertible-grammar ==0.1.1
-  - io-choice ==0.0.6
+  - io-choice ==0.0.7
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
   - io-memoize ==1.1.1.0
@@ -1164,7 +1164,7 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.3.0
   - ip6addr ==1.0.0
-  - iproute ==1.7.6
+  - iproute ==1.7.7
   - IPv6Addr ==1.1.1
   - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
@@ -1330,7 +1330,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==6.5.0
-  - mega-sdist ==0.3.3.1
+  - mega-sdist ==0.3.3.2
   - memory ==0.14.18
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
@@ -1733,6 +1733,7 @@ default-package-overrides:
   - refined ==0.2.3.0
   - reflection ==2.1.4
   - RefSerialize ==0.4.0
+  - regex ==1.0.1.4
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1800,8 +1801,8 @@ default-package-overrides:
   - say ==0.1.0.1
   - sbp ==2.3.17
   - sbv ==7.12
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1878,7 +1879,7 @@ default-package-overrides:
   - shell-escape ==0.2.0
   - shelltestrunner ==1.9
   - shelly ==1.8.1
-  - shortcut-links ==0.4.2.0
+  - shortcut-links ==0.4.2.1
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.0.0
   - show-prettyprint ==0.2.2
@@ -2184,7 +2185,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.8.1
+  - unliftio ==0.2.9.0
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2303,7 +2304,7 @@ default-package-overrides:
   - word-wrap ==0.4.1
   - world-peace ==0.1.0.0
   - wrap ==0.0.0
-  - wreq ==0.5.3.0
+  - wreq ==0.5.3.1
   - wreq-stringless ==0.5.9.1
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1

From 7f85bfd70d591ff7f369345ae602a92c1a633722 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Dec 2018 14:59:48 +0100
Subject: [PATCH 2465/2793] hackage2nix: prefer alsa-mixer 0.2.x by default

Fixes https://github.com/NixOS/nixpkgs/issues/52516.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 75d1884b0e8..f56a14f2ef4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -42,6 +42,7 @@ core-packages:
 
 default-package-overrides:
   # Newer versions don't work in LTS-12.x
+  - alsa-mixer < 0.3
   - cassava-megaparsec < 2
   # LTS Haskell 12.23
   - abstract-deque ==0.3

From e6d726e5aa527e6f41ec06adeb7f0272294373c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Dec 2018 02:30:50 +0100
Subject: [PATCH 2466/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-11-gaf7cf68 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6694c4746f931bbb53de37e140e0fea90dfb2793.
---
 .../haskell-modules/hackage-packages.nix      | 1805 +++++++++++------
 1 file changed, 1218 insertions(+), 587 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index db518444cb2..8ad30bb087e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5051,6 +5051,8 @@ self: {
        pname = "Euterpea";
        version = "2.0.6";
        sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
+       revision = "1";
+       editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -5469,21 +5471,6 @@ self: {
      }) {};
 
   "Fin" = 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;
-     }) {};
-
-  "Fin_0_2_6_1" = callPackage
     ({ mkDerivation, alg, base, foldable1, natural-induction, peano
      , universe-base
      }:
@@ -5496,7 +5483,6 @@ self: {
        ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -6689,6 +6675,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_10_0" = 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.10.0";
+       sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7";
+       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 {
@@ -7367,18 +7376,15 @@ self: {
      }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
-     , old-time, parsec, postgresql, time, utf8-string
+    ({ mkDerivation, base, bytestring, 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";
+       version = "2.3.2.6";
+       sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj";
        isLibrary = true;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
@@ -9290,8 +9296,8 @@ self: {
     ({ mkDerivation, array, base, containers, random }:
      mkDerivation {
        pname = "HaskellForMaths";
-       version = "0.4.8";
-       sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
+       version = "0.4.9";
+       sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz";
        libraryHaskellDepends = [ array base containers random ];
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -10743,14 +10749,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "JuicyPixels_3_3_2" = callPackage
+  "JuicyPixels_3_3_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.3.2";
-       sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z";
+       version = "3.3.3";
+       sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c";
+       revision = "1";
+       editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -10950,8 +10958,8 @@ self: {
     ({ mkDerivation, array, base, Cabal }:
      mkDerivation {
        pname = "KMP";
-       version = "0.1.0.2";
-       sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
+       version = "0.2.0.0";
+       sha256 = "0x90yi4aplfqhwaaw5ymgcmv6fpg7659r8n7ir6xfkrpgfmk18i9";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base Cabal ];
        description = "Knuth–Morris–Pratt string searching algorithm";
@@ -14639,8 +14647,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.12.2.2";
-       sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m";
+       version = "0.12.2.3";
+       sha256 = "1wmylc6z8ikq2qky46jvzffrrjzl8c9xzzlkwsx8223cxa2n59pn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15653,17 +15661,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Rasterific_0_7_4_1" = callPackage
+  "Rasterific_0_7_4_2" = 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";
-       revision = "1";
-       editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2";
+       version = "0.7.4.2";
+       sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -16345,6 +16351,8 @@ self: {
        pname = "SVGFonts";
        version = "1.7";
        sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s";
+       revision = "1";
+       editedCabalFile = "1w687f4lk4l07wqgldhpg7ycid0fs099x8vrylcxqdgfrzmm04dg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
@@ -22009,8 +22017,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.1.1";
        sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
-       revision = "2";
-       editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r";
+       revision = "3";
+       editedCabalFile = "0b9ccv529msmqay0gw2xcxm67n08hmv6s45ivyd8vq0rig4wz407";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec attoparsec-iso8601 base
          base-compat-batteries bytestring containers deepseq exceptions
@@ -23285,17 +23293,6 @@ self: {
      }) {};
 
   "alg" = callPackage
-    ({ mkDerivation, base, util }:
-     mkDerivation {
-       pname = "alg";
-       version = "0.2.8.0";
-       sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr";
-       libraryHaskellDepends = [ base util ];
-       description = "Algebraic structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alg_0_2_9_0" = callPackage
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
@@ -23304,7 +23301,6 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -23775,6 +23771,20 @@ self: {
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
+    ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
+     mkDerivation {
+       pname = "alsa-mixer";
+       version = "0.2.0.3";
+       sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp";
+       libraryHaskellDepends = [ alsa-core base unix ];
+       librarySystemDepends = [ alsaLib ];
+       libraryToolDepends = [ c2hs ];
+       description = "Bindings to the ALSA simple mixer API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+     }) {inherit (pkgs) alsaLib;};
+
+  "alsa-mixer_0_3_0" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
      mkDerivation {
        pname = "alsa-mixer";
@@ -23785,7 +23795,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -26594,8 +26604,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-worker";
-       version = "0.2.4";
-       sha256 = "0ps0d9hly3cc9y7cmi5gr6p3h8qddig7sz3s7v6dl0icy3bvhinc";
+       version = "0.2.5";
+       sha256 = "0crbrmxwv1dwd84l41p2zmx5ap5wwr0n5a9cznz87x3cc6qncylq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27272,8 +27282,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "6.1.5";
-       sha256 = "0p78yxdnfzz6jw7az6xfh6sjcnf9d8sl512cmhdcws78p7f2rhlx";
+       version = "6.2.0";
+       sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27289,8 +27299,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "6.1.5";
-       sha256 = "1ikd0sn3z901hyad55ngzs99b0v9bs5vkry5965w22smljdg3rqh";
+       version = "6.2.0";
+       sha256 = "0s2s0vq6n7zwjj1yd7kmpwxkvbnfd2ikjv9nzg1rz0hm6mz1dn4p";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27305,8 +27315,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "6.1.5";
-       sha256 = "06c8wd4gjlrz1sdk7qpd1l8n29a3jkipy749j3414x7b5fqxbzi7";
+       version = "6.2.0";
+       sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring exceptions generic-lens
          http-client http-types lens monad-logger mtl resourcet text
@@ -27328,8 +27338,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "6.1.5";
-       sha256 = "181ygxvf29acianvnryv1kbn5g69axkagqa54429ja8jfxiblrqq";
+       version = "6.2.0";
+       sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -27349,8 +27359,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "6.1.5";
-       sha256 = "09ysy9r38d216vzq0nm1zfl4fqz8mrqa39c2ivy7pqm4xldsqary";
+       version = "6.2.0";
+       sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
          base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27374,8 +27384,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "6.1.5";
-       sha256 = "0b2mildkgd271c8hwg6b3jf8xgli5bmd4dx9c0ac8ihyn28xr0m8";
+       version = "6.2.0";
+       sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 antiope-core attoparsec base
          bytestring conduit conduit-extra exceptions generic-lens http-types
@@ -27397,8 +27407,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "6.1.5";
-       sha256 = "07kg0b0iyik0axnycph3irp73cv614qcny3z3rib1rpvbknz9iwh";
+       version = "6.2.0";
+       sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base generic-lens lens
          text unliftio-core
@@ -27418,8 +27428,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "6.1.5";
-       sha256 = "097vxkz54k4ijqqzb8lijr90hvnyyhqm7sqn5qxam3wy355w3z5c";
+       version = "6.2.0";
+       sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
          antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27643,8 +27653,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.7.0";
-       sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
+       version = "0.7.1";
+       sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7";
        libraryHaskellDepends = [
          base containers mtl template-haskell vector
        ];
@@ -27662,8 +27672,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-gloss";
-       version = "0.1.1";
-       sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
+       version = "0.2.0";
+       sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh";
        libraryHaskellDepends = [
          apecs apecs-physics base containers gloss linear
        ];
@@ -28199,19 +28209,6 @@ self: {
      }) {};
 
   "appar" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "appar";
-       version = "0.1.5";
-       sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi";
-       revision = "1";
-       editedCabalFile = "0adhm7jldcqnikvd8b9wj6p5rnhf4ciwbms0jafwx79w720knj9p";
-       libraryHaskellDepends = [ base bytestring ];
-       description = "A simple applicative parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "appar_0_1_7" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "appar";
@@ -28220,7 +28217,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "appc" = callPackage
@@ -29227,14 +29223,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) arpack;};
 
-  "array_0_5_2_0" = callPackage
+  "array_0_5_3_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "array";
-       version = "0.5.2.0";
-       sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
-       revision = "2";
-       editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg";
+       version = "0.5.3.0";
+       sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -32372,30 +32366,21 @@ self: {
   "aws-lambda-haskell-runtime" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , directory, filepath, hspec, microlens-platform, mtl
-     , optparse-generic, process, QuickCheck, relude, template-haskell
-     , text, wreq
+     , optparse-generic, process, template-haskell, text, uuid, wreq
      }:
      mkDerivation {
        pname = "aws-lambda-haskell-runtime";
-       version = "1.0.4";
-       sha256 = "0cfmdgy0vn62gdi01r02k4yb87s4xv0xhyd06j5ws6ky6cpmmdwx";
+       version = "1.0.7";
+       sha256 = "0dkagfvnxr1bbl6ngglqvvwl4gc66ipvyww4j80nwaxdfwx85wjq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive conduit directory filepath
-         microlens-platform mtl optparse-generic process relude
-         template-haskell text wreq
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring case-insensitive conduit directory filepath
-         microlens-platform mtl optparse-generic process relude
-         template-haskell text wreq
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive conduit directory filepath
-         hspec microlens-platform mtl optparse-generic process QuickCheck
-         relude template-haskell text wreq
+         microlens-platform mtl optparse-generic process template-haskell
+         text uuid wreq
        ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base hspec mtl ];
        description = "Haskell runtime for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -32646,8 +32631,8 @@ self: {
      }) {};
 
   "axel" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , freer-simple, ghcid, 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
@@ -32655,22 +32640,24 @@ self: {
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.8";
-       sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9";
+       version = "0.0.9";
+       sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath freer-simple haskell-src-exts
-         lens lens-aeson optparse-applicative parsec process regex-pcre
-         singletons strict template-haskell text typed-process vector yaml
+         base bytestring containers directory filepath freer-simple ghcid
+         haskell-src-exts lens lens-aeson optparse-applicative parsec
+         process regex-pcre singletons strict template-haskell text
+         typed-process vector yaml
        ];
        executableHaskellDepends = [
-         base freer-simple optparse-applicative
+         base containers freer-simple optparse-applicative
        ];
        testHaskellDepends = [
-         base bytestring filepath freer-simple hedgehog lens split tasty
-         tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers
+         base bytestring containers filepath freer-simple hedgehog lens
+         split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec
+         transformers
        ];
        testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
@@ -33302,8 +33289,8 @@ self: {
      }:
      mkDerivation {
        pname = "barbies";
-       version = "1.0.0.0";
-       sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci";
+       version = "1.1.0.0";
+       sha256 = "02lnq2f5n75r214lrhkhdl3a85lzn3am197df4a0mp6pvw07z1cs";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -36401,8 +36388,8 @@ self: {
     ({ mkDerivation, base, monetdb-mapi }:
      mkDerivation {
        pname = "bindings-monetdb-mapi";
-       version = "0.1.0.1";
-       sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl";
+       version = "0.1.0.2";
+       sha256 = "1f6n2x8c0r72d011piyf8fqclfxcqda98ha3w29c86y66qid0wjm";
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
@@ -36779,6 +36766,8 @@ self: {
        pname = "biocore";
        version = "0.3.1";
        sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1";
+       revision = "1";
+       editedCabalFile = "0lz3inilvxn1simbpm8002iv7h9wk1gzng2vj3gpxps99zvihqc4";
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
@@ -37938,8 +37927,10 @@ self: {
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
        pname = "blas-ffi";
-       version = "0.0.1.1";
-       sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf";
+       version = "0.0.2";
+       sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ blas ];
        description = "Auto-generated interface to Fortran BLAS";
@@ -37947,12 +37938,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
-  "blas-ffi_0_0_2" = callPackage
+  "blas-ffi_0_1" = callPackage
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
        pname = "blas-ffi";
-       version = "0.0.2";
-       sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
+       version = "0.1";
+       sha256 = "1zmw1x37ayssplj8w01ivfyh2jjg906c389cjah4hpn5dpb7p9w5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base netlib-ffi ];
@@ -40190,6 +40181,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "bson_0_3_2_7" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.7";
+       sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         QuickCheck test-framework test-framework-quickcheck2 text time
+       ];
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -42046,6 +42059,8 @@ self: {
        pname = "cabal-file-th";
        version = "0.2.4";
        sha256 = "076rprsnb9nyhm97ky4vzfcvirl8wx4g3f68lx7k5inhmkzxfm8b";
+       revision = "1";
+       editedCabalFile = "0qbhrpn23vrqyh71vkbbs5yxwlb8m6nzfpwn6mqz2xi0wwzvl9s6";
        libraryHaskellDepends = [
          base Cabal directory pretty template-haskell
        ];
@@ -42363,10 +42378,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.4.0.0";
-       sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
-       revision = "1";
-       editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
+       version = "0.5.0.0";
+       sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -42380,7 +42393,7 @@ self: {
        ];
        doHaddock = false;
        description = "Library and utiltity for processing cabal's plan.json file";
-       license = stdenv.lib.licenses.gpl3;
+       license = "GPL-2.0-or-later AND BSD-3-Clause";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -43976,8 +43989,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "3.1.0.3";
-       sha256 = "0fb4pyz1f66r811ihpcrq5qpznnxrnrrsh8wfy5g8i5k8srf78n9";
+       version = "3.4.5.0";
+       sha256 = "0ps01gm27dajr8ixfppc2mfmx8yzr24fbq9k5n3c9xgxvn9w7rmc";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -44015,8 +44028,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "3.1.0.0";
-       sha256 = "08z6jh8hn23162d6baznvs3br3fin4rp6j4sdfsiid1c3z92q3rn";
+       version = "3.4.5.0";
+       sha256 = "0iqzr6gm30a0v7523yqkipgph89wlyihwmnzidpvki0vlv6fldrl";
        libraryHaskellDepends = [
          base casadi-bindings-internal containers vector
        ];
@@ -44030,8 +44043,8 @@ self: {
     ({ mkDerivation, base, casadi, containers, vector }:
      mkDerivation {
        pname = "casadi-bindings-internal";
-       version = "0.1.5.0";
-       sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2";
+       version = "0.1.6.1";
+       sha256 = "1y2h0r0l0b9y43n0irsc5s82x7xmzdjdjaz6cqmxk19v0hg4jdnx";
        libraryHaskellDepends = [ base containers vector ];
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
@@ -44891,6 +44904,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_8" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.8";
+       sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -48622,8 +48655,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloudi";
-       version = "1.7.4";
-       sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a";
+       version = "1.7.5";
+       sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs";
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
@@ -49504,26 +49537,26 @@ self: {
 
   "codex" = callPackage
     ({ mkDerivation, ascii-progress, base, bytestring, Cabal
-     , containers, cryptohash, directory, either, filepath, hackage-db
-     , http-client, lens, machines, machines-directory, MissingH
-     , monad-loops, network, process, tar, text, transformers, wreq
-     , yaml, zlib
+     , containers, cryptohash, directory, filepath, hackage-db
+     , http-client, lens, machines, machines-directory, network, process
+     , tar, text, transformers, wreq, yaml, zlib
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.5.1.2";
-       sha256 = "0w9m737v3fdgslqdfw16bq7hhsimjazdxrd4r5kzpm0jai39707r";
+       version = "0.5.2.0";
+       sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv";
+       revision = "1";
+       editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ascii-progress base bytestring Cabal containers cryptohash
-         directory either filepath hackage-db http-client lens machines
+         directory filepath hackage-db http-client lens machines
          machines-directory process tar text transformers wreq yaml zlib
        ];
        executableHaskellDepends = [
-         ascii-progress base bytestring Cabal directory either filepath
-         hackage-db MissingH monad-loops network process transformers wreq
-         yaml
+         ascii-progress base Cabal directory filepath hackage-db network
+         process transformers wreq yaml
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
@@ -53339,8 +53372,8 @@ self: {
     ({ mkDerivation, base, containers, convert, lens, text, vector }:
      mkDerivation {
        pname = "container";
-       version = "1.1.5";
-       sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm";
+       version = "1.1.6";
+       sha256 = "0q4zgd7hsnpq5wnn5gk5rz9nq1kfp8ci5kc6yp1rmzbyky3j0211";
        libraryHaskellDepends = [
          base containers convert lens text vector
        ];
@@ -54025,8 +54058,8 @@ self: {
      }:
      mkDerivation {
        pname = "convert";
-       version = "1.5";
-       sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g";
+       version = "1.5.1";
+       sha256 = "044syln587z5mc4fia0d81p47rpkbvzkyyrcxyckqkh2yj3b2k85";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers data-default impossible
          lens template-haskell text utf8-string
@@ -56466,8 +56499,8 @@ self: {
        pname = "cryptoids";
        version = "0.5.1.0";
        sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
-       revision = "1";
-       editedCabalFile = "0whcgkgdq7hp1z4dr8291q8kpqipfr4mvn8dqq7byxm10v59kn0k";
+       revision = "3";
+       editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g";
        libraryHaskellDepends = [
          base binary bytestring cryptoids-class cryptoids-types cryptonite
          directory exceptions filepath memory
@@ -56482,22 +56515,26 @@ self: {
        pname = "cryptoids-class";
        version = "0.0.0";
        sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy";
-       revision = "3";
-       editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy";
+       revision = "4";
+       editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld";
        libraryHaskellDepends = [ base cryptoids-types exceptions ];
        description = "Typeclass-based interface to cryptoids";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptoids-types" = callPackage
-    ({ mkDerivation, base, binary, http-api-data, path-pieces }:
+    ({ mkDerivation, aeson, base, binary, deepseq, hashable
+     , http-api-data, path-pieces
+     }:
      mkDerivation {
        pname = "cryptoids-types";
-       version = "0.0.0";
-       sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b";
-       revision = "3";
-       editedCabalFile = "1v8fgyh03qggn0fr2kg79m3r1v9i85q0dihgmbq5z4s1y700c8vq";
-       libraryHaskellDepends = [ base binary http-api-data path-pieces ];
+       version = "1.0.0";
+       sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf";
+       revision = "1";
+       editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb";
+       libraryHaskellDepends = [
+         aeson base binary deepseq hashable http-api-data path-pieces
+       ];
        description = "Shared types for encrypting internal object identifiers before exposure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63635,8 +63672,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.3";
        sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
-       revision = "1";
-       editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff";
+       revision = "2";
+       editedCabalFile = "0gn1lpsq1v9qpyhpizyknn3sfixg1b64s0dsl1jf25lz4kcrpbs7";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -63812,8 +63849,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.1";
        sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
-       revision = "3";
-       editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7";
+       revision = "4";
+       editedCabalFile = "1yjacw17ga4rh6iw70vclk03qm5xjw4y17c7m43gjw8h3cfaq15d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -66728,6 +66765,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-driver-gen_0_3_0_0" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "doctest-driver-gen";
+       version = "0.3.0.0";
+       sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       description = "Generate driver file for doctest's cabal integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-prop" = callPackage
     ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
      mkDerivation {
@@ -72972,8 +73025,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-store-specs";
-       version = "1.2.0";
-       sha256 = "1fvwwbbn8407rcxl7sww1k944gq95hniq9s9ys3hzr8a9y65598i";
+       version = "1.2.1";
+       sha256 = "1b7nhigf4r26zfbcq0civbsw8mhsz4hpdsdnm94zmkysl5k58f04";
        libraryHaskellDepends = [
          aeson async base eventsource-api mtl streaming tasty tasty-hspec
          text transformers-base uuid
@@ -72989,8 +73042,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-stub-store";
-       version = "1.1.0";
-       sha256 = "0rfbn3f6dw6m03f47f68if11xkjd98djhballl50zv7fqifcpz7h";
+       version = "1.1.1";
+       sha256 = "1xd3ngjjpimfpglkgad3r9dmd7sf2mq3kdlbqs4d6xz28gd7vh7y";
        libraryHaskellDepends = [
          async base containers eventsource-api mtl stm streaming
          transformers-base
@@ -74223,24 +74276,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extensible_0_4_10_1" = callPackage
+  "extensible_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, comonad
      , constraints, deepseq, exceptions, ghc-prim, hashable, lens
      , monad-skeleton, mtl, prettyprinter, primitive, profunctors
-     , QuickCheck, resourcet, semigroups, StateVar, tagged
-     , template-haskell, text, th-lift, transformers
-     , unordered-containers, vector
+     , QuickCheck, resourcet, StateVar, tagged, template-haskell, text
+     , th-lift, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.4.10.1";
-       sha256 = "009z0grpjnnmnsc887k6vgfz5w55mniax25dl4ispj1nq74djksb";
+       version = "0.5";
+       sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14";
        libraryHaskellDepends = [
          aeson base bytestring cassava comonad constraints deepseq
          exceptions ghc-prim hashable monad-skeleton mtl prettyprinter
-         primitive profunctors QuickCheck resourcet semigroups StateVar
-         tagged template-haskell text th-lift transformers
-         unordered-containers vector
+         primitive profunctors QuickCheck resourcet StateVar tagged
+         template-haskell text th-lift transformers unordered-containers
+         vector
        ];
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
        description = "Extensible, efficient, optics-friendly data types and effects";
@@ -74296,8 +74348,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.15.0";
-       sha256 = "0hy1z2caqwyxqw1s3xxkbrzi3f86w3vzch783ajq41xqd6z8spdp";
+       version = "0.18.1";
+       sha256 = "14kx3ipwz51g2qvdmz97v4mckglh6hajw6yzbzllqysgljs243cl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74355,22 +74407,6 @@ self: {
      }) {};
 
   "extra" = 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;
-     }) {};
-
-  "extra_1_6_14" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -74384,7 +74420,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
@@ -74726,6 +74761,8 @@ self: {
        pname = "fake";
        version = "0.1.1.1";
        sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf";
+       revision = "1";
+       editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5";
        libraryHaskellDepends = [
          base containers generics-sop random text time
        ];
@@ -74953,6 +74990,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_2_4_12" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, text, unix-compat, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.12";
+       sha256 = "1jl9kiiijjpilj4zka8ffb2sil31qmgysan2hkld6mhddlr6pjdy";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix-compat unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -75719,8 +75774,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fedora-dists";
-       version = "1.0.0.1";
-       sha256 = "0x5lccpwcf2cd97vnqlzyi4lgbyhqcs5ks1sr3l33h1zffpb0br8";
+       version = "1.0.0.2";
+       sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl";
        libraryHaskellDepends = [ base ];
        description = "Library for Fedora distribution versions";
        license = stdenv.lib.licenses.gpl3;
@@ -76726,8 +76781,8 @@ self: {
        pname = "filepath-crypto";
        version = "0.1.0.0";
        sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
-       revision = "6";
-       editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc";
+       revision = "7";
+       editedCabalFile = "0dniq1rzv6qb75svf2ya32r0116pjh9jlgly7106x3gyziq2cwh3";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive cryptoids cryptoids-class
          cryptoids-types exceptions filepath sandi template-haskell
@@ -81576,6 +81631,8 @@ self: {
        pname = "functor-infix";
        version = "0.0.5";
        sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn";
+       revision = "1";
+       editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
@@ -81597,8 +81654,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, lens }:
      mkDerivation {
        pname = "functor-utils";
-       version = "1.17.1";
-       sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld";
+       version = "1.17.2";
+       sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms";
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
@@ -85229,6 +85286,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_5" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.5";
+       sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4";
+       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 {
@@ -86866,20 +86945,21 @@ self: {
 
   "ginger" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , data-default, filepath, http-types, mtl, parsec, process, safe
-     , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, utf8-string, vector, yaml
+     , data-default, filepath, http-types, mtl, parsec, process
+     , regex-tdfa, safe, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , utf8-string, vector, yaml
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.8.2.0";
-       sha256 = "06k2imp511v4xxlzqgii14hf0ncnc6wci3hm7w48z332c5nk24m1";
+       version = "0.8.4.0";
+       sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring data-default filepath http-types
-         mtl parsec safe scientific text time transformers
+         mtl parsec regex-tdfa safe scientific text time transformers
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
@@ -91004,21 +91084,6 @@ self: {
      }) {};
 
   "google-oauth2-jwt" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
-     , RSA, text, unix-time
-     }:
-     mkDerivation {
-       pname = "google-oauth2-jwt";
-       version = "0.3.0";
-       sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
-       ];
-       description = "Get a signed JWT for Google Service Accounts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "google-oauth2-jwt_0_3_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
      , RSA, text, unix-time
      }:
@@ -91031,7 +91096,6 @@ self: {
        ];
        description = "Get a signed JWT for Google Service Accounts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-search" = callPackage
@@ -91056,8 +91120,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-server-api";
-       version = "0.2.0.1";
-       sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw";
+       version = "0.3.0.0";
+       sha256 = "1zrgflz6pav8ygjjisjm35w7a232116f90s0pd8jqf46an2bm8i2";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
          http-api-data http-client http-client-tls mime-mail monad-control
@@ -91999,22 +92063,6 @@ self: {
      }) {};
 
   "graph-wrapper" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, hspec
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "graph-wrapper";
-       version = "0.2.5.1";
-       sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
-       libraryHaskellDepends = [ array base containers ];
-       testHaskellDepends = [
-         array base containers deepseq hspec QuickCheck
-       ];
-       description = "A wrapper around the standard Data.Graph with a less awkward interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "graph-wrapper_0_2_5_2" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
      , QuickCheck
      }:
@@ -92028,7 +92076,6 @@ self: {
        ];
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphbuilder" = callPackage
@@ -92816,6 +92863,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog_0_10_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, containers, monad-control, mtl
+     , resourcet, safe-exceptions, scientific, text, time, transformers
+     , transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "groundhog";
+       version = "0.10.0";
+       sha256 = "1wckm2qrgmv1ccavwvq8ji3pfb4y197s1n1adv8hz9bqk246byrq";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         containers monad-control mtl resourcet safe-exceptions scientific
+         text time transformers transformers-base transformers-compat
+       ];
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-converters" = callPackage
     ({ mkDerivation, aeson, base, bimap, bytestring, containers
      , groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit
@@ -92861,6 +92928,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-inspector_0_10_0" = callPackage
+    ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
+     , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
+     , regex-compat, syb, template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "groundhog-inspector";
+       version = "0.10.0";
+       sha256 = "1l4smiydqqgpfqcyq77d2g0cvglanqfhlhx3y1k9n3kx94yss5a2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson-pretty base bytestring containers groundhog groundhog-th
+         regex-compat syb template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers groundhog groundhog-sqlite
+         groundhog-th mtl
+       ];
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-mysql" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
@@ -92879,6 +92970,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-mysql_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, containers, groundhog
+     , monad-control, monad-logger, mysql, mysql-simple, resource-pool
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "groundhog-mysql";
+       version = "0.10";
+       sha256 = "1idyisl0dbij4ffd0bn1bm681az87wc30qnkn1vmr0cd0xb6mwnx";
+       libraryHaskellDepends = [
+         base bytestring containers groundhog monad-control monad-logger
+         mysql mysql-simple resource-pool resourcet text time transformers
+       ];
+       description = "MySQL backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-postgresql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
@@ -92899,6 +93008,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-postgresql_0_10" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , containers, groundhog, monad-control, postgresql-libpq
+     , postgresql-simple, resource-pool, resourcet, text, time
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "groundhog-postgresql";
+       version = "0.10";
+       sha256 = "1digvi8ra58r122i030h0b089sbyzaclir1cg4iqaflbzrnz45l9";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder bytestring containers groundhog
+         monad-control postgresql-libpq postgresql-simple resource-pool
+         resourcet text time transformers vector
+       ];
+       description = "PostgreSQL backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-sqlite" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
      , groundhog, monad-control, resource-pool, resourcet, text
@@ -92917,6 +93046,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-sqlite_0_10_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, direct-sqlite
+     , groundhog, monad-control, resource-pool, resourcet, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "groundhog-sqlite";
+       version = "0.10.0";
+       sha256 = "1z6yss15aw0a14i0nj0flb0h2641sjr70mhasp718qmc4iwkgw7x";
+       libraryHaskellDepends = [
+         base bytestring containers direct-sqlite groundhog monad-control
+         resource-pool resourcet text transformers unordered-containers
+       ];
+       description = "Sqlite3 backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-th" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, groundhog
      , template-haskell, text, time, unordered-containers, yaml
@@ -92934,6 +93081,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-th_0_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
+     , template-haskell, text, time, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "groundhog-th";
+       version = "0.10";
+       sha256 = "1bshffmv8x0yqd9d7m3s3abnhnz1g4ny3va5mkzsvy1snzxj7xlb";
+       libraryHaskellDepends = [
+         aeson base bytestring containers groundhog template-haskell text
+         time unordered-containers yaml
+       ];
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "group-by-date" = callPackage
     ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
      , pathtype, time, transformers, unix-compat, utility-ht
@@ -96403,6 +96567,26 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "hakyll-images" = callPackage
+    ({ mkDerivation, base, bytestring, hakyll, HUnit-approx
+     , JuicyPixels, JuicyPixels-extra, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "hakyll-images";
+       version = "0.1.0";
+       sha256 = "1l135gmlm2ydqj3d27gfarykcg6k1g204cysm3bk163f499b8w50";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring hakyll JuicyPixels JuicyPixels-extra
+       ];
+       testHaskellDepends = [
+         base bytestring hakyll HUnit-approx JuicyPixels JuicyPixels-extra
+         tasty tasty-hunit
+       ];
+       description = "Hakyll utilities to work with images";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hakyll-ogmarkup" = callPackage
     ({ mkDerivation, base, hakyll, ogmarkup }:
      mkDerivation {
@@ -98187,26 +98371,6 @@ self: {
      }) {};
 
   "hasbolt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, connection, containers
-     , data-binary-ieee754, data-default, hex, hspec, network
-     , QuickCheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "hasbolt";
-       version = "0.1.3.1";
-       sha256 = "0d6prk5fav5l0d4j0ndinn3szimy02dmayx997z5yg6yb5ix3lai";
-       libraryHaskellDepends = [
-         base binary bytestring connection containers data-binary-ieee754
-         data-default network text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hex hspec QuickCheck text
-       ];
-       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hasbolt_0_1_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, connection, containers
      , data-binary-ieee754, data-default, hex, hspec, network
      , QuickCheck, text, transformers
@@ -98224,7 +98388,6 @@ self: {
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasbolt-extras" = callPackage
@@ -98888,8 +99051,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.5.3";
-       sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n";
+       version = "0.5.4";
+       sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99255,8 +99418,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.9.0";
-       sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr";
+       version = "0.0.10.0";
+       sha256 = "1d2jma4gly0bh1a114a7pm6xq13y5py3p1hkkn24755mi4b0ykqa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -99830,8 +99993,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-names";
-       version = "0.9.5";
-       sha256 = "0j1snakldb29v8786licz4k2b92pbdbxhxgyz22rvjypdxyhaa7h";
+       version = "0.9.6";
+       sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-lens-light filepath
@@ -101668,8 +101831,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.9.1";
-       sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
+       version = "0.9.2";
+       sha256 = "1p4za0b6n7ldz7jnq25n9f7wmngxy8ic0vy1kppb7wka0a96sdh1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105329,8 +105492,8 @@ self: {
     ({ mkDerivation, base, doctest, time }:
      mkDerivation {
        pname = "herf-time";
-       version = "0.2.2";
-       sha256 = "13nn46l5mf555rab3fwl38g4fznjh3n07754l671vqcr8c5zfm4m";
+       version = "0.3.0";
+       sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
@@ -107529,8 +107692,8 @@ self: {
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "0.8.0";
-       sha256 = "1mzq87sdcx50i67kf2lv5wg0k6ahxf1x2qxvi41dnaxkjjl1vcmr";
+       version = "0.8.1";
+       sha256 = "1qpdapvxy03jqrvn4p45pi2zhiy888k8acysb0fqzi3f8mypqm1c";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite deepseq
          exceptions lifted-async lifted-base memory monad-control
@@ -110802,17 +110965,15 @@ self: {
      }:
      mkDerivation {
        pname = "hosc";
-       version = "0.16";
-       sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj";
-       revision = "1";
-       editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb";
+       version = "0.17";
+       sha256 = "0340lldzim02ixj4n0smfwn20y5i0z7v0gqgbb0mdjs6c90rqhv6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
        ];
        description = "Haskell Open Sound Control";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "hosc-json" = callPackage
@@ -113116,21 +113277,21 @@ self: {
 
   "hsc3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , data-default, data-ordlist, directory, filepath, hashable, hosc
-     , network, process, random, safe, split, transformers, vector
+     , data-ordlist, directory, filepath, hosc, murmur-hash, network
+     , process, random, safe, split, transformers, vector
      }:
      mkDerivation {
        pname = "hsc3";
-       version = "0.16";
-       sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn";
+       version = "0.17";
+       sha256 = "1k7gm0qk96rm7rphmmwlqh99kn5v79g8szyyhb9cqg3rfv6as1ld";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array base binary bytestring containers data-default data-ordlist
-         directory filepath hashable hosc network process random safe split
+         array base binary bytestring containers data-ordlist directory
+         filepath hosc murmur-hash network process random safe split
          transformers vector
        ];
        description = "Haskell SuperCollider";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "hsc3-auditor" = callPackage
@@ -118287,8 +118448,8 @@ self: {
      }:
      mkDerivation {
        pname = "htvm";
-       version = "0.1.0.0";
-       sha256 = "0bf3dqyqrdi9mw72kp6hid4p6jk3gs5vw5fd1ycjgid218na7qmm";
+       version = "0.1.2";
+       sha256 = "0ggb6g6cdx6qzvda4l2z9danq5pkwncf3p2cyb68bwghs988fgxs";
        libraryHaskellDepends = [
          array base bytestring containers deriving-compat directory Earley
          filepath mtl pretty-show process recursion-schemes temporary text
@@ -118301,7 +118462,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck temporary text
        ];
        testSystemDepends = [ tvm_runtime ];
-       description = "TVM bindings";
+       description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
      }) {tvm_runtime = null;};
 
@@ -119225,20 +119386,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-ip_1_0_0_0" = callPackage
-    ({ mkDerivation, appar, attoparsec, base, generic-lens, hedgehog
+  "hw-ip_2_0_0_0" = callPackage
+    ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
      , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "1.0.0.0";
-       sha256 = "0di0r4dq1fzmb1cgmks54wqamx9jsjgnv4qjs3s8kwszz19plpfw";
+       version = "2.0.0.0";
+       sha256 = "04hb06rbkipm21fji9n5v56wm2jvdnr7w42ndp9x2hyp3m1i9sm0";
        libraryHaskellDepends = [
-         appar attoparsec base generic-lens hw-bits iproute text
+         appar base containers generic-lens hw-bits iproute text
        ];
        testHaskellDepends = [
-         attoparsec base generic-lens hedgehog hspec hw-bits
-         hw-hspec-hedgehog text
+         appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
+         text
        ];
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
@@ -122007,19 +122168,6 @@ self: {
      }) {};
 
   "ihs" = callPackage
-    ({ mkDerivation, base, process }:
-     mkDerivation {
-       pname = "ihs";
-       version = "0.1.0.2";
-       sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base process ];
-       description = "Interpolated Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "ihs_0_1_0_3" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "ihs";
@@ -122030,7 +122178,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Interpolated Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -122595,8 +122742,8 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "impossible";
-       version = "1.1.3";
-       sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n";
+       version = "1.1.4";
+       sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp";
        libraryHaskellDepends = [ base lens ];
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
@@ -123487,6 +123634,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c_0_7_0_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, template-haskell, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.7.0.1";
+       sha256 = "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring containers hashable mtl parsec
+         parsers template-haskell transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-cpp_0_1_0_0" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -123562,6 +123735,8 @@ self: {
        pname = "inline-r";
        version = "0.9.2";
        sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0";
+       revision = "1";
+       editedCabalFile = "01cxsjdxy5brdnw966928bcdivc8ab7kq91vdqkg2q801jf5jj9g";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class deepseq
          exceptions inline-c mtl pretty primitive process reflection setenv
@@ -124278,6 +124453,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "interpolator" = callPackage
+    ({ mkDerivation, aeson, base, containers, either, hspec
+     , mono-traversable, mtl, product-profunctors, profunctors
+     , QuickCheck, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "interpolator";
+       version = "0.1";
+       sha256 = "049zx47z071n8k83xc7fwqqd397pg0g7misrggj4w27gxvdlvr7r";
+       libraryHaskellDepends = [
+         aeson base containers either mono-traversable mtl
+         product-profunctors profunctors QuickCheck template-haskell text
+       ];
+       testHaskellDepends = [
+         aeson base containers either hspec mono-traversable mtl
+         product-profunctors profunctors QuickCheck template-haskell text
+       ];
+       description = "Runtime interpolation of environment variables in records using profunctors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "interprocess" = callPackage
     ({ mkDerivation, base, typed-process }:
      mkDerivation {
@@ -124647,25 +124843,6 @@ self: {
      }) {};
 
   "io-choice" = callPackage
-    ({ mkDerivation, base, hspec, lifted-base, monad-control
-     , template-haskell, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "io-choice";
-       version = "0.0.6";
-       sha256 = "1vqw5v1b9mrkhhszxp1rg8gl1d53akdlzwh40w01b1ni208jhav1";
-       libraryHaskellDepends = [
-         base lifted-base monad-control template-haskell transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base hspec lifted-base monad-control transformers
-       ];
-       description = "Choice for IO and lifted IO";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "io-choice_0_0_7" = callPackage
     ({ mkDerivation, base, hspec, lifted-base, monad-control
      , template-haskell, transformers, transformers-base
      }:
@@ -124682,7 +124859,6 @@ self: {
        ];
        description = "Choice for IO and lifted IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-machine" = callPackage
@@ -125118,25 +125294,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.6";
-       sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi";
-       libraryHaskellDepends = [
-         appar base byteorder containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder containers doctest hspec network QuickCheck
-         safe
-       ];
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_7" = callPackage
     ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
      , network, QuickCheck, safe
      }:
@@ -125153,7 +125310,6 @@ self: {
        ];
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -127339,6 +127495,41 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "jose_0_8_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, concise, containers, cryptonite, hspec, lens, memory
+     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
+     , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
+     , template-haskell, text, time, unix, unordered-containers, vector
+     , x509
+     }:
+     mkDerivation {
+       pname = "jose";
+       version = "0.8.0.0";
+       sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe semigroups template-haskell
+         text time unordered-containers vector x509
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring lens mtl semigroups text unix
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite hspec lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
+         tasty-quickcheck template-haskell text time unordered-containers
+         vector x509
+       ];
+       description = "Javascript Object Signing and Encryption and JSON Web Token library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
@@ -127662,6 +127853,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json_0_9_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
+     , pretty, syb, text
+     }:
+     mkDerivation {
+       pname = "json";
+       version = "0.9.3";
+       sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl parsec pretty syb text
+       ];
+       description = "Support for serialising Haskell to and from JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-alt" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
@@ -128627,6 +128834,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
+  "juicy-draw" = callPackage
+    ({ mkDerivation, base, JuicyPixels, numeric-extras, primitive }:
+     mkDerivation {
+       pname = "juicy-draw";
+       version = "0.2.0.0";
+       sha256 = "0fi4kwcb8mqnzi3cx2gzpls6nyc8vxnhjfgrb7zf04bpcsph7rgr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base JuicyPixels numeric-extras primitive
+       ];
+       executableHaskellDepends = [ base JuicyPixels ];
+       description = "Draw and fill lines, rectangles and polygons";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "juicy-gcode" = callPackage
     ({ mkDerivation, base, configurator, lens, linear, matrix
      , optparse-applicative, svg-tree, text
@@ -130249,8 +130472,8 @@ self: {
      }:
      mkDerivation {
        pname = "keystore";
-       version = "0.8.1.0";
-       sha256 = "11dfxm7wxn1l82cr30gn2xw45ma7apssfgrgz95wrzm5k0kq331v";
+       version = "0.8.1.1";
+       sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -131509,6 +131732,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdabot-xmpp" = callPackage
+    ({ mkDerivation, base, data-default, lambdabot-core
+     , lambdabot-haskell-plugins, lambdabot-irc-plugins
+     , lambdabot-misc-plugins, lambdabot-novelty-plugins
+     , lambdabot-reference-plugins, lambdabot-social-plugins
+     , lifted-base, mtl, network, pontarius-xmpp, split, text, tls
+     , x509-validation, xml-types
+     }:
+     mkDerivation {
+       pname = "lambdabot-xmpp";
+       version = "0.1.0.0";
+       sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base data-default lambdabot-core lambdabot-haskell-plugins
+         lambdabot-irc-plugins lambdabot-misc-plugins
+         lambdabot-novelty-plugins lambdabot-reference-plugins
+         lambdabot-social-plugins lifted-base mtl network pontarius-xmpp
+         split text tls x509-validation xml-types
+       ];
+       description = "Lambdabot plugin for XMPP (Jabber) protocol";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lambdabot-zulip" = callPackage
     ({ mkDerivation, base, containers, hint, hspec, HUnit, hzulip
      , mueval, optparse-applicative, say, text, yaml
@@ -133430,8 +133679,8 @@ self: {
      }:
      mkDerivation {
        pname = "layered-state";
-       version = "1.1.4";
-       sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa";
+       version = "1.1.5";
+       sha256 = "122z7jzhy65ksdkgn505gkjgn0j04gqq38q5k1d3xlg96x670chk";
        libraryHaskellDepends = [
          base constraints data-default exceptions lens lens-utils
          monad-branch monoid mtl primitive profunctors prologue transformers
@@ -133520,8 +133769,8 @@ self: {
      }:
      mkDerivation {
        pname = "layouting";
-       version = "1.1.3";
-       sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7";
+       version = "1.1.4";
+       sha256 = "0p50zg1xydvci313dh87g0asx292vbhbz5iaywcw9rapwxlg5zld";
        libraryHaskellDepends = [
          base container layered-state prologue terminal-text text
        ];
@@ -134616,8 +134865,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-utils";
-       version = "1.4.5";
-       sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g";
+       version = "1.4.6";
+       sha256 = "1gz2mf33lszk33yszzcsbjhch1jxszg1h9cin49wwbgrb0imz7ds";
        libraryHaskellDepends = [
          aeson base containers data-default lens monoid split
          template-haskell
@@ -137219,6 +137468,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_1_0_2" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
+     , mtl, mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "1.0.2";
+       sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s";
+       libraryHaskellDepends = [
+         base mmorph monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -137348,8 +137614,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "list-zip-def";
-       version = "0.1.0.2";
-       sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89";
+       version = "0.1.0.3";
+       sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79";
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
@@ -140660,6 +140926,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "macos-corelibs" = callPackage
+    ({ mkDerivation, base, containers, managed, mtl, profunctors
+     , tagged, transformers
+     }:
+     mkDerivation {
+       pname = "macos-corelibs";
+       version = "0.0.1.0";
+       sha256 = "1ma5dc8j1s3fpqkqwlqnb32vwchdyabxp001qa7r7balima5xfjs";
+       libraryHaskellDepends = [
+         base containers managed mtl profunctors tagged transformers
+       ];
+       description = "Haskell bindings to C-based Mac OS SDK frameworks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "macosx-make-standalone" = callPackage
     ({ mkDerivation, base, containers, data-lens, data-lens-template
      , deepseq, directory, filepath, graph-visit, mtl, process
@@ -143505,25 +143786,6 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
-     , yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
-       version = "0.3.3.1";
-       sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring conduit conduit-extra http-conduit optparse-simple
-         rio rio-orphans tar-conduit yaml
-       ];
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_3_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
      , yaml
@@ -143540,7 +143802,6 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -145760,6 +146021,66 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "mismi-core" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, base, bytestring
+     , exceptions, hedgehog, http-client, http-types, lens
+     , mismi-core-test, mismi-kernel, mismi-p, mmorph, mtl, resourcet
+     , retry, text, transformers
+     }:
+     mkDerivation {
+       pname = "mismi-core";
+       version = "0.0.1";
+       sha256 = "1vcj56blmk3g7vbp3d3a4yhla002w1ws5jxzbmgf1wxswc8hywvc";
+       libraryHaskellDepends = [
+         amazonka amazonka-core base bytestring exceptions http-client
+         http-types lens mismi-kernel mismi-p mtl resourcet retry text
+         transformers
+       ];
+       testHaskellDepends = [
+         amazonka-core base exceptions hedgehog mismi-core-test mismi-p
+         mmorph resourcet transformers
+       ];
+       description = "AWS Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {mismi-core-test = null;};
+
+  "mismi-kernel" = callPackage
+    ({ mkDerivation, base, hedgehog, mismi-p, text }:
+     mkDerivation {
+       pname = "mismi-kernel";
+       version = "0.0.1";
+       sha256 = "1pqm6xza3ds6z5n32bb12q6z2x9n5jzwyxhy7b7f0ryzijasabg4";
+       libraryHaskellDepends = [ base mismi-p text ];
+       testHaskellDepends = [ base hedgehog mismi-p text ];
+       description = "AWS Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "mismi-p" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "mismi-p";
+       version = "0.0.1";
+       sha256 = "1xkrf270rfjig6bkpk4n63kgmjh05x38p99ndan4gr31ghbjyvk5";
+       libraryHaskellDepends = [ base text ];
+       description = "A commmon prelude for the mismi project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "mismi-s3-core" = callPackage
+    ({ mkDerivation, attoparsec, base, hedgehog, mismi-p, text }:
+     mkDerivation {
+       pname = "mismi-s3-core";
+       version = "0.0.1";
+       sha256 = "06c7sgkhw7iax6z5cqq1a0icpizwmwl8agvi788h5w2d6hn9wgjh";
+       libraryHaskellDepends = [ attoparsec base mismi-p text ];
+       testHaskellDepends = [ base hedgehog mismi-p text ];
+       description = "AWS Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "miso" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
@@ -146366,13 +146687,13 @@ self: {
      }) {};
 
   "modular-arithmetic" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
+    ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "modular-arithmetic";
-       version = "1.2.1.3";
-       sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l";
+       version = "1.2.1.4";
+       sha256 = "1nlv5bwyfppw6qz6j2z1cvgzpixciv5gygpcvqlfnmmv410il4si";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest ];
        description = "A type for integers modulo some constant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146653,8 +146974,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "monad-branch";
-       version = "1.0.3";
-       sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r";
+       version = "1.0.4";
+       sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
        license = stdenv.lib.licenses.asl20;
@@ -147976,8 +148297,8 @@ self: {
     ({ mkDerivation, base, bindings-monetdb-mapi }:
      mkDerivation {
        pname = "monetdb-mapi";
-       version = "0.1.0.1";
-       sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0";
+       version = "0.1.0.2";
+       sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6";
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
@@ -148140,6 +148461,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_10_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, gauge
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.10.0";
+       sha256 = "04c8gcksxkrfdll2lm3aaj1dgz7snvfa8avsccs3h6v5ygvdp5h0";
+       revision = "1";
+       editedCabalFile = "1hgwrmq7r8d1nq9283wis67lg0wlid2sgqnr9vpsv2wpnd4n1rdl";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base gauge mwc-random vector ];
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -148172,8 +148519,8 @@ self: {
     ({ mkDerivation, base, containers, lens, mtl }:
      mkDerivation {
        pname = "monoid";
-       version = "0.1.8";
-       sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf";
+       version = "0.1.9";
+       sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv";
        libraryHaskellDepends = [ base containers lens mtl ];
        description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used.";
        license = stdenv.lib.licenses.asl20;
@@ -148520,8 +148867,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "more-containers";
-       version = "0.1.1.0";
-       sha256 = "1gy7h36spmksn1d3vg56l93kfgd24im304ync20pzaymkbljh1gk";
+       version = "0.1.2.0";
+       sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "A few more collections";
@@ -148706,6 +149053,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "moss" = callPackage
+    ({ mkDerivation, base, bytestring, conduit-extra, mtl, network
+     , network-simple, unix-compat
+     }:
+     mkDerivation {
+       pname = "moss";
+       version = "0.1.0.0";
+       sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr";
+       libraryHaskellDepends = [
+         base bytestring conduit-extra mtl network network-simple
+         unix-compat
+       ];
+       description = "Haskell client for Moss";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "moto" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath
@@ -154026,6 +154389,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-uri-lenses" = callPackage
+    ({ mkDerivation, base, lens, network-uri }:
+     mkDerivation {
+       pname = "network-uri-lenses";
+       version = "0.2.0.0";
+       sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p";
+       libraryHaskellDepends = [ base lens network-uri ];
+       description = "Lenses for network-uri";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-uri-static" = callPackage
     ({ mkDerivation, base, doctest, network-uri, template-haskell }:
      mkDerivation {
@@ -154423,8 +154797,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.1.0";
-       sha256 = "0q70p894sqzzx534vxl8grrizllzhw3cx1d02nfg88h7gr82zp3f";
+       version = "0.4.2.1";
+       sha256 = "1hb4n0sjxz6hrdpgw27kxynhvlb8lxf86k4vjjdvic038gf7lfik";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -155519,6 +155893,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "notmuch" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch
+     , profunctors, tagged, talloc, text, time
+     }:
+     mkDerivation {
+       pname = "notmuch";
+       version = "0.1.0.0";
+       sha256 = "100kqfyw5aan07ywynqrpmgvsv1cma1v7sl2a8zvlwnhva39nz3b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring deepseq mtl profunctors tagged text time
+       ];
+       librarySystemDepends = [ notmuch talloc ];
+       libraryToolDepends = [ c2hs ];
+       description = "Haskell binding to Notmuch, the mail indexer";
+       license = stdenv.lib.licenses.gpl3;
+     }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
+
   "notmuch-haskell" = callPackage
     ({ mkDerivation, base, containers, filepath, notmuch, old-locale
      , parseargs, time
@@ -162269,14 +162662,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_4_0" = callPackage
+  "path-io_1_4_1" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.4.0";
-       sha256 = "0pffdxzn59qm3ifk746sp2g3h2gip2ijs39gwi0k0xn1rkid6ph5";
+       version = "1.4.1";
+       sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -164355,7 +164748,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
-  "persistent-sqlite_2_9_0" = callPackage
+  "persistent-sqlite_2_9_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-logger, old-locale, persistent
      , persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -164363,8 +164756,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.9.0";
-       sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y";
+       version = "2.9.1";
+       sha256 = "1lh55511zw1zrbvfwbyz18zsm7kb2xsym76f1lp4cdjz37c7sh2j";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -168396,8 +168789,9 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.5.4";
-       sha256 = "0fmi915jmdh2k6fp97vywxpbljpcf6xpmvy3m7l1imqig0hfd8nf";
+       version = "0.5.5";
+       sha256 = "044fhp9fa2fp0aka972wmlmfq05k63dc1xb6fqrbwcyaamlprdsp";
+       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -168763,8 +169157,8 @@ self: {
      }:
      mkDerivation {
        pname = "posix-paths";
-       version = "0.2.1.5";
-       sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as";
+       version = "0.2.1.6";
+       sha256 = "0ibycc7z3gm6jr83cgsqwa7hkky2ldfqqd30ickgq6vn2rkp8fbj";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring doctest HUnit QuickCheck unix
@@ -170600,14 +170994,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pretty-show_1_9_2" = callPackage
+  "pretty-show_1_9_4" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.9.2";
-       sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a";
+       version = "1.9.4";
+       sha256 = "00gpniygx45yczhkf6ayqik5kraa2c436ragx07mqp3mp383ab5r";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -172220,8 +172614,8 @@ self: {
      }:
      mkDerivation {
        pname = "prologue";
-       version = "3.2.4";
-       sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv";
+       version = "3.2.6";
+       sha256 = "0xic2d3b7ya0qrb8r4q0v6f9zgbh7sw0l7rpbmz09i8pkx7bj90y";
        libraryHaskellDepends = [
          base bifunctors binary comonad cond container convert data-default
          deepseq deriving-compat either errors exceptions functor-utils
@@ -172561,34 +172955,37 @@ self: {
 
   "proteome" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
-     , data-default-class, deepseq, directory, filepath, hslogger, HTF
-     , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
-     , prettyprinter, process, resourcet, split, stm, strings, text
-     , time, transformers, unliftio, utf8-string
+     , data-default-class, deepseq, directory, either, filepath
+     , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs
+     , pretty-terminal, prettyprinter, process, resourcet, safe, split
+     , stm, strings, text, time, transformers, unliftio, utf8-string
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.8.0";
-       sha256 = "1lr0a5vyf305ikhzf8xqrdzksz48vjlikx7zvjxkp0wsarz07ikd";
+       version = "0.3.14.0";
+       sha256 = "0mrx51kqz69n8axhzcxfi7x0ddn35ypny2lidas45q0865qgniif";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
-         deepseq directory filepath hslogger lens messagepack MissingH mtl
-         nvim-hs pretty-terminal prettyprinter process resourcet split stm
-         strings text time transformers unliftio utf8-string
+         deepseq directory either filepath hslogger lens messagepack
+         MissingH mtl nvim-hs pretty-terminal prettyprinter process
+         resourcet safe split stm strings text time transformers unliftio
+         utf8-string
        ];
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
-         deepseq directory filepath hslogger lens messagepack MissingH mtl
-         nvim-hs pretty-terminal prettyprinter process resourcet split stm
-         strings text time transformers unliftio utf8-string
+         deepseq directory either filepath hslogger lens messagepack
+         MissingH mtl nvim-hs pretty-terminal prettyprinter process
+         resourcet safe split stm strings text time transformers unliftio
+         utf8-string
        ];
        testHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
-         deepseq directory filepath hslogger HTF lens messagepack MissingH
-         mtl nvim-hs pretty-terminal prettyprinter process resourcet split
-         stm strings text time transformers unliftio utf8-string
+         deepseq directory either filepath hslogger HTF lens messagepack
+         MissingH mtl nvim-hs pretty-terminal prettyprinter process
+         resourcet safe split stm strings text time transformers unliftio
+         utf8-string
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
@@ -172860,14 +173257,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
-  "proto-lens-protoc_0_4_0_1" = callPackage
+  "proto-lens-protoc_0_4_0_2" = 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.1";
-       sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni";
+       version = "0.4.0.2";
+       sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176196,8 +176593,8 @@ self: {
      }:
      mkDerivation {
        pname = "radius";
-       version = "0.5.0.2";
-       sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc";
+       version = "0.6.0.0";
+       sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l";
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
@@ -178741,6 +179138,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "recursion-schemes_5_1" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, free, HUnit
+     , template-haskell, th-abstraction, transformers
+     }:
+     mkDerivation {
+       pname = "recursion-schemes";
+       version = "5.1";
+       sha256 = "1lpk8mkh3vd2j56f0fmaj64indgf5m1db9355fgimcb4xfw13nq1";
+       libraryHaskellDepends = [
+         base base-orphans comonad free template-haskell th-abstraction
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit template-haskell transformers ];
+       description = "Generalized bananas, lenses and barbed wire";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "recursion-schemes-ext" = callPackage
     ({ mkDerivation, base, composition-prelude, criterion, deepseq
      , hspec, lens, recursion-schemes
@@ -179675,6 +180090,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex_1_0_2_0" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring, containers
+     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
+     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
+     , transformers, unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "regex";
+       version = "1.0.2.0";
+       sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda";
+       libraryHaskellDepends = [
+         array base base-compat bytestring containers hashable regex-base
+         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
+         time time-locale-compat transformers unordered-containers
+         utf8-string
+       ];
+       description = "Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -179814,8 +180250,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "1.0.1.4";
-       sha256 = "0lxwp1kqacw7dvhbrzy7kl0w5g79gp22b9143m6cgd2f2z7bgzqp";
+       version = "1.0.2.0";
+       sha256 = "0qpf4b2zxdlih1smlhybs923n2gjaxhx8i1rgjw6v7ng13vnriiy";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180119,8 +180555,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "1.0.1.4";
-       sha256 = "0pgy9bym4450kzhrzy3amw8dhswzvmqnj5i8pn33l8rvsyr37zp7";
+       version = "1.0.2.0";
+       sha256 = "19vn5w4vhgxv9s6nhlmj4xl8pa16d1a2ygxxyd5b0qg3q27vvisk";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
          regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
@@ -180333,8 +180769,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.2.0";
-       sha256 = "1y2fvb5qf2gz3nzw983v7r1xgdxxxg0n62sambngf7w8pww5p27d";
+       version = "0.1.2.2";
+       sha256 = "1knhdrjj5y9p8974am4z31k163yjz3123lvjjk1ml4ba65afqhc7";
        libraryHaskellDepends = [
          base exceptions mtl protolude resourcet text transformers-base
        ];
@@ -186366,6 +186802,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
+  "sbv_7_13" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, 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
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "7.13";
+       sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array async base containers crackNum deepseq directory filepath
+         generic-deriving ghc mtl pretty process QuickCheck random syb
+         template-haskell time
+       ];
+       testHaskellDepends = [
+         base bytestring containers crackNum directory doctest filepath Glob
+         hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
+         tasty-quickcheck template-haskell
+       ];
+       testSystemDepends = [ z3 ];
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) z3;};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -188608,8 +189072,8 @@ self: {
      }:
      mkDerivation {
        pname = "semilattices";
-       version = "0.0.0.2";
-       sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89";
+       version = "0.0.0.3";
+       sha256 = "089vgwbcwa3hj53hh9djmilwfknsd9g9z9q1gbl0dad4lr39062f";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -189595,8 +190059,8 @@ self: {
        pname = "servant-auth-server";
        version = "0.4.2.0";
        sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap";
-       revision = "2";
-       editedCabalFile = "188chzggs5ahc2v1mxrr5cda5dqjwwar8b85yz7ysvlvbxb1zsb3";
+       revision = "3";
+       editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
@@ -193721,8 +194185,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "shortcut-links";
-       version = "0.4.2.0";
-       sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy";
+       version = "0.4.2.1";
+       sha256 = "1zyy4jma61vg684sa66mpdlq9ylfrfv23d8m0163lbcfpkxfqdhd";
        libraryHaskellDepends = [ base text ];
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.bsd3;
@@ -195750,6 +196214,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skip-var" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "skip-var";
+       version = "0.1.0.0";
+       sha256 = "1xwbr25nsjkjvwjh62inr3ja7lp7carmc4nd68ybkyxmcfp1ivmc";
+       libraryHaskellDepends = [ base ];
+       description = "Skip variables";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skulk" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -196745,27 +197220,27 @@ self: {
   "snap" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
      , clientsession, configurator, containers, deepseq, directory
-     , directory-tree, dlist, filepath, hashable, heist, http-streams
-     , HUnit, lens, lifted-base, map-syntax, monad-control, mtl
-     , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
+     , directory-tree, dlist, fail, filepath, hashable, heist
+     , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control
+     , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
      , snap-server, stm, syb, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-smallcheck, text, time
      , transformers, transformers-base, unordered-containers, xmlhtml
      }:
      mkDerivation {
        pname = "snap";
-       version = "1.1.1.0";
-       sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7";
+       version = "1.1.2.0";
+       sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
-         containers directory directory-tree dlist filepath hashable heist
-         lens lifted-base map-syntax monad-control mtl mwc-random
+         containers directory directory-tree dlist fail filepath hashable
+         heist lens lifted-base map-syntax monad-control mtl mwc-random
          pwstore-fast snap-core snap-server stm text time transformers
          transformers-base unordered-containers xmlhtml
        ];
        testHaskellDepends = [
          aeson async attoparsec base bytestring cereal clientsession
-         configurator containers deepseq directory directory-tree dlist
+         configurator containers deepseq directory directory-tree dlist fail
          filepath hashable heist http-streams HUnit lens lifted-base
          map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck
          smallcheck snap-core snap-server stm syb test-framework
@@ -196998,8 +197473,8 @@ self: {
        pname = "snap-loader-dynamic";
        version = "1.0.0.0";
        sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
-       revision = "3";
-       editedCabalFile = "0kk3viaz5hikj9815ja9l3fqq3653vx7q9jamkz68hyfxyvf8qxh";
+       revision = "4";
+       editedCabalFile = "19bi4vh6pvcm0qc4wz0ydhs9flii6hyzg7z3iiijfcyhdcc9iah9";
        libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
@@ -200113,25 +200588,24 @@ self: {
 
   "sproxy2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, cereal, conduit, containers, cookie, docopt, entropy
-     , Glob, http-client, http-conduit, http-types
-     , interpolatedstring-perl6, network, postgresql-simple
-     , resource-pool, SHA, sqlite-simple, text, time, unix
-     , unordered-containers, wai, wai-conduit, warp, warp-tls, word8
-     , yaml
+     , bytestring, cereal, conduit, cookie, docopt, entropy, Glob
+     , http-client, http-conduit, http-types, interpolatedstring-perl6
+     , network, postgresql-simple, resource-pool, SHA, sqlite-simple
+     , text, time, unix, unordered-containers, wai, wai-conduit, warp
+     , warp-tls, word8, yaml
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.96.0";
-       sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6";
+       version = "1.97.0";
+       sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring cereal
-         conduit containers cookie docopt entropy Glob http-client
-         http-conduit http-types interpolatedstring-perl6 network
-         postgresql-simple resource-pool SHA sqlite-simple text time unix
-         unordered-containers wai wai-conduit warp warp-tls word8 yaml
+         conduit cookie docopt entropy Glob http-client http-conduit
+         http-types interpolatedstring-perl6 network postgresql-simple
+         resource-pool SHA sqlite-simple text time unix unordered-containers
+         wai wai-conduit warp warp-tls word8 yaml
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
@@ -201253,6 +201727,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stack2cabal" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , hpack, stackage-to-hackage, text
+     }:
+     mkDerivation {
+       pname = "stack2cabal";
+       version = "1.0.0";
+       sha256 = "0pqyf8jpldb733i0g93z5w1r6rgxgdnswkd2ciw8pbq5dw38q2yf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath hpack stackage-to-hackage
+         text
+       ];
+       description = "Convert stack projects to cabal.project + cabal.project.freeze";
+       license = stdenv.lib.licenses.gpl3Plus;
+     }) {};
+
   "stack2nix" = callPackage
     ({ mkDerivation, async, base, Cabal, cabal2nix, containers
      , directory, distribution-nixpkgs, filepath, hackage-db, hspec
@@ -201529,19 +202021,22 @@ self: {
 
   "stackage-to-hackage" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , extra, filepath, HsOpenSSL, HsYAML, http-streams, network-uri
-     , optparse-applicative, semigroupoids, text
+     , extra, filepath, HsYAML, http-client, http-client-tls
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "stackage-to-hackage";
-       version = "1.0.2";
-       sha256 = "0s474q0hwz917vhh9hmx33j9jjbgm58ajgl0wacw8hfbs8awwk20";
-       isLibrary = false;
+       version = "1.1.0";
+       sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory extra filepath HsYAML
+         http-client http-client-tls text
+       ];
        executableHaskellDepends = [
-         base bytestring Cabal containers directory extra filepath HsOpenSSL
-         HsYAML http-streams network-uri optparse-applicative semigroupoids
-         text
+         base bytestring Cabal containers directory extra filepath
+         optparse-applicative text
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
@@ -203320,15 +203815,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_28_1" = callPackage
+  "stratosphere_0_29_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.28.1";
-       sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
+       version = "0.29.0";
+       sha256 = "0zncpgjklm649fzrjjy0bri0ivybrc7lvys8yq72b4dpb8ksp5zs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -204621,6 +205116,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stripe-concepts" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "stripe-concepts";
+       version = "1.0.0.0";
+       sha256 = "0s518mlb181407w2gmlhaayaf3ypn03lzw3fmkzkiqz2c89kd1rw";
+       libraryHaskellDepends = [ base bytestring text ];
+       description = "Types for the Stripe API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stripe-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, mtl, text, time
      , transformers, unordered-containers
@@ -204691,6 +205197,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stripe-scotty" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-types, scotty
+     , stripe-concepts, stripe-signature, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stripe-scotty";
+       version = "1.0.0.0";
+       sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs";
+       revision = "1";
+       editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41";
+       libraryHaskellDepends = [
+         aeson base bytestring http-types scotty stripe-concepts
+         stripe-signature text unordered-containers
+       ];
+       description = "Listen for Stripe webhook events with Scotty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "stripe-signature" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory
+     , stripe-concepts, text
+     }:
+     mkDerivation {
+       pname = "stripe-signature";
+       version = "1.0.0.0";
+       sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps";
+       libraryHaskellDepends = [
+         base bytestring cryptonite hex-text memory stripe-concepts text
+       ];
+       testHaskellDepends = [ base bytestring text ];
+       description = "Verification of Stripe webhook signatures";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stripe-tests" = callPackage
     ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
      , mtl, random, stripe-core, text, time, transformers
@@ -204709,6 +205249,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stripe-wreq" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts
+     , text, unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "stripe-wreq";
+       version = "1.0.0.0";
+       sha256 = "1cm9fvkpanxydbbrk9s1yj3bkxd7wcschi40a4dhmh8h3wr89y8s";
+       libraryHaskellDepends = [
+         aeson base bytestring lens stripe-concepts text
+         unordered-containers wreq
+       ];
+       description = "Use the Stripe API via Wreq";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "strips" = callPackage
     ({ mkDerivation, base, containers, hspec, mtl }:
      mkDerivation {
@@ -205739,14 +206295,16 @@ self: {
      }) {};
 
   "supervisors" = callPackage
-    ({ mkDerivation, async, base, containers, hspec, stm, unliftio }:
+    ({ mkDerivation, async, base, containers, hspec, safe-exceptions
+     , stm
+     }:
      mkDerivation {
        pname = "supervisors";
-       version = "0.1.0.0";
-       sha256 = "1sxralp0hcz2zn5byn67xq612nzmpm890gnjs827sidvr7r7h31j";
-       revision = "2";
-       editedCabalFile = "08qz4qbfrj7hpk3pgyjy3r149dz48jpxajyjs10fgiz16xg11zyl";
-       libraryHaskellDepends = [ async base containers stm unliftio ];
+       version = "0.2.0.0";
+       sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i";
+       libraryHaskellDepends = [
+         async base containers safe-exceptions stm
+       ];
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
@@ -208826,6 +209384,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_1_5" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.1.5";
+       sha256 = "1px562a9c3vn0qxy8zs8mkp73nfqca17hdwhv5p7qgawpjafxk32";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -209294,6 +209870,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-test-vector" = callPackage
+    ({ mkDerivation, base, tasty }:
+     mkDerivation {
+       pname = "tasty-test-vector";
+       version = "0";
+       sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j";
+       libraryHaskellDepends = [ base tasty ];
+       description = "Test vector support for tasty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-th" = callPackage
     ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit
      , template-haskell
@@ -210556,8 +211143,8 @@ self: {
      }:
      mkDerivation {
        pname = "terminal-text";
-       version = "1.1.1";
-       sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3";
+       version = "1.1.2";
+       sha256 = "1cfxkx3mfjxw8fh3gw4wqk5wwf10hi1aldhn6xc75mwfa6x7djjq";
        libraryHaskellDepends = [
          ansi-terminal base container layered-state prologue text
        ];
@@ -212504,6 +213091,21 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_10_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.10.0";
+       sha256 = "1bql46ylr111g0pncdsf5mbhn6cpaw9xlqby89bz417dlk5gzny9";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -213826,19 +214428,19 @@ self: {
      }) {};
 
   "tidal" = callPackage
-    ({ mkDerivation, base, colour, containers, hashable, hosc
-     , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty
-     , tasty-hunit, text, time, websockets
+    ({ mkDerivation, base, bifunctors, colour, containers, hashable
+     , hosc, microspec, monad-loops, mtl, mwc-random, network, parsec
+     , random, safe, text, time, vector
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.9.10";
-       sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw";
+       version = "1.0.3";
+       sha256 = "1blzlahn1xsp03wiv7ci4n6795xx8i9syhclbgcx6fy6gkfr2wy2";
        libraryHaskellDepends = [
-         base colour containers hashable hosc mersenne-random-pure64
-         monad-loops mtl parsec safe text time websockets
+         base bifunctors colour containers hashable hosc monad-loops mtl
+         mwc-random network parsec random safe text time vector
        ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
+       testHaskellDepends = [ base containers microspec parsec ];
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -217999,6 +218601,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_13" = 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.13";
+       sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg";
+       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
      }:
@@ -219052,6 +219678,8 @@ self: {
        pname = "type-level-sets";
        version = "0.8.9.0";
        sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
+       revision = "1";
+       editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
@@ -219087,8 +219715,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-map";
-       version = "0.1.3.0";
-       sha256 = "146kc36z6fljcgmgl9vii1pmf3hs80v2vz21r84p823znrqjs8gc";
+       version = "0.1.4.0";
+       sha256 = "16ccnn5dk6wl2ynwwmc71rr64qpppqxlmxahmj5g3plq8hh0p40d";
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -219402,8 +220030,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-spreadsheet";
-       version = "1.1.3";
-       sha256 = "1y59kd92f5v116y26dlznvqi5kcb6y89rliwcs8ay9sk76606fa6";
+       version = "1.1.4";
+       sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -219527,8 +220155,8 @@ self: {
      }:
      mkDerivation {
        pname = "typelevel";
-       version = "1.2.2";
-       sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5";
+       version = "1.2.3";
+       sha256 = "02bvzgl0331xa4pwdclw08wyq8canmw06ps3xvgvhb5miy93rrwz";
        libraryHaskellDepends = [
          base constraints convert exceptions lens mtl pretty pretty-show
          primitive transformers
@@ -221560,14 +222188,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unix-time_0_4_0" = callPackage
-    ({ mkDerivation, base, binary, bytestring, doctest, hspec
-     , old-locale, old-time, QuickCheck, time
+  "unix-time_0_4_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
+     , doctest, hspec, old-locale, old-time, QuickCheck, time
      }:
      mkDerivation {
        pname = "unix-time";
-       version = "0.4.0";
-       sha256 = "0fb9mdg596db9wbxsr5m3zc3wasvwblb32fsva0zrac93c9rq51r";
+       version = "0.4.3";
+       sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base binary bytestring old-time ];
        testHaskellDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -221626,28 +222255,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.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;
-     }) {};
-
-  "unliftio_0_2_9_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, gauge
      , hspec, process, QuickCheck, stm, time, transformers, unix
      , unliftio-core
@@ -221670,7 +222277,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
@@ -223276,8 +223882,8 @@ self: {
        pname = "uuid-crypto";
        version = "1.4.0.0";
        sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn";
-       revision = "4";
-       editedCabalFile = "1rzvpkvjbvzwvks795998k8232pc41yvcblrq7f29abrvd0587xp";
+       revision = "6";
+       editedCabalFile = "146jxyrsnrcwsll6mhq8a67ms1wpbbbxmkbq7sh9wza6c4g2fbwy";
        libraryHaskellDepends = [
          base binary bytestring cryptoids cryptoids-class cryptoids-types
          exceptions uuid
@@ -224662,17 +225268,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_1_1_0" = callPackage
+  "vector-sized_1_2_0_0" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive
-     , finite-typelits, indexed-list-literals, primitive, vector
+     , finite-typelits, hashable, indexed-list-literals, primitive
+     , vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.1.1.0";
-       sha256 = "05rrfiy0zzcq5jmr1kfbpv1p6f35pqsd5k6zf78byznzjwk758nb";
+       version = "1.2.0.0";
+       sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54";
        libraryHaskellDepends = [
          adjunctions base comonad deepseq distributive finite-typelits
-         indexed-list-literals primitive vector
+         hashable indexed-list-literals primitive vector
        ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -224793,8 +225400,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-text";
-       version = "1.1.5";
-       sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir";
+       version = "1.1.6";
+       sha256 = "14ms8ach15c1pyaih92qi703vj9aanbrmcsfwzxb55vwfpbbm2f4";
        libraryHaskellDepends = [
          base binary prologue text vector vector-binary-instances
        ];
@@ -225153,6 +225760,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_26" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.26";
+       sha256 = "11nd137135jq19l58g5fkxzznbv2hdrfyy231fy9s8hifm2rz14d";
+       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 {
@@ -226040,8 +226666,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.4.2.0";
-       sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
+       version = "0.5.0.0";
+       sha256 = "0xa9ql4583z9cwkn76sf41igk0ny8yp8fcgs6lwbk7kfbb54kk4b";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant digit
@@ -226632,6 +227258,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_3" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.3";
+       sha256 = "1i200kn3cnd1b3hf53982y6rddwrf3z1acbclf1xc15632df73wx";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp
@@ -230834,44 +231478,6 @@ self: {
      }) {};
 
   "wreq" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec
-     , authenticate-oauth, base, base16-bytestring, base64-bytestring
-     , bytestring, Cabal, cabal-doctest, case-insensitive, containers
-     , cryptonite, directory, doctest, exceptions, filepath, ghc-prim
-     , hashable, http-client, http-client-tls, http-types, HUnit, lens
-     , lens-aeson, memory, mime-types, network-info, psqueues
-     , QuickCheck, snap-core, snap-server, template-haskell, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, transformers, unix-compat
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "wreq";
-       version = "0.5.3.0";
-       sha256 = "1bi78y0jzm8mvwbfc4mphg8iyjz5v1f4ziqpk1dskvb1f3ysw3d9";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec authenticate-oauth base base16-bytestring
-         bytestring case-insensitive containers cryptonite exceptions
-         ghc-prim hashable http-client http-client-tls http-types lens
-         lens-aeson memory mime-types psqueues template-haskell text time
-         time-locale-compat unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring
-         case-insensitive containers directory doctest filepath hashable
-         http-client http-types HUnit lens lens-aeson network-info
-         QuickCheck snap-core snap-server temporary test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers unix-compat unordered-containers uuid vector
-       ];
-       description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wreq_0_5_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
      , bytestring, Cabal, cabal-doctest, case-insensitive, containers
@@ -230907,7 +231513,6 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq-sb" = callPackage
@@ -231232,8 +231837,8 @@ self: {
      }:
      mkDerivation {
        pname = "wsjtx-udp";
-       version = "0.1.3.4";
-       sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf";
+       version = "0.1.3.5";
+       sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -235286,8 +235891,8 @@ self: {
        pname = "yesod-bin";
        version = "1.6.0.3";
        sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
-       revision = "3";
-       editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7";
+       revision = "4";
+       editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -237737,6 +238342,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yx" = callPackage
+    ({ mkDerivation, array, base, bytestring, hspec }:
+     mkDerivation {
+       pname = "yx";
+       version = "0.0.2.0";
+       sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ array base bytestring hspec ];
+       description = "Row-major coordinates";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yxdb-utils" = callPackage
     ({ mkDerivation, array, attoparsec, base, bimap, binary
      , binary-conduit, bytestring, Codec-Compression-LZF, conduit
@@ -238988,6 +239605,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zsyntax" = callPackage
+    ({ mkDerivation, base, constraints, containers, mtl, multiset }:
+     mkDerivation {
+       pname = "zsyntax";
+       version = "0.2.0.0";
+       sha256 = "1pv2slz9r305lal25gh5zhr0lnkf4nzsg6vib6i576m83d3pcsgx";
+       libraryHaskellDepends = [
+         base constraints containers mtl multiset
+       ];
+       testHaskellDepends = [ base containers mtl multiset ];
+       description = "Automated theorem prover for the Zsyntax biochemical calculus";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ztail" = callPackage
     ({ mkDerivation, array, base, bytestring, filepath, hinotify
      , process, regex-posix, time, unix, unordered-containers

From a220b2f3706582a3b4cd44c3431078e1a64c9aba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Dec 2018 12:26:21 +0100
Subject: [PATCH 2467/2793] haskell-appar: drop obsolete override

---
 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 3c01250c3fe..10c11415d8b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1201,9 +1201,6 @@ self: super: {
   # https://github.com/mgajda/json-autotype/issues/25
   json-autotype = dontCheck super.json-autotype;
 
-  # https://github.com/kazu-yamamoto/iproute/issues/43
-  appar = self.appar_0_1_7;
-
   # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
   hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });

From 195f8ac5ac62c7d11fe43bb077b91c184df931a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Dec 2018 15:07:24 +0100
Subject: [PATCH 2468/2793] haskell-JuicyPixels: update overrides for the new
 version

---
 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 2b3165981ea..f35172ed024 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -63,7 +63,7 @@ self: super: {
   hspec-discover = self.hspec-discover_2_6_0;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
   hspec-meta = self.hspec-meta_2_6_0;
-  JuicyPixels = self.JuicyPixels_3_3_2;
+  JuicyPixels = self.JuicyPixels_3_3_3;
   lens = self.lens_4_17;
   megaparsec = dontCheck (doJailbreak super.megaparsec);
   pandoc = self.pandoc_2_5;

From b569b87d4ac8e99c72428a195d7853c1cdec7741 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 21 Dec 2018 14:04:17 +0100
Subject: [PATCH 2469/2793] pythonPackages.sip: change module name

See https://github.com/NixOS/nixpkgs/pull/49400
---
 pkgs/development/python-modules/sip/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index f8cc7e8dc45..ee8a1ffbafc 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -14,6 +14,7 @@ buildPythonPackage rec {
 
   configurePhase = ''
     ${python.executable} ./configure.py \
+      --sip-module PyQt5.sip \
       -d $out/lib/${python.libPrefix}/site-packages \
       -b $out/bin -e $out/include
   '';

From 05cf0e1107abd25eeebbaeb71ef0cdaad1f12077 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 21 Dec 2018 14:05:23 +0100
Subject: [PATCH 2470/2793] pythonPackages.pyqt5: link sip module

---
 pkgs/development/python-modules/pyqt/5.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 0e033a9e45d..7c08b9f45d1 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -65,6 +65,7 @@ in buildPythonPackage {
   '';
 
   postInstall = ''
+    ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
     done

From 0be7bfe1bf6430f07c1da4f8290f1e53997e505e Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 21 Dec 2018 14:08:30 +0100
Subject: [PATCH 2471/2793] qutebrowser: fix pdfjs

Pdfjs was downloaded in two derivations, where one is sufficient.

Also there was allegedly a typo in the download URL.
---
 .../browsers/qutebrowser/default.nix          | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 8b7dfc86027..5e44bb8cbef 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -10,20 +10,14 @@
 assert withMediaPlayback -> gst_all_1 != null;
 
 let
-  pdfjs = stdenv.mkDerivation rec {
-    name = "pdfjs-${version}";
+  pdfjs = let
     version = "1.10.100";
-
-    src = fetchzip {
-      url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip";
-      sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
-      stripRoot = false;
-    };
-
-    buildCommand = ''
-      mkdir $out
-      cp -r $src $out
-    '';
+  in
+  fetchzip rec {
+    name = "pdfjs-${version}";
+    url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
+    sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
+    stripRoot = false;
   };
 
 in python3Packages.buildPythonApplication rec {

From 13d5941d50e262b8e310d9844975bce0a793596f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Dec 2018 14:49:25 +0100
Subject: [PATCH 2472/2793] matrix-synapse: fix build by local dependency
 downgrade

---
 pkgs/servers/matrix-synapse/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index b0330b72ae4..563530639d1 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -64,7 +64,13 @@ in buildPythonApplication rec {
     netaddr
     phonenumbers
     pillow
-    prometheus_client
+    (prometheus_client.overrideAttrs (x: {
+      src = fetchPypi {
+        pname = "prometheus_client";
+        version = "0.3.1";
+        sha256 = "093yhvz7lxl7irnmsfdnf2030lkj4gsfkg6pcmy4yr1ijk029g0p";
+      };
+    }))
     psutil
     psycopg2
     pyasn1

From 35efbedce4cddd6d155fae30e33b023bdf4f11da Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Dec 2018 15:00:39 +0100
Subject: [PATCH 2473/2793] matrix-synapse: 0.33.9 -> 0.34.0

---
 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 563530639d1..5db09284874 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -37,11 +37,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "0.33.9";
+  version = "0.34.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wdpywqi1xd6dy3hxnnjnh2amlmhljf8s0bff9v55jyh42bj1vpn";
+    sha256 = "1bqwivzfx3kikzjmn4mng829ll8y62pd08hvsx99arr7cyzp6gri";
   };
 
   patches = [

From 98ac5710bd493b36635bc1f9c2924bb66605e6f5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Dec 2018 09:10:17 -0500
Subject: [PATCH 2474/2793] kernel-config: CIFS_POSIX no longer exists

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ec9aed402bf..c098571bb60 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -301,7 +301,7 @@ let
       NFS_V4_SECURITY_LABEL = yes;
 
       CIFS_XATTR        = yes;
-      CIFS_POSIX        = yes;
+      CIFS_POSIX        = option yes;
       CIFS_FSCACHE      = yes;
       CIFS_STATS        = whenOlder "4.19" yes;
       CIFS_WEAK_PW_HASH = yes;

From 54ce2e016b338e47632b8f35c19987823c95d6e6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Dec 2018 09:10:24 -0500
Subject: [PATCH 2475/2793] linux: 4.4.168 -> 4.4.169

---
 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 5005e5b1d84..2e83e73df2e 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.168";
+  version = "4.4.169";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zhmhccwki1r7p99ap772p3bknl4hm6zfwvzk97nas42anqc0ylg";
+    sha256 = "1aah2qmifj15kcck4m6p00zz0d80afs22bg44y3n4l926f0b1w86";
   };
 } // (args.argsOverride or {}))

From a5f447e16a9c2a04047c559d25ceb42fe6f6620b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Dec 2018 09:10:45 -0500
Subject: [PATCH 2476/2793] linux: 4.9.146 -> 4.9.147

---
 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 f1fa1baea37..99b82522be3 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.146";
+  version = "4.9.147";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ncf7yqavxqkkwdrapy72hb7rsj67fm1rvd2hdy12p88wf5ml6aq";
+    sha256 = "10hxxcwa9lgsdz0k6229fly9r7iyqv9xq838zx8s7bd12qrrfb59";
   };
 } // (args.argsOverride or {}))

From dea57f15e9559056f96264e97271136f1ba476a6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Dec 2018 09:10:54 -0500
Subject: [PATCH 2477/2793] linux: 4.14.89 -> 4.14.90

---
 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 0e8215133ad..5f04b220b4b 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.89";
+  version = "4.14.90";
 
   # 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 = "098b38518va6hhv5114vkyhyr2xzx01wxwib4dm0vpfx8jn1cvnf";
+    sha256 = "1jl6l7zi5dl1ahxj30m4wmnd05s61rxn8yfjkkc4mr45634x07hc";
   };
 } // (args.argsOverride or {}))

From af6c117facb2c6c4913d701dc8733ed1780e93da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Dec 2018 09:11:02 -0500
Subject: [PATCH 2478/2793] linux: 4.19.11 -> 4.19.12

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 5ce1206c4c9..cb4a89a6419 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.11";
+  version = "4.19.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 = "1v3rbkf0vby9qav2d73zqzb4ch3vm4w8b54davmkz003452v6phs";
+    sha256 = "0xwvk6989glrpfc6irzf1lh3lvcckms72ngja9dpyqb2km9sr0ad";
   };
 } // (args.argsOverride or {}))

From 8eccf9e28400ae67a55fb1f9ec67a5c8b2df6cc5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 21 Dec 2018 14:07:54 +0000
Subject: [PATCH 2479/2793] bento4: fix license

The documentation says GPL2, and the source files also say "or any later version".
https://www.bento4.com/about/
https://github.com/axiomatic-systems/Bento4/blob/v1.5.1-624/Source/C++/CApi/Bento4C.h
---
 pkgs/tools/video/bento4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
index 687f80f1adf..75964a3c2e5 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/pkgs/tools/video/bento4/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Full-featured MP4 format and MPEG DASH library and tools";
     homepage = http://bento4.com;
-    license = licenses.gpl3;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ makefu ];
     broken = stdenv.isAarch64;
     platforms = platforms.linux;

From ed473e661533d04d3ed212be837346430c73cc88 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 21 Dec 2018 15:24:02 +0100
Subject: [PATCH 2480/2793] localtime: migrate to using buildGoPackage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/tools/system/localtime/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 442b9a42f2b..45cf378a14e 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, go, systemd, polkit, fetchFromGitHub, m4, removeReferencesTo }:
+{ stdenv, systemd, polkit, fetchFromGitHub, buildGoPackage, m4}:
 
-stdenv.mkDerivation {
+buildGoPackage rec {
   name = "localtime-2017-11-07";
 
   src = fetchFromGitHub {
@@ -9,14 +9,20 @@ stdenv.mkDerivation {
     rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce";
     sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8";
   };
+  goPackagePath = "github.com/Stebalien/localtime";
 
-  buildInputs = [ go systemd polkit m4 removeReferencesTo ];
-  disallowedRequisites = [ go ];
+  buildInputs = [ systemd polkit m4 ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    make localtimed
+  '';
+
+  installPhase = ''
+    mkdir -p $bin/bin
+    install -Dm555 localtimed $bin/bin
   '';
 
   meta = with stdenv.lib; {

From d180bf3862e7c0c6ca7e5963f575483b69e7f04b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 14:03:13 +0100
Subject: [PATCH 2481/2793] security.pam: make pam_unix.so required, not
 sufficient

Having pam_unix set to "sufficient" means early-succeeding account
management group, as soon as pam_unix.so is succeeding.

This is not sufficient. For example, nixos modules might install nss
modules for user lookup, so pam_unix.so succeeds, and we end the stack
successfully, even though other pam account modules might want to do
more extensive checks.

Other distros seem to set pam_unix.so to 'required', so if there are
other pam modules in that management group, they get a chance to do some
validation too.

For SSSD, @PsyanticY already added a workaround knob in
https://github.com/NixOS/nixpkgs/pull/31969, while stating this should
be the default anyway.

I did some thinking in what could break - after this commit, we require
pam_unix to succeed, means we require `getent passwd $username` to
return something.
This is the case for all local users due to the passwd nss module, and
also the case for all modules installing their nss module to
nsswitch.conf - true for ldap (if not explicitly disabled) and sssd.

I'm not so sure about krb5, cc @eqyiel for opinions. Is there some nss
module loaded? Should the pam account module be placed before pam_unix?

We don't drop the `security.pam.services.<name?>.sssdStrictAccess`
option, as it's also used some lines below to tweak error behaviour
inside the pam sssd module itself (by changing it's 'control' field).

This is also required to get admin login for Google OS Login working
(#51566), as their pam_oslogin_admin accounts module takes care of sudo
configuration.
---
 nixos/doc/manual/release-notes/rl-1903.xml | 16 ++++++++++++++++
 nixos/modules/security/pam.nix             |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 69e94fbccc5..7bc88769337 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -318,6 +318,22 @@
      case.
    </para>
   </listitem>
+  <listitem>
+   <para>
+     The <literal>pam_unix</literal> account module is now loaded with its
+     control field set to <literal>required</literal> instead of
+     <literal>sufficient</literal>, so that later pam account modules that
+     might do more extensive checks are being executed.
+     Previously, the whole account module verification was exited prematurely
+     in case a nss module provided the account name to
+     <literal>pam_unix</literal>.
+     The LDAP and SSSD NixOS modules already add their NSS modules when
+     enabled. In case your setup breaks due to some later pam account module
+     previosuly shadowed, or failing NSS lookups, please file a bug. You can
+     get back the old behaviour by manually setting
+     <literal><![CDATA[security.pam.services.<name?>.text]]></literal>.
+   </para>
+  </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 926c6d77d3b..812a71c68a3 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -269,7 +269,7 @@ let
       text = mkDefault
         (''
           # Account management.
-          account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so
+          account required pam_unix.so
           ${optionalString use_ldap
               "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false)

From 485bf85407ea79cd7fdfcab2fde983e9a3d85f0e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 21 Dec 2018 08:22:08 -0500
Subject: [PATCH 2482/2793] pyre: fix watchman references

---
 pkgs/development/tools/pyre/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 87066284bfe..a93dedded29 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
-, dune, python3, rsync, fetchpatch, buck }:
+{ stdenv, fetchFromGitHub, ocamlPackages, writeScript
+, dune, python3, rsync, buck, watchman }:
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
@@ -103,6 +103,10 @@ in python3.pkgs.buildPythonApplication rec {
     substituteInPlace scripts/build-pypi-package.sh \
         --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \
         --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build"
+    for file in client/pyre.py client/commands/initialize.py client/commands/tests/initialize_test.py; do
+      substituteInPlace "$file" \
+          --replace '"watchman"' '"${watchman}/bin/watchman"'
+    done
     substituteInPlace client/buck.py \
         --replace '"buck"' '"${buck}/bin/buck"'
     substituteInPlace client/tests/buck_test.py \

From 5d9d164c776b5c4755292b7dbd2bb58211d40707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Fri, 21 Dec 2018 17:03:48 +0100
Subject: [PATCH 2483/2793] clojure: 1.9.0.391 -> 1.10.0.403

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 845b5b1f1c0..33b5551a3d6 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "clojure-${version}";
-  version = "1.9.0.391";
+  version = "1.10.0.403";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz";
+    sha256 = "0jsyd0vr1qfqs0dz560hyfya553jhr4m4msf5x0n610yzvbqym4c";
   };
 
   buildInputs = [ makeWrapper ];

From fb41136208d24985df8c39cd69c491d5cb22bfe9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 13:52:51 +0100
Subject: [PATCH 2484/2793] google-compute-engine-oslogin: init at 1.4.3

---
 .../google-compute-engine-oslogin/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix

diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
new file mode 100644
index 00000000000..5096c7f9468
--- /dev/null
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchFromGitHub
+, curl
+, json_c
+, pam
+}:
+
+stdenv.mkDerivation rec {
+  name = "google-compute-engine-oslogin-${version}";
+  version = "1.4.3";
+
+  src = fetchFromGitHub {
+    repo = "compute-image-packages";
+    owner = "GoogleCloudPlatform";
+    rev = "2ccfe80f162a01b5b7c3316ca37981fc8b3fc32a";
+    sha256 = "036g7609ni164rmm68pzi47vrywfz2rcv0ad67gqf331pvlr92x1";
+  };
+  sourceRoot = "source/google_compute_engine_oslogin";
+
+  postPatch = ''
+    # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
+    substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
+    # fix "User foo not allowed because shell /bin/bash does not exist"
+    substituteInPlace utils/oslogin_utils.cc --replace /bin/bash /bin/sh
+  '';
+
+  buildInputs = [ curl.dev pam ];
+
+  NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c";
+  NIX_CFLAGS_LINK="-L${json_c}/lib";
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+
+    install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2
+    install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2
+
+    install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib
+    install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/GoogleCloudPlatform/compute-image-packages;
+    description = "OS Login Guest Environment for Google Compute Engine";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ adisbladis flokli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dd971c8d9e..e150c8e4957 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3033,6 +3033,8 @@ in
 
   google-compute-engine = python2.pkgs.google-compute-engine;
 
+  google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
+
   gource = callPackage ../applications/version-management/gource { };
 
   govc = callPackage ../tools/virtualization/govc { };

From be5ad774bff3e8fe21010d606776672ae7b6ee55 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 13:53:51 +0100
Subject: [PATCH 2485/2793] security.pam.services.<name?>.: add
 googleOsLogin(AccountVerification|Authentication)

---
 nixos/modules/security/pam.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 812a71c68a3..b1a0eff98c2 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -77,6 +77,30 @@ let
         '';
       };
 
+      googleOsLoginAccountVerification = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, will use the Google OS Login PAM modules
+          (<literal>pam_oslogin_login</literal>,
+          <literal>pam_oslogin_admin</literal>) to verify possible OS Login
+          users and set sudoers configuration accordingly.
+          This only makes sense to enable for the <literal>sshd</literal> PAM
+          service.
+        '';
+      };
+
+      googleOsLoginAuthentication = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, will use the <literal>pam_oslogin_login</literal>'s user
+          authentication methods to authenticate users using 2FA.
+          This only makes sense to enable for the <literal>sshd</literal> PAM
+          service.
+        '';
+      };
+
       fprintAuth = mkOption {
         default = config.services.fprintd.enable;
         type = types.bool;
@@ -278,8 +302,14 @@ let
               "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"}
           ${optionalString config.krb5.enable
               "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
+          ${optionalString cfg.googleOsLoginAccountVerification ''
+            account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so
+            account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so
+          ''}
 
           # Authentication management.
+          ${optionalString cfg.googleOsLoginAuthentication
+              "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"}
           ${optionalString cfg.rootOK
               "auth sufficient pam_rootok.so"}
           ${optionalString cfg.requireWheel

From c6de45c0d798d5302d9050317eac1dbadd3a41b2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 13:55:25 +0100
Subject: [PATCH 2486/2793] config.security.googleOsLogin: add module

The OS Login package enables the following components:
AuthorizedKeysCommand to query valid SSH keys from the user's OS Login
profile during ssh authentication phase.
NSS Module to provide user and group information
PAM Module for the sshd service, providing authorization and
authentication support, allowing the system to use data stored in
Google Cloud IAM permissions to control both, the ability to log into
an instance, and to perform operations as root (sudo).
---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/security/google_oslogin.nix | 68 +++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 nixos/modules/security/google_oslogin.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8fda7ee0b0a..e342c08f1be 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -154,6 +154,7 @@
   ./security/chromium-suid-sandbox.nix
   ./security/dhparams.nix
   ./security/duosec.nix
+  ./security/google_oslogin.nix
   ./security/hidepid.nix
   ./security/lock-kernel-modules.nix
   ./security/misc.nix
diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix
new file mode 100644
index 00000000000..246419b681a
--- /dev/null
+++ b/nixos/modules/security/google_oslogin.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.security.googleOsLogin;
+  package = pkgs.google-compute-engine-oslogin;
+
+in
+
+{
+
+  options = {
+
+    security.googleOsLogin.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable Google OS Login
+
+        The OS Login package enables the following components:
+        AuthorizedKeysCommand to query valid SSH keys from the user's OS Login
+        profile during ssh authentication phase.
+        NSS Module to provide user and group information
+        PAM Module for the sshd service, providing authorization and
+        authentication support, allowing the system to use data stored in
+        Google Cloud IAM permissions to control both, the ability to log into
+        an instance, and to perform operations as root (sudo).
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    security.pam.services.sshd = {
+      makeHomeDir = true;
+      googleOsLoginAccountVerification = true;
+      # disabled for now: googleOsLoginAuthentication = true;
+    };
+
+    security.sudo.extraConfig = ''
+      #includedir /run/google-sudoers.d
+    '';
+    systemd.tmpfiles.rules = [
+      "d /run/google-sudoers.d 750 root root -"
+      "d /var/google-users.d 750 root root -"
+    ];
+
+    # enable the nss module, so user lookups etc. work
+    system.nssModules = [ package ];
+
+    # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable.
+    # So indirect by a symlink.
+    environment.etc."ssh/authorized_keys_command_google_oslogin" = {
+      mode = "0755";
+      text = ''
+        #!/bin/sh
+        exec ${package}/bin/google_authorized_keys "$@"
+      '';
+    };
+    services.openssh.extraConfig = ''
+      AuthorizedKeysCommand /etc/ssh/authorized_keys_command_google_oslogin %u
+      AuthorizedKeysCommandUser nobody
+    '';
+  };
+
+}

From 04f3562fc46aee7bcc963156eff56f37c6fe2b14 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 13:57:31 +0100
Subject: [PATCH 2487/2793] config.nsswitch: load cache_oslogin and oslogin nss
 modules if config.security.googleOsLogin.enable is set

---
 nixos/modules/config/nsswitch.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index a74d551f50d..b601e908e49 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -1,6 +1,6 @@
 # Configuration for the Name Service Switch (/etc/nsswitch.conf).
 
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -15,6 +15,7 @@ let
   ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
   sssd = canLoadExternalModules && config.services.sssd.enable;
   resolved = canLoadExternalModules && config.services.resolved.enable;
+  googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable;
 
   hostArray = [ "files" ]
     ++ optional mymachines "mymachines"
@@ -29,6 +30,7 @@ let
     ++ optional sssd "sss"
     ++ optional ldap "ldap"
     ++ optional mymachines "mymachines"
+    ++ optional googleOsLogin "cache_oslogin oslogin"
     ++ [ "systemd" ];
 
   shadowArray = [ "files" ]
@@ -97,7 +99,7 @@ in {
     # configured IP addresses, or ::1 and 127.0.0.2 as
     # fallbacks. Systemd also provides nss-mymachines to return IP
     # addresses of local containers.
-    system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ];
-
+    system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ])
+      ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out;
   };
 }

From 0f46188ca10c2112e4af826233d203165ead17f4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 13:59:08 +0100
Subject: [PATCH 2488/2793] nixos/tests: add google-oslogin test

---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/google-oslogin/default.nix | 52 ++++++++++++++
 nixos/tests/google-oslogin/server.nix  | 29 ++++++++
 nixos/tests/google-oslogin/server.py   | 96 ++++++++++++++++++++++++++
 4 files changed, 178 insertions(+)
 create mode 100644 nixos/tests/google-oslogin/default.nix
 create mode 100644 nixos/tests/google-oslogin/server.nix
 create mode 100644 nixos/tests/google-oslogin/server.py

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1e8e2213fac..860262eeb6c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -81,6 +81,7 @@ in
   gitlab = handleTest ./gitlab.nix {};
   gitolite = handleTest ./gitolite.nix {};
   gjs = handleTest ./gjs.nix {};
+  google-oslogin = handleTest ./google-oslogin {};
   gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64
   gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64
   gocd-agent = handleTest ./gocd-agent.nix {};
diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix
new file mode 100644
index 00000000000..3b84bba3f98
--- /dev/null
+++ b/nixos/tests/google-oslogin/default.nix
@@ -0,0 +1,52 @@
+import ../make-test.nix ({ pkgs, ... } :
+let
+  inherit (import ./../ssh-keys.nix pkgs)
+    snakeOilPrivateKey snakeOilPublicKey;
+in {
+  name = "google-oslogin";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ adisbladis flokli ];
+  };
+
+  nodes = {
+    # the server provides both the the mocked google metadata server and the ssh server
+    server = (import ./server.nix pkgs);
+
+    client = { ... }: {};
+  };
+  testScript =  ''
+    startAll;
+
+    $server->waitForUnit("mock-google-metadata.service");
+    $server->waitForOpenPort(80);
+
+    # mockserver should return a non-expired ssh key for both mockuser and mockadmin
+    $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"');
+    $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"');
+
+    # install snakeoil ssh key on the client
+    $client->succeed("mkdir -p ~/.ssh");
+    $client->succeed("cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil");
+    $client->succeed("chmod 600 ~/.ssh/id_snakeoil");
+
+    $client->waitForUnit("network.target");
+    $server->waitForUnit("sshd.service");
+
+    # we should not be able to connect as non-existing user
+    $client->fail("ssh -o User=ghost -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+
+    # we should be able to connect as mockuser
+    $client->succeed("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+    # but we shouldn't be able to sudo
+    $client->fail("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
+
+    # we should also be able to log in as mockadmin
+    $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+    # pam_oslogin_admin.so should now have generated a sudoers file
+    $server->succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'");
+
+    # and we should be able to sudo
+    $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
+  '';
+  })
+
diff --git a/nixos/tests/google-oslogin/server.nix b/nixos/tests/google-oslogin/server.nix
new file mode 100644
index 00000000000..fdb7141da31
--- /dev/null
+++ b/nixos/tests/google-oslogin/server.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+let
+  inherit (import ./../ssh-keys.nix pkgs)
+    snakeOilPrivateKey snakeOilPublicKey;
+in {
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
+  systemd.services.mock-google-metadata = {
+    description = "Mock Google metadata service";
+    serviceConfig.Type = "simple";
+    serviceConfig.ExecStart = "${pkgs.python3}/bin/python ${./server.py}";
+    environment = {
+      SNAKEOIL_PUBLIC_KEY = snakeOilPublicKey;
+    };
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+  };
+
+  services.openssh.enable = true;
+  services.openssh.challengeResponseAuthentication = false;
+  services.openssh.passwordAuthentication = false;
+
+  security.googleOsLogin.enable = true;
+
+  # Mock google service
+  networking.extraHosts = ''
+    127.0.0.1 metadata.google.internal
+  '';
+}
diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py
new file mode 100644
index 00000000000..bfc527cb97d
--- /dev/null
+++ b/nixos/tests/google-oslogin/server.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+import json
+import sys
+import time
+import os
+import hashlib
+import base64
+
+from http.server import BaseHTTPRequestHandler, HTTPServer
+from typing import Dict
+
+SNAKEOIL_PUBLIC_KEY = os.environ['SNAKEOIL_PUBLIC_KEY']
+
+
+def w(msg):
+    sys.stderr.write(f"{msg}\n")
+    sys.stderr.flush()
+
+
+def gen_fingerprint(pubkey):
+    decoded_key = base64.b64decode(pubkey.encode("ascii").split()[1])
+    return hashlib.sha256(decoded_key).hexdigest()
+
+def gen_email(username):
+    """username seems to be a 21 characters long number string, so mimic that in a reproducible way"""
+    return str(int(hashlib.sha256(username.encode()).hexdigest(), 16))[0:21]
+
+def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoil_pubkey: str) -> Dict:
+    snakeoil_pubkey_fingerprint = gen_fingerprint(snakeoil_pubkey)
+    # seems to be a 21 characters long numberstring, so mimic that in a reproducible way
+    email = gen_email(username)
+    return {
+        "loginProfiles": [
+            {
+                "name": email,
+                "posixAccounts": [
+                    {
+                        "primary": True,
+                        "username": username,
+                        "uid": uid,
+                        "gid": gid,
+                        "homeDirectory": home_directory,
+                        "operatingSystemType": "LINUX"
+                    }
+                ],
+                "sshPublicKeys": {
+                    snakeoil_pubkey_fingerprint: {
+                        "key": snakeoil_pubkey,
+                        "expirationTimeUsec": str((time.time() + 600) * 1000000),  # 10 minutes in the future
+                        "fingerprint": snakeoil_pubkey_fingerprint
+                    }
+                }
+            }
+        ]
+    }
+
+
+class ReqHandler(BaseHTTPRequestHandler):
+    def _send_json_ok(self, data):
+        self.send_response(200)
+        self.send_header('Content-type', 'application/json')
+        self.end_headers()
+        out = json.dumps(data).encode()
+        w(out)
+        self.wfile.write(out)
+
+    def do_GET(self):
+        p = str(self.path)
+        # mockuser and mockadmin are allowed to login, both use the same snakeoil public key
+        if p == '/computeMetadata/v1/oslogin/users?username=mockuser' \
+            or p == '/computeMetadata/v1/oslogin/users?uid=1009719690':
+            self._send_json_ok(gen_mockuser(username='mockuser', uid='1009719690', gid='1009719690',
+                                            home_directory='/home/mockuser', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY))
+        elif p == '/computeMetadata/v1/oslogin/users?username=mockadmin' \
+            or p == '/computeMetadata/v1/oslogin/users?uid=1009719691':
+            self._send_json_ok(gen_mockuser(username='mockadmin', uid='1009719691', gid='1009719691',
+                                            home_directory='/home/mockadmin', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY))
+
+        # mockuser is allowed to login
+        elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockuser')}&policy=login":
+            self._send_json_ok({'success': True})
+
+        # mockadmin may also become root
+        elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=login" or p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=adminLogin":
+            self._send_json_ok({'success': True})
+        else:
+            sys.stderr.write(f"Unhandled path: {p}\n")
+            sys.stderr.flush()
+            self.send_response(501)
+            self.end_headers()
+            self.wfile.write(b'')
+
+
+if __name__ == '__main__':
+    s = HTTPServer(('0.0.0.0', 80), ReqHandler)
+    s.serve_forever()

From 706efadcb69e77f98f4f4db3bc04ea9bebe59219 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Dec 2018 15:43:29 +0100
Subject: [PATCH 2489/2793] 
 nixos/modules/virtualisation/google-compute-config.nix: remove
 google-accounts-daemon

Use googleOsLogin for login instead.
This allows setting users.mutableUsers back to false, and to strip the
security.sudo.extraConfig.

security.sudo.enable is default anyhow, so we can remove that as well.
---
 .../virtualisation/google-compute-config.nix  | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 1f8485b274f..8c7331fe4d2 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -65,33 +65,7 @@ in
   # GC has 1460 MTU
   networking.interfaces.eth0.mtu = 1460;
 
-  # allow the google-accounts-daemon to manage users
-  users.mutableUsers = true;
-  # and allow users to sudo without password
-  security.sudo.enable = true;
-  security.sudo.extraConfig = ''
-  %google-sudoers ALL=(ALL:ALL) NOPASSWD:ALL
-  '';
-
-  # NOTE: google-accounts tries to write to /etc/sudoers.d but the folder doesn't exist
-  # FIXME: not such file or directory on dynamic SSH provisioning
-  systemd.services.google-accounts-daemon = {
-    description = "Google Compute Engine Accounts Daemon";
-    # This daemon creates dynamic users
-    enable = config.users.mutableUsers;
-    after = [
-      "network.target"
-      "google-instance-setup.service"
-      "google-network-setup.service"
-    ];
-    requires = ["network.target"];
-    wantedBy = ["multi-user.target"];
-    path = with pkgs; [ shadow ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${gce}/bin/google_accounts_daemon --debug";
-    };
-  };
+  security.googleOsLogin.enable = true;
 
   systemd.services.google-clock-skew-daemon = {
     description = "Google Compute Engine Clock Skew Daemon";

From 3539f3875a8fd4f51218791fb5a7dd526f4c3ba0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 21 Dec 2018 18:01:36 +0100
Subject: [PATCH 2490/2793] release-notes/rl-1903: add security.googleOsLogin

---
 nixos/doc/manual/release-notes/rl-1903.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 7bc88769337..d99c8881727 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -43,6 +43,15 @@
      <literal>./programs/nm-applet.nix</literal>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     There is a new <varname>security.googleOsLogin</varname> module for using
+     <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link>
+     to manage SSH access to Google Compute Engine instances, which supersedes
+     the imperative and broken <literal>google-accounts-daemon</literal> used
+     in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 814319f1ae7665590e120db268e2aefe9f82458d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 29 Nov 2018 17:10:35 -0600
Subject: [PATCH 2491/2793] nixpkgs/firecracker: init at 0.12.0

This currently uses a binary-only package, since building
jailer/firecracker all on their own is somewhat complex from my
attempts.

This will later be changed into a source-only build, ideally.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../virtualization/firecracker/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/virtualization/firecracker/default.nix

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
new file mode 100644
index 00000000000..7d8772da73d
--- /dev/null
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv }:
+
+let
+  version = "0.12.0";
+  baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
+
+  fetchbin = name: sha256: fetchurl {
+    url    = "${baseurl}/v${version}/${name}-v${version}";
+    inherit sha256;
+  };
+
+  firecracker-bin = fetchbin "firecracker" "0jk9w5kagqp3w668c1x0g4yyahmy7696pm0bkhv066rrdpcqpw66";
+  jailer-bin      = fetchbin "jailer"      "1fcxzpnapnccklgbi4bis3f6c9fki2daxvzg9l7433vfqz2zbyjl";
+in
+stdenv.mkDerivation {
+  name = "firecracker-${version}";
+  inherit version;
+
+  srcs = [ firecracker-bin jailer-bin ];
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D ${firecracker-bin} $out/bin/firecracker
+    install -D ${jailer-bin}      $out/bin/jailer
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Secure, fast, minimal micro-container virtualization";
+    homepage    = http://firecracker-microvm.io;
+    license     = licenses.asl20;
+    platforms   = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dd971c8d9e..93fb364e472 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1400,6 +1400,8 @@ in
 
   fileshelter = callPackage ../servers/web-apps/fileshelter { };
 
+  firecracker = callPackage ../applications/virtualization/firecracker { };
+
   fsmon = callPackage ../tools/misc/fsmon { };
 
   fsql = callPackage ../tools/misc/fsql { };

From 26fb110d8163f3d6d4c19048945a28b5561b68a0 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 21 Dec 2018 00:01:13 -0500
Subject: [PATCH 2492/2793] pythonPackages.sh: fix tests on Python 3.7

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 37388bf4690..cbfa1583a1d 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, coverage }:
+{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "sh";
@@ -9,10 +9,15 @@ buildPythonPackage rec {
     sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
   };
 
-  checkInputs = [ coverage ];
+  postPatch = ''
+    sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py
+  '';
+
+  checkInputs = [ coverage lsof glibcLocales ];
 
   # A test needs the HOME directory to be different from $TMPDIR.
   preCheck = ''
+    export LC_ALL="en_US.UTF-8"
     HOME=$(mktemp -d)
   '';
 

From 0f25f590e8fec9402e46476b2cd2e2caba1657c1 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Fri, 21 Dec 2018 22:35:51 +0300
Subject: [PATCH 2493/2793] boohu: 0.11.1 -> 0.12.0

---
 pkgs/games/boohu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 2504e6935ab..1e70a92066d 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
 
   name = "boohu-${version}";
-  version = "0.11.1";
+  version = "0.12.0";
 
   goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
-    sha256 = "0m0ajxiyx8qwxj2zq33s5qpjr65cr33f7dpirg6b4w4y9gyhhv1g";
+    sha256 = "0nf3xj3lda8279cqvjv5c3vpsb7d2kynwwna5yrsy7gq8c9n4rh8";
   };
 
   buildFlags = "--tags ansi";

From 26869e7b31efdd046a3e63819e42413b175950fa Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 21 Dec 2018 14:41:39 -0500
Subject: [PATCH 2494/2793] pythonPackages.uritemplate_py: remove

This package is the same as uritemplate.
---
 .../python-modules/uritemplate_py/default.nix | 22 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/python-modules/uritemplate_py/default.nix

diff --git a/pkgs/development/python-modules/uritemplate_py/default.nix b/pkgs/development/python-modules/uritemplate_py/default.nix
deleted file mode 100644
index 6aff82c5711..00000000000
--- a/pkgs/development/python-modules/uritemplate_py/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "uritemplate.py";
-  version = "3.0.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e0cdeb0f55ec18e1580974e8017cd188549aacc2aba664ae756adb390b9d45b4";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/uri-templates/uritemplate-py;
-    description = "Python implementation of URI Template";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pSub ];
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f5ae962697..6b4b39a6371 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4373,8 +4373,6 @@ in {
 
   unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
 
-  uritemplate_py = callPackage ../development/python-modules/uritemplate_py { };
-
   traceback2 = callPackage ../development/python-modules/traceback2 { };
 
   linecache2 = callPackage ../development/python-modules/linecache2 { };

From 2b0699b2c4a644ac274a2b4aee58c26667224aa6 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Fri, 21 Dec 2018 23:02:12 +0300
Subject: [PATCH 2495/2793] ivan: 054 -> 055

---
 pkgs/games/ivan/default.nix |  9 +++------
 pkgs/games/ivan/new.patch   | 33 ---------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/games/ivan/new.patch

diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 6d31369a159..ad3baa9d22a 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "ivan-${version}";
-  version = "054";
+  version = "055";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "0ayhp9qvxsi5dsgjvy43i3lpdis883g1xn2b8l5xkwxcqfnvsfmq";
+    sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -18,11 +18,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = ["all"];
 
-  # To store bone and high score files in ~/.ivan of the current user
-  patches = [./new.patch];
-
   # Enable wizard mode
-  cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD" "-DFORCE_HOME_AS_STATE_DIR=ON"];
+  cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"];
 
   # Help CMake find SDL_mixer.h
   NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2";
diff --git a/pkgs/games/ivan/new.patch b/pkgs/games/ivan/new.patch
deleted file mode 100644
index d0ed866b3f3..00000000000
--- a/pkgs/games/ivan/new.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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();

From 6a6c28c40d8c03d9efffc458f401ef4a9e96cc07 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 21:18:58 +0100
Subject: [PATCH 2496/2793] pidgin-msn-pecan: do not abuse DESTDIR

---
 .../pidgin-plugins/msn-pecan/default.nix                   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
index 3b8cdd7a8cc..45214944309 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
   };
 
-  makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
-  preInstall = "mkdir -p \$out/share";
-  postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
+  makeFlags = [
+    "PURPLE_LIBDIR=${placeholder "out"}/lib"
+    "PURPLE_DATADIR=${placeholder "out"}/share/data"
+  ];
 
   buildInputs = [pidgin];
 }

From 578003af409a21c21eaddfbb2bf8339927060129 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 21:46:15 +0100
Subject: [PATCH 2497/2793] pidgin-mra: Do not abuse DESTDIR

---
 .../pidgin-plugins/pidgin-mra/default.nix             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
index 574c01c2cde..18bf89a5f2e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -15,13 +15,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin ];
 
-  preConfigure = ''
+  postPatch = ''
     sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
-    export DESTDIR=$out
-    export LIBDIR=/lib
-    export DATADIR=/share
   '';
 
+  makeFlags = [
+    "DESTDIR=/"
+    "LIBDIR=${placeholder "out"}/lib"
+    "DATADIR=${placeholder "out"}/share"
+  ];
+
   meta = {
     homepage = https://github.com/dreadatour/pidgin-mra;
     description = "Mail.ru Agent plugin for Pidgin / libpurple";

From c2617a7130dc3cd2b5b2c16b3fb700445e0402ec Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 21:54:35 +0100
Subject: [PATCH 2498/2793] purple-discord: Do not abuse DESTDIR

---
 .../pidgin-plugins/purple-discord/default.nix             | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index af58aaa0a76..ba1d64c8b92 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -14,12 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin json-glib ];
 
-  makeFlags = [
-    "DESTDIR=$(out)"
-  ];
-
-  PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2";
-  PKG_CONFIG_PURPLE_DATADIR = "/share";
+  PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
+  PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/EionRobb/purple-discord;

From 3ce8b3cb3b65ae5241b8cdbd93329c0ee34bfaf7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Dec 2018 16:04:15 -0600
Subject: [PATCH 2499/2793] mercurial: fix bash completion, correct comment

---
 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 e8b669d3d46..d395897e39d 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -49,8 +49,8 @@ in python2Packages.buildPythonApplication {
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
       chmod u+x $out/share/cgi-bin/hgweb.cgi
 
-      # install bash completion
-      install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/mercurial
+      # install bash/zsh completions
+      install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
       install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
     '';
 

From a87fd222c8a953eec7ce5e07f13f8acba9b65e8b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 21 Dec 2018 23:07:47 +0100
Subject: [PATCH 2500/2793] gitea: 1.6.0 -> 1.6.2

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.1
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.2
---
 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 3af24ffe759..683bf69b0ab 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.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p";
+    sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''

From f3b3b66cc4e45b24ac65f55d998cb3e1446dbe11 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 21 Dec 2018 23:37:43 +0100
Subject: [PATCH 2501/2793] source-sans-pro: 2.010 -> 2.040

---
 pkgs/data/fonts/source-sans-pro/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index fccb231f4ca..1561605b6ad 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchzip }:
 
 fetchzip {
-  name = "source-sans-pro-2.010";
+  name = "source-sans-pro-2.040";
 
-  url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip";
+  url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/2.040R-ro%2F1.090R-it/source-sans-pro-2.040R-ro-1.090R-it.zip";
 
   postFetch = ''
-    mkdir -p $out/share/fonts/opentype
-    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype $out/share/fonts/variable
+    unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
+    unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
+    unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
   '';
 
-  sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
+  sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp";
 
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/adobe/sourcesans;

From b3fe6fb1c61aaf67027989ea6516b2751e985c06 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 21 Dec 2018 23:42:03 +0100
Subject: [PATCH 2502/2793] solc: 0.5.1 -> 0.5.2

---
 pkgs/development/compilers/solc/default.nix                 | 6 +++---
 .../compilers/solc/patches/shared-libs-install.patch        | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 38a554a3fe3..48279fd7108 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.5.1";
-  rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981";
-  sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr";
+  version = "0.5.2";
+  rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d";
+  sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 0fb693ef421..e106c9bbb74 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -57,11 +57,10 @@ index 0bdec4b4..e876177e 100644
    target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
 --- a/libyul/CMakeLists.txt
 +++ b/libyul/CMakeLists.txt
-@@ -42,3 +42,4 @@ endif()
+@@ -43,3 +43,4 @@ endif()
  	optimiser/VarDeclPropagator.cpp
  )
--target_link_libraries(yul PUBLIC devcore)
-+target_link_libraries(yul PUBLIC evmasm devcore langutil)
+ target_link_libraries(yul PUBLIC evmasm devcore langutil)
 +install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 --- a/liblangutil/CMakeLists.txt
 +++ b/liblangutil/CMakeLists.txt

From d08254f7ffc7d5a0f87ca5fa5959b7bb6edfc5fb Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 21 Dec 2018 17:44:21 -0500
Subject: [PATCH 2503/2793] pythonPackages.sh: disable failing tests on Darwin

---
 .../development/python-modules/sh/default.nix |  4 ++
 .../sh/disable-broken-tests-darwin.patch      | 49 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index cbfa1583a1d..964386564e4 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -9,6 +9,10 @@ buildPythonPackage rec {
     sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
   };
 
+  # Disable tests that fail on Darwin
+  # Some of the failures are due to Nix using GNU coreutils
+  patches = [ ./disable-broken-tests-darwin.patch ];
+
   postPatch = ''
     sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py
   '';
diff --git a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch
new file mode 100644
index 00000000000..6488dd1ffea
--- /dev/null
+++ b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch
@@ -0,0 +1,49 @@
+From 264f2f6a04d25156bba43524a6b172d2e99c53f4 Mon Sep 17 00:00:00 2001
+From: Ben Wolsieffer <benwolsieffer@gmail.com>
+Date: Fri, 21 Dec 2018 17:39:45 -0500
+Subject: [PATCH] Disable tests that fail on OSX.
+
+Some of the failures are due to the use of GNU ls.
+---
+ test.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test.py b/test.py
+index 68ef40c..2f53360 100644
+--- a/test.py
++++ b/test.py
+@@ -352,6 +352,7 @@ exit(3)
+         self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(),
+                 "one two three")
+ 
++    @not_osx
+     def test_ok_code(self):
+         from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2
+ 
+@@ -498,6 +499,7 @@ while True:
+         self.assertEqual(out, match)
+ 
+ 
++    @not_osx
+     def test_environment(self):
+         """ tests that environments variables that we pass into sh commands
+         exist in the environment, and on the sh module """
+@@ -861,6 +863,7 @@ print(sys.argv[1])
+         self.assertTrue(now - start > sleep_time)
+ 
+ 
++    @not_osx
+     def test_background_exception(self):
+         from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2
+         p = ls("/ofawjeofj", _bg=True) # should not raise
+@@ -2036,6 +2039,7 @@ else:
+         self.assertEqual(p, "test")
+ 
+ 
++    @not_osx
+     def test_signal_exception(self):
+         from sh import SignalException_15
+ 
+-- 
+2.20.0
+

From 16316a12880b16cd86f73eb9376b4d806bbcdd44 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 21 Dec 2018 20:27:21 -0500
Subject: [PATCH 2504/2793] nixos/release-combined.nix: Adds missing aarch64
 constituents

This will block channel advancing, even if it is limited support.
---
 nixos/release-combined.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 429afe2b145..13f6e65b36d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -54,10 +54,12 @@ in rec {
         (all nixos.dummy)
         (all nixos.manual)
 
-        nixos.iso_minimal.x86_64-linux or []
-        nixos.iso_minimal.i686-linux or []
         nixos.iso_graphical.x86_64-linux or []
+        nixos.iso_minimal.aarch64-linux or []
+        nixos.iso_minimal.i686-linux or []
+        nixos.iso_minimal.x86_64-linux or []
         nixos.ova.x86_64-linux or []
+        nixos.sd_image.aarch64-linux or []
 
         #(all nixos.tests.containers)
         (all nixos.tests.containers-imperative)

From f097a16992915f778e68bb0c7c841185e0033182 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 22 Dec 2018 02:33:18 +0100
Subject: [PATCH 2505/2793] clojure: add $out/bin to wrapper PATH

without this, the `clj` command calls into system path, instead of its
own `clojure` command

cc @the-kenny
---
 pkgs/development/interpreters/clojure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 33b5551a3d6..001f7c9abee 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     substituteInPlace clojure --replace PREFIX $prefix
 
     install -Dt $out/bin clj clojure
-    wrapProgram $out/bin/clj --prefix PATH : ${binPath}
-    wrapProgram $out/bin/clojure --prefix PATH : ${binPath}
+    wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
+    wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
   '';
 
   meta = with stdenv.lib; {

From 1bfe8f189bd25de73340635d4e94673000f273ec Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 21 Dec 2018 20:28:21 -0500
Subject: [PATCH 2506/2793] nixos/release-combined.nix: makes aarch64-linux
 limited support

This is because it will not eval properly with `hydra-eval-jobs`.

```
$ ...hydra/result/bin/hydra-eval-jobs \
    --arg nixpkgs '{ outPath = ./.; revCount = 123; shortRev = "4567"; }' \
    -I "$PWD" \
    nixos/release-combined.nix
```

It fails with:

```
Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
```
---
 nixos/release-combined.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 13f6e65b36d..ea8b92e94f0 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,8 +4,8 @@
 
 { nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
-, limitedSupportedSystems ? [ "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" "aarch64-linux" ]
 }:
 
 let

From 48d08bea5a837a3b148011c4eccfc9fc5a7599f9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 22 Dec 2018 01:06:19 +0100
Subject: [PATCH 2507/2793] emacsPackages: update elpa and org generated

cc @ttuegel
---
 .../editors/emacs-modes/elpa-generated.nix    | 194 +++++++++++++-----
 .../editors/emacs-modes/org-generated.nix     |  12 +-
 2 files changed, 143 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 4d4da86d440..5674f64b30a 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -39,10 +39,10 @@
       elpaBuild {
         pname = "ada-mode";
         ename = "ada-mode";
-        version = "5.3.2";
+        version = "6.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-5.3.2.tar";
-          sha256 = "1ayp4y8q201fny2far9p2ziji968f2svr7apvfrlwnnpkk3w9lif";
+          url = "https://elpa.gnu.org/packages/ada-mode-6.0.1.tar";
+          sha256 = "12ryblyqnhqibaffibs7qq3xq9rf5d4y9dishq82pbbh9y8s17hj";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -478,10 +478,10 @@
       elpaBuild {
         pname = "company";
         ename = "company";
-        version = "0.9.7";
+        version = "0.9.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.9.7.tar";
-          sha256 = "17p61yzbgymr46y6vbz7pfvydp5hfkqckbwficwkpz0nq8gcklhs";
+          url = "https://elpa.gnu.org/packages/company-0.9.9.tar";
+          sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -711,16 +711,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "diff-hl";
         ename = "diff-hl";
-        version = "1.8.4";
+        version = "1.8.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar";
-          sha256 = "0axhidc3cym7a2x4rpxf4745qss9s9ajyg4s9h5b4zn7v7fyp71n";
+          url = "https://elpa.gnu.org/packages/diff-hl-1.8.5.tar";
+          sha256 = "1vxc7z7c2qs0mx7l5sa4sybi5qbzv0s79flj74p1ynw8dl3qxg3d";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/diff-hl.html";
           license = lib.licenses.free;
@@ -835,10 +835,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.6";
+        version = "0.6.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.6.tar";
-          sha256 = "1zj8jvq5l4wlk4734i3isxi4barpivarq2f9kqzkfia7mcspxav8";
+          url = "https://elpa.gnu.org/packages/ebdb-0.6.2.tar";
+          sha256 = "1b37962mvm80vk5sdk9kfvvxsxn83z5z6zvm20m9997ggl5dv4dz";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -891,16 +891,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
+    eglot = callPackage ({ elpaBuild
+                         , emacs
+                         , fetchurl
+                         , flymake ? null
+                         , jsonrpc
+                         , lib }:
       elpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "1.1";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eglot-1.1.tar";
-          sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y";
+          url = "https://elpa.gnu.org/packages/eglot-1.3.tar";
+          sha256 = "0hndqabxvrq4ak5kx2xlds5pkayi2bfd1f1xk8aidzk5i70f7yry";
         };
-        packageRequires = [ emacs jsonrpc ];
+        packageRequires = [ emacs flymake jsonrpc ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/eglot.html";
           license = lib.licenses.free;
@@ -915,10 +920,10 @@
       elpaBuild {
         pname = "el-search";
         ename = "el-search";
-        version = "1.7.15";
+        version = "1.8.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.7.15.tar";
-          sha256 = "000z8vllz53vmfblsrxjm2nc4h9lcyxw8xxqfxxyl99zhfiikjai";
+          url = "https://elpa.gnu.org/packages/el-search-1.8.7.tar";
+          sha256 = "0jlalcz8hppra2chmppd6b2g5dz8w6yscqylkx28pd7wy6aadx1r";
         };
         packageRequires = [ cl-print emacs stream ];
         meta = {
@@ -1032,10 +1037,10 @@
       elpaBuild {
         pname = "exwm";
         ename = "exwm";
-        version = "0.20";
+        version = "0.21";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.20.tar";
-          sha256 = "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04";
+          url = "https://elpa.gnu.org/packages/exwm-0.21.tar";
+          sha256 = "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1088,6 +1093,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "flymake";
+        ename = "flymake";
+        version = "1.0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/flymake-1.0.3.el";
+          sha256 = "1algny2zhcl4vc7kp5czcqvxzpgqfjnz2rnkv26r0ylxig3s98v7";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/flymake.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "fountain-mode";
@@ -1197,10 +1217,10 @@
       elpaBuild {
         pname = "gnorb";
         ename = "gnorb";
-        version = "1.6.0";
+        version = "1.6.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.6.0.tar";
-          sha256 = "0nssrnrf083mw7kllp0hkxdkklvildzmslcs1r3zf2hnl1ggfs8y";
+          url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar";
+          sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1232,10 +1252,10 @@
       elpaBuild {
         pname = "gnus-mock";
         ename = "gnus-mock";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnus-mock-0.3.0.tar";
-          sha256 = "02z3f8njwv480fff57dbrf7nhmwbgm4apzicnzwmip5j4a6w5q0n";
+          url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar";
+          sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s";
         };
         packageRequires = [];
         meta = {
@@ -1243,6 +1263,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "gpastel";
+        ename = "gpastel";
+        version = "0.3.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/gpastel-0.3.0.el";
+          sha256 = "0426y55f7mbfbyjhl2bn0c2cn57jd4d8xvzri2pbqakff8ij470a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gpastel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     heap = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "heap";
@@ -1459,10 +1494,10 @@
       elpaBuild {
         pname = "jsonrpc";
         ename = "jsonrpc";
-        version = "1.0.6";
+        version = "1.0.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.6.el";
-          sha256 = "13a19smz8cksv6fgcyxb111csvagkp07z5nl4imyp5b23asgl70p";
+          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.7.el";
+          sha256 = "19z35gjphl4mlgpznfhlccgipnmbb3c1dvax48f4hw8qwksfcac1";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1858,10 +1893,10 @@
       elpaBuild {
         pname = "nhexl-mode";
         ename = "nhexl-mode";
-        version = "1.0";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-1.0.el";
-          sha256 = "1bf0jfim41m08ac4p4zxjj6qqw7f86gwiwyvfjg68n2nzbzgz1i9";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el";
+          sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1989,6 +2024,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:
+      elpaBuild {
+        pname = "org-edna";
+        ename = "org-edna";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/org-edna-1.0.1.tar";
+          sha256 = "0xzyzx3pq1q6d66qcqx38pgxzn160y9yrzpy0ka8ap5xsm7ngn7m";
+        };
+        packageRequires = [ emacs org seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-edna.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "orgalist";
@@ -2113,10 +2163,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "0.3.0";
+        version = "0.4.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
-          sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k";
+          url = "https://elpa.gnu.org/packages/posframe-0.4.2.el";
+          sha256 = "1h8vvxvsg41vc1nnglqjs2q0k1yzfsn72skga9s76qa3zxmx6kds";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2522,10 +2572,10 @@
       elpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "2.0";
+        version = "3.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ssh-deploy-2.0.tar";
-          sha256 = "0mrgnandnqk25bx3x2a7hdw7pmjiq24w2lad7l2xqaqpwb8r6wgj";
+          url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar";
+          sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2552,10 +2602,10 @@
       elpaBuild {
         pname = "svg";
         ename = "svg";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-0.1.el";
-          sha256 = "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5";
+          url = "https://elpa.gnu.org/packages/svg-0.2.el";
+          sha256 = "14yfi27v3zdzh1chcjiq4l63iwh0vd99wv1z4w7agr33540jybc5";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2578,6 +2628,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "system-packages";
+        ename = "system-packages";
+        version = "1.0.10";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/system-packages-1.0.10.tar";
+          sha256 = "1vwf2j0fxrsqmrgc7x5nkkg0vlhwgxppc4w7kb5is6dgrssskpb5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/system-packages.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
       elpaBuild {
         pname = "tNFA";
@@ -2767,6 +2832,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "vcl-mode";
+        ename = "vcl-mode";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el";
+          sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
       elpaBuild {
         pname = "vdiff";
@@ -2932,16 +3012,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
       elpaBuild {
         pname = "wisi";
         ename = "wisi";
-        version = "1.1.6";
+        version = "2.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar";
-          sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk";
+          url = "https://elpa.gnu.org/packages/wisi-2.0.1.tar";
+          sha256 = "1h0g6y33jrafcabgyi7j700hpv4p56v84c2mlqb334k1g9rq3709";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib emacs seq ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/wisi.html";
           license = lib.licenses.free;
@@ -2966,10 +3046,10 @@
       elpaBuild {
         pname = "xclip";
         ename = "xclip";
-        version = "1.5";
+        version = "1.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xclip-1.5.el";
-          sha256 = "1fyqyi0672igjn53xlaj8hzbymkw08pk6wj58ndbrnm410g0h0i9";
+          url = "https://elpa.gnu.org/packages/xclip-1.7.el";
+          sha256 = "0jpy3zzbyb16vqa9l6m45crzlypwvscvs76h8lci7kvp91kq954r";
         };
         packageRequires = [];
         meta = {
@@ -3044,10 +3124,10 @@
       elpaBuild {
         pname = "zones";
         ename = "zones";
-        version = "2018.11.13";
+        version = "2018.11.21";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/zones-2018.11.13.el";
-          sha256 = "0716m9s5qjp5w3gdlx0p53qrfylw6mhdmic88qmsndmhkijsrax4";
+          url = "https://elpa.gnu.org/packages/zones-2018.11.21.el";
+          sha256 = "0s68mnynjd08gyga7xdnb0zy3irsxl1jryidpcrkzg821vfrk11i";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 479fb91acfe..d97b0729528 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 = "20181119";
+        version = "20181217";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20181119.tar";
-          sha256 = "0li6mx0kv70js3mlw7wxk1yi8kgc3nxnb87kdb7jy68xh4lsila7";
+          url = "http://orgmode.org/elpa/org-20181217.tar";
+          sha256 = "0j301z0429dnk1d3bn7524y848vp9il41sxpm9z9hs7gpzfdcw28";
         };
         packageRequires = [];
         meta = {
@@ -19,10 +19,10 @@
       elpaBuild {
         pname = "org-plus-contrib";
         ename = "org-plus-contrib";
-        version = "20181119";
+        version = "20181217";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20181119.tar";
-          sha256 = "0dz0vn2xyidifrwrd604yknyq843i31jcc8qgsi6wib29rh7zzpa";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20181217.tar";
+          sha256 = "1p7v9246zxkp68kc63550x3w7pmhx1drgj20wmddhvs0bqd3k3ap";
         };
         packageRequires = [];
         meta = {

From 12e57cbb61afeb27b90b32d4de5ea5960d7246f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 22 Dec 2018 04:29:52 +0100
Subject: [PATCH 2508/2793] gitea: fix version in app

---
 pkgs/applications/version-management/gitea/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 683bf69b0ab..eca07b81bac 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -33,7 +33,12 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildFlags = optionalString sqliteSupport "-tags sqlite";
+  buildFlags = optional sqliteSupport "-tags sqlite";
+  buildFlagsArray = ''
+    -ldflags=
+      -X=main.Version=${version}
+      ${optionalString sqliteSupport "-X=main.Tags=sqlite"}
+  '';
 
   outputs = [ "bin" "out" "data" ];
 

From fb60aedd7cd4e9bdc1f1ca411c7b59697398f846 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Dec 2018 22:47:00 -0600
Subject: [PATCH 2509/2793] nlohmann_json: 3.4.0 -> 3.5.0

https://github.com/nlohmann/json/releases/tag/v3.5.0
---
 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 d57461853d3..eb737c0757d 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.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym";
+    sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji";
   };
 
   nativeBuildInputs = [ cmake ];

From 58452342fd49a959c0abe8310259cd3d7209e99a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Dec 2018 21:58:48 -0800
Subject: [PATCH 2510/2793] zim: 0.68 -> 0.69

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

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 26a141dc506..3a2569bd93c 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.68";
+  version = "0.69";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr";
+    sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];

From 94af8ebde202bf2f0117cf4d5a1d78f75032448a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 21 Dec 2018 22:19:40 -0500
Subject: [PATCH 2511/2793] nixos/displayManager: only install wayland sessions
 if they exist in extraSessionFilePackages

Not everyone is using wayland just yet.
---
 nixos/modules/services/x11/display-managers/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 035029150c8..047321bd949 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -194,9 +194,12 @@ let
         ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
       '') cfg.displayManager.extraSessionFilePackages}
 
-      mkdir -p "$out/share/wayland-sessions"
+      
       ${concatMapStrings (pkg: ''
-        ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
+        if test -d ${pkg}/share/wayland-sessions; then
+          mkdir -p "$out/share/wayland-sessions"
+          ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
+        fi
       '') cfg.displayManager.extraSessionFilePackages}
     '';
 

From 88fbb325226d1ce2a31fb3ea0be9d06418def3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Dec 2018 09:09:17 +0100
Subject: [PATCH 2512/2793] pythonPackages.thumbor: 6.5.2 -> 6.6.0

now compatible with our pillow
---
 pkgs/development/python-modules/thumbor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 27e90514b72..0f10692685b 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "thumbor";
-  version = "6.5.2";
+  version = "6.6.0";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
@@ -16,14 +16,14 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1ys5ymwbvgh2ir85g9nyrzzf8vgi16j6pzzi53b0rgjx0kwlmnxg";
+    sha256 = "0m4q40fcha1aydyr1khjhnb08cdfma67yxgyhsvwar5a6sl0906i";
   };
 
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
-    substituteInPlace "setup.py" \
-      --replace "piexif>=1.0.13,<1.1.0" "piexif>=1.0.13"
+    sed -i setup.py \
+        -e 's/piexif[^"]*/piexif/;s/Pillow[^"]*/Pillow/'
     substituteInPlace "tests/test_utils.py" \
       --replace "/bin/ls" "${coreutils}/bin/ls"
     substituteInPlace "tests/detectors/test_face_detector.py" \

From eaf136b6b8ea5eff2e33dddcf746d13001921508 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 14 Dec 2018 21:34:43 +0300
Subject: [PATCH 2513/2793] unit: 1.6 -> 1.7

---
 pkgs/servers/http/unit/default.nix | 74 +++++++++++++++---------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 38212885541..a3948bb6908 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl
-, which
-, python
-, php71
-, php72
-, php73
-, perl
-, perldevel
-, ruby_2_3
-, ruby_2_4
-, ruby
+{ stdenv, fetchFromGitHub, which
+, withPython ? true, python
+, withPHP71 ? false, php71
+, withPHP72 ? true, php72
+, withPHP73 ? false, php73
+, withPerl ? true, perl
+, withPerldevel ? false, perldevel
+, withRuby_2_3 ? false, ruby_2_3
+, withRuby_2_4 ? false, ruby_2_4
+, withRuby ? true, ruby
 , withSSL ? true, openssl ? null
 , withIPv6 ? true
 , withDebug ? false
@@ -17,26 +16,29 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   name = "unit-${version}";
 
-  src = fetchurl {
-    url = "https://unit.nginx.org/download/${name}.tar.gz";
-    sha256 = "0lws5xpzkcmv0gc7vi8pgnymin02dq4gw0zb41jfzq0vbljxxl14";
+  src = fetchFromGitHub {
+    owner = "nginx";
+    repo = "unit";
+    rev = "${version}";
+    sha256 = "1klwricr0mxhw5wka35vnl919821vcvaf5w3ixvkbxaisml19qq4";
   };
 
-  buildInputs = [
-    which
-    python
-    php71
-    php72
-    php73
-    perl
-    perldevel
-    ruby_2_3
-    ruby_2_4
-    ruby
-  ] ++ optional withSSL openssl;
+  nativeBuildInputs = [ which ];
+
+  buildInputs = [ ]
+    ++ optional withPython python
+    ++ optional withPHP71 php71
+    ++ optional withPHP72 php72
+    ++ optional withPHP73 php73
+    ++ optional withPerl perl
+    ++ optional withPerldevel perldevel
+    ++ optional withRuby_2_3 ruby_2_3
+    ++ optional withRuby_2_4 ruby_2_4
+    ++ optional withRuby ruby
+    ++ optional withSSL openssl;
 
   configureFlags = [
     "--control=unix:/run/control.unit.sock"
@@ -46,15 +48,15 @@ stdenv.mkDerivation rec {
     ++ optional withDebug   [ "--debug" ];
 
   postConfigure = ''
-    ./configure python  --module=python    --config=${python}/bin/python-config  --lib-path=${python}/lib
-    ./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib
-    ./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib
-    ./configure php     --module=php73     --config=${php73.dev}/bin/php-config  --lib-path=${php73}/lib
-    ./configure perl    --module=perl      --perl=${perl}/bin/perl
-    ./configure perl    --module=perl529   --perl=${perldevel}/bin/perl
-    ./configure ruby    --module=ruby23    --ruby=${ruby_2_3}/bin/ruby
-    ./configure ruby    --module=ruby24    --ruby=${ruby_2_4}/bin/ruby
-    ./configure ruby    --module=ruby      --ruby=${ruby}/bin/ruby
+    ${optionalString withPython     "./configure python  --module=python    --config=${python}/bin/python-config  --lib-path=${python}/lib"}
+    ${optionalString withPHP71      "./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib"}
+    ${optionalString withPHP72      "./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib"}
+    ${optionalString withPHP73      "./configure php     --module=php73     --config=${php73.dev}/bin/php-config  --lib-path=${php73}/lib"}
+    ${optionalString withPerl       "./configure perl    --module=perl      --perl=${perl}/bin/perl"}
+    ${optionalString withPerldevel  "./configure perl    --module=perl529   --perl=${perldevel}/bin/perl"}
+    ${optionalString withRuby_2_3   "./configure ruby    --module=ruby23    --ruby=${ruby_2_3}/bin/ruby"}
+    ${optionalString withRuby_2_4   "./configure ruby    --module=ruby24    --ruby=${ruby_2_4}/bin/ruby"}
+    ${optionalString withRuby       "./configure ruby    --module=ruby      --ruby=${ruby}/bin/ruby"}
   '';
 
   meta = {

From 76c2f7129e497f0e4081c4bb369a255b7627c6ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 01:12:34 -0800
Subject: [PATCH 2514/2793] wireguard-tools: 0.0.20181119 -> 0.0.20181218

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 51e23e5dee1..07b75737a35 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.20181119";
+  version = "0.0.20181218";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1cxws2h64xvg6idb6jb6rdvn9wgmhdvq8s2lzqjbmds7sj6n09wa";
+    sha256 = "15lch0s4za7q5mr0dzdzwfsr7pr2i9gjygmpdnidwlx4z72vsajj";
   };
 
   sourceRoot = "source/src/tools";

From 2088ae10a312bd53cb6343e391dcf7368732c3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 22 Dec 2018 09:15:51 +0000
Subject: [PATCH 2515/2793] jre: use adoptopenjdk-jre-bin on aarch

---
 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 9494790f066..a4cbee31b9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7158,7 +7158,7 @@ in
           ((openjdk11.override { minimal = true; }) // {}));
 
   jdk = jdk8;
-  jre = jre8;
+  jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8;
   jre_headless = jre8_headless;
 
   inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8;

From 12dcd3409702d7782f92dbc2d268092261911a32 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 22 Dec 2018 09:53:35 +0000
Subject: [PATCH 2516/2793] pythonPackages.manhole: disable tests (#52666)

`python: process-tests: 1.2.1 -> 2.0.0` included the change
https://github.com/ionelmc/python-process-tests/commit/e6d4f4db27f61ebeb9dc451c12b8fb846d0f3728
which removed setup_coverage and thus broke manhole's tests.
---
 pkgs/development/python-modules/manhole/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix
index 8c8c6bf3501..1dc90e66683 100644
--- a/pkgs/development/python-modules/manhole/default.nix
+++ b/pkgs/development/python-modules/manhole/default.nix
@@ -19,7 +19,10 @@ buildPythonPackage rec {
   #
   # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket
   # on the x86_64-darwin builder.
-  doCheck = stdenv.isLinux;
+  #
+  # TODO: change this back to `doCheck = stdenv.isLinux` after
+  # https://github.com/ionelmc/python-manhole/issues/54 is fixed
+  doCheck = false;
 
   checkInputs = [ pytest requests process-tests ];
   checkPhase = ''

From 76e7572a1f1c2ccd4840d16af45528789b4d1ee6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 02:09:02 -0800
Subject: [PATCH 2517/2793] vault: 1.0.0 -> 1.0.1 (#52664)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vault/versions
---
 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 ac79fc8d464..4d646cfd332 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if";
+    sha256 = "17gyl8hb72gwb3vy7nrp3cj9lrj0zgb8xja0bgwqpv511hg1qwwf";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From 688afbd7df70d27df8a3510d00cd291f78f2bfb3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 02:10:47 -0800
Subject: [PATCH 2518/2793] whipper: 0.7.2 -> 0.7.3 (#52662)

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

diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 8b93175ce35..07ab9b55e5b 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -3,13 +3,13 @@
 
 python2.pkgs.buildPythonApplication rec {
   name = "whipper-${version}";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "whipper-team";
     repo = "whipper";
     rev = "v${version}";
-    sha256 = "17cn11c6c62pfhhp6vcslxpanb0czh2xbxq1g6wd7bpmgw38yd8v";
+    sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr";
   };
 
   pythonPath = with python2.pkgs; [

From c3d181fa349d80da752cab7a6540fef5d6897482 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 02:18:11 -0800
Subject: [PATCH 2519/2793] wt: 4.0.4 -> 4.0.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/wt/versions
---
 pkgs/development/libraries/wt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index aec64c9c33c..e1c339d1e0f 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -48,7 +48,7 @@ in {
   };
 
   wt4 = generic {
-    version = "4.0.4";
-    sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w";
+    version = "4.0.5";
+    sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv";
   };
 }

From f9d5ac9bff897b262c0e4158e8e8f19cef53a1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 22 Dec 2018 12:00:06 +0100
Subject: [PATCH 2520/2793] home-assistant: 0.84.3 -> 0.84.6

---
 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 b34355c88b6..fbea4ceff6a 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.84.3";
+  version = "0.84.6";
   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 7ed11a22e7d..049a1d5c293 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -85,7 +85,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.84.3";
+  hassVersion = "0.84.6";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0b7634niqqmcckhqb7vx1wimibfs4v042bwja7am90jy0hzafbji";
+    sha256 = "142hxsvhb9lh77h54975vkvl1fx5lslrydq1vbqyy51dy85ms8lc";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 0e1b327a264..74145d87589 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 = "20181211.1";
+  version = "20181211.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3bb994e8e121d146fedc113b35ced0c007169fd70b489e9344df082f934dbdf";
+    sha256 = "75dd525922efc1f9a6a4a42c720764a539b18636769e2febc33bb68967c7ebff";
   };
 
   propagatedBuildInputs = [ user-agents ];

From d4021ad9e4951aaae779e26f1eec0197ea1036bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 03:33:41 -0800
Subject: [PATCH 2521/2793] verilator: 4.006 -> 4.008

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 ab9f6af85d3..fdee3e013de 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.006";
+  version = "4.008";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "0vnybpknf4llw3fw800ffiqj89ilbq06j8b2x4syj2gsrlnjvp1i";
+    sha256 = "1b0cj7bb2a3hrfaziix7p9idcpbygapdl0nrfr3pbdxxsgnzdknm";
   };
 
   enableParallelBuilding = true;

From c1b7c345def15ccbd6ab06f86a129a681e6eb669 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 04:18:23 -0800
Subject: [PATCH 2522/2793] syncplay: 1.6.0 -> 1.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/syncplay/versions
---
 pkgs/applications/networking/syncplay/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 5861513e7bd..b8c905345bd 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "syncplay-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   format = "other";
 
   src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz;
-    sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5";
+    url = https://github.com/Syncplay/syncplay/archive/v1.6.1.tar.gz;
+    sha256 = "15rhbc3r7l012d330hb64p8bhcpy4ydy89iv34c34a1r554b8k97";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyside twisted ];

From 8f369b93023e33c2752b9e3cb8c311da49873c9b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 05:05:27 -0800
Subject: [PATCH 2523/2793] src: 1.18 -> 1.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/src/versions
---
 pkgs/applications/version-management/src/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 4a4879600ae..1054a2c06cf 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "src-${version}";
-  version = "1.18";
+  version = "1.22";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c";
+    sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils";
   };
 
   buildInputs = [ python rcs git makeWrapper ];

From 1d04be420cfe8039667fd95cfc7f084a1d2dab05 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 22 Dec 2018 14:10:09 +0100
Subject: [PATCH 2524/2793] zim: mark as broken for darwin

Has been broken for about a year already.
---
 pkgs/applications/office/zim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 3a2569bd93c..a3e2bdd4d1e 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec {
     homepage = http://zim-wiki.org;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ pSub ];
+    broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790
   };
 }

From dd3f755cf4e864bbf60613d5ca98d33ffbcbf9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 8 Dec 2018 10:18:26 +0100
Subject: [PATCH 2525/2793] vdr: initial at 2.4.0 and nixos module

used same plugin mechanism as kodi does
---
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/hardware/vdr.nix |  67 +++++
 pkgs/applications/video/vdr/default.nix |  78 ++++++
 pkgs/applications/video/vdr/plugins.nix | 318 ++++++++++++++++++++++++
 pkgs/applications/video/vdr/wrapper.nix |  21 ++
 pkgs/top-level/all-packages.nix         |   4 +
 6 files changed, 489 insertions(+)
 create mode 100644 nixos/modules/services/hardware/vdr.nix
 create mode 100644 pkgs/applications/video/vdr/default.nix
 create mode 100644 pkgs/applications/video/vdr/plugins.nix
 create mode 100644 pkgs/applications/video/vdr/wrapper.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e2b2666888c..f879c9bf855 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -299,6 +299,7 @@
   ./services/hardware/usbmuxd.nix
   ./services/hardware/thermald.nix
   ./services/hardware/undervolt.nix
+  ./services/hardware/vdr.nix
   ./services/logging/SystemdJournal2Gelf.nix
   ./services/logging/awstats.nix
   ./services/logging/fluentd.nix
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
new file mode 100644
index 00000000000..39a656ec7e4
--- /dev/null
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.vdr;
+  libDir = "/var/lib/vdr";
+in {
+
+  ###### interface
+
+  options = {
+
+    services.vdr = {
+      enable = mkEnableOption "enable VDR. Please put config into ${libDir}.";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.vdr;
+        defaultText = "pkgs.vdr";
+        example = literalExample "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }";
+        description = "Package to use.";
+      };
+
+      videoDir = mkOption {
+        type = types.path;
+        default = "/srv/vdr/video";
+        description = "Recording directory (must exist)";
+      };
+
+      extraArguments = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Additional command line arguments to pass to VDR.";
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.vdr = {
+      description = "VDR";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/vdr \
+            --video="${cfg.videoDir}" \
+            --config="${libDir}" \
+            ${escapeShellArgs cfg.extraArguments}
+        '';
+        User = "vdr";
+        CacheDirectory = "vdr";
+        StateDirectory = "vdr";
+        Restart = "on-failure";
+      };
+    };
+
+    users.users.vdr = {
+      group = "vdr";
+      home = libDir;
+    };
+
+    users.groups.vdr = {};
+  };
+}
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
new file mode 100644
index 00000000000..0ad0b04e7e4
--- /dev/null
+++ b/pkgs/applications/video/vdr/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
+, gettext, ncurses, systemd, perl
+, enableSystemd ? true
+, enableBidi ? true
+}:
+let
+
+  version = "2.4.0";
+
+  name = "vdr-${version}";
+
+  mkPlugin = name: stdenv.mkDerivation {
+    name = "vdr-${name}-${version}";
+    inherit (vdr) src;
+    buildInputs = [ vdr ];
+    preConfigure = "cd PLUGINS/src/${name}";
+    installFlags = [ "DESTDIR=$(out)" ];
+  };
+
+  vdr = stdenv.mkDerivation {
+
+    inherit name;
+
+    src = fetchurl {
+      url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2";
+      sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk";
+    };
+
+    enableParallelBuilding = true;
+
+    postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
+
+    buildInputs = [ fontconfig libjpeg libcap freetype ]
+    ++ stdenv.lib.optional enableSystemd systemd
+    ++ stdenv.lib.optional enableBidi fribidi;
+
+    buildFlags = [ "vdr" "i18n" ]
+    ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1"
+    ++ stdenv.lib.optional enableBidi "BIDI=1";
+
+    nativeBuildInputs = [ perl ];
+
+    # plugins uses the same build environment as vdr
+    propagatedNativeBuildInputs = [ pkgconfig gettext ];
+
+    installFlags = [
+      "DESTDIR=$(out)"
+      "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix
+    ];
+
+    installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n"
+      "install-includes" ];
+
+    postInstall = ''
+      mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin
+      mkdir -p $out/share/vdr/conf
+      cp *.conf $out/share/vdr/conf
+      '';
+
+    outputs = [ "out" "dev" "man" ];
+
+    meta = with stdenv.lib; {
+      homepage = http://www.tvdr.de/;
+      description = "Video Disc Recorder";
+      maintainers = [ maintainers.ck3d ];
+      platforms = [ "i686-linux" "x86_64-linux" ];
+      license = licenses.gpl2;
+    };
+
+  };
+in vdr // {
+  plugins = {
+    skincurses = (mkPlugin "skincurses").overrideAttrs(
+    oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; });
+  } // (stdenv.lib.genAttrs [
+    "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
+  ] mkPlugin);
+}
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
new file mode 100644
index 00000000000..0e543390c4b
--- /dev/null
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -0,0 +1,318 @@
+{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub
+, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
+, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }:
+{
+  femon = stdenv.mkDerivation rec {
+
+    name = "vdr-femon-2.4.0";
+
+    buildInputs = [ vdr ];
+
+    src = fetchurl {
+      url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz";
+      sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp";
+    };
+
+    postPatch = "substituteInPlace Makefile --replace /bin/true true";
+
+    makeFlags = [ "DESTDIR=$(out)" ];
+
+    meta = with stdenv.lib; {
+      homepage = http://www.saunalahti.fi/~rahrenbe/vdr/femon/;
+      description = "DVB Frontend Status Monitor plugin for VDR";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+
+  };
+
+  vaapidevice = stdenv.mkDerivation {
+
+    name = "vdr-vaapidevice-0.7.0";
+
+    buildInputs = [
+      vdr libxcb xcbutilwm ffmpeg
+      alsaLib
+      libvdpau # vdpau
+      libva # va-api
+    ] ++ (with xorg; [ libxcb libX11 ]);
+
+    makeFlags = [ "DESTDIR=$(out)" ];
+
+    postPatch = ''
+      substituteInPlace softhddev.c --replace /usr/bin/X ${xorgserver}/bin/X
+    '';
+
+    src = fetchFromGitHub {
+      owner = "pesintta";
+      repo = "vdr-plugin-vaapidevice";
+      sha256 = "072y61fpkh3i2dragg0nsd4g3malgwxkwpdrb1ykdljyzf52s5hs";
+      rev = "c99afc23a53e6d91f9afaa99af59b30e68e626a8";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/pesintta/vdr-plugin-vaapidevice;
+      description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+
+  };
+
+
+  markad = stdenv.mkDerivation rec {
+    name = "vdr-markad-2017-03-13";
+
+    src = fetchgit {
+      url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
+      sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4";
+      rev = "ea2e182ec798375f3830f8b794e7408576f139ad";
+    };
+
+    buildInputs = [ vdr libav ];
+
+    postPatch = ''
+      substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)'
+
+      substituteInPlace plugin/markad.cpp \
+        --replace "/usr/bin" "$out/bin" \
+        --replace "/var/lib/markad" "$out/var/lib/markad"
+
+      substituteInPlace command/markad-standalone.cpp \
+        --replace "/var/lib/markad" "$out/var/lib/markad"
+    '';
+
+    preBuild = ''
+      mkdir -p $out/lib/vdr
+    '';
+
+    buildFlags = [
+      "DESTDIR=$(out)"
+      "LIBDIR=$(out)/lib/vdr"
+      "VDRDIR=${vdr.dev}/include/vdr"
+      "LOCALEDIR=$(DESTDIR)/share/locale"
+    ];
+
+    installFlags = buildFlags;
+
+    meta = with stdenv.lib; {
+      homepage = https://projects.vdr-developer.org/projects/plg-markad;
+      description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung.";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+
+  };
+
+  epgsearch = stdenv.mkDerivation rec {
+    pname = "vdr-epgsearch";
+    version = "2.4.0";
+
+    src = fetchurl {
+      url = "https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${version}.tar.bz2";
+      sha256 = "0xfgn17vicyjwdf0rbkrik4q16mnfi305d4wmi8f0qk825pa0z3y";
+    };
+
+    postPatch = ''
+      for f in *.sh; do
+        patchShebangs "$f"
+      done
+    '';
+
+    nativeBuildInputs = [
+      perl # for pod2man and pos2html
+      utillinux
+      groff
+    ];
+
+    buildInputs = [
+      vdr
+      pcre
+    ];
+
+    buildFlags = [
+      "SENDMAIL="
+      "REGEXLIB=pcre"
+    ];
+
+    installFlags = [
+      "DESTDIR=$(out)"
+    ];
+
+    outputs = [ "out" "man" ];
+
+    meta = with stdenv.lib; {
+      homepage = http://winni.vdr-developer.org/epgsearch;
+      description = "Searchtimer and replacement of the VDR program menu";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+
+  };
+
+  vnsiserver = let
+    name = "vnsiserver";
+    version = "1.8.0";
+  in stdenv.mkDerivation {
+    name = "vdr-${name}-${version}";
+
+    buildInputs = [ vdr ];
+
+    installFlags = [ "DESTDIR=$(out)" ];
+
+    src = fetchFromGitHub {
+      repo = "vdr-plugin-${name}";
+      owner = "FernetMenta";
+      rev = "v${version}";
+      sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/FernetMenta/vdr-plugin-vnsiserver;
+      description = "VDR plugin to handle KODI clients.";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+
+  };
+
+  text2skin = stdenv.mkDerivation rec {
+    name = "vdr-text2skin-1.3.4-20170702";
+
+    src = fetchgit {
+      url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
+      sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
+      rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad";
+    };
+
+    buildInputs = [ vdr graphicsmagick ];
+
+    buildFlags = [
+      "DESTDIR=$(out)"
+      "IMAGELIB=graphicsmagic"
+      "VDRDIR=${vdr.dev}/include/vdr"
+      "LOCALEDIR=$(DESTDIR)/share/locale"
+      "LIBDIR=$(DESTDIR)/lib/vdr"
+    ];
+
+    preBuild = ''
+      mkdir -p $out/lib/vdr
+    '';
+
+    installPhase = ":";
+
+    meta = with stdenv.lib; {
+      homepage = https://projects.vdr-developer.org/projects/plg-text2skin;
+      description = "VDR Text2Skin Plugin";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+  };
+
+  fritzbox = let
+    libconvpp = stdenv.mkDerivation {
+      name = "jowi24-libconv++-20130216";
+      propagatedBuildInputs = [ libiconv ];
+      CXXFLAGS = "-std=gnu++11 -Os";
+      src = fetchFromGitHub {
+        owner = "jowi24";
+        repo = "libconvpp";
+        rev = "90769b2216bc66c5ea5e41a929236c20d367c63b";
+        sha256 = "0bf0dwxrzd42l84p8nxcsjdk1gvzlhad93nsbn97z6kr61n4cr33";
+      };
+      installPhase = ''
+        mkdir -p $out/lib $out/include/libconv++
+        cp source.a $out/lib/libconv++.a
+        cp *.h $out/include/libconv++
+      '';
+    };
+
+    liblogpp = stdenv.mkDerivation {
+      name = "jowi24-liblogpp-20130216";
+      CXXFLAGS = "-std=gnu++11 -Os";
+      src = fetchFromGitHub {
+        owner = "jowi24";
+        repo = "liblogpp";
+        rev = "eee4046d2ae440974bcc8ceec00b069f0a2c62b9";
+        sha256 = "01aqvwmwh5kk3mncqpim8llwha9gj5qq0c4cvqfn4h8wqi3d9l3p";
+      };
+      installPhase = ''
+        mkdir -p $out/lib $out/include/liblog++
+        cp source.a $out/lib/liblog++.a
+        cp *.h $out/include/liblog++
+      '';
+    };
+
+    libnetpp = stdenv.mkDerivation {
+      name = "jowi24-libnet++-20180628";
+      CXXFLAGS = "-std=gnu++11 -Os";
+      src = fetchFromGitHub {
+        owner = "jowi24";
+        repo = "libnetpp";
+        rev = "212847f0efaeffee8422059b8e202d844174aaf3";
+        sha256 = "0vjl6ld6aj25rzxm26yjv3h2gy7gp7qnbinpw6sf1shg2xim9x0b";
+      };
+      installPhase = ''
+        mkdir -p $out/lib $out/include/libnet++
+        cp source.a $out/lib/libnet++.a
+        cp *.h $out/include/libnet++
+      '';
+      buildInputs = [ boost liblogpp libconvpp ];
+    };
+
+    libfritzpp = stdenv.mkDerivation {
+      name = "jowi24-libfritzpp-20131201";
+      CXXFLAGS = "-std=gnu++11 -Os";
+      src = fetchFromGitHub {
+        owner = "jowi24";
+        repo = "libfritzpp";
+        rev = "ca19013c9451cbac7a90155b486ea9959ced0f67";
+        sha256 = "0jk93zm3qzl9z96gfs6xl1c8ip8lckgbzibf7jay7dbgkg9kyjfg";
+      };
+      installPhase = ''
+        mkdir -p $out/lib $out/include/libfritz++
+        cp source.a $out/lib/libfritz++.a
+        cp *.h $out/include/libfritz++
+      '';
+      propagatedBuildInputs = [ libgcrypt ];
+      buildInputs = [ boost liblogpp libconvpp libnetpp ];
+    };
+
+  in stdenv.mkDerivation rec {
+    pname = "vdr-fritzbox";
+
+    version = "1.5.3";
+
+    src = fetchFromGitHub {
+      owner = "jowi24";
+      repo = "vdr-fritz";
+      rev = version;
+      sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8";
+    };
+
+    postUnpack = ''
+      cp ${libfritzpp}/lib/* $sourceRoot/libfritz++
+      cp ${liblogpp}/lib/* $sourceRoot/liblog++
+      cp ${libnetpp}/lib/* $sourceRoot/libnet++
+      cp ${libconvpp}/lib/* $sourceRoot/libconv++
+    '';
+
+    buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ];
+
+    installFlags = [ "DESTDIR=$(out)" ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/jowi24/vdr-fritz;
+      description = "A plugin for VDR to access AVMs Fritz Box routers";
+      maintainers = [ maintainers.ck3d ];
+      license = licenses.gpl2;
+      platforms = [ "i686-linux" "x86_64-linux" ];
+    };
+  };
+}
diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix
new file mode 100644
index 00000000000..2272d1605fd
--- /dev/null
+++ b/pkgs/applications/video/vdr/wrapper.nix
@@ -0,0 +1,21 @@
+{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }:
+symlinkJoin {
+
+  name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}";
+
+  paths = [ vdr ] ++ plugins;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale"
+  '';
+
+  meta = with vdr.meta; {
+    inherit license homepage;
+    description = description
+    + " (with plugins: "
+    + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
+    + ")";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cdbff37956..6cb5b1eac32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23004,6 +23004,10 @@ in
 
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 
+  vdr = callPackage ../applications/video/vdr { };
+  vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }));
+  wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {};
+
   chrome-gnome-shell = callPackage  ../desktops/gnome-3/extensions/chrome-gnome-shell {};
 
   chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {};

From 45986ec5873c978725ed482dc9a35e215ebb0438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Dec 2018 15:13:35 +0100
Subject: [PATCH 2526/2793] nixos/vdr: create video directory automatically

---
 nixos/modules/services/hardware/vdr.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index 39a656ec7e4..b0ecb944b5e 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -25,7 +25,7 @@ in {
       videoDir = mkOption {
         type = types.path;
         default = "/srv/vdr/video";
-        description = "Recording directory (must exist)";
+        description = "Recording directory";
       };
 
       extraArguments = mkOption {
@@ -39,6 +39,10 @@ in {
   ###### implementation
 
   config = mkIf cfg.enable {
+    systemd.tmpfiles.rules = [
+      "d ${cfg.videoDir} 0755 vdr vdr 0"
+      "Z ${cfg.videoDir} - vdr vdr -"
+    ];
 
     systemd.services.vdr = {
       description = "VDR";

From ddd91fcfabbcfb2439bd4107d1efc01346dfb5aa Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Dec 2018 09:30:11 -0500
Subject: [PATCH 2527/2793] pythonPackages.django_1_11: 1.11.16 -> 1.11.17
 (#52636)

---
 pkgs/development/python-modules/django/1_11.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index c8c9267265d..131c6b3ef1b 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.16";
+  version = "1.11.17";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9";
+    url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
+    sha256 = "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7";
   };
 
   patches = stdenv.lib.optionals withGdal [
@@ -34,8 +34,9 @@ buildPythonPackage rec {
   # too complicated to setup
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high-level Python Web framework";
     homepage = https://www.djangoproject.com/;
+    license = licenses.bsd3;
   };
 }

From b2ea55787933b1bd0e2807165e45ea56939758b2 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 22 Dec 2018 17:24:21 +0100
Subject: [PATCH 2528/2793] opencv3: 3.4.4 -> 3.4.5

---
 pkgs/development/libraries/opencv/3.x.nix | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 01d15416dd7..cca820e2f37 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.4";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
+    sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
     rev    = version;
-    sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
+    sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h";
   };
 
   # Contrib must be built in order to enable Tesseract support:
@@ -147,21 +147,6 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
   '';
 
-  patches = [
-    # https://github.com/opencv/opencv/pull/13232
-    # This also fixes the test of haskell-opencv HEAD where we got the following error:
-    # libgomp: Out of memory allocating 927712937064 bytes
-    (fetchpatch {
-      url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch;
-      sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj";
-    })
-  ] ++
-    # https://github.com/opencv/opencv/pull/13254
-    lib.optional enablePython (fetchpatch {
-      url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
-      sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
-    });
-
   # 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

From 8347028c214e3359317059cdfd8c6c312578d2e6 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 22 Dec 2018 17:26:12 +0100
Subject: [PATCH 2529/2793] opencv4: 4.0.0 -> 4.0.1

---
 pkgs/development/libraries/opencv/4.x.nix | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index c90ed76b534..ecd320fe556 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -35,19 +35,21 @@
 }:
 
 let
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
+    sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
-    rev    = version;
+    # TODO: set to `version` when opencv_contrib-4.0.1 is released;
+    # See: http://answers.opencv.org/question/205793/will-there-be-a-opencv_contrib-401-release-now-that-opencv-401-is-out/
+    rev    = "4.0.0";
     sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
   };
 
@@ -160,15 +162,7 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
   '';
 
-  patches = [
-    # https://github.com/opencv/opencv/pull/13232
-    # This also fixes the test of haskell-opencv HEAD where we got the following error:
-    # libgomp: Out of memory allocating 927712937064 bytes
-    (fetchpatch {
-      url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch;
-      sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj";
-    })
-  ] ++
+  patches =
     # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
     # PR: https://github.com/opencv/opencv_contrib/pull/1913
     lib.optional buildContrib (fetchpatch {
@@ -176,11 +170,6 @@ stdenv.mkDerivation rec {
       sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
       stripLen = 2;
       extraPrefix = "opencv_contrib/";
-    }) ++
-    # https://github.com/opencv/opencv/pull/13254
-    lib.optional enablePython (fetchpatch {
-      url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
-      sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
     });
 
   # This prevents cmake from using libraries in impure paths (which

From 25b80b62daddc52c24ab17bd8a423e48379b80a8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 22 Dec 2018 17:25:56 +0100
Subject: [PATCH 2530/2793] wlroots: Remove the overrides for Meson

These overrides aren't required anymore as Meson 0.48.2 is now in
nixpkgs and there aren't any big problems so far (i.e. a revert is
unlikely).
---
 .../development/libraries/wlroots/default.nix | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index efe7214ab6a..92e8bded875 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -2,28 +2,11 @@
 , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
 , libpng, ffmpeg_4
-, python3Packages # TODO: Temporary
 }:
 
 let
   pname = "wlroots";
   version = "0.2";
-  meson480 = meson.overrideAttrs (oldAttrs: rec {
-    name = pname + "-" + version;
-    pname = "meson";
-    version = "0.48.0";
-
-    src = python3Packages.fetchPypi {
-      inherit pname version;
-      sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
-    };
-    # Remove gir-fallback-path.patch and
-    # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0):
-    patches = builtins.filter
-      (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str
-              || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str))
-      oldAttrs.patches;
-  });
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -43,7 +26,7 @@ in stdenv.mkDerivation rec {
   # programs (in examples) AND rootston
   outputs = [ "out" "bin" "examples" ];
 
-  nativeBuildInputs = [ meson480 ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
     wayland libGL wayland-protocols libinput libxkbcommon pixman

From 926642d53addefa2180fdd5cdde45ca092bfb467 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 08:36:23 -0800
Subject: [PATCH 2531/2793] rtl_433: 18.05 -> 18.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/rtl_433/versions
---
 pkgs/applications/misc/rtl_433/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix
index 7097dda3574..5d012437e6e 100644
--- a/pkgs/applications/misc/rtl_433/default.nix
+++ b/pkgs/applications/misc/rtl_433/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }:
 stdenv.mkDerivation rec {
 
-  version = "18.05";
+  version = "18.12";
   name = "rtl_433-${version}";
 
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    rev = "18.05";
-    sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc";
+    rev = "18.12";
+    sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From f1f1de32f3422df7f6e030b30f4322e343de2d83 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 22 Dec 2018 17:39:15 +0100
Subject: [PATCH 2532/2793] pgmanage: 10.3.1 -> 11.0.1

---
 pkgs/applications/misc/pgmanage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index a17f34378a8..113a63f7fe1 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
-  version = "10.3.1";
+  version = "11.0.1";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
     rev    = "v${version}";
-    sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz";
+    sha256 = "1a1dbc32b3y0ph8ydf800h6pz7dg6g1gxgid4gffk7k58xj0c5yf";
   };
 
   patchPhase = ''

From df856dd79910037f0ad611f4ed12316e489369f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 08:56:35 -0800
Subject: [PATCH 2533/2793] rosegarden: 18.06 -> 18.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/rosegarden/versions
---
 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 0b2bd9507e5..55e3b55472b 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 = "18.06";
+  version = "18.12";
   name = "rosegarden-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
-    sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7";
+    sha256 = "15i9fm0vkn3wsgahaxqi1j5zs0wc0j3wdwml0x49084gk2p328vb";
   };
 
   patchPhase = ''

From 1259a24c0579a533ff0c25e896f2e3ceb2d0258d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 22 Dec 2018 17:51:21 +0100
Subject: [PATCH 2534/2793] fuse3: 3.3.0 -> 3.4.1

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

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 5394edf2877..d712ea99578 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.3.0";
-    sha256Hash = "1pwrnfm8jkxxqhrjz0v1gaw36hshgznchyj961qdk2y697y4zp19";
+    version = "3.4.1";
+    sha256Hash = "1aihvklhqx7abqiy5n9gns7gryqgjldhzghigwrqwnwvf9z0ggyx";
   };
 }

From bacc8e6a545780fde4da2126a530c610ba379f7c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 22 Dec 2018 17:54:52 +0100
Subject: [PATCH 2535/2793] sshfs: 3.5.0 -> 3.5.1

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index ddec6b7eff8..1a24cf7e75c 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.5.0";
+  version = "3.5.1";
   name = "sshfs-fuse-${version}";
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6";
+    sha256 = "07ryavfbbzfxaswsbr8ifnnfn6g8yxgxam6mk6gvcskld6rkf6gd";
   };
 
   nativeBuildInputs = [ meson pkgconfig ninja docutils ];

From 66741bc94a457727a5ccec053af99c454b9b9382 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 09:04:59 -0800
Subject: [PATCH 2536/2793] riot-web: 0.17.6 -> 0.17.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/riot-web/versions
---
 .../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 e2ca3972b5f..1d1617ed9e0 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.17.6";
+  version = "0.17.8";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1y38fq0r9cxmazh9rjc5qy7fzwy81ad35k538d6rsfwz1y88ipdm";
+    sha256 = "0610h307q0zlyd0l7afrb8jv1r9gy9gc07zkjn33jpycwmpbwxbz";
   };
 
   installPhase = ''

From 6965ec04b994870013067aacf2cac848ffb5fc13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 09:48:07 -0800
Subject: [PATCH 2537/2793] rawtherapee: 5.4 -> 5.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/rawtherapee/versions
---
 pkgs/applications/graphics/rawtherapee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 52cdc0bc067..74e8c0e6b43 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.4";
+  version = "5.5";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = version;
-    sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99";
+    sha256 = "13clnx7rwkfa7wxgsim1xdx2pd7gwmmdad1m8a3fvywr20ml8xzk";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];

From fea0e9fbf340e2b2b0cf927fe65d0753cf4b5f44 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 22 Dec 2018 18:24:09 +0000
Subject: [PATCH 2538/2793] mailcore2: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 367c4e96384..c7794b1a8bf 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "mailcore2-${version}";
 
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner  = "MailCore";
     repo   = "mailcore2";
     rev    = version;
-    sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm";
+    sha256 = "0yxynvfmifpw9hdhv499a813hb2ynan74r353lhcdajkkm7w8br5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 124d8ccc692b6b11136826f9a51da3b8336bf08b Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 22 Dec 2018 20:04:19 +0100
Subject: [PATCH 2539/2793] Add IPFS warning

---
 nixos/modules/services/network-filesystems/ipfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 412d57b27b8..602cd50d8f5 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -74,7 +74,7 @@ in {
 
     services.ipfs = {
 
-      enable = mkEnableOption "Interplanetary File System";
+      enable = mkEnableOption "Interplanetary File System (WARNING: may cause severe network degredation)";
 
       user = mkOption {
         type = types.str;

From f99e146511c1e6934842692afe6aefd827837a7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 11:32:49 -0800
Subject: [PATCH 2540/2793] qt5ct: 0.36 -> 0.37

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

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 72ba4863c40..04151812a07 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.36";
+  version = "0.37";
 
   src = fetchurl {
     url = "mirror://sourceforge/qt5ct/${name}.tar.bz2";
-    sha256 = "12gfhchp05xn311zsxh41k3anyrscg53r5d06dasyxyk6hpr9hwg";
+    sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From d7652d5ef1768dc06cde5c93b7c2870f73c8f087 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 11:45:26 -0800
Subject: [PATCH 2541/2793] qmapshack: 1.12.0 -> 1.12.1 (#52696)

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

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index a2c8c75dc24..7b2e8bed10e 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qmapshack-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
-    sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih";
+    sha256 = "1d6n7xk0ksxb1fw43s5lb08vgxf6h93k3rb401cbka1inpyf2232";
   };
 
   nativeBuildInputs = [ cmake ];

From a42d5f0dab49a40a1feb24a0c9610eceebdd47e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 03:54:23 -0800
Subject: [PATCH 2542/2793] syslogng: 3.18.1 -> 3.19.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/syslog-ng/versions
---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 1ce7e766a18..7283819f14b 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.18.1";
+  version = "3.19.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn";
+    sha256 = "0y2ixmbl4af4yf0a56pmg1c00nh0yvlfwr9ck9nhxbdysylk3yaw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From f58c31ead0a29d29a0d7750028a4548bdde20fb3 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Sat, 22 Dec 2018 14:37:25 -0600
Subject: [PATCH 2543/2793] terragrunt: 0.17.3 -> 0.17.4

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index ab884a1b97c..56c30df37c5 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.17.3";
+  version = "0.17.4";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gruntwork-io";
     repo   = "terragrunt";
     rev    = "v${version}";
-    sha256 = "1b0fwql9nr00qpvcbsbdymxf1wrgr590gkms7yz3yirb4xfl3gl3";
+    sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a";
   };
 
   goDeps = ./deps.nix;

From 780f2f30f2c37d279552a99a3c27511f6493f8bb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 22 Dec 2018 15:45:38 -0500
Subject: [PATCH 2544/2793] Revert "opencollada: 1.6.67 -> 1.6.68"

Fixes #52659

This reverts commit bf53bea9e492cc995b0f3c2ea3405f5aa558f1e9.
---
 pkgs/development/libraries/opencollada/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index cd3da4a7960..d3e1482feb4 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "opencollada-${version}";
 
-  version = "1.6.68";
+  version = "1.6.67";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     rev = "v${version}";
-    sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
+    sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e6d8a83407dd703becc6033dc0763251213d9040 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 22:07:48 +0100
Subject: [PATCH 2545/2793] =?UTF-8?q?pidgin-skypeweb:=201.2.2=20=E2=86=92?=
 =?UTF-8?q?=201.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pidgin-plugins/pidgin-skypeweb/default.nix    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 6e589febe6d..5fbf385ed07 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pidgin-skypeweb-${version}";
-  version = "1.2.2";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "skype4pidgin";
-    rev = "${version}";
-    sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
+    rev = version;
+    sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv";
   };
 
   setSourceRoot = ''
@@ -18,13 +18,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin json-glib ];
 
-  makeFlags = [
-    "PLUGIN_DIR_PURPLE=/lib/pidgin/"
-    "DATA_ROOT_DIR_PURPLE=/share"
-    "DESTDIR=$(out)"
-  ];
-
-  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb";
+  PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
+  PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/EionRobb/skype4pidgin;

From 130e52555352b5705c6abbb3d2fff13d7209959a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 22:09:10 +0100
Subject: [PATCH 2546/2793] purple-matrix: Do not abuse DESTDIR

---
 .../pidgin-plugins/purple-matrix/default.nix                 | 5 ++---
 1 file changed, 2 insertions(+), 3 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 d4a26a266c3..0b2cba64920 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
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
 
   makeFlags = [
-    "DESTDIR=$(out)"
-    "PLUGIN_DIR_PURPLE=/lib/pidgin/"
-    "DATA_ROOT_DIR_PURPLE=/share"
+    "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
+    "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
   ];
 
   meta = with stdenv.lib; {

From 3d95861fc1a8f1c197ce8e983e4ad5a648e9ae98 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 22:17:57 +0100
Subject: [PATCH 2547/2793] pidgin-opensteamworks: Do not abuse DESTDIR

---
 .../pidgin-plugins/pidgin-opensteamworks/default.nix     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index b8d6cf6aee3..7e86a390edc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } :
+{ stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
 
 stdenv.mkDerivation rec {
   name = "pidgin-opensteamworks-${version}";
@@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cd steam-mobile";
   installFlags = [
-    "DESTDIR=$(out)"
-    "PLUGIN_DIR_PURPLE=/lib/purple-2"
-    "DATA_ROOT_DIR_PURPLE=/share"
+    "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
+    "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
   ];
 
-  buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ];
+  buildInputs = [ pidgin glib json-glib nss nspr libgnome-keyring ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/EionRobb/pidgin-opensteamworks;

From 4efe405311b279c1cb5eb716349e1818c5ea9d62 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Dec 2018 22:21:04 +0100
Subject: [PATCH 2548/2793] surf: Do not abuse DESTDIR

---
 pkgs/applications/networking/browsers/surf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 88680414d1c..3a7612bb0fb 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   inherit patches;
 
-  installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A simple web browser based on WebKit/GTK+";

From fadd95af14dcf5088c3970fce242dcbcdd87cb13 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Dec 2018 22:29:54 +0100
Subject: [PATCH 2549/2793] tgt: Do not abuse DESTDIR

---
 pkgs/tools/networking/tgt/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index b2ef684f589..71c9263a6e2 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -15,9 +15,14 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ libxslt systemd libaio docbook_xsl ];
 
-  DESTDIR = "$(out)";
-  PREFIX = "/";
-  SD_NOTIFY="1";
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "SD_NOTIFY=1"
+  ];
+
+  installFlags = [
+    "sysconfdir=${placeholder "out"}/etc"
+  ];
 
   preConfigure = ''
     sed -i 's|/usr/bin/||' doc/Makefile

From 8d42600921ad778150b49611a5b9a44aed605d1e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Dec 2018 22:33:33 +0100
Subject: [PATCH 2550/2793] duperemove: Do not abuse DESTDIR

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

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 4e71d910a5d..254649e39c5 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libgcrypt glib linuxHeaders sqlite ];
 
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = with stdenv.lib; {
     description = "A simple tool for finding duplicated extents and submitting them for deduplication";

From 98625b2bee4cd36f01de370b5a7af0b8121f4e78 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 22 Dec 2018 18:01:20 -0500
Subject: [PATCH 2551/2793] bzflag: enable on darwin (#52707)

---
 pkgs/games/bzflag/default.nix   | 8 +++++---
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index c114443e1e7..6c7e9ac76a9 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig
-, curl, SDL2, libGLU_combined, glew, ncurses, c-ares }:
+, curl, SDL2, libGLU_combined, glew, ncurses, c-ares
+, Carbon, CoreServices }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -12,13 +13,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ];
+  buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ]
+    ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ];
 
   meta = with lib; {
     description = "Multiplayer 3D Tank game";
     homepage = https://bzflag.org/;
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4cbee31b9b..70b223cb83e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20460,7 +20460,9 @@ in
 
   btanks = callPackage ../games/btanks { };
 
-  bzflag = callPackage ../games/bzflag { };
+  bzflag = callPackage ../games/bzflag {
+    inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
+  };
 
   cataclysm-dda = callPackage ../games/cataclysm-dda {
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 55af73e1565a3502d15ab9c95baf762f8e1cced4 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 22 Dec 2018 23:38:37 +0000
Subject: [PATCH 2552/2793] mono: only maintain major versions (mono4 & mono5)

---
 pkgs/development/compilers/mono/4.6.nix       |  9 ----
 .../compilers/mono/{4.8.nix => 4.nix}         |  0
 pkgs/development/compilers/mono/5.0.nix       |  8 ----
 pkgs/development/compilers/mono/5.4.nix       |  8 ----
 pkgs/development/compilers/mono/5.8.nix       |  8 ----
 .../compilers/mono/{5.14.nix => 5.nix}        |  0
 .../libraries/dbus-sharp/default.nix          |  4 +-
 .../libraries/mono-addins/default.nix         |  4 +-
 pkgs/servers/foundationdb/default.nix         |  4 +-
 pkgs/top-level/all-packages.nix               | 42 ++++---------------
 pkgs/top-level/python-packages.nix            |  2 +-
 11 files changed, 14 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/4.6.nix
 rename pkgs/development/compilers/mono/{4.8.nix => 4.nix} (100%)
 delete mode 100644 pkgs/development/compilers/mono/5.0.nix
 delete mode 100644 pkgs/development/compilers/mono/5.4.nix
 delete mode 100644 pkgs/development/compilers/mono/5.8.nix
 rename pkgs/development/compilers/mono/{5.14.nix => 5.nix} (100%)

diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
deleted file mode 100644
index 5ccdadc2878..00000000000
--- a/pkgs/development/compilers/mono/4.6.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic.nix (rec {
-  inherit Foundation libobjc;
-  version = "4.6.2.16";
-  sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
-  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
-  meta.knownVulnerabilities = [ "CVE-2018-1002208" ];
-})
diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.nix
similarity index 100%
rename from pkgs/development/compilers/mono/4.8.nix
rename to pkgs/development/compilers/mono/4.nix
diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix
deleted file mode 100644
index 53820c97b1b..00000000000
--- a/pkgs/development/compilers/mono/5.0.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic-cmake.nix (rec {
-  inherit Foundation libobjc;
-  version = "5.0.1.1";
-  sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8";
-  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
-})
diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix
deleted file mode 100644
index acebb4beef6..00000000000
--- a/pkgs/development/compilers/mono/5.4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic-cmake.nix (rec {
-  inherit Foundation libobjc;
-  version = "5.4.1.6";
-  sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx";
-  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
-})
diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix
deleted file mode 100644
index 7b5008fd04c..00000000000
--- a/pkgs/development/compilers/mono/5.8.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic-cmake.nix (rec {
-  inherit Foundation libobjc;
-  version = "5.8.0.108";
-  sha256 = "177khb06dfll0pcncr84vvibni7f8m5fgb30ndgsdjk25xfcbmzc";
-  enableParallelBuilding = false;
-})
diff --git a/pkgs/development/compilers/mono/5.14.nix b/pkgs/development/compilers/mono/5.nix
similarity index 100%
rename from pkgs/development/compilers/mono/5.14.nix
rename to pkgs/development/compilers/mono/5.nix
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 2704ef2de9f..14db5baea3f 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
   # See: https://github.com/NixOS/nixpkgs/pull/46060
-  buildInputs = [ mono48 ];
+  buildInputs = [ mono4 ];
 
   dontStrip = true;
 
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index ca72557242f..43311c29659 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, mono48, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   name = "mono-addins-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
-  buildInputs = [ mono48 gtk-sharp-2_0 ];
+  buildInputs = [ mono4 gtk-sharp-2_0 ];
 
   dontStrip = true;
 
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 7e4babbb979..5d8e347de99 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -2,7 +2,7 @@
 , lib, fetchurl, fetchpatch, fetchFromGitHub
 
 , which, findutils, m4, gawk
-, python, openjdk, mono58, libressl
+, python, openjdk, mono, libressl
 }:
 
 let
@@ -50,7 +50,7 @@ let
           inherit rev sha256;
         };
 
-        nativeBuildInputs = [ python openjdk gawk which m4 findutils mono58 ];
+        nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ];
         buildInputs = [ libressl boost ];
 
         patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4cbee31b9b..c27289de138 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3534,9 +3534,7 @@ in
 
   jaaa = callPackage ../applications/audio/jaaa { };
 
-  jackett = callPackage ../servers/jackett {
-    mono = mono514;
-  };
+  jackett = callPackage ../servers/jackett { };
 
   jade = callPackage ../tools/text/sgml/jade { };
 
@@ -7036,9 +7034,7 @@ in
 
   fsharp = callPackage ../development/compilers/fsharp { };
 
-  fsharp41 = callPackage ../development/compilers/fsharp41 {
-    mono = mono46;
-  };
+  fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; };
 
   fstar = callPackage ../development/compilers/fstar { };
 
@@ -7351,36 +7347,14 @@ in
 
   mlton = mlton20180207;
 
-  mono  = mono5;
-  mono5 = mono58;
-  mono4 = mono48;
+  mono = mono5;
 
-  mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix {
+  mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   });
 
-  mono48 = lowPrio (callPackage ../development/compilers/mono/4.8.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
-
-  mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
-
-  mono54 = lowPrio (callPackage ../development/compilers/mono/5.4.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
-
-  mono58 = callPackage ../development/compilers/mono/5.8.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
-
-  mono514 = callPackage ../development/compilers/mono/5.14.nix {
+  mono5 = callPackage ../development/compilers/mono/5.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
@@ -13506,7 +13480,7 @@ in
   elasticmq = callPackage ../servers/elasticmq { };
 
   eventstore = callPackage ../servers/nosql/eventstore {
-    mono = mono46;
+    mono = mono4;
     v8 = v8_6_x;
   };
 
@@ -16880,9 +16854,7 @@ in
   inherit (gnome3) evince;
   evolution-data-server = gnome3.evolution-data-server;
 
-  keepass = callPackage ../applications/misc/keepass {
-    buildDotnetPackage = buildDotnetPackage.override { mono = mono54; };
-  };
+  keepass = callPackage ../applications/misc/keepass { };
 
   keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9011f993321..b5c980080e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3725,7 +3725,7 @@ in {
 
   pythonnet = callPackage ../development/python-modules/pythonnet {
     # `mono >= 4.6` required to prevent crashes encountered with earlier versions.
-    mono = pkgs.mono46;
+    mono = pkgs.mono4;
   };
 
   pytz = callPackage ../development/python-modules/pytz { };

From 26e8258c41e46bcb22c9bf039d9d3fbd4581d0e4 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 22 Dec 2018 23:51:08 +0000
Subject: [PATCH 2553/2793] mono5: 5.14.0.177 -> 5.16.0.220

---
 pkgs/development/compilers/mono/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix
index dcf587a5fa4..ec7ad749d3b 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/pkgs/development/compilers/mono/5.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
-  version = "5.14.0.177";
-  sha256 = "164l30fkvfgs1rh663h7dnm1yp7425bi9x2lh2y6zml8h4pgmxfl";
+  version = "5.16.0.220";
+  sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l";
   enableParallelBuilding = false;
 })

From f382eb7d6179bc49d6fdf97a897a0353e7969eaa Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 5 Mar 2018 15:39:01 +0200
Subject: [PATCH 2554/2793] libgdiplus: 2.10.9 -> 5.6

A lot of updates from mono-project' folks. Patches dropped, because both
merged upstream.

Cherry-picked by @obadz from
https://github.com/NixOS/nixpkgs/pull/36711/commits/e022209def9016a8f53a3898d4a624a784c08c4a
---
 .../libraries/libgdiplus/default.nix          |  26 ++--
 .../libraries/libgdiplus/giflib.patch         | 143 ------------------
 2 files changed, 12 insertions(+), 157 deletions(-)
 delete mode 100644 pkgs/development/libraries/libgdiplus/giflib.patch

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index d54f9203d23..10e6dd568c8 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,31 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
+{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
 , libtiff, giflib, libjpeg, libpng
-, libXrender, libexif }:
+, libXrender, libexif, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libgdiplus-2.10.9";
+  name = "libgdiplus-5.6";
 
-  src = fetchurl {
-    url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2";
-    sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "libgdiplus";
+    rev = "5.6";
+    sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7";
   };
 
   NIX_LDFLAGS = "-lgif";
 
-  patches =
-    [ (fetchurl {
-        url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
-        sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
-      })
-      ./giflib.patch
-    ];
+  patches = [ ];
 
   patchFlags = "-p0";
 
   hardeningDisable = [ "format" ];
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
   buildInputs =
-    [ pkgconfig glib cairo fontconfig libtiff giflib
+    [ glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif
     ]
     ++ stdenv.lib.optional stdenv.isDarwin Carbon;
diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch
deleted file mode 100644
index 7b90d9863fd..00000000000
--- a/pkgs/development/libraries/libgdiplus/giflib.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c
---- src/gifcodec.c
-+++ src/gifcodec.c
-@@ -39,8 +39,10 @@
- 
- #include "gifcodec.h"
- 
-+#if GIFLIB_MAJOR < 5
- /* giflib declares this incorrectly as EgifOpen */
- extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
-+#endif
- 
- /* Data structure used for callback */
- typedef struct
-@@ -105,7 +107,7 @@
- */
- 
- static int
--AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
-+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
- {
- 	ExtensionBlock	*ep;
- 
-@@ -129,7 +131,7 @@
- 
- 	if (ExtData) {
- 		memcpy(ep->Bytes, ExtData, Len);
--		ep->Function = New->Function;
-+		ep->Function = func;
- 	}
- 
- 	return (GIF_OK);
-@@ -232,20 +234,20 @@
- 			}
- 
- 			case EXTENSION_RECORD_TYPE: {
--				if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
-+				int func;
-+				if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
- 					return (GIF_ERROR);
- 				}
- 
- 				while (ExtData != NULL) {
- 					/* Create an extension block with our data */
--					if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
-+					if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
- 						return (GIF_ERROR);
- 					}
- 
- 					if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
- 						return (GIF_ERROR);
- 					}
--					temp_save.Function = 0;
- 				}
- 				break;
- 			}
-@@ -303,12 +305,19 @@
- 	result = NULL;
- 	loop_counter = FALSE;
- 
-+#if GIFLIB_MAJOR < 5
- 	if (from_file) {
- 		gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
- 	} else {
- 		gif = DGifOpen (stream, &gdip_gif_inputfunc);
- 	}
--	
-+#else
-+	if (from_file)
-+		gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
-+	else
-+		gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
-+#endif
-+
- 	if (gif == NULL) {
- 		goto error;
- 	}
-@@ -581,7 +590,7 @@
- 	}
- 
- 	FreeExtensionMono(&global_extensions);
--	DGifCloseFile (gif);
-+	DGifCloseFile (gif, NULL);
- 
- 	*image = result;
- 	return Ok;
-@@ -597,7 +606,7 @@
- 
- 	if (gif != NULL) {
- 		FreeExtensionMono (&global_extensions);
--		DGifCloseFile (gif);
-+		DGifCloseFile (gif, NULL);
- 	}
- 
- 	*image = NULL;
-@@ -660,11 +669,22 @@
- 		return InvalidParameter;
- 	}
- 
-+#if GIFLIB_MAJOR < 5
- 	if (from_file) {
- 		fp = EGifOpenFileName (stream, 0);
- 	} else {
- 		fp = EGifOpen (stream, gdip_gif_outputfunc);
- 	}
-+#else
-+	if (from_file)
-+		fp = EGifOpenFileName (stream, 0, NULL);
-+	else
-+		fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
-+#define MakeMapObject  GifMakeMapObject
-+#define FreeMapObject  GifFreeMapObject
-+#define QuantizeBuffer GifQuantizeBuffer
-+#define BitSize        GifBitSize
-+#endif
- 		
- 	if (!fp) {
- 		return FileNotFound;
-@@ -848,8 +868,15 @@
- 						Buffer[0] = 1;
- 						Buffer[1] = ptr[0];
- 						Buffer[2] = ptr[1];
-+#if GIFLIB_MAJOR < 5
- 						EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
- 						EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
-+#else
-+						EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
-+						EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
-+						EGifPutExtensionBlock(fp, 3, Buffer);
-+						EGifPutExtensionTrailer(fp);
-+#endif
- 					}
- 				}
- 
-@@ -923,7 +950,7 @@
- 		}
- 	}
- 
--	EGifCloseFile (fp);	
-+	EGifCloseFile (fp, NULL);	
- 	
- 	return Ok;
-

From afbd840d2448cf5d5f83b24141edd11d746ad65a Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 9 Mar 2018 20:28:28 +0200
Subject: [PATCH 2555/2793] libgdiplus: fix segfaults by patches from master
 and dropping libungif

Configure script complains, that unable to build gif loading support,
but it's a lie -- it builds against libgif 5, which have DGifOpenFile as
well.

Cherry-picked by @obadz from
https://github.com/NixOS/nixpkgs/pull/36711/commits/8439304ebca3abcbd989131f77d644ab1e61ff90
(libungif was already dropped by commit b41ede5e3a3)
---
 .../libraries/libgdiplus/default.nix          | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 10e6dd568c8..70353d68ca7 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
 , libtiff, giflib, libjpeg, libpng
-, libXrender, libexif, autoreconfHook }:
+, libXrender, libexif, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libgdiplus-5.6";
@@ -14,9 +14,20 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lgif";
 
-  patches = [ ];
-
-  patchFlags = "-p0";
+  patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
+    (fetchpatch {
+          url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
+          sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
+    })
+    (fetchpatch {
+          url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
+          sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
+    })
+    (fetchpatch {
+          url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
+          sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
+    })
+  ];
 
   hardeningDisable = [ "format" ];
 
@@ -32,6 +43,10 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
   '';
 
+  checkPhase = ''
+    make check -w
+  '';
+
   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/;

From 57754ca28aeb261b7d442c36bd69b755415a97ee Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 23 Dec 2018 01:14:42 +0000
Subject: [PATCH 2556/2793] mono: delete two unused files

deleted: generic.nix
deleted: pkgconfig-before-gac-5x.patch
---
 pkgs/development/compilers/mono/generic.nix   | 97 -------------------
 .../mono/pkgconfig-before-gac-5x.patch        | 65 -------------
 2 files changed, 162 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/generic.nix
 delete mode 100644 pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch

diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
deleted file mode 100644
index 06dcfb8b393..00000000000
--- a/pkgs/development/compilers/mono/generic.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11
-, callPackage, ncurses, zlib
-, cacert, Foundation, libobjc, python
-
-, version, sha256
-, withLLVM ? false
-, enableParallelBuilding ? true
-, meta ? {}
-}:
-
-let
-  llvm     = callPackage ./llvm.nix { };
-  name = "mono-${version}";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    inherit sha256;
-    url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
-  };
-
-  buildInputs =
-    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python
-    ]
-    ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
-
-  propagatedBuildInputs = [glib];
-
-  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
-
-  # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
-  dontDisableStatic = true;
-
-  # In fact I think this line does not help at all to what I
-  # wanted to achieve: have mono to find libgdiplus automatically
-  configureFlags = [
-    "--x-includes=${libX11.dev}/include"
-    "--x-libraries=${libX11.out}/lib"
-    "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
-  ]
-  ++ stdenv.lib.optionals withLLVM [
-    "--enable-llvm"
-    "--enable-llvmloaded"
-    "--with-llvm=${llvm}"
-  ];
-
-  # Attempt to fix this error when running "mcs --version":
-  # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
-  dontStrip = true;
-
-  # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
-  # because we control pkg-config
-  patches = [ ./pkgconfig-before-gac.patch ];
-
-  # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default
-  # LLVM path to point into the Mono LLVM build, since it's private anyway.
-  preBuild = ''
-    makeFlagsArray=(INSTALL=`type -tp install`)
-    patchShebangs ./
-    substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
-  '' + stdenv.lib.optionalString withLLVM ''
-    substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
-  '';
-
-  # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
-  # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
-  # http://www.mono-project.com/Config_DllMap
-  postBuild = ''
-    find . -name 'config' -type f | xargs \
-    sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \
-           -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \
-  '';
-
-  # Without this, any Mono application attempting to open an SSL connection will throw with
-  # The authentication or decryption has failed.
-  # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server.
-  postInstall = ''
-    echo "Updating Mono key store"
-    $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
-  ''
-  # According to [1], gmcs is just mcs
-  # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
-  + ''
-    ln -s $out/bin/mcs $out/bin/gmcs
-  '';
-
-  inherit enableParallelBuilding;
-
-  meta = {
-    homepage = http://mono-project.com/;
-    description = "Cross platform, open source .NET development framework";
-    platforms = stdenv.lib.platforms.x86;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
-    license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
-  } // meta;
-}
diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch
deleted file mode 100644
index 1b9c59402bf..00000000000
--- a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
---- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old	2017-04-24 23:45:18.348116305 +0200
-+++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets	2017-04-24 23:45:11.407051755 +0200
-@@ -167,8 +167,8 @@
- 			$(ReferencePath);
- 			@(AdditionalReferencePath);
- 			{HintPathFromItem};
--			{TargetFrameworkDirectory};
- 			{PkgConfig};
-+			{TargetFrameworkDirectory};
- 			{GAC};
- 			{RawFileName};
- 			$(OutDir)
-diff -Naur mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
---- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old	2017-04-24 23:49:53.019616196 +0200
-+++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets	2017-04-24 23:50:05.709729585 +0200
-@@ -232,8 +232,8 @@
- 			$(ReferencePath);
- 			@(AdditionalReferencePath);
- 			{HintPathFromItem};
--			{TargetFrameworkDirectory};
- 			{PkgConfig};
-+			{TargetFrameworkDirectory};
- 			{GAC};
- 			{RawFileName};
- 			$(OutDir)
-diff -Naur mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
---- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old	2017-04-24 23:52:33.200037047 +0200
-+++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets	2017-04-24 23:52:43.281125802 +0200
-@@ -139,8 +139,8 @@
- 			$(ReferencePath);
- 			@(AdditionalReferencePath);
- 			{HintPathFromItem};
--			{TargetFrameworkDirectory};
- 			{PkgConfig};
-+			{TargetFrameworkDirectory};
- 			{GAC};
- 			{RawFileName};
- 			$(OutDir)
-diff -Naur mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
---- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old	2017-04-24 23:54:02.585821594 +0200
-+++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets	2017-04-24 23:54:09.313880438 +0200
-@@ -234,8 +234,8 @@
- 			$(ReferencePath);
- 			@(AdditionalReferencePath);
- 			{HintPathFromItem};
--			{TargetFrameworkDirectory};
- 			{PkgConfig};
-+			{TargetFrameworkDirectory};
- 			{GAC};
- 			{RawFileName};
- 			$(OutDir)
-diff -Naur mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
---- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old	2017-04-24 23:55:46.244895155 +0200
-+++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets	2017-04-24 23:55:51.998961342 +0200
-@@ -232,8 +232,8 @@
- 			$(ReferencePath);
- 			@(AdditionalReferencePath);
- 			{HintPathFromItem};
--			{TargetFrameworkDirectory};
- 			{PkgConfig};
-+			{TargetFrameworkDirectory};
- 			{GAC};
- 			{RawFileName};
- 			$(OutDir)

From 3f9ffdde5a37956f35f5a058cfc9138c071c731a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 22 Dec 2018 22:05:55 -0500
Subject: [PATCH 2557/2793] ammonite: 1.5.0 -> 1.6.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 d80270f65b7..6e090648798 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.5.0";
+  version = "1.6.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0ivfas9lfx3wsc2c4jxi1z54vn5f4cc4j1aqq53nxfl8sx2hbm3v";
+    sha256 = "17c6ps5i48hcjj7r6xw8mrqhy4cs7qsa787l36f30757hi1cx4qy";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 706aa7127efe3f47068dfad29b90b9b6d87a5abf Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Dec 2018 22:21:54 -0500
Subject: [PATCH 2558/2793] pythonPackages.scrapy: fix build on Python 3.7

---
 .../python-modules/scrapy/default.nix         | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index fcac013b6de..8bb332fa9da 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore,
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
-  service-identity, parsel, pydispatcher, cssselect, lib }:
+  service-identity, parsel, pydispatcher, cssselect, lib, fetchpatch }:
 buildPythonPackage rec {
   version = "1.5.1";
   pname = "Scrapy";
@@ -10,18 +10,26 @@ buildPythonPackage rec {
     six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
   ];
 
-  # Scrapy is usually installed via pip where copying all
-  # permissions makes sense. In Nix the files copied are owned by
-  # root and readonly. As a consequence scrapy can't edit the
-  # project templates.
-  patches = [ ./permissions-fix.patch ];
+  patches = [
+    # Scrapy is usually installed via pip where copying all
+    # permissions makes sense. In Nix the files copied are owned by
+    # root and readonly. As a consequence scrapy can't edit the
+    # project templates.
+    ./permissions-fix.patch
+    # fix python37 issues. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/scrapy/scrapy/commit/f4f39057cbbfa4daf66f82061e57101b88d88d05.patch;
+      sha256 = "1f761qkji362i20i5bzcxz44sihvl29prm02i5l2xyhgl1hp91hv";
+    })
+  ];
 
   LC_ALL="en_US.UTF-8";
 
+  # Ignore proxy tests because requires mitmproxy
+  # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean"
+  # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396
   checkPhase = ''
-    py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
-    # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
-    # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
+    pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"}
   '';
 
   src = fetchPypi {
@@ -29,11 +37,17 @@ buildPythonPackage rec {
     sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6";
   };
 
+  postInstall = ''
+    install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1
+    install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy
+    install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
+  '';
+
   meta = with lib; {
     description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
     homepage = https://scrapy.org/;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ drewkett ];
+    maintainers = with maintainers; [ drewkett marsam ];
     platforms = platforms.unix;
   };
 }

From dd6b4b7078d89decabefc6b1a698327db132fbfe Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 23 Dec 2018 02:52:34 +0100
Subject: [PATCH 2559/2793] dwm-status: 1.4.1 -> 1.5.0

---
 pkgs/applications/window-managers/dwm/dwm-status.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index f88ef63bc2e..d846ab7e29d 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -9,23 +9,22 @@ in
 
 rustPlatform.buildRustPackage rec {
   name = "dwm-status-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = "dwm-status";
     rev = version;
-    sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl";
+    sha256 = "0mfzpyacd7i6ipbjwyl1zc0x3lnz0f4qqzsmsb07p047z95mw4v6";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8";
+  cargoSha256 = "1cngcacsbzijs55k4kz8fidki3p8jblk3v5s21hjsn4glzjdbkmm";
 
   postInstall = lib.optionalString enableAlsaUtils ''
-    wrapProgram $out/bin/dwm-status \
-      --prefix "PATH" : "${binPath}"
+    wrapProgram $out/bin/dwm-status --prefix "PATH" : "${binPath}"
   '';
 
   meta = with stdenv.lib; {

From b46276658fcd819cb73423805116e3a93bd828f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 19 Dec 2018 09:37:59 +0100
Subject: [PATCH 2560/2793] fix update-python-libraries

---
 maintainers/scripts/update-python-libraries | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index d56c9e6338c..4a6024c4038 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,3 +1,5 @@
 #!/bin/sh
-exec nix-shell -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git --run pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"`
+python=${build}/bin/python
+exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
 

From 3d5025ba79da91bf387a52113dfa6fdc319251ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 23 Dec 2018 09:59:56 +0100
Subject: [PATCH 2561/2793] buildPython*: don't override custom updateScript

---
 .../interpreters/python/mk-python-derivation.nix            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 72a2805a300..b9a6835908f 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -110,9 +110,7 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
   } // meta;
 }));
 
-passthru = {
-  updateScript = let
+passthru.updateScript = let
     filename = builtins.head (lib.splitString ":" self.meta.position);
-  in [ update-python-libraries filename ];
-};
+  in attrs.passthru.updateScript or [ update-python-libraries filename ];
 in lib.extendDerivation true passthru self

From 49268e7a2059294db14cb2d0f1a972a257e86070 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Dec 2018 10:15:49 -0800
Subject: [PATCH 2562/2793] python37Packages.mysqlclient: 1.3.13 -> 1.3.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/python3.7-mysqlclient/versions
---
 pkgs/development/python-modules/mysqlclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 41e1d4cb10b..71287189017 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "mysqlclient";
-  version = "1.3.13";
+  version = "1.3.14";
 
   buildInputs = [
     mysql.connector-c
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f";
+    sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r";
   };
 
   meta = with stdenv.lib; {

From c6436ab3823c1437251065b44cbac14e943baa6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 03:44:36 -0800
Subject: [PATCH 2563/2793] sc-controller: 0.4.5 -> 0.4.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/sc-controller/versions
---
 pkgs/misc/drivers/sc-controller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index d9f68b3e2ec..c0f471c8e20 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0mb9r4811rfj5rs4vrdhaf3x38iy1fvxr4sk2zg3xhvc29cdf5wv";
+    sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 848ddac0feaa9b9cf7372e2d0ca6006c5261ad0a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 06:34:47 -0800
Subject: [PATCH 2564/2793] sysbench: 1.0.15 -> 1.0.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/sysbench/versions
---
 pkgs/development/tools/misc/sysbench/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index ee96b6198cc..14374937fe0 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -2,7 +2,7 @@
 , libaio }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-1.0.15";
+  name = "sysbench-1.0.16";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ vim mysql.connector-c libaio ];
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akopytov";
     repo = "sysbench";
-    rev = "1.0.15";
-    sha256 = "0ddj4mxxqlnlp817ix2qad0v3p83azi9wyz4h7mffchgp3mndp9z";
+    rev = "1.0.16";
+    sha256 = "0ypain0m1yqn7yqfb5847fdph6a6m0rn2rnqbnkxcxz5g85kv1rg";
   };
 
   meta = {

From 5caeaf1576a381677381479ea779d62170d6c1a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Dec 2018 12:01:45 -0800
Subject: [PATCH 2565/2793] qmmp: 1.2.4 -> 1.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/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 31b8bce90f4..c10358eed1e 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.4";
+  name = "qmmp-1.2.5";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0rmfd6h0186b6n4g079d8kshdmp3k5n8w06a1l41m4p3fgq08j92";
+    sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx";
   };
 
   buildInputs =

From ff70335091ba5115feee33219fe0ef72118a85c0 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 2566/2793] tdesktop: 1.5.2 -> 1.5.3

tdesktopPackages.preview: 1.5.2 -> 1.5.3
---
 .../instant-messengers/telegram/tdesktop/default.nix   |  4 ++--
 .../instant-messengers/telegram/tdesktop/generic.nix   | 10 ++++++++--
 2 files changed, 10 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 c74226e1e40..6b892a5baea 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.5.2";
-    sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8";
+    version = "1.5.3";
+    sha256Hash = "13gl81zb9739hs7p3pfavr2lcikajljf03g2x3zgcb9zyarwffg4";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "415526";
     archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 302eb975d81..398ddac3dda 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,6 +1,6 @@
 { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
-{ mkDerivation, lib, fetchFromGitHub, fetchsvn
+{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
 , pkgconfig, pythonPackages, cmake, wrapGAppsHook
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -29,7 +29,13 @@ mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches = [ "${archPatches}/tdesktop.patch" ]
+  patches = [
+      "${archPatches}/tdesktop.patch"
+      (fetchpatch {
+        url = "https://github.com/telegramdesktop/tdesktop/commit/4e692e2c1e10538d7fd3e7c0e0a66e0ba474fe76.patch";
+        sha256 = "11pv7ib56aq69q9257b9p7wxd2f8xcr6mavswzqw0lndvcx8a5dz";
+      })
+    ]
     # TODO: Only required to work around a compiler bug.
     # This should be fixed in GCC 7.3.1 (or later?)
     ++ [ ./fix-internal-compiler-error.patch ];

From 0c75ad784c83196861918042348bee6edb87afb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Sun, 23 Dec 2018 16:30:57 +0100
Subject: [PATCH 2567/2793] flexget: 2.17.14 -> 2.17.20 (#52681)

---
 .../networking/flexget/default.nix            | 43 ++++++-------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 3fec84d224f..8508ab10e1a 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -1,8 +1,4 @@
-{ lib, python
-, delugeSupport ? true, deluge ? null
-}:
-
-assert delugeSupport -> deluge != null;
+{ lib, python36 }:
 
 # Flexget have been a trouble maker in the past,
 # if you see flexget breaking when updating packages, don't worry.
@@ -10,17 +6,9 @@ assert delugeSupport -> deluge != null;
 # -- Mic92
 
 let
-  python' = python.override { inherit packageOverrides; };
+  python' = python36.override { inherit packageOverrides; };
 
   packageOverrides = self: super: {
-    sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
-      version = "1.2.6";
-      src = old.src.override {
-        inherit version;
-        sha256 = "1nwylglh256mbwwnng6n6bzgxshyz18j12hw76sghbprp74hrc3w";
-      };
-    });
-
     guessit = super.guessit.overridePythonAttrs (old: rec {
       version = "3.0.3";
       src = old.src.override {
@@ -36,14 +24,16 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.17.14";
+  version = "2.17.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wh12nspjzsgb0a7qp67s4k8wssbhhf500s8x8mx2smb1mgy4xzz";
+    sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3";
   };
 
   postPatch = ''
+    # build for the correct python version
+    substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' ""
     # remove dependency constraints
     sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
   '';
@@ -52,25 +42,20 @@ buildPythonApplication rec {
   doCheck = false;
 
   propagatedBuildInputs = [
+    # See https://github.com/Flexget/Flexget/blob/master/requirements.in
     feedparser sqlalchemy pyyaml
-    chardet beautifulsoup4 html5lib
+    beautifulsoup4 html5lib
     PyRSS2Gen pynzb rpyc jinja2
-    jsonschema requests dateutil
+    requests dateutil jsonschema
     pathpy guessit APScheduler
     terminaltables colorclass
     cherrypy flask flask-restful
     flask-restplus flask-compress
-    flask_login flask-cors safe
-    pyparsing future zxcvbn-python
-    werkzeug tempora cheroot rebulk
-    portend transmissionrpc aniso8601
-    babelfish certifi click futures
-    idna itsdangerous markupsafe
-    plumbum pytz six tzlocal urllib3
-    webencodings werkzeug zxcvbn-python
-    backports_functools_lru_cache
-  ] ++ lib.optional (pythonOlder "3.4") pathlib
-    ++ lib.optional delugeSupport deluge;
+    flask_login flask-cors
+    pyparsing zxcvbn-python future
+    # Optional requirements
+    deluge-client
+  ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
   meta = with lib; {
     homepage    = https://flexget.com/;

From 7685e17ea6b637ed928cbfe69aeab463deb5e28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 23 Dec 2018 16:52:03 +0100
Subject: [PATCH 2568/2793] ghostwriter: install translations

Fixes #52724.
The `lrelease` binary is used to do that, so I had to add qttools.
---
 pkgs/applications/editors/ghostwriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 1ed09a1caa5..65645dcc969 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebkit, hunspell }:
 
 stdenv.mkDerivation rec {
   pname = "ghostwriter";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m";
   };
 
-  nativeBuildInputs = [ qmake pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig qttools ];
 
   buildInputs = [ qtwebkit hunspell ];
 

From 07adbdf1e74d0b1cca4e9edecebd994a7fa1c83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 23 Dec 2018 17:04:07 +0100
Subject: [PATCH 2569/2793] python.pkgs.pyliblo: 0.9.2 -> 0.10.0

Fixes #52727.
---
 pkgs/development/python-modules/pyliblo/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix
index 9dc57aa9c72..3c637ffced3 100644
--- a/pkgs/development/python-modules/pyliblo/default.nix
+++ b/pkgs/development/python-modules/pyliblo/default.nix
@@ -2,20 +2,21 @@
 , buildPythonPackage
 , fetchurl
 , isPyPy
-, pkgs
+, liblo
+, cython
 }:
 
 buildPythonPackage rec {
   pname = "pyliblo";
-  version = "0.9.2";
+  version = "0.10.0";
   disabled = isPyPy;
 
   src = fetchurl {
     url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
-    sha256 = "382ee7360aa00aeebf1b955eef65f8491366657a626254574c647521b36e0eb0";
+    sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw";
   };
 
-  propagatedBuildInputs = [ pkgs.liblo ];
+  buildInputs = [ liblo cython ];
 
   meta = with stdenv.lib; {
     homepage = http://das.nasophon.de/pyliblo/;

From 7cb982776ee55b9d42ba87d0a1faca7520caa488 Mon Sep 17 00:00:00 2001
From: Yannis Koutras <ioannis.koutras@gmail.com>
Date: Sun, 23 Dec 2018 18:09:45 +0200
Subject: [PATCH 2570/2793] pythonPackages.cli-helpers: fix dependencies
 (#52692)

---
 pkgs/development/python-modules/cli-helpers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 799ad0473ea..f2817d0fd32 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -1,11 +1,13 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, configobj
 , terminaltables
 , tabulate
 , backports_csv
 , wcwidth
 , pytest
+, mock
 , isPy27
 }:
 
@@ -19,12 +21,13 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
+    configobj
     terminaltables
     tabulate
     wcwidth
   ] ++ (lib.optionals isPy27 [ backports_csv ]);
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest mock ];
 
   checkPhase = ''
     py.test

From 0b517e33de99323ac991e528d63318f97bdac29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Dec 2018 16:53:06 +0100
Subject: [PATCH 2571/2793] lmms: 1.2.0-rc6 -> 1.2.0-rc7

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

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 0ff864c0048..59e94e0bdad 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
-, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
+, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
 , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
 , qtbase, qtx11extras, qttools, SDL ? null }:
 
 stdenv.mkDerivation rec {
   name = "lmms-${version}";
-  version = "1.2.0-rc6";
+  version = "1.2.0-rc7";
 
   src = fetchFromGitHub {
     owner = "LMMS";
     repo = "lmms";
     rev = "v${version}";
-    sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25";
+    sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis";
     fetchSubmodules = true;
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     alsaLib
     fftwFloat
     fltk13
-    fluidsynth
+    fluidsynth_1
     lame
     libgig
     libjack2

From 81e44b093005fb3f91048f09b425b49b546ccab6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Dec 2018 10:52:29 -0600
Subject: [PATCH 2572/2793] datamash: 1.3 -> 1.4

https://lists.gnu.org/archive/html/info-gnu/2018-12/msg00014.html
---
 pkgs/tools/misc/datamash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index d8591647ad3..230a97da5e4 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "datamash-${version}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchurl {
     url = "mirror://gnu/datamash/${name}.tar.gz";
-    sha256 = "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf";
+    sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
   };
 
   meta = with stdenv.lib; {

From 142687c5c77299785f410dfed96817747a9d2401 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 23 Dec 2018 12:26:31 -0500
Subject: [PATCH 2573/2793] python3Packages.flit: 1.0 -> 1.2.1 (#51674)

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

diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index f0f7ee84bce..7c64d9bd183 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -28,14 +28,15 @@ buildPythonPackage rec {
   };
 
   disabled = !isPy3k;
-  propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36;
+  propagatedBuildInputs = [ docutils requests requests_download pytoml ]
+    ++ lib.optional (pythonOlder "3.6") zipfile36;
 
   checkInputs = [ pytest testpath responses ];
 
   # Disable test that needs some ini file.
   # Disable test that wants hg
   checkPhase = ''
-    py.test -k "not test_invalid_classifier and not test_build_sdist"
+    HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist"
   '';
 
   meta = {

From e8a79999c0f6379be8a088807040f7e4c3221517 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 20 Dec 2018 15:01:46 -0200
Subject: [PATCH 2574/2793] liquidwar6: fix double definition of
 GL_GLEXT_VERSION

---
 pkgs/games/liquidwar/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 9a6ff4e0ae8..6f0475209be 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  NIX_CFLAGS_COMPILE =
+    "-Wno-error=deprecated-declarations" +
+    # Avoid GL_GLEXT_VERSION double definition
+    " -DNO_SDL_GLEXT"
+  ;
 
   # To avoid problems finding SDL_types.h.
   configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ];

From cb24feaa7253010d528e4b82644282f1bd7c5a16 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 20 Dec 2018 15:02:20 -0200
Subject: [PATCH 2575/2793] liquidwar6: remove unneeded dependency on
 libGLU_combined

---
 pkgs/games/liquidwar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 6f0475209be..303855fb348 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xproto, libX11, libXrender
-, gmp, libGLU_combined, libjpeg, libpng
+, gmp, libjpeg, libpng
 , expat, gettext, perl, guile
 , SDL, SDL_image, SDL_mixer, SDL_ttf
 , curl, sqlite, libtool, readline
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xproto libX11 gmp guile
-    libGLU_combined libjpeg libpng
+    libjpeg libpng
     expat gettext perl
     SDL SDL_image SDL_mixer SDL_ttf
     curl sqlite

From c02445eec05b069f08245231e9434896880765bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Dec 2018 09:33:29 -0800
Subject: [PATCH 2576/2793] python37Packages.zeep: 3.1.0 -> 3.2.0 (#52699)

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

diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 09beb9d8991..c4d9222e817 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2d96881689c3f29e8ea5c8c6abb2b17fb0f470deee15d0d7bec4e74592850f6";
+    sha256 = "0bfpdy3hi8aa45piwg5gj0xxa187v13d66qr1ki73qn7c6rbizp5";
   };
 
   propagatedBuildInputs = [

From 4ecf1744c9b45eeef14de64cbbdd7497c72ffd35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Dec 2018 09:34:26 -0800
Subject: [PATCH 2577/2793] python37Packages.typed-ast: 1.1.0 -> 1.1.1 (#52700)

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

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 5bd0f5f81d2..ead61eef363 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,10 +1,10 @@
 { buildPythonPackage, fetchPypi, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.1.0";
+  version = "1.1.1";
   src = fetchPypi{
     inherit pname version;
-    sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa";
+    sha256 = "1iml3lcw50bz1fyw7s9sa4mqzbmqs5w43k6bsv5ix4vqa34mvckc";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";

From ff004d0b14afd86987f7674ea82b07b11f77648d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 23 Dec 2018 12:40:51 -0500
Subject: [PATCH 2578/2793] pythonPackages.nose-randomly: add checkPhase
 (#52628)

---
 pkgs/development/python-modules/nose-randomly/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix
index 2bfa5cb0f05..a9e31016a1f 100644
--- a/pkgs/development/python-modules/nose-randomly/default.nix
+++ b/pkgs/development/python-modules/nose-randomly/default.nix
@@ -19,6 +19,10 @@ buildPythonPackage rec {
     nose
   ];
 
+  checkPhase = ''
+    nosetests
+  '';
+
   meta = with lib; {
     description = "Nose plugin to randomly order tests and control random.seed";
     homepage = https://github.com/adamchainz/nose-randomly;

From 044ff3dc6632d45bcf25ad1d86589531792a0af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Dec 2018 18:54:13 +0100
Subject: [PATCH 2579/2793] nixos/vdr: don't delete recordings

---
 nixos/modules/services/hardware/vdr.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index b0ecb944b5e..75136a2f796 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -40,7 +40,7 @@ in {
 
   config = mkIf cfg.enable {
     systemd.tmpfiles.rules = [
-      "d ${cfg.videoDir} 0755 vdr vdr 0"
+      "d ${cfg.videoDir} 0755 vdr vdr -"
       "Z ${cfg.videoDir} - vdr vdr -"
     ];
 

From 2df9920c7983d6dfd7c0f9f7677e7ac91775c435 Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Mon, 24 Dec 2018 07:33:56 +1000
Subject: [PATCH 2580/2793] openra: 20180923->20181215

---
 pkgs/games/openra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index 130a413f1ae..922d4f4762c 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -4,8 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openra-${version}";
-  version = "20180923";
+  pname = "openra";
+  version = "20181215";
 
   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 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
+    sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r";
 
     extraPostFetch = ''
       sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh

From 1be47a2c001b16d1333016ad4e0e0504b0b9c7b5 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 23 Dec 2018 17:59:57 +0000
Subject: [PATCH 2581/2793] mono: renamed generic-cmake.nix -> generic.nix

---
 pkgs/development/compilers/mono/4.nix                           | 2 +-
 pkgs/development/compilers/mono/5.nix                           | 2 +-
 .../compilers/mono/{generic-cmake.nix => generic.nix}           | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/mono/{generic-cmake.nix => generic.nix} (100%)

diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix
index f445127c0da..3c748e2dff7 100644
--- a/pkgs/development/compilers/mono/4.nix
+++ b/pkgs/development/compilers/mono/4.nix
@@ -1,6 +1,6 @@
 { callPackage, Foundation, libobjc }:
 
-callPackage ./generic-cmake.nix (rec {
+callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.8.1.0";
   sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix
index ec7ad749d3b..2b987b08364 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/pkgs/development/compilers/mono/5.nix
@@ -1,6 +1,6 @@
 { callPackage, Foundation, libobjc }:
 
-callPackage ./generic-cmake.nix (rec {
+callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "5.16.0.220";
   sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l";
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic.nix
similarity index 100%
rename from pkgs/development/compilers/mono/generic-cmake.nix
rename to pkgs/development/compilers/mono/generic.nix

From 013927f93cbca5c823710042e469d573d17859c8 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 23 Dec 2018 17:06:58 +0000
Subject: [PATCH 2582/2793] mono: llvm fork update 3.4svn-mono-f9b1a74368 ->
 3.6-mono-2017-02-15

Also now builds with --enable-llvmloaded.

Extracted by @obadz from @abbradar's #23295
https://github.com/NixOS/nixpkgs/commit/d27768ac1bb06aa4471dc5bcd500a583bd4ece24
---
 .../compilers/mono/build-fix-llvm.patch       | 12 --------
 pkgs/development/compilers/mono/generic.nix   |  1 -
 pkgs/development/compilers/mono/llvm.nix      | 30 ++++++++-----------
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/build-fix-llvm.patch

diff --git a/pkgs/development/compilers/mono/build-fix-llvm.patch b/pkgs/development/compilers/mono/build-fix-llvm.patch
deleted file mode 100644
index 526986ad12c..00000000000
--- a/pkgs/development/compilers/mono/build-fix-llvm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt
-index be484a6..c92ff46 100644
---- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old
-+++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt
-@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter
-   DwarfCompileUnit.cpp
-   DwarfDebug.cpp
-   DwarfException.cpp
-+  DwarfMonoException.cpp
-   ErlangGCPrinter.cpp
-   OcamlGCPrinter.cpp
-   Win64Exception.cpp
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 12f833f5525..400b040ae85 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   ]
   ++ stdenv.lib.optionals withLLVM [
     "--enable-llvm"
-    "--enable-llvmloaded"
     "--with-llvm=${llvm}"
   ];
 
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 8e9dcc1dbcb..616ec420d2d 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -1,9 +1,10 @@
 { stdenv
-, fetchurl
-, perl
+, lib
+, fetchFromGitHub
 , groff
 , cmake
-, python
+, python2
+, perl
 , libffi
 , libbfd
 , libxml2
@@ -14,22 +15,16 @@
 
 stdenv.mkDerivation rec {
   name    = "llvm-${version}";
-  version = "3.4svn-mono-f9b1a74368";
-  src = fetchurl {
-    # from the HEAD of the 'mono3' branch
-    url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz";
-    name = "${name}.tar.gz";
-    sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg";
+  version = "3.6-mono-2017-02-15";
+
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "llvm";
+    rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3";
+    sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7";
   };
 
-  patches = [ ./build-fix-llvm.patch ];
-  unpackPhase = ''
-    unpackFile ${src}
-    mv llvm-* llvm
-    sourceRoot=$PWD/llvm
-  '';
-
-  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
+  buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -43,7 +38,6 @@ stdenv.mkDerivation rec {
   cmakeFlags = with stdenv; [
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
   ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;

From 35b6b892f72e939755ef90d18daa33b7aae51449 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sun, 23 Dec 2018 22:39:08 +0100
Subject: [PATCH 2583/2793] Revert "neopg: 0.0.4 -> 0.0.5"

This broke the build, as the bump introduced test failures. Revert to a
working version.

This reverts commit 031737126c72c2cdc117dcc42472a8475f835bb8.
---
 pkgs/tools/security/neopg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 7cb442bdf62..cf5f760cda4 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   name = "neopg-${version}";
-  version = "0.0.5";
+  version = "0.0.4";
 
   src = fetchFromGitHub {
     owner = "das-labor";
     repo = "neopg";
     rev = "v${version}";
-    sha256 = "1ky3pwg6w8kyaa9iksfx6rryva87mbj1h3yi2mrzp2h7jhrfffpp";
+    sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
     fetchSubmodules = true;
   };
 

From 30c6234e1549a67c931c046620b307bd27aa186a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Dec 2018 22:56:58 +0100
Subject: [PATCH 2584/2793] python3Packages.pyaxmlparser: fix build

The build is currently broken on master[1] due to a major bump of
`click` in fe0af1ce777abf99a3fd851a86f2000326153207.

Manually patching `setup.py` temporarily fixes the issue. To ensure that
succeeding builds don't deliver packages breaking at runtime due to
dependency issues I switched to the GitHub archive as source since it
contains tests as well.

Additionally, Python 2.7 support has been dropped. It seems as it
was never intended to support Python3 here, I simply forgot to disable
the Python2 build.

```
TypeError: AXMLParser object is not an iterator
```

[1] https://hydra.nixos.org/build/86108813
---
 .../python-modules/pyaxmlparser/default.nix   | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 9ea3a3eda07..0721c0d449c 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,16 +1,30 @@
-{ buildPythonPackage, stdenv, lxml, click, fetchPypi }:
+{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
 
 buildPythonPackage rec {
   version = "0.3.13";
   pname = "pyaxmlparser";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mzdrifnaky57vkmdvg0rgjss55xkxaramci3wpv4h65lmk95988";
+  # the PyPI tarball doesn't ship tests.
+  src = fetchFromGitHub {
+    owner = "appknox";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0jfjhxc6b57npsidknxmhj1x813scg47aaw90ybyr90fpdz5rlwk";
   };
 
+  disabled = !isPy3k;
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "click==6.7" "click"
+  '';
+
   propagatedBuildInputs = [ lxml click ];
 
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test tests/
+  '';
+
   meta = with stdenv.lib; {
     description = "Python3 Parser for Android XML file and get Application Name without using Androguard";
     homepage = https://github.com/appknox/pyaxmlparser;

From 1e25b748fae3cfcb3179665481967eb0e9027fd4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 23 Dec 2018 23:30:11 +0100
Subject: [PATCH 2585/2793] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 216 ++++++++++++++--------------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ebb8f1868ff..38a2a584262 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-12-10";
+    name = "ale-2018-12-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d";
-      sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp";
+      rev = "73ca1e71918a0b50b7bbcbed91857c3618ad93cc";
+      sha256 = "0q2wmpprr6mva6k7d8280cpf8ia6g7fbzw309fb0291y7241v5j1";
     };
   };
 
@@ -103,12 +103,12 @@
   };
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "awesome-vim-colorschemes-2018-10-30";
+    name = "awesome-vim-colorschemes-2018-12-16";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "21d1c93da95d58bead99f3226f9447f5b035afe1";
-      sha256 = "1niwwyxgq7k7mbi05lnpz12lbmn9mam9x4qvzxcbvxsqqp2zzsj8";
+      rev = "680930f34bf5d4007dbaee66aba2dd688cbb3098";
+      sha256 = "0jk4fm2ivf6r91yra7ddyxfbh2swf315zvmrm5ym605xcsiwv0nw";
     };
   };
 
@@ -143,12 +143,12 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-11-07";
+    name = "caw-vim-2018-12-17";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
-      sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
+      rev = "0060d6fbf53e02a153c5faf6eca1d10c1ed7c489";
+      sha256 = "01pngcf7b04rw2a0bmr8xv191wlnsny2rwg5xzhmargzf68fd6lv";
     };
   };
 
@@ -344,22 +344,22 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-11";
+    name = "denite-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17";
-      sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al";
+      rev = "c21dd10b6d1c4fd3805b130e1a6551daadb8c111";
+      sha256 = "0is51kkzf2vqaxhdfsxaq3vzwjcysriqsigfmv8wl80r6nk1nxlp";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-10-12";
+    name = "deol-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "04a5295ebad2df1a2141b85dc0b78cc51ea86fb4";
-      sha256 = "1v5qip8kzrsq8qmmjrvhm15d9wrn48iz2s62qddcgvc0sdzk1y64";
+      rev = "b052a5aef05bafd2b6dc48e089483eb5839febc6";
+      sha256 = "1y6nx364xg6xh9arvr53kk45j5p5pkhrm1izkqaigwmsnyr2gdjq";
     };
   };
 
@@ -386,12 +386,12 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-03";
+    name = "deoplete-jedi-2018-12-22";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "583ee29a0a0fe6206f3f106b8866ff2b663fde74";
-      sha256 = "0lbiwk6fc1z9i3sx4y62gsl3yr8pzv09s4wwxq1k8cziddbiypig";
+      rev = "d3fac767f7034baa3d61baf4f844c5f1b3470817";
+      sha256 = "0m16h2fwz7i7l7l5833jkc97sapg6p56v60yjwilmrlagq4k4bk8";
       fetchSubmodules = true;
     };
   };
@@ -427,12 +427,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-11";
+    name = "deoplete-nvim-2018-12-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "04159b053ae83933d67225c53c36d98e516fa729";
-      sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115";
+      rev = "48bcbe06757907de62919d27dc75d51dc1deed3a";
+      sha256 = "1f7l8mczp5kl06swwzbdhbjqc9vw9xnyx1pbxla7wly2djjcawh2";
     };
   };
 
@@ -509,12 +509,12 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-11-30";
+    name = "falcon-2018-12-21";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "070f2132266d85059f36496ed277527d5b8f00a1";
-      sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
+      rev = "92489daf912f33c743fb07b170a563aa53a8a0a6";
+      sha256 = "1a3yahjvp98icfv6a6d0z0v70rb9i0580iik2jjbcdmbri5jbnj2";
     };
   };
 
@@ -529,12 +529,12 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-04";
+    name = "ferret-2018-12-20";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "fbef13c37f0083ecbcec131c2a8f62079f3cdacb";
-      sha256 = "1ajrwg5fg3myhazsdfprlj50qlw25jk1viy1cny6mzhbvmb80qln";
+      rev = "b1647292669ddfa13bfd16d2cc3e084b9b01cfbb";
+      sha256 = "1afry4h6ms2h92c0gdcx89z9jb1g2d5wk4swc3xc20x1p32qdql1";
     };
   };
 
@@ -861,12 +861,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-08";
+    name = "ncm2-2018-12-23";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "40d1eb9b52805e0e81bbaac4bb87788007ad19de";
-      sha256 = "1awbzm3vgp31afjlbagxjzzxxgwmy2axhnyhcal7x1rk93cr78iw";
+      rev = "ead80d5e0c8e6079b780a0470c3e893b508fcc5c";
+      sha256 = "082ixcr7v8h349aiyi0rrcp61nxk7g5jp0s1g48rv0mknwkzj9ir";
     };
   };
 
@@ -971,12 +971,12 @@
   };
 
   neoformat = buildVimPluginFrom2Nix {
-    name = "neoformat-2018-09-22";
+    name = "neoformat-2018-12-21";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07";
-      sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw";
+      rev = "fec5be9e3ee10d8311fb78944fdaa8547480f3d9";
+      sha256 = "0wzw59pw22gqd9db6j1yvyz5l2xvrcw3gwjcg03pys9ynwd0vcjs";
     };
   };
 
@@ -991,12 +991,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-15";
+    name = "neomake-2018-12-23";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "b84769baf9f04e1018ca16bb5d22287500c25e43";
-      sha256 = "0wfh0332yczq42pr2fyv5bv3ryf09021n1nsfrgiyrcy00k62r4j";
+      rev = "a7fe130028375e7dbc0d17ba5ee6b4d807245875";
+      sha256 = "14wmpf719w05hy9nhgdkpag5chzyai1x227cmmc3sqgdjy6phfxs";
     };
   };
 
@@ -1081,12 +1081,12 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-12-13";
+    name = "nim-vim-2018-12-16";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
-      rev = "358e2e013056af5ad09b3e2963e3390db8677680";
-      sha256 = "0ygyxcbbf6vqimzi71gdq40xx7kyi03yc73h5lyycnzwqc7wyxm2";
+      rev = "21731384b8f0675e3d666e98dd6625508c30f3af";
+      sha256 = "15l897xyli4wr5adgciizqnpqv80l95ykf2xq5kvc4icgj93gwga";
     };
   };
 
@@ -1111,12 +1111,12 @@
   };
 
   nvim-yarp = buildVimPluginFrom2Nix {
-    name = "nvim-yarp-2018-09-14";
+    name = "nvim-yarp-2018-12-23";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
-      rev = "5443ac06b3989baa9262adec810503e0234c316e";
-      sha256 = "0b6gmsbgzgwidl0rpkwzr2l1qxd9aw5pvj8izflf6gz36r2irszq";
+      rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0";
+      sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v";
     };
   };
 
@@ -1271,12 +1271,12 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-11-30";
+    name = "ranger-vim-2018-12-21";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
-      rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
-      sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
+      rev = "0bd9e8122f79655f58142389c595513b855cf05d";
+      sha256 = "0vpfdn01vy065hpc9ii56dsx35cxpmw2k6cidjdl0czy30vyjy94";
     };
   };
 
@@ -1341,12 +1341,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-11-29";
+    name = "rust-vim-2018-12-23";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
-      sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
+      rev = "c6312525ce948e603aec827fba8842a5dea92a9c";
+      sha256 = "11ki4zfnnizvdpymddxb7l1qmx1090xn5hiwhxifsrlg1c0dn3dp";
     };
   };
 
@@ -1501,12 +1501,12 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-11-01";
+    name = "targets-vim-2018-12-21";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
-      rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
-      sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
+      rev = "55c9c40e47af660677725b68fcfe7e88d9985889";
+      sha256 = "0jywlb5yxkyxn6vrdd3vd7q522llr2jplcl9yf97v89x3kmwpbqy";
     };
   };
 
@@ -1631,12 +1631,12 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-11-25";
+    name = "vim-2018-12-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "f24e259073994b4f76d125332954d26748fcc581";
-      sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
+      rev = "88b2e4086966a36beebd146b67f83e19079142c9";
+      sha256 = "14l1vkja1179b10ikg7i39z4vi5zm1c5call54sa5jb5c68fjbvr";
     };
   };
 
@@ -1841,12 +1841,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-12-10";
+    name = "vim-airline-2018-12-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60";
-      sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr";
+      rev = "72888d87ea57761f21c9f67cd0c0faa5904795eb";
+      sha256 = "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd";
     };
   };
 
@@ -1891,12 +1891,12 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-12-10";
+    name = "vim-autoformat-2018-12-19";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "c203080645936e73b2124040bc963386eeb44f5e";
-      sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9";
+      rev = "4f993fad63f98b844a5bd728c5a963c0da404e1a";
+      sha256 = "12c8yqwwm7n63r3gpl5zc5qd9mq3xdzk4rj4s91ni5x6njirpjzf";
     };
   };
 
@@ -1951,12 +1951,12 @@
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-12-14";
+    name = "vim-codefmt-2018-12-15";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "62c09d51dd5fda2cbd579a3c4f261bbf34a1f655";
-      sha256 = "10bv35xm0qs44sff5nkp3pvvvi1fh339m4a2fcnnz2bbd0nal8dl";
+      rev = "2147649088e977852c168a2173f13e0e04d555ed";
+      sha256 = "17kc9zwj3flj32riqsknwik5b5fr042yr3qn7w9wqk0m2vdid4mv";
     };
   };
 
@@ -2231,12 +2231,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-11-22";
+    name = "vim-fugitive-2018-12-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
-      sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
+      rev = "baee3bbfe87784985a410924a2b3a0008d6b8424";
+      sha256 = "05c99m2ph0iy9fan2l1148f7vs3nii5zbya7hpdiarvs5i35cj53";
     };
   };
 
@@ -2271,12 +2271,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-12-13";
+    name = "vim-gitgutter-2018-12-15";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "5c636b128ed40f3ed926d18adb307e01dfc082f8";
-      sha256 = "014ylh6cmrfw7qp6nrjz0dr4f5v09fmmfi729kpkf97lx79sd37i";
+      rev = "1d422b9f98194e38bc56e54192c9bc66d95c21f1";
+      sha256 = "1xv4brbhpxx23q2wklxxclzj9n1fi34m2rj0syf7ggp9fy7y50dk";
     };
   };
 
@@ -2291,12 +2291,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-12";
+    name = "vim-go-2018-12-21";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27";
-      sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw";
+      rev = "ead0ef3a169e1b990f20cbbbcca8b3bda5056675";
+      sha256 = "1f4v4jilk3hf0xapqq7zm6fx2p8n43baq3j9128ayd0cg5i60352";
     };
   };
 
@@ -2311,12 +2311,12 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-11-08";
+    name = "vim-grepper-2018-12-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
-      sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
+      rev = "9b62e6bdd9de9fe027363bbde68e9e32d937cfa0";
+      sha256 = "15j65qcnyfdkzyyv7504anaic891v5kvnqszcz37y5j15zjs5c02";
     };
   };
 
@@ -2491,22 +2491,22 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-14";
+    name = "vim-javacomplete2-2018-12-21";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "e896e0b249f6115a921cb27aaabdb688374d9f21";
-      sha256 = "0lqhb5kgswvsni456nmskrmn9lrnxwg523x5yaylm8s71w3kv1a6";
+      rev = "fd441fde07fe132f1e278bc61354e02277559d2b";
+      sha256 = "11z9q11xgnmsm6dd4bk19pj585qwmi5qrlbs4ga5vyvbvng1xgl5";
     };
   };
 
   vim-javascript = buildVimPluginFrom2Nix {
-    name = "vim-javascript-2018-08-29";
+    name = "vim-javascript-2018-12-23";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
-      rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28";
-      sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl";
+      rev = "50c135735611946707d04757fdc0cde5537659ae";
+      sha256 = "175w6a5x8wcssd5ix32gmyc4s4v7l4nmhhzvs28n3lwias8cm2q9";
     };
   };
 
@@ -2682,12 +2682,12 @@
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
-    name = "vim-nerdtree-tabs-2018-05-05";
+    name = "vim-nerdtree-tabs-2018-12-21";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
-      rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
-      sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
+      rev = "07d19f0299762669c6f93fbadb8249da6ba9de62";
+      sha256 = "16iqhp5l6xvq0k8bq9ngqfhish1fwggpmvd7ni1fh5dqr00iii9x";
     };
   };
 
@@ -3002,12 +3002,12 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-11-03";
+    name = "vim-scriptease-2018-12-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
-      rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
-      sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
+      rev = "386f19cd92f7b30cd830784ae22ebbe7033564aa";
+      sha256 = "122bnx9j1pdgpkfph48l4zngak1hjlijbksim05iypi7sd0bvix9";
     };
   };
 
@@ -3032,12 +3032,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-11-16";
+    name = "vim-signify-2018-12-20";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
-      sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
+      rev = "ea6db3c7df7671584df0a37a2436a919332d0b7c";
+      sha256 = "0876ik4a4kxa22fwcgm9b2swnc6ngmiakhy4h0brxgmci8h0r9m2";
     };
   };
 
@@ -3112,12 +3112,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-12-08";
+    name = "vim-startify-2018-12-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "5cd4faf2c681c36edfae3aa907d0ab720ff9c6e5";
-      sha256 = "0zs1sxwpi24lfiaz5k5wglm642qrmd8krcv8vjrvg222jq4inhlf";
+      rev = "9c26c7e8dcee2e580f137610ccde1af40a19d2bb";
+      sha256 = "01km6gka0k06kppk9q3c5c1a2jlg5ibid37dv6575kfkibhri3yn";
     };
   };
 
@@ -3192,12 +3192,12 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-11-19";
+    name = "vim-terraform-2018-12-20";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
-      sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
+      rev = "0f62e7937781cee672227f292b59ce687b28f037";
+      sha256 = "1iwsy5hcsxjzcgksfqwcn8lqwys828dsihazixjv01a31d2wrjsk";
     };
   };
 
@@ -3272,12 +3272,12 @@
   };
 
   vim-unimpaired = buildVimPluginFrom2Nix {
-    name = "vim-unimpaired-2018-07-26";
+    name = "vim-unimpaired-2018-12-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
-      rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da";
-      sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv";
+      rev = "9da253e92ca8444be9f67a5b0086c9213b8772e9";
+      sha256 = "0s5jvc618nncsc4dzgr30nf2xfm71jpdsxq90gnxm1730fyln8f3";
     };
   };
 
@@ -3312,12 +3312,12 @@
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-11-25";
+    name = "vim-wakatime-2018-12-19";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
-      sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
+      rev = "227099fba9c60f58c520ec055c79335405d11668";
+      sha256 = "011wjh5iwcp0ixbyfry2rgjiwz46dc1iilhi6zlixkf3lk2qbfih";
     };
   };
 
@@ -3422,12 +3422,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-12";
+    name = "vimtex-2018-12-21";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "6165a4421e7605a96d9b6c83f3ac853bf2f90a03";
-      sha256 = "01yp79w53wyxqjd1dnba069pmj1b56nl52x2r3mfzzldm1p5gx4k";
+      rev = "0715b256f3cdab75c2b7818773f7df297d0a7cac";
+      sha256 = "1kkhhvx3dxd9dv9na724l7kzzlg14xbgh1mh82dwzv91yqikmr2c";
     };
   };
 
@@ -3553,12 +3553,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-12-12";
+    name = "youcompleteme-2018-12-23";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234";
-      sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql";
+      rev = "7997fc5536e8220ed2798c5522a1eb4421577fa2";
+      sha256 = "1662js5dpspmrak92zwy8751qfd1pkp5q7xgw2m6c76ccvv88c5p";
       fetchSubmodules = true;
     };
   };

From 455a04727b5c287202f12a7db9429fe3699127dd Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 23 Dec 2018 22:17:51 +0000
Subject: [PATCH 2586/2793] ue4demos: fix download URLs

http://ue4linux.raxxy.com/ has been down for a while.

I mirrored the demos to https://ludios.org/mirror/ue4demos/ because
Wayback transfer speeds can be slow.
---
 pkgs/games/ue4demos/default.nix | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index b8b165ee051..b9cc8a6cd6d 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -1,6 +1,13 @@
 { stdenv, fetchurl, unzip, patchelf, xorg, openal }:
 
 let
+  urls = file:
+    [
+      # Untrusted mirrors - do not update hashes
+      "https://ludios.org/mirror/ue4demos/${file}"
+      "http://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
+    ];
+
   buildDemo = { name, src }:
     stdenv.mkDerivation rec {
       inherit name src;
@@ -53,7 +60,7 @@ in {
   tappy_chicken = buildDemo rec {
     name = "ue4demos-tappy_chicken";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/tappy_chicken.zip";
+      urls = urls "tappy_chicken.zip";
       sha256 = "0lwhvk3lpb2r5ng2cnzk7fpjj5lwhy2sch1a8v154x1xfhfb3h4v";
     };
   };
@@ -61,7 +68,7 @@ in {
   swing_ninja = buildDemo rec {
     name = "ue4demos-swing_ninja";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/swing_ninja.zip";
+      urls = urls "swing_ninja.zip";
       sha256 = "1bmgqqk3lda5h7nnqi59jgyrsn0clr3xs0k1jclnqf9fk0m8hjcv";
     };
   };
@@ -69,7 +76,7 @@ in {
   card_game = buildDemo rec {
     name = "ue4demos-card_game";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/card_game.zip";
+      urls = urls "card_game.zip";
       sha256 = "154baqias5q7kad0c89k35jbmnmlm865sll02mi7bk1yllcckz5z";
     };
   };
@@ -77,7 +84,7 @@ in {
   vehicle_game = buildDemo rec {
     name = "ue4demos-vehicle_game";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/vehicle_game.zip";
+      urls = urls "vehicle_game.zip";
       sha256 = "03dlacf1iv7sgn7pl3sx9r6243wy8fsi2kd858syfm9slg0190bs";
     };
   };
@@ -85,7 +92,7 @@ in {
   shooter_game = buildDemo rec {
     name = "ue4demos-shooter_game";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/shooter_game.zip";
+      urls = urls "shooter_game.zip";
       sha256 = "1bk32k349iqbqk8x8jffnqq0pjiqmvrvv675xxmlvkkr8qrlhz98";
     };
   };
@@ -93,7 +100,7 @@ in {
   strategy_game = buildDemo rec {
     name = "ue4demos-strategy_game";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/strategy_game.zip";
+      urls = urls "strategy_game.zip";
       sha256 = "1p7i966v1ssm20y12g4wsccpgnky3szy19qyjlacynk7bgbk6lg7";
     };
   };
@@ -101,7 +108,7 @@ in {
   black_jack = buildDemo rec {
     name = "ue4demos-black_jack";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/black_jack.zip";
+      urls = urls "black_jack.zip";
       sha256 = "0g52wkzn5isa3az32y25yx5b56wxks97pajqwkmm6gf4qpkfksxv";
     };
   };
@@ -109,7 +116,7 @@ in {
   landscape_mountains = buildDemo rec {
     name = "ue4demos-landscape_mountains";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/landscape_mountains.zip";
+      urls = urls "landscape_mountains.zip";
       sha256 = "14jzajhs3cpydvf3ag7lpj4hkpbjpwnn3xkdvdx92fi0pcl8cwym";
     };
   };
@@ -117,7 +124,7 @@ in {
   matinee_demo = buildDemo rec {
     name = "ue4demos-matinee_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/matinee_demo.zip";
+      urls = urls "matinee_demo.zip";
       sha256 = "0ib8k6fl15cxzdarar2sqq5v3g3c7p2jidkdjd00nym6cvkibb4d";
     };
   };
@@ -125,7 +132,7 @@ in {
   elemental_demo = buildDemo rec {
     name = "ue4demos-elemental_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/elemental_demo.zip";
+      urls = urls "elemental_demo.zip";
       sha256 = "1v4jdsy8jvv8wgc8dx17q17xigfrya5q0nfdzw4md7fzm3bg9z0v";
     };
   };
@@ -133,7 +140,7 @@ in {
   effects_cave_demo = buildDemo rec {
     name = "ue4demos-effects_cave_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/effects_cave_demo.zip";
+      urls = urls "effects_cave_demo.zip";
       sha256 = "0lvd3aaha2x9pnpkdmrzi6nf7hymr95834z3l8shygjf9kbbzsz4";
     };
   };
@@ -141,7 +148,7 @@ in {
   realistic_rendering = buildDemo rec {
     name = "ue4demos-realistic_rendering";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/realistic_rendering_demo.zip";
+      urls = urls "realistic_rendering_demo.zip";
       sha256 = "0r16nznkv475hkw5rnngqsc69ch8vh86dppyyyr9nn43dkr2110a";
     };
   };
@@ -149,7 +156,7 @@ in {
   reflections_subway = buildDemo rec {
     name = "ue4demos-reflections_subway";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/reflections_subway_demo.zip";
+      urls = urls "reflections_subway_demo.zip";
       sha256 = "0dw5sm7405gxw9iqz0vpnhdprrb4wl5i14pvzl1381k973m8bd00";
     };
   };
@@ -157,7 +164,7 @@ in {
   scifi_hallway_demo = buildDemo rec {
     name = "ue4demos-scifi_hallway_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/sci-fi_hallway_demo.zip";
+      urls = urls "sci-fi_hallway_demo.zip";
       sha256 = "14qp9iwm47awn8d9j6ijh6cnds308x60xs4vi2fvz2666jlz1pq2";
     };
   };
@@ -165,7 +172,7 @@ in {
   mobile_temple_demo = buildDemo rec {
     name = "ue4demos-mobile_temple_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/mobile_temple_demo.zip";
+      urls = urls "mobile_temple_demo.zip";
       sha256 = "12bz4h1b9lhmqglwsa6r8q48ijqbjdha9fql31540d01kigaka75";
     };
   };
@@ -173,7 +180,7 @@ in {
   stylized_demo = buildDemo rec {
     name = "ue4demos-stylized_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/stylized_demo.zip";
+      urls = urls "stylized_demo.zip";
       sha256 = "1676ridmj8rk4y4hbdscfnnka5l636av1xxl0qwvk236kq9j7v0l";
     };
   };
@@ -181,7 +188,7 @@ in {
   blueprint_examples_demo = buildDemo rec {
     name = "ue4demos-blueprint_examples_demo";
     src = fetchurl {
-      url = "http://ue4linux.raxxy.com/blueprint_examples_demo.zip";
+      urls = urls "blueprint_examples_demo.zip";
       sha256 = "076q33h2hy965fvr805hsprkpcmizf638lj2ik8k923v86b15nbv";
     };
   };

From 3ec683c85e62d640230eea8f910a767d31697677 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 22:21:07 +0100
Subject: [PATCH 2587/2793] libgdamm: init at 4.99.11

---
 .../libraries/libgdamm/default.nix            | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/libgdamm/default.nix

diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix
new file mode 100644
index 00000000000..012400a49ab
--- /dev/null
+++ b/pkgs/development/libraries/libgdamm/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3
+, mysqlSupport ? false, mysql ? null
+, postgresSupport ? false, postgresql ? null }:
+
+let
+  gda = libgda.override {
+    inherit mysqlSupport postgresSupport;
+  };
+in stdenv.mkDerivation rec {
+  pname = "libgdamm";
+  version = "4.99.11";
+
+  outputs = [ "out" "dev" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glibmm libxml2 ];
+  propagatedBuildInputs = [ gda ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "C++ bindings for libgda";
+    homepage = http://www.gnome-db.org/;
+    license = licenses.lgpl21Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70b223cb83e..732b552a37b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10813,6 +10813,8 @@ in
 
   libgda = callPackage ../development/libraries/libgda { };
 
+  libgdamm = callPackage ../development/libraries/libgdamm { };
+
   libgdata = gnome3.libgdata;
 
   libgig = callPackage ../development/libraries/libgig { };

From 994a63a91d1ccae905055f65599685a125fea1de Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 22:47:16 +0100
Subject: [PATCH 2588/2793] avahi: add gtk support

---
 pkgs/development/libraries/avahi/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 971637bc787..fc67035ce20 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
 , expat, gettext, intltool, glib, libiconv
+, gtk3Support ? false, gtk3 ? null
 , qt4 ? null
 , qt4Support ? false
 , withLibdnssdCompat ? false }:
@@ -19,13 +20,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdaemon dbus glib expat libiconv ]
     ++ (with perlPackages; [ perl XMLParser ])
+    ++ (stdenv.lib.optional gtk3Support gtk3)
     ++ (stdenv.lib.optional qt4Support qt4);
 
   nativeBuildInputs = [ pkgconfig gettext intltool glib ];
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
-      "--disable-gtk" "--disable-gtk3"
+      "--disable-gtk"
+      (stdenv.lib.enableFeature gtk3Support "gtk3")
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--disable-python" "--localstatedir=/var" "--with-distro=none"
       # A systemd unit is provided by the avahi-daemon NixOS module

From 130c1411540d7dc123bac1655887edac869c3c0a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 22:54:22 +0100
Subject: [PATCH 2589/2793] libepc: init at 0.4.6

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

diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix
new file mode 100644
index 00000000000..59780699fd1
--- /dev/null
+++ b/pkgs/development/libraries/libepc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
+
+let
+  avahiWithGtk = avahi.override { gtk3Support = true; };
+in stdenv.mkDerivation rec {
+  pname = "libepc";
+  version = "0.4.6";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    gtk-doc
+  ];
+  buildInputs = [
+    glib
+    libuuid
+    gtk3
+  ];
+  propagatedBuildInputs = [
+    avahiWithGtk
+    gnutls
+    libsoup
+  ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Easy Publish and Consume Library";
+    homepage = https://wiki.gnome.org/Projects/libepc;
+    license = licenses.lgpl21Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 732b552a37b..86261f7d419 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3932,6 +3932,8 @@ in
 
   libee = callPackage ../development/libraries/libee { };
 
+  libepc = callPackage ../development/libraries/libepc { };
+
   libestr = callPackage ../development/libraries/libestr { };
 
   libevdev = callPackage ../development/libraries/libevdev { };

From ba1f2b345bedd44e16e3a07bda968b72f09a0e54 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 23:16:27 +0100
Subject: [PATCH 2590/2793] goocanvas2: init at 1.90.11

---
 .../libraries/goocanvasmm/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/goocanvasmm/default.nix

diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix
new file mode 100644
index 00000000000..b7f56837686
--- /dev/null
+++ b/pkgs/development/libraries/goocanvasmm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "goocanvasmm";
+  version = "1.90.11";
+
+  outputs = [ "out" "dev" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0";
+  };
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ gtkmm3 goocanvas2 ];
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "C++ bindings for GooCanvas";
+    homepage = https://wiki.gnome.org/Projects/GooCanvas;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86261f7d419..e929e4d1492 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10036,6 +10036,7 @@ in
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
+  goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };
 
   google-gflags = callPackage ../development/libraries/google-gflags { };
   gflags = google-gflags; # TODO: move to aliases.nix

From 5fc2a47e7eebf120b1a3518f4329596ede16391a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Dec 2018 16:03:24 +0100
Subject: [PATCH 2591/2793] mm-common: init 0.9.12

---
 .../libraries/mm-common/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/mm-common/default.nix

diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix
new file mode 100644
index 00000000000..78ae8875fcf
--- /dev/null
+++ b/pkgs/development/libraries/mm-common/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "mm-common";
+  version = "0.9.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "02vwgv404b56wxy0gnm9xq9fvzgn9dhfqcy2hhl78ljv3v7drzyf";
+  };
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Common build files of GLib/GTK+ C++ bindings";
+    longDescription = ''
+      The mm-common module provides the build infrastructure and utilities
+      shared among the GNOME C++ binding libraries. It is only a required
+      dependency for building the C++ bindings from the gnome.org version
+      control repository. An installation of mm-common is not required for
+      building tarball releases, unless configured to use maintainer-mode.
+    '';
+    homepage = http://www.gtkmm.org;
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e929e4d1492..df3e23f3d66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18285,6 +18285,8 @@ in
 
   mm = callPackage ../applications/networking/instant-messengers/mm { };
 
+  mm-common = callPackage ../development/libraries/mm-common { };
+
   matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { };
 
   mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };

From 53f04caad2a84ee1dd3c289e6cef089308d0ae91 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Dec 2018 16:17:05 +0100
Subject: [PATCH 2592/2793] gtksourceviewmm4: init at 3.91.1

---
 .../libraries/gtksourceviewmm/4.x.nix         | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/gtksourceviewmm/4.x.nix

diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
new file mode 100644
index 00000000000..d60bb29c47a
--- /dev/null
+++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "gtksourceviewmm";
+  version = "3.91.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy";
+  };
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none";
+    };
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    homepage = https://developer.gnome.org/gtksourceviewmm/;
+    description = "C++ wrapper for gtksourceview";
+    license = licenses.lgpl2;
+    maintainers = gnome3.maintainers;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df3e23f3d66..9216cd18073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10248,6 +10248,8 @@ in
 
   gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { };
 
+  gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { };
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From 0e502862d5740f96482278ef171591f67ca1b59c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Dec 2018 18:20:19 +0100
Subject: [PATCH 2593/2793] gnome3.evince: remove libtool files

Stop requiring dependents to link against aspell and hspell.
---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 4867335af12..94d39964bc4 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -4,7 +4,7 @@
 , librsvg, gobject-introspection, yelp-tools, gspell
 , recentListSize ? null # 5 is not enough, allow passing a different number
 , supportXPS ? false    # Open XML Paper Specification via libgxps
-, autoreconfHook
+, autoreconfHook, pruneLibtoolFiles
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook
+    pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles
   ];
 
   buildInputs = [

From 6b1574500755142773de9e47db8e4e6860417f2f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Dec 2018 18:58:16 +0100
Subject: [PATCH 2594/2793] libgda: build GI typelibs

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

diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index ee9323ebc5c..9bf03f25c9c 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala
 , overrideCC, gcc6
 , mysqlSupport ? false, mysql ? null
 , postgresSupport ? false, postgresql ? null
@@ -23,7 +23,7 @@ assert postgresSupport -> postgresql != null;
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ];
+  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
   buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
     ++ optional (mysqlSupport) mysql.connector-c
     ++ optional (postgresSupport) postgresql;

From 2b9283afc5bccdd06f60720064e492f076ee9a37 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 2 Dec 2018 22:27:11 +0100
Subject: [PATCH 2595/2793] glom: init at unstable-2018-12-16

---
 pkgs/applications/misc/glom/default.nix | 132 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |   2 +
 2 files changed, 134 insertions(+)
 create mode 100644 pkgs/applications/misc/glom/default.nix

diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix
new file mode 100644
index 00000000000..9e71837c0f5
--- /dev/null
+++ b/pkgs/applications/misc/glom/default.nix
@@ -0,0 +1,132 @@
+{ stdenv
+, fetchFromGitLab
+, pkgconfig
+, autoconf
+, automake
+, libtool
+, mm-common
+, intltool
+, itstool
+, doxygen
+, graphviz
+, makeFontsConf
+, freefont_ttf
+, boost
+, libxmlxx3
+, libxslt
+, libgdamm
+, libarchive
+, libepc
+, python3
+, ncurses
+, glibmm
+, gtk3
+, openssl
+, gtkmm3
+, goocanvasmm2
+, evince
+, isocodes
+, gtksourceviewmm4
+, postgresql
+, gnome3
+, gobject-introspection
+, wrapGAppsHook
+}:
+
+let
+  gda = libgdamm.override {
+    mysqlSupport = true;
+    postgresSupport = true;
+  };
+  python = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
+  sphinx-build = python3.pkgs.sphinx.overrideAttrs (super: {
+    postFixup = super.postFixup or "" + ''
+      # Do not propagate Python
+      rm $out/nix-support/propagated-build-inputs
+    '';
+  });
+  boost_python = boost.override { enablePython = true; inherit python; };
+in stdenv.mkDerivation rec {
+  pname = "glom";
+  version = "unstable-2018-12-16";
+
+  outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = pname;
+    rev = "fa5ff04f209f35bf3e97bc1c3eb1d1138d6172ce";
+    sha256 = "145hnk96xa4v35i3a3mbf3fnx4nlk8cksc0qhm7nrh8cnnrbdfgn";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    autoconf
+    automake
+    libtool
+    mm-common
+    intltool
+    gnome3.yelp-tools
+    itstool
+    doxygen
+    graphviz
+    sphinx-build
+    wrapGAppsHook
+    gobject-introspection # for setup hook
+  ];
+
+  buildInputs = [
+    boost_python
+    glibmm
+    gtk3
+    openssl
+    libxmlxx3
+    libxslt
+    gda
+    libarchive
+    libepc
+    python
+    ncurses # for python
+    gtkmm3
+    goocanvasmm2
+    evince
+    isocodes
+    python3.pkgs.pygobject3
+    gtksourceviewmm4
+    postgresql # for pg_config
+  ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+
+  configureFlags = [
+    "--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}"
+  ];
+
+  makeFlags = [
+    "libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
+    "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
+  ];
+
+  # Fontconfig error: Cannot load default config file
+  FONTCONFIG_FILE = makeFontsConf {
+    fontDirectories = [ freefont_ttf ];
+  };
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "${placeholder "out"}/${python3.sitePackages}"
+      --set PYTHONHOME "${python}"
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An easy-to-use database designer and user interface";
+    homepage = http://www.glom.org/;
+    license = [ licenses.lgpl2 licenses.gpl2 ];
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9216cd18073..99d4a241262 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21760,6 +21760,8 @@ in
 
   ginac = callPackage ../applications/science/math/ginac { };
 
+  glom = callPackage ../applications/misc/glom { };
+
   glucose = callPackage ../applications/science/logic/glucose { };
   glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { };
 

From ecda0434adc7d40d39f57a650e6416598f53f76b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 02:54:39 +0100
Subject: [PATCH 2596/2793] =?UTF-8?q?midori:=200.5.11=20=E2=86=92=207.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/browsers/midori/default.nix    | 63 ++++++-------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index c3273562b0b..6091c25ccd9 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,54 +1,31 @@
-{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook
-, gtk3, webkitgtk, librsvg, libnotify, sqlite
-, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3
-, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core
-, zeitgeistSupport ? false, zeitgeist ? null
+{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook
+, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
 }:
 
-assert zeitgeistSupport -> zeitgeist != null;
-
 stdenv.mkDerivation rec {
-  name = "midori-${version}";
-  version = "0.5.11";
+  pname = "midori";
+  version = "7";
+
+  src = fetchurl {
+    url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz";
+    sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig cmake ninja intltool vala wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3 webkitgtk sqlite gsettings-desktop-schemas gnome3.gcr
+    (libsoup.override { gnomeSupport = true; }) gnome3.libpeas
+    glib-networking
+  ];
 
   meta = with stdenv.lib; {
     description = "Lightweight WebKitGTK+ web browser";
-    homepage = http://midori-browser.org;
+    homepage = https://www.midori-browser.org/;
     license = with licenses; [ lgpl21Plus ];
     platforms = with platforms; linux;
     maintainers = with maintainers; [ raskin ramkromberg ];
   };
-
-  src = fetchurl {
-    urls = [
-      "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2"
-      "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2"
-    ];
-    name = "midori_${version}_all_.tar.bz2";
-    sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";
-  };
-
-  nativeBuildInputs = [
-    pkgconfig wrapGAppsHook cmake intltool vala_0_34
-  ];
-
-  buildInputs = [
-    gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
-    libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
-    (libsoup.override {gnomeSupport = true;})
-  ] ++ stdenv.lib.optionals zeitgeistSupport [
-    zeitgeist
-  ];
-
-  cmakeFlags = [
-    "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}"
-    "-DHALF_BRO_INCOM_WEBKIT2=ON"
-    "-DUSE_GTK3=1"
-  ];
-
-  NIX_LDFLAGS="-lX11";
-
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules")
-  '';
 }

From b52fe92a2f996f486deb00e3f4c75e8fe23dade8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 02:56:29 +0100
Subject: [PATCH 2597/2793] gnome3.california: drop

---
 pkgs/desktops/gnome-3/default.nix             |  2 -
 .../gnome-3/misc/california/default.nix       | 47 -------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/misc/california/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 29b48873e72..6bf0c5add1f 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -359,8 +359,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
-  california = callPackage ./misc/california { };
-
   geary = callPackage ./misc/geary { };
 
   gfbgraph = callPackage ./misc/gfbgraph { };
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
deleted file mode 100644
index 8024f66650e..00000000000
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobject-introspection
-, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
-
-let
-  pname = "california";
-  version = "0.4.0";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
-  };
-
-  nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobject-introspection ];
-  buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
-
-  enableParallelBuilding = true;
-
-  patches = [
-    # Apply Fedora patch to build with evolution-data-server > 3.13
-    (fetchurl {
-      url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch;
-      sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm";
-    })
-    # Apply Fedora patch to build with libical > 3.0
-    (fetchurl {
-      url = https://src.fedoraproject.org/rpms/california/raw/2af9a6a1b67b53f3fca1472c5350dc11a1acf28f/f/california-0.4.0-libical-3.0.patch;
-      sha256 = "0cxycfaql0bsiz9hzanns33pwdqpb5n44znfcfa66i1bin34r4n6";
-    })
-  ];
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      attrPath = "gnome3.${pname}";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/California;
-    description = "Calendar application for GNOME 3";
-    maintainers = with maintainers; [ pSub ];
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}

From 913aa6b7c8a5055e3606dd97e63bfd6606c71e0b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 02:56:51 +0100
Subject: [PATCH 2598/2793] vala_0_34: drop

---
 pkgs/development/compilers/vala/default.nix | 6 ------
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index a721625b1f4..daf0987be57 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -45,12 +45,6 @@ let
   };
 
 in rec {
-  vala_0_34 = generic {
-    major   = "0.34";
-    minor   = "18";
-    sha256  = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
-  };
-
   vala_0_36 = generic {
     major   = "0.36";
     minor   = "15";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e224b7925d..b46788bab4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7584,7 +7584,6 @@ in
   urweb = callPackage ../development/compilers/urweb { };
 
   inherit (callPackage ../development/compilers/vala { })
-    vala_0_34
     vala_0_36
     vala_0_38
     vala_0_40

From 6397fd3e719c0319c63490de6dd7e1f58429b0d5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 24 Dec 2018 03:15:22 +0100
Subject: [PATCH 2599/2793] gitlab-ce: 11.5.4 -> 11.5.5

CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
---
 pkgs/applications/version-management/gitlab/data.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 1f8f627f5ed..6ac6c6d9ad8 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,12 +1,12 @@
 {
   "ce": {
-    "version": "11.5.4",
-    "repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8",
-    "deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb",
+    "version": "11.5.5",
+    "repo_hash": "1dxky06im18s4kxbb33qwm22pkkhgvyjggx31164iy71zcxxj1jr",
+    "deb_hash": "0wnyfl1bb5wb8kdyarjk9y4ydla84f3alnk3m3zwmdqfg9jsqgb8",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.5-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ce",
-    "rev": "v11.5.4",
+    "rev": "v11.5.5",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
       "GITLAB_PAGES_VERSION": "1.3.1",

From 236cb269542d4f98e8b879bcda49170cade7bfd9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 24 Dec 2018 03:20:11 +0100
Subject: [PATCH 2600/2793] gitlab-ee: 11.5.4 -> 11.5.5

CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
---
 pkgs/applications/version-management/gitlab/data.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 6ac6c6d9ad8..1e0d5de0847 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -15,13 +15,13 @@
     }
   },
   "ee": {
-    "version": "11.5.4",
-    "repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc",
-    "deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb",
+    "version": "11.5.5",
+    "repo_hash": "1j5g0x7rxrdb39b12psjirsa3s0lhqgnxh0q3r22cgzgxv0332b8",
+    "deb_hash": "193s1f7w9lcamqnmrc7c3klmybqqra7yr16x6ay0cznwcdgirisp",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.5-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ee",
-    "rev": "v11.5.4-ee",
+    "rev": "v11.5.5-ee",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
       "GITLAB_PAGES_VERSION": "1.3.1",

From a6520f6136e424982376ebd38ce5cb94e70efc23 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 24 Dec 2018 13:20:37 +0800
Subject: [PATCH 2601/2793] uchiwa: 1.3.1 -> 1.5.0

---
 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 a8180c5de3d..40789fa34f8 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.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk")
+  (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1")
   (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.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn")
+  (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4")
   (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 51c343d01da..cf5376318b4 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-    version = "1.3.1-1";
-    sha256  = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi";
+    version = "1.5.0-1";
+    sha256  = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b";
 }

From 98436ba55a8b29fc5540f83d0bc209ba828a4fae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 00:12:07 -0800
Subject: [PATCH 2602/2793] you-get: 0.4.1181 -> 0.4.1193 (#52755)

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 6ca284f15a6..2d0ed3ac1c5 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.1181";
+  version = "0.4.1193";
 
   # 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 = "1rcy590392aycjazi3z8gf6ll39rxkbgmkgnsbsl6yl5vb3jgk83";
+    sha256 = "1q7wha0d55pw077bs92bbzx6ck3nsmhnxblz7zaqzladn23hs9zg";
   };
 
   meta = with stdenv.lib; {

From 50d8250195c81356b090914d82e71a15bac7e3ed Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 23 Dec 2018 20:03:05 +0100
Subject: [PATCH 2603/2793] fsarchiver: init at 0.8.5

Filesystem archiver: http://www.fsarchiver.org/
---
 pkgs/tools/archivers/fsarchiver/default.nix | 43 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/archivers/fsarchiver/default.nix

diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
new file mode 100644
index 00000000000..cb73233dcb4
--- /dev/null
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, zlib, bzip2, lzma, lzo, lz4, zstd, xz
+, libgcrypt, e2fsprogs, utillinux, libgpgerror }:
+
+let
+  version = "0.8.5";
+
+in stdenv.mkDerivation {
+  name = "fsarchiver-${version}";
+
+  src = fetchFromGitHub {
+    owner = "fdupoux";
+    repo = "fsarchiver";
+    rev = version;
+    sha256 = "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig
+  ];
+
+  buildInputs = [
+    zlib bzip2 lzma lzo lz4 zstd xz
+    libgcrypt e2fsprogs utillinux libgpgerror
+  ];
+
+  meta = with stdenv.lib; {
+    description = "File system archiver for linux";
+    longDescription = ''
+      FSArchiver is a system tool that allows you to save the contents of a
+      file-system to a compressed archive file. The file-system can be restored
+      on a partition which has a different size and it can be restored on a
+      different file-system. Unlike tar/dar, FSArchiver also creates the
+      file-system when it extracts the data to partitions. Everything is
+      checksummed in the archive in order to protect the data. If the archive is
+      corrupt, you just loose the current file, not the whole archive.
+    '';
+    homepage = http://www.fsarchiver.org/;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.etu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e224b7925d..48683857db0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2783,6 +2783,8 @@ in
 
   ftop = callPackage ../os-specific/linux/ftop { };
 
+  fsarchiver = callPackage ../tools/archivers/fsarchiver { };
+
   fsfs = callPackage ../tools/filesystems/fsfs { };
 
   fstl = qt5.callPackage ../applications/graphics/fstl { };

From 4adc26cef268071acfedc324076e050eff4e0a2c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 00:49:57 -0800
Subject: [PATCH 2604/2793] wavebox: 4.5.5 -> 4.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/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 b85e9d3d4cb..85dafa331c1 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 let
   bits = "x86_64";
 
-  version = "4.5.5";
+  version = "4.5.9";
 
   desktopItem = makeDesktopItem rec {
     name = "Wavebox";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   name = "wavebox-${version}";
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
-    sha256 = "b392e02b3b1b4deece32311aeb69b31c2550c4251be65f408c35b0badbf3c8b6";
+    sha256 = "158kj7r5p4p3xk5pwzvbd51h543panmgkr64knv418ksyqjdi16g";
   };
 
   # don't remove runtime deps

From 5948a5a3b0e7b67b3d1b8907dc1e883a42098bc6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 24 Dec 2018 12:05:45 +0300
Subject: [PATCH 2605/2793] pythonPackages.pg8000: fix build

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 175e64b8d72..f5828bebbb3 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytz
+, six
 }:
 
 buildPythonPackage rec {
@@ -13,10 +14,10 @@ buildPythonPackage rec {
     sha256 = "18192d90409a3037619ef17f1924e3fd9c7169c9c1b3277cec1982116ec2b6de";
   };
 
-  propagatedBuildInputs = [ pytz ];
+  propagatedBuildInputs = [ pytz six ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/realazthat/aiopg8000;
+    homepage = https://github.com/mfenniak/pg8000;
     description = "PostgreSQL interface library, for asyncio";
     maintainers = with maintainers; [ garbas domenkozar ];
     platforms = platforms.linux;

From df15c08611693063957e3f4a7667638d09179361 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 24 Dec 2018 11:08:52 +0100
Subject: [PATCH 2606/2793] minishift: 1.27.0 -> 1.29.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../applications/networking/cluster/minishift/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index c07be777de0..6f227615502 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -4,10 +4,9 @@
 }:
 
 let
-  version = "1.27.0";
+  version = "1.29.0";
 
   # Update these on version bumps according to Makefile
-  b2dIsoVersion = "v1.3.0";
   centOsIsoVersion = "v1.13.0";
   openshiftVersion = "v3.11.0";
 
@@ -19,7 +18,7 @@ in buildGoPackage rec {
     owner = "minishift";
     repo = "minishift";
     rev = "v${version}";
-    sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f";
+    sha256 = "17scvv60hgk7s9fy4s9z26sc8a69ryh33rhr1f7p92kb5wfh2x40";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
@@ -41,7 +40,6 @@ in buildGoPackage rec {
   buildFlagsArray = ''
     -ldflags=
       -X ${goPackagePath}/pkg/version.minishiftVersion=${version}
-      -X ${goPackagePath}/pkg/version.b2dIsoVersion=${b2dIsoVersion}
       -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
       -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
   '';
@@ -65,7 +63,7 @@ in buildGoPackage rec {
       or develop with it, day-to-day, on your local host.
     '';
     homepage = https://github.com/minishift/minishift;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz vdemeester ];
     platforms = platforms.linux;
     license = licenses.asl20;
   };

From 4fa7bbf4865302d2cdc2467cc4d37e3af8bde733 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 02:17:58 -0800
Subject: [PATCH 2607/2793] linuxPackages.sysdig: 0.24.1 -> 0.24.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/sysdig/versions
---
 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 1a89ff57491..2a614e22c9a 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w";
+    sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a";
   };
 
   nativeBuildInputs = [ cmake perl ];

From 461552526ba6a655643af525ee4901c848ede891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 24 Dec 2018 11:10:30 +0100
Subject: [PATCH 2608/2793] python.pkgs.django_1_8: 1.8.18 -> 1.8.19

This fixes CVE-2018-7536 and CVE-2018-7537:
https://www.djangoproject.com/weblog/2018/mar/06/security-releases/

cc https://github.com/NixOS/nixpkgs/issues/52679
---
 pkgs/development/python-modules/django/1_8.nix           | 5 ++---
 pkgs/development/python-modules/graphite-web/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
index e87a9cbad02..30d75e73c68 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   name = "Django-${version}";
-  version = "1.8.18";
-  disabled = pythonOlder "2.7";
+  version = "1.8.19";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-    sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
+    sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
   };
 
   # too complicated to setup
diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix
index 51a7fd9b5d2..229e35b6ca4 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/pkgs/development/python-modules/graphite-web/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, which
 , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
 }:
-if django.version != "1.8.18"
+if django.version != "1.8.19"
 || django_tagging.version != "0.4.3"
 then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3"
 else buildPythonPackage rec {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9011f993321..398cd92a52e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2215,7 +2215,7 @@ in {
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
   django_tagging_0_4_3 = if
-       self.django.version != "1.8.18"
+       self.django.version != "1.8.19"
   then throw "django_tagging_0_4_3 should be build with django_1_8"
   else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {
     pname = "django-tagging";

From 5b61578924faed2269d9ab4a562c8f91bb816a58 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 24 Dec 2018 11:24:13 +0100
Subject: [PATCH 2609/2793] gitlab-runner: 11.5.0 -> 11.6.0

---
 .../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 04f0c5cb66f..93f389e6879 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.5.0";
+  version = "11.6.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 = "1siiws19qzfv2nnyp9fy215yd08iv70x830b61kr1742ywc0jcbn";
+    sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "0d7wnpry4861dcmpspbaar97mkf0jf2bcxvr4nph9xnkw8w7fs2z";
+    sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "028bl249yfccdnwskbn6sxzf1xsg94chbm107n2h83j7a81cz8kw";
+    sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 82470c2e3b84f50f51dd14bf9fb020ce84947497 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Mon, 24 Dec 2018 10:42:06 +0000
Subject: [PATCH 2610/2793] snscrape: init at 0.1.3 (#52758)

---
 .../python-modules/snscrape/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/snscrape/default.nix

diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix
new file mode 100644
index 00000000000..972ea3149f9
--- /dev/null
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, requests
+, lxml
+, beautifulsoup4
+}:
+
+buildPythonPackage rec {
+  pname = "snscrape";
+  version = "0.1.3";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mnhqqc7xfwg2wrzpj1pjbcisjjwxrgmy21f53p80xbx2iz8b9n1";
+  };
+
+  # There are no tests; make sure the executable works.
+  checkPhase = ''
+    export PATH=$PATH:$out/bin
+    snscrape --help
+  '';
+
+  propagatedBuildInputs = [ requests lxml beautifulsoup4 ];
+
+  meta = with lib; {
+    homepage = https://github.com/JustAnotherArchivist/snscrape;
+    description = "A social networking service scraper in Python";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ivan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c495072cde..007673eeddb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22818,6 +22818,8 @@ in
 
   snapraid = callPackage ../tools/filesystems/snapraid { };
 
+  snscrape = with python3Packages; toPythonApplication snscrape;
+
   soundOfSorting = callPackage ../misc/sound-of-sorting { };
 
   sourceAndTags = callPackage ../misc/source-and-tags {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 398cd92a52e..67cd6cf1948 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3938,6 +3938,8 @@ in {
 
   snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
 
+  snscrape = callPackage ../development/python-modules/snscrape { };
+
   snug = callPackage ../development/python-modules/snug { };
 
   snuggs = callPackage ../development/python-modules/snuggs { };

From a47c3b32abf7f0471c42d2759af7b47c89fb2d96 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 2611/2793] tdesktop: 1.5.3 -> 1.5.4

tdesktopPackages.preview: 1.5.3 -> 1.5.4
---
 .../instant-messengers/telegram/tdesktop/default.nix        | 4 ++--
 .../instant-messengers/telegram/tdesktop/generic.nix        | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 6b892a5baea..2aa09074204 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.5.3";
-    sha256Hash = "13gl81zb9739hs7p3pfavr2lcikajljf03g2x3zgcb9zyarwffg4";
+    version = "1.5.4";
+    sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "415526";
     archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 398ddac3dda..c20da7eeb66 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,6 +1,6 @@
 { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
-{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, fetchsvn
 , pkgconfig, pythonPackages, cmake, wrapGAppsHook
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -31,10 +31,6 @@ mkDerivation rec {
   # TODO: libtgvoip.patch no-gtk2.patch
   patches = [
       "${archPatches}/tdesktop.patch"
-      (fetchpatch {
-        url = "https://github.com/telegramdesktop/tdesktop/commit/4e692e2c1e10538d7fd3e7c0e0a66e0ba474fe76.patch";
-        sha256 = "11pv7ib56aq69q9257b9p7wxd2f8xcr6mavswzqw0lndvcx8a5dz";
-      })
     ]
     # TODO: Only required to work around a compiler bug.
     # This should be fixed in GCC 7.3.1 (or later?)

From f994e5fe8d266b01bb851f75954e7c7bc62e7261 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 23 Dec 2018 19:10:13 -0500
Subject: [PATCH 2612/2793] guff: init at 0.1.0

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

diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix
new file mode 100644
index 00000000000..db218a812e6
--- /dev/null
+++ b/pkgs/tools/graphics/guff/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "guff";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "silentbicycle";
+    repo = "guff";
+    rev = "v${version}";
+    sha256 = "0n8mc9j3044j4b3vgc94ryd2j9ik6g73fqja54yxfdfrks4ksyds";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib;  {
+    description = "A plot device";
+    homepage = https://github.com/silentbicycle/guff;
+    license = licenses.isc;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 007673eeddb..7a7f152d5d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8719,6 +8719,8 @@ in
 
   gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
 
+  guff = callPackage ../tools/graphics/guff { };
+
   guile-lint = callPackage ../development/tools/guile/guile-lint {
     guile = guile_1_8;
   };

From c6cc68a5105dc4e585bd0dad7c7056f9d3e4ddce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 04:42:47 -0800
Subject: [PATCH 2613/2793] stellarium: 0.18.2 -> 0.18.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/stellarium/versions
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index cb7b2fbff3c..eb7ba2a8c9c 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   name = "stellarium-${version}";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${version}";
-    sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf";
+    sha256 = "1cnwfk3vdsxh8gacw22qik401z0kpzd1ralbg9ph2cjqx9x2m1s1";
   };
 
   nativeBuildInputs = [ cmake perl ];

From 1de252715980c523dde594c8cf6511aab4a45727 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Mon, 24 Dec 2018 14:01:37 +0100
Subject: [PATCH 2614/2793] skopeo: 0.1.32 -> 0.1.34

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

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 7f39376dc06..d44b3d4ec4f 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.32";
+  version = "0.1.34";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    sha256 = "0pyii4z9xf23lsdx4d3m5pkdyrsi4v1pbjj8l7fjgyfv8ncrjyn8";
+    sha256 = "1drbbjqih69nvgynjcz0js0vi6sgsax8565zbrmf8fkbk609c7r3";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";

From 8d217ede58386b96bcf561c313c12b170c975440 Mon Sep 17 00:00:00 2001
From: msteen <emailmatthijs@gmail.com>
Date: Mon, 24 Dec 2018 14:05:55 +0100
Subject: [PATCH 2615/2793] fix infinite recursion caused by the unnecessary
 inspection of options + fix is parent of mount point check (#51541)

---
 nixos/lib/utils.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index 1ef915d4061..b68e55a40b9 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -7,9 +7,8 @@ rec {
                      || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ];
 
   # Check whenever `b` depends on `a` as a fileSystem
-  # FIXME: it's incorrect to simply use hasPrefix here: "/dev/a" is not a parent of "/dev/ab"
-  fsBefore = a: b: ((any (x: elem x [ "bind" "move" ]) b.options) && (a.mountPoint == b.device))
-                || (hasPrefix a.mountPoint b.mountPoint);
+  fsBefore = a: b: a.mountPoint == b.device
+                || hasPrefix "${a.mountPoint}${optionalString (!(hasSuffix "/" a.mountPoint)) "/"}" b.mountPoint;
 
   # Escape a path according to the systemd rules, e.g. /dev/xyzzy
   # becomes dev-xyzzy.  FIXME: slow.

From daaba731a74e8dac220b97dc9875049c2810e168 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Dec 2018 10:46:31 +0000
Subject: [PATCH 2616/2793] ocamlPackages.csv-lwt: init at 2.2

---
 pkgs/development/ocaml-modules/csv/lwt.nix | 14 ++++++++++++++
 pkgs/top-level/ocaml-packages.nix          |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/csv/lwt.nix

diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix
new file mode 100644
index 00000000000..2fa9296d7e4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/csv/lwt.nix
@@ -0,0 +1,14 @@
+{ lib, buildDunePackage, ocaml, csv, ocaml_lwt }:
+
+if !lib.versionAtLeast ocaml.version "4.02"
+then throw "csv-lwt is not available for OCaml ${ocaml.version}"
+else
+
+buildDunePackage {
+  pname = "csv-lwt";
+  inherit (csv) src version meta;
+
+  propagatedBuildInputs = [ csv ocaml_lwt ];
+
+  doCheck = lib.versionAtLeast ocaml.version "4.03";
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9c3e81e3177..ba583418163 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -202,6 +202,8 @@ let
       then callPackage ../development/ocaml-modules/csv { }
       else callPackage ../development/ocaml-modules/csv/1.5.nix { };
 
+    csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { };
+
     curses = callPackage ../development/ocaml-modules/curses { };
 
     custom_printf = callPackage ../development/ocaml-modules/custom_printf { };

From bdf46079f54f57e6821a80958ad5fe23eda5ec32 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 12:37:51 +0100
Subject: [PATCH 2617/2793] goffice: add updateScript

---
 pkgs/development/libraries/goffice/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 9a3775a79bd..ac6836dc69d 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
-, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.44";
+  pname = "goffice";
+  version = "0.10.44";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
   };
 
@@ -20,6 +21,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = {
     description = "A Glib/GTK+ set of document centric objects and utilities";
 

From eee241006290aa8e615d8a503c7bf17000f9e2d3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 12:41:00 +0100
Subject: [PATCH 2618/2793] =?UTF-8?q?gnumeric:=201.12.43=20=E2=86=92=201.1?=
 =?UTF-8?q?2.44?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also remove entity definitions, gnumeric now inlines them:

https://bugzilla.gnome.org/show_bug.cgi?id=790226
---
 pkgs/applications/office/gnumeric/default.nix | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index b1aed5e5f59..5d0985b0ba2 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -5,33 +5,23 @@
 
 let
   inherit (pythonPackages) python pygobject3;
-  isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; };
-  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.43";
+  pname = "gnumeric";
+  version = "1.12.44";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0";
   };
 
   configureFlags = [ "--disable-component" ];
 
-  prePatch = ''
-    substituteInPlace doc/C/gnumeric.xml \
-      --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
-      --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
-      --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig intltool bison itstool makeWrapper ];
 
   # ToDo: optional libgda, introspection?
   buildInputs = [
-    intltool bison
-    goffice gtk3 makeWrapper gnome3.defaultIconTheme
-    python pygobject3 itstool
+    goffice gtk3 gnome3.defaultIconTheme
+    python pygobject3
   ] ++ (with perlPackages; [ perl XMLParser ]);
 
   enableParallelBuilding = true;
@@ -44,6 +34,12 @@ in stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "The GNOME Office Spreadsheet";
     license = stdenv.lib.licenses.gpl2Plus;

From 9cf3c1f52ed8f28114c52f644878d68eabf25cdd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 13:32:39 +0100
Subject: [PATCH 2619/2793] lasem: init at 0.4.3

---
 pkgs/development/libraries/lasem/default.nix | 38 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/lasem/default.nix

diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix
new file mode 100644
index 00000000000..aa1172029d2
--- /dev/null
+++ b/pkgs/development/libraries/lasem/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf
+, libxml2, cairo, pango, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "lasem";
+  version = "0.4.3";
+
+  outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "13ym5pm2y3wk5hh9zb2535i3lnhnzyzs0na1knxwgvwxazwm1ng7";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+
+  propagatedBuildInputs = [
+    glib gdk_pixbuf libxml2 cairo pango
+  ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = {
+    description = "SVG and MathML rendering library";
+
+    homepage = https://wiki.gnome.org/Projects/Lasem;
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e18a8d89518..facdeb79862 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10464,6 +10464,8 @@ in
 
   languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
 
+  lasem = callPackage ../development/libraries/lasem { };
+
   lasso = callPackage ../development/libraries/lasso { };
 
   LASzip = callPackage ../development/libraries/LASzip { };

From dd3eea4b476552cbdf95388179bfdd668d04b8b7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Dec 2018 14:57:38 +0100
Subject: [PATCH 2620/2793] goffice: add lasem support

Also split outputs
---
 pkgs/development/libraries/goffice/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index ac6836dc69d..3d3275b041f 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,10 +1,12 @@
-{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "goffice";
   version = "0.10.44";
 
+  outputs = [ "out" "dev" "devdoc" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
@@ -12,8 +14,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
-    glib gtk3 libxml2 cairo pango libgsf
+  propagatedBuildInputs = [
+    glib gtk3 libxml2 cairo pango libgsf lasem
   ];
 
   buildInputs = [ libxslt librsvg ];

From 8934dae2c39aa26ed9ac446bd08c7b6cce075638 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Dec 2018 23:48:08 +0100
Subject: [PATCH 2621/2793] osquery: fix build

As discussed in #51756, recently packaged versions of `lvm2` miss the
`lvm2app.h` header which breaks the osquery build.

Please note that this simply fixes the build and is not an upgrade. The
CMake patches are fairly diverged in constrast to the current upstream
packaging which requires a lot more effort I can't provide ATM.

cc @markuskowa @hedning
---
 pkgs/tools/system/osquery/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 6cdaec10868..c7faf4d3889 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -4,7 +4,7 @@
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
 , openssl, file, doxygen
-, gtest, sqlite, fpm, zstd, rdkafka, rapidjson
+, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit
 }:
 
 let
@@ -43,6 +43,20 @@ stdenv.mkDerivation rec {
     gflags' = google-gflags.overrideAttrs (old: {
       cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags;
     });
+
+    # use older `lvm2` source for osquery, the 2.03 sourcetree
+    # will break osquery due to the lacking header `lvm2app.h`.
+    #
+    # https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295
+    lvm2' = lvm2.overrideAttrs (old: rec {
+      name = "lvm2-${version}";
+      version = "2.02.183";
+      src = fetchgit {
+        url = "git://sourceware.org/git/lvm2.git";
+        rev = "v${version}";
+        sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx";
+      };
+    });
   in [
     udev audit
 
@@ -51,7 +65,7 @@ stdenv.mkDerivation rec {
       customMemoryManagement = false;
     })
 
-    lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg
+    lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg
     lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit
     yara lldpd gflags' thrift boost
     glog gbenchmark snappy openssl

From 60be98f697300ef673b2dc8a612bdb189175837a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 06:43:47 -0800
Subject: [PATCH 2622/2793] skrooge: 2.16.2 -> 2.17.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/skrooge/versions
---
 pkgs/applications/office/skrooge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 070ef4845d8..5168b2fef53 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.16.2";
+  version = "2.17.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj";
+    sha256 = "0v83bcabchsz5fs0iv5i75ps01sga48hq4cx29dajcq3kf9xgwhr";
   };
 
   nativeBuildInputs = [

From 8f9c2f9726cbe39f01af25b4e4ac8c99d2462d7b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Dec 2018 12:32:55 -0500
Subject: [PATCH 2623/2793] linux: Add 4.20

---
 pkgs/os-specific/linux/kernel/linux-4.20.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 13 ++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.20.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix
new file mode 100644
index 00000000000..838ef4a5b80
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.20";
+
+  # 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 = "0f14l6mb5c4rwpqjbcb2yrvk1bmmiyh0mpw24fbl7rr26lc2625d";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc999c3bc7c..8e0f19b4ab4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14561,6 +14561,16 @@ in
       ];
   };
 
+  linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.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_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -14739,7 +14749,7 @@ in
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_19;
+  linuxPackages_latest = linuxPackages_4_20;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -14749,6 +14759,7 @@ in
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
+  linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20);
   # When adding to this list:
   # - Update linuxPackages_latest to the latest version
   # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.

From 24cdaa7b4889ba242d9442645120917f8bed2658 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Dec 2018 12:33:18 -0500
Subject: [PATCH 2624/2793] linux-libre: 15715 -> 15814

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 104dc457d6c..fa9b41b928e 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
-    
+
     # Update this if linux_latest-libre fails to build.
     # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
-    rev = "15715";
-    sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
+    rev = "15814";
+    sha256 = "10y2nh9sqd5kw1331apq50ikd8585gsja8hbjzyiskl3x5ak5xzh";
   }
 , ...
 }:

From b177bbfe67d04ab060ead851753b8439c1067fa2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 09:53:59 -0800
Subject: [PATCH 2625/2793] qjackctl: 0.5.3 -> 0.5.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/qjackctl/versions
---
 pkgs/applications/audio/qjackctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 83608014f14..eafde7957a2 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.3";
+  version = "0.5.5";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1";
+    sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5";
   };
 
   buildInputs = [

From 9477cad1e1b34c5b95ed5c369f2bc9ae224367a2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 24 Dec 2018 14:15:40 -0500
Subject: [PATCH 2626/2793] diskus: enable build on darwin

---
 pkgs/tools/misc/diskus/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 7b0681f3166..346ae141819 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "diskus-${version}";
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   cargoSha256 = "1syrmm5qpz7d1h17xpw1wa3d2snaz9n7d1avsjp7xz8s2qcx1wdc";
 
   meta = with stdenv.lib; {
@@ -18,6 +20,6 @@ rustPlatform.buildRustPackage rec {
     homepage = https://github.com/sharkdp/diskus;
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = [ maintainers.fuerbringer ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0f19b4ab4..b9765628fff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,7 +700,9 @@ in
 
   deskew = callPackage ../applications/graphics/deskew { };
 
-  diskus = callPackage ../tools/misc/diskus { };
+  diskus = callPackage ../tools/misc/diskus {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   djmount = callPackage ../tools/filesystems/djmount { };
 

From 80ceb35158726b5a656bcd5db06b6eaa7f4336a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 11:46:37 -0800
Subject: [PATCH 2627/2793] python37Packages.nvchecker: 1.2.7 -> 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/python3.7-nvchecker/versions
---
 pkgs/development/python-modules/nvchecker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index a015a124738..c636346a5e3 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "1.2.7";
+  version = "1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19qc2wwkdr701mx94r75ayq5h2jz3q620hcqaj2ng9qdgxm90940";
+    sha256 = "0lgcc05c515d7692zvcmf36n2qpyn0bi018i1z3jy73abm04230j";
   };
 
   propagatedBuildInputs = [ setuptools structlog tornado pycurl ];

From dd915395c46f1ffd890d4e23adb633d8c9fa238e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:04:05 -0200
Subject: [PATCH 2628/2793] matcha: 2018-11-12 -> 2018-12-24

---
 pkgs/misc/themes/matcha/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix
index d76e0ed74c5..edb1113a696 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-11-12";
+  version = "2018-12-24";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "matcha";
     rev = version;
-    sha256 = "04alnwb3r0546y7xk2lx8bsdm47q6j89vld3g19rfb3622iv85la";
+    sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc";
   };
 
   buildInputs = [ gdk_pixbuf librsvg ];
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     patchShebangs .
-    substituteInPlace Install --replace '$HOME/.themes' "$out/share/themes"
-    ./Install
+    mkdir -p $out/share/themes
+    name= ./Install -d $out/share/themes
     install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
   '';
 

From 5b1fb4941608cd1f3fcc36cd9a7a3a368c997c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:10:13 -0200
Subject: [PATCH 2629/2793] matcha: move to pkgs/data/themes

---
 pkgs/{misc => data}/themes/matcha/default.nix | 0
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{misc => data}/themes/matcha/default.nix (100%)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
similarity index 100%
rename from pkgs/misc/themes/matcha/default.nix
rename to pkgs/data/themes/matcha/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0f19b4ab4..d8708e4e354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15600,6 +15600,8 @@ in
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
+  matcha = callPackage ../data/themes/matcha { };
+
   materia-theme = callPackage ../data/themes/materia-theme { };
 
   material-icons = callPackage ../data/fonts/material-icons { };
@@ -22404,8 +22406,6 @@ in
 
   martyr = callPackage ../development/libraries/martyr { };
 
-  matcha = callPackage ../misc/themes/matcha { };
-
   mess = callPackage ../misc/emulators/mess {
     inherit (pkgs.gnome2) GConf;
   };

From 369af2f5b234a8cf8e30694fc36b26475ff64413 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 20 Dec 2018 17:24:01 -0500
Subject: [PATCH 2630/2793] lvm2: disable parallel building

---
 pkgs/os-specific/linux/lvm2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index a33431f0f58..469096d014d 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation {
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
     '';
 
-  enableParallelBuilding = true;
+  # gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory
+  enableParallelBuilding = false;
 
   #patches = [ ./purity.patch ];
   patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [

From e36ab216ecedd75ce7b23e321fb84eb11fba179b Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Dec 2018 23:33:16 +0100
Subject: [PATCH 2631/2793] opencv4: opencv_contrib: 4.0.0 -> 4.0.1

---
 pkgs/development/libraries/opencv/4.x.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index ecd320fe556..3f21ee15bf3 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, fetchurl, fetchFromGitHub, fetchpatch
+, fetchurl, fetchFromGitHub
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
 , glog, boost, google-gflags, protobuf
 , config
@@ -47,10 +47,8 @@ let
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
-    # TODO: set to `version` when opencv_contrib-4.0.1 is released;
-    # See: http://answers.opencv.org/question/205793/will-there-be-a-opencv_contrib-401-release-now-that-opencv-401-is-out/
-    rev    = "4.0.0";
-    sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
+    rev    = version;
+    sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy";
   };
 
   # Contrib must be built in order to enable Tesseract support:
@@ -162,16 +160,6 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
   '';
 
-  patches =
-    # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
-    # PR: https://github.com/opencv/opencv_contrib/pull/1913
-    lib.optional buildContrib (fetchpatch {
-      url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
-      sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
-      stripLen = 2;
-      extraPrefix = "opencv_contrib/";
-    });
-
   # 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

From ce7899bea513dcc4290b91269334b26f67e76f6f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 23 Dec 2018 23:31:34 +0100
Subject: [PATCH 2632/2793] vimPlugins.ncm2-jedi: init at 2018-07-18

---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  5 +++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 16 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 38a2a584262..a13dca0019f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -880,6 +880,16 @@
     };
   };
 
+  ncm2-jedi = buildVimPluginFrom2Nix {
+    name = "ncm2-jedi-2018-07-18";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-jedi";
+      rev = "0418d5ca8d4fe6996500eb04517a946f7de83d34";
+      sha256 = "1rbwxsycrn3nis9mj08k70hb174z7cw9p610r6nd8lv4zk1h341z";
+    };
+  };
+
   ncm2-path = buildVimPluginFrom2Nix {
     name = "ncm2-path-2018-09-12";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index e7d95fb50b5..7bdce724ab7 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -177,6 +177,11 @@ with generated;
     dependencies = ["nvim-yarp"];
   });
 
+  ncm2-jedi = ncm2-jedi.overrideAttrs(old: {
+    dependencies = ["nvim-yarp" "ncm2"];
+    passthru.python3Dependencies = ps: with ps; [ jedi ];
+  });
+
   ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
     dependencies = ["ultisnips"];
   });
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7bb07aa3e9d..0fa61a82e3e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -197,6 +197,7 @@ navicore/vissort.vim
 nbouscal/vim-stylish-haskell
 ncm2/ncm2
 ncm2/ncm2-bufword
+ncm2/ncm2-jedi
 ncm2/ncm2-path
 ncm2/ncm2-tmux
 ncm2/ncm2-ultisnips

From b352318cd11d67d49ddb6d1c0cb2cea786e08b46 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 24 Dec 2018 13:02:31 +0100
Subject: [PATCH 2633/2793] vimUtils: represent vim plugins as derivations

Vim plugins were previously represented as strings by default,
necessitating a `knownPlugins` set. Backwards compatibility is kept
(strings are still accepted), so vam plugins should continue to work.
---
 pkgs/misc/vim-plugins/generated.nix | 361 ++++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/overrides.nix | 162 +++++++------
 pkgs/misc/vim-plugins/update.py     |   1 +
 pkgs/misc/vim-plugins/vim-utils.nix |  58 +++--
 4 files changed, 483 insertions(+), 99 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a13dca0019f..f899199c844 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4,6 +4,7 @@
 {
   a-vim = buildVimPluginFrom2Nix {
     name = "a-vim-2010-11-06";
+    pname = "a-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "a.vim";
@@ -14,6 +15,7 @@
 
   ack-vim = buildVimPluginFrom2Nix {
     name = "ack-vim-2018-02-27";
+    pname = "ack-vim";
     src = fetchFromGitHub {
       owner = "mileszs";
       repo = "ack.vim";
@@ -24,6 +26,7 @@
 
   acp = buildVimPluginFrom2Nix {
     name = "acp-2013-02-05";
+    pname = "acp";
     src = fetchFromGitHub {
       owner = "eikenb";
       repo = "acp";
@@ -34,6 +37,7 @@
 
   agda-vim = buildVimPluginFrom2Nix {
     name = "agda-vim-2018-11-10";
+    pname = "agda-vim";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
@@ -44,6 +48,7 @@
 
   alchemist-vim = buildVimPluginFrom2Nix {
     name = "alchemist-vim-2018-12-07";
+    pname = "alchemist-vim";
     src = fetchFromGitHub {
       owner = "slashmili";
       repo = "alchemist.vim";
@@ -54,6 +59,7 @@
 
   ale = buildVimPluginFrom2Nix {
     name = "ale-2018-12-20";
+    pname = "ale";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
@@ -64,6 +70,7 @@
 
   align = buildVimPluginFrom2Nix {
     name = "align-2012-08-08";
+    pname = "align";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "align";
@@ -74,6 +81,7 @@
 
   argtextobj-vim = buildVimPluginFrom2Nix {
     name = "argtextobj-vim-2010-10-18";
+    pname = "argtextobj-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "argtextobj.vim";
@@ -84,6 +92,7 @@
 
   auto-pairs = buildVimPluginFrom2Nix {
     name = "auto-pairs-2018-09-23";
+    pname = "auto-pairs";
     src = fetchFromGitHub {
       owner = "jiangmiao";
       repo = "auto-pairs";
@@ -94,6 +103,7 @@
 
   autoload_cscope-vim = buildVimPluginFrom2Nix {
     name = "autoload_cscope-vim-2011-01-28";
+    pname = "autoload_cscope-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "autoload_cscope.vim";
@@ -104,6 +114,7 @@
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     name = "awesome-vim-colorschemes-2018-12-16";
+    pname = "awesome-vim-colorschemes";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
@@ -114,6 +125,7 @@
 
   base16-vim = buildVimPluginFrom2Nix {
     name = "base16-vim-2018-11-30";
+    pname = "base16-vim";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
@@ -124,6 +136,7 @@
 
   bats-vim = buildVimPluginFrom2Nix {
     name = "bats-vim-2013-07-03";
+    pname = "bats-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "bats.vim";
@@ -134,6 +147,7 @@
 
   calendar-vim = buildVimPluginFrom2Nix {
     name = "calendar-vim-2018-11-02";
+    pname = "calendar-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
@@ -144,6 +158,7 @@
 
   caw-vim = buildVimPluginFrom2Nix {
     name = "caw-vim-2018-12-17";
+    pname = "caw-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
@@ -154,6 +169,7 @@
 
   changeColorScheme-vim = buildVimPluginFrom2Nix {
     name = "changeColorScheme-vim-2010-10-18";
+    pname = "changeColorScheme-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "changeColorScheme.vim";
@@ -164,6 +180,7 @@
 
   CheckAttach = buildVimPluginFrom2Nix {
     name = "CheckAttach-2018-09-02";
+    pname = "CheckAttach";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "CheckAttach";
@@ -174,6 +191,7 @@
 
   clang_complete = buildVimPluginFrom2Nix {
     name = "clang_complete-2018-09-19";
+    pname = "clang_complete";
     src = fetchFromGitHub {
       owner = "Rip-Rip";
       repo = "clang_complete";
@@ -184,6 +202,7 @@
 
   clighter8 = buildVimPluginFrom2Nix {
     name = "clighter8-2018-07-25";
+    pname = "clighter8";
     src = fetchFromGitHub {
       owner = "bbchung";
       repo = "clighter8";
@@ -194,6 +213,7 @@
 
   Colour-Sampler-Pack = buildVimPluginFrom2Nix {
     name = "Colour-Sampler-Pack-2012-11-30";
+    pname = "Colour-Sampler-Pack";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -204,6 +224,7 @@
 
   command-t = buildVimPluginFrom2Nix {
     name = "command-t-2018-09-19";
+    pname = "command-t";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -215,6 +236,7 @@
 
   committia-vim = buildVimPluginFrom2Nix {
     name = "committia-vim-2018-10-23";
+    pname = "committia-vim";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
@@ -225,6 +247,7 @@
 
   concealedyank-vim = buildVimPluginFrom2Nix {
     name = "concealedyank-vim-2013-03-24";
+    pname = "concealedyank-vim";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "concealedyank.vim";
@@ -235,6 +258,7 @@
 
   context_filetype-vim = buildVimPluginFrom2Nix {
     name = "context_filetype-vim-2018-08-30";
+    pname = "context_filetype-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
@@ -245,6 +269,7 @@
 
   cosco-vim = buildVimPluginFrom2Nix {
     name = "cosco-vim-2018-08-07";
+    pname = "cosco-vim";
     src = fetchFromGitHub {
       owner = "lfilho";
       repo = "cosco.vim";
@@ -255,6 +280,7 @@
 
   cpsm = buildVimPluginFrom2Nix {
     name = "cpsm-2018-09-08";
+    pname = "cpsm";
     src = fetchFromGitHub {
       owner = "nixprime";
       repo = "cpsm";
@@ -265,6 +291,7 @@
 
   csapprox = buildVimPluginFrom2Nix {
     name = "csapprox-2013-07-27";
+    pname = "csapprox";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "csapprox";
@@ -275,6 +302,7 @@
 
   csv-vim = buildVimPluginFrom2Nix {
     name = "csv-vim-2018-10-04";
+    pname = "csv-vim";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
@@ -285,6 +313,7 @@
 
   ctrlp-cmatcher = buildVimPluginFrom2Nix {
     name = "ctrlp-cmatcher-2015-10-15";
+    pname = "ctrlp-cmatcher";
     src = fetchFromGitHub {
       owner = "JazzCore";
       repo = "ctrlp-cmatcher";
@@ -295,6 +324,7 @@
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix {
     name = "ctrlp-py-matcher-2017-11-01";
+    pname = "ctrlp-py-matcher";
     src = fetchFromGitHub {
       owner = "FelikZ";
       repo = "ctrlp-py-matcher";
@@ -305,6 +335,7 @@
 
   ctrlp-z = buildVimPluginFrom2Nix {
     name = "ctrlp-z-2015-10-17";
+    pname = "ctrlp-z";
     src = fetchFromGitHub {
       owner = "amiorin";
       repo = "ctrlp-z";
@@ -315,6 +346,7 @@
 
   ctrlp-vim = buildVimPluginFrom2Nix {
     name = "ctrlp-vim-2018-11-22";
+    pname = "ctrlp-vim";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
@@ -325,6 +357,7 @@
 
   denite-extra = buildVimPluginFrom2Nix {
     name = "denite-extra-2018-09-20";
+    pname = "denite-extra";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-extra";
@@ -335,6 +368,7 @@
 
   denite-git = buildVimPluginFrom2Nix {
     name = "denite-git-2018-07-19";
+    pname = "denite-git";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
@@ -345,6 +379,7 @@
 
   denite-nvim = buildVimPluginFrom2Nix {
     name = "denite-nvim-2018-12-17";
+    pname = "denite-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
@@ -355,6 +390,7 @@
 
   deol-nvim = buildVimPluginFrom2Nix {
     name = "deol-nvim-2018-12-17";
+    pname = "deol-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
@@ -365,6 +401,7 @@
 
   deoplete-clang = buildVimPluginFrom2Nix {
     name = "deoplete-clang-2018-07-01";
+    pname = "deoplete-clang";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
@@ -376,6 +413,7 @@
 
   deoplete-go = buildVimPluginFrom2Nix {
     name = "deoplete-go-2018-11-23";
+    pname = "deoplete-go";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
@@ -387,6 +425,7 @@
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     name = "deoplete-jedi-2018-12-22";
+    pname = "deoplete-jedi";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
@@ -398,6 +437,7 @@
 
   deoplete-julia = buildVimPluginFrom2Nix {
     name = "deoplete-julia-2018-06-11";
+    pname = "deoplete-julia";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "deoplete-julia";
@@ -408,6 +448,7 @@
 
   deoplete-rust = buildVimPluginFrom2Nix {
     name = "deoplete-rust-2017-07-18";
+    pname = "deoplete-rust";
     src = fetchFromGitHub {
       owner = "sebastianmarkow";
       repo = "deoplete-rust";
@@ -418,6 +459,7 @@
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
     name = "deoplete-ternjs-2018-11-29";
+    pname = "deoplete-ternjs";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
@@ -428,6 +470,7 @@
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     name = "deoplete-nvim-2018-12-17";
+    pname = "deoplete-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
@@ -438,6 +481,7 @@
 
   dhall-vim = buildVimPluginFrom2Nix {
     name = "dhall-vim-2018-12-12";
+    pname = "dhall-vim";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
@@ -448,6 +492,7 @@
 
   direnv-vim = buildVimPluginFrom2Nix {
     name = "direnv-vim-2018-11-10";
+    pname = "direnv-vim";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
@@ -458,6 +503,7 @@
 
   echodoc-vim = buildVimPluginFrom2Nix {
     name = "echodoc-vim-2018-12-09";
+    pname = "echodoc-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
@@ -468,6 +514,7 @@
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     name = "editorconfig-vim-2018-11-15";
+    pname = "editorconfig-vim";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
@@ -479,6 +526,7 @@
 
   elm-vim = buildVimPluginFrom2Nix {
     name = "elm-vim-2018-11-13";
+    pname = "elm-vim";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
@@ -489,6 +537,7 @@
 
   emmet-vim = buildVimPluginFrom2Nix {
     name = "emmet-vim-2018-11-29";
+    pname = "emmet-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
@@ -500,6 +549,7 @@
 
   ensime-vim = buildVimPluginFrom2Nix {
     name = "ensime-vim-2018-10-10";
+    pname = "ensime-vim";
     src = fetchFromGitHub {
       owner = "ensime";
       repo = "ensime-vim";
@@ -510,6 +560,7 @@
 
   falcon = buildVimPluginFrom2Nix {
     name = "falcon-2018-12-21";
+    pname = "falcon";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
@@ -520,6 +571,7 @@
 
   fastfold = buildVimPluginFrom2Nix {
     name = "fastfold-2018-09-24";
+    pname = "fastfold";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
@@ -530,6 +582,7 @@
 
   ferret = buildVimPluginFrom2Nix {
     name = "ferret-2018-12-20";
+    pname = "ferret";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
@@ -540,6 +593,7 @@
 
   flake8-vim = buildVimPluginFrom2Nix {
     name = "flake8-vim-2017-02-17";
+    pname = "flake8-vim";
     src = fetchFromGitHub {
       owner = "andviro";
       repo = "flake8-vim";
@@ -551,6 +605,7 @@
 
   floobits-neovim = buildVimPluginFrom2Nix {
     name = "floobits-neovim-2018-08-01";
+    pname = "floobits-neovim";
     src = fetchFromGitHub {
       owner = "floobits";
       repo = "floobits-neovim";
@@ -561,6 +616,7 @@
 
   forms = buildVimPluginFrom2Nix {
     name = "forms-2012-11-28";
+    pname = "forms";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "forms";
@@ -571,6 +627,7 @@
 
   fugitive-gitlab-vim = buildVimPluginFrom2Nix {
     name = "fugitive-gitlab-vim-2018-07-04";
+    pname = "fugitive-gitlab-vim";
     src = fetchFromGitHub {
       owner = "shumphrey";
       repo = "fugitive-gitlab.vim";
@@ -581,6 +638,7 @@
 
   fzf-vim = buildVimPluginFrom2Nix {
     name = "fzf-vim-2018-12-11";
+    pname = "fzf-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
@@ -591,6 +649,7 @@
 
   ghcmod-vim = buildVimPluginFrom2Nix {
     name = "ghcmod-vim-2016-06-19";
+    pname = "ghcmod-vim";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "ghcmod-vim";
@@ -601,6 +660,7 @@
 
   gist-vim = buildVimPluginFrom2Nix {
     name = "gist-vim-2018-11-09";
+    pname = "gist-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
@@ -611,6 +671,7 @@
 
   gitv = buildVimPluginFrom2Nix {
     name = "gitv-2018-11-24";
+    pname = "gitv";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
@@ -621,6 +682,7 @@
 
   goyo-vim = buildVimPluginFrom2Nix {
     name = "goyo-vim-2017-05-31";
+    pname = "goyo-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "goyo.vim";
@@ -631,6 +693,7 @@
 
   gruvbox = buildVimPluginFrom2Nix {
     name = "gruvbox-2018-02-25";
+    pname = "gruvbox";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
@@ -641,6 +704,7 @@
 
   gundo-vim = buildVimPluginFrom2Nix {
     name = "gundo-vim-2017-05-09";
+    pname = "gundo-vim";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "gundo.vim";
@@ -651,6 +715,7 @@
 
   haskell-vim = buildVimPluginFrom2Nix {
     name = "haskell-vim-2018-05-22";
+    pname = "haskell-vim";
     src = fetchFromGitHub {
       owner = "neovimhaskell";
       repo = "haskell-vim";
@@ -661,6 +726,7 @@
 
   hasksyn = buildVimPluginFrom2Nix {
     name = "hasksyn-2014-09-04";
+    pname = "hasksyn";
     src = fetchFromGitHub {
       owner = "travitch";
       repo = "hasksyn";
@@ -671,6 +737,7 @@
 
   hlint-refactor-vim = buildVimPluginFrom2Nix {
     name = "hlint-refactor-vim-2015-12-05";
+    pname = "hlint-refactor-vim";
     src = fetchFromGitHub {
       owner = "mpickering";
       repo = "hlint-refactor-vim";
@@ -681,6 +748,7 @@
 
   iceberg-vim = buildVimPluginFrom2Nix {
     name = "iceberg-vim-2018-10-17";
+    pname = "iceberg-vim";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
@@ -691,6 +759,7 @@
 
   idris-vim = buildVimPluginFrom2Nix {
     name = "idris-vim-2017-12-04";
+    pname = "idris-vim";
     src = fetchFromGitHub {
       owner = "idris-hackers";
       repo = "idris-vim";
@@ -701,6 +770,7 @@
 
   Improved-AnsiEsc = buildVimPluginFrom2Nix {
     name = "Improved-AnsiEsc-2015-08-26";
+    pname = "Improved-AnsiEsc";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Improved-AnsiEsc";
@@ -711,6 +781,7 @@
 
   incsearch-easymotion-vim = buildVimPluginFrom2Nix {
     name = "incsearch-easymotion-vim-2016-01-18";
+    pname = "incsearch-easymotion-vim";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch-easymotion.vim";
@@ -721,6 +792,7 @@
 
   incsearch-vim = buildVimPluginFrom2Nix {
     name = "incsearch-vim-2017-11-24";
+    pname = "incsearch-vim";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch.vim";
@@ -731,6 +803,7 @@
 
   intero-neovim = buildVimPluginFrom2Nix {
     name = "intero-neovim-2018-08-07";
+    pname = "intero-neovim";
     src = fetchFromGitHub {
       owner = "parsonsmatt";
       repo = "intero-neovim";
@@ -741,6 +814,7 @@
 
   iosvkem = buildVimPluginFrom2Nix {
     name = "iosvkem-2018-08-26";
+    pname = "iosvkem";
     src = fetchFromGitHub {
       owner = "neutaaaaan";
       repo = "iosvkem";
@@ -751,6 +825,7 @@
 
   jedi-vim = buildVimPluginFrom2Nix {
     name = "jedi-vim-2018-12-03";
+    pname = "jedi-vim";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
@@ -762,6 +837,7 @@
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     name = "Jenkinsfile-vim-syntax-2018-11-25";
+    pname = "Jenkinsfile-vim-syntax";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
@@ -772,6 +848,7 @@
 
   julia-vim = buildVimPluginFrom2Nix {
     name = "julia-vim-2018-12-11";
+    pname = "julia-vim";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
@@ -782,6 +859,7 @@
 
   last256 = buildVimPluginFrom2Nix {
     name = "last256-2017-06-10";
+    pname = "last256";
     src = fetchFromGitHub {
       owner = "sk1418";
       repo = "last256";
@@ -792,6 +870,7 @@
 
   latex-box = buildVimPluginFrom2Nix {
     name = "latex-box-2015-06-01";
+    pname = "latex-box";
     src = fetchFromGitHub {
       owner = "latex-box-team";
       repo = "latex-box";
@@ -802,6 +881,7 @@
 
   lightline-vim = buildVimPluginFrom2Nix {
     name = "lightline-vim-2018-12-12";
+    pname = "lightline-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
@@ -812,6 +892,7 @@
 
   limelight-vim = buildVimPluginFrom2Nix {
     name = "limelight-vim-2016-06-23";
+    pname = "limelight-vim";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "limelight.vim";
@@ -822,6 +903,7 @@
 
   lushtags = buildVimPluginFrom2Nix {
     name = "lushtags-2017-04-19";
+    pname = "lushtags";
     src = fetchFromGitHub {
       owner = "mkasa";
       repo = "lushtags";
@@ -832,6 +914,7 @@
 
   matchit-zip = buildVimPluginFrom2Nix {
     name = "matchit-zip-2010-10-18";
+    pname = "matchit-zip";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "matchit.zip";
@@ -842,6 +925,7 @@
 
   mayansmoke = buildVimPluginFrom2Nix {
     name = "mayansmoke-2010-10-18";
+    pname = "mayansmoke";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "mayansmoke";
@@ -852,6 +936,7 @@
 
   molokai = buildVimPluginFrom2Nix {
     name = "molokai-2015-11-11";
+    pname = "molokai";
     src = fetchFromGitHub {
       owner = "tomasr";
       repo = "molokai";
@@ -862,6 +947,7 @@
 
   ncm2 = buildVimPluginFrom2Nix {
     name = "ncm2-2018-12-23";
+    pname = "ncm2";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
@@ -872,6 +958,7 @@
 
   ncm2-bufword = buildVimPluginFrom2Nix {
     name = "ncm2-bufword-2018-12-06";
+    pname = "ncm2-bufword";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-bufword";
@@ -882,6 +969,7 @@
 
   ncm2-jedi = buildVimPluginFrom2Nix {
     name = "ncm2-jedi-2018-07-18";
+    pname = "ncm2-jedi";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-jedi";
@@ -892,6 +980,7 @@
 
   ncm2-path = buildVimPluginFrom2Nix {
     name = "ncm2-path-2018-09-12";
+    pname = "ncm2-path";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-path";
@@ -902,6 +991,7 @@
 
   ncm2-tmux = buildVimPluginFrom2Nix {
     name = "ncm2-tmux-2018-12-06";
+    pname = "ncm2-tmux";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-tmux";
@@ -912,6 +1002,7 @@
 
   ncm2-ultisnips = buildVimPluginFrom2Nix {
     name = "ncm2-ultisnips-2018-08-01";
+    pname = "ncm2-ultisnips";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-ultisnips";
@@ -922,6 +1013,7 @@
 
   neco-ghc = buildVimPluginFrom2Nix {
     name = "neco-ghc-2018-05-13";
+    pname = "neco-ghc";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "neco-ghc";
@@ -932,6 +1024,7 @@
 
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-11-09";
+    pname = "neco-look";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
@@ -942,6 +1035,7 @@
 
   neco-syntax = buildVimPluginFrom2Nix {
     name = "neco-syntax-2017-10-01";
+    pname = "neco-syntax";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-syntax";
@@ -952,6 +1046,7 @@
 
   neco-vim = buildVimPluginFrom2Nix {
     name = "neco-vim-2018-10-30";
+    pname = "neco-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
@@ -962,6 +1057,7 @@
 
   neocomplete-vim = buildVimPluginFrom2Nix {
     name = "neocomplete-vim-2018-11-19";
+    pname = "neocomplete-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
@@ -972,6 +1068,7 @@
 
   neodark-vim = buildVimPluginFrom2Nix {
     name = "neodark-vim-2018-10-17";
+    pname = "neodark-vim";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
@@ -982,6 +1079,7 @@
 
   neoformat = buildVimPluginFrom2Nix {
     name = "neoformat-2018-12-21";
+    pname = "neoformat";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
@@ -992,6 +1090,7 @@
 
   neoinclude-vim = buildVimPluginFrom2Nix {
     name = "neoinclude-vim-2018-05-21";
+    pname = "neoinclude-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoinclude.vim";
@@ -1002,6 +1101,7 @@
 
   neomake = buildVimPluginFrom2Nix {
     name = "neomake-2018-12-23";
+    pname = "neomake";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
@@ -1012,6 +1112,7 @@
 
   neomru-vim = buildVimPluginFrom2Nix {
     name = "neomru-vim-2018-11-29";
+    pname = "neomru-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
@@ -1022,6 +1123,7 @@
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     name = "neosnippet-snippets-2018-09-30";
+    pname = "neosnippet-snippets";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
@@ -1032,6 +1134,7 @@
 
   neosnippet-vim = buildVimPluginFrom2Nix {
     name = "neosnippet-vim-2018-12-03";
+    pname = "neosnippet-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
@@ -1042,6 +1145,7 @@
 
   neovim-sensible = buildVimPluginFrom2Nix {
     name = "neovim-sensible-2017-09-20";
+    pname = "neovim-sensible";
     src = fetchFromGitHub {
       owner = "jeffkreeftmeijer";
       repo = "neovim-sensible";
@@ -1052,6 +1156,7 @@
 
   neoyank-vim = buildVimPluginFrom2Nix {
     name = "neoyank-vim-2018-12-03";
+    pname = "neoyank-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
@@ -1062,6 +1167,7 @@
 
   nerdcommenter = buildVimPluginFrom2Nix {
     name = "nerdcommenter-2018-12-03";
+    pname = "nerdcommenter";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
@@ -1072,6 +1178,7 @@
 
   nerdtree = buildVimPluginFrom2Nix {
     name = "nerdtree-2018-12-12";
+    pname = "nerdtree";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
@@ -1082,6 +1189,7 @@
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
     name = "nerdtree-git-plugin-2018-11-15";
+    pname = "nerdtree-git-plugin";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
@@ -1092,6 +1200,7 @@
 
   nim-vim = buildVimPluginFrom2Nix {
     name = "nim-vim-2018-12-16";
+    pname = "nim-vim";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
@@ -1102,6 +1211,7 @@
 
   nvim-cm-racer = buildVimPluginFrom2Nix {
     name = "nvim-cm-racer-2017-07-27";
+    pname = "nvim-cm-racer";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-cm-racer";
@@ -1112,6 +1222,7 @@
 
   nvim-completion-manager = buildVimPluginFrom2Nix {
     name = "nvim-completion-manager-2018-07-27";
+    pname = "nvim-completion-manager";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-completion-manager";
@@ -1122,6 +1233,7 @@
 
   nvim-yarp = buildVimPluginFrom2Nix {
     name = "nvim-yarp-2018-12-23";
+    pname = "nvim-yarp";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
@@ -1132,6 +1244,7 @@
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     name = "nvimdev-nvim-2018-11-07";
+    pname = "nvimdev-nvim";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
@@ -1142,6 +1255,7 @@
 
   onehalf = buildVimPluginFrom2Nix {
     name = "onehalf-2018-10-21";
+    pname = "onehalf";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
@@ -1152,6 +1266,7 @@
 
   open-browser-vim = buildVimPluginFrom2Nix {
     name = "open-browser-vim-2018-11-29";
+    pname = "open-browser-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
@@ -1162,6 +1277,7 @@
 
   papercolor-theme = buildVimPluginFrom2Nix {
     name = "papercolor-theme-2018-09-04";
+    pname = "papercolor-theme";
     src = fetchFromGitHub {
       owner = "NLKNguyen";
       repo = "papercolor-theme";
@@ -1172,6 +1288,7 @@
 
   peskcolor-vim = buildVimPluginFrom2Nix {
     name = "peskcolor-vim-2016-06-11";
+    pname = "peskcolor-vim";
     src = fetchFromGitHub {
       owner = "andsild";
       repo = "peskcolor.vim";
@@ -1182,6 +1299,7 @@
 
   pig-vim = buildVimPluginFrom2Nix {
     name = "pig-vim-2017-06-08";
+    pname = "pig-vim";
     src = fetchFromGitHub {
       owner = "motus";
       repo = "pig.vim";
@@ -1192,6 +1310,7 @@
 
   pony-vim-syntax = buildVimPluginFrom2Nix {
     name = "pony-vim-syntax-2017-09-26";
+    pname = "pony-vim-syntax";
     src = fetchFromGitHub {
       owner = "dleonard0";
       repo = "pony-vim-syntax";
@@ -1202,6 +1321,7 @@
 
   PreserveNoEOL = buildVimPluginFrom2Nix {
     name = "PreserveNoEOL-2013-06-14";
+    pname = "PreserveNoEOL";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "PreserveNoEOL";
@@ -1212,6 +1332,7 @@
 
   psc-ide-vim = buildVimPluginFrom2Nix {
     name = "psc-ide-vim-2018-03-11";
+    pname = "psc-ide-vim";
     src = fetchFromGitHub {
       owner = "frigoeu";
       repo = "psc-ide-vim";
@@ -1222,6 +1343,7 @@
 
   purescript-vim = buildVimPluginFrom2Nix {
     name = "purescript-vim-2018-12-10";
+    pname = "purescript-vim";
     src = fetchFromGitHub {
       owner = "raichoo";
       repo = "purescript-vim";
@@ -1232,6 +1354,7 @@
 
   python-mode = buildVimPluginFrom2Nix {
     name = "python-mode-2018-04-29";
+    pname = "python-mode";
     src = fetchFromGitHub {
       owner = "python-mode";
       repo = "python-mode";
@@ -1242,6 +1365,7 @@
 
   quickfixstatus = buildVimPluginFrom2Nix {
     name = "quickfixstatus-2011-09-03";
+    pname = "quickfixstatus";
     src = fetchFromGitHub {
       owner = "dannyob";
       repo = "quickfixstatus";
@@ -1252,6 +1376,7 @@
 
   rainbow = buildVimPluginFrom2Nix {
     name = "rainbow-2018-07-31";
+    pname = "rainbow";
     src = fetchFromGitHub {
       owner = "luochen1990";
       repo = "rainbow";
@@ -1262,6 +1387,7 @@
 
   rainbow_parentheses-vim = buildVimPluginFrom2Nix {
     name = "rainbow_parentheses-vim-2013-03-05";
+    pname = "rainbow_parentheses-vim";
     src = fetchFromGitHub {
       owner = "kien";
       repo = "rainbow_parentheses.vim";
@@ -1272,6 +1398,7 @@
 
   random-vim = buildVimPluginFrom2Nix {
     name = "random-vim-2010-10-18";
+    pname = "random-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "random.vim";
@@ -1282,6 +1409,7 @@
 
   ranger-vim = buildVimPluginFrom2Nix {
     name = "ranger-vim-2018-12-21";
+    pname = "ranger-vim";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
@@ -1292,6 +1420,7 @@
 
   Recover-vim = buildVimPluginFrom2Nix {
     name = "Recover-vim-2018-10-22";
+    pname = "Recover-vim";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "Recover.vim";
@@ -1302,6 +1431,7 @@
 
   Rename = buildVimPluginFrom2Nix {
     name = "Rename-2011-08-31";
+    pname = "Rename";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Rename";
@@ -1312,6 +1442,7 @@
 
   ReplaceWithRegister = buildVimPluginFrom2Nix {
     name = "ReplaceWithRegister-2014-10-31";
+    pname = "ReplaceWithRegister";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "ReplaceWithRegister";
@@ -1322,6 +1453,7 @@
 
   riv-vim = buildVimPluginFrom2Nix {
     name = "riv-vim-2018-10-17";
+    pname = "riv-vim";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
@@ -1332,6 +1464,7 @@
 
   robotframework-vim = buildVimPluginFrom2Nix {
     name = "robotframework-vim-2017-04-14";
+    pname = "robotframework-vim";
     src = fetchFromGitHub {
       owner = "mfukar";
       repo = "robotframework-vim";
@@ -1342,6 +1475,7 @@
 
   rtorrent-syntax-file = buildVimPluginFrom2Nix {
     name = "rtorrent-syntax-file-2016-03-19";
+    pname = "rtorrent-syntax-file";
     src = fetchFromGitHub {
       owner = "ccarpita";
       repo = "rtorrent-syntax-file";
@@ -1352,6 +1486,7 @@
 
   rust-vim = buildVimPluginFrom2Nix {
     name = "rust-vim-2018-12-23";
+    pname = "rust-vim";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
@@ -1362,6 +1497,7 @@
 
   self = buildVimPluginFrom2Nix {
     name = "self-2014-05-28";
+    pname = "self";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "self";
@@ -1372,6 +1508,7 @@
 
   shabadou-vim = buildVimPluginFrom2Nix {
     name = "shabadou-vim-2016-07-19";
+    pname = "shabadou-vim";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "shabadou.vim";
@@ -1382,6 +1519,7 @@
 
   sourcemap-vim = buildVimPluginFrom2Nix {
     name = "sourcemap-vim-2012-09-19";
+    pname = "sourcemap-vim";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "sourcemap.vim";
@@ -1392,6 +1530,7 @@
 
   Spacegray-vim = buildVimPluginFrom2Nix {
     name = "Spacegray-vim-2018-06-21";
+    pname = "Spacegray-vim";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
@@ -1402,6 +1541,7 @@
 
   spacevim = buildVimPluginFrom2Nix {
     name = "spacevim-2018-03-29";
+    pname = "spacevim";
     src = fetchFromGitHub {
       owner = "ctjhoa";
       repo = "spacevim";
@@ -1412,6 +1552,7 @@
 
   sparkup = buildVimPluginFrom2Nix {
     name = "sparkup-2012-06-11";
+    pname = "sparkup";
     src = fetchFromGitHub {
       owner = "chrisgeo";
       repo = "sparkup";
@@ -1422,6 +1563,7 @@
 
   splice-vim = buildVimPluginFrom2Nix {
     name = "splice-vim-2017-09-03";
+    pname = "splice-vim";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "splice.vim";
@@ -1432,6 +1574,7 @@
 
   supertab = buildVimPluginFrom2Nix {
     name = "supertab-2017-11-14";
+    pname = "supertab";
     src = fetchFromGitHub {
       owner = "ervandew";
       repo = "supertab";
@@ -1442,6 +1585,7 @@
 
   swift-vim = buildVimPluginFrom2Nix {
     name = "swift-vim-2018-09-12";
+    pname = "swift-vim";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
@@ -1452,6 +1596,7 @@
 
   syntastic = buildVimPluginFrom2Nix {
     name = "syntastic-2018-11-24";
+    pname = "syntastic";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
@@ -1462,6 +1607,7 @@
 
   tabmerge = buildVimPluginFrom2Nix {
     name = "tabmerge-2010-10-18";
+    pname = "tabmerge";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "tabmerge";
@@ -1472,6 +1618,7 @@
 
   tabpagebuffer-vim = buildVimPluginFrom2Nix {
     name = "tabpagebuffer-vim-2014-09-30";
+    pname = "tabpagebuffer-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "tabpagebuffer.vim";
@@ -1482,6 +1629,7 @@
 
   tabular = buildVimPluginFrom2Nix {
     name = "tabular-2016-05-04";
+    pname = "tabular";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "tabular";
@@ -1492,6 +1640,7 @@
 
   tagbar = buildVimPluginFrom2Nix {
     name = "tagbar-2017-12-17";
+    pname = "tagbar";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
@@ -1502,6 +1651,7 @@
 
   taglist-vim = buildVimPluginFrom2Nix {
     name = "taglist-vim-2010-10-18";
+    pname = "taglist-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "taglist.vim";
@@ -1512,6 +1662,7 @@
 
   targets-vim = buildVimPluginFrom2Nix {
     name = "targets-vim-2018-12-21";
+    pname = "targets-vim";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
@@ -1522,6 +1673,7 @@
 
   tender-vim = buildVimPluginFrom2Nix {
     name = "tender-vim-2017-03-14";
+    pname = "tender-vim";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
@@ -1532,6 +1684,7 @@
 
   tern_for_vim = buildVimPluginFrom2Nix {
     name = "tern_for_vim-2017-11-27";
+    pname = "tern_for_vim";
     src = fetchFromGitHub {
       owner = "ternjs";
       repo = "tern_for_vim";
@@ -1542,6 +1695,7 @@
 
   thumbnail-vim = buildVimPluginFrom2Nix {
     name = "thumbnail-vim-2017-04-24";
+    pname = "thumbnail-vim";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "thumbnail.vim";
@@ -1552,6 +1706,7 @@
 
   tlib_vim = buildVimPluginFrom2Nix {
     name = "tlib_vim-2018-04-08";
+    pname = "tlib_vim";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
@@ -1562,6 +1717,7 @@
 
   traces-vim = buildVimPluginFrom2Nix {
     name = "traces-vim-2018-12-13";
+    pname = "traces-vim";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
@@ -1572,6 +1728,7 @@
 
   tslime-vim = buildVimPluginFrom2Nix {
     name = "tslime-vim-2018-07-23";
+    pname = "tslime-vim";
     src = fetchFromGitHub {
       owner = "jgdavey";
       repo = "tslime.vim";
@@ -1582,6 +1739,7 @@
 
   tsuquyomi = buildVimPluginFrom2Nix {
     name = "tsuquyomi-2018-10-31";
+    pname = "tsuquyomi";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
@@ -1592,6 +1750,7 @@
 
   typescript-vim = buildVimPluginFrom2Nix {
     name = "typescript-vim-2018-10-17";
+    pname = "typescript-vim";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
@@ -1602,6 +1761,7 @@
 
   ultisnips = buildVimPluginFrom2Nix {
     name = "ultisnips-2018-04-30";
+    pname = "ultisnips";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
@@ -1612,6 +1772,7 @@
 
   undotree = buildVimPluginFrom2Nix {
     name = "undotree-2018-10-15";
+    pname = "undotree";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
@@ -1622,6 +1783,7 @@
 
   unite-vim = buildVimPluginFrom2Nix {
     name = "unite-vim-2018-12-14";
+    pname = "unite-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
@@ -1632,6 +1794,7 @@
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
     name = "verilog_systemverilog-vim-2018-12-08";
+    pname = "verilog_systemverilog-vim";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
@@ -1642,6 +1805,7 @@
 
   vim = buildVimPluginFrom2Nix {
     name = "vim-2018-12-22";
+    pname = "vim";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
@@ -1652,6 +1816,7 @@
 
   vim-abolish = buildVimPluginFrom2Nix {
     name = "vim-abolish-2018-11-25";
+    pname = "vim-abolish";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
@@ -1662,6 +1827,7 @@
 
   vim-addon-actions = buildVimPluginFrom2Nix {
     name = "vim-addon-actions-2018-01-18";
+    pname = "vim-addon-actions";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-actions";
@@ -1672,6 +1838,7 @@
 
   vim-addon-async = buildVimPluginFrom2Nix {
     name = "vim-addon-async-2017-03-20";
+    pname = "vim-addon-async";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-async";
@@ -1682,6 +1849,7 @@
 
   vim-addon-background-cmd = buildVimPluginFrom2Nix {
     name = "vim-addon-background-cmd-2015-12-11";
+    pname = "vim-addon-background-cmd";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-background-cmd";
@@ -1692,6 +1860,7 @@
 
   vim-addon-commenting = buildVimPluginFrom2Nix {
     name = "vim-addon-commenting-2013-06-10";
+    pname = "vim-addon-commenting";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-commenting";
@@ -1702,6 +1871,7 @@
 
   vim-addon-completion = buildVimPluginFrom2Nix {
     name = "vim-addon-completion-2015-02-10";
+    pname = "vim-addon-completion";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-completion";
@@ -1712,6 +1882,7 @@
 
   vim-addon-errorformats = buildVimPluginFrom2Nix {
     name = "vim-addon-errorformats-2014-11-05";
+    pname = "vim-addon-errorformats";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-errorformats";
@@ -1722,6 +1893,7 @@
 
   vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
     name = "vim-addon-goto-thing-at-cursor-2012-01-10";
+    pname = "vim-addon-goto-thing-at-cursor";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-goto-thing-at-cursor";
@@ -1732,6 +1904,7 @@
 
   vim-addon-local-vimrc = buildVimPluginFrom2Nix {
     name = "vim-addon-local-vimrc-2015-03-19";
+    pname = "vim-addon-local-vimrc";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-local-vimrc";
@@ -1742,6 +1915,7 @@
 
   vim-addon-manager = buildVimPluginFrom2Nix {
     name = "vim-addon-manager-2018-07-27";
+    pname = "vim-addon-manager";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-manager";
@@ -1752,6 +1926,7 @@
 
   vim-addon-mru = buildVimPluginFrom2Nix {
     name = "vim-addon-mru-2013-08-08";
+    pname = "vim-addon-mru";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mru";
@@ -1762,6 +1937,7 @@
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix {
     name = "vim-addon-mw-utils-2018-03-09";
+    pname = "vim-addon-mw-utils";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mw-utils";
@@ -1772,6 +1948,7 @@
 
   vim-addon-nix = buildVimPluginFrom2Nix {
     name = "vim-addon-nix-2017-09-11";
+    pname = "vim-addon-nix";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-nix";
@@ -1782,6 +1959,7 @@
 
   vim-addon-other = buildVimPluginFrom2Nix {
     name = "vim-addon-other-2014-07-15";
+    pname = "vim-addon-other";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-other";
@@ -1792,6 +1970,7 @@
 
   vim-addon-php-manual = buildVimPluginFrom2Nix {
     name = "vim-addon-php-manual-2015-01-01";
+    pname = "vim-addon-php-manual";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-php-manual";
@@ -1802,6 +1981,7 @@
 
   vim-addon-signs = buildVimPluginFrom2Nix {
     name = "vim-addon-signs-2013-04-19";
+    pname = "vim-addon-signs";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-signs";
@@ -1812,6 +1992,7 @@
 
   vim-addon-sql = buildVimPluginFrom2Nix {
     name = "vim-addon-sql-2017-02-11";
+    pname = "vim-addon-sql";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-sql";
@@ -1822,6 +2003,7 @@
 
   vim-addon-syntax-checker = buildVimPluginFrom2Nix {
     name = "vim-addon-syntax-checker-2017-06-26";
+    pname = "vim-addon-syntax-checker";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-syntax-checker";
@@ -1832,6 +2014,7 @@
 
   vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
     name = "vim-addon-toggle-buffer-2012-01-13";
+    pname = "vim-addon-toggle-buffer";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-toggle-buffer";
@@ -1842,6 +2025,7 @@
 
   vim-addon-xdebug = buildVimPluginFrom2Nix {
     name = "vim-addon-xdebug-2014-08-29";
+    pname = "vim-addon-xdebug";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-xdebug";
@@ -1852,6 +2036,7 @@
 
   vim-airline = buildVimPluginFrom2Nix {
     name = "vim-airline-2018-12-18";
+    pname = "vim-airline";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
@@ -1862,6 +2047,7 @@
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     name = "vim-airline-themes-2018-11-15";
+    pname = "vim-airline-themes";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
@@ -1872,6 +2058,7 @@
 
   vim-android = buildVimPluginFrom2Nix {
     name = "vim-android-2018-07-31";
+    pname = "vim-android";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
@@ -1882,6 +2069,7 @@
 
   vim-anzu = buildVimPluginFrom2Nix {
     name = "vim-anzu-2018-02-28";
+    pname = "vim-anzu";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-anzu";
@@ -1892,6 +2080,7 @@
 
   vim-auto-save = buildVimPluginFrom2Nix {
     name = "vim-auto-save-2017-11-08";
+    pname = "vim-auto-save";
     src = fetchFromGitHub {
       owner = "907th";
       repo = "vim-auto-save";
@@ -1902,6 +2091,7 @@
 
   vim-autoformat = buildVimPluginFrom2Nix {
     name = "vim-autoformat-2018-12-19";
+    pname = "vim-autoformat";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
@@ -1912,6 +2102,7 @@
 
   vim-bazel = buildVimPluginFrom2Nix {
     name = "vim-bazel-2018-01-11";
+    pname = "vim-bazel";
     src = fetchFromGitHub {
       owner = "bazelbuild";
       repo = "vim-bazel";
@@ -1922,6 +2113,7 @@
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
     name = "vim-better-whitespace-2018-06-11";
+    pname = "vim-better-whitespace";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
@@ -1932,6 +2124,7 @@
 
   vim-buffergator = buildVimPluginFrom2Nix {
     name = "vim-buffergator-2018-05-02";
+    pname = "vim-buffergator";
     src = fetchFromGitHub {
       owner = "jeetsukumaran";
       repo = "vim-buffergator";
@@ -1942,6 +2135,7 @@
 
   vim-bufferline = buildVimPluginFrom2Nix {
     name = "vim-bufferline-2016-02-09";
+    pname = "vim-bufferline";
     src = fetchFromGitHub {
       owner = "bling";
       repo = "vim-bufferline";
@@ -1952,6 +2146,7 @@
 
   vim-closetag = buildVimPluginFrom2Nix {
     name = "vim-closetag-2018-12-08";
+    pname = "vim-closetag";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
@@ -1962,6 +2157,7 @@
 
   vim-codefmt = buildVimPluginFrom2Nix {
     name = "vim-codefmt-2018-12-15";
+    pname = "vim-codefmt";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
@@ -1972,6 +2168,7 @@
 
   vim-coffee-script = buildVimPluginFrom2Nix {
     name = "vim-coffee-script-2018-02-27";
+    pname = "vim-coffee-script";
     src = fetchFromGitHub {
       owner = "kchmck";
       repo = "vim-coffee-script";
@@ -1982,6 +2179,7 @@
 
   vim-colemak = buildVimPluginFrom2Nix {
     name = "vim-colemak-2016-10-16";
+    pname = "vim-colemak";
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "vim-colemak";
@@ -1992,6 +2190,7 @@
 
   vim-colors-solarized = buildVimPluginFrom2Nix {
     name = "vim-colors-solarized-2011-05-09";
+    pname = "vim-colors-solarized";
     src = fetchFromGitHub {
       owner = "altercation";
       repo = "vim-colors-solarized";
@@ -2002,6 +2201,7 @@
 
   vim-colorschemes = buildVimPluginFrom2Nix {
     name = "vim-colorschemes-2018-11-20";
+    pname = "vim-colorschemes";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
@@ -2012,6 +2212,7 @@
 
   vim-colorstepper = buildVimPluginFrom2Nix {
     name = "vim-colorstepper-2016-01-28";
+    pname = "vim-colorstepper";
     src = fetchFromGitHub {
       owner = "jonbri";
       repo = "vim-colorstepper";
@@ -2022,6 +2223,7 @@
 
   vim-commentary = buildVimPluginFrom2Nix {
     name = "vim-commentary-2018-07-27";
+    pname = "vim-commentary";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-commentary";
@@ -2032,6 +2234,7 @@
 
   vim-css-color = buildVimPluginFrom2Nix {
     name = "vim-css-color-2018-11-20";
+    pname = "vim-css-color";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
@@ -2042,6 +2245,7 @@
 
   vim-cursorword = buildVimPluginFrom2Nix {
     name = "vim-cursorword-2017-10-19";
+    pname = "vim-cursorword";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
@@ -2052,6 +2256,7 @@
 
   vim-cute-python = buildVimPluginFrom2Nix {
     name = "vim-cute-python-2016-04-04";
+    pname = "vim-cute-python";
     src = fetchFromGitHub {
       owner = "ehamberg";
       repo = "vim-cute-python";
@@ -2062,6 +2267,7 @@
 
   vim-devicons = buildVimPluginFrom2Nix {
     name = "vim-devicons-2018-06-21";
+    pname = "vim-devicons";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
@@ -2072,6 +2278,7 @@
 
   vim-dirdiff = buildVimPluginFrom2Nix {
     name = "vim-dirdiff-2018-01-31";
+    pname = "vim-dirdiff";
     src = fetchFromGitHub {
       owner = "will133";
       repo = "vim-dirdiff";
@@ -2082,6 +2289,7 @@
 
   vim-dirvish = buildVimPluginFrom2Nix {
     name = "vim-dirvish-2018-12-04";
+    pname = "vim-dirvish";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
@@ -2092,6 +2300,7 @@
 
   vim-dispatch = buildVimPluginFrom2Nix {
     name = "vim-dispatch-2018-10-31";
+    pname = "vim-dispatch";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
@@ -2102,6 +2311,7 @@
 
   vim-docbk = buildVimPluginFrom2Nix {
     name = "vim-docbk-2015-04-01";
+    pname = "vim-docbk";
     src = fetchFromGitHub {
       owner = "jhradilek";
       repo = "vim-docbk";
@@ -2112,6 +2322,7 @@
 
   vim-easy-align = buildVimPluginFrom2Nix {
     name = "vim-easy-align-2017-06-03";
+    pname = "vim-easy-align";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-easy-align";
@@ -2122,6 +2333,7 @@
 
   vim-easygit = buildVimPluginFrom2Nix {
     name = "vim-easygit-2018-07-08";
+    pname = "vim-easygit";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "vim-easygit";
@@ -2132,6 +2344,7 @@
 
   vim-easymotion = buildVimPluginFrom2Nix {
     name = "vim-easymotion-2018-06-04";
+    pname = "vim-easymotion";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
@@ -2142,6 +2355,7 @@
 
   vim-easytags = buildVimPluginFrom2Nix {
     name = "vim-easytags-2015-07-01";
+    pname = "vim-easytags";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-easytags";
@@ -2152,6 +2366,7 @@
 
   vim-eighties = buildVimPluginFrom2Nix {
     name = "vim-eighties-2016-12-15";
+    pname = "vim-eighties";
     src = fetchFromGitHub {
       owner = "justincampbell";
       repo = "vim-eighties";
@@ -2162,6 +2377,7 @@
 
   vim-elixir = buildVimPluginFrom2Nix {
     name = "vim-elixir-2018-12-12";
+    pname = "vim-elixir";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
@@ -2172,6 +2388,7 @@
 
   vim-eunuch = buildVimPluginFrom2Nix {
     name = "vim-eunuch-2018-09-09";
+    pname = "vim-eunuch";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
@@ -2182,6 +2399,7 @@
 
   vim-expand-region = buildVimPluginFrom2Nix {
     name = "vim-expand-region-2013-08-19";
+    pname = "vim-expand-region";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-expand-region";
@@ -2192,6 +2410,7 @@
 
   vim-extradite = buildVimPluginFrom2Nix {
     name = "vim-extradite-2015-09-22";
+    pname = "vim-extradite";
     src = fetchFromGitHub {
       owner = "int3";
       repo = "vim-extradite";
@@ -2202,6 +2421,7 @@
 
   vim-fireplace = buildVimPluginFrom2Nix {
     name = "vim-fireplace-2018-06-01";
+    pname = "vim-fireplace";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
@@ -2212,6 +2432,7 @@
 
   vim-flagship = buildVimPluginFrom2Nix {
     name = "vim-flagship-2018-08-15";
+    pname = "vim-flagship";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-flagship";
@@ -2222,6 +2443,7 @@
 
   vim-flake8 = buildVimPluginFrom2Nix {
     name = "vim-flake8-2018-09-21";
+    pname = "vim-flake8";
     src = fetchFromGitHub {
       owner = "nvie";
       repo = "vim-flake8";
@@ -2232,6 +2454,7 @@
 
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
     name = "vim-ft-diff_fold-2013-02-10";
+    pname = "vim-ft-diff_fold";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-ft-diff_fold";
@@ -2242,6 +2465,7 @@
 
   vim-fugitive = buildVimPluginFrom2Nix {
     name = "vim-fugitive-2018-12-23";
+    pname = "vim-fugitive";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
@@ -2252,6 +2476,7 @@
 
   vim-ghost = buildVimPluginFrom2Nix {
     name = "vim-ghost-2018-12-12";
+    pname = "vim-ghost";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
@@ -2262,6 +2487,7 @@
 
   vim-gista = buildVimPluginFrom2Nix {
     name = "vim-gista-2017-02-20";
+    pname = "vim-gista";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-gista";
@@ -2272,6 +2498,7 @@
 
   vim-gitbranch = buildVimPluginFrom2Nix {
     name = "vim-gitbranch-2017-05-27";
+    pname = "vim-gitbranch";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-gitbranch";
@@ -2282,6 +2509,7 @@
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     name = "vim-gitgutter-2018-12-15";
+    pname = "vim-gitgutter";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
@@ -2292,6 +2520,7 @@
 
   vim-github-dashboard = buildVimPluginFrom2Nix {
     name = "vim-github-dashboard-2018-09-03";
+    pname = "vim-github-dashboard";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-github-dashboard";
@@ -2302,6 +2531,7 @@
 
   vim-go = buildVimPluginFrom2Nix {
     name = "vim-go-2018-12-21";
+    pname = "vim-go";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
@@ -2312,6 +2542,7 @@
 
   vim-grammarous = buildVimPluginFrom2Nix {
     name = "vim-grammarous-2018-09-13";
+    pname = "vim-grammarous";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-grammarous";
@@ -2322,6 +2553,7 @@
 
   vim-grepper = buildVimPluginFrom2Nix {
     name = "vim-grepper-2018-12-22";
+    pname = "vim-grepper";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
@@ -2332,6 +2564,7 @@
 
   vim-gutentags = buildVimPluginFrom2Nix {
     name = "vim-gutentags-2018-11-17";
+    pname = "vim-gutentags";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
@@ -2342,6 +2575,7 @@
 
   vim-hardtime = buildVimPluginFrom2Nix {
     name = "vim-hardtime-2017-03-31";
+    pname = "vim-hardtime";
     src = fetchFromGitHub {
       owner = "takac";
       repo = "vim-hardtime";
@@ -2352,6 +2586,7 @@
 
   vim-haskellconceal = buildVimPluginFrom2Nix {
     name = "vim-haskellconceal-2017-06-15";
+    pname = "vim-haskellconceal";
     src = fetchFromGitHub {
       owner = "twinside";
       repo = "vim-haskellconceal";
@@ -2362,6 +2597,7 @@
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
     name = "vim-haskellConcealPlus-2018-08-07";
+    pname = "vim-haskellConcealPlus";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
@@ -2372,6 +2608,7 @@
 
   vim-hdevtools = buildVimPluginFrom2Nix {
     name = "vim-hdevtools-2018-11-19";
+    pname = "vim-hdevtools";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
@@ -2382,6 +2619,7 @@
 
   vim-hier = buildVimPluginFrom2Nix {
     name = "vim-hier-2011-08-27";
+    pname = "vim-hier";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-hier";
@@ -2392,6 +2630,7 @@
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
     name = "vim-highlightedyank-2018-10-08";
+    pname = "vim-highlightedyank";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
@@ -2402,6 +2641,7 @@
 
   vim-hindent = buildVimPluginFrom2Nix {
     name = "vim-hindent-2018-07-31";
+    pname = "vim-hindent";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-hindent";
@@ -2412,6 +2652,7 @@
 
   vim-hoogle = buildVimPluginFrom2Nix {
     name = "vim-hoogle-2018-03-04";
+    pname = "vim-hoogle";
     src = fetchFromGitHub {
       owner = "Twinside";
       repo = "vim-hoogle";
@@ -2422,6 +2663,7 @@
 
   vim-husk = buildVimPluginFrom2Nix {
     name = "vim-husk-2015-11-29";
+    pname = "vim-husk";
     src = fetchFromGitHub {
       owner = "vim-utils";
       repo = "vim-husk";
@@ -2432,6 +2674,7 @@
 
   vim-iced-coffee-script = buildVimPluginFrom2Nix {
     name = "vim-iced-coffee-script-2013-12-26";
+    pname = "vim-iced-coffee-script";
     src = fetchFromGitHub {
       owner = "noc7c9";
       repo = "vim-iced-coffee-script";
@@ -2442,6 +2685,7 @@
 
   vim-indent-guides = buildVimPluginFrom2Nix {
     name = "vim-indent-guides-2018-05-14";
+    pname = "vim-indent-guides";
     src = fetchFromGitHub {
       owner = "nathanaelkane";
       repo = "vim-indent-guides";
@@ -2452,6 +2696,7 @@
 
   vim-indent-object = buildVimPluginFrom2Nix {
     name = "vim-indent-object-2018-04-08";
+    pname = "vim-indent-object";
     src = fetchFromGitHub {
       owner = "michaeljsmith";
       repo = "vim-indent-object";
@@ -2462,6 +2707,7 @@
 
   vim-ipython = buildVimPluginFrom2Nix {
     name = "vim-ipython-2015-06-23";
+    pname = "vim-ipython";
     src = fetchFromGitHub {
       owner = "ivanov";
       repo = "vim-ipython";
@@ -2472,6 +2718,7 @@
 
   vim-isort = buildVimPluginFrom2Nix {
     name = "vim-isort-2018-08-22";
+    pname = "vim-isort";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
@@ -2482,6 +2729,7 @@
 
   vim-jade = buildVimPluginFrom2Nix {
     name = "vim-jade-2018-09-10";
+    pname = "vim-jade";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
@@ -2492,6 +2740,7 @@
 
   vim-janah = buildVimPluginFrom2Nix {
     name = "vim-janah-2018-10-01";
+    pname = "vim-janah";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-janah";
@@ -2502,6 +2751,7 @@
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     name = "vim-javacomplete2-2018-12-21";
+    pname = "vim-javacomplete2";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
@@ -2512,6 +2762,7 @@
 
   vim-javascript = buildVimPluginFrom2Nix {
     name = "vim-javascript-2018-12-23";
+    pname = "vim-javascript";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
@@ -2522,6 +2773,7 @@
 
   vim-jinja = buildVimPluginFrom2Nix {
     name = "vim-jinja-2016-11-16";
+    pname = "vim-jinja";
     src = fetchFromGitHub {
       owner = "lepture";
       repo = "vim-jinja";
@@ -2532,6 +2784,7 @@
 
   vim-jsbeautify = buildVimPluginFrom2Nix {
     name = "vim-jsbeautify-2018-10-23";
+    pname = "vim-jsbeautify";
     src = fetchFromGitHub {
       owner = "maksimr";
       repo = "vim-jsbeautify";
@@ -2543,6 +2796,7 @@
 
   vim-jsdoc = buildVimPluginFrom2Nix {
     name = "vim-jsdoc-2018-05-05";
+    pname = "vim-jsdoc";
     src = fetchFromGitHub {
       owner = "heavenshell";
       repo = "vim-jsdoc";
@@ -2553,6 +2807,7 @@
 
   vim-json = buildVimPluginFrom2Nix {
     name = "vim-json-2018-01-10";
+    pname = "vim-json";
     src = fetchFromGitHub {
       owner = "elzr";
       repo = "vim-json";
@@ -2563,6 +2818,7 @@
 
   vim-jsonnet = buildVimPluginFrom2Nix {
     name = "vim-jsonnet-2018-10-08";
+    pname = "vim-jsonnet";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
@@ -2573,6 +2829,7 @@
 
   vim-lastplace = buildVimPluginFrom2Nix {
     name = "vim-lastplace-2017-06-13";
+    pname = "vim-lastplace";
     src = fetchFromGitHub {
       owner = "farmergreg";
       repo = "vim-lastplace";
@@ -2583,6 +2840,7 @@
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
     name = "vim-latex-live-preview-2018-09-25";
+    pname = "vim-latex-live-preview";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
@@ -2593,6 +2851,7 @@
 
   vim-lawrencium = buildVimPluginFrom2Nix {
     name = "vim-lawrencium-2018-11-04";
+    pname = "vim-lawrencium";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
@@ -2603,6 +2862,7 @@
 
   vim-leader-guide = buildVimPluginFrom2Nix {
     name = "vim-leader-guide-2018-10-06";
+    pname = "vim-leader-guide";
     src = fetchFromGitHub {
       owner = "hecal3";
       repo = "vim-leader-guide";
@@ -2613,6 +2873,7 @@
 
   vim-ledger = buildVimPluginFrom2Nix {
     name = "vim-ledger-2017-12-12";
+    pname = "vim-ledger";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
@@ -2623,6 +2884,7 @@
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     name = "vim-localvimrc-2018-11-06";
+    pname = "vim-localvimrc";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
@@ -2633,6 +2895,7 @@
 
   vim-logreview = buildVimPluginFrom2Nix {
     name = "vim-logreview-2017-07-08";
+    pname = "vim-logreview";
     src = fetchFromGitHub {
       owner = "andreshazard";
       repo = "vim-logreview";
@@ -2643,6 +2906,7 @@
 
   vim-maktaba = buildVimPluginFrom2Nix {
     name = "vim-maktaba-2018-12-13";
+    pname = "vim-maktaba";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
@@ -2653,6 +2917,7 @@
 
   vim-markdown = buildVimPluginFrom2Nix {
     name = "vim-markdown-2018-10-24";
+    pname = "vim-markdown";
     src = fetchFromGitHub {
       owner = "plasticboy";
       repo = "vim-markdown";
@@ -2663,6 +2928,7 @@
 
   vim-misc = buildVimPluginFrom2Nix {
     name = "vim-misc-2015-05-21";
+    pname = "vim-misc";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-misc";
@@ -2673,6 +2939,7 @@
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
     name = "vim-monokai-pro-2018-12-03";
+    pname = "vim-monokai-pro";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
@@ -2683,6 +2950,7 @@
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     name = "vim-multiple-cursors-2018-10-16";
+    pname = "vim-multiple-cursors";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
@@ -2693,6 +2961,7 @@
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
     name = "vim-nerdtree-tabs-2018-12-21";
+    pname = "vim-nerdtree-tabs";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
@@ -2703,6 +2972,7 @@
 
   vim-niceblock = buildVimPluginFrom2Nix {
     name = "vim-niceblock-2018-09-06";
+    pname = "vim-niceblock";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-niceblock";
@@ -2713,6 +2983,7 @@
 
   vim-nix = buildVimPluginFrom2Nix {
     name = "vim-nix-2018-08-27";
+    pname = "vim-nix";
     src = fetchFromGitHub {
       owner = "LnL7";
       repo = "vim-nix";
@@ -2723,6 +2994,7 @@
 
   vim-obsession = buildVimPluginFrom2Nix {
     name = "vim-obsession-2018-09-17";
+    pname = "vim-obsession";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
@@ -2733,6 +3005,7 @@
 
   vim-one = buildVimPluginFrom2Nix {
     name = "vim-one-2018-07-22";
+    pname = "vim-one";
     src = fetchFromGitHub {
       owner = "rakr";
       repo = "vim-one";
@@ -2743,6 +3016,7 @@
 
   vim-operator-replace = buildVimPluginFrom2Nix {
     name = "vim-operator-replace-2015-02-24";
+    pname = "vim-operator-replace";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-replace";
@@ -2753,6 +3027,7 @@
 
   vim-operator-surround = buildVimPluginFrom2Nix {
     name = "vim-operator-surround-2018-11-01";
+    pname = "vim-operator-surround";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-operator-surround";
@@ -2763,6 +3038,7 @@
 
   vim-operator-user = buildVimPluginFrom2Nix {
     name = "vim-operator-user-2015-02-17";
+    pname = "vim-operator-user";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-user";
@@ -2773,6 +3049,7 @@
 
   vim-orgmode = buildVimPluginFrom2Nix {
     name = "vim-orgmode-2018-07-25";
+    pname = "vim-orgmode";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
@@ -2783,6 +3060,7 @@
 
   vim-pager = buildVimPluginFrom2Nix {
     name = "vim-pager-2015-08-26";
+    pname = "vim-pager";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-pager";
@@ -2793,6 +3071,7 @@
 
   vim-pandoc = buildVimPluginFrom2Nix {
     name = "vim-pandoc-2018-10-07";
+    pname = "vim-pandoc";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
@@ -2803,6 +3082,7 @@
 
   vim-pandoc-after = buildVimPluginFrom2Nix {
     name = "vim-pandoc-after-2017-11-21";
+    pname = "vim-pandoc-after";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-after";
@@ -2813,6 +3093,7 @@
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
     name = "vim-pandoc-syntax-2017-04-13";
+    pname = "vim-pandoc-syntax";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
@@ -2823,6 +3104,7 @@
 
   vim-pathogen = buildVimPluginFrom2Nix {
     name = "vim-pathogen-2018-12-13";
+    pname = "vim-pathogen";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
@@ -2833,6 +3115,7 @@
 
   vim-peekaboo = buildVimPluginFrom2Nix {
     name = "vim-peekaboo-2017-03-20";
+    pname = "vim-peekaboo";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-peekaboo";
@@ -2843,6 +3126,7 @@
 
   vim-pencil = buildVimPluginFrom2Nix {
     name = "vim-pencil-2017-06-14";
+    pname = "vim-pencil";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-pencil";
@@ -2853,6 +3137,7 @@
 
   vim-plug = buildVimPluginFrom2Nix {
     name = "vim-plug-2018-11-03";
+    pname = "vim-plug";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
@@ -2863,6 +3148,7 @@
 
   vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
     name = "vim-plugin-AnsiEsc-2018-05-10";
+    pname = "vim-plugin-AnsiEsc";
     src = fetchFromGitHub {
       owner = "powerman";
       repo = "vim-plugin-AnsiEsc";
@@ -2873,6 +3159,7 @@
 
   vim-polyglot = buildVimPluginFrom2Nix {
     name = "vim-polyglot-2018-10-10";
+    pname = "vim-polyglot";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
@@ -2883,6 +3170,7 @@
 
   vim-prettyprint = buildVimPluginFrom2Nix {
     name = "vim-prettyprint-2016-07-16";
+    pname = "vim-prettyprint";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-prettyprint";
@@ -2893,6 +3181,7 @@
 
   vim-projectionist = buildVimPluginFrom2Nix {
     name = "vim-projectionist-2018-10-21";
+    pname = "vim-projectionist";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
@@ -2903,6 +3192,7 @@
 
   vim-ps1 = buildVimPluginFrom2Nix {
     name = "vim-ps1-2017-10-20";
+    pname = "vim-ps1";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
@@ -2913,6 +3203,7 @@
 
   vim-puppet = buildVimPluginFrom2Nix {
     name = "vim-puppet-2018-11-15";
+    pname = "vim-puppet";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
@@ -2923,6 +3214,7 @@
 
   vim-qml = buildVimPluginFrom2Nix {
     name = "vim-qml-2018-07-22";
+    pname = "vim-qml";
     src = fetchFromGitHub {
       owner = "peterhoeg";
       repo = "vim-qml";
@@ -2933,6 +3225,7 @@
 
   vim-quickrun = buildVimPluginFrom2Nix {
     name = "vim-quickrun-2018-11-27";
+    pname = "vim-quickrun";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
@@ -2943,6 +3236,7 @@
 
   vim-racer = buildVimPluginFrom2Nix {
     name = "vim-racer-2018-08-26";
+    pname = "vim-racer";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
@@ -2953,6 +3247,7 @@
 
   vim-repeat = buildVimPluginFrom2Nix {
     name = "vim-repeat-2018-07-02";
+    pname = "vim-repeat";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-repeat";
@@ -2963,6 +3258,7 @@
 
   vim-rhubarb = buildVimPluginFrom2Nix {
     name = "vim-rhubarb-2018-11-16";
+    pname = "vim-rhubarb";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
@@ -2973,6 +3269,7 @@
 
   vim-ruby = buildVimPluginFrom2Nix {
     name = "vim-ruby-2018-12-11";
+    pname = "vim-ruby";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
@@ -2983,6 +3280,7 @@
 
   vim-sayonara = buildVimPluginFrom2Nix {
     name = "vim-sayonara-2017-03-13";
+    pname = "vim-sayonara";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-sayonara";
@@ -2993,6 +3291,7 @@
 
   vim-scala = buildVimPluginFrom2Nix {
     name = "vim-scala-2017-11-10";
+    pname = "vim-scala";
     src = fetchFromGitHub {
       owner = "derekwyatt";
       repo = "vim-scala";
@@ -3003,6 +3302,7 @@
 
   vim-scouter = buildVimPluginFrom2Nix {
     name = "vim-scouter-2014-08-10";
+    pname = "vim-scouter";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-scouter";
@@ -3013,6 +3313,7 @@
 
   vim-scriptease = buildVimPluginFrom2Nix {
     name = "vim-scriptease-2018-12-19";
+    pname = "vim-scriptease";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
@@ -3023,6 +3324,7 @@
 
   vim-sensible = buildVimPluginFrom2Nix {
     name = "vim-sensible-2018-10-27";
+    pname = "vim-sensible";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
@@ -3033,6 +3335,7 @@
 
   vim-signature = buildVimPluginFrom2Nix {
     name = "vim-signature-2018-07-06";
+    pname = "vim-signature";
     src = fetchFromGitHub {
       owner = "kshenoy";
       repo = "vim-signature";
@@ -3043,6 +3346,7 @@
 
   vim-signify = buildVimPluginFrom2Nix {
     name = "vim-signify-2018-12-20";
+    pname = "vim-signify";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
@@ -3053,6 +3357,7 @@
 
   vim-sleuth = buildVimPluginFrom2Nix {
     name = "vim-sleuth-2018-08-19";
+    pname = "vim-sleuth";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sleuth";
@@ -3063,6 +3368,7 @@
 
   vim-smalls = buildVimPluginFrom2Nix {
     name = "vim-smalls-2015-05-02";
+    pname = "vim-smalls";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-smalls";
@@ -3073,6 +3379,7 @@
 
   vim-snipmate = buildVimPluginFrom2Nix {
     name = "vim-snipmate-2017-04-20";
+    pname = "vim-snipmate";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
@@ -3083,6 +3390,7 @@
 
   vim-snippets = buildVimPluginFrom2Nix {
     name = "vim-snippets-2018-12-14";
+    pname = "vim-snippets";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
@@ -3093,6 +3401,7 @@
 
   vim-solidity = buildVimPluginFrom2Nix {
     name = "vim-solidity-2018-04-17";
+    pname = "vim-solidity";
     src = fetchFromGitHub {
       owner = "tomlion";
       repo = "vim-solidity";
@@ -3103,6 +3412,7 @@
 
   vim-sort-motion = buildVimPluginFrom2Nix {
     name = "vim-sort-motion-2018-07-15";
+    pname = "vim-sort-motion";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-sort-motion";
@@ -3113,6 +3423,7 @@
 
   vim-speeddating = buildVimPluginFrom2Nix {
     name = "vim-speeddating-2018-10-31";
+    pname = "vim-speeddating";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-speeddating";
@@ -3123,6 +3434,7 @@
 
   vim-startify = buildVimPluginFrom2Nix {
     name = "vim-startify-2018-12-16";
+    pname = "vim-startify";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
@@ -3133,6 +3445,7 @@
 
   vim-stylish-haskell = buildVimPluginFrom2Nix {
     name = "vim-stylish-haskell-2018-08-31";
+    pname = "vim-stylish-haskell";
     src = fetchFromGitHub {
       owner = "nbouscal";
       repo = "vim-stylish-haskell";
@@ -3143,6 +3456,7 @@
 
   vim-stylishask = buildVimPluginFrom2Nix {
     name = "vim-stylishask-2018-07-05";
+    pname = "vim-stylishask";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-stylishask";
@@ -3153,6 +3467,7 @@
 
   vim-surround = buildVimPluginFrom2Nix {
     name = "vim-surround-2018-07-23";
+    pname = "vim-surround";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-surround";
@@ -3163,6 +3478,7 @@
 
   vim-SyntaxRange = buildVimPluginFrom2Nix {
     name = "vim-SyntaxRange-2018-03-09";
+    pname = "vim-SyntaxRange";
     src = fetchFromGitHub {
       owner = "inkarkat";
       repo = "vim-SyntaxRange";
@@ -3173,6 +3489,7 @@
 
   vim-table-mode = buildVimPluginFrom2Nix {
     name = "vim-table-mode-2018-10-21";
+    pname = "vim-table-mode";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
@@ -3183,6 +3500,7 @@
 
   vim-tabpagecd = buildVimPluginFrom2Nix {
     name = "vim-tabpagecd-2013-11-29";
+    pname = "vim-tabpagecd";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-tabpagecd";
@@ -3193,6 +3511,7 @@
 
   vim-tbone = buildVimPluginFrom2Nix {
     name = "vim-tbone-2018-06-28";
+    pname = "vim-tbone";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-tbone";
@@ -3203,6 +3522,7 @@
 
   vim-terraform = buildVimPluginFrom2Nix {
     name = "vim-terraform-2018-12-20";
+    pname = "vim-terraform";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
@@ -3213,6 +3533,7 @@
 
   vim-test = buildVimPluginFrom2Nix {
     name = "vim-test-2018-11-22";
+    pname = "vim-test";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
@@ -3223,6 +3544,7 @@
 
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
     name = "vim-textobj-multiblock-2014-06-02";
+    pname = "vim-textobj-multiblock";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-textobj-multiblock";
@@ -3233,6 +3555,7 @@
 
   vim-themis = buildVimPluginFrom2Nix {
     name = "vim-themis-2017-12-27";
+    pname = "vim-themis";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
@@ -3243,6 +3566,7 @@
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
     name = "vim-tmux-navigator-2018-11-03";
+    pname = "vim-tmux-navigator";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
@@ -3253,6 +3577,7 @@
 
   vim-toml = buildVimPluginFrom2Nix {
     name = "vim-toml-2018-11-27";
+    pname = "vim-toml";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
@@ -3263,6 +3588,7 @@
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
     name = "vim-trailing-whitespace-2017-09-23";
+    pname = "vim-trailing-whitespace";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
@@ -3273,6 +3599,7 @@
 
   vim-tsx = buildVimPluginFrom2Nix {
     name = "vim-tsx-2017-03-16";
+    pname = "vim-tsx";
     src = fetchFromGitHub {
       owner = "ianks";
       repo = "vim-tsx";
@@ -3283,6 +3610,7 @@
 
   vim-unimpaired = buildVimPluginFrom2Nix {
     name = "vim-unimpaired-2018-12-20";
+    pname = "vim-unimpaired";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
@@ -3293,6 +3621,7 @@
 
   vim-vinegar = buildVimPluginFrom2Nix {
     name = "vim-vinegar-2018-08-06";
+    pname = "vim-vinegar";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-vinegar";
@@ -3303,6 +3632,7 @@
 
   vim-visualstar = buildVimPluginFrom2Nix {
     name = "vim-visualstar-2015-08-27";
+    pname = "vim-visualstar";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-visualstar";
@@ -3313,6 +3643,7 @@
 
   vim-vue = buildVimPluginFrom2Nix {
     name = "vim-vue-2018-11-11";
+    pname = "vim-vue";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
@@ -3323,6 +3654,7 @@
 
   vim-wakatime = buildVimPluginFrom2Nix {
     name = "vim-wakatime-2018-12-19";
+    pname = "vim-wakatime";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
@@ -3333,6 +3665,7 @@
 
   vim-watchdogs = buildVimPluginFrom2Nix {
     name = "vim-watchdogs-2017-12-03";
+    pname = "vim-watchdogs";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-watchdogs";
@@ -3343,6 +3676,7 @@
 
   vim-wordy = buildVimPluginFrom2Nix {
     name = "vim-wordy-2018-03-10";
+    pname = "vim-wordy";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-wordy";
@@ -3353,6 +3687,7 @@
 
   vim-xdebug = buildVimPluginFrom2Nix {
     name = "vim-xdebug-2012-08-15";
+    pname = "vim-xdebug";
     src = fetchFromGitHub {
       owner = "joonty";
       repo = "vim-xdebug";
@@ -3363,6 +3698,7 @@
 
   vim-xkbswitch = buildVimPluginFrom2Nix {
     name = "vim-xkbswitch-2017-03-27";
+    pname = "vim-xkbswitch";
     src = fetchFromGitHub {
       owner = "lyokha";
       repo = "vim-xkbswitch";
@@ -3373,6 +3709,7 @@
 
   vim-yapf = buildVimPluginFrom2Nix {
     name = "vim-yapf-2018-10-04";
+    pname = "vim-yapf";
     src = fetchFromGitHub {
       owner = "mindriot101";
       repo = "vim-yapf";
@@ -3383,6 +3720,7 @@
 
   vim2hs = buildVimPluginFrom2Nix {
     name = "vim2hs-2014-04-16";
+    pname = "vim2hs";
     src = fetchFromGitHub {
       owner = "dag";
       repo = "vim2hs";
@@ -3393,6 +3731,7 @@
 
   vimoutliner = buildVimPluginFrom2Nix {
     name = "vimoutliner-2018-07-04";
+    pname = "vimoutliner";
     src = fetchFromGitHub {
       owner = "vimoutliner";
       repo = "vimoutliner";
@@ -3403,6 +3742,7 @@
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
     name = "vimpreviewpandoc-2018-11-05";
+    pname = "vimpreviewpandoc";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
@@ -3413,6 +3753,7 @@
 
   vimproc-vim = buildVimPluginFrom2Nix {
     name = "vimproc-vim-2018-10-11";
+    pname = "vimproc-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimproc.vim";
@@ -3423,6 +3764,7 @@
 
   vimshell-vim = buildVimPluginFrom2Nix {
     name = "vimshell-vim-2018-06-02";
+    pname = "vimshell-vim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimshell.vim";
@@ -3433,6 +3775,7 @@
 
   vimtex = buildVimPluginFrom2Nix {
     name = "vimtex-2018-12-21";
+    pname = "vimtex";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
@@ -3443,6 +3786,7 @@
 
   vimux = buildVimPluginFrom2Nix {
     name = "vimux-2017-10-24";
+    pname = "vimux";
     src = fetchFromGitHub {
       owner = "benmills";
       repo = "vimux";
@@ -3453,6 +3797,7 @@
 
   vimwiki = buildVimPluginFrom2Nix {
     name = "vimwiki-2018-10-12";
+    pname = "vimwiki";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
@@ -3463,6 +3808,7 @@
 
   vissort-vim = buildVimPluginFrom2Nix {
     name = "vissort-vim-2014-01-31";
+    pname = "vissort-vim";
     src = fetchFromGitHub {
       owner = "navicore";
       repo = "vissort.vim";
@@ -3473,6 +3819,7 @@
 
   vundle = buildVimPluginFrom2Nix {
     name = "vundle-2018-02-03";
+    pname = "vundle";
     src = fetchFromGitHub {
       owner = "gmarik";
       repo = "vundle";
@@ -3483,6 +3830,7 @@
 
   wal-vim = buildVimPluginFrom2Nix {
     name = "wal-vim-2018-06-04";
+    pname = "wal-vim";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
@@ -3493,6 +3841,7 @@
 
   webapi-vim = buildVimPluginFrom2Nix {
     name = "webapi-vim-2018-03-14";
+    pname = "webapi-vim";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "webapi-vim";
@@ -3503,6 +3852,7 @@
 
   wombat256-vim = buildVimPluginFrom2Nix {
     name = "wombat256-vim-2010-10-18";
+    pname = "wombat256-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "wombat256.vim";
@@ -3513,6 +3863,7 @@
 
   workflowish = buildVimPluginFrom2Nix {
     name = "workflowish-2015-12-03";
+    pname = "workflowish";
     src = fetchFromGitHub {
       owner = "lukaszkorecki";
       repo = "workflowish";
@@ -3523,6 +3874,7 @@
 
   xptemplate = buildVimPluginFrom2Nix {
     name = "xptemplate-2017-12-06";
+    pname = "xptemplate";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
@@ -3533,6 +3885,7 @@
 
   xterm-color-table-vim = buildVimPluginFrom2Nix {
     name = "xterm-color-table-vim-2014-01-01";
+    pname = "xterm-color-table-vim";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "xterm-color-table.vim";
@@ -3543,6 +3896,7 @@
 
   YankRing-vim = buildVimPluginFrom2Nix {
     name = "YankRing-vim-2015-07-29";
+    pname = "YankRing-vim";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
@@ -3553,6 +3907,7 @@
 
   yats-vim = buildVimPluginFrom2Nix {
     name = "yats-vim-2018-12-15";
+    pname = "yats-vim";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
@@ -3564,6 +3919,7 @@
 
   youcompleteme = buildVimPluginFrom2Nix {
     name = "youcompleteme-2018-12-23";
+    pname = "youcompleteme";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
@@ -3575,6 +3931,7 @@
 
   YUNOcommit-vim = buildVimPluginFrom2Nix {
     name = "YUNOcommit-vim-2014-11-26";
+    pname = "YUNOcommit-vim";
     src = fetchFromGitHub {
       owner = "esneider";
       repo = "YUNOcommit.vim";
@@ -3585,6 +3942,7 @@
 
   zeavim-vim = buildVimPluginFrom2Nix {
     name = "zeavim-vim-2018-03-22";
+    pname = "zeavim-vim";
     src = fetchFromGitHub {
       owner = "KabbAmine";
       repo = "zeavim.vim";
@@ -3595,6 +3953,7 @@
 
   zenburn = buildVimPluginFrom2Nix {
     name = "zenburn-2018-04-29";
+    pname = "zenburn";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
@@ -3605,6 +3964,7 @@
 
   zig-vim = buildVimPluginFrom2Nix {
     name = "zig-vim-2018-12-12";
+    pname = "zig-vim";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
@@ -3615,6 +3975,7 @@
 
   zoomwintab-vim = buildVimPluginFrom2Nix {
     name = "zoomwintab-vim-2018-04-14";
+    pname = "zoomwintab-vim";
     src = fetchFromGitHub {
       owner = "troydm";
       repo = "zoomwintab.vim";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 7bdce724ab7..d0e55cb4c3f 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -25,14 +25,30 @@ in
 
 generated:
 
-with generated;
+rec {
 
-{
+  # list of plugins that are needed as dependencies somewhere
+  # This is necessary (as opposed to `with generated;`) because
+  # there would otherwise be conflicts with `rec`. `rec` is necessary
+  # however to make sure overriden plugins can be used as dependencies.
+  # This should use a proper package set with fixed-points instead.
+  inherit (generated)
+    self
+    webapi-vim
+    nvim-yarp
+    ultisnips
+    vim-addon-mw-utils
+    tlib_vim
+    vim-addon-signs
+    vim-addon-other
+    vim-addon-errorformats
+    vim-maktaba
+    vim-misc;
 
   vim2nix = buildVimPluginFrom2Nix {
     name = "vim2nix";
     src = ./vim2nix;
-    dependencies = ["vim-addon-manager"];
+    dependencies = [ vim-addon-manager ];
   };
 
   fzfWrapper = buildVimPluginFrom2Nix {
@@ -90,7 +106,7 @@ with generated;
     dependencies = [];
   };
 
-  clang_complete = clang_complete.overrideAttrs(old: {
+  clang_complete = generated.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).
@@ -107,14 +123,14 @@ with generated;
     '';
   });
 
-  clighter8 = clighter8.overrideAttrs(old: {
+  clighter8 = generated.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
     '';
   });
 
-  command-t = command-t.overrideAttrs(old: {
+  command-t = generated.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -122,7 +138,7 @@ with generated;
     '';
   });
 
-  cpsm = cpsm.overrideAttrs(old: {
+  cpsm = generated.cpsm.overrideAttrs(old: {
     buildInputs = [
       python3
       stdenv
@@ -138,7 +154,7 @@ with generated;
     '';
   });
 
-  ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
+  ctrlp-cmatcher = generated.ctrlp-cmatcher.overrideAttrs(old: {
     buildInputs = [ python ];
     buildPhase = ''
       patchShebangs .
@@ -146,7 +162,7 @@ with generated;
     '';
   });
 
-  deoplete-go = deoplete-go.overrideAttrs(old: {
+  deoplete-go = generated.deoplete-go.overrideAttrs(old: {
     buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
@@ -156,37 +172,33 @@ with generated;
    '';
   });
 
-  ensime-vim = ensime-vim.overrideAttrs(old: {
+  ensime-vim = generated.ensime-vim.overrideAttrs(old: {
     passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-    dependencies = ["vimproc" "vimshell" "self" "forms"];
+    dependencies = [ vimproc-vim vimshell-vim self forms ];
   });
 
-  forms = forms.overrideAttrs(old: {
-    dependencies = ["self"];
+  forms = generated.forms.overrideAttrs(old: {
+    dependencies = [ self ];
   });
 
-  gist-vim = gist-vim.overrideAttrs(old: {
-    dependencies = ["webapi-vim"];
+  gist-vim = generated.gist-vim.overrideAttrs(old: {
+    dependencies = [ webapi-vim ];
   });
 
-  gitv = gitv.overrideAttrs(old: {
-    dependencies = ["gitv"];
+  ncm2 = generated.ncm2.overrideAttrs(old: {
+    dependencies = [ nvim-yarp ];
   });
 
-  ncm2 = ncm2.overrideAttrs(old: {
-    dependencies = ["nvim-yarp"];
-  });
-
-  ncm2-jedi = ncm2-jedi.overrideAttrs(old: {
-    dependencies = ["nvim-yarp" "ncm2"];
+  ncm2-jedi = generated.ncm2-jedi.overrideAttrs(old: {
+    dependencies = [ nvim-yarp ncm2 ];
     passthru.python3Dependencies = ps: with ps; [ jedi ];
   });
 
-  ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
-    dependencies = ["ultisnips"];
+  ncm2-ultisnips = generated.ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = [ ultisnips ];
   });
 
-  taglist-vim = taglist-vim.overrideAttrs(old: {
+  taglist-vim = generated.taglist-vim.overrideAttrs(old: {
     setSourceRoot = ''
       export sourceRoot=taglist
       mkdir taglist
@@ -195,80 +207,80 @@ with generated;
     '';
   });
 
-  vimshell-vim = vimshell-vim.overrideAttrs(old: {
-    dependencies = [ "vimproc-vim" ];
+  vimshell-vim = generated.vimshell-vim.overrideAttrs(old: {
+    dependencies = [ vimproc-vim ];
   });
 
-  vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
+  vim-addon-manager = generated.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-actions = generated.vim-addon-actions.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-async = vim-addon-async.overrideAttrs(old: {
-    dependencies = [ "vim-addon-signs" ];
+  vim-addon-async = generated.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-background-cmd = generated.vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils ];
   });
 
-  vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
+  vim-addon-completion = generated.vim-addon-completion.overrideAttrs(old: {
+    dependencies = [ tlib_vim ];
   });
 
-  vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
+  vim-addon-goto-thing-at-cursor = generated.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = [ tlib_vim ];
   });
 
-  vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
-    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
+  vim-addon-mru = generated.vim-addon-mru.overrideAttrs(old: {
+    dependencies = [ vim-addon-other vim-addon-mw-utils ];
   });
 
-  vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
+  vim-addon-nix = generated.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-completion
+      vim-addon-goto-thing-at-cursor
+      vim-addon-errorformats
+      vim-addon-actions
+      vim-addon-mw-utils tlib_vim
     ];
   });
 
-  vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
-    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
+  vim-addon-sql = generated.vim-addon-sql.overrideAttrs(old: {
+    dependencies = [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
   });
 
-  vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
-    dependencies = ["vim-addon-mw-utils" "tlib"];
+  vim-addon-syntax-checker = generated.vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  vim-addon-toggle-buffer = generated.vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
-    dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
+  vim-addon-xdebug = generated.vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
   });
 
-  vim-bazel = vim-bazel.overrideAttrs(old: {
-    dependencies = ["maktaba"];
+  vim-bazel = generated.vim-bazel.overrideAttrs(old: {
+    dependencies = [ vim-maktaba ];
   });
 
-  vim-codefmt = vim-codefmt.overrideAttrs(old: {
-    dependencies = ["maktaba"];
+  vim-codefmt = generated.vim-codefmt.overrideAttrs(old: {
+    dependencies = [ vim-maktaba ];
   });
 
-  vim-easytags = vim-easytags.overrideAttrs(old: {
-    dependencies = ["vim-misc"];
+  vim-easytags = generated.vim-easytags.overrideAttrs(old: {
+    dependencies = [ vim-misc ];
   });
 
   # change the go_bin_path to point to a path in the nix store. See the code in
   # fatih/vim-go here
   # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
-  vim-go = vim-go.overrideAttrs(old: let
+  vim-go = generated.vim-go.overrideAttrs(old: let
     binPath = lib.makeBinPath [
       asmfmt
       delve
@@ -296,7 +308,7 @@ with generated;
     '';
   });
 
-  vim-grammarous = vim-grammarous.overrideAttrs(old: {
+  vim-grammarous = generated.vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -309,31 +321,31 @@ with generated;
     ];
   });
 
-  vim-hier = vim-hier.overrideAttrs(old: {
+  vim-hier = generated.vim-hier.overrideAttrs(old: {
     buildInputs = [ vim ];
   });
 
-  vim-isort = vim-isort.overrideAttrs(old: {
+  vim-isort = generated.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-snipmate = generated.vim-snipmate.overrideAttrs(old: {
+    dependencies = [ vim-addon-mw-utils tlib_vim ];
   });
 
 
-  vim-wakatime = vim-wakatime.overrideAttrs(old: {
+  vim-wakatime = generated.vim-wakatime.overrideAttrs(old: {
     buildInputs = [ python ];
   });
 
-  vim-xdebug = vim-xdebug.overrideAttrs(old: {
+  vim-xdebug = generated.vim-xdebug.overrideAttrs(old: {
     postInstall = false;
   });
 
-  vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
+  vim-xkbswitch = generated.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
         --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -341,14 +353,14 @@ with generated;
     buildInputs = [ xkb_switch ];
   });
 
-  vim-yapf = vim-yapf.overrideAttrs(old: {
+  vim-yapf = generated.vim-yapf.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
         --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
     '';
   });
 
-  vimproc-vim = vimproc-vim.overrideAttrs(old: {
+  vimproc-vim = generated.vimproc-vim.overrideAttrs(old: {
     buildInputs = [ which ];
 
     buildPhase = ''
@@ -360,11 +372,11 @@ with generated;
     '';
   });
 
-  YankRing-vim = YankRing-vim.overrideAttrs(old: {
+  YankRing-vim = generated.YankRing-vim.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
-  youcompleteme = youcompleteme.overrideAttrs(old: {
+  youcompleteme = generated.youcompleteme.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
@@ -383,7 +395,7 @@ with generated;
     };
   });
 
-  jedi-vim = jedi-vim.overrideAttrs(old: {
+  jedi-vim = generated.jedi-vim.overrideAttrs(old: {
     # checking for python3 support in vim would be neat, too, but nobody else seems to care
     buildInputs = [ python3Packages.jedi ];
     meta = {
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 3f5e255ae21..b57bff5c09d 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -310,6 +310,7 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
                 f"""
   {plugin.normalized_name} = buildVimPluginFrom2Nix {{
     name = "{plugin.normalized_name}-{plugin.version}";
+    pname = "{plugin.normalized_name}";
     src = fetchFromGitHub {{
       owner = "{owner}";
       repo = "{repo}";
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 7122e2a4230..59d1a980e88 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -150,23 +150,35 @@ vim_with_plugins can be installed like any other application within Nix.
 let
   inherit (stdenv) lib;
 
-  toNames = x:
+  # transitive closure of plugin dependencies
+  transitiveClosure = knownPlugins: plugin:
+  let
+    # vam puts out a list of strings as the dependency list, we need to be able to deal with that.
+    # Because of that, "plugin" may be a string or a derivation. If it is a string, it is resolved
+    # using `knownPlugins`. Otherwise `knownPlugins` can be null.
+    knownPlugins' = if knownPlugins == null then vimPlugins else knownPlugins;
+    pluginDrv = if builtins.isString plugin then knownPlugins'.${plugin} else plugin;
+  in
+    [ pluginDrv ] ++ (
+      lib.unique (builtins.concatLists (map (transitiveClosure knownPlugins) pluginDrv.dependencies or []))
+    );
+
+  findDependenciesRecursively = knownPlugins: plugins: lib.concatMap (transitiveClosure knownPlugins) plugins;
+
+  attrnamesToPlugins = { knownPlugins, names }:
+    map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins;
+
+  pluginToAttrname = plugin:
+    plugin.pname;
+
+  pluginsToAttrnames = plugins: map pluginToAttrname plugins;
+
+  vamDictToNames = x:
       if builtins.isString x then [x]
       else (lib.optional (x ? name) x.name)
             ++ (x.names or []);
-  findDependenciesRecursively = {knownPlugins, names}:
 
-    let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or [];
-
-        recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names;
-
-        recurse = path:
-          let name = builtins.head path;
-          in if builtins.elem name (builtins.tail path)
-            then throw "recursive vim dependencies"
-            else [name] ++ recurseNames path (depsOf name);
-
-    in lib.uniqList { inputList = recurseNames [] names; };
+  rtpPath = "share/vim-plugins";
 
   vimrcFile = {
     packages ? null,
@@ -183,11 +195,11 @@ let
       (let
         knownPlugins = pathogen.knownPlugins or vimPlugins;
 
-        plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
+        plugins = findDependenciesRecursively knownPlugins pathogen.pluginNames;
 
         pluginsEnv = buildEnv {
           name = "pathogen-plugin-env";
-          paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins;
+          paths = map (x: "${x}/${rtpPath}") plugins;
         };
       in
       ''
@@ -228,7 +240,7 @@ let
       (let
         knownPlugins = vam.knownPlugins or vimPlugins;
 
-        names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
+        plugins = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
 
         # Vim almost reads JSON, so eventually JSON support should be added to Nix
         # TODO: proper quoting
@@ -242,9 +254,9 @@ let
       in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
       ''
         let g:nix_plugin_locations = {}
-        ${lib.concatMapStrings (name: ''
-          let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}"
-        '') names}
+        ${lib.concatMapStrings (plugin: ''
+          let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}"
+        '') plugins}
         let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}"
 
         let g:vim_addon_manager = {}
@@ -381,8 +393,6 @@ rec {
     '';
   };
 
-  rtpPath = "share/vim-plugins";
-
   vimHelpTags = ''
   vimHelpTags(){
     if [ -d "$1/doc" ]; then
@@ -450,13 +460,13 @@ rec {
                      if vam != null && vam ? knownPlugins then vam.knownPlugins else
                      if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
                      vimPlugins;
-      pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
-      vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
+      pathogenNames = findDependenciesRecursively knownPlugins pathogen.pluginNames;
+      vamNames = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries);
       names = (lib.optionals (pathogen != null) pathogenNames) ++
               (lib.optionals (vam != null) vamNames);
       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;
+      nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs;
     in
       nativePlugins ++ nonNativePlugins;
 

From 8e8a09bfc9546edca6623f713bd1be2cb544da21 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 24 Dec 2018 13:13:59 +0100
Subject: [PATCH 2634/2793] vimUtils: add dependency logic to nativeImpl

nativeImpl previously simply ignored dependency information.
---
 doc/languages-frameworks/vim.section.md |  7 ++++++-
 pkgs/misc/vim-plugins/vim-utils.nix     | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 2cec1543a24..6ed60028ae2 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -48,7 +48,7 @@ neovim.override {
 
 ## Managing plugins with Vim packages
 
-To store you plugins in Vim packages the following example can be used:
+To store you plugins in Vim packages (the native vim plugin manager, see `:help packages`) the following example can be used:
 
 ```
 vim_configurable.customize {
@@ -56,6 +56,8 @@ vim_configurable.customize {
     # loaded on launch
     start = [ youcompleteme fugitive ];
     # manually loadable by calling `:packadd $plugin-name`
+    # however, if a vim plugin has a dependency that is not explicitly listed in
+	# opt that dependency will always be added to start to avoid confusion.
     opt = [ phpCompletion elm-vim ];
     # To automatically load a plugin when opening a filetype, add vimrc lines like:
     # autocmd FileType php :packadd phpCompletion
@@ -63,6 +65,7 @@ vim_configurable.customize {
 }
 ```
 
+`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like.
 For Neovim the syntax is:
 
 ```
@@ -74,6 +77,8 @@ neovim.override {
     packages.myVimPackage = with pkgs.vimPlugins; {
       # see examples below how to use custom packages
       start = [ ];
+      # If a vim plugin has a dependency that is not explicitly listed in
+      # opt that dependency will always be added to start to avoid confusion.
       opt = [ ];
     };
   };
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 59d1a980e88..a8146dbf5d4 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -293,8 +293,18 @@ let
       (let
         link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
         packageLinks = (packageName: {start ? [], opt ? []}:
+        let
+          # `nativeImpl` expects packages to be derivations, not strings (as
+          # opposed to older implementations that have to maintain backwards
+          # compatibility). Therefore we don't need to deal with "knownPlugins"
+          # and can simply pass `null`.
+          depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively null opt);
+          startWithDeps = findDependenciesRecursively null start;
+        in
           ["mkdir -p $out/pack/${packageName}/start"]
-          ++ (builtins.map (link packageName "start") start)
+          # To avoid confusion, even dependencies of optional plugins are added
+          # to `start` (except if they are explicitly listed as optional plugins).
+          ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins)))
           ++ ["mkdir -p $out/pack/${packageName}/opt"]
           ++ (builtins.map (link packageName "opt") opt)
         );

From 18a5e8c36b2681f5fc4aecd79f4cc723365d2d94 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 24 Dec 2018 23:29:58 +0000
Subject: [PATCH 2635/2793] licenses: update SPDX IDs (#52711)

See the bottom of https://spdx.org/licenses/ for the list of deprecations.

The explicit URLs of agpl3Plus and gpl2Classpath were dropped because the
default SPDX URL is correct.

wxWindows ID had wrong capitalization.
---
 lib/licenses.nix | 55 ++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 5ef60b51063..fc9cb42621d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -29,13 +29,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   agpl3 = spdx {
-    spdxId = "AGPL-3.0";
-    fullName = "GNU Affero General Public License v3.0";
+    spdxId = "AGPL-3.0-only";
+    fullName = "GNU Affero General Public License v3.0 only";
   };
 
-  agpl3Plus = {
+  agpl3Plus = spdx {
+    spdxId = "AGPL-3.0-or-later";
     fullName = "GNU Affero General Public License v3.0 or later";
-    inherit (agpl3) url;
   };
 
   amazonsl = {
@@ -266,13 +266,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   fdl12 = spdx {
-    spdxId = "GFDL-1.2";
-    fullName = "GNU Free Documentation License v1.2";
+    spdxId = "GFDL-1.2-only";
+    fullName = "GNU Free Documentation License v1.2 only";
+  };
+
+  fdl12Plus = spdx {
+    spdxId = "GFDL-1.2-or-later";
+    fullName = "GNU Free Documentation License v1.2 or later";
   };
 
   fdl13 = spdx {
-    spdxId = "GFDL-1.3";
-    fullName = "GNU Free Documentation License v1.3";
+    spdxId = "GFDL-1.3-only";
+    fullName = "GNU Free Documentation License v1.3 only";
+  };
+
+  fdl13Plus = spdx {
+    spdxId = "GFDL-1.3-or-later";
+    fullName = "GNU Free Documentation License v1.3 or later";
   };
 
   ffsl = {
@@ -297,24 +307,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   gpl1 = spdx {
-    spdxId = "GPL-1.0";
+    spdxId = "GPL-1.0-only";
     fullName = "GNU General Public License v1.0 only";
   };
 
   gpl1Plus = spdx {
-    spdxId = "GPL-1.0+";
+    spdxId = "GPL-1.0-or-later";
     fullName = "GNU General Public License v1.0 or later";
   };
 
   gpl2 = spdx {
-    spdxId = "GPL-2.0";
+    spdxId = "GPL-2.0-only";
     fullName = "GNU General Public License v2.0 only";
   };
 
-  gpl2Classpath = {
+  gpl2Classpath = spdx {
     spdxId = "GPL-2.0-with-classpath-exception";
     fullName = "GNU General Public License v2.0 only (with Classpath exception)";
-    url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
   gpl2ClasspathPlus = {
@@ -328,17 +337,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   gpl2Plus = spdx {
-    spdxId = "GPL-2.0+";
+    spdxId = "GPL-2.0-or-later";
     fullName = "GNU General Public License v2.0 or later";
   };
 
   gpl3 = spdx {
-    spdxId = "GPL-3.0";
+    spdxId = "GPL-3.0-only";
     fullName = "GNU General Public License v3.0 only";
   };
 
   gpl3Plus = spdx {
-    spdxId = "GPL-3.0+";
+    spdxId = "GPL-3.0-or-later";
     fullName = "GNU General Public License v3.0 or later";
   };
 
@@ -408,32 +417,32 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   lgpl2 = spdx {
-    spdxId = "LGPL-2.0";
+    spdxId = "LGPL-2.0-only";
     fullName = "GNU Library General Public License v2 only";
   };
 
   lgpl2Plus = spdx {
-    spdxId = "LGPL-2.0+";
+    spdxId = "LGPL-2.0-or-later";
     fullName = "GNU Library General Public License v2 or later";
   };
 
   lgpl21 = spdx {
-    spdxId = "LGPL-2.1";
+    spdxId = "LGPL-2.1-only";
     fullName = "GNU Library General Public License v2.1 only";
   };
 
   lgpl21Plus = spdx {
-    spdxId = "LGPL-2.1+";
+    spdxId = "LGPL-2.1-or-later";
     fullName = "GNU Library General Public License v2.1 or later";
   };
 
   lgpl3 = spdx {
-    spdxId = "LGPL-3.0";
+    spdxId = "LGPL-3.0-only";
     fullName = "GNU Lesser General Public License v3.0 only";
   };
 
   lgpl3Plus = spdx {
-    spdxId = "LGPL-3.0+";
+    spdxId = "LGPL-3.0-or-later";
     fullName = "GNU Lesser General Public License v3.0 or later";
   };
 
@@ -697,7 +706,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   };
 
   wxWindows = spdx {
-    spdxId = "WXwindows";
+    spdxId = "wxWindows";
     fullName = "wxWindows Library Licence, Version 3.1";
   };
 

From 1a40a8e00001b78603c8eb7fa82d83f17f9171f6 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 24 Dec 2018 23:31:40 +0000
Subject: [PATCH 2636/2793] gtk-sharp: wrap output executables

Fixes the below build error in gnome-sharp which appeared after #52712

/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/bin/gapi2-fixup --api=art-api.xml --metadata=./Art.metadata  --symbols=./art-symbols.xml
rm -f generated/* &&    \
/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/bin/gapi2-codegen --generate art-api.xml \
-I:/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/lib/pkgconfig/../../share/gapi-2.0/pango-api.xml -I:/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/lib/pkgconfig/../../share/gapi-2.0/atk-api.xml -I:/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/lib/pkgconfig/../../share/gapi-2.0/gdk-api.xml -I:/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/lib/pkgconfig/../../share/gapi-2.0/gtk-api.xml -I:/nix/store/wsqld4bccm0bwjnn1gj9cr32qscz4qk7-gtk-sharp-2.12.10/lib/pkgconfig/../../share/gapi-2.0/glib-api.xml      \
--outdir=generated --customdir=. --assembly-name=art-sharp      \
--gluelib-name=artsharpglue-2 --glue-filename=glue/generated.c          \
--glue-includes=                                                \
&& touch generated-stamp

Unhandled Exception:
System.MissingMethodException: Method 'string.Split' not found.
  at GtkSharp.Generation.SimpleGen..ctor (System.String ctype, System.String type, System.String default_value) [0x00000] in <d117698e7b8a4f9b867143c99aa161ba>:0
  at GtkSharp.Generation.SymbolTable..ctor () [0x00011] in <d117698e7b8a4f9b867143c99aa161ba>:0
  at GtkSharp.Generation.SymbolTable.get_Table () [0x0000a] in <d117698e7b8a4f9b867143c99aa161ba>:0
  at GtkSharp.Generation.CodeGenerator.Main (System.String[] args) [0x0003e] in <d117698e7b8a4f9b867143c99aa161ba>:0
[ERROR] FATAL UNHANDLED EXCEPTION: System.MissingMethodException: Method 'string.Split' not found.
  at GtkSharp.Generation.SimpleGen..ctor (System.String ctype, System.String type, System.String default_value) [0x00000] in <d117698e7b8a4f9b867143c99aa161ba>:0
---
 pkgs/development/libraries/gtk-sharp/2.0.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index c037db97c04..8b360e54ef1 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -32,7 +32,17 @@ stdenv.mkDerivation {
     done
   '';
 
+  postInstall = ''
+    pushd $out/bin
+    for f in gapi2-*
+    do
+      substituteInPlace $f --replace mono ${mono}/bin/mono
+    done
+    popd
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [
     mono glib pango gtk2 GConf libglade libgnomecanvas
     libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2

From cd46319bdc789697f48857c33df282aa4982c7c2 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 24 Dec 2018 23:57:04 +0000
Subject: [PATCH 2637/2793] gtk-sharp: 2.12.10 -> 2.12.45

---
 pkgs/development/libraries/gtk-sharp/2.0.nix | 38 +++++++++++---------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 8b360e54ef1..659dc14800e 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, mono
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, mono
 , glib
 , pango
 , gtk2
@@ -12,26 +16,24 @@
 , libgnomeprintui ? null
 , libxml2
 , monoDLLFixer
+, autoconf
+, automake
+, libtool
+, which
 }:
 
-stdenv.mkDerivation {
-  name = "gtk-sharp-2.12.10";
+stdenv.mkDerivation rec {
+  name = "gtk-sharp-${version}";
+  version = "2.12.45";
 
   builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
-    sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "gtk-sharp";
+    rev = version;
+    sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
   };
 
-  # patches = [ ./dllmap-glue.patch ];
-
-  # patch bad usage of glib, which wasn't tolerated anymore
-  prePatch = ''
-    for f in glib/glue/{thread,list,slist}.c; do
-      sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f"
-    done
-  '';
-
   postInstall = ''
     pushd $out/bin
     for f in gapi2-*
@@ -41,13 +43,17 @@ stdenv.mkDerivation {
     popd
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
 
   buildInputs = [
     mono glib pango gtk2 GConf libglade libgnomecanvas
     libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
   ];
 
+  preConfigure = ''
+    ./bootstrap-${lib.versions.majorMinor version}
+  '';
+
   dontStrip = true;
 
   inherit monoDLLFixer;

From f7cc6f04b23db7a1eb405ea4fbe2ac74e745e5b3 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 24 Dec 2018 23:56:49 +0000
Subject: [PATCH 2638/2793] gnome-sharp: 2.24.1 -> 2.24.4

---
 .../libraries/gnome-sharp/Makefile.in.patch   | 11 ------
 .../libraries/gnome-sharp/default.nix         | 36 ++++++++++++++-----
 2 files changed, 27 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnome-sharp/Makefile.in.patch

diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch
deleted file mode 100644
index 46b644f2471..00000000000
--- a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sample/gnomevfs/Makefile.in	2009-03-03 16:09:52.000000000 +0000
-+++ b/sample/gnomevfs/Makefile.in	2014-10-14 13:35:51.020427244 +0100
-@@ -218,7 +218,7 @@
- 
- @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = 
- @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = 
--@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
-+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
- assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
- references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
- noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index d80144b3d71..db93bdf27af 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -1,17 +1,35 @@
-{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}:
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, gtk2
+, mono
+, gtk-sharp-2_0
+, gnome2
+, autoconf
+, automake
+, libtool
+, which
+}:
 
-stdenv.mkDerivation {
-  name = "gnome-sharp-2.24.1";
-  src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
-    sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
+stdenv.mkDerivation rec {
+  name = "gnome-sharp-${version}";
+  version = "2.24.4";
+
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "gnome-sharp";
+    rev = "${version}";
+    sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
   buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
-  ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
+  ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
 
-  patches = [ ./Makefile.in.patch ];
+  preConfigure = ''
+    ./bootstrap-${lib.versions.majorMinor version}
+  '';
 
   dontStrip = true;
 

From 4ff22f224f9c5d4fdde095461e7650d76ee8315e Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 24 Dec 2018 23:57:12 +0000
Subject: [PATCH 2639/2793] mono: move a hyena and pdfmod from mono4 to mono5

Closes #52484
---
 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 c27289de138..82a5fa8bc00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4785,7 +4785,7 @@ in
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };
 
-  pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
+  pdfmod = callPackage ../applications/misc/pdfmod { };
 
   pdf-quench = callPackage ../applications/misc/pdf-quench { };
 
@@ -10298,7 +10298,7 @@ in
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
-  hyena = callPackage ../development/libraries/hyena { mono = mono4; };
+  hyena = callPackage ../development/libraries/hyena { };
 
   hyperscan = callPackage ../development/libraries/hyperscan { };
 

From fcfdd1d96f227d981c6b3e57a2693fcbe1978bc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 12:44:28 -0800
Subject: [PATCH 2640/2793] python37Packages.peewee: 3.7.1 -> 3.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/python3.7-peewee/versions
---
 pkgs/development/python-modules/peewee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 09ee7dc92ea..a18168eaa5a 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
 buildPythonPackage rec {
 
   pname = "peewee";
-  version = "3.7.1";
+  version = "3.8.0";
 
   # pypi release does not provide tests
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = pname;
     rev = version;
-    sha256 = "0chn8mknzvkmcmysy2291hanf0vg3sfzqgfc5hqx1nnrd6qkiq8r";
+    sha256 = "0kqhpalw1587zaz3fcj13mpzs5950l6fm3qlcfqsfp16h8w0s89f";
   };
 
 

From af5d0659b37653a7353b151246dbb6f25d50d611 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 01:02:50 -0800
Subject: [PATCH 2641/2793] pdfpc: 4.2.1 -> 4.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/pdfpc/versions
---
 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 8b536e49316..232184c1976 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.2.1";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5";
+    sha256 = "1ild2p2lv89yj74fbbdsg3jb8dxpzdamsw0l0xs5h20fd2lsrwcd";
   };
 
   nativeBuildInputs = [

From 1fd3323a0d584561e2959b6113c6b8d5b4d8fb6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 20:17:39 -0800
Subject: [PATCH 2642/2793] python37Packages.biopython: 1.72 -> 1.73

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

diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index 39be67e6e51..beb03c894be 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "biopython";
-  version = "1.72";
+  version = "1.73";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2";
+    sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh";
   };
 
   propagatedBuildInputs = [ numpy ];

From 1920ca6a16a866a2b13da96581eac1bd9187f910 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 23:06:43 -0800
Subject: [PATCH 2643/2793] python37Packages.affine: 2.2.1 -> 2.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/python3.7-affine/versions
---
 pkgs/development/python-modules/affine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix
index 5bd957ae731..e2fd802cf80 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/pkgs/development/python-modules/affine/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "affine";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j3mvcnmgjvvm0znqyf7xylq7i89zjf4dq0g8280xs6bwbl5cvih";
+    sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
   };
 
   checkInputs = [ pytest ];

From 106d46a0f3845ecdf0cca33723e6ab08f7630858 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 14:48:22 -0800
Subject: [PATCH 2644/2793] python37Packages.dpkt: 1.9.1 -> 1.9.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/python3.7-dpkt/versions
---
 pkgs/development/python-modules/dpkt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index e45d651f324..c8c7f255afa 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dpkt";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6";
+    sha256 = "0m0ym219zsqfjl6jwivw5as3igjbmhpcn4dvabc5nkd0bk6jxaaj";
   };
 
   meta = with stdenv.lib; {

From f09e4a42aff3bc32d4b7228dbf5fee67d0c3d41e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 12:30:11 -0800
Subject: [PATCH 2645/2793] python37Packages.shellingham: 1.2.7 -> 1.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/python3.7-shellingham/versions
---
 pkgs/development/python-modules/shellingham/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index 6fa265517df..b2c63ea97e3 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "shellingham";
-  version = "1.2.7";
+  version = "1.2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm";
+    sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn";
   };
 
   meta = with stdenv.lib; {

From 741e00fd1051bf119c13704abaadc46f046baabf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 25 Dec 2018 10:05:38 +0100
Subject: [PATCH 2646/2793] python36: 3.6.7 -> 3.6.8

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

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 4c9d0c2a896..15a62b42959 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.6";
-  minorVersion = "7";
+  minorVersion = "8";
   minorVersionSuffix = "";
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
@@ -51,7 +51,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0zgp8nvz3rkiz5cxd42vgpah4rvw3kmg9qz9lfq36rfnm40i9zc1";
+    sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From 552d8a70d4c47a6e52a8e0b26e3a2e33d5b94ca6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 25 Dec 2018 10:05:49 +0100
Subject: [PATCH 2647/2793] python37: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index 093d8599690..800534e17d5 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.7";
-  minorVersion = "1";
+  minorVersion = "2";
   minorVersionSuffix = "";
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps";
+    sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From f690bfd3f3a4185dac33f0ef8988563c49bb1bdc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 12:10:00 -0800
Subject: [PATCH 2648/2793] python37Packages.pytesseract: 0.2.5 -> 0.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/python3.7-pytesseract/versions
---
 pkgs/development/python-modules/pytesseract/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 7d96f4d39bd..8fae56e9a23 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wlz1vbg1k8cdrpzvrahjnbsfs4ki6xqhbkv17ycfchh7h6kfkfm";
+    sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";
   };
 
   patches = [

From ffe4a9a863a10c9e816569968e2108a572e8d1fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 14:16:47 -0800
Subject: [PATCH 2649/2793] python37Packages.EasyProcess: 0.2.3 -> 0.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/python3.7-easyprocess/versions
---
 pkgs/development/python-modules/easyprocess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix
index dc5784aafb7..46948f2485c 100644
--- a/pkgs/development/python-modules/easyprocess/default.nix
+++ b/pkgs/development/python-modules/easyprocess/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "EasyProcess";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll";
+    sha256 = "0gdl6y37g8rns2i26d2zlx7x4kbpql9h5qd8k23ka69q6frcpb8k";
   };
 
   # No tests

From 8dc93ec7ee79264f1b35a1aef5df1f3e3bbe9da0 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 25 Dec 2018 09:06:45 +0000
Subject: [PATCH 2650/2793] calibre: 3.31.0 -> 3.36.0

---
 pkgs/applications/misc/calibre/default.nix                   | 4 ++--
 pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3554c36f519..6da1cdefa70 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.31.0";
+  version = "3.36.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw";
+    sha256 = "0fbf4b29vkka3gg8c5n9dc7qhv43jpw6naz6w83jkz7andypikb8";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
index 45e27984ed5..5164b80a0be 100644
--- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -6,7 +6,7 @@ index 938ab24..1e095f8 100644
      description = _('Extract common e-book formats from archive files '
          '(ZIP/RAR). Also try to autodetect if they are actually '
          'CBZ/CBR files.')
--    file_types = set(['zip', 'rar'])
-+    file_types = set(['zip'])
+-    file_types = {'zip', 'rar'}
++    file_types = {'zip'}
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True

From d7f08cd90ff3b2e992a18d32a42bf431085868c3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Dec 2018 21:39:33 +0000
Subject: [PATCH 2651/2793] ocamlPackages.ppxfind: init at 1.2

---
 .../ocaml-modules/ppxfind/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ppxfind/default.nix

diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix
new file mode 100644
index 00000000000..ebb592dddd2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppxfind/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }:
+
+buildDunePackage rec {
+	pname = "ppxfind";
+	version = "1.2";
+	src = fetchurl {
+		url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
+		sha256 = "1687jbgii5w5dvvid3ri2cx006ysv0rrspn8dz8x7ma8615whz2h";
+	};
+
+	minimumOCamlVersion = "4.03";
+
+	buildInputs = [ ocaml-migrate-parsetree ];
+
+	meta = {
+		homepage = "https://github.com/diml/ppxfind";
+		description = "ocamlfind ppx tool";
+		license = lib.licenses.bsd3;
+		maintainers = [ lib.maintainers.vbgl ];
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ba583418163..c670db81772 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -580,6 +580,8 @@ let
     piqi = callPackage ../development/ocaml-modules/piqi { };
     piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
 
+    ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
+
     ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
 
     psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };

From 8b795576001cb169d61f0cf4a87d5c54a88dfa90 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Dec 2018 21:39:43 +0000
Subject: [PATCH 2652/2793] ocamlPackages.ppx_deriving_yojson: 3.1 -> 3.3

---
 .../ppx_deriving_yojson/default.nix           | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 26fa24d8dc0..53e8265c3a7 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -1,29 +1,30 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo
-, ppx_deriving, yojson, ounit
+{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit
+, ppx_deriving, yojson
 }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}";
-  version = "3.1";
+buildDunePackage rec {
+  pname = "ppx_deriving_yojson";
+  version = "3.3";
+
+  minimumOCamlVersion = "4.04";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
     rev = "v${version}";
-    sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw";
+    sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
+  buildInputs = [ ppxfind ounit ];
 
   propagatedBuildInputs = [ ppx_deriving yojson ];
 
-  inherit (topkg) installPhase;
+  doCheck = true;
 
   meta = {
-    description = "A Yojson codec generator for OCaml >= 4.02.";
+    description = "A Yojson codec generator for OCaml >= 4.04";
     inherit (src.meta) homepage;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (ocaml.meta) platforms;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }

From 090bc5b85e20f5eb7b4c9022ac54a1f82d14ff8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 02:40:06 -0800
Subject: [PATCH 2653/2793] mtools: 4.0.22 -> 4.0.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/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 956b0039489..b477ad8deac 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.22";
+  name = "mtools-4.0.23";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "08shiy9am4x65yg8l5mplj8jrvsimzbaf2id8cmfc02b00i0yb35";
+    sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

From 425355b07b21bb97a8c4b50e439e3f96237a068e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 01:37:50 -0800
Subject: [PATCH 2654/2793] pcmanfm: 1.3.0 -> 1.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/pcmanfm/versions
---
 pkgs/applications/misc/pcmanfm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index a77b2d17ecb..2649c7cbd6a 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -7,10 +7,10 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "pcmanfm-1.3.0";
+  name = "pcmanfm-1.3.1";
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
-    sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas";
+    sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
   };
 
   buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = optional withGtk3 "--with-gtk=3";
 
   meta = with stdenv.lib; {
-    homepage = http://blog.lxde.org/?cat=28/;
+    homepage = https://blog.lxde.org/category/pcmanfm/;
     license = licenses.gpl2Plus;
     description = "File manager with GTK+ interface";
     maintainers = [ maintainers.ttuegel ];

From 1c041f5b0f873a6a8cb925c98a8084702de5eaa5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 12:51:26 +0100
Subject: [PATCH 2655/2793] =?UTF-8?q?libfm:=201.3.0.2=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libfm/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 796c03dab5e..a0323481be9 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,23 +9,29 @@ stdenv.mkDerivation rec {
   name = if extraOnly
     then "libfm-extra-${version}"
     else "libfm-${version}";
-  version = "1.3.0.2";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
-    sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q";
+    sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
   };
 
   nativeBuildInputs = [ vala pkgconfig intltool ];
   buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
 
-  configureFlags = optional extraOnly "--with-extra-only"
+  configureFlags = [
+    "--sysconfdir=/etc"
+  ] ++ optional extraOnly "--with-extra-only"
     ++ optional withGtk3 "--with-gtk=3";
 
+  installFlags = [
+    "sysconfdir=${placeholder "out"}/etc"
+  ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://blog.lxde.org/?cat=28/;
+    homepage = https://blog.lxde.org/category/pcmanfm/;
     license = licenses.lgpl21Plus;
     description = "A glib-based library for file management";
     maintainers = [ maintainers.ttuegel ];

From 6efc5245d3f64481deac38ee429722f8cea055f4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 13:09:50 +0100
Subject: [PATCH 2656/2793] menu-cache: update homepage

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

diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index c92b6a4e728..d64b7f12312 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
   buildInputs = [ glib libfm-extra ];
 
   meta = with stdenv.lib; {
-    homepage = http://blog.lxde.org/?tag=menu-cache;
-    license = licenses.gpl2Plus;
     description = "Library to read freedesktop.org menu files";
+    homepage = https://blog.lxde.org/tag/menu-cache/;
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.ttuegel ];
     platforms = platforms.linux ++ platforms.darwin;
   };

From f471114ab66d2030f611e4a9af2b51b6abccb768 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Dec 2018 14:04:13 +0000
Subject: [PATCH 2657/2793] libdeflate: init at 1.1 (#52832)

---
 .../libraries/libdeflate/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/libdeflate/default.nix

diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
new file mode 100644
index 00000000000..0328a2215b4
--- /dev/null
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libdeflate-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "ebiggers";
+    repo = "libdeflate";
+    rev = "v${version}";
+    sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
+
+  configurePhase = ''
+    make programs/config.h
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Fast DEFLATE/zlib/gzip compressor and decompressor";
+    license = licenses.mit;
+    homepage = https://github.com/ebiggers/libdeflate;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9765628fff..3650e3bcb85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10700,6 +10700,8 @@ in
 
   libde265 = callPackage ../development/libraries/libde265 {};
 
+  libdeflate = callPackage ../development/libraries/libdeflate { };
+
   libdevil = callPackage ../development/libraries/libdevil {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };

From 687567efd0c0792c9a93becc9b35d25e299af174 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 06:49:39 -0800
Subject: [PATCH 2658/2793] matomo: 3.6.1 -> 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/matomo/versions
---
 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 474a5b65b30..9c1180ffb49 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.6.1";
+  version = "3.7.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 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz";
+    sha256 = "17ihsmwdfrx1c1v8cp5pc3swx3h0i0l9pjrc8jyww08kavfbfly6";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 37faf68b8661d70d776ad164873d5adf1151b765 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 16:29:16 +0100
Subject: [PATCH 2659/2793] =?UTF-8?q?libsigcxx:=202.10.0=20=E2=86=92=202.1?=
 =?UTF-8?q?0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/libsigcxx/default.nix           | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index 8eba5377bc3..434dbfb9f72 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, gnum4 }:
-let
-  ver_maj = "2.10"; # odd major numbers are unstable
-  ver_min = "0";
-in
+{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }:
+
 stdenv.mkDerivation rec {
-  name = "libsigc++-${ver_maj}.${ver_min}";
+  pname = "libsigc++";
+  version = "2.10.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz";
-    sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
   };
 
   nativeBuildInputs = [ pkgconfig gnum4 ];
 
   doCheck = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "libsigcxx";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
     description = "A typesafe callback system for standard C++";

From b51aaaa36c4f806ce052778a1b494dcc058af8ac Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 21:24:28 -0500
Subject: [PATCH 2660/2793] pythonPackages.lz4: remove in favor of
 pythonPackages.python-lz4

lz4 packages the same package as python-lz4, but an outdated version
---
 .../python-modules/lz4/default.nix            | 29 -------------------
 pkgs/top-level/python-packages.nix            |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/lz4/default.nix

diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
deleted file mode 100644
index a9a7783fe77..00000000000
--- a/pkgs/development/python-modules/lz4/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, pytestrunner
-, pytest
-, psutil
-, pkgconfig
-, setuptools_scm
-}:
-
-buildPythonPackage rec {
-  pname = "lz4";
-  version = "2.1.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
-  };
-
-  buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
-  checkInputs = [ pytest psutil ];
-
-  meta = with stdenv.lib; {
-    description = "Compression library";
-    homepage = https://github.com/python-lz4/python-lz4;
-    license = licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8fbcaa194c..a64ce4e869c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -648,6 +648,7 @@ in {
   python-hosts = callPackage ../development/python-modules/python-hosts { };
 
   python-lz4 = callPackage ../development/python-modules/python-lz4 { };
+  lz4 = self.python-lz4; # alias 2018-12-05
 
   python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
 
@@ -3268,8 +3269,6 @@ in {
 
   ldappool = callPackage ../development/python-modules/ldappool { };
 
-  lz4 = callPackage ../development/python-modules/lz4 { };
-
   retrying = callPackage ../development/python-modules/retrying { };
 
   fasteners = callPackage ../development/python-modules/fasteners { };

From 6ef6d4339a499f30cb83ea768e8cbb3fb662469b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 21:25:22 -0500
Subject: [PATCH 2661/2793] pythonPackages.python-lz4: fix license

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

diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
index a0fe6666d84..df95ce50a80 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = {
      description = "LZ4 Bindings for Python";
      homepage = https://github.com/python-lz4/python-lz4;
-     license = lib.licenses.bsd0;
+     license = lib.licenses.bsd3;
      maintainers = with lib.maintainers; [ costrouc ];
   };
 }

From fdc9826c195ec0f7396a67b2979005ab9298bcb0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 23:20:12 -0500
Subject: [PATCH 2662/2793] buildbot: replace lz4 alias with proper name

lz4 used to package the same package as python-lz4, then lz4 was
removed and became an alias to python-lz4
---
 pkgs/development/python-modules/buildbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index c8bc14d3dc1..011cd879b1f 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,7 +1,7 @@
 { 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,
+  txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
   flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
 
 let
@@ -55,7 +55,7 @@ let
       boto3
       moto
       mock
-      lz4
+      python-lz4
       setuptoolsTrial
       isort
       pylint

From be94ca4ada66eef0850e3484b0c02db3607a7632 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 23:20:42 -0500
Subject: [PATCH 2663/2793] pythonPackages.python-lz4: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
index df95ce50a80..544d8f6254d 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-lz4";
-  version = "2.1.0";
+  version = "2.1.2";
 
   # get full repository inorder to run tests
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6";
+    sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d";
   };
 
   buildInputs = [ setuptools_scm pkgconfig pytestrunner ];

From c217d67be3f0919bf471143d8b7c37a2ede970bc Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 6 Dec 2018 02:10:30 -0500
Subject: [PATCH 2664/2793] mozlz4a: replace lz4 alias with proper name

lz4 used to package the same package as python-lz4, then lz4 was
removed and became an alias to python-lz4
---
 pkgs/tools/compression/mozlz4a/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix            | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index abd09483666..ce2aa9520d6 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, python3, pylz4}:
+{ stdenv, fetchurl, python3 }:
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "mozlz4a";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     chmod a+x "$out/bin/mozlz4a"
   '';
 
-  buildInputs = [ pylz4 python3 ];
+  buildInputs = [ python3 python3.pkgs.python-lz4 ];
 
   meta = {
     inherit version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3650e3bcb85..962f2ed3455 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1693,9 +1693,7 @@ in
 
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
-  mozlz4a = callPackage ../tools/compression/mozlz4a {
-    pylz4 = python3Packages.lz4;
-  };
+  mozlz4a = callPackage ../tools/compression/mozlz4a { };
 
   msr-tools = callPackage ../os-specific/linux/msr-tools { };
 

From 40e0d00cd61188ebef625921d1bec71f0183e78a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 07:48:32 -0800
Subject: [PATCH 2665/2793] libqmatrixclient: 0.4.0 -> 0.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/libqmatrixclient/versions
---
 pkgs/development/libraries/libqmatrixclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index 2f20150ad16..db9c2946935 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "libqmatrixclient-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "libqmatrixclient";
     rev    = "v${version}";
-    sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
+    sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns";
   };
 
   buildInputs = [ qtbase ];

From be96560327748a6f1b9fc7201df522449f3f765c Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai@prodo.ai>
Date: Mon, 17 Dec 2018 14:15:13 +0000
Subject: [PATCH 2666/2793] pythonPackages.pytorch: 0.4.1 -> 1.0.0

`thd_distributed` is broken just like `distributed` is. `cpp_extensions`
is broken upstream now, it seems? In the future it can hopefully be
re-enabled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index b0ae9ef0cf5..d0aa2e59ffc 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake,
+  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis,
   linkFarm, symlinkJoin,
   utillinux, which }:
 
@@ -25,7 +25,7 @@ let
     "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
 
 in buildPythonPackage rec {
-  version = "0.4.1";
+  version = "1.0.0";
   pname = "pytorch";
 
   src = fetchFromGitHub {
@@ -33,7 +33,7 @@ in buildPythonPackage rec {
     repo   = "pytorch";
     rev    = "v${version}";
     fetchSubmodules = true;
-    sha256 = "1cr8h47jxgfar5bamyvlayvqymnb2qvp7rr0ka2d2d4rdldf9lrp";
+    sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
   };
 
   preConfigure = lib.optionalString cudaSupport ''
@@ -71,8 +71,9 @@ in buildPythonPackage rec {
     pyyaml
   ] ++ lib.optional (pythonOlder "3.5") typing;
 
+  checkInputs = [ hypothesis ];
   checkPhase = ''
-    ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils distributed
+    ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
   '';
 
   meta = {

From c6ecb3887f2adb423939a058ff141ae4a82d7315 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Dec 2018 05:46:51 -0600
Subject: [PATCH 2667/2793] pythonPackages.pytorch: fix weirdly broken wheel
 version number

Otherwise, the wheel gets built with invalid metadata -- causing
'torch >= 1.0.0' to be unsatisfiable in other python packages, for
instance.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index d0aa2e59ffc..e65626e7787 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -58,6 +58,12 @@ in buildPythonPackage rec {
     done
   '';
 
+  # Override the (weirdly) wrong version set by default. See
+  # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
+  # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
+  PYTORCH_BUILD_VERSION = version;
+  PYTORCH_BUILD_NUMBER = 0;
+
   buildInputs = [
      cmake
      numpy.blas

From 6fcebb6427de9e5eb105d2057614c8adce6ad17d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Dec 2018 19:57:30 -0600
Subject: [PATCH 2668/2793] pythonPackages.pytorch: fix spurious test failures

This was fixed upstream already -- these tests ensure multi-GPU
functionality works, and thus requires multiple GPUs.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index e65626e7787..7d80e756c77 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, pythonOlder,
+{ fetchurl, buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
   fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis,
   linkFarm, symlinkJoin,
@@ -36,6 +36,14 @@ in buildPythonPackage rec {
     sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
   };
 
+  patches =
+    [ # Skips two tests that are only meant to run on multi GPUs
+      (fetchurl {
+        url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch";
+        sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i";
+      })
+    ];
+
   preConfigure = lib.optionalString cudaSupport ''
     export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
   '' + lib.optionalString (cudaSupport && cudnn != null) ''

From 79d21285dd91222aa4cdbbda4e33f19e2e32aa83 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Dec 2018 19:58:04 -0600
Subject: [PATCH 2669/2793] pythonPackages.pytorch: meta touch up, add myself
 as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 7d80e756c77..11fe0b5e6c4 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -91,10 +91,10 @@ in buildPythonPackage rec {
   '';
 
   meta = {
-    description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
-    homepage = https://pytorch.org/;
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ teh ];
+    description = "Open source, prototype-to-production deep learning platform";
+    homepage    = https://pytorch.org/;
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ teh thoughtpolice ];
   };
 }

From 60176e005dd466727bd9bde8fbeb01f39ddee37e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Dec 2018 19:59:40 -0600
Subject: [PATCH 2670/2793] pythonPackages.pytorch: add libnuma dep on Linux

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 11fe0b5e6c4..fd3ada70762 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, buildPythonPackage, pythonOlder,
+{ stdenv, fetchurl, buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis,
+  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
   linkFarm, symlinkJoin,
   utillinux, which }:
 
@@ -77,7 +77,8 @@ in buildPythonPackage rec {
      numpy.blas
      utillinux
      which
-  ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn];
+  ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
+    ++ lib.optionals stdenv.isLinux [ numactl ];
 
   propagatedBuildInputs = [
     cffi

From af53114a093a57649bb6c827da0618fd4b42c82e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Dec 2018 20:00:13 -0600
Subject: [PATCH 2671/2793] pythonPackages.pytorch: fix Intel MKL BLAS compile
 failure

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pytorch/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index fd3ada70762..8b9ba07ce95 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -72,6 +72,11 @@ in buildPythonPackage rec {
   PYTORCH_BUILD_VERSION = version;
   PYTORCH_BUILD_NUMBER = 0;
 
+  # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
+  # (upstream seems to have fixed this in the wrong place?)
+  # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
+  NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];
+
   buildInputs = [
      cmake
      numpy.blas

From 517babbd36bec183bf1809aac6bee9f81e57e653 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 09:11:14 -0800
Subject: [PATCH 2672/2793] lmdb: 0.9.22 -> 0.9.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/lmdb/versions
---
 pkgs/development/libraries/lmdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index ef187a15efc..047a74f0840 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.22";
+  version = "0.9.23";
 
   src = fetchFromGitHub {
     owner = "LMDB";
     repo = "lmdb";
     rev = "LMDB_${version}";
-    sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj";
+    sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From d30a200ab23a4dfa388ce65bd8c2831540289f32 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Dec 2018 18:11:28 +0100
Subject: [PATCH 2673/2793] eclipse-plugin-spotbugs: 3.1.9 -> 3.1.10

---
 pkgs/applications/editors/eclipse/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 9595bfe4d8b..30f381644ac 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -555,12 +555,12 @@ rec {
 
   spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.9";
+    version = "3.1.10";
 
     src = fetchzip {
       stripRoot = false;
       url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
-      sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz";
+      sha256 = "0xrflgw0h05z3za784ach2fx6dh04lgmfr426m1q235vv2ibds5y";
     };
 
     meta = with stdenv.lib; {

From f53e7518583cc9aa8fe6ed6b6f141d3c2f023998 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 09:54:59 -0800
Subject: [PATCH 2674/2793] libhandy: 0.0.5 -> 0.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/libhandy/versions
---
 pkgs/development/libraries/libhandy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 7e80ec817d1..1d07fe6ca26 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "libhandy";
-  version = "0.0.5";
+  version = "0.0.6";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
+    sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5";
   };
 
   nativeBuildInputs = [

From e32a9ca6ff691617681c30453f8027447f0ecf1c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 18:57:21 +0100
Subject: [PATCH 2675/2793] =?UTF-8?q?libuchardet:=200.0.5=20=E2=86=92=200.?=
 =?UTF-8?q?0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/libuchardet/default.nix         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index 52bc0ac5cfd..5aa26a749e4 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "libuchardet-${version}";
+  pname = "uchardet";
+  version = "0.0.6";
 
-  version = "0.0.5";
+  outputs = [ "bin" "out" "man" "dev" ];
 
-  src = fetchFromGitHub {
-    owner  = "BYVoid";
-    repo   = "uchardet";
-    rev    = "v${version}";
-    sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm";
+  src = fetchurl {
+    url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
+    sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
   };
 
   buildInputs = [ cmake ];
 
-  doCheck = false; # fails all the tests (ctest)
+  cmakeFlags = [
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
+    # TODO: move the following to CMake setup hook
+    "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
+    "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
+  ];
+
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
-    homepage    = https://www.byvoid.com/zht/project/uchardet;
-    license     = licenses.mpl11;
+    homepage = https://www.freedesktop.org/wiki/Software/uchardet/;
+    license = licenses.mpl11;
     maintainers = with maintainers; [ cstrahan ];
     platforms = with platforms; unix;
   };

From f3365db994eaa71dc8292c90237f35b9236656a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 11:04:00 -0800
Subject: [PATCH 2676/2793] libcec: 4.0.3 -> 4.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/libcec/versions
---
 pkgs/development/libraries/libcec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 6dec972e249..e016484e677 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "4.0.3"; in
+let version = "4.0.4"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
-    sha256 = "1713qs4nrynkcr3mgs1i7xj10lcyaxqipwiz9p0lfn4xrzjdd47g";
+    sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1f6b0950614594557d121f4cfbe75f382961b2ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Nov 2018 11:49:00 +0100
Subject: [PATCH 2677/2793] gtest: build shared library

Arch provides shared library as well.
---
 pkgs/development/libraries/gtest/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index cf4069871d1..06fffc4f524 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -3,6 +3,8 @@ stdenv.mkDerivation rec {
   name = "gtest-${version}";
   version = "1.8.1";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
@@ -12,6 +14,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja ];
 
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
   meta = with stdenv.lib; {
     description = "Google's framework for writing C++ tests";
     homepage = https://github.com/google/googletest;

From 7a2f45fe1a3b1be762174c7d00ae4e37581df8c6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 25 Dec 2018 15:22:37 -0600
Subject: [PATCH 2678/2793] =?UTF-8?q?emacs-mac:=207.2=20=E2=86=92=207.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 3b32eef4e03..4eb0fecec40 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.2";
+  macportVersion = "7.4";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "0j4dcjv7kh84d6lzzxdzambk6ybbdr2j7r63nkbivssjv29z7zag";
+    sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6";
   };
 
   hiresSrc = fetchurl {

From c1e10bd2582ed85466ed401228acf2112a2ecdd0 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@px.io>
Date: Tue, 25 Dec 2018 23:28:59 +0100
Subject: [PATCH 2679/2793] masterpdfeditor: 5.1.60 -> 5.2.20

---
 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 1cb472ff019..2928d271efc 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.60";
+  version = "5.2.20";
 
 in stdenv.mkDerivation {
   name = "masterpdfeditor-${version}";
 
   src = fetchurl {
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-    sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz";
+    sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

From 2fa46e16a1fba066d6d69415b4e3fdddb3e8309e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 14:31:41 -0800
Subject: [PATCH 2680/2793] kid3: 3.6.2 -> 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/kid3/versions
---
 pkgs/applications/audio/kid3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 22342581434..522ffa2a533 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -9,11 +9,11 @@
 stdenv.mkDerivation rec {
 
   name = "kid3-${version}";
-  version = "3.6.2";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
-    sha256 = "19yq39fqj19g98cxd4cdgv0f935ckfw0c43cxaxbf27x5f5dj0yz";
+    sha256 = "1bj4kq9hklgfp81rbxcjzbxmdgxjqksx7cqnw3m9dc0pnns5jx0x";
   };
 
   buildInputs = with stdenv.lib;

From eff03315680285fa19978d8c920287a4bd8fffa7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 14:47:29 -0800
Subject: [PATCH 2681/2793] intel-gmmlib: 18.3.0 -> 18.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/intel-gmmlib/versions
---
 pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index f61c507c764..61d7b067ae8 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "intel-gmmlib-${version}";
-  version = "18.3.0";
+  version = "18.4.1";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = name;
-    sha256 = "1x1p4xvi870vjka2ag6rmmw897hl7zhav1sgwhnrzrggsx9jrw80";
+    sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17";
   };
 
   nativeBuildInputs = [ cmake ];

From 981ecaad30658e4614b0b393ec23139dd6ace440 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 15:08:33 -0800
Subject: [PATCH 2682/2793] girara: 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/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 0dfeac3cf8b..919f20f1398 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.1";
+  version = "0.3.2";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
-    sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
+    sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext ];

From 549bf1354bccc62036d16763dd1f9a022dfb1f95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 15:19:03 -0800
Subject: [PATCH 2683/2793] global: 6.6.2 -> 6.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/global/versions
---
 pkgs/development/tools/misc/global/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index cc6dde53bb9..b2c71388fc5 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "global-${version}";
-  version = "6.6.2";
+  version = "6.6.3";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0zvi5vxwiq0dy8mq2cgs64m8harxs0fvkmsnvi0ayb0w608lgij3";
+    sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From c65edd687f11a5b16b79bc90b129ccdf9b8bc902 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 20 Dec 2018 12:46:05 -0500
Subject: [PATCH 2684/2793] geoclue2: correct sysconfdir

---
 nixos/modules/services/desktops/geoclue2.nix  |  2 +
 ...d-option-for-installation-sysconfdir.patch | 55 +++++++++++++++++++
 .../development/libraries/geoclue/default.nix |  6 ++
 3 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch

diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index dafb0af2075..840aa5294ed 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -61,6 +61,8 @@ in
         wantedBy = [ "default.target" ];
       };
     };
+
+    environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
   };
 
 }
diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
new file mode 100644
index 00000000000..629ea102971
--- /dev/null
+++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
@@ -0,0 +1,55 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,7 +7,7 @@
+         conf.set('demo_agent', '')
+     endif
+ 
+-    conf_dir = join_paths(get_option('sysconfdir'), 'geoclue')
++    conf_dir = join_paths(sysconfdir_install, 'geoclue')
+     configure_file(output: 'geoclue.conf',
+                    input: 'geoclue.conf.in',
+                    configuration: conf,
+@@ -26,7 +26,7 @@
+     # DBus Service policy file
+     dbus_service_dir = get_option('dbus-sys-dir')
+     if dbus_service_dir  == ''
+-        dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
++        dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
+     endif
+     configure_file(output: 'org.freedesktop.GeoClue2.conf',
+                    input: 'org.freedesktop.GeoClue2.conf.in',
+--- a/demo/meson.build
++++ b/demo/meson.build
+@@ -56,8 +56,7 @@
+                                    install_dir: desktop_dir)
+ 
+     # Also install in the autostart directory.
+-    autostart_dir = join_paths(get_option('prefix'),
+-                               get_option('sysconfdir'),
++    autostart_dir = join_paths(sysconfdir_install,
+                                'xdg', 'autostart')
+     meson.add_install_script('install-file.py',
+                              desktop_file.full_path(),
+--- a/meson.build
++++ b/meson.build
+@@ -22,6 +22,11 @@
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
+ conf.set_quoted('LOCALEDIR', datadir + '/locale')
+ conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
++if get_option('sysconfdir_install') != ''
++  sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
++else
++  sysconfdir_install = get_option('sysconfdir')
++endif
+ 
+ configure_file(output: 'config.h', configuration : conf)
+ configinc = include_directories('.')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -34,3 +34,6 @@
+ option('dbus-srv-user',
+        type: 'string', value: 'root',
+        description: 'The user (existing) as which the service will run')
++option('sysconfdir_install',
++       type: 'string', value: '',
++       description: 'sysconfdir to use during installation')
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index f2eeb9ae40b..5e83ba71c1b 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
   };
 
+  patches = [
+    ./add-option-for-installation-sysconfdir.patch
+  ];
+
   outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
@@ -36,6 +40,8 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
     "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
+    "--sysconfdir=/etc"
+    "-Dsysconfdir_install=${placeholder "out"}/etc"
   ] ++ optionals stdenv.isDarwin [
     "-D3g-source=false"
     "-Dcdma-source=false"

From 574efdb1853696107924b300a4b967e5c2f92190 Mon Sep 17 00:00:00 2001
From: Jonas Holst Damtoft <jonasdamtoft@hotmail.com>
Date: Wed, 26 Dec 2018 00:40:57 +0100
Subject: [PATCH 2685/2793] alacritty: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4b8657c55c9..5d1e43769b7 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -43,16 +43,16 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-${version}";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "alacritty";
     rev = "v${version}";
-    sha256 = "0p9q5cpxw5v2ka1ylaa009sfbncnlrva9yam4hag6npcnd8x4f95";
+    sha256 = "1mf0x8dc196qf08lqpm0n4a5954cx9qfb09dq8ab7mp3xnyrnqzx";
   };
 
-  cargoSha256 = "0664fi16kyly8hhfj0hgddsnfdk3y0z31758gvb0xq13ssdb6sv6";
+  cargoSha256 = "0p3bygvmpmy09h7972nhmma51lxp8q91cdlaw3s6p35i79hq3bmp";
 
   nativeBuildInputs = [
     cmake

From 5f9cd7475cac34ec55e55d28b46891ed4d33855f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 16:46:38 -0800
Subject: [PATCH 2686/2793] jsonnet: 0.11.2 -> 0.12.1 (#52874)

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

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 15eec4134ac..6104ffc7aaa 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jsonnet-${version}";
-  version = "0.11.2";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
+    sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
   };
 
   enableParallelBuilding = true;

From 5fe80e686ac6318d3118c8fe97bec506908a1999 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 16:52:12 -0800
Subject: [PATCH 2687/2793] gprolog: 1.4.4 -> 1.4.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/gprolog/versions
---
 pkgs/development/compilers/gprolog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index a0cc27b37e2..b823bf9bdd4 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gprolog-1.4.4";
+  name = "gprolog-1.4.5";
 
   src = fetchurl {
     urls = [
       "mirror://gnu/gprolog/${name}.tar.gz"
       "http://www.gprolog.org/${name}.tar.gz"
     ];
-    sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q";
+    sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z";
   };
 
   hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";

From f2eb5692506d54ffddaf2410313293d6d58d6d8b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Dec 2018 23:53:00 +0000
Subject: [PATCH 2688/2793] psi-plus: 1.4.404 -> 1.4.504

---
 .../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 d01019a5619..e1a2fb40c5a 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.4.404";
+  version = "1.4.504";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m";
+    sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
   };
 
   resources = fetchFromGitHub {

From c6f90688045073c5624b65e42e0a4be1564b7c2c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Dec 2018 23:10:21 +0000
Subject: [PATCH 2689/2793] pythonPackages.parsel: fix for Python 2

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

diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix
index 0135b98cbda..9ebd5e9b9ea 100644
--- a/pkgs/development/python-modules/parsel/default.nix
+++ b/pkgs/development/python-modules/parsel/default.nix
@@ -1,8 +1,9 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
 , pytestrunner
+, functools32
 , six
 , w3lib
 , lxml
@@ -19,13 +20,13 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytest pytestrunner ];
-  propagatedBuildInputs = [ six w3lib lxml cssselect ];
+  propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];
 
   checkPhase = ''
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/scrapy/parsel";
     description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
     license = licenses.bsd3;

From 6137c6de6c521ee70e69d2a1edf49155ee13d823 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 01:09:06 +0000
Subject: [PATCH 2690/2793] pythonPackages.secretstorage: fix license

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

diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
index c0df4d4a878..bff45c7f2c3 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = https://github.com/mitya57/secretstorage;
     description = "Python bindings to FreeDesktop.org Secret Service API";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ teto ];
   };
 }

From 84d133c8451646d4a55a2365b16983d08e41461a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Dec 2018 23:09:53 +0000
Subject: [PATCH 2691/2793] pythonPackages.secretstorage: init at 2.3.1 for
 Python 2

---
 .../python-modules/secretstorage/2.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/secretstorage/2.nix

diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix
new file mode 100644
index 00000000000..8fa044e638a
--- /dev/null
+++ b/pkgs/development/python-modules/secretstorage/2.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
+
+buildPythonPackage rec {
+  pname = "secretstorage";
+  version = "2.3.1";
+
+  src = fetchPypi {
+    pname = "SecretStorage";
+    inherit version;
+    sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
+  };
+
+  propagatedBuildInputs = [ cryptography dbus-python ];
+
+  # Needs a D-Bus Sesison
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/mitya57/secretstorage;
+    description = "Python bindings to FreeDesktop.org Secret Service API";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a64ce4e869c..d3e384d8ed2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4258,7 +4258,9 @@ in {
 
   blessings = callPackage ../development/python-modules/blessings { };
 
-  secretstorage = callPackage ../development/python-modules/secretstorage { };
+  secretstorage = if isPy3k
+    then callPackage ../development/python-modules/secretstorage { }
+    else callPackage ../development/python-modules/secretstorage/2.nix { };
 
   semantic = callPackage ../development/python-modules/semantic { };
 

From 3fd67fbb42d94fefe32af5955a546d146b5f7eb8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 02:26:46 +0000
Subject: [PATCH 2692/2793] pythonPackages.taskw: fix build

Broken by 8600798172e6a4c526d593ec8da48ce28cf0d15c in #49741.
---
 .../python-modules/taskw/default.nix          |  3 +-
 ...emplate-for-taskwarrior-install-path.patch | 42 ++-----------------
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix
index 328eb158eef..d2d12ca0b96 100644
--- a/pkgs/development/python-modules/taskw/default.nix
+++ b/pkgs/development/python-modules/taskw/default.nix
@@ -5,6 +5,7 @@
 , tox
 , six
 , dateutil
+, kitchen
 , pytz
 , pkgs
 }:
@@ -28,7 +29,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   buildInputs = [ nose pkgs.taskwarrior tox ];
-  propagatedBuildInputs = [ six dateutil pytz ];
+  propagatedBuildInputs = [ six dateutil kitchen pytz ];
 
   meta = with stdenv.lib; {
     homepage =  https://github.com/ralphbean/taskw;
diff --git a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
index 006d964d401..8c7685c9d03 100644
--- a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
+++ b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
@@ -4,45 +4,11 @@ Date:   Sun Nov 16 15:19:38 2014 +0100
 
     Use a template for taskwarrior install path.
 
-diff --git a/taskw/warrior.py b/taskw/warrior.py
-index 21dde88..e0509f2 100644
 --- a/taskw/warrior.py
 +++ b/taskw/warrior.py
-@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase):
-     def _execute(self, *args):
-         """ Execute a given taskwarrior command with arguments
- 
-         Returns a 2-tuple of stdout and stderr (respectively).
- 
-         """
-         command = (
-             [
+@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
 -                'task',
 +                '@@taskwarrior@@/bin/task',
-                 'rc:%s' % self.config_filename,
-             ]
-             + self.get_configuration_override_args()
-             + [six.text_type(arg) for arg in args]
-         )
- 
-         # subprocess is expecting bytestrings only, so nuke unicode if present
-         for i in range(len(command)):
-@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
-         except OSError:
-             # OSError is raised if subprocess.Popen fails to find
-             # the executable.
-             return False
- 
-     @classmethod
-     def get_version(cls):
-         taskwarrior_version = subprocess.Popen(
--            ['task', '--version'],
-+            ['@@taskwarrior@@/bin/task', '--version'],
-             stdout=subprocess.PIPE
-         ).communicate()[0]
-         return LooseVersion(taskwarrior_version.decode())
- 
-     def sync(self, init=False):
-         if self.get_version() < LooseVersion('2.3'):
-             raise UnsupportedVersionException(
-                 "'sync' requires version 2.3 of taskwarrior or later."
+@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
+-                ['task', '--version'],
++                ['@@taskwarrior@@/bin/task', '--version'],

From 4f909b59b46e273cfb0682df6131e3e3124e0833 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 02:30:48 +0000
Subject: [PATCH 2693/2793] pythonPackages.goobook: fix build

Broken by e42495282650010acabaad76e5b7f27de4315665 in #49741.
---
 pkgs/development/python-modules/goobook/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
index 599132f0f2c..4a3c3dc3bcb 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -4,6 +4,7 @@
 , isPy3k
 , oauth2client
 , gdata
+, google_api_python_client
 , simplejson
 , httplib2
 , keyring
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
   };
 
-  propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];
+  propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
 
   preConfigure = ''
     sed -i '/distribute/d' setup.py

From 669705c6205a7feccf4c3ff52a8e5448571b87d1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 02:33:07 +0000
Subject: [PATCH 2694/2793] pythonPackages.ofxparse: fix build

Broken by 0fde2cf4e140d6ca93303bb4622195176ffa94b2 in #49741.
---
 pkgs/development/python-modules/ofxparse/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
index fbbd3899420..377138877c9 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/pkgs/development/python-modules/ofxparse/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , six
 , beautifulsoup4
+, lxml
 }:
 
 buildPythonPackage rec {
@@ -14,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
   };
 
-  propagatedBuildInputs = [ six beautifulsoup4 ];
+  propagatedBuildInputs = [ six beautifulsoup4 lxml ];
 
   meta = with stdenv.lib; {
     homepage = "http://sites.google.com/site/ofxparse";

From 2102ff090d07fc388eccb2be75c3cdf50369c0da Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 02:41:38 +0000
Subject: [PATCH 2695/2793] pythonPackages.jsonrpclib-pelix: disable tests

Version 0.3.2 has started to advertise the tests in setup.py, but there are no
tests in the PyPI distribution.
---
 pkgs/development/python-modules/jsonrpclib-pelix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 2e3ef054598..5e6d6ceab9b 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
     sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
   };
 
+  doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
+
   meta = with lib; {
     description = "JSON RPC client library - Pelix compatible fork";
     homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/;

From 483b87ba090b8db10b92fb908c48eb530c15245f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Dec 2018 23:06:37 +0000
Subject: [PATCH 2696/2793] pythonPackages.qrcode: disable tests with Python 3

They fail since qrcode 6.0:
https://hydra.nixos.org/job/nixpkgs/trunk/python37Packages.qrcode.x86_64-linux

Upstream issue: https://github.com/lincolnloop/python-qrcode/issues/163
---
 pkgs/development/python-modules/qrcode/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index ca751e4ce78..fedff05d813 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , buildPythonPackage
+, isPy27
 , fetchPypi
 , six
 , pillow
@@ -18,6 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six pillow pymaging_png ];
   checkInputs = [ mock ];
+  doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163
 
   meta = with stdenv.lib; {
     description = "Quick Response code generation for Python";

From f58229ac1bd277e3dc8302857746dbf1bb345d84 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 25 Dec 2018 01:47:38 +0000
Subject: [PATCH 2697/2793] qbittorrent: 4.1.4 -> 4.1.5

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

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 532efa68f9a..81c493fedcf 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.1.4";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1hclyahgzj775h1fnv2rck9cw3r2yp2r6p1q263mj890n32gf3hp";
+    sha256 = "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported

From 8b12b17df3a8b5141e7a848641933cec28818ffa Mon Sep 17 00:00:00 2001
From: Craig Younkins <cyounkins@gmail.com>
Date: Fri, 30 Nov 2018 01:19:05 +0000
Subject: [PATCH 2698/2793] treewide: Fix broken Gmane URLs

---
 nixos/doc/manual/release-notes/rl-1412.xml      | 2 +-
 pkgs/build-support/fetchgit/nix-prefetch-git    | 2 +-
 pkgs/development/libraries/adns/default.nix     | 2 +-
 pkgs/development/tools/misc/dejagnu/default.nix | 2 +-
 pkgs/os-specific/linux/ati-drivers/default.nix  | 2 +-
 pkgs/tools/misc/coreutils/default.nix           | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 4d93aa644c1..139f61c2a55 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -17,7 +17,7 @@
    </listitem>
    <listitem>
     <para>
-     <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
+     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
      Nix has been updated to 1.8.</link>
     </para>
    </listitem>
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 34dfe67df4b..fa4e504c908 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -152,7 +152,7 @@ checkout_ref(){
     if "$deepClone"; then
         # The caller explicitly asked for a deep clone.  Deep clones
         # allow "git describe" and similar tools to work.  See
-        # http://thread.gmane.org/gmane.linux.distributions.nixos/3569
+        # https://marc.info/?l=nix-dev&m=139641582514772
         # for a discussion.
         return 1
     fi
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 0f0e30ef0f3..76e49768d53 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   preConfigure =
     stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
 
-  # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
+  # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
   doCheck = false;
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 26eaf707b2b..c04031bc41d 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
   # the build daemon when building in a chroot.  See
-  # <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
+  # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
   # details.
 
   # The test-suite needs to have a non-empty stdin:
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index cda7e03cd06..bc35d14321b 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -19,7 +19,7 @@ with stdenv.lib;
 # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
 # which is a problem because it doesn't contain the xorgserver patch supporting
 # the XORG_DRI_DRIVER_PATH env var.
-# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
+# See https://marc.info/?l=nix-dev&m=139641585515351 for a
 # workaround (TODO)
 
 # The gentoo ebuild contains much more "magic" and is usually a great resource to
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 0ddfad65a7a..c252a8748bc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
     ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
 
   # The tests are known broken on Cygwin
-  # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
-  # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
+  # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
+  # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
   # and {Open,Free}BSD.
   # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform

From 4543559aead7172e6da78325bb1b760ddb729df2 Mon Sep 17 00:00:00 2001
From: Craig Younkins <cyounkins@gmail.com>
Date: Fri, 30 Nov 2018 01:19:05 +0000
Subject: [PATCH 2699/2793] net-snmp: Fix broken Gmane URL

Fixes: #52898
Fixes: #51260
---
 pkgs/servers/monitoring/net-snmp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 0e7a53306eb..d86eac719a6 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       perlarchname=$(perl -e 'use Config; print $Config{archname};')
       installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3"
 
-      # http://comments.gmane.org/gmane.network.net-snmp.user/32434
+      # http://article.gmane.org/gmane.network.net-snmp.user/32434
       substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v'
     '';
 

From 12abec645331664585630ddc42322b9566909f13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 23:16:34 -0800
Subject: [PATCH 2700/2793] couchdb2: 2.2.0 -> 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/couchdb/versions
---
 pkgs/servers/http/couchdb/2.0.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index 6e52bdc3270..fa8cb23bf1f 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f";
+    sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e96b3a95c42a37477485398aa1de02d851988703 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Dec 2018 00:22:09 -0800
Subject: [PATCH 2701/2793] clipgrab: 3.7.1 -> 3.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/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 6a429116a71..3937244f25b 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.7.1";
+  version = "3.7.2";
 
   src = fetchurl {
-    sha256 = "0bhzkmcinlsfp5ldgqp59xnkaz6ikzdnq78drcdf1w7q4z05ipxd";
+    sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From 79e90ca154946bcecf3866254b3e67cab0cfcca5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 19:39:19 -0800
Subject: [PATCH 2702/2793] python37Packages.graph-tool: 2.26 -> 2.27

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

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 7c83039ecdb..d58ec269054 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -8,7 +8,7 @@
 buildPythonPackage rec {
   pname = "graph-tool";
   format = "other";
-  version = "2.26";
+  version = "2.27";
 
   meta = with stdenv.lib; {
     description = "Python module for manipulation and statistical analysis of graphs";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
+    sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27";
   };
 
   patches = [

From 5898cc663ff52d71487aa8eb7b84a2805423270e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 16:25:35 -0800
Subject: [PATCH 2703/2793] python37Packages.influxdb: 5.2.0 -> 5.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/python3.7-influxdb/versions
---
 pkgs/development/python-modules/influxdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix
index 0d6828bff72..99edea703c6 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/pkgs/development/python-modules/influxdb/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "influxdb";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v";
+    sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm";
   };
 
   # ImportError: No module named tests

From 50769a739ea8ae2d795e617ec1104abcfede7b3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 16:11:52 -0800
Subject: [PATCH 2704/2793] python37Packages.django_extensions: 2.1.3 -> 2.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/python3.7-django-extensions/versions
---
 pkgs/development/python-modules/django-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 30ef1a10418..822815736da 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "django-extensions";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy";
+    sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f";
   };
 
   postPatch = ''

From 35639a1a80652e1a6291c40c7f3145af6174765c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 22:36:16 -0800
Subject: [PATCH 2705/2793] doitlive: 4.2.0 -> 4.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/doitlive/versions
---
 pkgs/tools/misc/doitlive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
index f18874e4f44..00b04c2112f 100644
--- a/pkgs/tools/misc/doitlive/default.nix
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "doitlive";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0yabw2gqsjdivivlwsc2q7p3qq72cccx3xzfc1a4gd8d74f84nrw";
+    sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526";
   };
 
   propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ];

From 04b54453417945bd20a57a28aeaa35d28315b8fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 20:49:48 -0800
Subject: [PATCH 2706/2793] python37Packages.breathe: 4.11.0 -> 4.11.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/python3.7-breathe/versions
---
 pkgs/development/python-modules/breathe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 7dc9649e628..f7b09b96fb1 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.11.0";
+  version = "4.11.1";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05x3qrvsriy0cn0p4bxnzhp27pvxbq2vxlxncr2wqh003gpbp4fa";
+    sha256 = "1mps0cfli6iq2gqsv3d24fs1cp7sq7crd9ji6lw63b9r40998ylv";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

From 567b3093da723e70468d76e4e831402cf89da206 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 21:55:49 -0800
Subject: [PATCH 2707/2793] featherpad: 0.9.1 -> 0.9.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/featherpad/versions
---
 pkgs/applications/editors/featherpad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index dbdc13ece2a..b1e26910f1f 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -3,13 +3,13 @@
 with qt5;
 
 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.2";
   name = "featherpad-${version}";
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
     rev = "V${version}";
-    sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla";
+    sha256 = "1kpv8x3m4hiz7q9k7qadgbrys5nyzm7v5mhjyk22hawnp98m9x4q";
   };
   nativeBuildInputs = [ qmake pkgconfig qttools ];
   buildInputs = [ qtbase qtsvg qtx11extras ];

From fc27f4b297306ffb52144f66fa909668e2eb734c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 18:14:52 -0800
Subject: [PATCH 2708/2793] gauche: 0.9.6 -> 0.9.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/gauche/versions
---
 pkgs/development/interpreters/gauche/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index 2478493d41d..5481c4e7d05 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gauche-${version}";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
-    sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd";
+    sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd";
   };
 
   nativeBuildInputs = [ pkgconfig texinfo ];

From 92def1d5f708faa3c1fcf998018ccd1df1bfbc72 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Dec 2018 10:42:11 +0100
Subject: [PATCH 2709/2793] codeowners: fix reference to renamed file

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3a2761204d6..5c2096cfe4d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -55,7 +55,7 @@
 /pkgs/top-level/python-packages.nix     @FRidh
 /pkgs/development/interpreters/python   @FRidh
 /pkgs/development/python-modules        @FRidh
-/doc/languages-frameworks/python.md     @FRidh
+/doc/languages-frameworks/python.section.md     @FRidh
 
 # Haskell
 /pkgs/development/compilers/ghc                       @peti @ryantm @basvandijk

From 338cf1a7fc35455295103cbd8d1b56b7d6764283 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 14:11:28 -0800
Subject: [PATCH 2710/2793] igv: 2.4.15 -> 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/igv/versions
---
 pkgs/applications/science/biology/igv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 4ffbaf85fbd..1804f854c48 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "igv-${version}";
-  version = "2.4.15";
+  version = "2.4.16";
 
   src = fetchurl {
     url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
-    sha256 = "000l9hnkjbl9js7v8fyssgl4imrl0qd15mgz37qx2bwvimdp75gh";
+    sha256 = "0bsl20zw7sgw16xadh1hmlg6d6ijyb1dhpnyvf4kxk3nk0abrmn1";
   };
 
   buildInputs = [ unzip jre ];

From 28263b02a92f597d89657b533b1e2296e055425a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 06:04:04 -0800
Subject: [PATCH 2711/2793] log4cplus: 2.0.2 -> 2.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/log4cplus/versions
---
 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 7a390021d1f..7fb79c549be 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 let
-  name = "log4cplus-2.0.2";
+  name = "log4cplus-2.0.3";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
-    sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4";
+    sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w";
   };
 
   meta = {

From 2a20920fe29eafb01c4651a773790fab29acb255 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 21:47:45 -0800
Subject: [PATCH 2712/2793] facter: 3.12.1 -> 3.12.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/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 dd2340668c4..8fe8ac836ba 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.12.1";
+  version = "3.12.2";
 
   src = fetchFromGitHub {
-    sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d";
+    sha256 = "021z0r6m5nyi37045ycjpw0lawvw70w4pjl56cj1mwz99pq1qqns";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";

From 1834a3ed22115f4f7805b403c732658808ab5490 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 23:51:40 -0800
Subject: [PATCH 2713/2793] python37Packages.antlr4-python3-runtime: 4.7.1 ->
 4.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/python3.7-antlr4-python3-runtime/versions
---
 .../python-modules/antlr4-python3-runtime/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 8f46a6f0b0f..6f5fd3e934a 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "antlr4-python3-runtime";
-  version = "4.7.1";
+  version = "4.7.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
+    sha256 = "02xm7ccsf51vh4xsnhlg6pvchm1x3ckgv9kwm222w5drizndr30n";
   };
 
   meta = {

From 02fdc64be3f7b0bcd1ec829b3d9d8cd2b0ff1595 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Dec 2018 00:14:05 -0800
Subject: [PATCH 2714/2793] csound: 6.12.0 -> 6.12.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/csound/versions
---
 pkgs/applications/audio/csound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 450ece6a12f..b11f525e9d2 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # When updating, please check if https://github.com/csound/csound/issues/1078
   # has been fixed in the new version so we can use the normal fluidsynth
   # version and remove fluidsynth 1.x from nixpkgs again.
-  version = "6.12.0";
+  version = "6.12.2";
 
   enableParallelBuilding = true;
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi";
+    sha256 = "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

From 3970c9799dff70e82160b90adce0e01dcee0bcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:57:35 -0200
Subject: [PATCH 2715/2793] terminology: 1.3.0 -> 1.3.2

---
 pkgs/desktops/enlightenment/terminology.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 3cac8bca2d3..f11f21f5b95 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r";
+    sha256 = "1kclxzadmk272s9spa7n704pcb1c611ixxrq88w5zk22va0i25xm";
   };
 
   nativeBuildInputs = [

From 964342e2313ab7ee60e4b836c654b35f14dff12d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 22:55:32 -0800
Subject: [PATCH 2716/2793] checkSSLCert: 1.78.0 -> 1.79.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 b1fbb3eb9ea..5c5750fccc8 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.78.0";
+  version = "1.79.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    sha256 = "0s03625xzb30f6dbn34zkp0wcajzlir7wzkgi9rmms76gk4jqq6h";
+    sha256 = "0pqk09xypa9vdxw5lbaa1j8w3mbmdwh2y1sq768rqq0izyfynf4d";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From de0de8903f5140e63ed62629f2e9b4b7ead572bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 16:03:18 -0800
Subject: [PATCH 2717/2793] grml-zsh-config: 0.15.1 -> 0.15.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/grml-zsh-config/versions
---
 pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index 0c092e31a03..b52255cc594 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "grml-zsh-config-${version}";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "13mm1vjmb600l4g0ssr56xrlx6lwpv1brrpmf2v2pp2d5ki0d47x";
+    sha256 = "15cr8pv1idshhq5d9sq4smgfl00iz55ji5mrxclsl3a35wg0djnw";
   };
 
   buildInputs = [ zsh coreutils txt2tags procps ]

From 281981a6df9ca93fe7237676757be316ff51e98f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Dec 2018 11:57:27 +0100
Subject: [PATCH 2718/2793] pywal: move to pythonPackages and inject path to
 convert

---
 .../python-modules/pywal/convert.patch        | 21 +++++++++++++++++++
 .../python-modules}/pywal/default.nix         |  8 +++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 ++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pywal/convert.patch
 rename pkgs/{tools/graphics => development/python-modules}/pywal/default.nix (82%)

diff --git a/pkgs/development/python-modules/pywal/convert.patch b/pkgs/development/python-modules/pywal/convert.patch
new file mode 100644
index 00000000000..999bc1abeaf
--- /dev/null
+++ b/pkgs/development/python-modules/pywal/convert.patch
@@ -0,0 +1,21 @@
+diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py
+index a75fdc5..4339680 100644
+--- a/pywal/backends/wal.py
++++ b/pywal/backends/wal.py
+@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command):
+
+ def has_im():
+     """Check to see if the user has im installed."""
+-    if shutil.which("magick"):
+-        return ["magick", "convert"]
+-
+-    if shutil.which("convert"):
+-        return ["convert"]
+-
+-    logging.error("Imagemagick wasn't found on your system.")
+-    logging.error("Try another backend. (wal --backend)")
+-    sys.exit(1)
++    return ["@convert@"]
+
+
+ def gen_colors(img):
diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix
similarity index 82%
rename from pkgs/tools/graphics/pywal/default.nix
rename to pkgs/development/python-modules/pywal/default.nix
index 4d493bdd73e..799a018e539 100644
--- a/pkgs/tools/graphics/pywal/default.nix
+++ b/pkgs/development/python-modules/pywal/default.nix
@@ -19,6 +19,14 @@ python3Packages.buildPythonApplication rec {
     HOME=$PWD/tmp
   '';
 
+  patches = [
+    ./convert.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert"
+  '';
+
   meta = with lib; {
     description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3.";
     homepage = https://github.com/dylanaraps/pywal;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbf1c2e4e39..9f9e963caac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5017,7 +5017,7 @@ in
 
   pytrainer = callPackage ../applications/misc/pytrainer { };
 
-  pywal = callPackage ../tools/graphics/pywal {};
+  pywal = with python3Packages; toPythonApplication pywal;
 
   remarshal = callPackage ../development/tools/remarshal { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3e384d8ed2..a377046c990 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3733,6 +3733,8 @@ in {
 
   pyutil = callPackage ../development/python-modules/pyutil { };
 
+  pywal = callPackage ../development/python-modules/pywal { };
+
   pywebkitgtk = callPackage ../development/python-modules/pywebkitgtk { };
 
   pywinrm = callPackage ../development/python-modules/pywinrm { };

From 8862d554c7eca04d8f1a5caeffd99933ab6b6b5e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Dec 2018 12:01:20 +0100
Subject: [PATCH 2719/2793] wpgtk: use python37 and fix dependency on pywal

---
 pkgs/tools/X11/wpgtk/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index 374d3e112ca..2c8306a25af 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick,
+{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt,
   gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
 
-python36Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "wpgtk";
   version = "5.7.4";
 
@@ -12,13 +12,6 @@ python36Packages.buildPythonApplication rec {
     sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726";
   };
 
-  pythonPath = [
-    python36Packages.pygobject3
-    python36Packages.pillow
-    pywal
-    imagemagick
-  ];
-
   buildInputs = [
     wrapGAppsHook
     gtk3
@@ -27,11 +20,20 @@ python36Packages.buildPythonApplication rec {
     libxslt
   ];
 
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    pillow
+    pywal
+  ];
+
   # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise
   preBuild = ''
       export HOME=$(pwd)
   '';
 
+  # No test exist
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Template based wallpaper/colorscheme generator and manager";
     longDescription = ''

From d8cf1db93f24d1159dee9a419e9767b3ec563ddd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Dec 2018 14:38:35 -0500
Subject: [PATCH 2720/2793] linuxPackages.ndiswrapper: updated to fix build on
 recent kernels

While the upstream commit says 4.18, it builds for 4.19 and 4.20.
---
 pkgs/os-specific/linux/ndiswrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index fc9e6ab00dd..bdb52c0c091 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pgiri";
     repo = "ndiswrapper";
-    rev = "f4d16afb29ab04408d02e38d4ea1148807778e21";
-    sha256 = "0iaw0vhchmqf1yh14v4a6whnbg4sx1hag8a4hrsh4fzgw9fx0ij4";
+    rev = "5e29f6a9d41df949b435066c173e3b1947f179d3";
+    sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi";
   };
 
   buildInputs = [ perl libelf ];

From 7093970e1d4cb3739d40a0be75ada90af1bb64de Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Dec 2018 14:43:39 -0500
Subject: [PATCH 2721/2793] linuxPackages.ena: 1.5.2 -> 2.0.2

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

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 180957ac2ad..495cd49e3f4 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.2";
+  version = "2.0.2";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
+    sha256 = "0vb8s0w7ddwajk5gj5nqqlqc63p8p556f9ccwviwda2zvgqmk2pb";
   };
 
   hardeningDisable = [ "pic" ];

From b861ebb4c634cd474a1c688b61ab16c9c7eb7257 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Dec 2018 14:44:48 -0500
Subject: [PATCH 2722/2793] linuxPackages: 4.14 -> 4.19

---
 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 9f9e963caac..1493043d1c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14747,7 +14747,7 @@ in
   });
 
   # The current default kernel / kernel modules.
-  linuxPackages = linuxPackages_4_14;
+  linuxPackages = linuxPackages_4_19;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!

From 207210660f2a8f178fa0dfb3fd3c35371bf9406d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Dec 2018 18:55:42 -0500
Subject: [PATCH 2723/2793] nixos/sd-image-aarch64: Configures it to use the
 default kernel

---
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 86e19f3da56..2db71eb20c5 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -26,7 +26,6 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.consoleLogLevel = lib.mkDefault 7;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   # The serial ports listed here are:
   # - ttyS0: for Tegra (Jetson TX1)

From 302d53df2b79f48ea6e9f42e47dd17e561ff6433 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Dec 2018 18:58:04 -0500
Subject: [PATCH 2724/2793] nixos/sd-image-aarch64-new-kernel: Added to release

This, paired with the previous commit, ensures the channel won't be held
back from a kernel upgrade and a non-building sd image, while still
having a new-kernel variant available.
---
 .../installer/cd-dvd/sd-image-aarch64-new-kernel.nix      | 7 +++++++
 nixos/release.nix                                         | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
new file mode 100644
index 00000000000..2882fbcc730
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ./sd-image-aarch64.nix ];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index e7952b33de6..df2c52ccd0b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -172,6 +172,14 @@ in rec {
     inherit system;
   });
 
+  sd_image_new_kernel = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
+    module = {
+        aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix;
+      }.${system};
+    type = "minimal-new-kernel";
+    inherit system;
+  });
+
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = forMatchingSystems [ "x86_64-linux" ] (system:
 

From 3f93d68ebbf7488edbb578afc905a6fc3df1747e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Dec 2018 12:57:19 +0100
Subject: [PATCH 2725/2793] python.pkgs.pywal: hardcode path to feh

---
 .../python-modules/pywal/default.nix          |  7 +---
 .../python-modules/pywal/feh.patch            | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/pywal/feh.patch

diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix
index 799a018e539..00691e65225 100644
--- a/pkgs/development/python-modules/pywal/default.nix
+++ b/pkgs/development/python-modules/pywal/default.nix
@@ -9,11 +9,6 @@ python3Packages.buildPythonApplication rec {
     sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic";
   };
 
-  # necessary for imagemagick to be found during tests
-  buildInputs = [ imagemagick ];
-
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ];
-
   preCheck = ''
     mkdir tmp
     HOME=$PWD/tmp
@@ -21,10 +16,12 @@ python3Packages.buildPythonApplication rec {
 
   patches = [
     ./convert.patch
+    ./feh.patch
   ];
 
   postPatch = ''
     substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert"
+    substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pywal/feh.patch b/pkgs/development/python-modules/pywal/feh.patch
new file mode 100644
index 00000000000..eae2ddbefd6
--- /dev/null
+++ b/pkgs/development/python-modules/pywal/feh.patch
@@ -0,0 +1,39 @@
+commit 99ef6bfc51ee401f6762183f8e323b8306a8ce56
+Author: Frederik Rietdijk <fridh@fridh.nl>
+Date:   Wed Dec 26 12:54:32 2018 +0100
+
+    nix: hardcode feh
+
+diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py
+index ba61e66..6107305 100644
+--- a/pywal/wallpaper.py
++++ b/pywal/wallpaper.py
+@@ -47,27 +47,7 @@ def xfconf(path, img):
+ 
+ def set_wm_wallpaper(img):
+     """Set the wallpaper for non desktop environments."""
+-    if shutil.which("feh"):
+-        util.disown(["feh", "--bg-fill", img])
+-
+-    elif shutil.which("nitrogen"):
+-        util.disown(["nitrogen", "--set-zoom-fill", img])
+-
+-    elif shutil.which("bgs"):
+-        util.disown(["bgs", "-z", img])
+-
+-    elif shutil.which("hsetroot"):
+-        util.disown(["hsetroot", "-fill", img])
+-
+-    elif shutil.which("habak"):
+-        util.disown(["habak", "-mS", img])
+-
+-    elif shutil.which("display"):
+-        util.disown(["display", "-backdrop", "-window", "root", img])
+-
+-    else:
+-        logging.error("No wallpaper setter found.")
+-        return
++    return util.disown(["@feh@/bin/feh", "--bg-fill", img])
+ 
+ 
+ def set_desktop_wallpaper(desktop, img):

From 2f62e382afc08a6b7d982a3b5edff8f57afd5eb3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Dec 2018 13:30:58 +0100
Subject: [PATCH 2726/2793] python.pkgs.pywal: fix path to feh

---
 pkgs/development/python-modules/pywal/feh.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pywal/feh.patch b/pkgs/development/python-modules/pywal/feh.patch
index eae2ddbefd6..985e601d625 100644
--- a/pkgs/development/python-modules/pywal/feh.patch
+++ b/pkgs/development/python-modules/pywal/feh.patch
@@ -1,11 +1,11 @@
-commit 99ef6bfc51ee401f6762183f8e323b8306a8ce56
+commit c31faa212e09aa62c232d9008e05976b1cdc9ee5
 Author: Frederik Rietdijk <fridh@fridh.nl>
 Date:   Wed Dec 26 12:54:32 2018 +0100
 
     nix: hardcode feh
 
 diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py
-index ba61e66..6107305 100644
+index ba61e66..fad34f7 100644
 --- a/pywal/wallpaper.py
 +++ b/pywal/wallpaper.py
 @@ -47,27 +47,7 @@ def xfconf(path, img):
@@ -33,7 +33,7 @@ index ba61e66..6107305 100644
 -    else:
 -        logging.error("No wallpaper setter found.")
 -        return
-+    return util.disown(["@feh@/bin/feh", "--bg-fill", img])
++    return util.disown(["@feh@", "--bg-fill", img])
  
  
  def set_desktop_wallpaper(desktop, img):

From 889815fd7bf633d3a7c116dbf3598f57129cd221 Mon Sep 17 00:00:00 2001
From: Melkor333 <samuel@ton-kunst.ch>
Date: Wed, 26 Dec 2018 13:14:02 +0100
Subject: [PATCH 2727/2793] wpgtk: 5.7.4 -> 5.8.6

---
 pkgs/tools/X11/wpgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index 2c8306a25af..cc7f213b88b 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "wpgtk";
-  version = "5.7.4";
+  version = "5.8.6";
 
   src = fetchFromGitHub {
     owner = "deviantfero";
     repo = "wpgtk";
     rev = "${version}";
-    sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726";
+    sha256 = "1i29zdmgm8knp6mmz3nfl0dwn3vd2wcvf5vn0gg8sv2wjgk3i10y";
   };
 
   buildInputs = [

From f884c6c1de77d5bce4e6286b8c747712fc7a6562 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Dec 2018 04:34:11 -0800
Subject: [PATCH 2728/2793] bind: 9.12.3 -> 9.12.3-P1

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 49d11a51617..74e1fda2d42 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.3"; in
+let version = "9.12.3-P1"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0f5rjs6zsq8sp6iv5r4q5y65xv05dk2sgvsj6lcir3i564k7d00f";
+    sha256 = "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 91ec96d77d146efa7595b6d3f12193a89958ec0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Dec 2018 14:52:47 +0100
Subject: [PATCH 2729/2793] LTS Haskell 13.0 (updates to ghc-8.6.3)

---
 .../configuration-hackage2nix.yaml            | 1043 ++++++++---------
 1 file changed, 483 insertions(+), 560 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f56a14f2ef4..66cc0808f65 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,34 +1,36 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.4.4
+compiler: ghc-8.6.3
 
 core-packages:
-  - array-0.5.2.0
-  - base-4.11.1.0
-  - binary-0.8.5.1
+  - array-0.5.3.0
+  - base-4.12.0.0
+  - binary-0.8.6.0
   - bytestring-0.10.8.2
-  - Cabal-2.2.0.1
-  - containers-0.5.11.0
-  - deepseq-1.4.3.0
-  - directory-1.3.1.5
-  - filepath-1.4.2
-  - ghc-8.4.4
-  - ghc-boot-8.4.4
-  - ghc-boot-th-8.4.4
+  - Cabal-2.4.0.1
+  - containers-0.6.0.1
+  - deepseq-1.4.4.0
+  - directory-1.3.3.0
+  - filepath-1.4.2.1
+  - ghc-8.6.3
+  - ghc-boot-8.6.3
+  - ghc-boot-th-8.6.3
   - ghc-compact-0.1.0.0
-  - ghc-prim-0.5.2.0
-  - ghci-8.4.4
-  - haskeline-0.7.4.2
+  - ghc-heap-8.6.3
+  - ghc-prim-0.5.3
+  - ghci-8.6.3
+  - haskeline-0.7.4.3
   - hpc-0.6.0.3
   - integer-gmp-1.0.2.0
+  - libiserv-8.6.3
   - mtl-2.2.2
   - parsec-3.1.13.0
   - pretty-1.1.3.6
   - process-1.6.3.0
   - rts-1.0
-  - stm-2.4.5.1
-  - template-haskell-2.13.0.0
-  - terminfo-0.4.1.1
+  - stm-2.5.0.0
+  - template-haskell-2.14.0.0
+  - terminfo-0.4.1.2
   - text-1.2.3.1
   - time-1.8.0.2
   - transformers-0.5.5.0
@@ -44,7 +46,7 @@ default-package-overrides:
   # Newer versions don't work in LTS-12.x
   - alsa-mixer < 0.3
   - cassava-megaparsec < 2
-  # LTS Haskell 12.23
+  # LTS Haskell 13.0
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -55,9 +57,9 @@ default-package-overrides:
   - ad ==4.3.5
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
+  - advent-of-code-api ==0.1.2.3
   - aern2-mp ==0.1.3.1
-  - aern2-real ==0.1.1.0
-  - aeson ==1.3.1.1
+  - aeson ==1.4.2.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
@@ -72,17 +74,15 @@ default-package-overrides:
   - aeson-typescript ==0.1.1.0
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
-  - Agda ==2.5.4.2
   - al ==0.1.4.2
-  - alarmclock ==0.5.0.2
+  - alarmclock ==0.6.0.2
   - alerts ==0.1.0.0
   - alex ==3.2.4
   - alg ==0.2.9.0
-  - algebra ==4.3.1
-  - algebraic-graphs ==0.2
-  - Allure ==0.8.3.0
+  - algebraic-graphs ==0.3
   - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
+  - alsa-mixer ==0.3.0
   - alsa-pcm ==0.6.1.1
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
@@ -92,6 +92,7 @@ default-package-overrides:
   - amazonka-apigateway ==1.6.0
   - amazonka-application-autoscaling ==1.6.0
   - amazonka-appstream ==1.6.0
+  - amazonka-athena ==1.6.0
   - amazonka-autoscaling ==1.6.0
   - amazonka-budgets ==1.6.0
   - amazonka-certificatemanager ==1.6.0
@@ -181,18 +182,32 @@ default-package-overrides:
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.8.2
   - ansi-wl-pprint ==0.6.8.2
+  - antiope-athena ==6.2.0
+  - antiope-core ==6.2.0
+  - antiope-dynamodb ==6.2.0
+  - antiope-messages ==6.2.0
+  - antiope-s3 ==6.2.0
+  - antiope-sns ==6.2.0
+  - antiope-sqs ==6.2.0
   - ANum ==0.2.0.2
+  - aos-signature ==0.1.1
+  - apecs ==0.7.1
+  - apecs-gloss ==0.2.0
+  - apecs-physics ==0.3.1
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.7
-  - apply-refact ==0.5.0.0
+  - appendmap ==0.1.5
+  - apply-refact ==0.6.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.1
   - app-settings ==0.2.0.12
-  - arithmoi ==0.7.0.0
+  - arbor-lru-cache ==0.1.1.0
+  - arithmoi ==0.8.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
-  - arrow-list ==0.7
+  - asciidiagram ==1.3.3.2
   - ascii-progress ==0.3.3.0
+  - asif ==3.2.0
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
@@ -204,27 +219,31 @@ default-package-overrides:
   - async-refresh-tokens ==0.4.0.0
   - async-timer ==0.2.0.0
   - atom-basic ==0.2.5
-  - atom-conduit ==0.5.0.1
   - atomic-primops ==0.8.2
   - atomic-write ==0.2.0.6
   - attoparsec ==0.13.2.2
   - attoparsec-base64 ==0.0.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
-  - attoparsec-ip ==0.0.1
+  - attoparsec-ip ==0.0.5
   - attoparsec-iso8601 ==1.0.1.0
   - attoparsec-path ==0.0.0.1
-  - attoparsec-uri ==0.0.4
+  - attoparsec-uri ==0.0.7
   - audacity ==0.0.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
   - autoexporter ==1.1.13
   - auto-update ==0.1.4
-  - avro ==0.3.5.1
+  - avers ==0.0.17.1
+  - avers-api ==0.1.0
+  - avers-server ==0.1.0.1
+  - avro ==0.4.1.1
   - avwx ==0.3.0.2
-  - backprop ==0.2.5.0
+  - axel ==0.0.9
+  - backprop ==0.2.6.1
   - bank-holidays-england ==0.1.0.8
+  - barbies ==1.1.0.0
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
@@ -233,20 +252,20 @@ default-package-overrides:
   - base64-bytestring-type ==1
   - base64-string ==0.2
   - base-compat ==0.10.5
-  - base-compat-batteries ==0.10.1
+  - base-compat-batteries ==0.10.5
   - basement ==0.0.8
-  - base-orphans ==0.7
+  - base-noprelude ==4.12.0.0
+  - base-orphans ==0.8
   - base-prelude ==1.3
-  - base-unicode-symbols ==0.2.2.4
+  - base-unicode-symbols ==0.2.3
   - basic-prelude ==0.7.0
+  - bazel-runfiles ==0.7.0.1
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - beam-core ==0.7.2.2
-  - beam-migrate ==0.3.2.1
   - bench ==1.0.12
+  - benchpress ==0.2.2.12
   - bencode ==0.6.0.0
   - between ==0.11.0.0
-  - bhoogle ==0.1.3.5
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.3
   - bimap ==0.3.3
@@ -266,10 +285,8 @@ default-package-overrides:
   - bindings-GLFW ==3.2.1.1
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
-  - BiobaseNewick ==0.0.0.2
+  - bins ==0.1.1.1
   - bitarray ==0.0.1.1
-  - bitcoin-api ==0.12.1
-  - bitcoin-api-extra ==0.9.1
   - bitcoin-block ==0.13.1
   - bitcoin-script ==0.11.1
   - bitcoin-tx ==0.13.1
@@ -280,9 +297,7 @@ default-package-overrides:
   - bit-stream ==0.1.0.2
   - bitx-bitcoin ==0.12.0.0
   - blake2 ==0.2.0
-  - blank-canvas ==0.6.3
-  - blas-carray ==0.0.1.1
-  - blas-ffi ==0.0.2
+  - blas-ffi ==0.1
   - blas-hs ==0.1.1.0
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
@@ -296,6 +311,7 @@ default-package-overrides:
   - boltzmann-samplers ==0.1.1.0
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
+  - boolean-normal-forms ==0.0.1
   - boolsimplifier ==0.1.8
   - bordacount ==0.1.0.0
   - boring ==0.1
@@ -305,16 +321,14 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.37.2
-  - brittany ==0.11.0.0
-  - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.4
-  - bson ==0.3.2.6
+  - bson ==0.3.2.7
   - bson-lens ==0.1.1
-  - btrfs ==0.1.2.3
+  - btrfs ==0.2.0.0
   - buffer-builder ==0.2.4.7
   - buffer-pipe ==0.0
-  - butcher ==1.3.2.0
+  - bugsnag-haskell ==0.0.3.0
+  - bulletproofs ==0.4.0
   - butter ==0.1.0.6
   - bv ==0.5
   - bv-little ==0.1.2
@@ -331,43 +345,41 @@ default-package-overrides:
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.3.0.1
   - c2hs ==0.28.6
-  - Cabal ==2.2.0.1
-  - cabal2spec ==2.1.1
+  - Cabal ==2.4.1.0
+  - cabal2spec ==2.2.2
   - cabal-doctest ==1.0.6
   - cabal-rpm ==0.12.6
   - cache ==0.1.1.1
-  - cachix ==0.1.3
   - cachix-api ==0.1.0.3
-  - cairo ==0.13.5.0
+  - cacophony ==0.10.1
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.1.0
-  - capataz ==0.2.0.0
   - carray ==0.1.6.8
   - cased ==0.1.0.0
   - case-insensitive ==1.2.0.11
   - cases ==0.1.3.2
   - casing ==0.1.4.0
   - cassava ==0.5.1.0
-  - cassava-conduit ==0.5.0
+  - cassava-conduit ==0.5.1
+  - cassava-megaparsec ==2.0.0
   - cassava-records ==0.1.0.4
   - cast ==0.1.0.2
   - category ==0.2.0.1
-  - cayley-client ==0.4.7
+  - cayley-client ==0.4.8
   - cborg ==0.2.1.0
+  - cborg-json ==0.2.1.0
   - cereal ==0.5.7.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
+  - cgi ==3001.3.0.3
   - chan ==0.0.4.1
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
-  - chart-unit ==0.7.0.0
   - chaselev-deque ==0.5.0.5
-  - ChasingBottoms ==1.3.1.5
-  - chatwork ==0.1.3.5
   - cheapskate ==0.1.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -385,33 +397,29 @@ default-package-overrides:
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
   - cisco-spark-api ==0.1.0.3
-  - clang-compilation-database ==0.1.0.1
-  - clash-ghc ==0.99.3
-  - clash-lib ==0.99.3
-  - clash-prelude ==0.99.3
   - classyplate ==0.3.2.0
-  - classy-prelude ==1.4.0
-  - classy-prelude-conduit ==1.4.0
-  - classy-prelude-yesod ==1.4.0
+  - classy-prelude ==1.5.0
+  - classy-prelude-conduit ==1.5.0
+  - classy-prelude-yesod ==1.5.0
   - clay ==0.13.1
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.2.0
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
-  - closed ==0.2.0
   - clr-host ==0.2.1.0
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.2.3
+  - cmark ==0.5.6
   - cmark-gfm ==0.1.6
   - cmdargs ==0.10.20
-  - code-builder ==0.1.3
   - codec ==0.2.1
   - codec-beam ==0.2.0
   - codec-rpm ==0.2.2
-  - code-page ==0.1.3
+  - code-page ==0.2
   - codo-notation ==0.5.2
   - coercible-utils ==0.0.0
+  - co-log ==0.2.0
+  - co-log-core ==0.1.1
   - colonnade ==1.2.0.1
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
@@ -423,14 +431,10 @@ default-package-overrides:
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
   - compiler-warnings ==0.1.0
-  - componentm ==0.0.0.2
-  - componentm-devel ==0.0.0.2
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.5.3.1
-  - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.6.2.0
   - concurrent-extra ==0.7.0.12
@@ -441,13 +445,15 @@ default-package-overrides:
   - conduit ==1.3.1
   - conduit-algorithms ==0.0.8.2
   - conduit-combinators ==1.3.0
+  - conduit-concurrent-map ==0.1.1
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
   - conduit-iconv ==0.1.1.3
   - conduit-parse ==0.2.1.0
   - conduit-throttle ==0.3.1.0
-  - config-ini ==0.2.2.0
-  - configuration-tools ==0.3.1
+  - conduit-zstd ==0.0.1.1
+  - confcrypt ==0.1.0.4
+  - configuration-tools ==0.4.0
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.8
@@ -455,9 +461,7 @@ default-package-overrides:
   - console-style ==0.0.2.1
   - constraint ==0.1.1.1
   - constraints ==0.10.1
-  - consul-haskell ==0.4.2
-  - containers-unicode-symbols ==0.3.1.1
-  - contravariant ==1.4.1
+  - contravariant ==1.5
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
   - control-dsl ==0.2.1.3
@@ -477,7 +481,7 @@ default-package-overrides:
   - cql-io ==1.0.1.1
   - crackNum ==2.3
   - credential-store ==0.1.2
-  - criterion ==1.4.1.0
+  - criterion ==1.5.3.0
   - criterion-measurement ==0.1.1.0
   - cron ==0.6.1
   - crypto-api ==0.13.3
@@ -486,7 +490,7 @@ default-package-overrides:
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - cryptocompare ==0.1.1
-  - crypto-enigma ==0.0.3.1
+  - crypto-enigma ==0.1.1.4
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -496,29 +500,29 @@ default-package-overrides:
   - cryptonite ==0.25
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.7
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
+  - crypto-pubkey-openssh ==0.2.7
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csg ==0.1.0.5
   - csp ==1.4.0
-  - css-syntax ==0.0.8
+  - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
   - csv ==0.1.2
   - ctrie ==0.2
   - cubicbezier ==0.6.0.5
   - cubicspline ==0.1.2
-  - cue-sheet ==1.0.1
+  - cublas ==0.5.0.0
+  - cuckoo-filter ==0.2.0.2
+  - cuda ==0.10.0.0
+  - cue-sheet ==2.0.0
+  - cufft ==0.9.0.1
   - curl ==1.3.8
-  - curl-runnings ==0.6.0
   - currencies ==0.2.0.0
   - currency ==0.2.0.0
+  - cusparse ==0.2.0.0
   - cutter ==0.0
-  - cyclotomic ==0.5.1
   - czipwith ==1.0.1.1
-  - darcs ==2.14.1
   - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
   - data-accessor-template ==0.2.1.16
@@ -526,7 +530,6 @@ default-package-overrides:
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
   - data-checked ==0.3
-  - data-clist ==0.1.2.1
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
   - data-default-instances-containers ==0.0.1
@@ -539,7 +542,6 @@ default-package-overrides:
   - data-endian ==0.1.1
   - data-fix ==0.2.0
   - data-has ==0.3.0.0
-  - data-hash ==0.2.0.1
   - data-inttrie ==0.1.4
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
@@ -550,119 +552,105 @@ default-package-overrides:
   - data-ref ==0.0.1.2
   - data-reify ==0.6.1
   - data-serializer ==0.3.4
-  - datasets ==0.2.5
   - data-textual ==0.3.0.2
   - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.3
-  - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
-  - dbus ==1.0.1
+  - DBFunctor ==0.1.0.0
+  - dbus ==1.2.1
   - debian-build ==0.10.1.2
   - debug ==0.1.1
   - debug-trace-var ==0.2.0
+  - decidable ==0.1.4.0
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
+  - deferred-folds ==0.9.10
   - dejafu ==1.11.0.4
+  - dense-linear-algebra ==0.1.0.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
-  - deque ==0.2.1
+  - deque ==0.2.7
+  - deriveJsonNoPrefix ==0.1.0.1
   - deriving-compat ==0.5.2
   - derulo ==1.0.5
   - detour-via-sci ==1.0.0
-  - df1 ==0.1.1
-  - dhall ==1.15.1
-  - dhall-bash ==1.0.15
-  - dhall-json ==1.2.3
+  - dhall ==1.19.1
+  - dhall-bash ==1.0.17
+  - dhall-json ==1.2.5
   - dhall-text ==1.0.14
-  - di ==1.0.1
   - diagrams ==1.4
-  - diagrams-builder ==0.8.0.3
-  - diagrams-cairo ==1.4.1
-  - diagrams-canvas ==1.4.1
   - diagrams-contrib ==1.4.3
   - diagrams-core ==1.4.1.1
-  - diagrams-gtk ==1.4
-  - diagrams-html5 ==1.4.1
   - diagrams-lib ==1.4.2.3
-  - diagrams-postscript ==1.4.1
   - diagrams-rasterific ==1.4.1.1
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.2
   - di-core ==1.0.3
   - dictionary-sharing ==0.1.0.0
-  - di-df1 ==1.0.2
   - Diff ==0.3.4
   - digest ==0.0.1.2
   - digits ==0.3.1
-  - di-handle ==1.0
-  - dimensional ==1.1
-  - di-monad ==1.0.2
+  - di-monad ==1.3
   - directory-tree ==0.12.1
   - direct-sqlite ==2.3.23
   - discount ==0.1.1
-  - discrimination ==0.3
   - disk-free-space ==0.1.0.1
   - distributed-closure ==0.4.1
-  - distributed-static ==0.3.8
-  - distributive ==0.5.3
+  - distribution-opensuse ==1.1.1
+  - distributive ==0.6
   - dlist ==0.8.0.5
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.4
-  - docker ==0.6.0.0
-  - dockerfile ==0.1.0.1
+  - dockerfile ==0.2.0
   - docopt ==0.7.0.5
   - doctemplates ==0.2.2.1
   - doctest ==0.16.0.1
-  - doctest-discover ==0.1.0.9
-  - doctest-driver-gen ==0.2.0.4
+  - doctest-discover ==0.2.0.0
+  - doctest-driver-gen ==0.3.0.0
   - do-list ==1.0.1
   - dom-parser ==3.1.0
-  - dotenv ==0.5.2.5
+  - dotenv ==0.8.0.0
+  - dotgen ==0.4.2
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
-  - drawille ==0.1.2.0
-  - DRBG ==0.5.5
-  - drifter ==0.2.3
-  - drifter-postgresql ==0.2.1
+  - drinkery ==0.4
   - dsp ==0.2.4.1
   - dual-tree ==0.2.2
   - dublincore-xml-conduit ==0.1.0.2
-  - dunai ==0.4.0.0
+  - dunai ==0.5.1
+  - dunai-core ==0.5.1.0
+  - duration ==0.1.0.0
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3.1
   - dyre ==0.8.12
-  - Earley ==0.12.1.0
+  - Earley ==0.13.0.0
   - easy-file ==0.2.2
   - easytest ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
-  - EdisonAPI ==1.3.1
-  - EdisonCore ==1.3.2.1
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
   - either ==5.0.1
-  - either-unwrap ==1.1
-  - ekg ==0.4.0.15
+  - either-both ==0.1.0.0
   - ekg-core ==0.1.1.6
-  - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.4.0
-  - ekg-wai ==0.1.0.3
   - elerea ==2.9.0
   - elf ==0.29
-  - eliminators ==0.4.1
+  - eliminators ==0.5
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
+  - emacs-module ==0.1.1
   - email-validate ==2.3.2.9
+  - emd ==0.1.4.0
   - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.4
-  - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
   - enum-subset-generate ==0.1.0.0
   - envelope ==0.2.2.0
@@ -670,60 +658,51 @@ default-package-overrides:
   - epub-metadata ==4.5
   - eq ==4.2
   - equal-files ==0.0.5.3
-  - equivalence ==0.3.3
   - erf ==2.0.0.0
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - error-util ==0.0.1.2
   - ersatz ==0.4.4
   - etc ==0.4.1.0
-  - event ==0.1.4
   - eventful-core ==0.2.0
   - eventful-memory ==0.2.0
   - eventful-sql-common ==0.2.0
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.1.6
+  - eventstore ==1.2.0
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
-  - exact-pi ==0.4.1.4
+  - exact-pi ==0.5.0.1
   - exceptional ==0.3.0.0
-  - exception-hierarchy ==0.1.0.1
   - exception-mtl ==0.4.0.1
   - exceptions ==0.10.0
   - exception-transformers ==0.4.0.7
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
-  - exinst ==0.6
+  - exit-codes ==1.0.0
   - exomizer ==1.0.0
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
-  - exp-pairs ==0.1.6.0
-  - extensible ==0.4.9
+  - exp-pairs ==0.2.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.14
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
-  - facts ==0.0.1.0
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.11
+  - fast-logger ==2.4.12
   - fast-math ==1.0.2
-  - fay ==0.24.0.1
-  - fay-base ==0.21.1.0
-  - fay-dom ==0.5.0.1
   - fb ==1.2.1
   - fclabels ==2.0.3.3
   - feature-flags ==0.1.0.1
-  - fedora-haskell-tools ==0.5.1
+  - fedora-haskell-tools ==0.6
   - feed ==1.0.1.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
-  - fgl ==5.6.0.0
   - filecache ==0.4.1
-  - file-embed ==0.0.10.1
+  - file-embed ==0.0.11
   - file-embed-lzma ==0
   - filelock ==0.1.1.2
   - filemanip ==0.3.6.3
@@ -731,16 +710,16 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - Fin ==0.2.6.1
   - fin ==0.0.1
   - FindBin ==0.0.5
-  - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.2
   - finite-typelits ==0.1.4.2
+  - first-class-families ==0.3.0.1
   - first-class-patterns ==0.3.2.4
+  - fitspec ==0.4.7
   - fixed ==0.2.1.1
   - fixed-length ==0.2
-  - fixed-vector ==1.1.0.0
+  - fixed-vector ==1.2.0.0
   - fixed-vector-hetero ==0.5.0.0
   - flac ==0.1.2
   - flac-picture ==0.1.1
@@ -751,8 +730,9 @@ default-package-overrides:
   - floatshow ==0.2.4
   - flow ==1.0.17
   - fmlist ==0.9.2
+  - fmt ==0.6.1.1
   - fn ==0.3.0.2
-  - focus ==0.1.5.2
+  - focus ==1.0.1.2
   - focuslist ==0.1.0.1
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.8
@@ -762,78 +742,76 @@ default-package-overrides:
   - FontyFruity ==0.5.3.4
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
-  - ForestStructures ==0.0.0.2
   - forkable-monad ==0.2.0.3
   - forma ==1.1.0
   - format-numbers ==0.1.0.0
   - formatting ==6.3.6
   - foundation ==0.0.21
-  - free ==5.0.2
+  - free ==5.1
   - freenect ==1.2.1
-  - freer-simple ==1.1.0.0
+  - freer-simple ==1.2.1.0
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
-  - friday ==0.2.3.1
-  - friday-juicypixels ==0.1.2.4
   - friendly-time ==0.4.1
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.3.0.1
   - fsnotify-conduit ==0.1.1.1
+  - ftp-client ==0.5.1.1
+  - ftp-client-conduit ==0.5.0.4
   - funcmp ==1.9
   - functor-classes-compat ==1
+  - fused-effects ==0.1.2.1
   - fuzzcheck ==0.1.1
   - fuzzy-dates ==0.1.1.1
-  - fuzzyset ==0.1.0.6
+  - fuzzyset ==0.1.0.8
   - gauge ==0.2.4
   - gc ==0.0.2
   - gd ==3000.7.3
-  - gdax ==0.6.0.0
   - gdp ==0.0.0.2
   - general-games ==1.1.1
-  - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
+  - generic-data ==0.3.0.0
   - generic-deriving ==1.12.2
-  - generic-lens ==1.0.0.2
+  - generic-lens ==1.1.0.0
   - GenericPretty ==1.2.2
   - generic-random ==1.2.0.0
   - generics-eot ==0.4
-  - generics-sop ==0.3.2.0
+  - generics-mrsop ==1.2.2
+  - generics-sop ==0.4.0.1
   - generics-sop-lens ==0.1.2.1
-  - generic-xmlpickler ==0.1.0.5
-  - geniplate-mirror ==0.7.6
-  - genvalidity ==0.5.1.0
+  - genvalidity ==0.7.0.0
   - genvalidity-aeson ==0.2.0.2
-  - genvalidity-bytestring ==0.2.0.2
-  - 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-bytestring ==0.3.0.1
+  - genvalidity-containers ==0.5.1.1
+  - genvalidity-hspec ==0.6.2.1
+  - genvalidity-hspec-aeson ==0.3.0.1
+  - genvalidity-hspec-binary ==0.2.0.3
+  - genvalidity-hspec-cereal ==0.2.0.3
+  - genvalidity-hspec-hashable ==0.2.0.3
+  - genvalidity-hspec-optics ==0.1.1.1
   - genvalidity-path ==0.3.0.2
-  - genvalidity-property ==0.2.1.1
+  - genvalidity-property ==0.3.0.0
   - genvalidity-scientific ==0.2.1.0
   - genvalidity-text ==0.5.1.0
   - genvalidity-time ==0.2.1.1
-  - genvalidity-unordered-containers ==0.2.0.3
+  - genvalidity-unordered-containers ==0.2.0.4
   - genvalidity-uuid ==0.1.0.2
   - genvalidity-vector ==0.2.0.3
-  - geodetics ==0.0.6
+  - geojson ==3.0.4
   - getopt-generics ==0.13.0.3
   - ghc-core ==0.5.6
-  - ghc-exactprint ==0.5.6.1
+  - ghc-exactprint ==0.5.8.2
   - ghcid ==0.7.1
-  - ghcjs-base-stub ==0.2.0.0
+  - ghci-hexcalc ==0.1.0.1
   - ghcjs-codemirror ==0.0.0.2
-  - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.4
+  - ghc-prof ==1.4.1.5
   - ghc-syntax-highlighter ==0.0.3.0
   - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.2.6
-  - ghc-typelits-knownnat ==0.5.1
+  - ghc-typelits-extra ==0.3
+  - ghc-typelits-knownnat ==0.6
   - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
@@ -847,35 +825,35 @@ default-package-overrides:
   - gi-gtk-hs ==0.3.6.3
   - gi-gtksource ==3.0.16
   - gi-javascriptcore ==4.0.16
-  - gio ==0.13.5.0
+  - gingersnap ==0.3.1.0
   - gi-pango ==1.0.16
   - giphy-api ==0.6.0.1
-  - github ==0.19
+  - githash ==0.1.3.0
   - github-release ==1.2.3
   - github-types ==0.2.1
   - github-webhooks ==0.10.0
   - gitrev ==1.3.1
-  - git-vogue ==0.3.0.2
   - gi-vte ==2.91.19
   - gl ==0.8.0
-  - glabrous ==0.3.6
+  - glabrous ==1.0.0
   - glaze ==0.3.0.1
   - glazier ==1.0.0.0
   - GLFW-b ==3.2.1.0
-  - glib ==0.13.6.0
   - Glob ==0.9.3
-  - gloss ==1.12.0.0
-  - gloss-raster ==1.12.0.0
-  - gloss-rendering ==1.12.0.0
+  - gloss ==1.13.0.1
+  - gloss-algorithms ==1.13.0.1
+  - gloss-examples ==1.13.0.2
+  - gloss-raster ==1.13.0.2
+  - gloss-rendering ==1.13.0.2
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.14
   - gnuplot ==0.5.5.3
   - goggles ==0.3.2
+  - google-isbn ==1.0.3
   - google-oauth2-jwt ==0.3.1
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
-  - graphviz ==2999.20.0.2
   - graph-wrapper ==0.2.5.2
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
@@ -883,35 +861,26 @@ default-package-overrides:
   - greskell-core ==0.1.2.4
   - greskell-websocket ==0.1.1.2
   - groom ==0.1.2.1
-  - groundhog ==0.9.0
-  - groundhog-inspector ==0.9.0
-  - groundhog-mysql ==0.9.0
-  - groundhog-postgresql ==0.9.0.1
-  - groundhog-sqlite ==0.9.0
-  - groundhog-th ==0.9.0.1
+  - groundhog ==0.10.0
+  - groundhog-mysql ==0.10
+  - groundhog-postgresql ==0.10
+  - groundhog-sqlite ==0.10.0
   - groups ==0.4.1.0
-  - gtk ==0.14.10
-  - gtk2hs-buildtools ==0.13.4.0
-  - gtk3 ==0.14.9
   - gym-http-api ==0.1.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0.1
   - hackage-security ==0.5.3.0
-  - haddock-library ==1.5.0.1
+  - haddock-library ==1.7.0
   - hailgun ==0.4.1.8
-  - 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.7.0
-  - happstack-server ==7.5.1.1
+  - hapistrano ==0.3.8.0
   - happy ==1.19.9
-  - hasbolt ==0.1.3.2
   - hashable ==1.2.7.0
+  - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
-  - hashing ==0.1.0.1
   - hashmap ==1.3.3
   - hashtables ==1.2.3.1
   - haskeline ==0.7.4.3
@@ -919,34 +888,22 @@ default-package-overrides:
   - haskell-gi-base ==0.21.4
   - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.0.2
-  - haskell-lsp ==0.2.2.0
-  - haskell-lsp-types ==0.2.2.0
+  - haskell-lsp ==0.8.0.1
+  - haskell-lsp-types ==0.8.0.1
+  - haskell-names ==0.9.4
   - 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.3
-  - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.4
   - haskell-src-meta ==0.8.0.3
-  - haskell-tools-ast ==1.1.0.2
-  - haskell-tools-backend-ghc ==1.1.0.2
-  - haskell-tools-builtin-refactorings ==1.1.0.2
-  - haskell-tools-debug ==1.1.0.2
-  - haskell-tools-demo ==1.1.0.2
-  - haskell-tools-prettyprint ==1.1.0.2
-  - haskell-tools-refactor ==1.1.0.2
-  - haskell-tools-rewrite ==1.1.0.2
-  - haskey ==0.3.0.2
   - haskey-btree ==0.3.0.0
-  - haskey-mtl ==0.3.1.0
-  - haskintex ==0.8.0.0
+  - haskoin-core ==0.8.4
   - hasql ==1.3.0.3
   - hasql-optparse-applicative ==0.3.0.3
   - hasql-pool ==0.5
   - hasql-transaction ==0.7
   - hasty-hamiltonian ==1.3.2
-  - HaTeX ==3.19.0.0
   - haxl ==2.0.1.1
   - hbeanstalk ==0.2.4
   - HCodecs ==0.5.1
@@ -957,61 +914,58 @@ default-package-overrides:
   - heap ==1.0.4
   - heaps ==0.3.6
   - hebrew-time ==0.1.1
-  - hedgehog ==0.6.1
   - hedgehog-corpus ==0.1.0
   - hedis ==0.10.10
   - here ==1.2.13
   - heredoc ==0.2.0.0
-  - heterocephalus ==1.0.5.2
   - hex ==0.1.2
   - hexml ==0.3.4
   - hexml-lens ==0.2.1
   - hexpat ==0.20.13
   - hexstring ==0.11.1
+  - hformat ==0.3.3.1
   - hfsevents ==0.1.6
   - hgmp ==0.1.1
   - hidapi ==0.1.5
   - hidden-char ==0.1.0.2
-  - hierarchical-clustering ==0.4.6
-  - hierarchy ==1.0.2
   - higher-leveldb ==0.5.0.2
   - highlighting-kate ==0.6.4
-  - hinotify ==0.3.10
-  - hint ==0.8.0
-  - histogram-fill ==0.9.1.0
+  - hinfo ==0.0.3.0
+  - hinotify ==0.4
+  - hint ==0.9.0
   - hjsmin ==0.2.0.2
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.8.0
   - hmatrix ==0.19.0.0
-  - hmatrix-backprop ==0.1.2.3
+  - hmatrix-backprop ==0.1.2.5
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.7
   - hmatrix-morpheus ==0.1.1.2
-  - hmatrix-special ==0.19.0.0
   - hmatrix-vector-sized ==0.1.1.2
   - hmpfr ==0.4.4
+  - hoauth2 ==1.8.3
   - Hoed ==0.5.1
-  - hoopl ==3.10.2.2
   - hOpenPGP ==2.7.4.1
-  - hopenpgp-tools ==0.21.2
   - hopfli ==0.2.2.1
+  - hosc ==0.17
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.12
   - hourglass-orphans ==0.1.0.0
-  - hp2pretty ==0.8.0.2
-  - hpack ==0.28.2
-  - HPDF ==1.4.10
-  - hpqtypes ==1.5.3.0
-  - hprotoc ==2.4.11
-  - hquantlib ==0.0.5.0
-  - hquantlib-time ==0.0.4.1
+  - hp2pretty ==0.9
+  - hpack ==0.31.1
+  - hpack-dhall ==0.5.1
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
   - hruby ==0.3.6
-  - hsass ==0.7.0
-  - hs-bibutils ==6.6.0.0
+  - hsass ==0.8.0
+  - hs-bibutils ==6.7.0.0
+  - hschema ==0.0.1.1
+  - hschema-aeson ==0.0.1.1
+  - hschema-prettyprinter ==0.0.1.1
+  - hschema-quickcheck ==0.0.1.1
   - hscolour ==1.24.4
+  - hsdev ==0.3.2.3
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
@@ -1021,37 +975,39 @@ default-package-overrides:
   - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
-  - hsinstall ==1.6
+  - hsinstall ==2.2
   - HSlippyMap ==3.0.1
   - hslogger ==1.2.12
-  - hslua ==0.9.5.2
-  - hslua-aeson ==0.3.0.2
-  - hslua-module-text ==0.1.2.1
+  - hslua ==1.0.1
+  - hslua-aeson ==1.0.0
+  - hslua-module-text ==0.2.0
   - HsOpenSSL ==0.11.4.15
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.5.5
+  - hspec ==2.6.0
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
-  - hspec-contrib ==0.5.0
-  - hspec-core ==2.5.5
-  - hspec-discover ==2.5.5
+  - hspec-contrib ==0.5.1
+  - hspec-core ==2.6.0
+  - hspec-discover ==2.6.0
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.7.0.0
-  - hspec-megaparsec ==1.0.0
-  - hspec-meta ==2.4.6
+  - hspec-leancheck ==0.0.3
+  - hspec-megaparsec ==2.0.0
+  - hspec-meta ==2.6.0
+  - hspec-need-env ==0.1.0.2
   - hspec-pg-transact ==0.1.0.2
   - hspec-smallcheck ==0.5.2
   - hspec-wai ==0.9.0
   - hspec-wai-json ==0.9.0
+  - hs-php-session ==0.0.9.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
-  - hsx-jmacro ==7.3.8.1
+  - HsYAML ==0.1.1.2
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.4
   - htaglib ==1.2.0
   - HTF ==0.13.2.5
   - html ==1.0.1.2
@@ -1062,12 +1018,11 @@ default-package-overrides:
   - htoml ==1.0.0.3
   - HTTP ==4000.3.12
   - http2 ==1.6.4
-  - http-api-data ==0.3.8.1
+  - http-api-data ==0.4
   - http-client ==0.5.14
-  - http-client-openssl ==0.2.2.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
-  - http-conduit ==2.3.2
+  - http-conduit ==2.3.4
   - http-date ==0.0.8
   - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3.1
@@ -1084,31 +1039,30 @@ default-package-overrides:
   - hw-balancedparens ==0.2.0.2
   - hw-bits ==0.7.0.5
   - hw-conduit ==0.2.0.5
+  - hw-conduit-merges ==0.2.0.0
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
+  - hw-eliasfano ==0.1.0.1
   - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
-  - hw-hedgehog ==0.1.0.2
-  - hw-hspec-hedgehog ==0.1.0.5
   - hw-int ==0.0.0.3
-  - hw-ip ==0.1.0.0
-  - hw-json ==0.6.0.0
+  - hw-ip ==2.0.0.0
+  - hw-json ==0.9.0.1
   - hw-mquery ==0.1.0.1
-  - hworker ==0.1.0.1
-  - hw-parser ==0.0.0.3
+  - hw-packed-vector ==0.0.0.1
+  - hw-parser ==0.1.0.0
   - hw-prim ==0.6.2.22
-  - hw-rankselect ==0.10.0.3
+  - hw-rankselect ==0.12.0.4
   - hw-rankselect-base ==0.3.2.1
+  - hw-streams ==0.0.0.8
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
-  - hw-xml ==0.1.0.3
   - hxt ==9.3.1.16
   - hxt-charproperties ==9.2.0.1
   - hxt-css ==0.1.0.3
   - hxt-curl ==9.1.1.1
   - hxt-expat ==9.1.1
   - hxt-http ==9.1.5.2
-  - hxt-pickle-utils ==0.1.0.3
   - hxt-regex-xmlschema ==9.2.0.3
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
@@ -1121,8 +1075,6 @@ default-package-overrides:
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - iff ==0.0.6
-  - ihaskell ==0.9.1.0
-  - ihaskell-hvega ==0.1.0.3
   - ihs ==0.1.0.3
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
@@ -1134,14 +1086,15 @@ default-package-overrides:
   - indentation-parsec ==0.0.0.2
   - indents ==0.5.0.0
   - indexed-list-literals ==0.2.1.2
-  - inflections ==0.4.0.3
+  - infer-license ==0.2.0
+  - inflections ==0.4.0.4
   - influxdb ==1.6.1
   - ini ==0.3.6
-  - inline-c ==0.6.1.0
-  - inline-java ==0.8.4
+  - inline-c ==0.7.0.1
+  - inline-c-cpp ==0.3.0.1
   - inliterate ==0.1.0
   - insert-ordered-containers ==0.2.1.0
-  - inspection-testing ==0.2.0.1
+  - inspection-testing ==0.4.1.1
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.2.2
   - integration ==0.2.1
@@ -1149,12 +1102,13 @@ default-package-overrides:
   - interpolate ==0.2.0
   - interpolatedstring-perl6 ==1.0.1
   - interpolation ==0.1.0.3
+  - interpolator ==0.1.1
   - IntervalMap ==0.6.1.0
   - intervals ==0.8.1
-  - intro ==0.3.2.0
+  - intro ==0.5.2.1
+  - intset-imperative ==0.1.0.0
   - invariant ==0.5.1
   - invertible ==0.2.0.5
-  - invertible-grammar ==0.1.1
   - io-choice ==0.0.7
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1163,17 +1117,15 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.0.1
   - io-streams-haproxy ==1.0.0.2
-  - ip ==1.3.0
+  - ip ==1.4.1
   - ip6addr ==1.0.0
   - iproute ==1.7.7
   - IPv6Addr ==1.1.1
-  - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
   - irc-client ==1.1.0.5
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
-  - irc-dcc ==2.0.1
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
@@ -1182,36 +1134,32 @@ default-package-overrides:
   - ixset-typed ==0.4.0.1
   - ix-shapable ==0.1.0
   - jack ==0.7.1.4
-  - jmacro ==0.6.15
-  - jmacro-rpc ==0.3.3
-  - jmacro-rpc-snap ==0.3
-  - jni ==0.6.1
-  - jose ==0.7.0.0
-  - jose-jwt ==0.7.8
+  - jose ==0.8.0.0
+  - jose-jwt ==0.8.0
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
-  - json ==0.9.2
+  - json ==0.9.3
+  - json-alt ==1.0.0
   - json-feed ==1.0.5
+  - json-rpc ==1.0.0
   - json-rpc-client ==0.2.5.0
   - 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
-  - JuicyPixels-blp ==0.1.1.0
-  - JuicyPixels-extra ==0.3.0
+  - JuicyPixels ==3.3.3
+  - JuicyPixels-extra ==0.4.0
   - JuicyPixels-scale-dct ==0.1.2
   - justified-containers ==0.3.0.0
-  - jvm ==0.4.2
-  - jvm-batching ==0.1.1
-  - jvm-streaming ==0.3.1
-  - jwt ==0.7.2
   - kan-extensions ==5.2
   - kanji ==3.4.0
-  - kansas-comet ==0.4
+  - katip ==0.7.0.0
   - kawhi ==0.3.0
+  - kazura-queue ==0.1.0.4
   - kdt ==0.2.4
   - keycode ==0.2.2
   - keys ==3.12.1
+  - kind-apply ==0.3.0.0
+  - kind-generics ==0.3.0.0
+  - kind-generics-th ==0.1.0.0
   - kleene ==0
   - kmeans ==0.1.3
   - koofr-client ==1.0.0.3
@@ -1219,66 +1167,64 @@ default-package-overrides:
   - l10n ==0.1.0.1
   - labels ==0.3.3
   - lackey ==1.0.7
-  - LambdaHack ==0.8.3.0
   - lame ==0.1.1
   - language-c ==0.8.2
   - language-c-quote ==0.12.2
-  - language-docker ==6.0.4
+  - language-docker ==8.0.0
   - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.20.1
-  - lapack-carray ==0.0.2
+  - language-puppet ==1.4.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.1
-  - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - 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.7
+  - leancheck ==0.8.0
+  - leancheck-instances ==0.0.1
   - leapseconds-announced ==2017.1.0.1
-  - learn-physics ==0.6.3
-  - lens ==4.16.1
+  - lens ==4.17
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
   - lens-datetime ==0.3
   - 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-labels ==0.3.0.1
   - lens-misc ==0.0.2.0
   - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
+  - lens-typelevel ==0.1.1.0
   - lenz ==0.3.0.0
   - leveldb-haskell ==0.6.5
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
   - libmpd ==0.9.0.9
-  - libxml-sax ==0.7.5
+  - libraft ==0.1.1.0
+  - libyaml ==0.1.0.0
   - LibZip ==1.0.1
   - lifted-async ==0.10.0.3
   - lifted-base ==0.2.3.12
   - lift-generics ==0.1.2
   - line ==4.0.1
   - linear ==1.20.8
-  - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.3.0
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
-  - list-t ==1.0.1
-  - llvm-hs ==6.3.0
-  - llvm-hs-pretty ==0.5.0.0
-  - llvm-hs-pure ==6.2.1
+  - list-t ==1.0.2
+  - ListTree ==0.2.3
+  - llvm-hs-pure ==7.0.0
   - lmdb ==0.2.5
   - load-env ==0.2.0.2
+  - loc ==0.1.3.4
   - locators ==0.2.4.4
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.3.1
@@ -1290,38 +1236,35 @@ default-package-overrides:
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
-  - log-postgres ==0.7.0.2
   - long-double ==0.1
   - loop ==0.3.0
-  - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
+  - lsp-test ==0.5.0.2
   - lucid ==2.9.11
   - lucid-extras ==0.1.0.1
   - lxd-client-config ==0.1.0.1
-  - lz4 ==0.2.3.1
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
   - machines ==0.6.4
   - machines-binary ==0.3.0.3
   - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
-  - magicbane ==0.3.0
   - mainland-pretty ==0.7
-  - main-tester ==0.1.0.0
+  - main-tester ==0.2.0.0
   - makefile ==1.1.0.0
   - managed ==1.0.6
   - mapquest-api ==0.3.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.5.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
-  - math-functions ==0.2.1.0
+  - math-functions ==0.3.1.0
   - matrices ==0.4.5
   - matrix ==0.3.6.1
   - matrix-market-attoparsec ==0.1.0.8
+  - matrix-static ==0.2
   - maximal-cliques ==0.1.1
   - mbox ==0.3.4
   - mbox-utility ==0.0.1
@@ -1329,66 +1272,62 @@ default-package-overrides:
   - mbug ==1.3
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
-  - med-module ==0.1.1
-  - megaparsec ==6.5.0
+  - megaparsec ==7.0.4
   - mega-sdist ==0.3.3.2
   - memory ==0.14.18
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
+  - merkle-tree ==0.1.1
   - mersenne-random-pure64 ==0.2.2.0
-  - messagepack ==0.5.4
-  - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.9
-  - microlens ==0.4.9.1
+  - microlens ==0.4.10
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.2
-  - microlens-ghc ==0.4.9.1
+  - microlens-ghc ==0.4.10
   - microlens-mtl ==0.1.11.1
-  - microlens-platform ==0.3.10
+  - microlens-platform ==0.3.11
   - microlens-th ==0.4.2.3
-  - microspec ==0.1.0.0
+  - microspec ==0.2.1.3
   - microstache ==1.0.1.1
+  - midair ==0.2.0.1
   - midi ==0.2.2.2
   - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.3
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.8
-  - minimorph ==0.1.6.1
+  - minimorph ==0.2.1.0
   - minio-hs ==1.2.0
-  - minisat-solver ==0.1
-  - miniutter ==0.4.7.0
+  - miniutter ==0.5.0.0
   - mintty ==0.1.2
   - miso ==0.21.2.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.1.0
   - mixed-types-num ==0.3.1.5
+  - mixpanel-client ==0.1.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
-  - mmark ==0.0.5.6
-  - mmark-cli ==0.0.3.0
+  - mmark ==0.0.6.0
+  - mmark-cli ==0.0.5.0
   - mmark-ext ==0.2.1.1
   - mmorph ==1.1.2
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
-  - modern-uri ==0.2.2.0
-  - moesocks ==1.0.0.44
+  - modern-uri ==0.3.0.1
+  - modular ==0.1.0.8
   - monad-control ==1.0.2.3
   - monad-control-aligned ==0.0.1.1
   - monad-coroutine ==0.9.0.4
   - monad-extras ==0.6.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
-  - monadlist ==0.0.2
   - monad-logger ==0.3.30
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.10
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
-  - monad-memo ==0.4.1
-  - monad-metrics ==0.2.1.2
+  - monad-memo ==0.5.1
   - monad-par ==0.3.4.8
   - monad-parallel ==0.7.2.3
   - monad-par-extras ==0.3.3
@@ -1396,7 +1335,6 @@ default-package-overrides:
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1.1
-  - monad-recorder ==0.1.1
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
@@ -1404,36 +1342,35 @@ default-package-overrides:
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
   - mongoDB ==2.4.0.0
-  - monoidal-containers ==0.3.1.0
+  - monoidal-containers ==0.4.0.0
   - monoid-extras ==0.5
   - monoid-subclasses ==0.4.6.1
   - monoid-transformer ==0.0.4
-  - mono-traversable ==1.0.9.0
+  - mono-traversable ==1.0.10.0
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.20
   - mountpoints ==1.0.2
-  - mstate ==0.2.7
   - mtl ==2.2.2
   - mtl-compat ==0.2.1.3
   - mtl-prelude ==2.0.3.1
   - multiarg ==0.30.0.10
   - multimap ==1.2.1
   - multipart ==0.1.3
-  - multistate ==0.8.0.1
+  - multiset ==0.3.4.1
+  - murmur3 ==1.0.3
   - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.4.1
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
   - mwc-probability ==2.0.4
   - mwc-probability-transition ==0.4
-  - mwc-random ==0.13.6.0
+  - mwc-random ==0.14.0.0
   - mysql ==0.1.6
-  - mysql-haskell ==0.8.3.0
+  - mysql-haskell ==0.8.4.1
   - mysql-haskell-nem ==0.1.0.0
-  - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.5
+  - n2o ==0.11.1
   - nagios-check ==0.3.2
-  - named ==0.1.0.0
+  - named ==0.2.0.0
   - names-th ==0.3.0.0
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
@@ -1442,15 +1379,14 @@ default-package-overrides:
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.3.2.2
-  - netlib-carray ==0.0.1.1
+  - neat-interpolation ==0.3.2.4
   - netlib-ffi ==0.1
   - netpbm ==1.0.2
   - nettle ==0.3.0
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
-  - network ==2.6.3.6
+  - network ==2.8.0.0
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
@@ -1459,18 +1395,15 @@ default-package-overrides:
   - network-house ==0.1.0.2
   - network-info ==0.2.0.10
   - network-ip ==0.3.0.2
+  - network-messagepack-rpc ==0.1.1.0
   - network-multicast ==0.2.0
-  - Network-NineP ==0.4.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
-  - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
   - newtype-generics ==0.5.3
-  - next-ref ==0.1.0.2
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
@@ -1478,38 +1411,35 @@ default-package-overrides:
   - nonce ==1.0.7
   - nondeterminism ==1.4
   - non-empty ==0.3.0.1
+  - nonempty-containers ==0.1.1.0
+  - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
-  - not-gloss ==0.7.7.0
+  - nowdoc ==0.1.1.0
+  - nqe ==0.6.1
   - nsis ==0.3.2
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3.1
-  - numhask ==0.2.3.1
-  - numhask-prelude ==0.1.0.1
-  - numhask-range ==0.2.3.1
-  - numhask-test ==0.1.0.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.2
-  - nvim-hs ==1.0.0.3
-  - nvim-hs-contrib ==1.0.0.0
+  - nuxeo ==0.3.2
+  - nvvm ==0.9.0.0
   - oauthenticated ==0.2.1.0
-  - objective ==1.1.2
   - ObjectName ==1.1.0.1
-  - o-clock ==1.0.0.1
+  - oblivious-transfer ==0.1.0
   - odbc ==0.2.2
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
-  - om-elm ==1.0.0.3
-  - once ==0.2
+  - once ==0.4
   - one-liner ==1.0
   - one-liner-instances ==0.1.2.1
   - OneTuple ==0.2.2
-  - online ==0.3.0.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
+  - opaleye ==0.6.7003.1
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
@@ -1529,31 +1459,33 @@ default-package-overrides:
   - optparse-simple ==0.1.0
   - optparse-text ==0.1.1.0
   - overhang ==1.0.0
-  - packcheck ==0.3.1
-  - packdeps ==0.4.5
+  - packcheck ==0.4.1
   - pager ==0.1.1.0
   - pagination ==0.2.1
-  - palette ==0.3.0.1
-  - pandoc ==2.2.1
-  - pandoc-citeproc ==0.14.8.1
+  - pairing ==0.1.4
+  - pandoc ==2.5
+  - pandoc-citeproc ==0.15.0.1
+  - pandoc-pyplot ==1.0.3.0
   - pandoc-types ==1.17.5.4
-  - pango ==0.13.5.0
-  - papillon ==0.1.0.6
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
+  - paripari ==0.6.0.0
   - parseargs ==0.2.0.8
   - parsec ==3.1.13.0
+  - parsec-class ==1.0.0.0
+  - parsec-numbers ==0.1.0
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
   - parser-combinators ==1.0.0
   - parsers ==0.12.9
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.2.1
-  - partial-order ==0.1.2.1
+  - partial-semigroup ==0.5.0.0
   - path ==0.6.1
   - path-extra ==0.2.0
-  - path-io ==1.3.3
+  - path-io ==1.4.1
   - path-pieces ==0.2.1
+  - path-text-utf8 ==0.0.1.2
   - pathtype ==0.8.1
   - pathwalk ==0.3.1.2
   - pattern-arrows ==0.0.2
@@ -1565,25 +1497,24 @@ default-package-overrides:
   - pcre-utils ==0.1.8.1.1
   - pdfinfo ==1.5.4
   - peano ==0.1.0.1
+  - pedersen-commitment ==0.2.0
   - pem ==0.2.4
-  - perf ==0.4.1.0
+  - percent-format ==0.0.1
   - perfect-hash-generator ==0.2.0.6
+  - persist ==0.1.1.0
   - persistable-record ==0.6.0.4
   - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.8.2
+  - persistent ==2.9.0
   - persistent-iproute ==0.2.3
-  - persistent-mysql ==2.8.1
-  - persistent-mysql-haskell ==0.4.2
-  - persistent-postgresql ==2.8.2.0
-  - persistent-refs ==0.4
-  - persistent-sqlite ==2.8.2
+  - persistent-mysql ==2.9.0
+  - persistent-mysql-haskell ==0.5.0
+  - persistent-postgresql ==2.9.0
+  - persistent-sqlite ==2.9.1
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
-  - picosat ==0.1.5
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.11
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
@@ -1601,12 +1532,10 @@ default-package-overrides:
   - pipes-network ==0.6.5
   - pipes-network-tls ==0.3
   - pipes-parse ==3.0.8
-  - pipes-random ==1.0.0.4
-  - pipes-safe ==2.2.9
+  - pipes-safe ==2.3.1
   - pipes-wai ==3.2.0
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
-  - plot-light ==0.4.3
   - plotlyhs ==0.2.1
   - pointed ==5.0.1
   - pointedlist ==0.6.1
@@ -1614,24 +1543,22 @@ default-package-overrides:
   - poll ==0.0.0.1
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
-  - polyparse ==1.12
+  - polyparse ==1.12.1
   - pooled-io ==0.0.2.2
-  - portable-lines ==0.1
+  - port-utils ==0.2.0.0
+  - posix-paths ==0.2.1.6
   - postgresql-binary ==0.12.1.2
   - postgresql-libpq ==0.9.4.2
   - postgresql-schema ==0.1.14
-  - postgresql-simple ==0.5.4.0
-  - postgresql-simple-migration ==0.1.13.0
+  - postgresql-simple ==0.6
   - postgresql-simple-queue ==1.0.1
   - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
-  - postgresql-typed ==0.5.3.0
   - post-mess-age ==0.2.1.0
   - pptable ==0.3.0.0
   - pqueue ==1.4.1.2
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.1
-  - prelude-extras ==0.4.0.3
   - prelude-safeenum ==0.1.1.2
   - present ==4.1.0
   - prettyclass ==1.0.0.0
@@ -1642,99 +1569,101 @@ default-package-overrides:
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
-  - prettyprinter-convert-ansi-wl-pprint ==1.1
-  - pretty-show ==1.7
-  - pretty-simple ==2.1.0.1
+  - pretty-show ==1.9.4
+  - pretty-simple ==2.2.0.1
+  - pretty-sop ==0.2.0.2
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
-  - primitive ==0.6.3.0
+  - primitive ==0.6.4.0
   - prim-uniq ==0.1.0.1
   - probability ==0.2.5.2
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.10.0.0
   - profiterole ==0.1
-  - profunctors ==5.2.2
+  - profunctors ==5.3
   - projectroot ==0.2.0.1
   - project-template ==0.2.0.1
-  - prometheus-client ==0.3.0
+  - prometheus-client ==1.0.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.2
   - protobuf-simple ==0.1.1.0
-  - protocol-buffers ==2.4.11
-  - protocol-buffers-descriptor ==2.4.11
+  - protocol-buffers ==2.4.12
+  - protocol-buffers-descriptor ==2.4.12
   - 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.2
-  - proto-lens-combinators ==0.1.0.11
+  - proto-lens ==0.4.0.1
+  - proto-lens-arbitrary ==0.1.2.5
+  - proto-lens-combinators ==0.4.0.1
   - 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
+  - proto-lens-protobuf-types ==0.4.0.1
+  - proto-lens-protoc ==0.4.0.2
+  - proto-lens-runtime ==0.4.0.2
+  - proto-lens-setup ==0.4.0.1
+  - protolude ==0.2.3
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - psqueues ==0.2.7.0
-  - publicsuffix ==0.20180513
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.13.0.0
   - pure-zlib ==0.6.4
   - pushbullet-types ==0.4.1.0
+  - pusher-http-haskell ==1.5.1.6
+  - qchas ==1.1.0.1
   - qm-interpolated-string ==0.3.0.0
   - qnap-decrypt ==0.3.3
+  - quadratic-irrational ==0.0.6
   - QuasiText ==0.1.2.6
   - quickbench ==1.0
-  - QuickCheck ==2.11.3
+  - QuickCheck ==2.12.6.1
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
   - quickcheck-instances ==0.3.19
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.0.4
   - quickcheck-special ==0.1.0.6
+  - quickcheck-state-machine ==0.4.3
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.1.0
-  - quicklz ==1.5.0.11
   - rainbow ==0.30.0.2
   - rainbox ==0.20.0.0
-  - rakuten ==0.1.1.5
   - ramus ==0.1.2
+  - rando ==0.0.0.4
   - random ==1.1
   - random-bytestring ==0.1.3.1
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
+  - range ==0.2.1.1
   - range-set-list ==0.1.3
   - rank1dynamic ==0.4.0
-  - rank2classes ==1.1.0.1
-  - Rasterific ==0.7.4
+  - rank2classes ==1.2
+  - Rasterific ==0.7.4.2
   - rasterific-svg ==0.3.3.2
   - ratel ==1.0.7
   - ratel-wai ==1.0.4
-  - ratio-int ==0.1.2
-  - rattletrap ==4.1.2
+  - rattletrap ==6.0.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
   - rcu ==0.2.3
-  - rdf ==0.1.0.2
-  - rdtsc ==1.3.0.1
-  - re2 ==0.2
+  - re2 ==0.3
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - rebase ==1.2.4
+  - rebase ==1.3
   - record-dot-preprocessor ==0.1.4
-  - recursion-schemes ==5.0.3
+  - records-sop ==0.1.0.2
+  - recursion-schemes ==5.1
   - reducers ==3.12.3
   - refact ==0.3.0.2
   - references ==0.3.3.1
-  - ref-fd ==0.4.0.1
-  - refined ==0.2.3.0
+  - refined ==0.3.0.0
   - reflection ==2.1.4
   - RefSerialize ==0.4.0
-  - regex ==1.0.1.4
+  - regex ==1.0.2.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1746,41 +1675,43 @@ default-package-overrides:
   - regex-posix ==0.95.2
   - regex-tdfa ==1.2.3.1
   - regex-tdfa-text ==1.0.0.3
+  - regex-with-pcre ==1.0.2.0
+  - registry ==0.1.2.2
   - reinterpret-cast ==0.1.0
+  - relapse ==1.0.0.0
   - relational-query ==0.12.1.0
   - relational-query-HDBC ==0.7.1.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
-  - relude ==0.1.1
+  - relude ==0.4.0
   - renderable ==0.2.0.1
   - repa ==3.4.1.4
-  - repline ==0.1.7.0
-  - req ==1.1.0
+  - repa-algorithms ==3.4.1.3
+  - repa-io ==3.4.1.1
+  - repline ==0.2.0.0
+  - req ==1.2.1
   - 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.2
+  - rerebase ==1.3
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.2
-  - rest-stringmap ==0.2.0.7
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.7.7.0
   - rev-state ==0.1.2
+  - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
-  - rhine ==0.4.0.1
-  - riak ==1.1.2.5
-  - riak-protobuf ==0.23.0.0
   - rio ==0.1.6.0
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
+  - roc-id ==0.1.0.0
+  - rocksdb-haskell ==1.0.1
+  - rocksdb-query ==0.2.0
   - roles ==0.2.0.0
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
   - rounded ==0.1.0.1
   - RSA ==2.3.0
-  - rss-conduit ==0.4.2.2
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.5.0.0
@@ -1790,23 +1721,21 @@ default-package-overrides:
   - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
   - safeio ==0.0.5.0
-  - safe-money ==0.6
   - SafeSemaphore ==0.10.1
+  - salak ==0.1.4
   - saltine ==0.1.0.2
   - salve ==1.0.6
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
-  - sandi ==0.4.3
   - sandman ==0.2.0.1
   - say ==0.1.0.1
-  - sbp ==2.3.17
-  - sbv ==7.12
-  - SCalendar ==1.1.0
-  - scalendar ==1.2.0
+  - sbp ==2.4.0
+  - sbv ==7.13
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
-  - scanner ==0.2
+  - scanf ==0.1.0.0
+  - scanner ==0.3
   - scientific ==0.3.6.2
   - scotty ==0.11.2
   - scrypt ==0.5.0
@@ -1815,71 +1744,71 @@ default-package-overrides:
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.1.0
-  - search-algorithms ==0.3.0
+  - secp256k1-haskell ==0.1.4
   - securemem ==0.1.10
-  - SegmentTree ==0.3
-  - selda ==0.2.0.0
-  - selda-postgresql ==0.1.7.2
-  - selda-sqlite ==0.1.6.0
+  - selda ==0.3.4.0
+  - selda-postgresql ==0.1.7.3
+  - selda-sqlite ==0.1.6.1
   - semigroupoid-extras ==5
-  - semigroupoids ==5.2.2
+  - semigroupoids ==5.3.1
   - semigroups ==0.18.5
+  - semirings ==0.2.1.1
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
   - seqalign ==0.2.0.4
   - serf ==0.1.1.0
-  - servant ==0.14.1
+  - serialise ==0.2.1.0
+  - servant ==0.15
   - 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.1
+  - servant-auth-server ==0.4.2.0
   - servant-auth-swagger ==0.2.10.0
   - servant-blaze ==0.8
   - servant-cassava ==0.10
   - servant-checked-exceptions ==2.0.0.0
   - servant-checked-exceptions-core ==2.0.0.0
-  - servant-client ==0.14
-  - servant-client-core ==0.14.1
-  - servant-dhall ==0.1.0.1
-  - servant-docs ==0.11.2
+  - servant-client ==0.15
+  - servant-client-core ==0.15
+  - servant-docs ==0.11.3
   - servant-elm ==0.5.0.0
   - servant-exceptions ==0.1.1
-  - servant-foreign ==0.11.1
-  - servant-github-webhook ==0.4.1.0
-  - servant-js ==0.9.3.2
+  - servant-foreign ==0.15
+  - servant-js ==0.9.4
   - servant-JuicyPixels ==0.3.0.4
+  - servant-kotlin ==0.1.1.5
   - servant-lucid ==0.8.1
-  - servant-mock ==0.8.4
+  - servant-mock ==0.8.5
   - servant-pandoc ==0.5.0.0
-  - servant-ruby ==0.8.0.2
-  - servant-server ==0.14.1
+  - servant-rawm ==0.3.0.0
+  - servant-ruby ==0.9.0.0
+  - servant-server ==0.15
   - servant-static-th ==0.2.2.0
   - servant-streaming ==0.3.0.0
-  - servant-streaming-client ==0.3.0.0
-  - servant-streaming-server ==0.3.0.0
-  - servant-swagger ==1.1.6
-  - servant-swagger-ui ==0.3.0.3.13.2
-  - servant-swagger-ui-core ==0.3.1
+  - servant-swagger ==1.1.7
+  - servant-swagger-ui ==0.3.2.3.19.3
+  - servant-swagger-ui-core ==0.3.2
+  - servant-swagger-ui-redoc ==0.3.2.1.22.2
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
-  - servant-yaml ==0.1.0.0
-  - serverless-haskell ==0.6.7
+  - servant-yaml ==0.1.0.1
+  - serverless-haskell ==0.8.4
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - servius ==1.2.3.0
   - ses-html ==0.4.0.0
-  - set-cover ==0.0.9
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.8
-  - sexp-grammar ==2.0.1
   - SHA ==1.6.4.4
   - shake-language-c ==0.12.0
   - shakespeare ==2.0.20
+  - shared-memory ==0.2.0.0
   - shell-conduit ==4.7.0
   - shell-escape ==0.2.0
   - shelltestrunner ==1.9
   - shelly ==1.8.1
+  - shikensu ==0.3.11
   - shortcut-links ==0.4.2.1
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.0.0
@@ -1888,96 +1817,86 @@ default-package-overrides:
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple-cmd ==0.1.2
+  - simple-log ==0.9.10
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
-  - simplest-sqlite ==0.1.0.0
   - simple-vec3 ==0.4.0.9
   - since ==0.0.0
   - singleton-bool ==0.1.4
   - singleton-nats ==0.4.2
-  - singletons ==2.4.1
+  - singletons ==2.5.1
   - siphash ==1.0.3
   - size-based ==0.1.2.0
+  - sized-grid ==0.1.1.6
   - skein ==1.0.9.4
+  - skews ==0.1.0.1
+  - skip-var ==0.1.0.0
   - skylighting ==0.7.5
   - skylighting-core ==0.7.5
   - slack-web ==0.2.0.9
-  - slave-thread ==1.0.2
   - smallcheck ==1.1.5
   - smoothie ==0.4.2.9
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.3.2
-  - snappy ==0.2.0.2
   - snap-server ==1.1.0.0
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
-  - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.4
   - socket-activation ==0.1.0.2
   - socks ==0.5.6
+  - sop-core ==0.4.0.0
   - sort ==1.0.0.0
   - sorted-list ==0.2.1.0
   - sourcemap ==0.1.6
   - 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
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
   - Spintax ==0.3.3
   - 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
   - sqlite-simple-errors ==0.6.1.0
   - sql-words ==0.1.6.2
-  - squeal-postgresql ==0.3.2.0
   - srcloc ==0.5.1.2
-  - stache ==1.2.1
+  - stache ==2.0.1
   - starter ==0.3.0
   - state-codes ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.1.1
-  - static-canvas ==0.2.0.3
   - static-text ==0.2.0.3
-  - statistics ==0.14.0.2
+  - statistics ==0.15.0.0
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
-  - stm ==2.4.5.1
+  - stm ==2.5.0.0
   - stm-chans ==3.0.0.4
   - 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.1
-  - stm-stats ==0.2.0.0
   - stopwatch ==0.1.0.5
   - storable-complex ==0.2.3.0
-  - storable-endian ==0.2.6
   - storable-record ==0.0.4
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
   - store ==0.5.0.1
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.24.4
+  - stratosphere ==0.29.0
   - streaming ==0.2.2.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
   - streaming-commons ==0.2.1.0
   - streaming-wai ==0.1.1
-  - streamly ==0.3.0
+  - streamly ==0.5.2
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1993,26 +1912,29 @@ default-package-overrides:
   - string-transform ==1.1.0
   - strive ==5.0.7
   - structs ==0.1.1
-  - stylish-haskell ==0.9.2.0
+  - summoner ==1.2.0
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
+  - sv-cassava ==0.3
+  - sv-core ==0.3
   - svg-builder ==0.1.1
   - SVGFonts ==1.7
   - svg-tree ==0.6.2.3
   - swagger ==0.3.0
-  - swagger2 ==2.2.2
-  - swish ==0.9.2.1
+  - swagger2 ==2.3.1
+  - swish ==0.10.0.1
   - syb ==0.7
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
+  - systemd ==1.1.2
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - tabular ==0.2.2.7
   - tagchup ==0.4.1.1
-  - tagged ==0.8.5
+  - tagged ==0.8.6
   - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
   - tagged-transformer ==0.8.1
@@ -2022,37 +1944,40 @@ default-package-overrides:
   - tao ==1.0.0
   - tao-example ==1.0.0
   - tar ==0.5.1.0
-  - tar-conduit ==0.2.5
+  - tar-conduit ==0.3.1
   - tardis ==0.4.1.0
-  - tasty ==1.1.0.4
-  - tasty-ant-xml ==1.1.4
+  - tasty ==1.2
+  - tasty-ant-xml ==1.1.5
   - tasty-dejafu ==1.2.0.8
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.2
-  - tasty-hedgehog ==0.2.0.0
   - tasty-hspec ==1.1.5.1
   - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
+  - tasty-leancheck ==0.0.1
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10
   - tasty-silver ==3.1.12
   - tasty-smallcheck ==0.8.1
-  - tasty-stats ==0.2.0.4
   - tasty-th ==0.1.7
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==1.0.1.0
   - tcp-streams-openssl ==1.0.1.0
   - tdigest ==0.2.1
-  - teardown ==0.5.0.0
   - telegram-bot-simple ==0.2.0
+  - template-toolkit ==0.1.1.0
   - temporary ==1.3
   - temporary-rc ==1.2.0.3
+  - temporary-resourcet ==0.1.0.1
   - tensorflow-test ==0.1.0.0
+  - tensors ==0.1.0
+  - termbox ==0.1.0
   - terminal-size ==0.3.2.1
   - test-framework ==0.8.2.0
   - test-framework-hunit ==0.3.0.2
+  - test-framework-leancheck ==0.0.1
   - test-framework-quickcheck2 ==0.3.0.5
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
@@ -2061,8 +1986,9 @@ default-package-overrides:
   - texmath ==0.11.1.2
   - text ==1.2.3.1
   - text-binary ==0.2.1.1
-  - text-builder ==0.5.4.3
+  - text-builder ==0.6.4
   - text-conversions ==0.3.0
+  - text-format ==0.3.2
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
@@ -2071,36 +1997,31 @@ default-package-overrides:
   - text-metrics ==0.3.0
   - text-postgresql ==0.0.3.1
   - text-printer ==0.5
+  - text-region ==0.3.1.0
   - text-short ==0.1.2
-  - text-show ==3.7.4
-  - text-show-instances ==3.6.5
-  - text-zipper ==0.10.1
   - tfp ==1.0.0.2
   - tf-random ==0.5
-  - th-abstraction ==0.2.8.0
+  - th-abstraction ==0.2.10.0
   - th-data-compat ==0.0.2.7
-  - th-desugar ==1.8
+  - th-desugar ==1.9
   - these ==0.7.5
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.11
   - th-lift-instances ==0.1.11
-  - th-nowq ==0.1.0.2
   - th-orphans ==0.13.6
-  - th-printf ==0.5.1
+  - th-printf ==0.6.0
   - thread-hierarchy ==0.3.0.0
   - thread-local-storage ==0.2
   - threads ==0.5.1.6
-  - threads-extras ==0.1.0.2
   - 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
-  - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
   - th-utilities ==0.2.0.1
-  - tibetan-utils ==0.1.1.5
+  - thyme ==0.3.5.5
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
   - timeit ==2.0
@@ -2109,20 +2030,24 @@ default-package-overrides:
   - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
   - time-parsers ==0.1.2.0
+  - time-qq ==0.0.1.0
   - timerep ==2.0.0.2
+  - timer-wheel ==0.1.0
   - timezone-olson ==0.1.9
   - timezone-series ==0.1.9
-  - tintin ==1.9.2
   - tinylog ==0.14.1
   - titlecase ==1.0.1
+  - tldr ==0.4.0.1
   - tls ==1.4.1
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.1.1
-  - tomland ==0.3.1
+  - token-bucket ==0.1.0.1
+  - tomland ==0.5.0
   - tostring ==0.2.1.1
+  - TotalMap ==0.1.0.0
   - transaction ==0.1.1.3
   - transformers-base ==0.4.5.2
   - transformers-bifunctors ==0.1
@@ -2133,15 +2058,14 @@ default-package-overrides:
   - tree-diff ==0.0.2
   - tree-fun ==0.8.1.0
   - trifecta ==2
-  - triplesec ==0.1.2.0
+  - triplesec ==0.2.2.0
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.12
-  - TypeCompose ==0.9.14
+  - turtle ==1.5.13
   - typed-process ==0.2.3.0
   - type-fun ==0.1.1
   - type-hint ==0.1
@@ -2150,21 +2074,22 @@ default-package-overrides:
   - type-level-numbers ==0.1.1.1
   - typelits-witnesses ==0.3.0.3
   - typenums ==0.1.2.1
-  - type-of-html ==1.4.1.0
+  - type-of-html ==1.5.0.0
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.1.0.4
+  - typerep-map ==0.3.0
   - type-spec ==0.3.0.1
-  - typography-geometry ==1.0.0.1
   - tz ==0.1.3.2
   - tzdata ==0.1.20181026.0
+  - ua-parser ==0.7.5.1
+  - ucam-webauth ==0.1.0.0
+  - ucam-webauth-types ==0.1.0.0
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.4
+  - unbound-generics ==0.4.0
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unconstrained ==0.1.0.2
-  - unfoldable ==0.9.6
-  - unfoldable-restricted ==0.0.3
   - unicode ==0.0.1.1
   - unicode-show ==0.1.0.3
   - unicode-transforms ==0.3.5
@@ -2176,16 +2101,14 @@ default-package-overrides:
   - uniq-deep ==1.1.0.0
   - unique ==0
   - unit-constraint ==0.0.0
-  - universe ==1.0
   - universe-base ==1.0.2.1
   - universe-instances-base ==1.0
-  - universe-instances-extended ==1.0.0.1
   - universe-instances-trans ==1.0.0.1
   - universe-reverse-instances ==1.0
-  - universum ==1.2.0
+  - universum ==1.5.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
-  - unix-time ==0.3.8
+  - unix-time ==0.4.3
   - unliftio ==0.2.9.0
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
@@ -2193,9 +2116,11 @@ default-package-overrides:
   - unordered-intmap ==0.1.1
   - unsafe ==0.0
   - uri-bytestring ==0.3.2.1
+  - uri-bytestring-aeson ==0.1.0.7
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
-  - urlpath ==9.0.0
+  - url ==2.1.3
+  - urlpath ==9.0.1
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
@@ -2206,9 +2131,9 @@ default-package-overrides:
   - uuid ==1.3.13
   - uuid-types ==1.0.3
   - validation ==1
-  - validity ==0.7.0.0
+  - validity ==0.9.0.0
   - validity-aeson ==0.2.0.2
-  - validity-bytestring ==0.3.0.2
+  - validity-bytestring ==0.4.0.0
   - validity-containers ==0.3.1.0
   - validity-path ==0.3.0.2
   - validity-scientific ==0.2.0.2
@@ -2221,28 +2146,26 @@ default-package-overrides:
   - vault ==0.3.1.2
   - vec ==0.1
   - vector ==0.12.0.2
-  - vector-algorithms ==0.7.0.4
+  - vector-algorithms ==0.8.0.1
   - vector-binary-instances ==0.2.5.1
   - vector-buffer ==0.4.1
   - vector-builder ==0.3.6
   - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==1.0.4.0
-  - vector-space ==0.13
+  - vector-sized ==1.2.0.0
+  - vector-space ==0.15
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.4.0
   - verbosity ==0.2.3.0
-  - versions ==3.4.0.1
+  - versions ==3.5.0
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.25
-  - vinyl ==0.8.1.1
-  - vivid ==0.3.0.2
-  - vivid-osc ==0.3.0.0
-  - vivid-supercollider ==0.3.0.0
+  - vinyl ==0.10.0.1
+  - vivid ==0.4.2.3
+  - vivid-osc ==0.5.0.0
+  - vivid-supercollider ==0.4.1.2
   - void ==0.7.2
-  - vty ==5.21
+  - vty ==5.25.1
   - wai ==3.2.1.2
   - wai-app-static ==3.1.6.2
   - wai-cli ==0.1.1
@@ -2251,13 +2174,12 @@ default-package-overrides:
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.24.3
   - wai-handler-launch ==3.0.2.4
-  - wai-logger ==2.3.2
+  - wai-logger ==2.3.3
+  - wai-middleware-auth ==0.1.2.1
   - wai-middleware-caching ==0.1.0.2
-  - wai-middleware-caching-lru ==0.1.0.0
-  - wai-middleware-consul ==0.1.0.2
   - wai-middleware-crowd ==0.1.4.2
-  - wai-middleware-metrics ==0.2.4
   - wai-middleware-static ==0.8.2
+  - wai-middleware-throttle ==0.3.0.0
   - wai-middleware-travisci ==0.1.0
   - wai-predicates ==0.10.0
   - wai-session ==0.3.3
@@ -2270,12 +2192,11 @@ default-package-overrides:
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
   - wcwidth ==0.0.2
-  - web3 ==0.7.3.0
+  - web3 ==0.8.2.1
   - webdriver ==0.8.5
   - webex-teams-api ==0.2.0.0
   - webex-teams-conduit ==0.2.0.0
   - webex-teams-pipes ==0.2.0.0
-  - web-plugins ==0.2.9
   - web-routes ==0.27.14.2
   - web-routes-hsp ==0.24.6.1
   - web-routes-wai ==0.24.3.1
@@ -2288,31 +2209,29 @@ default-package-overrides:
   - wild-bind ==0.1.2.3
   - wild-bind-x11 ==0.2.0.6
   - Win32-notify ==0.3.0.3
+  - windns ==0.1.0.1
+  - winery ==0.3.1
   - wire-streams ==0.1.1.0
-  - withdependencies ==0.2.4.2
-  - witherable ==0.2
+  - witherable ==0.3
   - with-location ==0.1.0
   - witness ==0.4
   - wizards ==1.0.3
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-console ==0.1.0.2
-  - wl-pprint-extras ==3.5.0.5
-  - wl-pprint-terminfo ==3.7.1.4
   - wl-pprint-text ==1.2.0.0
   - word24 ==2.0.1
   - word8 ==0.1.3
   - word-trie ==0.3.0
-  - word-wrap ==0.4.1
   - world-peace ==0.1.0.0
   - wrap ==0.0.0
   - wreq ==0.5.3.1
-  - wreq-stringless ==0.5.9.1
+  - writer-cps-exceptions ==0.1.0.0
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.5
   - writer-cps-transformers ==0.1.1.4
-  - ws ==0.0.4
+  - ws ==0.0.5
   - wuss ==1.1.11
   - X11 ==1.9
   - X11-xft ==0.3.1
@@ -2328,6 +2247,7 @@ default-package-overrides:
   - xhtml ==3000.2.2.1
   - xls ==0.1.1
   - xlsx ==0.7.2
+  - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3.1
   - xmlbf ==0.4.1
@@ -2337,7 +2257,6 @@ default-package-overrides:
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0
-  - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
   - xml-isogen ==0.3.0
   - xml-lens ==0.1.6.3
@@ -2345,37 +2264,41 @@ default-package-overrides:
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
+  - xmonad ==0.15
+  - xmonad-contrib ==0.15
+  - xmonad-extras ==0.15.1
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.32
+  - yaml ==0.11.0.0
   - yeshql ==4.1.0.1
   - yeshql-core ==4.1.0.2
   - yeshql-hdbc ==4.1.0.2
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.5
-  - yesod-auth-fb ==1.9.1
   - yesod-auth-hashdb ==1.7.1
+  - yesod-auth-oauth2 ==0.6.0.0
   - yesod-bin ==1.6.0.3
   - yesod-core ==1.6.9
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
   - yesod-form ==1.6.3
-  - yesod-form-bootstrap4 ==1.0.2
+  - yesod-form-bootstrap4 ==2.1.0
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
+  - yesod-markdown ==0.12.6.0
   - yesod-newsfeed ==1.6.1.0
   - yesod-paginator ==1.1.0.1
   - yesod-persistent ==1.6.0.1
-  - yesod-recaptcha2 ==0.2.4
+  - yesod-recaptcha2 ==0.3.0
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0.1
   - yesod-test ==1.6.5.1
   - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0.1
   - yes-precure5-command ==5.5.3
-  - yi-language ==0.17.1
+  - yi-language ==0.18.0
   - yi-rope ==0.11
   - yjtools ==0.9.18
   - yoga ==0.0.0.5
@@ -2384,10 +2307,10 @@ default-package-overrides:
   - zeromq4-haskell ==0.7.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.1.0
-  - zip-archive ==0.3.3
+  - zip ==1.2.0
+  - zip-archive ==0.4
   - zippers ==0.2.5
-  - zip-stream ==0.1.1
+  - zip-stream ==0.2.0.1
   - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1

From 11312448890631c90b793cce60765be9a65049ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Dec 2018 02:31:03 +0100
Subject: [PATCH 2730/2793] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.13-1-gda47f40 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/752c180edcf0db0986f6e3da2a2faa82472a9c1e.
---
 .../haskell-modules/hackage-packages.nix      | 7105 ++---------------
 1 file changed, 766 insertions(+), 6339 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8ad30bb087e..a6deacf7015 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4590,27 +4590,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.12.1.0";
-       sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ListLike parsec
-       ];
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_13_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -4629,7 +4608,6 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -5656,27 +5634,6 @@ self: {
      }) {};
 
   "ForestStructures" = callPackage
-    ({ mkDerivation, base, containers, criterion, fgl, QuickCheck
-     , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector
-     , vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "ForestStructures";
-       version = "0.0.0.2";
-       sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y";
-       libraryHaskellDepends = [
-         base containers fgl QuickCheck unordered-containers vector
-         vector-th-unbox
-       ];
-       testHaskellDepends = [
-         base containers QuickCheck tasty tasty-quickcheck tasty-th vector
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Tree- and forest structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ForestStructures_0_0_1_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, fgl, lens
      , QuickCheck, tasty, tasty-quickcheck, tasty-th
      , unordered-containers, vector, vector-th-unbox
@@ -5695,7 +5652,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Tree- and forest structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Forestry" = callPackage
@@ -10734,22 +10690,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.9.5";
-       sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_3_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10765,7 +10705,6 @@ self: {
        ];
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -10804,22 +10743,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.3.0";
-       sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865";
-       revision = "3";
-       editedCabalFile = "1xr4vjhzjw3ynibb6693dhcz2jbvbx4yg2bir8w2s98n37gwsxd7";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-extra_0_4_0" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover
      , JuicyPixels
      }:
@@ -10834,7 +10757,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -13175,8 +13097,8 @@ self: {
      }:
      mkDerivation {
        pname = "Network-NineP";
-       version = "0.4.3";
-       sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1";
+       version = "0.4.4";
+       sha256 = "119v9iimpgd5cym5q7az0gg70irja9034r2mhvq2k4ygmmz0lazy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15119,23 +15041,6 @@ self: {
      }) {};
 
   "QuickCheck" = callPackage
-    ({ mkDerivation, base, containers, deepseq, random
-     , template-haskell, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "QuickCheck";
-       version = "2.11.3";
-       sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328";
-       libraryHaskellDepends = [
-         base containers deepseq random template-haskell tf-random
-         transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "QuickCheck_2_12_6_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, erf, process, random
      , template-haskell, tf-random, transformers
      }:
@@ -15150,7 +15055,6 @@ self: {
        testHaskellDepends = [ base deepseq process ];
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -15518,6 +15422,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "RSolve" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "RSolve";
+       version = "0.1.0.1";
+       sha256 = "1qqcn87hmya2cl8d4b312y4j4s099czsw5qgqcwh1gc261ppkxvm";
+       libraryHaskellDepends = [ base containers ];
+       description = "A general solver for equations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Raincat" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
      , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time
@@ -15645,23 +15560,6 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
-     , free, JuicyPixels, mtl, primitive, transformers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "Rasterific";
-       version = "0.7.4";
-       sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq";
-       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;
-     }) {};
-
-  "Rasterific_0_7_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
@@ -15676,7 +15574,6 @@ self: {
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReadArgs" = callPackage
@@ -21768,37 +21665,6 @@ self: {
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, HUnit, integer-logarithms, 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.3.1.1";
-       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
-       libraryHaskellDepends = [
-         attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable scientific tagged template-haskell text
-         th-abstraction time time-locale-compat unordered-containers
-         uuid-types vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers directory dlist filepath generic-deriving
-         ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged tasty tasty-hunit
-         tasty-quickcheck template-haskell text time time-locale-compat
-         unordered-containers uuid-types vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_4_2_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , base16-bytestring, bytestring, containers, contravariant, deepseq
-     , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, integer-logarithms, primitive, QuickCheck
      , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, th-abstraction, time
@@ -21809,10 +21675,10 @@ self: {
        version = "1.4.2.0";
        sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm";
        libraryHaskellDepends = [
-         attoparsec base base-compat bytestring containers contravariant
-         deepseq dlist ghc-prim hashable primitive scientific tagged
-         template-haskell text th-abstraction time time-locale-compat
-         unordered-containers uuid-types vector
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable primitive scientific tagged template-haskell text
+         th-abstraction time time-locale-compat unordered-containers
+         uuid-types vector
        ];
        testHaskellDepends = [
          attoparsec base base-compat base-orphans base16-bytestring
@@ -21824,7 +21690,6 @@ self: {
        ];
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -22916,8 +22781,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika";
-       version = "5.8";
-       sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp";
+       version = "5.9";
+       sha256 = "0chmrj8r1qh1k1xkp9gybadxz5zz04v2zh26byrckyx7l2bb7j8x";
        libraryHaskellDepends = [
          array base binary containers deepseq exceptions mtl mwc-random
          random semigroups vector
@@ -23078,8 +22943,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "5.8";
-       sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0";
+       version = "5.9";
+       sha256 = "1vqwhjwjsnrbqp3n97arl2nz28xb0vwxvsn42iqf8fxj6xsks3y1";
        libraryHaskellDepends = [
          aivika array base containers exceptions mtl mwc-random random
          semigroups vector
@@ -23130,24 +22995,6 @@ self: {
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
-    ({ mkDerivation, async, base, clock, hspec, stm, time
-     , unbounded-delays
-     }:
-     mkDerivation {
-       pname = "alarmclock";
-       version = "0.5.0.2";
-       sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15";
-       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;
-     }) {};
-
-  "alarmclock_0_6_0_2" = callPackage
     ({ mkDerivation, async, base, clock, hspec, stm, time
      , unbounded-delays
      }:
@@ -23163,7 +23010,6 @@ self: {
        ];
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alea" = callPackage
@@ -23416,25 +23262,6 @@ self: {
      }) {};
 
   "algebraic-graphs" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, containers
-     , deepseq, extra, mtl, QuickCheck
-     }:
-     mkDerivation {
-       pname = "algebraic-graphs";
-       version = "0.2";
-       sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8";
-       libraryHaskellDepends = [
-         array base base-compat containers deepseq mtl
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans containers extra QuickCheck
-       ];
-       description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "algebraic-graphs_0_3" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, containers
      , deepseq, extra, inspection-testing, mtl, QuickCheck
      }:
@@ -23771,20 +23598,6 @@ self: {
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
-    ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
-     mkDerivation {
-       pname = "alsa-mixer";
-       version = "0.2.0.3";
-       sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp";
-       libraryHaskellDepends = [ alsa-core base unix ];
-       librarySystemDepends = [ alsaLib ];
-       libraryToolDepends = [ c2hs ];
-       description = "Bindings to the ALSA simple mixer API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) alsaLib;};
-
-  "alsa-mixer_0_3_0" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
      mkDerivation {
        pname = "alsa-mixer";
@@ -23795,7 +23608,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -28378,37 +28191,6 @@ self: {
      }) {};
 
   "apply-refact" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.5.0.0";
-       sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apply-refact_0_6_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -28437,7 +28219,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -28700,8 +28481,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.10.0.2";
-       sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c";
+       version = "0.10.1";
+       sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29095,34 +28876,6 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim
-     , integer-gmp, integer-logarithms, mtl, QuickCheck, random
-     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "arithmoi";
-       version = "0.7.0.0";
-       sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
-       revision = "3";
-       editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha";
-       configureFlags = [ "-f-llvm" ];
-       libraryHaskellDepends = [
-         array base containers exact-pi ghc-prim integer-gmp
-         integer-logarithms mtl random vector
-       ];
-       testHaskellDepends = [
-         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge integer-logarithms random vector
-       ];
-       description = "Efficient basic number-theoretic functions";
-       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
@@ -29148,7 +28901,6 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "armada" = callPackage
@@ -29173,6 +28925,8 @@ self: {
        pname = "armor";
        version = "0.1";
        sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71";
+       revision = "1";
+       editedCabalFile = "075nxkch0azmf4fkrnckwsr9s7bmxpm38xbwkj9kak3lsfaml4sk";
        libraryHaskellDepends = [
          base bytestring containers directory filepath HUnit lens
        ];
@@ -30991,19 +30745,6 @@ self: {
      }) {};
 
   "attoparsec-ip" = callPackage
-    ({ mkDerivation, attoparsec, base, ip }:
-     mkDerivation {
-       pname = "attoparsec-ip";
-       version = "0.0.1";
-       sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd";
-       libraryHaskellDepends = [ attoparsec base ip ];
-       testHaskellDepends = [ base ];
-       description = "Parse IP data types with attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "attoparsec-ip_0_0_5" = callPackage
     ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
      , tasty-quickcheck, text, vector
      }:
@@ -31138,22 +30879,6 @@ self: {
      }) {};
 
   "attoparsec-uri" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
-     , strict, text, vector
-     }:
-     mkDerivation {
-       pname = "attoparsec-uri";
-       version = "0.0.4";
-       sha256 = "1wzisb9xnykaxnp1jp0a3lvh1m2swynk2r2mg6nfv5jzlv52q0sf";
-       libraryHaskellDepends = [
-         attoparsec attoparsec-ip base bytedump ip strict text vector
-       ];
-       description = "URI parser / printer using attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "attoparsec-uri_0_0_7" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
      , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck
      , text, vector
@@ -31824,32 +31549,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.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;
-     }) {};
-
-  "avro_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
      , binary, bytestring, containers, data-binary-ieee754, directory
      , entropy, extra, fail, hashable, hspec, lens, lens-aeson, mtl
@@ -31859,8 +31558,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.4.1.0";
-       sha256 = "0dndnk8wk1ir59m19qsb3jrza8xy2w3w3fqv52hyqz1w5ca906n6";
+       version = "0.4.1.1";
+       sha256 = "150pzq5yfvd8vgmrgcdw4kww2jgs0c6hyw7z9wsk7fhjbvrz570k";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bifunctors binary bytestring
          containers data-binary-ieee754 entropy fail hashable mtl pure-zlib
@@ -31875,7 +31574,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -32370,8 +32068,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-lambda-haskell-runtime";
-       version = "1.0.7";
-       sha256 = "0dkagfvnxr1bbl6ngglqvvwl4gc66ipvyww4j80nwaxdfwx85wjq";
+       version = "1.0.9";
+       sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32930,27 +32628,6 @@ self: {
      }) {};
 
   "backprop" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , hmatrix, microlens, microlens-th, mwc-random, primitive
-     , reflection, simple-reflect, time, transformers, vector, vinyl
-     }:
-     mkDerivation {
-       pname = "backprop";
-       version = "0.2.5.0";
-       sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda";
-       libraryHaskellDepends = [
-         base containers deepseq microlens primitive reflection
-         simple-reflect transformers vector vinyl
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq directory hmatrix microlens microlens-th
-         mwc-random time vector
-       ];
-       description = "Heterogeneous automatic differentation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "backprop_0_2_6_1" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, directory
      , hmatrix, microlens, microlens-th, mwc-random, primitive
      , reflection, time, transformers, vector, vinyl
@@ -32969,7 +32646,6 @@ self: {
        ];
        description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -33440,8 +33116,8 @@ self: {
      }:
      mkDerivation {
        pname = "base-compat-batteries";
-       version = "0.10.1";
-       sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm";
+       version = "0.10.5";
+       sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
        libraryHaskellDepends = [ base base-compat ];
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
@@ -33449,22 +33125,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "base-compat-batteries_0_10_5" = callPackage
-    ({ mkDerivation, base, base-compat, contravariant, hspec
-     , hspec-discover, QuickCheck
-     }:
-     mkDerivation {
-       pname = "base-compat-batteries";
-       version = "0.10.5";
-       sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
-       libraryHaskellDepends = [ base base-compat contravariant ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "base-compat with extra batteries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "base-compat-migrate" = callPackage
     ({ mkDerivation, base, base-compat }:
      mkDerivation {
@@ -33548,20 +33208,6 @@ self: {
      }) {};
 
   "base-orphans" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
-     }:
-     mkDerivation {
-       pname = "base-orphans";
-       version = "0.7";
-       sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-orphans_0_8" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
      }:
      mkDerivation {
@@ -33573,7 +33219,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-prelude" = callPackage
@@ -33588,17 +33233,6 @@ self: {
      }) {};
 
   "base-unicode-symbols" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-unicode-symbols";
-       version = "0.2.2.4";
-       sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
-       libraryHaskellDepends = [ base ];
-       description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base-unicode-symbols_0_2_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-unicode-symbols";
@@ -33607,7 +33241,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base16-bytestring" = callPackage
@@ -37503,6 +37136,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitset-word8_0_1_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , hspec, QuickCheck, template-haskell, th-lift-instances, vector
+     }:
+     mkDerivation {
+       pname = "bitset-word8";
+       version = "0.1.1.1";
+       sha256 = "1pjjpqfqjnylfs5npnh7w75h9xk5gpkwzaqx0a972wa9h18gih7z";
+       libraryHaskellDepends = [
+         base containers template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck template-haskell th-lift-instances
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq template-haskell
+         th-lift-instances vector
+       ];
+       description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bitspeak" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib
      , bindings-gobject, gtk2, pango
@@ -37808,6 +37464,25 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "blake2_0_3_0" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , hlint, QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "blake2";
+       version = "0.3.0";
+       sha256 = "0y937kr3dp87likwrl4wpaw80jhf383k89zn8li1yj3zp1vb6niv";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring hlint QuickCheck tasty
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "A library providing BLAKE2";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blakesum" = callPackage
     ({ mkDerivation, base, bytestring, text, vector }:
      mkDerivation {
@@ -37924,21 +37599,6 @@ self: {
      }) {};
 
   "blas-ffi" = callPackage
-    ({ mkDerivation, base, blas, netlib-ffi }:
-     mkDerivation {
-       pname = "blas-ffi";
-       version = "0.0.2";
-       sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base netlib-ffi ];
-       libraryPkgconfigDepends = [ blas ];
-       description = "Auto-generated interface to Fortran BLAS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) blas;};
-
-  "blas-ffi_0_1" = callPackage
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
        pname = "blas-ffi";
@@ -39096,14 +38756,14 @@ self: {
 
   "boolector" = callPackage
     ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl
-     , temporary
+     , temporary, time
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.7";
-       sha256 = "1mb897br307c84p0aj8r20qjwryinhy0bxgm62hphz7mvxlak1pb";
+       version = "0.0.0.8";
+       sha256 = "09zhrg6zrf3viigjdw4q4c1i0x4ww467m9ghapdfwq4d01cr0c43";
        libraryHaskellDepends = [
-         base containers directory mtl temporary
+         base containers directory mtl temporary time
        ];
        librarySystemDepends = [ boolector ];
        libraryToolDepends = [ c2hs ];
@@ -39690,30 +39350,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, QuickCheck, stm, template-haskell, text
-     , text-zipper, transformers, vector, vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.37.2";
-       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
-       revision = "1";
-       editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq dlist
-         microlens microlens-mtl microlens-th stm template-haskell text
-         text-zipper transformers vector vty word-wrap
-       ];
-       testHaskellDepends = [ base containers QuickCheck ];
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_45" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
      , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
@@ -39736,7 +39372,6 @@ self: {
        ];
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -39961,19 +39596,6 @@ self: {
      }) {};
 
   "broadcast-chan" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       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_1" = callPackage
     ({ mkDerivation, async, base, criterion, deepseq, stm
      , unliftio-core
      }:
@@ -39987,7 +39609,6 @@ self: {
        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
@@ -40159,29 +39780,6 @@ self: {
      }) {};
 
   "bson" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cryptohash
-     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
-     , test-framework-quickcheck2, text, time
-     }:
-     mkDerivation {
-       pname = "bson";
-       version = "0.3.2.6";
-       sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
-       revision = "1";
-       editedCabalFile = "0d9s7v330fckrxzdgmbdj7bapb1pgla8yf0mq5zhw27shxy5m3dx";
-       libraryHaskellDepends = [
-         base binary bytestring cryptohash data-binary-ieee754 mtl network
-         text time
-       ];
-       testHaskellDepends = [
-         base binary bytestring cryptohash data-binary-ieee754 mtl network
-         QuickCheck test-framework test-framework-quickcheck2 text time
-       ];
-       description = "BSON documents are JSON-like objects with a standard binary encoding";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "bson_0_3_2_7" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptohash
      , data-binary-ieee754, mtl, network, QuickCheck, test-framework
      , test-framework-quickcheck2, text, time
@@ -40200,7 +39798,6 @@ self: {
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson-generic" = callPackage
@@ -40327,21 +39924,6 @@ self: {
      }) {};
 
   "btrfs" = callPackage
-    ({ mkDerivation, base, bytestring, time, unix }:
-     mkDerivation {
-       pname = "btrfs";
-       version = "0.1.2.3";
-       sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y";
-       revision = "1";
-       editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring time unix ];
-       description = "Bindings to the btrfs API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "btrfs_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
@@ -40352,7 +39934,6 @@ self: {
        libraryHaskellDepends = [ base bytestring time unix ];
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buchhaltung" = callPackage
@@ -40861,29 +40442,6 @@ self: {
      }) {gio-unix = null; system-glib = pkgs.glib;};
 
   "butcher" = 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.0";
-       sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc";
-       revision = "1";
-       editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m";
-       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;
-     }) {};
-
-  "butcher_1_3_2_1" = callPackage
     ({ mkDerivation, base, bifunctors, containers, deque, extra, free
      , hspec, microlens, microlens-th, mtl, multistate, pretty
      , transformers, unsafe, void
@@ -40902,7 +40460,6 @@ self: {
        ];
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butter" = callPackage
@@ -42710,8 +42267,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.12";
-       sha256 = "0zm85ax4wcdkcyljm2nq40j2yi514x44wr4k75r5qjpsrpsg473v";
+       version = "2.13";
+       sha256 = "0qp5q40y2wsba0gykws0w6xzbvr19bcgbqbz05xacp14zxw4r4sp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42739,26 +42296,6 @@ self: {
      }) {};
 
   "cabal2spec" = callPackage
-    ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
-     , tasty-golden, time
-     }:
-     mkDerivation {
-       pname = "cabal2spec";
-       version = "2.1.1";
-       sha256 = "1fm9vi7iyxcpvvivy973njlmsp7ia7cl4jijhf43h8wq60skh1md";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal filepath time ];
-       executableHaskellDepends = [
-         base Cabal filepath optparse-applicative
-       ];
-       testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
-       description = "Convert Cabal files into rpm spec files";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "cabal2spec_2_2_2" = callPackage
     ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
      , tasty-golden, time
      }:
@@ -42775,7 +42312,6 @@ self: {
        testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
        description = "Convert Cabal files into rpm spec files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -44465,26 +44001,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, containers, criterion, mtl, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.5.0";
-       sha256 = "0xj8hxyijkajgrg6g52lxfbg83d8gp01b2x35z0mqia2k6whlihr";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit containers mtl
-         text
-       ];
-       testHaskellDepends = [
-         base bytestring cassava conduit QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cassava-conduit_0_5_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, containers, criterion, mtl, QuickCheck, text
      }:
@@ -44502,7 +44018,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-embed" = callPackage
@@ -44524,27 +44039,6 @@ 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
      }:
@@ -44560,7 +44054,6 @@ 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
@@ -44885,26 +44378,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.7";
-       sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -47076,6 +46549,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cisco-spark-api_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
+     , bytestring, conduit, data-default, hspec, http-conduit
+     , http-types, network-uri, optparse-applicative, text, utf8-string
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "cisco-spark-api";
+       version = "0.1.0.4";
+       sha256 = "0i528c0lbk3k30q53p3qy01fq3mdpv0664q49lfvzcxkkjchwmbg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bitset-word8 bytestring conduit data-default
+         http-conduit network-uri text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit data-default http-conduit
+         optparse-applicative text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base bytestring conduit data-default hspec
+         http-conduit http-types network-uri text wai warp
+       ];
+       description = "DEPRECATED in favor of webex-teams-api";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "citation-resolve" = callPackage
     ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers
      , curl, data-default, directory, doctest, download-curl, either
@@ -47690,34 +47192,6 @@ self: {
      }) {};
 
   "classy-prelude" = 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.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
-         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;
-     }) {};
-
-  "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
@@ -47741,29 +47215,9 @@ self: {
        ];
        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
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.4.0";
-       sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr";
-       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;
-     }) {};
-
-  "classy-prelude-conduit_1_5_0" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
      , monad-control, QuickCheck, resourcet, transformers, void
      }:
@@ -47780,29 +47234,9 @@ self: {
        ];
        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
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.4.0";
-       sha256 = "0a4y9fipcikndzqqna5694f1wcwwin5ir076pjj1nm638a7silhc";
-       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;
-     }) {};
-
-  "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
@@ -49342,18 +48776,6 @@ self: {
      }) {};
 
   "code-page" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "code-page";
-       version = "0.1.3";
-       sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       description = "Windows code page library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "code-page_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "code-page";
@@ -49363,7 +48785,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Windows code page library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec" = callPackage
@@ -51231,17 +50652,6 @@ self: {
      }) {};
 
   "composition-prelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "composition-prelude";
-       version = "1.5.3.1";
-       sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
-       libraryHaskellDepends = [ base ];
-       description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "composition-prelude_2_0_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
@@ -51250,7 +50660,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition-tree" = callPackage
@@ -52593,24 +52002,6 @@ self: {
      }) {};
 
   "config-ini" = callPackage
-    ({ mkDerivation, base, containers, directory, hedgehog, ini
-     , megaparsec, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "config-ini";
-       version = "0.2.2.0";
-       sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n";
-       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;
-     }) {};
-
-  "config-ini_0_2_4_0" = callPackage
     ({ mkDerivation, base, containers, directory, hedgehog, ini
      , megaparsec, text, transformers, unordered-containers
      }:
@@ -52626,7 +52017,6 @@ self: {
        ];
        description = "A library for simple INI-based configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-manager" = callPackage
@@ -52767,38 +52157,6 @@ self: {
      }) {};
 
   "configuration-tools" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
-     , case-insensitive, connection, data-default, deepseq, directory
-     , dlist, enclosed-exceptions, filepath, http-client
-     , http-client-tls, http-types, monad-control, mtl, network-uri
-     , optparse-applicative, process, profunctors, semigroups, text, tls
-     , transformers, unordered-containers, wai, warp, warp-tls, x509
-     , x509-system, x509-validation, yaml
-     }:
-     mkDerivation {
-       pname = "configuration-tools";
-       version = "0.3.1";
-       sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0";
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
-         base64-bytestring bytestring Cabal case-insensitive connection
-         data-default deepseq directory dlist enclosed-exceptions filepath
-         http-client http-client-tls http-types monad-control mtl
-         network-uri optparse-applicative process profunctors semigroups
-         text tls transformers unordered-containers x509 x509-system
-         x509-validation yaml
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols bytestring Cabal enclosed-exceptions
-         http-types monad-control mtl text transformers unordered-containers
-         wai warp warp-tls yaml
-       ];
-       description = "Tools for specifying and parsing configurations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "configuration-tools_0_4_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base-unicode-symbols, base64-bytestring, bytestring, Cabal
      , case-insensitive, connection, data-default, deepseq, directory
@@ -52831,7 +52189,6 @@ self: {
        ];
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configurator" = callPackage
@@ -53666,22 +53023,6 @@ self: {
      }) {};
 
   "contravariant" = callPackage
-    ({ mkDerivation, base, StateVar, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "contravariant";
-       version = "1.4.1";
-       sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9";
-       revision = "1";
-       editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx";
-       libraryHaskellDepends = [
-         base StateVar transformers transformers-compat
-       ];
-       description = "Contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "contravariant_1_5" = callPackage
     ({ mkDerivation, base, StateVar, transformers }:
      mkDerivation {
        pname = "contravariant";
@@ -53690,7 +53031,6 @@ self: {
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -55038,6 +54378,45 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cql-io_1_1_0" = callPackage
+    ({ mkDerivation, async, auto-update, base, bytestring, containers
+     , cql, cryptonite, data-default-class, Decimal, exceptions
+     , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network
+     , primes, raw-strings-qq, retry, semigroups, stm, tasty
+     , tasty-hunit, text, time, transformers, unliftio-core
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "cql-io";
+       version = "1.1.0";
+       sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw";
+       libraryHaskellDepends = [
+         async auto-update base bytestring containers cql cryptonite
+         data-default-class exceptions hashable HsOpenSSL iproute lens mtl
+         mwc-random network retry semigroups stm text time transformers
+         unliftio-core unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         async base containers cql Decimal iproute mtl primes raw-strings-qq
+         tasty tasty-hunit text time uuid
+       ];
+       doHaddock = false;
+       description = "Cassandra CQL client";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cql-io-tinylog" = callPackage
+    ({ mkDerivation, base, bytestring, cql-io, tinylog }:
+     mkDerivation {
+       pname = "cql-io-tinylog";
+       version = "0.1.0";
+       sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f";
+       libraryHaskellDepends = [ base bytestring cql-io tinylog ];
+       description = "Tinylog integration for cql-io";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "cqrs" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -55630,43 +55009,6 @@ self: {
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
-     , base-compat-batteries, binary, bytestring, cassava, code-page
-     , containers, deepseq, directory, exceptions, 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
-     }:
-     mkDerivation {
-       pname = "criterion";
-       version = "1.4.1.0";
-       sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
-       revision = "1";
-       editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base base-compat-batteries binary bytestring
-         cassava code-page containers deepseq directory exceptions filepath
-         Glob js-flot js-jquery microstache mtl mwc-random
-         optparse-applicative parsec semigroups statistics text time
-         transformers transformers-compat vector vector-algorithms
-       ];
-       executableHaskellDepends = [
-         base base-compat-batteries optparse-applicative semigroups
-       ];
-       testHaskellDepends = [
-         aeson base base-compat base-compat-batteries bytestring deepseq
-         directory HUnit QuickCheck statistics tasty tasty-hunit
-         tasty-quickcheck vector
-       ];
-       description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "criterion_1_5_3_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, bytestring, cassava, code-page
      , containers, criterion-measurement, deepseq, directory, exceptions
@@ -55699,7 +55041,6 @@ self: {
        ];
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-measurement" = callPackage
@@ -56068,25 +55409,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, HUnit, mtl
-     , optparse-applicative, QuickCheck, split, text
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.3.1";
-       sha256 = "0iadzyp44ylzwq65jqvln1cmlnsvpwvy0cvpn8xfdqd1x0qil8i2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base containers mtl split text ];
-       executableHaskellDepends = [
-         ansi-terminal base containers mtl optparse-applicative split text
-       ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_1_1_4" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, HUnit
      , optparse-applicative, QuickCheck, split, text
      }:
@@ -56103,7 +55425,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
@@ -56903,24 +56224,6 @@ self: {
      }) {};
 
   "css-syntax" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
-     , scientific, text
-     }:
-     mkDerivation {
-       pname = "css-syntax";
-       version = "0.0.8";
-       sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2";
-       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_1_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, directory, hspec
      , QuickCheck, scientific, text
      }:
@@ -56939,7 +56242,6 @@ self: {
        ];
        description = "High-performance CSS tokenizer and serializer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-text" = callPackage
@@ -57280,30 +56582,6 @@ self: {
      }) {cudd = null;};
 
   "cue-sheet" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "cue-sheet";
-       version = "1.0.1";
-       sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
-       revision = "3";
-       editedCabalFile = "14kgk1digf1vbsr7v5jvj8gajkx0rkn3zjl4m8csqhxalkaxa2zl";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class exceptions megaparsec
-         mtl QuickCheck text
-       ];
-       testHaskellDepends = [
-         base bytestring exceptions hspec hspec-megaparsec megaparsec
-         QuickCheck text
-       ];
-       description = "Support for construction, rendering, and parsing of CUE sheets";
-       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
@@ -57326,7 +56604,6 @@ self: {
        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
@@ -57373,29 +56650,6 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , case-insensitive, cmdargs, directory, hspec, hspec-expectations
-     , http-conduit, http-types, megaparsec, text, unordered-containers
-     , vector, yaml
-     }:
-     mkDerivation {
-       pname = "curl-runnings";
-       version = "0.6.0";
-       sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring case-insensitive directory hspec
-         hspec-expectations http-conduit http-types megaparsec text
-         unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [ base cmdargs text ];
-       testHaskellDepends = [ base directory hspec hspec-expectations ];
-       description = "A framework for declaratively writing curl based API tests";
-       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
@@ -57418,7 +56672,6 @@ self: {
        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
@@ -60601,6 +59854,8 @@ self: {
        pname = "dbus";
        version = "0.10.15";
        sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4";
+       revision = "1";
+       editedCabalFile = "04fy208xlvdyi2ms9c2l2xd7jwi6vd0wzpv2v2s0bc2icha79rih";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq libxml-sax network parsec
          random text transformers unix vector xml-types
@@ -60619,34 +59874,6 @@ self: {
      }) {};
 
   "dbus" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, directory, extra, filepath, lens, libxml-sax, network
-     , parsec, process, QuickCheck, random, resourcet, split, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift
-     , transformers, unix, vector, xml-types
-     }:
-     mkDerivation {
-       pname = "dbus";
-       version = "1.0.1";
-       sha256 = "1xg8wzs7xnh3455v3bbw9nd8inzr06n5939pzlq3nd4ajp3ba9d3";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq filepath lens libxml-sax
-         network parsec random split template-haskell text th-lift
-         transformers unix vector xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers directory extra filepath
-         libxml-sax network parsec process QuickCheck random resourcet tasty
-         tasty-hunit tasty-quickcheck text transformers unix vector
-         xml-types
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       doCheck = false;
-       description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "dbus_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
      , network, parsec, process, QuickCheck, random, resourcet, split
@@ -60671,7 +59898,6 @@ self: {
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -62301,17 +61527,6 @@ self: {
      }) {};
 
   "deque" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "deque";
-       version = "0.2.1";
-       sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781";
-       libraryHaskellDepends = [ base ];
-       description = "Double-ended queue";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "deque_0_2_7" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
      , tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -62326,7 +61541,6 @@ self: {
        ];
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dequeue" = callPackage
@@ -62815,25 +62029,6 @@ self: {
      }) {};
 
   "df1" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , QuickCheck, tasty, tasty-quickcheck, text, time
-     }:
-     mkDerivation {
-       pname = "df1";
-       version = "0.1.1";
-       sha256 = "1qrgf823bf33g6vvilg9q4v1avdwh0iprf26qypzjsbzykbhj91n";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers text time
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
-         time
-       ];
-       description = "Type, render and parse the df1 hierarchical structured log format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "df1_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , QuickCheck, tasty, tasty-quickcheck, text, time
      }:
@@ -62850,7 +62045,6 @@ self: {
        ];
        description = "Type, render and parse the df1 hierarchical structured log format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dfinity-radix-tree" = callPackage
@@ -62947,42 +62141,6 @@ self: {
      }) {};
 
   "dhall" = 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
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.15.1";
-       sha256 = "0c4fr0cs56wkfqiylbpi5qlyxxk9k6x5f9yphq12xf06l2vb6fza";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring case-insensitive 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
-         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
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory text
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_19_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
      , cborg, containers, contravariant, criterion, cryptonite, deepseq
      , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline
@@ -63021,32 +62179,9 @@ self: {
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , shell-escape, text
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.15";
-       sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall insert-ordered-containers
-         neat-interpolation shell-escape text
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text
-       ];
-       description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-bash_1_0_17" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
@@ -63065,7 +62200,6 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -63087,30 +62221,6 @@ self: {
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , insert-ordered-containers, optparse-applicative, tasty
-     , tasty-hunit, text, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.2.3";
-       sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base dhall insert-ordered-containers optparse-applicative
-         text unordered-containers
-       ];
-       executableHaskellDepends = [
-         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;
-     }) {};
-
-  "dhall-json_1_2_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
      , optparse-applicative, tasty, tasty-hunit, text
      , unordered-containers, vector, yaml
@@ -63135,7 +62245,6 @@ self: {
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-lex" = callPackage
@@ -63245,22 +62354,6 @@ self: {
      }) {};
 
   "di" = callPackage
-    ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad
-     , exceptions
-     }:
-     mkDerivation {
-       pname = "di";
-       version = "1.0.1";
-       sha256 = "0h7c6s18vj60higi23icjsf1ky756l553v3a18bdkf4dgcxfs4r9";
-       libraryHaskellDepends = [
-         base df1 di-core di-df1 di-handle di-monad exceptions
-       ];
-       description = "Typeful hierarchical structured logging using di, mtl and df1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "di_1_2" = callPackage
     ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
      , di-monad, exceptions
      }:
@@ -63330,21 +62423,6 @@ self: {
      }) {};
 
   "di-monad" = callPackage
-    ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
-     , stm, transformers
-     }:
-     mkDerivation {
-       pname = "di-monad";
-       version = "1.0.2";
-       sha256 = "1s2f2rvchfc6ha8w75rcz5w9706vf9zmxgrimav211vph3hpjkdq";
-       libraryHaskellDepends = [
-         base containers di-core exceptions mtl pipes stm transformers
-       ];
-       description = "mtl flavoured typeful hierarchical structured logging for di-core";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "di-monad_1_3" = callPackage
     ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
      , stm, transformers
      }:
@@ -63357,7 +62435,6 @@ self: {
        ];
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-base" = callPackage
@@ -65980,26 +65057,6 @@ self: {
      }) {};
 
   "distributive" = callPackage
-    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
-     , generic-deriving, hspec, tagged, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "distributive";
-       version = "0.5.3";
-       sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
-       revision = "6";
-       editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base doctest generic-deriving hspec ];
-       description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributive_0_6" = callPackage
     ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
      , generic-deriving, hspec, hspec-discover, tagged, transformers
      }:
@@ -66013,7 +65070,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diversity" = callPackage
@@ -66574,18 +65630,6 @@ self: {
      }) {};
 
   "dockerfile" = callPackage
-    ({ mkDerivation, base, hspec }:
-     mkDerivation {
-       pname = "dockerfile";
-       version = "0.1.0.1";
-       sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
-       description = "A simple DSL for describing and generating Dockerfile containers in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dockerfile_0_2_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "dockerfile";
@@ -66595,7 +65639,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A Haskell DSL for generating Dockerfiles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docopt" = callPackage
@@ -66680,28 +65723,6 @@ self: {
      }) {};
 
   "doctest-discover" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath
-     }:
-     mkDerivation {
-       pname = "doctest-discover";
-       version = "0.1.0.9";
-       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring directory doctest filepath
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring directory doctest filepath
-       ];
-       testHaskellDepends = [ base doctest ];
-       doHaddock = false;
-       description = "Easy way to run doctests via cabal";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "doctest-discover_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
@@ -66721,7 +65742,6 @@ self: {
        doHaddock = false;
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -66750,22 +65770,6 @@ self: {
      }) {};
 
   "doctest-driver-gen" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "doctest-driver-gen";
-       version = "0.2.0.4";
-       sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base doctest ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "Generate driver file for doctest's cabal integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "doctest-driver-gen_0_3_0_0" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
@@ -67089,35 +66093,6 @@ self: {
      }) {};
 
   "dotenv" = callPackage
-    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
-     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
-     , transformers, yaml
-     }:
-     mkDerivation {
-       pname = "dotenv";
-       version = "0.5.2.5";
-       sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base base-compat directory exceptions megaparsec process text
-         transformers yaml
-       ];
-       executableHaskellDepends = [
-         base base-compat megaparsec optparse-applicative process text
-         transformers yaml
-       ];
-       testHaskellDepends = [
-         base base-compat directory exceptions hspec hspec-megaparsec
-         megaparsec process text transformers yaml
-       ];
-       description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "dotenv_0_8_0_0" = callPackage
     ({ mkDerivation, base, base-compat, containers, directory
      , exceptions, hspec, hspec-megaparsec, megaparsec
      , optparse-applicative, process, text, transformers, yaml
@@ -68168,20 +67143,6 @@ self: {
      }) {};
 
   "dunai" = callPackage
-    ({ mkDerivation, base, MonadRandom, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "dunai";
-       version = "0.4.0.0";
-       sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n";
-       libraryHaskellDepends = [
-         base MonadRandom transformers transformers-base
-       ];
-       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dunai_0_5_1" = callPackage
     ({ mkDerivation, base, MonadRandom, transformers, transformers-base
      }:
      mkDerivation {
@@ -68193,7 +67154,6 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dunai-core" = callPackage
@@ -70110,24 +69070,6 @@ self: {
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
-     , singletons, template-haskell, th-abstraction, th-desugar
-     }:
-     mkDerivation {
-       pname = "eliminators";
-       version = "0.4.1";
-       sha256 = "000x3gjwyf2s44ry16a2a9dk7cqjvl0dh21r5k85s19ljrxsxv1v";
-       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;
-     }) {};
-
-  "eliminators_0_5" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
      }:
@@ -70143,7 +69085,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -73078,43 +72019,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.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
-         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_2_0" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -73234,17 +72138,6 @@ self: {
      }) {};
 
   "exact-pi" = callPackage
-    ({ mkDerivation, base, numtype-dk }:
-     mkDerivation {
-       pname = "exact-pi";
-       version = "0.4.1.4";
-       sha256 = "15v10wn5zgg7y66jzfg0l8lx2qpj91dh7rp05aa3c6c3dss9dx3v";
-       libraryHaskellDepends = [ base numtype-dk ];
-       description = "Exact rational multiples of pi (and integer powers of pi)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "exact-pi_0_5_0_1" = callPackage
     ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck
      }:
@@ -73258,7 +72151,6 @@ self: {
        ];
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exact-real" = callPackage
@@ -73604,28 +72496,6 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytes, bytestring, cborg
-     , cereal, constraints, deepseq, hashable, profunctors, QuickCheck
-     , serialise, singletons, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "exinst";
-       version = "0.6";
-       sha256 = "0pljgk0y4azzgp0k9q8dl7jpf9bf2719xax54mnc35g1px4s21p9";
-       libraryHaskellDepends = [
-         aeson base binary bytes cborg cereal constraints deepseq hashable
-         profunctors QuickCheck serialise singletons
-       ];
-       testHaskellDepends = [
-         aeson base binary bytes bytestring cborg cereal constraints deepseq
-         hashable profunctors QuickCheck serialise singletons tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exinst_0_7" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, deepseq
      , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit
      , tasty-quickcheck
@@ -73644,7 +72514,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -73870,28 +72739,6 @@ self: {
      }) {};
 
   "exp-pairs" = 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.1.6.0";
-       sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
-       revision = "1";
-       editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3";
-       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;
-     }) {};
-
-  "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
@@ -73911,7 +72758,6 @@ self: {
        ];
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -74255,28 +73101,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
-     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
-     , mtl, prettyprinter, primitive, profunctors, QuickCheck
-     , semigroups, StateVar, tagged, template-haskell, text, th-lift
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.4.9";
-       sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp";
-       libraryHaskellDepends = [
-         aeson base bytestring cassava comonad constraints deepseq ghc-prim
-         hashable monad-skeleton mtl prettyprinter primitive profunctors
-         QuickCheck semigroups StateVar tagged template-haskell text th-lift
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [ base lens QuickCheck template-haskell ];
-       description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, comonad
      , constraints, deepseq, exceptions, ghc-prim, hashable, lens
      , monad-skeleton, mtl, prettyprinter, primitive, profunctors
@@ -74297,7 +73121,6 @@ self: {
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -74973,24 +73796,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, text, unix, unix-time
+  "fast-downward" = callPackage
+    ({ mkDerivation, base, containers, list-t, mtl, process, temporary
+     , text, transformers
      }:
      mkDerivation {
-       pname = "fast-logger";
-       version = "2.4.11";
-       sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv";
+       pname = "fast-downward";
+       version = "0.1.0.0";
+       sha256 = "187c3mx2vw1d8xj0k8k2wy51nz7bskcmxgbzx4d5pgrn74gr5azb";
        libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix unix-time
+         base containers list-t mtl process temporary text transformers
        ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       description = "A fast logging system";
+       description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fast-logger_2_4_12" = callPackage
+  "fast-logger" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, text, unix-compat, unix-time
      }:
@@ -75005,6 +73826,23 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "fast-logger_2_4_13" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, text, unix-compat, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.13";
+       sha256 = "1ciji847kcpg8zfld964wd20c5n554y3ak5340rn07k6dx0fzm2b";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix-compat unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -75782,21 +74620,6 @@ self: {
      }) {};
 
   "fedora-haskell-tools" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, time, unix }:
-     mkDerivation {
-       pname = "fedora-haskell-tools";
-       version = "0.5.1";
-       sha256 = "1543i2lxzplqmx1cpggp5773qvqc6jzn4960c1cgyhg9mjd13adr";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath process time unix
-       ];
-       description = "Building and managing tools for Fedora Haskell";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fedora-haskell-tools_0_6" = callPackage
     ({ mkDerivation, base, csv, directory, filepath, HTTP, process
      , time, unix
      }:
@@ -75811,7 +74634,6 @@ self: {
        ];
        description = "Building and maintenance tools for Fedora Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fedora-packages" = callPackage
@@ -76340,25 +75162,6 @@ self: {
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, hspec
-     , microbench, QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "fgl";
-       version = "5.6.0.0";
-       sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
-       revision = "1";
-       editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70";
-       libraryHaskellDepends = [
-         array base containers deepseq transformers
-       ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base deepseq microbench ];
-       description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fgl_5_7_0_1" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
      , microbench, QuickCheck, transformers
      }:
@@ -76373,7 +75176,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-arbitrary" = callPackage
@@ -76552,22 +75354,6 @@ self: {
      }) {};
 
   "file-embed" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "file-embed";
-       version = "0.0.10.1";
-       sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k";
-       libraryHaskellDepends = [
-         base bytestring directory filepath template-haskell
-       ];
-       testHaskellDepends = [ base filepath ];
-       description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "file-embed_0_0_11" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -76581,7 +75367,6 @@ self: {
        testHaskellDepends = [ base filepath ];
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-embed-lzma" = callPackage
@@ -76842,8 +75627,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3.3";
-       sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c";
+       version = "0.6.3.4";
+       sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
@@ -77482,18 +76267,6 @@ self: {
      }) {};
 
   "fixed-vector" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
-     mkDerivation {
-       pname = "fixed-vector";
-       version = "1.1.0.0";
-       sha256 = "1iclmv1xkyr1wdszrahzdim6ilqvpxrhpsiammcxishg9gwvxl0y";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [ base doctest filemanip primitive ];
-       description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector_1_2_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
@@ -77503,7 +76276,6 @@ self: {
        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
@@ -78760,17 +77532,6 @@ self: {
      }) {};
 
   "focus" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "focus";
-       version = "0.1.5.2";
-       sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662";
-       libraryHaskellDepends = [ base ];
-       description = "A general abstraction for manipulating elements of container data structures";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "focus_1_0_1_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "focus";
@@ -78779,7 +77540,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "focuslist" = callPackage
@@ -80007,25 +78767,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, containers
-     , distributive, exceptions, mtl, profunctors, semigroupoids
-     , semigroups, template-haskell, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "5.0.2";
-       sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg";
-       libraryHaskellDepends = [
-         base bifunctors comonad containers distributive exceptions mtl
-         profunctors semigroupoids semigroups template-haskell transformers
-         transformers-base transformers-compat
-       ];
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_1" = callPackage
     ({ mkDerivation, base, comonad, containers, distributive
      , exceptions, mtl, profunctors, semigroupoids, template-haskell
      , transformers, transformers-base
@@ -80040,7 +78781,6 @@ self: {
        ];
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -80450,31 +79190,6 @@ self: {
      }) {};
 
   "freer-simple" = callPackage
-    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
-     , natural-transformation, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers-base
-     }:
-     mkDerivation {
-       pname = "freer-simple";
-       version = "1.1.0.0";
-       sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base natural-transformation transformers-base
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion extensible-effects free mtl
-       ];
-       description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-simple_1_2_1_0" = callPackage
     ({ mkDerivation, base, criterion, extensible-effects, free, mtl
      , natural-transformation, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, transformers-base
@@ -80497,7 +79212,6 @@ self: {
        ];
        description = "Implementation of a friendly effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-simple-catching" = callPackage
@@ -82010,26 +80724,6 @@ self: {
      }) {};
 
   "fuzzyset" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
-     , ieee754, lens, text, text-metrics, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "fuzzyset";
-       version = "0.1.0.6";
-       sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk";
-       libraryHaskellDepends = [
-         base base-unicode-symbols data-default lens text text-metrics
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols hspec ieee754 lens text
-         unordered-containers
-       ];
-       description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fuzzyset_0_1_0_8" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
      , ieee754, lens, text, text-metrics, unordered-containers, vector
      }:
@@ -82047,7 +80741,6 @@ self: {
        ];
        description = "Fuzzy set for approximate string matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -83156,26 +81849,6 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
-     , inspection-testing, lens, profunctors, QuickCheck, tagged
-     }:
-     mkDerivation {
-       pname = "generic-lens";
-       version = "1.0.0.2";
-       sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy";
-       libraryHaskellDepends = [ base profunctors tagged ];
-       testHaskellDepends = [
-         base doctest HUnit inspection-testing lens profunctors
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq lens QuickCheck
-       ];
-       description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "generic-lens_1_1_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
      , inspection-testing, lens, profunctors, QuickCheck, tagged
      }:
@@ -83409,20 +82082,6 @@ self: {
      }) {};
 
   "generics-sop" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "generics-sop";
-       version = "0.3.2.0";
-       sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h";
-       revision = "3";
-       editedCabalFile = "0lw5n8npdrdd1h7j000flaig4z30b8pig4q52sj34zhwccjkdzq2";
-       libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-sop_0_4_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
      , template-haskell
      }:
@@ -83439,7 +82098,6 @@ self: {
        ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -83687,18 +82345,6 @@ self: {
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, validity }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.5.1.0";
-       sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0";
-       libraryHaskellDepends = [ base QuickCheck validity ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_7_0_0" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
@@ -83708,7 +82354,6 @@ self: {
        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
@@ -83734,24 +82379,6 @@ self: {
      }) {};
 
   "genvalidity-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
-     , hspec, QuickCheck, validity, validity-bytestring
-     }:
-     mkDerivation {
-       pname = "genvalidity-bytestring";
-       version = "0.2.0.2";
-       sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3";
-       libraryHaskellDepends = [
-         base bytestring genvalidity QuickCheck validity validity-bytestring
-       ];
-       testHaskellDepends = [
-         base bytestring genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       description = "GenValidity support for ByteString";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-bytestring_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, genvalidity
      , genvalidity-hspec, hspec, QuickCheck, validity
      , validity-bytestring
@@ -83769,28 +82396,9 @@ self: {
        ];
        description = "GenValidity support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-containers" = callPackage
-    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
-     , hspec, QuickCheck, validity, validity-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-containers";
-       version = "0.5.1.0";
-       sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83";
-       libraryHaskellDepends = [
-         base containers genvalidity QuickCheck validity validity-containers
-       ];
-       testHaskellDepends = [
-         base containers genvalidity genvalidity-hspec hspec
-       ];
-       description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-containers_0_5_1_1" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
      }:
@@ -83806,29 +82414,9 @@ self: {
        ];
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
-     , hspec, hspec-core, QuickCheck, transformers, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec";
-       version = "0.6.2.0";
-       sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v";
-       libraryHaskellDepends = [
-         base genvalidity genvalidity-property hspec hspec-core QuickCheck
-         transformers validity
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity hspec hspec-core QuickCheck
-       ];
-       description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec_0_6_2_1" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, transformers, validity
      }:
@@ -83846,31 +82434,9 @@ self: {
        ];
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-aeson, genvalidity-hspec
-     , genvalidity-text, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-aeson";
-       version = "0.3.0.0";
-       sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
-         QuickCheck
-       ];
-       testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
-         genvalidity-text hspec text
-       ];
-       description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec-aeson_0_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-property, genvalidity-text, hspec, QuickCheck, text
@@ -83890,26 +82456,9 @@ self: {
        ];
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
-    ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-binary";
-       version = "0.2.0.2";
-       sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211";
-       libraryHaskellDepends = [
-         base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
-       description = "Standard spec's for binary-related Instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec-binary_0_2_0_3" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
      , validity
@@ -83926,26 +82475,9 @@ self: {
        ];
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
-    ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.2";
-       sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71";
-       libraryHaskellDepends = [
-         base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
-       description = "Standard spec's for cereal-related instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec-cereal_0_2_0_3" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
      , validity
@@ -83962,31 +82494,9 @@ self: {
        ];
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
-     , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.2";
-       sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw";
-       libraryHaskellDepends = [
-         base genvalidity genvalidity-hspec genvalidity-property hashable
-         hspec QuickCheck validity
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity genvalidity-hspec hashable hspec
-         hspec-core QuickCheck
-       ];
-       description = "Standard spec's for Hashable instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec-hashable_0_2_0_3" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
      , validity
@@ -84005,7 +82515,6 @@ self: {
        ];
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-optics" = callPackage
@@ -84072,22 +82581,6 @@ self: {
      }) {};
 
   "genvalidity-property" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
-     , hspec, QuickCheck, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-property";
-       version = "0.2.1.1";
-       sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b";
-       libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       description = "Standard properties for functions on `Validity` types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-property_0_3_0_0" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
@@ -84101,7 +82594,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Standard properties for functions on `Validity` types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-scientific" = callPackage
@@ -84157,26 +82649,6 @@ self: {
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
-     , hspec, QuickCheck, unordered-containers, validity
-     , validity-unordered-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-unordered-containers";
-       version = "0.2.0.3";
-       sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd";
-       libraryHaskellDepends = [
-         base genvalidity hashable QuickCheck unordered-containers validity
-         validity-unordered-containers
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec unordered-containers
-       ];
-       description = "GenValidity support for unordered-containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-unordered-containers_0_2_0_4" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
@@ -84195,7 +82667,6 @@ self: {
        ];
        description = "GenValidity support for unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-uuid" = callPackage
@@ -84622,8 +83093,7 @@ self: {
        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
@@ -84881,29 +83351,6 @@ self: {
      }) {};
 
   "ghc-exactprint" = 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.6.1";
-       sha256 = "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_5_8_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -84924,7 +83371,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -85266,27 +83712,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.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;
-     }) {};
-
-  "ghc-prof_1_4_1_5" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -85305,7 +83730,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
@@ -85519,27 +83943,6 @@ self: {
      }) {};
 
   "ghc-typelits-extra" = 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.2.6";
-       sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm";
-       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;
-     }) {};
-
-  "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
@@ -85558,30 +83961,9 @@ self: {
        ];
        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
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.5.1";
-       sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v";
-       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;
-     }) {};
-
-  "ghc-typelits-knownnat_0_6" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers
@@ -85599,7 +83981,6 @@ self: {
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
@@ -85687,8 +84068,7 @@ self: {
        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 }:
@@ -87589,39 +85969,6 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, 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.19";
-       sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph";
-       revision = "3";
-       editedCabalFile = "0s3zmkzgfbh1mc0492i7rjiawxkzg0im8z2p10niv5ff58m87yri";
-       libraryHaskellDepends = [
-         aeson aeson-compat 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-compat 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;
-     }) {};
-
-  "github_0_20" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , binary, binary-orphans, byteable, bytestring, containers
      , cryptohash, deepseq, deepseq-generics, exceptions, file-embed
@@ -87649,7 +85996,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -88255,26 +86601,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.3.6";
-       sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_1_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -88292,7 +86618,6 @@ self: {
        ];
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -88745,21 +87070,6 @@ self: {
      }) {};
 
   "gloss" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
-       version = "1.12.0.0";
-       sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9";
-       libraryHaskellDepends = [
-         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
-       ];
-       description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss_1_13_0_1" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
      , gloss-rendering, GLUT, OpenGL
      }:
@@ -88774,7 +87084,6 @@ self: {
        ];
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -88903,21 +87212,6 @@ self: {
      }) {};
 
   "gloss-raster" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
-     , repa
-     }:
-     mkDerivation {
-       pname = "gloss-raster";
-       version = "1.12.0.0";
-       sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8";
-       libraryHaskellDepends = [
-         base containers ghc-prim gloss gloss-rendering repa
-       ];
-       description = "Parallel rendering of raster images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-raster_1_13_0_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
      , repa
      }:
@@ -88930,7 +87224,6 @@ self: {
        ];
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -88952,19 +87245,6 @@ self: {
      }) {};
 
   "gloss-rendering" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
-     mkDerivation {
-       pname = "gloss-rendering";
-       version = "1.12.0.0";
-       sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0";
-       libraryHaskellDepends = [
-         base bmp bytestring containers GLUT OpenGL
-       ];
-       description = "Gloss picture data types and rendering functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-rendering_1_13_0_2" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
      mkDerivation {
        pname = "gloss-rendering";
@@ -88977,7 +87257,6 @@ self: {
        ];
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-sodium" = callPackage
@@ -92742,6 +91021,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "grids" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, finite-typelits
+     , lens, vector
+     }:
+     mkDerivation {
+       pname = "grids";
+       version = "0.1.1.0";
+       sha256 = "048k7r9x7d6vfyhsspqawzjrabk30igf3049hjnji27xhpghr90k";
+       libraryHaskellDepends = [
+         adjunctions base distributive finite-typelits lens vector
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grm" = callPackage
     ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy
      , parsec, process, syb, wl-pprint
@@ -92844,26 +91137,6 @@ self: {
      }) {};
 
   "groundhog" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, containers, monad-control, mtl
-     , resourcet, safe-exceptions, scientific, text, time, transformers
-     , transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "groundhog";
-       version = "0.9.0";
-       sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         containers monad-control mtl resourcet safe-exceptions scientific
-         text time transformers transformers-base transformers-compat
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog_0_10_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, containers, monad-control, mtl
      , resourcet, safe-exceptions, scientific, text, time, transformers
@@ -92903,32 +91176,6 @@ self: {
      }) {};
 
   "groundhog-inspector" = callPackage
-    ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
-     , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
-     , regex-compat, syb, template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-inspector";
-       version = "0.9.0";
-       sha256 = "1vb9zsg2r5d9ad6ppbzzm18hq4d4ygc7g2z1w5nb866774zwlywb";
-       revision = "1";
-       editedCabalFile = "1fzkm7rxg3la10j65drhvqnzcv6c5rscq3cqz7f0395rbw0pakmy";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson-pretty base bytestring containers groundhog groundhog-th
-         regex-compat syb template-haskell text time transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring cmdargs containers groundhog groundhog-sqlite
-         groundhog-th mtl
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-inspector_0_10_0" = callPackage
     ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
      , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
      , regex-compat, syb, template-haskell, text, time, transformers
@@ -92953,24 +91200,6 @@ self: {
      }) {};
 
   "groundhog-mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, groundhog
-     , monad-control, monad-logger, mysql, mysql-simple, resource-pool
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-mysql";
-       version = "0.9.0";
-       sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq";
-       libraryHaskellDepends = [
-         base bytestring containers groundhog monad-control monad-logger
-         mysql mysql-simple resource-pool resourcet text time transformers
-       ];
-       description = "MySQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-mysql_0_10" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
      , resourcet, text, time, transformers
@@ -92989,26 +91218,6 @@ self: {
      }) {};
 
   "groundhog-postgresql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , containers, groundhog, monad-control, postgresql-libpq
-     , postgresql-simple, resource-pool, resourcet, text, time
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "groundhog-postgresql";
-       version = "0.9.0.1";
-       sha256 = "0p88l85rsmbdpfnrh2411n68yy70g0iw7pqmp496b8n6gr0mmvl5";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring containers groundhog
-         monad-control postgresql-libpq postgresql-simple resource-pool
-         resourcet text time transformers vector
-       ];
-       description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-postgresql_0_10" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -93029,24 +91238,6 @@ self: {
      }) {};
 
   "groundhog-sqlite" = callPackage
-    ({ mkDerivation, base, bytestring, containers, direct-sqlite
-     , groundhog, monad-control, resource-pool, resourcet, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "groundhog-sqlite";
-       version = "0.9.0";
-       sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb";
-       libraryHaskellDepends = [
-         base bytestring containers direct-sqlite groundhog monad-control
-         resource-pool resourcet text transformers unordered-containers
-       ];
-       description = "Sqlite3 backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-sqlite_0_10_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
      , groundhog, monad-control, resource-pool, resourcet, text
      , transformers, unordered-containers
@@ -93066,32 +91257,15 @@ self: {
 
   "groundhog-th" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, groundhog
-     , template-haskell, text, time, unordered-containers, yaml
+     , libyaml, template-haskell, text, time, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.9.0.1";
-       sha256 = "0hrk86s5mfj33sx5im6pcym1br160vnp17yhi82b2x1imm26cmlk";
+       version = "0.10.2";
+       sha256 = "1bpxvprsxd66k951yjlvpbpzni2f0s94ypkad698a2iyccb2slzk";
        libraryHaskellDepends = [
-         aeson base bytestring containers groundhog template-haskell text
-         time unordered-containers yaml
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-th_0_10" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
-     , template-haskell, text, time, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "groundhog-th";
-       version = "0.10";
-       sha256 = "1bshffmv8x0yqd9d7m3s3abnhnz1g4ny3va5mkzsvy1snzxj7xlb";
-       libraryHaskellDepends = [
-         aeson base bytestring containers groundhog template-haskell text
-         time unordered-containers yaml
+         aeson base bytestring containers groundhog libyaml template-haskell
+         text time unordered-containers yaml
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
@@ -93491,24 +91665,6 @@ self: {
      }) {};
 
   "gtk" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
-     }:
-     mkDerivation {
-       pname = "gtk";
-       version = "0.14.10";
-       sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98";
-       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;
-     }) {gtk2 = pkgs.gnome2.gtk;};
-
-  "gtk_0_15_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
      , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
@@ -93524,7 +91680,6 @@ self: {
        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
@@ -93844,26 +91999,6 @@ self: {
      }) {};
 
   "gtk3" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
-     }:
-     mkDerivation {
-       pname = "gtk3";
-       version = "0.14.9";
-       sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8";
-       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;
-     }) {inherit (pkgs) gtk3;};
-
-  "gtk3_0_15_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
      , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
@@ -93881,7 +92016,6 @@ self: {
        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
@@ -95778,7 +93912,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library" = callPackage
+  "haddock-library_1_5_0_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
      , QuickCheck, transformers, tree-diff
@@ -95798,9 +93932,10 @@ self: {
        doHaddock = false;
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library_1_7_0" = callPackage
+  "haddock-library" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , hspec, hspec-discover, parsec, QuickCheck, text, transformers
      }:
@@ -95818,7 +93953,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-test" = callPackage
@@ -97046,6 +95180,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "han2zen" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "han2zen";
+       version = "0.1";
+       sha256 = "1wm2pa549z3yvyxzl0wbaz623za54fyryhz9bjx4xi7fwlgxylqk";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base text ];
+       description = "Convert Halfwidth Katakana to Fullwidth Katakana";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "handa-data" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -97284,19 +95430,19 @@ self: {
   "hapistrano" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, QuickCheck, stm, temporary, time, transformers
-     , yaml
+     , path-io, process, QuickCheck, silently, stm, temporary, time
+     , transformers, typed-process, yaml
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.7.0";
-       sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041";
+       version = "0.3.8.0";
+       sha256 = "1kkasqfx7k8sl22sklysxl76d5ljcm7p96hgcak7qgwwbj7igj56";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base filepath formatting gitrev mtl path process time
-         transformers
+         aeson base filepath formatting gitrev mtl path process stm time
+         transformers typed-process
        ];
        executableHaskellDepends = [
          aeson async base formatting gitrev optparse-applicative path
@@ -97304,7 +95450,7 @@ self: {
        ];
        testHaskellDepends = [
          base directory filepath hspec mtl path path-io process QuickCheck
-         temporary
+         silently temporary
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
@@ -98391,16 +96537,19 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, base, containers, free, hasbolt, lens, mtl
-     , neat-interpolation, template-haskell, text, th-lift-instances
+    ({ mkDerivation, aeson, aeson-casing, base, containers, free
+     , hasbolt, lens, mtl, neat-interpolation, scientific
+     , template-haskell, text, th-lift-instances, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.12";
-       sha256 = "0rh4nn7dy9jfn4vhmf18fgyqhldj5lg46l35ka2m60ig86za9fkn";
+       version = "0.0.0.14";
+       sha256 = "1sqlngr8wbvs94j1qmqam0q5shjbil61j7dq520qa87rblljs96i";
        libraryHaskellDepends = [
-         base containers free hasbolt lens mtl neat-interpolation
-         template-haskell text th-lift-instances
+         aeson aeson-casing base containers free hasbolt lens mtl
+         neat-interpolation scientific template-haskell text
+         th-lift-instances unordered-containers vector
        ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
@@ -99308,8 +97457,8 @@ self: {
 
   "haskell-ci" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
-     , deepseq, Diff, directory, filepath, ShellCheck, tasty
-     , tasty-golden, transformers
+     , deepseq, Diff, directory, filepath, tasty, tasty-golden
+     , transformers
      }:
      mkDerivation {
        pname = "haskell-ci";
@@ -99318,8 +97467,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal containers deepseq directory filepath ShellCheck
-         transformers
+         base Cabal containers deepseq directory filepath transformers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -99794,38 +97942,6 @@ self: {
      }) {};
 
   "haskell-lsp" = 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
-     , transformers, unordered-containers, vector, yi-rope
-     }:
-     mkDerivation {
-       pname = "haskell-lsp";
-       version = "0.2.2.0";
-       sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
-       revision = "1";
-       editedCabalFile = "0bdgpj5cj4qwp31glmilp1gqdm8c3fkqvgw18aqv8pz2wg39x23y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hashable haskell-lsp-types hslogger lens mtl network-uri parsec
-         sorted-list stm text time unordered-containers yi-rope
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hslogger lens mtl network-uri parsec stm text time transformers
-         unordered-containers vector yi-rope
-       ];
-       testHaskellDepends = [
-         aeson base containers directory filepath hashable hspec lens
-         network-uri sorted-list text yi-rope
-       ];
-       description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-lsp_0_8_0_1" = 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
@@ -99853,7 +97969,6 @@ self: {
        ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -99878,22 +97993,6 @@ self: {
      }) {};
 
   "haskell-lsp-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
-     , hashable, lens, network-uri, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "haskell-lsp-types";
-       version = "0.2.2.0";
-       sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default filepath hashable lens
-         network-uri text unordered-containers
-       ];
-       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-lsp-types_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , hashable, lens, network-uri, scientific, text
      , unordered-containers
@@ -99908,7 +98007,6 @@ self: {
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-menu" = callPackage
@@ -99986,6 +98084,30 @@ self: {
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
+     , pretty-show, tasty, tasty-golden, transformers
+     , traverse-with-class, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-names";
+       version = "0.9.4";
+       sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-lens-light filepath
+         haskell-src-exts mtl transformers traverse-with-class uniplate
+       ];
+       testHaskellDepends = [
+         base containers filemanip filepath haskell-src-exts mtl pretty-show
+         tasty tasty-golden traverse-with-class
+       ];
+       description = "Name resolution library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-names_0_9_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
      , pretty-show, tasty, tasty-golden, transformers
@@ -102068,6 +100190,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskseg" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, bytestring, containers
+     , exact-combinatorics, logging-effect, monad-loops, MonadRandom
+     , mtl, optparse-generic, random, random-shuffle, text, vector, zlib
+     }:
+     mkDerivation {
+       pname = "haskseg";
+       version = "0.1.0.1";
+       sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array base bytestring containers exact-combinatorics
+         logging-effect monad-loops MonadRandom mtl optparse-generic random
+         random-shuffle text vector zlib
+       ];
+       executableHaskellDepends = [
+         ansi-terminal array base bytestring containers exact-combinatorics
+         logging-effect monad-loops MonadRandom mtl optparse-generic random
+         random-shuffle text vector zlib
+       ];
+       description = "Simple unsupervised segmentation model";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , HUnit, json, microlens-platform, optparse-applicative
@@ -104569,8 +102716,8 @@ self: {
      }:
      mkDerivation {
        pname = "heavy-logger";
-       version = "0.3.2.0";
-       sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv";
+       version = "0.3.2.1";
+       sha256 = "09m8wqldmiwys4g5fjisgfc192g55y88gr9akgfhs18nm1gggix6";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default fast-logger
          hsyslog lifted-base monad-control monad-logger mtl stm
@@ -106797,6 +104944,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {harp = null;};
 
+  "hhp" = callPackage
+    ({ mkDerivation, base, Cabal, containers, deepseq, directory
+     , doctest, filepath, ghc, hlint, hspec, io-choice, process, syb
+     }:
+     mkDerivation {
+       pname = "hhp";
+       version = "0.0.0";
+       sha256 = "1520cax79wrf5a183630pji3bypz6qck73fa3p0x63vgcv3p5rwk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base Cabal containers deepseq directory filepath ghc hlint
+         io-choice process syb
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath ghc
+       ];
+       testHaskellDepends = [
+         base Cabal containers deepseq directory doctest filepath ghc hlint
+         hspec io-choice process syb
+       ];
+       description = "Happy Haskell Programming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hi" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory
      , doctest, filepath, hspec, HUnit, optparse-applicative, parsec
@@ -107521,22 +105694,6 @@ self: {
      }) {};
 
   "hinotify" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , unix
-     }:
-     mkDerivation {
-       pname = "hinotify";
-       version = "0.3.10";
-       sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg";
-       revision = "1";
-       editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324";
-       libraryHaskellDepends = [ async base bytestring containers unix ];
-       testHaskellDepends = [ base bytestring directory unix ];
-       description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hinotify_0_4" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , unix
      }:
@@ -107548,7 +105705,6 @@ self: {
        testHaskellDepends = [ base bytestring directory unix ];
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinotify-bytestring" = callPackage
@@ -107607,26 +105763,6 @@ self: {
      }) {};
 
   "hint" = callPackage
-    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
-     , unix
-     }:
-     mkDerivation {
-       pname = "hint";
-       version = "0.8.0";
-       sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f";
-       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;
-     }) {};
-
-  "hint_0_9_0" = callPackage
     ({ mkDerivation, base, directory, exceptions, extensible-exceptions
      , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
      , unix
@@ -107644,7 +105780,6 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hint-server" = callPackage
@@ -107665,8 +105800,7 @@ self: {
 
   "hinter" = callPackage
     ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
-     , unix
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
      }:
      mkDerivation {
        pname = "hinter";
@@ -107674,7 +105808,7 @@ self: {
        sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl";
        libraryHaskellDepends = [
          base directory exceptions filepath ghc ghc-boot ghc-paths mtl
-         random temporary unix
+         random unix
        ];
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit unix
@@ -108932,31 +107066,6 @@ self: {
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-backprop" = callPackage
-    ({ mkDerivation, backprop, base, finite-typelits
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
-     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
-     , vector, vector-sized
-     }:
-     mkDerivation {
-       pname = "hmatrix-backprop";
-       version = "0.1.2.3";
-       sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx";
-       revision = "1";
-       editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv";
-       libraryHaskellDepends = [
-         backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
-         hmatrix hmatrix-vector-sized microlens vector vector-sized
-       ];
-       testHaskellDepends = [
-         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
-         microlens microlens-platform vector-sized
-       ];
-       description = "hmatrix operations lifted for backprop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hmatrix-backprop_0_1_2_5" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
      , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -110718,8 +108827,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, openssl }:
      mkDerivation {
        pname = "hopenssl";
-       version = "2.2.3";
-       sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168";
+       version = "2.2.4";
+       sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring HUnit ];
@@ -111240,24 +109349,6 @@ self: {
      }) {};
 
   "hp2pretty" = callPackage
-    ({ mkDerivation, array, attoparsec, base, containers, filepath
-     , floatshow, mtl, optparse-applicative, semigroups, text
-     }:
-     mkDerivation {
-       pname = "hp2pretty";
-       version = "0.8.0.2";
-       sha256 = "1j3rn4xjpyqnl8vcsc9pyj03mwpilq20g0z8brh3prsvhjb9gl9g";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array attoparsec base containers filepath floatshow mtl
-         optparse-applicative semigroups text
-       ];
-       description = "generate pretty graphs from heap profiles";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hp2pretty_0_9" = callPackage
     ({ mkDerivation, array, attoparsec, base, containers, filepath
      , floatshow, mtl, optparse-applicative, semigroups, text
      }:
@@ -111273,46 +109364,9 @@ self: {
        ];
        description = "generate pretty graphs from heap profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , http-client, http-client-tls, http-types, HUnit, interpolate
-     , mockery, pretty, QuickCheck, scientific, template-haskell
-     , temporary, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.28.2";
-       sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types pretty scientific text transformers unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types pretty scientific text transformers unordered-containers
-         vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob hspec http-client http-client-tls
-         http-types HUnit interpolate mockery pretty QuickCheck scientific
-         template-haskell temporary text transformers unordered-containers
-         vector yaml
-       ];
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_31_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , hspec-discover, http-client, http-client-tls, http-types, HUnit
@@ -111348,7 +109402,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A modern format for Haskell packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpack-convert" = callPackage
@@ -111777,36 +109830,6 @@ self: {
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
-     , data-default-class, directory, exceptions, filepath, HUnit
-     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
-     , resource-pool, scientific, semigroups, test-framework
-     , test-framework-hunit, text, text-show, time, transformers
-     , transformers-base, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hpqtypes";
-       version = "1.5.3.0";
-       sha256 = "1igzja5vy3pfvn2xi4bfbrbnxggxwav16cw2kfjrzkp2xrxq09gz";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default-class
-         exceptions lifted-base monad-control mtl resource-pool semigroups
-         text text-show time transformers transformers-base vector
-       ];
-       librarySystemDepends = [ postgresql ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions HUnit lifted-base monad-control
-         mtl QuickCheck random scientific test-framework
-         test-framework-hunit text text-show time transformers-base
-         unordered-containers vector
-       ];
-       description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) postgresql;};
-
-  "hpqtypes_1_6_1_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
      , data-default-class, directory, exceptions, filepath, HUnit
      , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
@@ -111861,33 +109884,6 @@ self: {
      }) {};
 
   "hprotoc" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, filepath, haskell-src-exts, mtl, parsec
-     , protocol-buffers, protocol-buffers-descriptor, utf8-string
-     }:
-     mkDerivation {
-       pname = "hprotoc";
-       version = "2.4.11";
-       sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         haskell-src-exts mtl parsec protocol-buffers
-         protocol-buffers-descriptor utf8-string
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         haskell-src-exts mtl parsec protocol-buffers
-         protocol-buffers-descriptor utf8-string
-       ];
-       executableToolDepends = [ alex ];
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hprotoc_2_4_12" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, filepath, haskell-src-exts, mtl, parsec
      , protocol-buffers, protocol-buffers-descriptor, utf8-string
@@ -111912,7 +109908,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -112228,17 +110223,6 @@ self: {
      }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
-    ({ mkDerivation, base, syb }:
-     mkDerivation {
-       pname = "hs-bibutils";
-       version = "6.6.0.0";
-       sha256 = "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l";
-       libraryHaskellDepends = [ base syb ];
-       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
-       license = "GPL";
-     }) {};
-
-  "hs-bibutils_6_7_0_0" = callPackage
     ({ mkDerivation, base, syb }:
      mkDerivation {
        pname = "hs-bibutils";
@@ -112247,7 +110231,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-blake2" = callPackage
@@ -113078,28 +111061,6 @@ self: {
      }) {inherit (pkgs) libxml2;};
 
   "hsass" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, filepath
-     , hlibsass, hspec, hspec-discover, monad-loops, temporary, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hsass";
-       version = "0.7.0";
-       sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk";
-       libraryHaskellDepends = [
-         base bytestring data-default-class filepath hlibsass monad-loops
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring data-default-class hspec hspec-discover temporary
-         text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Integrating Sass into Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hsass_0_8_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, filepath
      , hlibsass, hspec, hspec-discover, monad-loops, temporary, text
      , transformers
@@ -113119,7 +111080,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -114304,21 +112264,6 @@ self: {
      }) {};
 
   "hsinstall" = callPackage
-    ({ mkDerivation, base, directory, filepath }:
-     mkDerivation {
-       pname = "hsinstall";
-       version = "1.6";
-       sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       description = "Install Haskell software";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "hsinstall_2_2" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
      , safe-exceptions
      }:
@@ -114334,7 +112279,6 @@ self: {
        ];
        description = "Install Haskell software";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hskeleton" = callPackage
@@ -114483,28 +112427,6 @@ self: {
      }) {};
 
   "hslua" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, fail
-     , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty
-     , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "hslua";
-       version = "0.9.5.2";
-       sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
-       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
-       libraryHaskellDepends = [
-         base bytestring containers exceptions fail mtl text
-       ];
-       librarySystemDepends = [ lua5_3 ];
-       testHaskellDepends = [
-         base bytestring containers QuickCheck quickcheck-instances tasty
-         tasty-expected-failure tasty-hunit tasty-quickcheck text
-       ];
-       description = "A Lua language interpreter embedding in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) lua5_3;};
-
-  "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
@@ -114525,31 +112447,9 @@ self: {
        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
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hslua-aeson";
-       version = "0.3.0.2";
-       sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2";
-       libraryHaskellDepends = [
-         aeson base hashable hslua scientific text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base 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;
-     }) {};
-
-  "hslua-aeson_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec
      , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific
      , text, unordered-containers, vector
@@ -114568,24 +112468,9 @@ self: {
        ];
        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 {
-       pname = "hslua-module-text";
-       version = "0.1.2.1";
-       sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf";
-       revision = "1";
-       editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n";
-       libraryHaskellDepends = [ base hslua text ];
-       testHaskellDepends = [ base hslua tasty tasty-hunit text ];
-       description = "Lua module for text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-module-text_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text
      }:
      mkDerivation {
@@ -114596,7 +112481,6 @@ self: {
        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
@@ -114965,29 +112849,6 @@ self: {
      }) {};
 
   "hspec" = callPackage
-    ({ mkDerivation, base, call-stack, directory, hspec-core
-     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
-     , stringbuilder, transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.5.5";
-       sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
-       libraryHaskellDepends = [
-         base call-stack hspec-core hspec-discover hspec-expectations HUnit
-         QuickCheck transformers
-       ];
-       testHaskellDepends = [
-         base call-stack directory hspec-core hspec-discover
-         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec_2_6_0" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
@@ -115000,7 +112861,6 @@ self: {
        ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -115034,18 +112894,6 @@ self: {
      }) {};
 
   "hspec-contrib" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
-     mkDerivation {
-       pname = "hspec-contrib";
-       version = "0.5.0";
-       sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv";
-       libraryHaskellDepends = [ base hspec-core HUnit ];
-       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
-       description = "Contributed functionality for Hspec";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-contrib_0_5_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
        pname = "hspec-contrib";
@@ -115057,7 +112905,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-core_2_4_8" = callPackage
@@ -115090,34 +112937,6 @@ self: {
      }) {};
 
   "hspec-core" = 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.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
-         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
-       ];
-       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;
-     }) {};
-
-  "hspec-core_2_6_0" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -115142,7 +112961,6 @@ self: {
        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
@@ -115184,24 +113002,6 @@ self: {
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
-     }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.5.5";
-       sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath hspec-meta QuickCheck
-       ];
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_6_0" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
@@ -115218,7 +113018,6 @@ self: {
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -115410,22 +113209,6 @@ self: {
      }) {};
 
   "hspec-megaparsec" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-expectations
-     , megaparsec
-     }:
-     mkDerivation {
-       pname = "hspec-megaparsec";
-       version = "1.0.0";
-       sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl";
-       libraryHaskellDepends = [
-         base containers hspec-expectations megaparsec
-       ];
-       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
-       description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-megaparsec_2_0_0" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
@@ -115441,35 +113224,9 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-meta" = callPackage
-    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
-     , deepseq, directory, filepath, hspec-expectations, HUnit
-     , QuickCheck, quickcheck-io, random, setenv, time, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-meta";
-       version = "2.4.6";
-       sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv time transformers
-       ];
-       executableHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv time transformers
-       ];
-       description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-meta_2_6_0" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, HUnit
      , QuickCheck, quickcheck-io, random, setenv, stm, time
@@ -115493,7 +113250,6 @@ self: {
        ];
        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
@@ -115762,6 +113518,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-wai_0_9_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
+     , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
+     , text, transformers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "hspec-wai";
+       version = "0.9.1";
+       sha256 = "01fc00dxm717blynx4a0b4rrjdqc6yn5pxpk21m8y3jqbw7pryhk";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive hspec-core
+         hspec-expectations http-types QuickCheck text transformers wai
+         wai-extra
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring case-insensitive hspec hspec-core
+         hspec-expectations http-types QuickCheck text transformers wai
+         wai-extra
+       ];
+       description = "Experimental Hspec support for testing WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-wai-json" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
      , case-insensitive, hspec, hspec-wai, template-haskell
@@ -115779,6 +113559,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-wai-json_0_9_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring
+     , case-insensitive, hspec, hspec-wai, template-haskell
+     }:
+     mkDerivation {
+       pname = "hspec-wai-json";
+       version = "0.9.1";
+       sha256 = "15llj764lgl0rad6bypkidcz5dbmsdzr182x1vp5sa0wx6xsvlzm";
+       libraryHaskellDepends = [
+         aeson aeson-qq base bytestring case-insensitive hspec-wai
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-wai ];
+       description = "Testing JSON APIs with hspec-wai";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-webdriver" = callPackage
     ({ mkDerivation, aeson, base, data-default, hashable, hspec
      , hspec-core, HUnit, lifted-base, stm, text, transformers
@@ -117281,34 +115079,6 @@ self: {
      }) {};
 
   "http-api-data" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
-     , Cabal, cabal-doctest, containers, directory, doctest, filepath
-     , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
-     , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid-types
-     }:
-     mkDerivation {
-       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
-         http-types text time time-locale-compat unordered-containers
-         uri-bytestring 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;
-     }) {};
-
-  "http-api-data_0_4" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
      , bytestring, Cabal, cabal-doctest, containers, cookie, directory
      , doctest, filepath, hashable, hspec, hspec-discover, http-types
@@ -117333,7 +115103,6 @@ self: {
        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
@@ -117454,23 +115223,6 @@ self: {
      }) {};
 
   "http-client-openssl" = callPackage
-    ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
-     , network
-     }:
-     mkDerivation {
-       pname = "http-client-openssl";
-       version = "0.2.2.0";
-       sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn";
-       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
-       testHaskellDepends = [
-         base HsOpenSSL hspec http-client http-types
-       ];
-       doCheck = false;
-       description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-openssl_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client
      , http-types, network
      }:
@@ -117487,7 +115239,6 @@ self: {
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -117628,36 +115379,6 @@ self: {
      }) {};
 
   "http-conduit" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, hspec, http-client, http-client-tls
-     , http-types, HUnit, mtl, network, resourcet, streaming-commons
-     , temporary, text, time, transformers, unliftio, unliftio-core
-     , utf8-string, wai, wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
-       version = "2.3.2";
-       sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km";
-       revision = "1";
-       editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra http-client
-         http-client-tls http-types mtl resourcet transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive conduit
-         conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit network resourcet streaming-commons
-         temporary text time transformers unliftio utf8-string wai
-         wai-conduit warp warp-tls
-       ];
-       doCheck = false;
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-conduit_2_3_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, hspec, http-client, http-client-tls
@@ -117683,7 +115404,6 @@ self: {
        doCheck = false;
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -119375,18 +117095,6 @@ self: {
      }) {};
 
   "hw-ip" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }:
-     mkDerivation {
-       pname = "hw-ip";
-       version = "0.1.0.0";
-       sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
-       description = "Library for manipulating IP addresses and CIDR blocks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-ip_2_0_0_0" = callPackage
     ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
      , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
      }:
@@ -119403,53 +117111,9 @@ self: {
        ];
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, criterion, dlist, hspec
-     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-mquery
-     , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, mmap
-     , mono-traversable, parsec, QuickCheck, resourcet, text
-     , transformers, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-json";
-       version = "0.6.0.0";
-       sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv";
-       revision = "2";
-       editedCabalFile = "0ygq95nx4sb70l5kfxlsj6rf2b3ry84ixby567n0jk1g0zks3z7s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bytestring conduit containers
-         dlist hw-balancedparens hw-bits hw-conduit hw-mquery hw-parser
-         hw-prim hw-rankselect hw-rankselect-base mmap mono-traversable
-         resourcet text vector word8
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bytestring conduit containers
-         criterion dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics
-         hw-mquery hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
-         mono-traversable resourcet text vector word8
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring conduit containers hspec
-         hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
-         hw-rankselect-base mmap parsec QuickCheck resourcet transformers
-         vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion hw-balancedparens hw-bits
-         hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet
-         vector
-       ];
-       description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-json_0_9_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
      , bytestring, containers, criterion, directory, dlist, hspec
      , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
@@ -119482,7 +117146,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -119609,21 +117272,6 @@ self: {
      }) {};
 
   "hw-parser" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hw-prim
-     , mono-traversable, text
-     }:
-     mkDerivation {
-       pname = "hw-parser";
-       version = "0.0.0.3";
-       sha256 = "1wn68s00smwnivi813jcb71mx095v1kjgd2253gqknpmdv3ig16x";
-       libraryHaskellDepends = [
-         attoparsec base bytestring hw-prim mono-traversable text
-       ];
-       description = "Simple parser support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-parser_0_1_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }:
      mkDerivation {
        pname = "hw-parser";
@@ -119634,7 +117282,6 @@ self: {
        ];
        description = "Simple parser support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim" = callPackage
@@ -119682,39 +117329,6 @@ self: {
      }) {};
 
   "hw-rankselect" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
-     , directory, hedgehog, hspec, hw-balancedparens, hw-bits
-     , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
-     , QuickCheck, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "hw-rankselect";
-       version = "0.10.0.3";
-       sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da";
-       revision = "1";
-       editedCabalFile = "1rkni89h3sq02y03phb2bgx4yrx4gly9mzan6r4ziph0qayf09wf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base
-         vector
-       ];
-       executableHaskellDepends = [
-         base directory hw-bits hw-prim hw-rankselect-base mmap vector
-       ];
-       testHaskellDepends = [
-         base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
-         hw-prim hw-rankselect-base mmap QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion directory hw-bits hw-prim
-         hw-rankselect-base mmap resourcet vector
-       ];
-       description = "Rank-select";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-rankselect_0_12_0_4" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -119745,7 +117359,6 @@ self: {
        ];
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -123161,6 +120774,8 @@ self: {
        pname = "indexed-extras";
        version = "0.2";
        sha256 = "17rbk2kgiy04n48i6hk4lracwdl45qqklvs1lri7mma2r62f67xh";
+       revision = "1";
+       editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77";
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
        license = stdenv.lib.licenses.bsd3;
@@ -123366,25 +120981,6 @@ self: {
      }) {};
 
   "inflections" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec
-     , hspec-megaparsec, megaparsec, QuickCheck, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "inflections";
-       version = "0.4.0.3";
-       sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
-       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;
-     }) {};
-
-  "inflections_0_4_0_4" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec
      , hspec-megaparsec, megaparsec, QuickCheck, text
      , unordered-containers
@@ -123401,7 +120997,6 @@ self: {
        ];
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflist" = callPackage
@@ -123610,31 +121205,6 @@ self: {
      }) {};
 
   "inline-c" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
-     , regex-posix, template-haskell, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "inline-c";
-       version = "0.6.1.0";
-       sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring containers hashable mtl parsec
-         parsers template-haskell transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
-         raw-strings-qq regex-posix template-haskell transformers
-         unordered-containers vector
-       ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c_0_7_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
      , regex-posix, template-haskell, transformers, unordered-containers
@@ -123657,7 +121227,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-cpp_0_1_0_0" = callPackage
@@ -123848,22 +121417,6 @@ self: {
      }) {};
 
   "inspection-testing" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.2.0.1";
-       sha256 = "1551dvk63xb4lr2zsyg3ri8v1nsjs050k2jsf8v0vfasx7w9ns8z";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_4_1_1" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, template-haskell
      , transformers
      }:
@@ -123877,7 +121430,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -124328,8 +121880,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.34";
-       sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3";
+       version = "0.1.35";
+       sha256 = "1vja9hfgisvkyv3qd69lswwxjmkddvd2ijag6jxc0w2bq25v452h";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -124460,8 +122012,8 @@ self: {
      }:
      mkDerivation {
        pname = "interpolator";
-       version = "0.1";
-       sha256 = "049zx47z071n8k83xc7fwqqd397pg0g7misrggj4w27gxvdlvr7r";
+       version = "0.1.1";
+       sha256 = "13symhhxvv2dxn7449p8b9g7p37p98icj0ql63y9qkdg6s7b8rf0";
        libraryHaskellDepends = [
          aeson base containers either mono-traversable mtl
          product-profunctors profunctors QuickCheck template-haskell text
@@ -124593,28 +122145,6 @@ self: {
      }) {};
 
   "intro" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text
-     , transformers, unordered-containers, writer-cps-mtl
-     }:
-     mkDerivation {
-       pname = "intro";
-       version = "0.3.2.0";
-       sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq dlist extra hashable mtl
-         safe text transformers unordered-containers writer-cps-mtl
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers deepseq dlist extra hashable lens
-         mtl QuickCheck safe text transformers unordered-containers
-         writer-cps-mtl
-       ];
-       description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "intro_0_5_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, dlist
      , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
      , unordered-containers, writer-cps-mtl
@@ -124634,7 +122164,6 @@ self: {
        ];
        description = "Safe and minimal prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intro-prelude" = callPackage
@@ -125107,32 +122636,6 @@ self: {
      }) {};
 
   "ip" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
-     , quickcheck-classes, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, vector
-     }:
-     mkDerivation {
-       pname = "ip";
-       version = "1.3.0";
-       sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hashable primitive text vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring doctest hspec HUnit QuickCheck
-         quickcheck-classes test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion text
-       ];
-       description = "Library for IP and MAC addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ip_1_4_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck
      , quickcheck-classes, test-framework, test-framework-hunit
@@ -127465,37 +124968,6 @@ self: {
      }) {};
 
   "jose" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, concise, containers, cryptonite, hspec, lens, memory
-     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
-     , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
-     , template-haskell, text, time, unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
-       version = "0.7.0.0";
-       sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe semigroups template-haskell
-         text time unordered-containers vector x509
-       ];
-       executableHaskellDepends = [ aeson base bytestring lens mtl ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite hspec lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
-         tasty-quickcheck template-haskell text time unordered-containers
-         vector x509
-       ];
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -127527,34 +124999,9 @@ self: {
        ];
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, transformers
-     , transformers-compat, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.8";
-       sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time transformers transformers-compat
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jose-jwt_0_8_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
      , memory, mtl, QuickCheck, text, time, transformers
@@ -127576,7 +125023,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jot" = callPackage
@@ -127839,21 +125285,6 @@ self: {
      }) {};
 
   "json" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
-     , pretty, syb, text
-     }:
-     mkDerivation {
-       pname = "json";
-       version = "0.9.2";
-       sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6";
-       libraryHaskellDepends = [
-         array base bytestring containers mtl parsec pretty syb text
-       ];
-       description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json_0_9_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
      , pretty, syb, text
      }:
@@ -127866,7 +125297,6 @@ self: {
        ];
        description = "Support for serialising Haskell to and from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-alt" = callPackage
@@ -129080,34 +126510,6 @@ self: {
      }) {};
 
   "jwt" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
-     , data-default, doctest, http-types, HUnit, lens, lens-aeson
-     , memory, network-uri, QuickCheck, scientific, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jwt";
-       version = "0.7.2";
-       sha256 = "0c8aq9y7chq58xp9qd0w5dgbh2q3ksfidj3b4dm5k68ks89p95hp";
-       revision = "1";
-       editedCabalFile = "1q8h94yslw6k6zcjbwx94pnji8dcr2w5n1wzgzfb8hb78w2qr1dm";
-       libraryHaskellDepends = [
-         aeson base bytestring containers cryptonite data-default http-types
-         memory network-uri scientific semigroups text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers cryptonite data-default doctest
-         http-types HUnit lens lens-aeson memory network-uri QuickCheck
-         scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
-         text time unordered-containers vector
-       ];
-       description = "JSON Web Token (JWT) decoding and encoding";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "jwt_0_8_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
      , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory
      , network-uri, QuickCheck, RSA, scientific, semigroups, tasty
@@ -129133,7 +126535,6 @@ self: {
        ];
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kademlia" = callPackage
@@ -132368,30 +129769,6 @@ self: {
      }) {};
 
   "language-docker" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
-     , QuickCheck, split, template-haskell, text, th-lift, time
-     }:
-     mkDerivation {
-       pname = "language-docker";
-       version = "6.0.4";
-       sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1";
-       revision = "1";
-       editedCabalFile = "0la3l8m32zmgb4nk4fwchy1abip0k1b0x1i9205dih136g1iaq62";
-       libraryHaskellDepends = [
-         base bytestring containers free megaparsec mtl prettyprinter split
-         template-haskell text th-lift time
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath free Glob hspec HUnit
-         megaparsec mtl prettyprinter process QuickCheck split
-         template-haskell text th-lift time
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-docker_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
      , QuickCheck, split, template-haskell, text, th-lift, time
@@ -132411,7 +129788,6 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -132992,51 +130368,6 @@ self: {
      }) {};
 
   "language-puppet" = 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
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.20.1";
-       sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         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
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Glob hslogger
-         http-client lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         pcre-utils protolude scientific strict-base-types temporary text
-         transformers unordered-containers vector
-       ];
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "language-puppet_1_4_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -134107,18 +131438,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.7.7";
-       sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_8_0" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -134128,7 +131447,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leancheck-enum-instances" = callPackage
@@ -134469,48 +131787,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.16.1";
-       sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
-       revision = "2";
-       editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_17" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -134548,7 +131824,6 @@ self: {
        ];
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -134668,17 +131943,6 @@ self: {
      }) {};
 
   "lens-labels" = callPackage
-    ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
-     mkDerivation {
-       pname = "lens-labels";
-       version = "0.2.0.2";
-       sha256 = "1s23klkxckly91yfn194bbd3g8lq2x5ykp2mx6730wh2izzwiblw";
-       libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
-       description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-labels_0_3_0_1" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
@@ -134687,7 +131951,6 @@ self: {
        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
@@ -137451,24 +134714,6 @@ self: {
      }) {};
 
   "list-t" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
-     , mtl, mtl-prelude, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "list-t";
-       version = "1.0.1";
-       sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3";
-       revision = "1";
-       editedCabalFile = "0jv0wxxr6rpw9mi3n6jbjqlk403wzycyafrc26vcwkdjaw63ckxb";
-       libraryHaskellDepends = [
-         base mmorph monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "list-t_1_0_2" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
      , mtl, mtl-prelude, transformers, transformers-base
      }:
@@ -137482,7 +134727,6 @@ self: {
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -138094,35 +135338,6 @@ self: {
      }) {};
 
   "llvm-hs" = 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 = "6.3.0";
-       sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd";
-       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
@@ -138152,27 +135367,6 @@ self: {
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
-    ({ mkDerivation, array, base, bytestring, directory, filepath
-     , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden
-     , tasty-hspec, tasty-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "llvm-hs-pretty";
-       version = "0.5.0.0";
-       sha256 = "1715x7wggllp445kkb6f2pkc87qw504yvl2adzz2i4fz8jzm1jhd";
-       libraryHaskellDepends = [
-         array base bytestring llvm-hs-pure prettyprinter text
-       ];
-       testHaskellDepends = [
-         base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
-         tasty-hspec tasty-hunit text transformers
-       ];
-       description = "A pretty printer for LLVM IR";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "llvm-hs-pretty_0_6_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
      , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden
      , tasty-hspec, tasty-hunit, text, transformers
@@ -138194,26 +135388,6 @@ self: {
      }) {};
 
   "llvm-hs-pure" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, fail
-     , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "llvm-hs-pure";
-       version = "6.2.1";
-       sha256 = "1a9xzg6q4gd6j7dkvpkqpnrmh8y1fabllpjbh0m181v1c52aj23r";
-       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;
-     }) {};
-
-  "llvm-hs-pure_7_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
      , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, unordered-containers
@@ -138231,7 +135405,6 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -141052,37 +138225,6 @@ self: {
      }) {};
 
   "magicbane" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
-     , conduit, conduit-combinators, data-default, 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.3.0";
-       sha256 = "1jg6mhi046gdp0mhwzx2n40dv2ysrj8mkif6krb4vg3mdwh39lr0";
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base bytestring conduit
-         conduit-combinators data-default 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;
-     }) {};
-
-  "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
@@ -141110,7 +138252,6 @@ self: {
        ];
        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
@@ -141270,23 +138411,6 @@ self: {
      }) {};
 
   "main-tester" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, hspec
-     , hspec-core, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "main-tester";
-       version = "0.1.0.0";
-       sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc";
-       libraryHaskellDepends = [ base bytestring directory ];
-       testHaskellDepends = [
-         base bytestring doctest 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;
-     }) {};
-
-  "main-tester_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, hspec, hspec-core
      , QuickCheck, text
      }:
@@ -142655,27 +139779,6 @@ self: {
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
-    ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "math-functions";
-       version = "0.2.1.0";
-       sha256 = "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp";
-       libraryHaskellDepends = [
-         base deepseq primitive vector vector-th-unbox
-       ];
-       testHaskellDepends = [
-         base deepseq erf HUnit primitive QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-         vector-th-unbox
-       ];
-       description = "Special functions and Chebyshev polynomials";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "math-functions_0_3_1_0" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-th-unbox
@@ -142694,7 +139797,6 @@ self: {
        ];
        description = "Collection of tools for numeric computations";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathblog" = callPackage
@@ -142866,6 +139968,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrices_0_5_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
+     , tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "matrices";
+       version = "0.5.0";
+       sha256 = "0k8x75k1vkalpmcblmfjqy7lq49nr5mznh134h3d0zqz0q5ky0gx";
+       libraryHaskellDepends = [ base deepseq primitive vector ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "native matrix based on vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, semigroups, tasty, tasty-quickcheck, vector
@@ -143805,32 +140925,6 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, hspec, hspec-discover, hspec-expectations
-     , mtl, parser-combinators, QuickCheck, scientific, text
-     , transformers, weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "6.5.0";
-       sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
-       revision = "4";
-       editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-expectations mtl QuickCheck
-         scientific text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_7_0_4" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -143854,7 +140948,6 @@ self: {
        ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -144880,17 +141973,6 @@ self: {
      }) {};
 
   "microlens" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "microlens";
-       version = "0.4.9.1";
-       sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51";
-       libraryHaskellDepends = [ base ];
-       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens_0_4_10" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
@@ -144899,7 +141981,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -144930,12 +142011,12 @@ self: {
      }) {};
 
   "microlens-contra" = callPackage
-    ({ mkDerivation, base, contravariant, microlens }:
+    ({ mkDerivation, base, microlens }:
      mkDerivation {
        pname = "microlens-contra";
        version = "0.1.0.2";
        sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
-       libraryHaskellDepends = [ base contravariant microlens ];
+       libraryHaskellDepends = [ base microlens ];
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144953,21 +142034,6 @@ self: {
      }) {};
 
   "microlens-ghc" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, microlens
-     , transformers
-     }:
-     mkDerivation {
-       pname = "microlens-ghc";
-       version = "0.4.9.1";
-       sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj";
-       libraryHaskellDepends = [
-         array base bytestring containers microlens transformers
-       ];
-       description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-ghc_0_4_10" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, microlens
      , transformers
      }:
@@ -144980,7 +142046,6 @@ self: {
        ];
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
@@ -144999,22 +142064,6 @@ self: {
      }) {};
 
   "microlens-platform" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
-       version = "0.3.10";
-       sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_3_11" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -145028,7 +142077,6 @@ self: {
        ];
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-th" = callPackage
@@ -145085,19 +142133,6 @@ self: {
      }) {};
 
   "microspec" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       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_1_3" = callPackage
     ({ mkDerivation, base, QuickCheck, time }:
      mkDerivation {
        pname = "microspec";
@@ -145106,7 +142141,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck time ];
        description = "Tiny QuickCheck test library with minimal dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microstache" = callPackage
@@ -145574,6 +142608,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mime-types_0_1_0_9" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "mime-types";
+       version = "0.1.0.9";
+       sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       description = "Basic mime-type handling types and functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minecraft-data" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse
@@ -145692,22 +142738,6 @@ self: {
      }) {};
 
   "minimorph" = callPackage
-    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
-     , text
-     }:
-     mkDerivation {
-       pname = "minimorph";
-       version = "0.1.6.1";
-       sha256 = "0i5qigcj5qpzyg2br8xppd36b5q86y3n457g0hdpv9469d2pnrwl";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       description = "English spelling functions with an emphasis on simplicity";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "minimorph_0_2_1_0" = callPackage
     ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
      , text
      }:
@@ -145721,7 +142751,6 @@ self: {
        ];
        description = "English spelling functions with an emphasis on simplicity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minimung" = callPackage
@@ -145883,24 +142912,6 @@ self: {
      }) {};
 
   "miniutter" = callPackage
-    ({ mkDerivation, base, binary, containers, ghc-prim, HUnit
-     , minimorph, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "miniutter";
-       version = "0.4.7.0";
-       sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd";
-       libraryHaskellDepends = [
-         base binary containers ghc-prim minimorph text
-       ];
-       testHaskellDepends = [
-         base containers HUnit test-framework test-framework-hunit text
-       ];
-       description = "Simple English clause creation from arbitrary words";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miniutter_0_5_0_0" = callPackage
     ({ mkDerivation, base, binary, containers, HUnit, minimorph
      , test-framework, test-framework-hunit, text
      }:
@@ -145915,7 +142926,6 @@ self: {
        ];
        description = "Simple English clause creation from arbitrary words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minlen" = callPackage
@@ -146293,37 +143303,6 @@ self: {
      }) {};
 
   "mmark" = callPackage
-    ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, data-default-class, deepseq, dlist, email-validate
-     , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
-     , megaparsec, microlens, microlens-th, modern-uri, mtl
-     , parser-combinators, QuickCheck, text, text-metrics
-     , unordered-containers, weigh, yaml
-     }:
-     mkDerivation {
-       pname = "mmark";
-       version = "0.0.5.6";
-       sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
-       revision = "6";
-       editedCabalFile = "13cn8nkqj0zl26rgs01rspb2mz6gq1a6ax3g5bygdphvwzraswc5";
-       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
-       ];
-       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
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-discover, hspec-megaparsec
@@ -146356,28 +143335,6 @@ self: {
      }) {};
 
   "mmark-cli" = 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.3.0";
-       sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp";
-       revision = "2";
-       editedCabalFile = "0i3gvfgm4bfbdyflhhaf4gdr7cbkw51i330f25rgha9k3s4v59w3";
-       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 MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "mmark-cli_0_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
      , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark
      , mmark-ext, optparse-applicative, stache, text
@@ -146576,32 +143533,6 @@ self: {
      }) {};
 
   "modern-uri" = 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.2.2.0";
-       sha256 = "1ldl2i34fl7srv72bjxnrbihafq8m8mmk5xca6lhcqwdpx8yakxb";
-       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;
-     }) {};
-
-  "modern-uri_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , criterion, deepseq, exceptions, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
@@ -146627,7 +143558,6 @@ self: {
        ];
        description = "Modern library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta" = callPackage
@@ -147442,29 +144372,6 @@ self: {
      }) {};
 
   "monad-memo" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, mtl, primitive
-     , QuickCheck, random, test-framework, test-framework-quickcheck2
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "monad-memo";
-       version = "0.4.1";
-       sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c";
-       libraryHaskellDepends = [
-         array base containers mtl primitive transformers vector
-       ];
-       testHaskellDepends = [
-         array base containers mtl primitive QuickCheck random
-         test-framework test-framework-quickcheck2 transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         array base containers criterion mtl primitive transformers vector
-       ];
-       description = "Memoization monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-memo_0_5_1" = callPackage
     ({ mkDerivation, array, base, containers, criterion, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
      , transformers, vector
@@ -147485,7 +144392,6 @@ self: {
        ];
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -148439,29 +145345,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, gauge
-     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.9.0";
-       sha256 = "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base gauge mwc-random vector ];
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_10_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, foldl, gauge
      , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
      , text, transformers, unordered-containers, vector
@@ -148484,7 +145367,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge mwc-random vector ];
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -148628,22 +145510,6 @@ self: {
      }) {};
 
   "monoidal-containers" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
-     , semigroups, unordered-containers
-     }:
-     mkDerivation {
-       pname = "monoidal-containers";
-       version = "0.3.1.0";
-       sha256 = "11gpqp4c54q6kmsdfpl0lcrfj6687h51mjpgirl299j6bam2bhs4";
-       libraryHaskellDepends = [
-         base containers deepseq hashable lens newtype semigroups
-         unordered-containers
-       ];
-       description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoidal-containers_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
      , newtype, semigroups, unordered-containers
      }:
@@ -148657,7 +145523,6 @@ self: {
        ];
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoidplus" = callPackage
@@ -148956,40 +145821,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, formatting, http-client
-     , http-client-tls, microlens, microlens-mtl, mtl
-     , optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
-     }:
+  "morphisms-functors" = callPackage
+    ({ mkDerivation, morphisms }:
      mkDerivation {
-       pname = "morte";
-       version = "1.6.20";
-       sha256 = "01m382137sa9if332y9aag8fl77f4sd3i8kxz5cp8g1p10iyjjbl";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley formatting http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page formatting optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
+       pname = "morphisms-functors";
+       version = "0.1.2";
+       sha256 = "056vy0pmjm5p88kjhzy19nfhdwsjv9qqyvi78ff2czmv88242ala";
+       libraryHaskellDepends = [ morphisms ];
+       description = "Functors, theirs compositions and transformations";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
-  "morte_1_7_1" = callPackage
+  "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -149020,7 +145863,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -151171,20 +148013,6 @@ self: {
      }) {};
 
   "mwc-random" = callPackage
-    ({ mkDerivation, base, math-functions, primitive, time, vector }:
-     mkDerivation {
-       pname = "mwc-random";
-       version = "0.13.6.0";
-       sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6";
-       libraryHaskellDepends = [
-         base math-functions primitive time vector
-       ];
-       doCheck = false;
-       description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mwc-random_0_14_0_0" = callPackage
     ({ mkDerivation, base, math-functions, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
@@ -151196,7 +148024,6 @@ self: {
        doCheck = false;
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random-accelerate" = callPackage
@@ -151527,32 +148354,6 @@ self: {
      }) {};
 
   "mysql-haskell" = callPackage
-    ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
-     , blaze-textual, bytestring, bytestring-lexing, cryptonite
-     , io-streams, memory, monad-loops, network, scientific, tasty
-     , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
-     , word24
-     }:
-     mkDerivation {
-       pname = "mysql-haskell";
-       version = "0.8.3.0";
-       sha256 = "1b3sa119m82qmq2mkn0ixhs175i6l92nk4qwvfhh226crj6g5bp9";
-       revision = "1";
-       editedCabalFile = "1kpfmrwwdaxjqwbsc6m9imlcfi2vvkz62pin5nrvm1fk17isy69v";
-       libraryHaskellDepends = [
-         base binary binary-ieee754 binary-parsers blaze-textual bytestring
-         bytestring-lexing cryptonite io-streams memory monad-loops network
-         scientific tcp-streams text time tls vector wire-streams word24
-       ];
-       testHaskellDepends = [
-         base bytestring io-streams tasty tasty-hunit text time vector
-       ];
-       description = "pure haskell MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "mysql-haskell_0_8_4_1" = callPackage
     ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
      , blaze-textual, bytestring, bytestring-lexing, cryptonite
      , io-streams, memory, monad-loops, network, scientific, tasty
@@ -151926,18 +148727,6 @@ self: {
      }) {};
 
   "named" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "named";
-       version = "0.1.0.0";
-       sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       description = "Named parameters (keyword arguments) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "named_0_2_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "named";
@@ -151949,7 +148738,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Named parameters (keyword arguments) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-formlet" = callPackage
@@ -152625,22 +149413,6 @@ self: {
      }) {};
 
   "neat-interpolation" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, megaparsec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "neat-interpolation";
-       version = "0.3.2.2";
-       sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n";
-       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;
-     }) {};
-
-  "neat-interpolation_0_3_2_4" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, megaparsec
      , template-haskell, text
      }:
@@ -152654,7 +149426,6 @@ self: {
        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
@@ -153439,18 +150210,6 @@ self: {
      }) {};
 
   "network" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }:
-     mkDerivation {
-       pname = "network";
-       version = "2.6.3.6";
-       sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv";
-       libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [ base bytestring doctest hspec HUnit ];
-       description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network_2_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
      , unix
      }:
@@ -153464,7 +150223,6 @@ self: {
        ];
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -153563,8 +150321,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-arbitrary";
-       version = "0.3.0.0";
-       sha256 = "13mr3gxgc4g1ij0fj8xwn1md0hi9l1gpka06y072ffh8ib7qg98c";
+       version = "0.4.0.1";
+       sha256 = "161l63gr2l2ncp8vaznl4izxgig43w26q91hvpd6x57k0y4r2zk9";
        libraryHaskellDepends = [
          base bytestring http-media http-types network-uri QuickCheck
        ];
@@ -154797,8 +151555,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.2.1";
-       sha256 = "1hb4n0sjxz6hrdpgw27kxynhvlb8lxf86k4vjjdvic038gf7lfik";
+       version = "0.4.2.2";
+       sha256 = "08ar9qjilx9im2qyxkxf8h6nah9k5c8qdfvbkqxbklg3lq9a54nf";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -157735,21 +154493,6 @@ self: {
      }) {};
 
   "once" = callPackage
-    ({ mkDerivation, base, containers, hashable, template-haskell
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "once";
-       version = "0.2";
-       sha256 = "1a2833v9mvjjh0m87qc5aj0n5yb8wzg5mrxhlh4g7hgsl4lccgkm";
-       libraryHaskellDepends = [
-         base containers hashable template-haskell unordered-containers
-       ];
-       description = "memoization for IO actions and functions";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "once_0_4" = callPackage
     ({ mkDerivation, async, base, containers, hashable, hspec
      , hspec-discover, HUnit, template-haskell, unordered-containers
      }:
@@ -157767,7 +154510,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "memoization for IO actions and functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-line-aeson-text" = callPackage
@@ -159249,6 +155991,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-simple_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, directory, githash
+     , optparse-applicative, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "optparse-simple";
+       version = "0.1.1";
+       sha256 = "192mw3dn43vcckjbhmmrbs3r6vaaa74xqsp6c5bvmv2wafm1plq3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base githash optparse-applicative template-haskell transformers
+       ];
+       testHaskellDepends = [ base bytestring directory ];
+       description = "Simple interface to optparse-applicative";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "optparse-text" = callPackage
     ({ mkDerivation, base, hspec, optparse-applicative, text }:
      mkDerivation {
@@ -159943,19 +156704,6 @@ self: {
      }) {};
 
   "packcheck" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "packcheck";
-       version = "0.3.1";
-       sha256 = "1s171bgqpqh61vaf8s91bbpgn816380bma4wb8in4pnnaf2s0xhv";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [ base ];
-       description = "Universal build and CI testing for Haskell packages";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "packcheck_0_4_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "packcheck";
@@ -159966,7 +156714,6 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Universal build and CI testing for Haskell packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packdeps" = callPackage
@@ -160396,60 +157143,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , binary, blaze-html, blaze-markup, bytestring, Cabal
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doctemplates, exceptions
-     , executable-path, filepath, Glob, haddock-library, hslua
-     , hslua-module-text, HTTP, http-client, http-client-tls, http-types
-     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
-     , process, QuickCheck, random, safe, scientific, SHA, skylighting
-     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, temporary, texmath, text, time, unix
-     , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.2.1";
-       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
-       revision = "1";
-       editedCabalFile = "16f2c7awxbs17xycl3z1x11h7gc7rfzvw7i3pslsn9nms7rz3s3v";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring binary blaze-html
-         blaze-markup bytestring case-insensitive cmark-gfm containers
-         data-default deepseq directory doctemplates exceptions filepath
-         Glob haddock-library hslua hslua-module-text HTTP http-client
-         http-client-tls http-types JuicyPixels mtl network network-uri
-         pandoc-types parsec process random safe scientific SHA skylighting
-         split syb tagsoup temporary texmath text time unix
-         unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring containers Diff directory
-         executable-path filepath Glob hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
-         xml zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion mtl text time weigh
-       ];
-       doCheck = false;
-       postInstall = ''
-         mkdir -p $out/share
-         mv $data/*/*/man $out/share/
-       '';
-       description = "Conversion between markup formats";
-       license = stdenv.lib.licenses.gpl2;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -160500,45 +157193,10 @@ self: {
        '';
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = 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.8.1";
-       sha256 = "04cdx0b9k3xk2ss97vws21pydxcwxffsgh7xrqrnwwc3v7jn80fz";
-       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;
-     }) {};
-
-  "pandoc-citeproc_0_15_0_1" = 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
@@ -160570,7 +157228,6 @@ self: {
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -162642,27 +159299,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, exceptions
-     , filepath, hspec, path, temporary, time, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "1.3.3";
-       sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
-       revision = "3";
-       editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc";
-       libraryHaskellDepends = [
-         base containers directory dlist exceptions filepath path temporary
-         time transformers unix-compat
-       ];
-       testHaskellDepends = [
-         base directory exceptions hspec path transformers unix-compat
-       ];
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-io_1_4_1" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
@@ -162679,7 +159315,6 @@ self: {
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-pieces" = callPackage
@@ -164175,40 +160810,6 @@ self: {
      }) {};
 
   "persistent" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , fast-logger, haskell-src-meta, 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.8.2";
-       sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9";
-       revision = "1";
-       editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers fast-logger haskell-src-meta
-         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;
-       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
@@ -164238,7 +160839,6 @@ self: {
        ];
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -164421,24 +161021,6 @@ self: {
      }) {};
 
   "persistent-mysql" = 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.8.1";
-       sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40";
-       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;
-     }) {};
-
-  "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
@@ -164454,7 +161036,6 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -164465,8 +161046,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.4.2";
-       sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653";
+       version = "0.5.0";
+       sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164482,7 +161063,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "persistent-mysql-haskell_0_5_0" = callPackage
+  "persistent-mysql-haskell_0_5_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
      , persistent-template, resource-pool, resourcet, text, time, tls
@@ -164490,8 +161071,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.5.0";
-       sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
+       version = "0.5.1";
+       sha256 = "1hl0igjcq9clwhn1dl6nix9gy8ka1mb2alb80cixz8gm8q6bx1dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164542,26 +161123,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = 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.8.2.0";
-       sha256 = "0j9g12fk1rlxhd45frxrj9bkmzrk1qbz611296af8nhxkw5wiwzj";
-       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;
-       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
@@ -164580,7 +161141,6 @@ self: {
        ];
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -164721,34 +161281,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.2";
-       sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6";
-       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_9_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-logger, old-locale, persistent
      , persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -164773,7 +161305,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;};
 
@@ -165867,31 +162398,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.11";
-       sha256 = "12vj9lg7l2nb92j9mydsa8hcy0ql71qnphfhgdm30xrsps79vwd0";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_10_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, semigroups, text, time
@@ -165915,7 +162421,6 @@ self: {
        ];
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -166922,24 +163427,6 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
-     , pipes, primitive, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-safe";
-       version = "2.2.9";
-       sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
-       revision = "2";
-       editedCabalFile = "1crpzg72nahmffw468d31l23bw3wgi0p3w7ad2pv3jxhy1432c71";
-       libraryHaskellDepends = [
-         base containers exceptions monad-control mtl pipes primitive
-         transformers transformers-base
-       ];
-       description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-safe_2_3_1" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, primitive, transformers, transformers-base
      }:
@@ -166953,7 +163440,6 @@ self: {
        ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-shell" = callPackage
@@ -168563,19 +165049,6 @@ self: {
      }) {};
 
   "polyparse" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
-     mkDerivation {
-       pname = "polyparse";
-       version = "1.12";
-       sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
-       revision = "1";
-       editedCabalFile = "18daiyj3009wx0bhr87fbgy7xfh68ss9qzn6k3lgmh1z9dfsryrd";
-       libraryHaskellDepends = [ base bytestring text ];
-       description = "A variety of alternative parser combinator libraries";
-       license = "LGPL";
-     }) {};
-
-  "polyparse_1_12_1" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "polyparse";
@@ -168584,7 +165057,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polyseq" = callPackage
@@ -169583,30 +166055,6 @@ self: {
      }) {};
 
   "postgresql-simple" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , cryptohash, filepath, hashable, HUnit, postgresql-libpq
-     , scientific, tasty, tasty-golden, tasty-hunit, template-haskell
-     , text, time, transformers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-simple";
-       version = "0.5.4.0";
-       sha256 = "0xrsyx25v5z06qziy32wlb3lvkyci3nxkbb25nis21vkj3kimlgm";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring bytestring-builder
-         case-insensitive containers hashable postgresql-libpq scientific
-         template-haskell text time transformers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring containers cryptohash
-         filepath HUnit tasty tasty-golden tasty-hunit text time vector
-       ];
-       description = "Mid-Level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple_0_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, bytestring-builder, case-insensitive, containers
      , cryptohash, filepath, hashable, HUnit, Only, postgresql-libpq
@@ -169631,7 +166079,6 @@ self: {
        benchmarkHaskellDepends = [ base vector ];
        description = "Mid-Level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-bind" = callPackage
@@ -169661,8 +166108,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.13.0";
-       sha256 = "0rpcl6s1hwb5z0lkcrahh6ljx5zcb0aq8mrk691hfwazlhbv01zk";
+       version = "0.1.13.1";
+       sha256 = "0xblb0k3xnsbvdqrl5k3i6jimj4cskgip6w021byirn8i73s7j8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170975,26 +167422,6 @@ self: {
      }) {};
 
   "pretty-show" = callPackage
-    ({ mkDerivation, array, base, filepath, ghc-prim, happy
-     , haskell-lexer, pretty, text
-     }:
-     mkDerivation {
-       pname = "pretty-show";
-       version = "1.7";
-       sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base filepath ghc-prim haskell-lexer pretty text
-       ];
-       libraryToolDepends = [ happy ];
-       executableHaskellDepends = [ base ];
-       description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pretty-show_1_9_4" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
@@ -171012,7 +167439,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-show-ansi-wl" = callPackage
@@ -171032,25 +167458,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "2.1.0.1";
-       sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_2_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl
      , text, transformers
      }:
@@ -171067,7 +167474,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -171396,18 +167802,6 @@ self: {
      }) {};
 
   "primitive" = callPackage
-    ({ mkDerivation, base, ghc-prim, transformers }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.6.3.0";
-       sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd";
-       libraryHaskellDepends = [ base ghc-prim transformers ];
-       testHaskellDepends = [ base ghc-prim ];
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "primitive_0_6_4_0" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "primitive";
@@ -171418,7 +167812,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-checked" = callPackage
@@ -172285,24 +168678,6 @@ self: {
      }) {};
 
   "profunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad
-     , contravariant, distributive, semigroups, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "profunctors";
-       version = "5.2.2";
-       sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
-       revision = "2";
-       editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq";
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad contravariant distributive
-         semigroups tagged transformers
-       ];
-       description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profunctors_5_3" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, semigroups, tagged, transformers
      }:
@@ -172316,7 +168691,6 @@ self: {
        ];
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -172646,30 +169020,6 @@ self: {
      }) {};
 
   "prometheus-client" = callPackage
-    ({ mkDerivation, atomic-primops, base, bytestring, clock
-     , containers, criterion, doctest, hspec, mtl, QuickCheck, random
-     , random-shuffle, stm, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "prometheus-client";
-       version = "0.3.0";
-       sha256 = "0nyh90ixf4g54q8qy315fv310rn0sw6rypkj37876isdhq5w8a2z";
-       libraryHaskellDepends = [
-         atomic-primops base bytestring clock containers mtl stm
-         transformers utf8-string
-       ];
-       testHaskellDepends = [
-         atomic-primops base bytestring clock containers doctest hspec mtl
-         QuickCheck random-shuffle stm transformers utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion random utf8-string
-       ];
-       description = "Haskell client library for http://prometheus.io.";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "prometheus-client_1_0_0" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, clock
      , containers, criterion, deepseq, doctest, exceptions, hspec, mtl
      , QuickCheck, random, random-shuffle, stm, text, transformers
@@ -172693,7 +169043,6 @@ self: {
        ];
        description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prometheus-effect" = callPackage
@@ -172962,8 +169311,8 @@ self: {
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.14.0";
-       sha256 = "0mrx51kqz69n8axhzcxfi7x0ddn35ypny2lidas45q0865qgniif";
+       version = "0.3.16.0";
+       sha256 = "1lnvc34xvxf10b41bv3c2gkpzhmckbd12199nfky8sk8z60sqpsh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173010,24 +169359,6 @@ self: {
      }) {};
 
   "proto-lens" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, deepseq, lens-family, lens-labels, parsec
-     , pretty, text, transformers, void
-     }:
-     mkDerivation {
-       pname = "proto-lens";
-       version = "0.3.1.0";
-       sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class deepseq
-         lens-family lens-labels parsec pretty text transformers void
-       ];
-       description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens_0_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , lens-family, lens-labels, parsec, pretty, text, transformers
      , void
@@ -173043,25 +169374,9 @@ self: {
        ];
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-family
-     , proto-lens, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-arbitrary";
-       version = "0.1.2.2";
-       sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i";
-       libraryHaskellDepends = [
-         base bytestring containers lens-family proto-lens QuickCheck text
-       ];
-       description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-arbitrary_0_1_2_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
@@ -173074,32 +169389,9 @@ self: {
        ];
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-combinators" = callPackage
-    ({ mkDerivation, base, Cabal, data-default-class, HUnit
-     , lens-family, lens-family-core, proto-lens, proto-lens-protoc
-     , test-framework, test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "proto-lens-combinators";
-       version = "0.1.0.11";
-       sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
-       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
-       libraryHaskellDepends = [
-         base data-default-class lens-family proto-lens-protoc transformers
-       ];
-       testHaskellDepends = [
-         base HUnit lens-family lens-family-core proto-lens
-         proto-lens-protoc test-framework test-framework-hunit
-       ];
-       description = "Utilities functions to proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "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
@@ -173170,23 +169462,6 @@ self: {
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protobuf-types" = callPackage
-    ({ mkDerivation, base, Cabal, lens-family, proto-lens
-     , proto-lens-protoc, protobuf, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protobuf-types";
-       version = "0.3.0.1";
-       sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca";
-       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
-       libraryHaskellDepends = [
-         base lens-family proto-lens proto-lens-protoc text
-       ];
-       libraryToolDepends = [ protobuf ];
-       description = "Basic protocol buffer message types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) protobuf;};
-
-  "proto-lens-protobuf-types_0_4_0_1" = callPackage
     ({ mkDerivation, base, Cabal, lens-labels, proto-lens
      , proto-lens-runtime, proto-lens-setup, protobuf, text
      }:
@@ -173201,7 +169476,6 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc_0_2_2_3" = callPackage
@@ -173232,32 +169506,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, temporary, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protoc";
-       version = "0.3.1.2";
-       sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7";
-       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 temporary 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_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath
      , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
      }:
@@ -173277,7 +169525,6 @@ self: {
        ];
        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
@@ -173385,22 +169632,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.11";
-       sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_12" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, binary
      , bytestring, containers, directory, filepath, mtl, parsec, syb
      , text, utf8-string, vector
@@ -173415,24 +169646,9 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.11";
-       sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_12" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -173444,7 +169660,6 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -173515,23 +169730,6 @@ self: {
      }) {};
 
   "protolude" = 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.2";
-       sha256 = "0z251xxv8rhds981acdf6dr34ac2kc062mbq9gl2nj339grhqpb8";
-       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;
-     }) {};
-
-  "protolude_0_2_3" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
      , transformers, transformers-compat
@@ -173546,7 +169744,6 @@ self: {
        ];
        description = "A small prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protolude-lifted" = callPackage
@@ -173855,21 +170052,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, criterion, filepath, hspec, random
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20180513";
-       sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion random ];
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20180825" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
@@ -173882,7 +170064,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -174314,6 +170495,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "purebred-email" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+     , case-insensitive, concise, deepseq, lens, QuickCheck
+     , quickcheck-instances, semigroupoids, semigroups, stringsearch
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "purebred-email";
+       version = "0.1.0.0";
+       sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring bytestring case-insensitive
+         concise deepseq lens semigroupoids semigroups stringsearch text
+         time
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring case-insensitive lens QuickCheck
+         quickcheck-instances semigroups tasty tasty-golden tasty-hunit
+         tasty-quickcheck text time
+       ];
+       description = "types and parser for email messages (including MIME)";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "purescript" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
      , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes
@@ -175746,21 +171953,21 @@ self: {
      }) {};
 
   "quickcheck-classes" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, containers, primitive
-     , QuickCheck, semigroupoids, semigroups, semirings, tagged
-     , transformers, vector
+    ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
+     , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings
+     , tagged, tasty, tasty-quickcheck, transformers, vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.5.0.0";
-       sha256 = "1jg4wkysz2hdfkl9ah9lyvasnr01dvp3lfzzn1cin2ac6b1inj6v";
+       version = "0.6.0.0";
+       sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy";
        libraryHaskellDepends = [
-         aeson base bifunctors containers primitive QuickCheck semigroupoids
-         semigroups semirings tagged transformers
+         aeson base base-orphans bifunctors containers fail primitive
+         QuickCheck semigroupoids semigroups semirings tagged transformers
        ];
        testHaskellDepends = [
-         aeson base containers primitive QuickCheck semigroupoids tagged
-         transformers vector
+         aeson base base-orphans containers primitive QuickCheck
+         semigroupoids tagged tasty tasty-quickcheck transformers vector
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
@@ -177422,25 +173629,6 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "rank2classes";
-       version = "1.1.0.1";
-       sha256 = "1iw2xanyv7rw995sy3c0dvkjl3js4bd7n2hz0x509pkz8hzsa93w";
-       libraryHaskellDepends = [
-         base distributive template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base distributive doctest tasty tasty-hunit
-       ];
-       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "rank2classes_1_2" = callPackage
     ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
      , template-haskell, transformers
      }:
@@ -177813,36 +174001,6 @@ self: {
      }) {};
 
   "rattletrap" = 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 = "4.1.2";
-       sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2";
-       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;
-     }) {};
-
-  "rattletrap_6_0_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
      , bytestring, clock, containers, filepath, http-client
      , http-client-tls, HUnit, template-haskell, temporary, text
@@ -177871,7 +174029,6 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -178220,19 +174377,6 @@ self: {
      }) {};
 
   "re2" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, re2, vector }:
-     mkDerivation {
-       pname = "re2";
-       version = "0.2";
-       sha256 = "0qfmiwy4kc87a736fpzh4cscvldiywq641gb9kvn4hc3sq7dh1k9";
-       libraryHaskellDepends = [ base bytestring vector ];
-       librarySystemDepends = [ re2 ];
-       testHaskellDepends = [ base bytestring HUnit vector ];
-       description = "Bindings to the re2 regular expression library";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) re2;};
-
-  "re2_0_3" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, re2, vector }:
      mkDerivation {
        pname = "re2";
@@ -178243,7 +174387,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit vector ];
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) re2;};
 
   "react-flux" = callPackage
@@ -178866,27 +175009,6 @@ self: {
      }) {};
 
   "rebase" = 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.2.4";
-       sha256 = "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya";
-       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;
-     }) {};
-
-  "rebase_1_3" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
      , either, fail, hashable, mtl, profunctors, scientific
@@ -178907,7 +175029,6 @@ self: {
        ];
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -179112,33 +175233,14 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "2.2.0.0";
-       sha256 = "075rmdrfvaq14p6c3fpg8svf3klrxi5a43a4cgl2j61q5yhhgb3a";
+       version = "2.2.0.1";
+       sha256 = "0xf8d9gjqmnp9scz5q06kx473y498iy7kql5200zr4mnr62c2pqj";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "recursion-schemes" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, free, HUnit
-     , template-haskell, th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "recursion-schemes";
-       version = "5.0.3";
-       sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
-       revision = "3";
-       editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q";
-       libraryHaskellDepends = [
-         base base-orphans comonad free template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base HUnit template-haskell transformers ];
-       description = "Generalized bananas, lenses and barbed wire";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "recursion-schemes_5_1" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, free, HUnit
      , template-haskell, th-abstraction, transformers
      }:
@@ -179153,7 +175255,6 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell transformers ];
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursion-schemes-ext" = callPackage
@@ -179613,22 +175714,6 @@ self: {
      }) {};
 
   "refined" = callPackage
-    ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter
-     , template-haskell, these, transformers
-     }:
-     mkDerivation {
-       pname = "refined";
-       version = "0.2.3.0";
-       sha256 = "1xc4qg2xibf2j0k6dwjj2sp5s58cj4dwcri6zrn42460wxnvyjk6";
-       libraryHaskellDepends = [
-         base containers exceptions mtl prettyprinter template-haskell these
-         transformers
-       ];
-       description = "Refinement types with static and runtime checking";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "refined_0_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter
      , template-haskell, transformers
      }:
@@ -179642,7 +175727,6 @@ self: {
        ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection" = callPackage
@@ -180070,27 +176154,6 @@ self: {
      }) {};
 
   "regex" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
-     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
-     , transformers, unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "regex";
-       version = "1.0.1.4";
-       sha256 = "15kdlb8wgdv72wsxd0av7j085vd3hg6lhpnx4wn3q659f43g6ahc";
-       libraryHaskellDepends = [
-         array base base-compat bytestring containers hashable regex-base
-         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
-         time time-locale-compat transformers unordered-containers
-         utf8-string
-       ];
-       description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "regex_1_0_2_0" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , hashable, regex-base, regex-pcre-builtin, regex-tdfa
      , regex-tdfa-text, template-haskell, text, time, time-locale-compat
@@ -181175,33 +177238,6 @@ self: {
      }) {};
 
   "relude" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
-     , tasty-hedgehog, text, transformers, unordered-containers
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "relude";
-       version = "0.1.1";
-       sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0";
-       revision = "1";
-       editedCabalFile = "18vil2wa8xzpf0y5r5zdfylsqmphlappzc7a2ac9lmxngfkbzwyc";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable mtl stm text
-         transformers unordered-containers utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude from Kowainik";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "relude_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
      , tasty-hedgehog, text, transformers, unordered-containers
@@ -181222,7 +177258,6 @@ self: {
        ];
        description = "Custom prelude from Kowainik";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remark" = callPackage
@@ -181823,17 +177858,6 @@ self: {
      }) {};
 
   "repline" = callPackage
-    ({ mkDerivation, base, containers, haskeline, mtl, process }:
-     mkDerivation {
-       pname = "repline";
-       version = "0.1.7.0";
-       sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh";
-       libraryHaskellDepends = [ base containers haskeline mtl process ];
-       description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "repline_0_2_0_0" = callPackage
     ({ mkDerivation, base, containers, haskeline, mtl, process }:
      mkDerivation {
        pname = "repline";
@@ -181842,7 +177866,6 @@ self: {
        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
@@ -181980,38 +178003,6 @@ self: {
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
-     , bytestring, case-insensitive, connection, data-default-class
-     , hspec, hspec-core, hspec-discover, http-api-data, http-client
-     , http-client-tls, http-types, monad-control, mtl, QuickCheck
-     , retry, text, time, transformers, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "req";
-       version = "1.1.0";
-       sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7";
-       revision = "1";
-       editedCabalFile = "1qb458sldda1msrx8hyp31a5ybny2kdymsxhmsyk9i9c5gk0qqib";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base blaze-builder bytestring
-         case-insensitive connection data-default-class http-api-data
-         http-client http-client-tls http-types monad-control mtl retry text
-         time transformers transformers-base
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive
-         data-default-class hspec hspec-core http-client http-types
-         monad-control mtl QuickCheck text time unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doCheck = false;
-       description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "req_1_2_1" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, data-default-class
      , hspec, hspec-core, hspec-discover, http-api-data, http-client
@@ -182041,7 +178032,6 @@ self: {
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "req-conduit" = callPackage
@@ -182139,32 +178129,6 @@ self: {
      }) {};
 
   "require" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty
-     , tasty-hspec, text, universum
-     }:
-     mkDerivation {
-       pname = "require";
-       version = "0.2.1";
-       sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring megaparsec text universum
-       ];
-       executableHaskellDepends = [
-         base bytestring megaparsec text universum
-       ];
-       testHaskellDepends = [
-         base bytestring megaparsec tasty tasty-hspec text universum
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion megaparsec text universum
-       ];
-       description = "Scrap your qualified import clutter";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "require_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, inliterate
      , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
      }:
@@ -182192,7 +178156,6 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rerebase" = callPackage
@@ -183283,23 +179246,6 @@ self: {
      }) {};
 
   "rhine" = callPackage
-    ({ mkDerivation, base, containers, dunai, free, time, transformers
-     }:
-     mkDerivation {
-       pname = "rhine";
-       version = "0.4.0.1";
-       sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers dunai free time transformers
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Functional Reactive Programming with type-level clocks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rhine_0_5_0_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, dunai, free, time
      , transformers, vector-sized
      }:
@@ -183312,7 +179258,6 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -184983,37 +180928,6 @@ self: {
      }) {};
 
   "rss-conduit" = callPackage
-    ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
-     , conduit, conduit-combinators, containers, data-default
-     , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
-     , quickcheck-instances, resourcet, safe, safe-exceptions
-     , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , timerep, uri-bytestring, vinyl, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "rss-conduit";
-       version = "0.4.2.2";
-       sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps";
-       revision = "3";
-       editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn";
-       libraryHaskellDepends = [
-         atom-conduit base conduit conduit-combinators containers
-         dublincore-xml-conduit lens-simple safe safe-exceptions singletons
-         text time timerep uri-bytestring vinyl xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         atom-conduit base blaze-builder bytestring conduit
-         conduit-combinators data-default dublincore-xml-conduit lens-simple
-         mono-traversable QuickCheck quickcheck-instances resourcet
-         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
-         time uri-bytestring vinyl xml-conduit xml-types
-       ];
-       description = "Streaming parser/renderer for the RSS standard";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "rss-conduit_0_4_3_0" = callPackage
     ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
      , conduit, conduit-combinators, containers, data-default
      , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
@@ -185709,28 +181623,6 @@ self: {
      }) {};
 
   "safe-money" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , constraints, deepseq, hashable, serialise, store, tasty
-     , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf
-     }:
-     mkDerivation {
-       pname = "safe-money";
-       version = "0.6";
-       sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r";
-       libraryHaskellDepends = [
-         aeson base binary cereal constraints deepseq hashable serialise
-         store text vector-space xmlbf
-       ];
-       testHaskellDepends = [
-         aeson base binary bytestring cereal constraints deepseq hashable
-         serialise store tasty tasty-hunit tasty-quickcheck text
-         vector-space xmlbf
-       ];
-       description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe-money_0_7" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, deepseq
      , hashable, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      , vector-space
@@ -185749,7 +181641,6 @@ self: {
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-aeson" = callPackage
@@ -186132,6 +182023,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "salak_0_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, hspec, QuickCheck, scientific, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "salak";
+       version = "0.2.0";
+       sha256 = "0jxyg5kyjax6q75zgrgb60zp54i4p131hymqszk590nc3qca2csm";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "saltine" = callPackage
     ({ mkDerivation, base, bytestring, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
@@ -186703,32 +182616,6 @@ self: {
      }) {};
 
   "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml
-     }:
-     mkDerivation {
-       pname = "sbp";
-       version = "2.3.17";
-       sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet time yaml
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "sbp_2_4_0" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -186752,7 +182639,6 @@ self: {
        testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -186776,33 +182662,6 @@ self: {
      }) {};
 
   "sbv" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , 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.12";
-       sha256 = "1lbihjy2nbr77xm1jnvqdjqkabpxjlbdddsdvsr7n9a60bjcr2yx";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         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 directory doctest filepath Glob hlint
-         mtl QuickCheck random reinterpret-cast syb tasty tasty-golden
-         tasty-hunit tasty-quickcheck template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) z3;};
-
-  "sbv_7_13" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, deepseq, directory, doctest, filepath, generic-deriving
      , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
@@ -186827,7 +182686,6 @@ self: {
        testSystemDepends = [ z3 ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -186895,7 +182753,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scalendar_1_1_1" = callPackage
+  "scalendar" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }:
      mkDerivation {
        pname = "scalendar";
@@ -186909,23 +182767,6 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "scalendar" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, SCalendar
-     , text, time
-     }:
-     mkDerivation {
-       pname = "scalendar";
-       version = "1.2.0";
-       sha256 = "1b33w7fh9jfsr9wrdvnhc7nvn7km69f4qb03d0hb4zlylf6mxj7m";
-       libraryHaskellDepends = [ base containers text time ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck SCalendar text time
-       ];
-       description = "A library for handling calendars and resource availability over time";
-       license = stdenv.lib.licenses.mit;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -187028,23 +182869,6 @@ self: {
      }) {};
 
   "scanner" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
-     , hspec, text
-     }:
-     mkDerivation {
-       pname = "scanner";
-       version = "0.2";
-       sha256 = "1sd5czkfncadyxlbr13is44ad3kkk6rfwm9fqw8m4aipl1l0s0is";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring hspec ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring cereal criterion text
-       ];
-       description = "Fast non-backtracking incremental combinator parsing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scanner_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
      , hspec, text
      }:
@@ -187059,7 +182883,6 @@ self: {
        ];
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scanner-attoparsec" = callPackage
@@ -188689,22 +184512,6 @@ self: {
      }) {sedna = null;};
 
   "selda" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
-     , psqueues, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "selda";
-       version = "0.2.0.0";
-       sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj";
-       libraryHaskellDepends = [
-         base bytestring exceptions hashable mtl psqueues text time
-         unordered-containers
-       ];
-       description = "Multi-backend, high-level EDSL for interacting with SQL databases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda_0_3_4_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
      , psqueues, text, time, unordered-containers
      }:
@@ -188718,27 +184525,9 @@ self: {
        ];
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
-     , selda, text
-     }:
-     mkDerivation {
-       pname = "selda-postgresql";
-       version = "0.1.7.2";
-       sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z";
-       revision = "1";
-       editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782";
-       libraryHaskellDepends = [
-         base bytestring exceptions postgresql-libpq selda text
-       ];
-       description = "PostgreSQL backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-postgresql_0_1_7_3" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
      , selda, text
      }:
@@ -188753,27 +184542,9 @@ self: {
        ];
        description = "PostgreSQL backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-sqlite" = callPackage
-    ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
-     , text
-     }:
-     mkDerivation {
-       pname = "selda-sqlite";
-       version = "0.1.6.0";
-       sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6";
-       revision = "2";
-       editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6";
-       libraryHaskellDepends = [
-         base direct-sqlite directory exceptions selda text
-       ];
-       description = "SQLite backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-sqlite_0_1_6_1" = callPackage
     ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
      , text
      }:
@@ -188788,7 +184559,6 @@ self: {
        ];
        description = "SQLite backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "select" = callPackage
@@ -188978,29 +184748,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
-     , cabal-doctest, comonad, containers, contravariant, distributive
-     , doctest, hashable, semigroups, tagged, template-haskell
-     , transformers, transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.2.2";
-       sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
-       revision = "4";
-       editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive hashable semigroups tagged template-haskell
-         transformers transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_3_1" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, hashable, semigroups, tagged, template-haskell
@@ -189019,7 +184766,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -189777,36 +185523,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
-     , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
-     , hspec, hspec-discover, http-api-data, http-media, http-types
-     , mmorph, mtl, natural-transformation, network-uri, QuickCheck
-     , quickcheck-instances, singleton-bool, string-conversions, tagged
-     , text, vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.14.1";
-       sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7";
-       revision = "1";
-       editedCabalFile = "1n9lwm77w0xi6jzqrhyn6akf71z140wngj4s5x2zkndq8wmg4rg4";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring case-insensitive
-         http-api-data http-media http-types mmorph mtl
-         natural-transformation network-uri singleton-bool
-         string-conversions tagged text vault
-       ];
-       testHaskellDepends = [
-         aeson aeson-compat base base-compat bytestring doctest hspec
-         QuickCheck quickcheck-instances string-conversions text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_15" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
      , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
      , hspec, hspec-discover, http-api-data, http-media, http-types
@@ -189832,7 +185548,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -190015,38 +185730,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.1";
-       sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
-       revision = "1";
-       editedCabalFile = "0l35r80yf1i3hjwls9cvhmzrjkgxfs103qcb1m650y77w1h3xr9p";
-       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_2_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
      , crypto-api, data-default-class, entropy, hspec, hspec-discover
@@ -190076,7 +185759,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
@@ -190225,6 +185907,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-wordpress" = callPackage
+    ({ mkDerivation, base, mtl, servant-server, text, time, wai
+     , wordpress-auth
+     }:
+     mkDerivation {
+       pname = "servant-auth-wordpress";
+       version = "1.0.0.0";
+       sha256 = "0ns744n58irm2la9xz4nqxz3yyb69vwbw2h9nqcfhr66dmqd80ar";
+       libraryHaskellDepends = [
+         base mtl servant-server text time wai wordpress-auth
+       ];
+       description = "Authenticate Routes Using Wordpress Cookies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant
      , servant-server, wai, warp
@@ -190311,38 +186008,6 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , exceptions, generics-sop, hspec, hspec-discover, http-api-data
-     , http-client, http-media, http-types, HUnit, markdown-unlit
-     , monad-control, mtl, network, QuickCheck, semigroupoids, servant
-     , servant-client-core, servant-server, stm, text, time
-     , transformers, transformers-base, transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.14";
-       sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
-       revision = "3";
-       editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers exceptions http-client
-         http-media http-types monad-control mtl semigroupoids
-         servant-client-core stm text time transformers transformers-base
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring generics-sop hspec http-api-data
-         http-client http-types HUnit markdown-unlit mtl network QuickCheck
-         servant servant-client-core servant-server text transformers
-         transformers-compat wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-client_0_15" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover
      , http-api-data, http-client, http-media, http-types, HUnit
@@ -190375,29 +186040,6 @@ self: {
      }) {};
 
   "servant-client-core" = callPackage
-    ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
-     , containers, deepseq, exceptions, free, generics-sop, hspec
-     , hspec-discover, http-api-data, http-media, http-types
-     , network-uri, QuickCheck, safe, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-client-core";
-       version = "0.14.1";
-       sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
-       revision = "2";
-       editedCabalFile = "02pvrccfwvvy53gma56jcqnbia3pm1pncyghdkjp519bwff9iwvb";
-       libraryHaskellDepends = [
-         base base-compat base64-bytestring bytestring containers exceptions
-         free generics-sop http-api-data http-media http-types network-uri
-         safe servant text
-       ];
-       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "Core functionality and class for client function generation for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client-core_0_15" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, deepseq, exceptions, free, generics-sop
      , hspec, hspec-discover, http-media, http-types, network-uri
@@ -190416,7 +186058,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-conduit" = callPackage
@@ -190522,36 +186163,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, control-monad-omega, hashable, hspec
-     , hspec-discover, http-media, http-types, lens, servant
-     , string-conversions, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.11.2";
-       sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
-       revision = "6";
-       editedCabalFile = "0w9yi4rmfq4irmnia9rl9pb66ix086ic9nd0grspnk54ib7970cl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         control-monad-omega hashable http-media http-types lens servant
-         string-conversions text unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base hspec lens servant string-conversions
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-docs_0_11_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, http-media
      , http-types, lens, servant, string-conversions, tasty
@@ -190578,7 +186189,6 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -190705,25 +186315,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , http-types, lens, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.11.1";
-       sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
-       revision = "4";
-       editedCabalFile = "1alal6ps1lwl8yd2vwkpmkn4a69blr1ws2cba7mc7a2w63lg1pyz";
-       libraryHaskellDepends = [
-         base base-compat http-types lens servant text
-       ];
-       testHaskellDepends = [ base hspec servant ];
-       testToolDepends = [ hspec-discover ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_15" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -190738,7 +186329,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generate" = callPackage
@@ -190934,32 +186524,6 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
-     , hspec-expectations, language-ecmascript, lens, QuickCheck
-     , servant, servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-js";
-       version = "0.9.3.2";
-       sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
-       revision = "3";
-       editedCabalFile = "0j5kmqzhkyb1wmvyxz0r20473myzp9bqcdgjbi8i4k1lfvcjsigq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat charset lens servant servant-foreign text
-       ];
-       testHaskellDepends = [
-         base base-compat hspec hspec-expectations language-ecmascript lens
-         QuickCheck servant text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-js_0_9_4" = callPackage
     ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
      , hspec-expectations, language-ecmascript, lens, QuickCheck
      , servant, servant-foreign, text
@@ -191081,36 +186645,6 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring
-     , bytestring-conversion, hspec, hspec-discover, hspec-wai
-     , http-types, QuickCheck, servant, servant-server, transformers
-     , wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-mock";
-       version = "0.8.4";
-       sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
-       revision = "3";
-       editedCabalFile = "13sbgnzr0yfrbrbvzc6v66lxrgvg3pb7h9alvmg77kmm95gmx8mm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring http-types QuickCheck servant
-         servant-server transformers wai
-       ];
-       executableHaskellDepends = [
-         aeson base QuickCheck servant-server warp
-       ];
-       testHaskellDepends = [
-         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
-         servant-server wai
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-mock_0_8_5" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , bytestring-conversion, hspec, hspec-discover, hspec-wai
      , http-types, QuickCheck, servant, servant-server, transformers
@@ -191136,7 +186670,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-multipart" = callPackage
@@ -191487,20 +187020,6 @@ self: {
      }) {};
 
   "servant-ruby" = callPackage
-    ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-ruby";
-       version = "0.8.0.2";
-       sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6";
-       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_9_0_0" = callPackage
     ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
      , text
      }:
@@ -191512,7 +187031,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
@@ -191535,44 +187053,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
-     , bytestring, Cabal, cabal-doctest, containers, directory, doctest
-     , exceptions, filepath, hspec, hspec-discover, hspec-wai
-     , http-api-data, http-media, http-types, monad-control, mtl
-     , network, network-uri, QuickCheck, resourcet, safe, servant
-     , should-not-typecheck, string-conversions, tagged, temporary, text
-     , transformers, transformers-base, transformers-compat, wai
-     , wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.14.1";
-       sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02";
-       revision = "1";
-       editedCabalFile = "028vqbmqkc9gjsk34n74ssi0xfn085v26zdvpixgfi5yd7cvfg03";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-compat base64-bytestring bytestring containers exceptions
-         filepath http-api-data http-media http-types monad-control mtl
-         network network-uri resourcet servant string-conversions tagged
-         text transformers transformers-base transformers-compat wai
-         wai-app-static word8
-       ];
-       executableHaskellDepends = [ aeson base servant text wai warp ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory
-         doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
-         servant should-not-typecheck string-conversions temporary text
-         transformers transformers-compat wai wai-extra
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-server_0_15" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, Cabal, cabal-doctest, containers, directory, doctest
      , exceptions, filepath, hspec, hspec-discover, hspec-wai
@@ -191607,7 +187087,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -191833,32 +187312,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
-     , hspec-discover, http-media, insert-ordered-containers, lens
-     , QuickCheck, servant, singleton-bool, swagger2, template-haskell
-     , text, time, unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.6";
-       sha256 = "1gx61328ciprc6ps8xzawfj483s28h5z21zmqczqqh3wfvc8h77w";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hspec http-media
-         insert-ordered-containers lens QuickCheck servant singleton-bool
-         swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat directory doctest filepath hspec lens
-         QuickCheck servant swagger2 template-haskell text time utf8-string
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_7" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -191882,28 +187335,9 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui" = callPackage
-    ({ mkDerivation, base, bytestring, file-embed-lzma, servant
-     , servant-server, servant-swagger-ui-core, swagger2, text
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui";
-       version = "0.3.0.3.13.2";
-       sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n";
-       revision = "2";
-       editedCabalFile = "0sz08w56f7p74saass6xdzmbpyk78hpa9d79kkd2nclwinajpkgr";
-       libraryHaskellDepends = [
-         base bytestring file-embed-lzma servant servant-server
-         servant-swagger-ui-core swagger2 text
-       ];
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui_0_3_2_3_19_3" = callPackage
     ({ mkDerivation, base, bytestring, file-embed-lzma, servant
      , servant-server, servant-swagger-ui-core, swagger2, text
      }:
@@ -191919,30 +187353,9 @@ self: {
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
-    ({ mkDerivation, base, blaze-markup, bytestring, http-media
-     , servant, servant-blaze, servant-server, swagger2, text
-     , transformers, transformers-compat, wai-app-static
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui-core";
-       version = "0.3.1";
-       sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb";
-       revision = "1";
-       editedCabalFile = "10p5yjzvfdn764mszlsx49kb55ygzi5m2mq32l9m91imvj1926b1";
-       libraryHaskellDepends = [
-         base blaze-markup bytestring http-media servant servant-blaze
-         servant-server swagger2 text transformers transformers-compat
-         wai-app-static
-       ];
-       description = "Servant swagger ui core components";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui-core_0_3_2" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, http-media
      , servant, servant-blaze, servant-server, swagger2, text
      , transformers, transformers-compat, wai-app-static
@@ -191960,7 +187373,6 @@ self: {
        ];
        description = "Servant swagger ui core components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -192070,27 +187482,6 @@ self: {
      }) {};
 
   "servant-yaml" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
-     , servant, servant-server, wai, warp, yaml
-     }:
-     mkDerivation {
-       pname = "servant-yaml";
-       version = "0.1.0.0";
-       sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "22";
-       editedCabalFile = "1mi52j2c7960k0qmxqd7238yxgbccb0xgfj3ahh0zfckficn9bk7";
-       libraryHaskellDepends = [
-         base bytestring http-media servant yaml
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring http-media servant servant-server
-         wai warp yaml
-       ];
-       description = "Servant support for yaml";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-yaml_0_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
      }:
@@ -192107,7 +187498,6 @@ self: {
        ];
        description = "Servant support for yaml";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-zeppelin" = callPackage
@@ -192209,33 +187599,6 @@ self: {
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
-     , text, time, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "serverless-haskell";
-       version = "0.6.7";
-       sha256 = "0p34wd3g1gg7c6yp018164ky1rqz67wq5fcax6fis0hn3g8qgjm9";
-       libraryHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive http-types iproute
-         lens text time unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
-         http-types iproute lens raw-strings-qq text time unix
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "serverless-haskell_0_8_4" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, network
@@ -192263,6 +187626,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "serverless-haskell_0_8_5" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
+     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
+     , hspec, hspec-discover, http-types, iproute, lens, network
+     , network-simple, raw-strings-qq, text, time, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serverless-haskell";
+       version = "0.8.5";
+       sha256 = "0jnq2z5h7bqzbrppznw38vq9ibbijddw3jkx3vhrf0jzvk50gqqg";
+       libraryHaskellDepends = [
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive http-types iproute
+         lens network network-simple text time unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
+         http-types iproute lens network network-simple raw-strings-qq text
+         time unix unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Deploying Haskell code onto AWS Lambda using Serverless";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, data-default, hashable, hspec, nonce, path-pieces
@@ -193804,8 +189195,8 @@ self: {
     ({ mkDerivation, base, containers, text, unix }:
      mkDerivation {
        pname = "shell-monad";
-       version = "0.6.6";
-       sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038";
+       version = "0.6.7";
+       sha256 = "101ivifq9gcfafj295l773wpv0c0cqmh8zjzg65r1fhblhbd30f7";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -195723,26 +191114,6 @@ self: {
      }) {};
 
   "singletons" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th
-     , mtl, process, syb, tasty, tasty-golden, template-haskell, text
-     , th-desugar, transformers
-     }:
-     mkDerivation {
-       pname = "singletons";
-       version = "2.4.1";
-       sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th mtl syb template-haskell text
-         th-desugar transformers
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-golden
-       ];
-       description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singletons_2_5_1" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
      , template-haskell, text, th-desugar, transformers
@@ -195759,7 +191130,6 @@ self: {
        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
@@ -196225,6 +191595,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skip-var_0_1_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "skip-var";
+       version = "0.1.1.0";
+       sha256 = "07nljfjd45fagisd99pqz2jhznfapk9cgd9lyy9cija7pmxfbg5z";
+       libraryHaskellDepends = [ base ];
+       description = "Skip variables";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skulk" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -196414,6 +191796,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "slack-verify" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
+     , hspec
+     }:
+     mkDerivation {
+       pname = "slack-verify";
+       version = "0.1.0.0";
+       sha256 = "0rkanwf4q9mlhsxmxhpnn5svnrz0hkd9iw4yczjidm5mb0xrdqs1";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cryptonite
+       ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cryptonite hspec
+       ];
+       description = "Slack API Request Verification HMAC";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slack-web" = callPackage
     ({ mkDerivation, aeson, base, containers, errors, hspec
      , http-api-data, http-client, http-client-tls, megaparsec, mtl
@@ -196466,27 +191866,6 @@ self: {
      }) {};
 
   "slave-thread" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
-     , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
-     , stm-containers, transformers
-     }:
-     mkDerivation {
-       pname = "slave-thread";
-       version = "1.0.2";
-       sha256 = "04sbbdgzsi1ww642b9fgbhx348c0a4qim4ak6bivwpnnimcj0wg4";
-       libraryHaskellDepends = [
-         base base-prelude list-t mmorph partial-handler stm-containers
-         transformers
-       ];
-       testHaskellDepends = [
-         base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
-       ];
-       description = "A principal solution to ghost threads and silent exceptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slave-thread_1_0_3" = callPackage
     ({ mkDerivation, base, deferred-folds, focus, foldl, QuickCheck
      , quickcheck-instances, rerebase, SafeSemaphore, stm-containers
      , tasty, tasty-hunit, tasty-quickcheck
@@ -200892,37 +196271,6 @@ self: {
      }) {};
 
   "squeal-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, binary-parser, bytestring
-     , bytestring-strict-builder, deepseq, doctest, generics-sop
-     , lifted-base, mmorph, monad-control, mtl, network-ip
-     , postgresql-binary, postgresql-libpq, profunctors, resource-pool
-     , scientific, text, time, transformers, transformers-base
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "squeal-postgresql";
-       version = "0.3.2.0";
-       sha256 = "022bh32r5cgkiical5jc7ax9im5a3nfl8v2cxc7v1rkq6ag2rclq";
-       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 profunctors
-         resource-pool scientific text time transformers transformers-base
-         uuid-types vector
-       ];
-       executableHaskellDepends = [
-         base bytestring generics-sop mtl text transformers
-         transformers-base vector
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Squeal PostgreSQL Library";
-       license = stdenv.lib.licenses.bsd3;
-       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
@@ -201352,34 +196700,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec
-     , megaparsec, mtl, template-haskell, text, unordered-containers
-     , vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "1.2.1";
-       sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "8";
-       editedCabalFile = "0jz9cg3w71nvxc4y6hrwjayxl2291q5xm5r4qrhz1ag1lvzk26yn";
-       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
-       ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "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
@@ -201406,7 +196726,6 @@ self: {
        ];
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -201728,18 +197047,18 @@ self: {
      }) {};
 
   "stack2cabal" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , hpack, stackage-to-hackage, text
+    ({ mkDerivation, base, bytestring, Cabal, directory, extra
+     , filepath, hpack, stackage-to-hackage, text
      }:
      mkDerivation {
        pname = "stack2cabal";
-       version = "1.0.0";
-       sha256 = "0pqyf8jpldb733i0g93z5w1r6rgxgdnswkd2ciw8pbq5dw38q2yf";
+       version = "1.0.2";
+       sha256 = "0zdyjf55zda465ai6bjp13a4f4khgz59smmaa2nlbbrjknlb1kbl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring Cabal directory filepath hpack stackage-to-hackage
-         text
+         base bytestring Cabal directory extra filepath hpack
+         stackage-to-hackage text
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
@@ -202597,33 +197916,6 @@ self: {
      }) {};
 
   "statistics" = callPackage
-    ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, 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.14.0.2";
-       sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
-       revision = "2";
-       editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3";
-       libraryHaskellDepends = [
-         aeson base base-orphans binary deepseq erf math-functions monad-par
-         mwc-random primitive vector vector-algorithms
-         vector-binary-instances vector-th-unbox
-       ];
-       testHaskellDepends = [
-         aeson base binary 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;
-     }) {};
-
-  "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
@@ -202648,7 +197940,6 @@ self: {
        ];
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -203175,35 +198466,6 @@ self: {
      }) {};
 
   "stm-containers" = callPackage
-    ({ mkDerivation, async, base, base-prelude, containers, criterion
-     , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
-     , mtl-prelude, mwc-random, mwc-random-monad, placeholders
-     , primitive, QuickCheck, text, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "stm-containers";
-       version = "0.2.16";
-       sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139";
-       libraryHaskellDepends = [
-         base base-prelude focus hashable list-t primitive transformers
-       ];
-       testHaskellDepends = [
-         base base-prelude focus free hashable HTF list-t loch-th mtl
-         mtl-prelude placeholders primitive QuickCheck transformers
-         unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         async base base-prelude containers criterion focus free hashable
-         hashtables list-t loch-th mtl mtl-prelude mwc-random
-         mwc-random-monad placeholders text unordered-containers vector
-       ];
-       description = "Containers for STM";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "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
@@ -203792,30 +199054,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.24.4";
-       sha256 = "0n4gry4vgqb64vy9ncyz3hcsjv31a869al5kbwgzi7pd7rp61zla";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_29_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -203837,7 +199075,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -204489,29 +199726,6 @@ self: {
      }) {};
 
   "streamly" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control
-     , mtl, QuickCheck, random, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streamly";
-       version = "0.3.0";
-       sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         atomic-primops base containers exceptions heaps lockfree-queue
-         monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck random transformers
-       ];
-       benchmarkHaskellDepends = [ base deepseq gauge random ];
-       description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streamly_0_5_2" = callPackage
     ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
      , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
      , monad-control, mtl, QuickCheck, random, transformers
@@ -204537,7 +199751,6 @@ self: {
        ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streamproc" = callPackage
@@ -206709,39 +201922,6 @@ self: {
      }) {};
 
   "swagger2" = 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
-     , quickcheck-instances, scientific, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.2.2";
-       sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2";
-       revision = "3";
-       editedCabalFile = "187jl8slpyr6blcxnhdp7wf85ab54pgqnbl11n816xg6fyqy7ylk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base base-compat-batteries bytestring containers generics-sop
-         hashable http-media insert-ordered-containers lens mtl network
-         scientific template-haskell text time transformers
-         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
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_3_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
      , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop
      , Glob, hashable, hspec, hspec-discover, http-media, HUnit
@@ -206771,7 +201951,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -206841,31 +202020,6 @@ self: {
      }) {};
 
   "swish" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hashable
-     , HUnit, intern, mtl, network-uri, old-locale, polyparse
-     , semigroups, test-framework, test-framework-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "swish";
-       version = "0.9.2.1";
-       sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers directory filepath hashable intern mtl network-uri
-         old-locale polyparse semigroups text time
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers hashable HUnit network-uri old-locale semigroups
-         test-framework test-framework-hunit text time
-       ];
-       description = "A semantic web toolkit";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {};
-
-  "swish_0_10_0_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hashable
      , HUnit, intern, mtl, network-uri, old-locale, polyparse
      , semigroups, test-framework, test-framework-hunit, text, time
@@ -206888,7 +202042,6 @@ self: {
        ];
        description = "A semantic web toolkit";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sws" = callPackage
@@ -208480,23 +203633,6 @@ self: {
      }) {};
 
   "tagged" = callPackage
-    ({ mkDerivation, base, deepseq, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "tagged";
-       version = "0.8.5";
-       sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74";
-       revision = "2";
-       editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5";
-       libraryHaskellDepends = [
-         base deepseq template-haskell transformers transformers-compat
-       ];
-       description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tagged_0_8_6" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell, transformers }:
      mkDerivation {
        pname = "tagged";
@@ -208507,7 +203643,6 @@ self: {
        ];
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-binary" = callPackage
@@ -209133,31 +204268,6 @@ self: {
      }) {};
 
   "tar-conduit" = 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.2.5";
-       sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3";
-       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;
-     }) {};
-
-  "tar-conduit_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, criterion, deepseq, directory
      , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
@@ -209180,7 +204290,6 @@ self: {
        ];
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -209333,23 +204442,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
-     , optparse-applicative, stm, tagged, unbounded-delays, unix
-     , wcwidth
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "1.1.0.4";
-       sha256 = "1gzf1gqi5p78m8rc21g9a8glc69r68igxr9n4qn4bs6wqyi3ykiv";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers mtl optparse-applicative
-         stm tagged unbounded-delays unix wcwidth
-       ];
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_1_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      , wcwidth
@@ -209364,27 +204456,9 @@ self: {
        ];
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
-     , xml
-     }:
-     mkDerivation {
-       pname = "tasty-ant-xml";
-       version = "1.1.4";
-       sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
-       libraryHaskellDepends = [
-         base containers directory filepath generic-deriving ghc-prim mtl
-         stm tagged tasty transformers xml
-       ];
-       description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-ant-xml_1_1_5" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
      , xml
@@ -209399,7 +204473,6 @@ self: {
        ];
        description = "Render tasty output to XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-auto" = callPackage
@@ -212055,28 +207128,6 @@ self: {
      }) {};
 
   "text-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring, criterion
-     , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "text-builder";
-       version = "0.5.4.3";
-       sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h";
-       libraryHaskellDepends = [
-         base base-prelude bytestring semigroups text
-       ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ criterion rerebase ];
-       description = "An efficient strict text builder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "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
@@ -212623,40 +207674,6 @@ self: {
      }) {};
 
   "text-show" = 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.4";
-       sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
-       revision = "2";
-       editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82";
-       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;
-     }) {};
-
-  "text-show_3_7_5" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers
      , contravariant, criterion, deepseq, deriving-compat
@@ -212688,46 +207705,9 @@ self: {
        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
-     , haskeline, hoopl, 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.6.5";
-       sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
-       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
-         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 hoopl 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-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
@@ -213076,22 +208056,6 @@ self: {
      }) {};
 
   "th-abstraction" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-abstraction";
-       version = "0.2.8.0";
-       sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
-       revision = "1";
-       editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       testHaskellDepends = [ base containers template-haskell ];
-       description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "th-abstraction_0_2_10_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
@@ -213103,7 +208067,6 @@ self: {
        testHaskellDepends = [ base containers template-haskell ];
        description = "Nicer interface for reified information about data types";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-alpha" = callPackage
@@ -213197,28 +208160,6 @@ self: {
      }) {};
 
   "th-desugar" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
-     , template-haskell, th-expand-syns, th-lift, th-orphans
-     }:
-     mkDerivation {
-       pname = "th-desugar";
-       version = "1.8";
-       sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv";
-       revision = "1";
-       editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd";
-       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;
-     }) {};
-
-  "th-desugar_1_9" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
      , template-haskell, th-expand-syns, th-lift, th-orphans
      }:
@@ -213236,7 +208177,6 @@ self: {
        ];
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -213467,27 +208407,6 @@ self: {
      }) {};
 
   "th-printf" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring
-     , charset, containers, criterion, hspec, HUnit, QuickCheck
-     , template-haskell, text, transformers, trifecta, utf8-string
-     }:
-     mkDerivation {
-       pname = "th-printf";
-       version = "0.5.1";
-       sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6";
-       libraryHaskellDepends = [
-         ansi-wl-pprint attoparsec base charset containers template-haskell
-         text transformers trifecta utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring hspec HUnit QuickCheck template-haskell text
-       ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Compile-time printf";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "th-printf_0_6_0" = callPackage
     ({ mkDerivation, base, charset, containers, hspec, HUnit
      , microlens-platform, mtl, parsec, QuickCheck, semigroups
      , template-haskell, th-lift, transformers
@@ -213505,7 +208424,6 @@ self: {
        ];
        description = "Quasiquoters for printf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-compat" = callPackage
@@ -213892,6 +208810,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "thread-hierarchy_0_3_0_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, stm }:
+     mkDerivation {
+       pname = "thread-hierarchy";
+       version = "0.3.0.1";
+       sha256 = "0d2wbm75f59vj1h18afdhb1wqyclv5gpgj6pyrhbcnf7aa2490c1";
+       libraryHaskellDepends = [ base containers stm ];
+       testHaskellDepends = [ base containers hspec stm ];
+       description = "Simple Haskel thread management in hierarchical manner";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "thread-local-storage" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, criterion }:
      mkDerivation {
@@ -214325,26 +209256,6 @@ self: {
      }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;};
 
   "tibetan-utils" = callPackage
-    ({ mkDerivation, base, composition-prelude, either, hspec
-     , hspec-megaparsec, megaparsec, text, text-show
-     }:
-     mkDerivation {
-       pname = "tibetan-utils";
-       version = "0.1.1.5";
-       sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q";
-       revision = "2";
-       editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf";
-       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;
-     }) {};
-
-  "tibetan-utils_0_1_1_9" = callPackage
     ({ mkDerivation, base, composition-prelude, either, hspec
      , hspec-megaparsec, megaparsec, text, text-show
      }:
@@ -214360,7 +209271,6 @@ self: {
        ];
        description = "Parse and display tibetan numerals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -214434,8 +209344,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "1.0.3";
-       sha256 = "1blzlahn1xsp03wiv7ci4n6795xx8i9syhclbgcx6fy6gkfr2wy2";
+       version = "1.0.5";
+       sha256 = "07wx1p2avr731xmi5i0sx4k7xp4ayszz3j32y2i83wnv5kvf8szs";
        libraryHaskellDepends = [
          base bifunctors colour containers hashable hosc monad-loops mtl
          mwc-random network parsec random safe text time vector
@@ -216092,6 +211002,8 @@ self: {
        pname = "tokenizer-monad";
        version = "0.1.0.0";
        sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99";
+       revision = "1";
+       editedCabalFile = "0ahl0aj1xrpnd8m7aa9bp94lid0ypnmwi4cishrr1ixnwl2bdlnx";
        libraryHaskellDepends = [ base text ];
        description = "An efficient and easy-to-use tokenizer monad";
        license = stdenv.lib.licenses.gpl3;
@@ -216200,34 +211112,6 @@ self: {
      }) {};
 
   "tomland" = callPackage
-    ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
-     , megaparsec, mtl, parser-combinators, tasty, tasty-discover
-     , tasty-hedgehog, tasty-hspec, text, time, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "tomland";
-       version = "0.3.1";
-       sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw";
-       revision = "1";
-       editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base hashable megaparsec mtl parser-combinators text time
-         transformers unordered-containers
-       ];
-       executableHaskellDepends = [ base text time unordered-containers ];
-       testHaskellDepends = [
-         base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
-         tasty-hspec text time unordered-containers
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "TOML parser";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "tomland_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , gauge, hashable, hedgehog, hspec-megaparsec, htoml
      , htoml-megaparsec, megaparsec, mtl, parsec, parser-combinators
@@ -216255,7 +211139,6 @@ self: {
        ];
        description = "Bidirectional TOML parser";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomlcheck" = callPackage
@@ -217842,26 +212725,6 @@ self: {
      }) {};
 
   "triplesec" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, doctest, memory, mtl
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers
-     }:
-     mkDerivation {
-       pname = "triplesec";
-       version = "0.1.2.0";
-       sha256 = "0qvhsn5l35mmm71j5g0kv955hfjyzywvwgnjfjl8illgf2g79f46";
-       libraryHaskellDepends = [
-         base cryptonite memory mtl transformers
-       ];
-       testHaskellDepends = [
-         base bytestring doctest memory QuickCheck tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "triplesec_0_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, doctest, memory, mtl
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers
      }:
@@ -218579,29 +213442,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.12";
-       sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k";
-       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_13" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -218622,7 +213462,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -219715,8 +214554,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-map";
-       version = "0.1.4.0";
-       sha256 = "16ccnn5dk6wl2ynwwmc71rr64qpppqxlmxahmj5g3plq8hh0p40d";
+       version = "0.1.5.0";
+       sha256 = "12kamygfjaja0bk9fbc658hrr5zh4iadq3m1hwxfkk0gkr98pw0b";
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -219744,27 +214583,6 @@ self: {
      }) {};
 
   "type-of-html" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
-     , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck
-     , random, temporary, text, weigh
-     }:
-     mkDerivation {
-       pname = "type-of-html";
-       version = "1.4.1.0";
-       sha256 = "05c9rsbfivw7dsjmci7rnv08i4xmyg59kqghqi0f3dr5hrvas8dv";
-       libraryHaskellDepends = [
-         base bytestring double-conversion ghc-prim text
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion deepseq ghc ghc-paths random
-         temporary text weigh
-       ];
-       description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-of-html_1_5_0_0" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
      , hspec, QuickCheck, random, temporary, text, weigh
@@ -219783,7 +214601,6 @@ self: {
        ];
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html-static" = callPackage
@@ -220298,8 +215115,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.1.1";
-       sha256 = "1csg945w81qqa5fipj9fyzqy1f2n6blf55cjcqg7gm1k1jln768k";
+       version = "0.7.2.1";
+       sha256 = "1fdn7l9dayaii03n63cv3jgaqmblhskfyq3g3qrqw79z1jl755bk";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -220955,6 +215772,45 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unbeliever" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal
+     , chronologique, containers, deepseq, directory, exceptions
+     , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm
+     , template-haskell, terminal-size, text, text-short, transformers
+     , unix, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "unbeliever";
+       version = "0.8.0.0";
+       sha256 = "1cq7w09320nz6jcdg8gcapbsajlihx1836502m36rgm4w9vbxvqi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring Cabal chronologique containers deepseq
+         directory exceptions fingertree hashable hourglass mtl
+         prettyprinter prettyprinter-ansi-terminal safe-exceptions
+         scientific stm template-haskell terminal-size text text-short
+         transformers unix unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring Cabal chronologique containers deepseq
+         directory exceptions fingertree hashable hourglass hspec mtl
+         prettyprinter prettyprinter-ansi-terminal safe-exceptions
+         scientific stm template-haskell terminal-size text text-short
+         transformers unix unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson async base bytestring Cabal chronologique containers deepseq
+         directory exceptions fingertree gauge hashable hourglass mtl
+         prettyprinter prettyprinter-ansi-terminal safe-exceptions
+         scientific stm template-haskell terminal-size text text-short
+         transformers unix unordered-containers vector
+       ];
+       description = "Opinionated Haskell Interoperability";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unbound" = callPackage
     ({ mkDerivation, base, binary, containers, mtl, parsec, pretty
      , QuickCheck, RepLib, template-haskell, transformers
@@ -220976,28 +215832,6 @@ self: {
      }) {};
 
   "unbound-generics" = 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.3.4";
-       sha256 = "01g8zhf9plgl3fcj57fkma3rkdwmh28rla3r1cr0bfmbd03q3fva";
-       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;
-     }) {};
-
-  "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
@@ -221017,7 +215851,6 @@ self: {
        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
@@ -221120,6 +215953,8 @@ self: {
        pname = "unescaping-print";
        version = "0.1";
        sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
+       revision = "1";
+       editedCabalFile = "0w8fw1nymnj34lnm2q8nj1ymcbzw6q6jpp4c1h2w5b0q4rdw41jv";
        libraryHaskellDepends = [ base ];
        description = "Tiny package providing unescaping versions of show and print";
        license = stdenv.lib.licenses.bsd3;
@@ -221996,33 +216831,6 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
-     , text, transformers, type-operators, unordered-containers
-     , utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.2.0";
-       sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text transformers
-         type-operators unordered-containers utf8-string vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -222046,7 +216854,6 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -222173,13 +216980,14 @@ self: {
      }) {};
 
   "unix-time" = callPackage
-    ({ mkDerivation, base, binary, bytestring, doctest, hspec
-     , old-locale, old-time, QuickCheck, time
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
+     , doctest, hspec, old-locale, old-time, QuickCheck, time
      }:
      mkDerivation {
        pname = "unix-time";
-       version = "0.3.8";
-       sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw";
+       version = "0.4.3";
+       sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base binary bytestring old-time ];
        testHaskellDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -222188,14 +216996,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unix-time_0_4_3" = callPackage
+  "unix-time_0_4_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
      , doctest, hspec, old-locale, old-time, QuickCheck, time
      }:
      mkDerivation {
        pname = "unix-time";
-       version = "0.4.3";
-       sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53";
+       version = "0.4.4";
+       sha256 = "1hgh7v2xcscd69hdbnijp0bh0h1gg9y4qygp7bzwapmlckk3cihx";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base binary bytestring old-time ];
        testHaskellDepends = [
@@ -222495,6 +217303,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unpacked-maybe-numeric" = callPackage
+    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }:
+     mkDerivation {
+       pname = "unpacked-maybe-numeric";
+       version = "0.1.0.0";
+       sha256 = "19jz91jkbvnldy56kv9wb1nmbwvlxjh7nqlxc99nq6yi4whsh8gj";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "maybes of numeric values with fewer indirections";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unpacked-these" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck
      , quickcheck-classes, these, unpacked-maybe
@@ -223177,26 +217997,6 @@ self: {
      }) {};
 
   "urlpath" = callPackage
-    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
-     , monad-control, monad-control-aligned, monad-logger, mtl, path
-     , path-extra, resourcet, split, strict, text, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "urlpath";
-       version = "9.0.0";
-       sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh";
-       libraryHaskellDepends = [
-         attoparsec-uri base exceptions mmorph monad-control
-         monad-control-aligned monad-logger mtl path path-extra resourcet
-         split strict text transformers transformers-base vector
-       ];
-       description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "urlpath_9_0_1" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl, path
      , path-extra, resourcet, split, strict, text, transformers
@@ -224044,6 +218844,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vabal" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cassava, deepseq
+     , directory, filepath, http-client, http-client-tls, http-types
+     , optparse-applicative, process, tar, unix, vector
+     }:
+     mkDerivation {
+       pname = "vabal";
+       version = "1.0.0";
+       sha256 = "01sfg1rwh1qrawqpzn2b9fg415ha029lgfsrxy4xqkpdpxpkajrk";
+       isLibrary = false;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal cassava directory filepath http-client
+         http-client-tls http-types vector
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal cassava directory filepath
+         optparse-applicative process
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal deepseq directory filepath process tar unix
+       ];
+       doHaddock = false;
+       description = "the cabal companion";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "vacuum" = callPackage
     ({ mkDerivation, array, base, containers, ghc-prim }:
      mkDerivation {
@@ -224273,18 +219100,6 @@ self: {
      }) {};
 
   "validity" = callPackage
-    ({ mkDerivation, base, hspec }:
-     mkDerivation {
-       pname = "validity";
-       version = "0.7.0.0";
-       sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
-       description = "Validity typeclass";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity_0_9_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "validity";
@@ -224294,7 +219109,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Validity typeclass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-aeson" = callPackage
@@ -224314,17 +219128,6 @@ self: {
      }) {};
 
   "validity-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, validity }:
-     mkDerivation {
-       pname = "validity-bytestring";
-       version = "0.3.0.2";
-       sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2";
-       libraryHaskellDepends = [ base bytestring validity ];
-       description = "Validity instances for bytestring";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-bytestring_0_4_0_0" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
@@ -224333,7 +219136,6 @@ self: {
        libraryHaskellDepends = [ base bytestring validity ];
        description = "Validity instances for bytestring";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-containers" = callPackage
@@ -224952,24 +219754,6 @@ self: {
      }) {};
 
   "vector-algorithms" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primitive
-     , QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "vector-algorithms";
-       version = "0.7.0.4";
-       sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg";
-       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_8_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
      , primitive, QuickCheck, vector
      }:
@@ -224984,7 +219768,6 @@ self: {
        benchmarkHaskellDepends = [ base mwc-random vector ];
        description = "Efficient algorithms for vector arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-binary" = callPackage
@@ -225253,22 +220036,6 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, adjunctions, base, deepseq, distributive
-     , finite-typelits, indexed-list-literals, primitive, vector
-     }:
-     mkDerivation {
-       pname = "vector-sized";
-       version = "1.0.4.0";
-       sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4";
-       libraryHaskellDepends = [
-         adjunctions base deepseq distributive finite-typelits
-         indexed-list-literals primitive vector
-       ];
-       description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-sized_1_2_0_0" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive
      , finite-typelits, hashable, indexed-list-literals, primitive
      , vector
@@ -225283,23 +220050,9 @@ self: {
        ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space" = callPackage
-    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
-     mkDerivation {
-       pname = "vector-space";
-       version = "0.13";
-       sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482";
-       revision = "2";
-       editedCabalFile = "1p9vibym0ggr1rjyak0wphswdl4vik2b2w85afgvyj9zn32w28bw";
-       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
-       description = "Vector & affine spaces, linear maps, and derivatives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-space_0_15" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
@@ -225308,7 +220061,6 @@ self: {
        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
@@ -225598,24 +220350,6 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
-     , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "versions";
-       version = "3.4.0.1";
-       sha256 = "0r7crjnzllip9ya3lgf7cckfgz57daq379sh19z7adlzj8rxhimg";
-       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;
-     }) {};
-
-  "versions_3_5_0" = callPackage
     ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
      , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -225633,7 +220367,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vfr-waypoints" = callPackage
@@ -225743,24 +220476,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.25";
-       sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws";
-       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_26" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -225776,7 +220491,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -225909,28 +220623,6 @@ self: {
      }) {};
 
   "vinyl" = callPackage
-    ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
-     , lens, linear, microlens, mwc-random, primitive
-     , should-not-typecheck, singletons, tagged, vector
-     }:
-     mkDerivation {
-       pname = "vinyl";
-       version = "0.8.1.1";
-       sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh";
-       revision = "1";
-       editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr";
-       libraryHaskellDepends = [ array base ghc-prim ];
-       testHaskellDepends = [
-         base doctest hspec lens microlens should-not-typecheck singletons
-       ];
-       benchmarkHaskellDepends = [
-         base criterion linear microlens mwc-random primitive tagged vector
-       ];
-       description = "Extensible Records";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "vinyl_0_10_0_1" = 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
@@ -225950,7 +220642,6 @@ self: {
        ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -226179,25 +220870,6 @@ self: {
      }) {};
 
   "vivid" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , hashable, MonadRandom, mtl, network, process, random
-     , random-shuffle, split, stm, time, transformers, utf8-string
-     , vivid-osc, vivid-supercollider
-     }:
-     mkDerivation {
-       pname = "vivid";
-       version = "0.3.0.2";
-       sha256 = "16dvg5yq26fkrq01mn3c4byz32xld3alxa8h9m16gi4g04f99q00";
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath hashable MonadRandom
-         mtl network process random random-shuffle split stm time
-         transformers utf8-string vivid-osc vivid-supercollider
-       ];
-       description = "Sound synthesis with SuperCollider";
-       license = "GPL";
-     }) {};
-
-  "vivid_0_4_2_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, hashable, MonadRandom, mtl, network, process, random
      , random-shuffle, split, stm, time, transformers, utf8-string
@@ -226214,23 +220886,9 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vivid-osc" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cereal, microspec, time
-     }:
-     mkDerivation {
-       pname = "vivid-osc";
-       version = "0.3.0.0";
-       sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57";
-       libraryHaskellDepends = [ base binary bytestring cereal time ];
-       testHaskellDepends = [ base bytestring cereal microspec time ];
-       description = "Open Sound Control encode/decode";
-       license = "GPL";
-     }) {};
-
-  "vivid-osc_0_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, microspec, time }:
      mkDerivation {
        pname = "vivid-osc";
@@ -226240,7 +220898,6 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vivid-supercollider" = callPackage
@@ -226249,8 +220906,8 @@ self: {
      }:
      mkDerivation {
        pname = "vivid-supercollider";
-       version = "0.3.0.0";
-       sha256 = "15fkqjf3hfhc262slr5znh4f320lw68h318wr4sdprml0sy9xdw3";
+       version = "0.4.1.2";
+       sha256 = "1jr132l3zgwxz3vnnqbm1ycms29izsbn6kdddq7204zz9y7hx96j";
        libraryHaskellDepends = [
          base binary bytestring cereal split utf8-string vivid-osc
        ];
@@ -226262,26 +220919,6 @@ self: {
        license = "GPL";
      }) {};
 
-  "vivid-supercollider_0_4_1_1" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cereal, microspec
-     , QuickCheck, split, utf8-string, vivid-osc
-     }:
-     mkDerivation {
-       pname = "vivid-supercollider";
-       version = "0.4.1.1";
-       sha256 = "1qf4hnslcmqkahxs5d55iljiybn46is41a5kikjd2vnbns4va0fb";
-       libraryHaskellDepends = [
-         base binary bytestring cereal split utf8-string vivid-osc
-       ];
-       testHaskellDepends = [
-         base binary bytestring cereal microspec QuickCheck utf8-string
-         vivid-osc
-       ];
-       description = "Implementation of SuperCollider server specifications";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "vk-aws-route53" = callPackage
     ({ mkDerivation, aws, base, bytestring, containers, http-conduit
      , http-types, old-locale, resourcet, text, time, xml-conduit
@@ -226493,40 +221130,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.21";
-       sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_25_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -226558,7 +221161,6 @@ self: {
        ];
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -227242,23 +221844,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, byteorder, bytestring, case-insensitive
-     , doctest, fast-logger, http-types, network, unix, unix-time, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.2";
-       sha256 = "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d";
-       libraryHaskellDepends = [
-         base byteorder bytestring case-insensitive fast-logger http-types
-         network unix unix-time wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_3" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
      , doctest, fast-logger, http-types, network, wai
      }:
@@ -227273,6 +221858,23 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "wai-logger_2_3_4" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.4";
+       sha256 = "004ng1r1qij0frlsyps0nz9b0ijn0zlk3i6qbb7lq1f4209ikzlk";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -228494,6 +223096,8 @@ self: {
        pname = "warc";
        version = "1.0.4";
        sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b";
+       revision = "1";
+       editedCabalFile = "1mdd3r1lg92rchy1zv4jwvrsn6x3wnplhbnwavpx0nivf3xp7m8q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229217,33 +223821,6 @@ self: {
      }) {};
 
   "web3" = callPackage
-    ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
-     , cryptonite, data-default, exceptions, generics-sop, hspec
-     , hspec-contrib, hspec-discover, hspec-expectations, http-client
-     , machines, memory, mtl, parsec, split, stm, tagged
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "web3";
-       version = "0.7.3.0";
-       sha256 = "1ff52krn6vylz8fjbj6224q48lg6cz4glg6xl9sgrz36ayliv0mg";
-       libraryHaskellDepends = [
-         aeson async base basement bytestring cereal cryptonite data-default
-         exceptions generics-sop http-client machines memory mtl parsec
-         tagged template-haskell text transformers
-       ];
-       testHaskellDepends = [
-         async base bytestring data-default generics-sop hspec hspec-contrib
-         hspec-discover hspec-expectations memory split stm tagged text time
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Ethereum API for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "web3_0_8_2_1" = callPackage
     ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
      , cryptonite, data-default, exceptions, generics-sop, hspec
      , hspec-contrib, hspec-discover, hspec-expectations, http-client
@@ -230622,22 +225199,6 @@ self: {
      }) {};
 
   "witherable" = callPackage
-    ({ mkDerivation, base, base-orphans, containers, hashable
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "witherable";
-       version = "0.2";
-       sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx";
-       libraryHaskellDepends = [
-         base base-orphans containers hashable transformers
-         unordered-containers vector
-       ];
-       description = "filterable traversable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "witherable_0_3" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, transformers-compat, unordered-containers, vector
      }:
@@ -230651,7 +225212,6 @@ self: {
        ];
        description = "filterable traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witness" = callPackage
@@ -231160,6 +225720,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wordpress-auth" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cookie
+     , cryptohash-md5, cryptohash-sha256, hs-php-session, http-types
+     , mtl, text, time, uri-encode
+     }:
+     mkDerivation {
+       pname = "wordpress-auth";
+       version = "1.0.0.0";
+       sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cookie cryptohash-md5
+         cryptohash-sha256 hs-php-session http-types mtl text time
+         uri-encode
+       ];
+       description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "words" = callPackage
     ({ mkDerivation, base, directory, text }:
      mkDerivation {
@@ -231722,31 +226300,6 @@ self: {
      }) {};
 
   "ws" = callPackage
-    ({ mkDerivation, async, attoparsec, attoparsec-uri, base
-     , bytestring, exceptions, haskeline, mtl, network
-     , optparse-applicative, strict, text, vector, websockets, wuss
-     }:
-     mkDerivation {
-       pname = "ws";
-       version = "0.0.4";
-       sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async attoparsec-uri base bytestring exceptions haskeline mtl
-         network text websockets wuss
-       ];
-       executableHaskellDepends = [
-         async attoparsec attoparsec-uri base bytestring exceptions
-         haskeline mtl network optparse-applicative strict text vector
-         websockets wuss
-       ];
-       description = "A simple CLI utility for interacting with a websocket";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ws_0_0_5" = callPackage
     ({ mkDerivation, async, attoparsec, attoparsec-uri, base
      , bytestring, exceptions, haskeline, mtl, network
      , optparse-applicative, strict, text, vector, websockets, wuss
@@ -233724,8 +228277,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.29.3";
-       sha256 = "1bg8nj9k8r7i7328djnf6bgqzdq7lgx9yjgvl9fqq76bkxzkgx0a";
+       version = "0.29.4";
+       sha256 = "08kis4pxw073cixpfv9ccnarxl425mxszsni5cqzbns1gl8qydsr";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -233897,8 +228450,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-extras";
-       version = "0.15";
-       sha256 = "0yi6p4s9vl92bnr0sbcvm80x37n4fyglm4x3lrc9l8mapbpxjr02";
+       version = "0.15.1";
+       sha256 = "1x61s81rnmh26i8bwd7jlpsa5jn7fsas2fsibg46bsszs5ln225q";
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
@@ -234506,6 +229059,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yam" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, data-default
+     , hspec, monad-logger, mtl, persistent, persistent-sqlite
+     , QuickCheck, random, reflection, resource-pool, resourcet, salak
+     , servant-server, servant-swagger, servant-swagger-ui, text, time
+     , unliftio-core, vault, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "yam";
+       version = "0.4.0";
+       sha256 = "1kapdqz6pn1x95xffm5w0wclj3hdyazmvvgmgir8kjlchfmdanmi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit data-default monad-logger mtl
+         persistent random reflection resource-pool resourcet salak
+         servant-server servant-swagger servant-swagger-ui text
+         unliftio-core vault wai warp
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit data-default monad-logger mtl
+         persistent persistent-sqlite random reflection resource-pool
+         resourcet salak servant-server servant-swagger servant-swagger-ui
+         text time unliftio-core vault wai wai-extra warp
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit data-default hspec monad-logger mtl
+         persistent QuickCheck random reflection resource-pool resourcet
+         salak servant-server servant-swagger servant-swagger-ui text
+         unliftio-core vault wai warp
+       ];
+       description = "Yam Web";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yam-app" = callPackage
     ({ mkDerivation, aeson, base, conduit, containers, ctrie
      , data-default, directory, exceptions, fast-logger, monad-control
@@ -234677,34 +229265,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , 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 = [ "-f-system-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat bytestring conduit containers
-         directory filepath hspec HUnit mockery resourcet scientific
-         semigroups template-haskell temporary text transformers
-         unordered-containers vector
-       ];
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "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
@@ -234731,7 +229291,6 @@ self: {
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-combinators" = callPackage
@@ -236364,17 +230923,6 @@ self: {
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, text, yesod-core, yesod-form }:
-     mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "1.0.2";
-       sha256 = "0y68k6xnb8i7wa2c1c0msc3p69azs4z0iwjdgkr0kaqzahw56scq";
-       libraryHaskellDepends = [ base text yesod-core yesod-form ];
-       description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-bootstrap4_2_1_0" = callPackage
     ({ mkDerivation, base, text, yesod-core, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -236383,7 +230931,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core yesod-form ];
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -236977,22 +231524,6 @@ self: {
      }) {};
 
   "yesod-recaptcha2" = callPackage
-    ({ mkDerivation, base, classy-prelude-yesod, http-conduit
-     , yesod-auth
-     }:
-     mkDerivation {
-       pname = "yesod-recaptcha2";
-       version = "0.2.4";
-       sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18";
-       libraryHaskellDepends = [
-         base classy-prelude-yesod http-conduit yesod-auth
-       ];
-       description = "yesod recaptcha2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-recaptcha2_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude, http-conduit
      , yesod-auth, yesod-core, yesod-form
      }:
@@ -237773,33 +232304,6 @@ self: {
      }) {};
 
   "yi-language" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, hashable, microlens-platform, oo-prototypes
-     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
-     , tasty-quickcheck, template-haskell, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "yi-language";
-       version = "0.17.1";
-       sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja";
-       libraryHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform pointedlist regex-base regex-tdfa tasty
-         tasty-hspec tasty-quickcheck template-haskell transformers-base
-         unordered-containers
-       ];
-       description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-language_0_18_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -237824,7 +232328,6 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -238959,31 +233462,6 @@ self: {
      }) {};
 
   "zip" = 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.1.0";
-       sha256 = "1p6r4rmagq2x44wizpxk3844vh5nv2k51wl3h6vx5xnf5im2v535";
-       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
-       ];
-       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;
-     }) {};
-
-  "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
@@ -239011,38 +233489,12 @@ self: {
        ];
        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
-     , temporary, text, time, unix, unzip, zlib
-     }:
-     mkDerivation {
-       pname = "zip-archive";
-       version = "0.3.3";
-       sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         array base binary bytestring containers digest directory filepath
-         mtl pretty text time unix zlib
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath HUnit process temporary time
-         unix
-       ];
-       testToolDepends = [ unzip ];
-       description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) unzip;};
-
-  "zip-archive_0_4" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, pretty, process
-     , temporary, text, time, unix, unzip, zlib
+     , temporary, text, time, unix, unzip, which, zlib
      }:
      mkDerivation {
        pname = "zip-archive";
@@ -239058,11 +233510,10 @@ self: {
          base bytestring directory filepath HUnit process temporary time
          unix
        ];
-       testToolDepends = [ unzip ];
+       testToolDepends = [ unzip which ];
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) unzip;};
+     }) {inherit (pkgs) unzip; inherit (pkgs) which;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
@@ -239095,29 +233546,6 @@ self: {
      }) {};
 
   "zip-stream" = callPackage
-    ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, digest, directory, exceptions, filepath, mtl
-     , primitive, resourcet, time, transformers, transformers-base, zlib
-     }:
-     mkDerivation {
-       pname = "zip-stream";
-       version = "0.1.1";
-       sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary binary-conduit bytestring conduit conduit-extra digest
-         exceptions mtl primitive resourcet time transformers-base zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring conduit conduit-extra directory filepath resourcet
-         time transformers
-       ];
-       description = "ZIP archive streaming using conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip-stream_0_2_0_1" = callPackage
     ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit
      , conduit-extra, digest, directory, exceptions, filepath, mtl
      , primitive, resourcet, text, time, transformers, transformers-base
@@ -239139,7 +233567,6 @@ self: {
        ];
        description = "ZIP archive streaming using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipedit" = callPackage

From 46cb1538a14f35edf37c9ae9af8c50ef6e38a760 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Dec 2018 11:14:39 +0100
Subject: [PATCH 2731/2793] haskellPackages: update default package set to
 ghc-8.6.3 (LTS 13.x)

---
 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 1493043d1c7..eac05e5125d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7006,7 +7006,7 @@ in
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc844.override {
+  haskellPackages = haskell.packages.ghc863.override {
     overrides = config.haskellPackageOverrides or haskell.packageOverrides;
   };
 

From 4f4313046e1ac6688c26c11c1647d6cd8decfe14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Dec 2018 11:23:56 +0100
Subject: [PATCH 2732/2793] Comment out some obsolete Haskell overrides to fix
 evaluation.

---
 .../haskell-modules/configuration-common.nix  | 37 +++++------
 .../configuration-ghc-8.6.x.nix               | 66 +++++++++----------
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 10c11415d8b..e6bbbe000d0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -51,7 +51,6 @@ self: super: {
   clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
-  hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
   hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
@@ -948,9 +947,9 @@ self: super: {
 
   # hledger needs a newer megaparsec version than we have in LTS 12.x.
   hledger-lib = super.hledger-lib.overrideScope (self: super: {
-    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
-    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
-    megaparsec = self.megaparsec_7_0_4;
+    # cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    # hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    # megaparsec = self.megaparsec_7_0_4;
   });
 
   # Copy hledger man pages from data directory into the proper place. This code
@@ -979,10 +978,10 @@ self: super: {
       cp -v *.info* $out/share/info/
     '';
   })).overrideScope (self: super: {
-    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
-    config-ini = self.config-ini_0_2_4_0;
-    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
-    megaparsec = self.megaparsec_7_0_4;
+    # cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    # config-ini = self.config-ini_0_2_4_0;
+    # hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    # megaparsec = self.megaparsec_7_0_4;
   });
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
@@ -1087,19 +1086,15 @@ self: super: {
   haddock-library = doJailbreak (dontCheck super.haddock-library);
   # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
 
-  # The tool needs a newer hpack version than the one mandated by LTS-12.x.
-  # Also generate shell completions.
-  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix"
-    (super.cabal2nix.overrideScope (self: super: {
-      hpack = self.hpack_0_31_1;
-      yaml = self.yaml_0_11_0_0;
-    }));
-  stack2nix = super.stack2nix.overrideScope (self: super: {
-    hpack = self.hpack_0_31_1;
-    yaml = self.yaml_0_11_0_0;
-  });
-  # Break out of "aeson <1.3, temporary <1.3".
-  stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack);
+  # Break out of tasty >=0.10 && <1.2.
+  aeson-compat = doJailbreak super.aeson-compat;
+
+  # Break out of pretty-show >=1.6 && <1.9
+  hedgehog = doJailbreak super.hedgehog;
+
+  # Generate shell completion.
+  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
+  stack = generateOptparseApplicativeCompletion "stack" super.stack;
 
   # https://github.com/pikajude/stylish-cabal/issues/11
   stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
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 f35172ed024..c29c89d69f4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -45,40 +45,38 @@ self: super: {
   hoopl = self.hoopl_3_10_2_2;
 
   # LTS-12.x versions do not compile.
-  base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_45;
-  cassava-megaparsec = doJailbreak super.cassava-megaparsec;
-  config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
-  contravariant = self.contravariant_1_5;
-  fgl = self.fgl_5_7_0_1;
-  free = self.free_5_1;
-  haddock-library = dontCheck super.haddock-library_1_7_0;
-  HaTeX = doJailbreak super.HaTeX;
-  hpack = self.hpack_0_31_1;
-  hslua = self.hslua_1_0_1;
-  hslua-module-text = self.hslua-module-text_0_2_0;
-  hspec = self.hspec_2_6_0;
-  hspec-contrib = self.hspec-contrib_0_5_1;
-  hspec-core = self.hspec-core_2_6_0;
-  hspec-discover = self.hspec-discover_2_6_0;
-  hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
-  hspec-meta = self.hspec-meta_2_6_0;
-  JuicyPixels = self.JuicyPixels_3_3_3;
-  lens = self.lens_4_17;
-  megaparsec = dontCheck (doJailbreak super.megaparsec);
-  pandoc = self.pandoc_2_5;
-  pandoc-citeproc = self.pandoc-citeproc_0_15;
-  pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
-  patience = markBrokenVersion "0.1.1" super.patience;
-  polyparse = self.polyparse_1_12_1;
-  primitive = self.primitive_0_6_4_0;
-  QuickCheck = self.QuickCheck_2_12_6_1;
-  semigroupoids = self.semigroupoids_5_3_1;
-  tagged = self.tagged_0_8_6;
-  vty = self.vty_5_25_1;
-  wizards = doJailbreak super.wizards;
-  wl-pprint-extras = doJailbreak super.wl-pprint-extras;
-  yaml = self.yaml_0_11_0_0;
+  # base-orphans = self.base-orphans_0_8;
+  # brick = self.brick_0_45;
+  # cassava-megaparsec = doJailbreak super.cassava-megaparsec;
+  # config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
+  # contravariant = self.contravariant_1_5;
+  # fgl = self.fgl_5_7_0_1;
+  # free = self.free_5_1;
+  # haddock-library = dontCheck super.haddock-library_1_7_0;
+  # HaTeX = doJailbreak super.HaTeX;
+  # hpack = self.hpack_0_31_1;
+  # hslua = self.hslua_1_0_1;
+  # hslua-module-text = self.hslua-module-text_0_2_0;
+  # hspec = self.hspec_2_6_0;
+  # hspec-contrib = self.hspec-contrib_0_5_1;
+  # hspec-core = self.hspec-core_2_6_0;
+  # hspec-discover = self.hspec-discover_2_6_0;
+  # hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
+  # hspec-meta = self.hspec-meta_2_6_0;
+  # JuicyPixels = self.JuicyPixels_3_3_3;
+  # lens = self.lens_4_17;
+  # megaparsec = dontCheck (doJailbreak super.megaparsec);
+  # pandoc = self.pandoc_2_5;
+  # pandoc-citeproc = self.pandoc-citeproc_0_15;
+  # pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
+  # patience = markBrokenVersion "0.1.1" super.patience;
+  # polyparse = self.polyparse_1_12_1;
+  # semigroupoids = self.semigroupoids_5_3_1;
+  # tagged = self.tagged_0_8_6;
+  # vty = self.vty_5_25_1;
+  # wizards = doJailbreak super.wizards;
+  # wl-pprint-extras = doJailbreak super.wl-pprint-extras;
+  # yaml = self.yaml_0_11_0_0;
 
   # https://github.com/tibbe/unordered-containers/issues/214
   unordered-containers = dontCheck super.unordered-containers;

From 08ca69a513d4e5427241524b3664ae11002bc261 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Dec 2018 14:02:07 +0100
Subject: [PATCH 2733/2793] haskell-hoopl: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 ---
 1 file changed, 3 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 c29c89d69f4..088e2d5f9ce 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -41,9 +41,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # 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.
   # base-orphans = self.base-orphans_0_8;
   # brick = self.brick_0_45;

From 4f4b151ae2b7f8f20e1651aa4931dc973be416e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Dec 2018 14:03:50 +0100
Subject: [PATCH 2734/2793] haskell-scalendar: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e6bbbe000d0..6fc6c2583f8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -868,10 +868,6 @@ self: super: {
     testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
   });
 
-  # These packages depend on each other, forming an infinite loop.
-  scalendar = markBroken (super.scalendar.override { SCalendar = null; });
-  SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
-
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;
   blaze-markup = doJailbreak super.blaze-markup;

From 302fe24374484ecf22c3db47c740a4552091feea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Dec 2018 05:16:52 -0800
Subject: [PATCH 2735/2793] appstream: 0.12.3 -> 0.12.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/appstream/versions
---
 pkgs/development/libraries/appstream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index f53b63472cc..aded6945cb1 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "appstream-${version}";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner  = "ximion";
     repo   = "appstream";
     rev    = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja";
+    sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw";
   };
 
   nativeBuildInputs = [

From f4b4dc2d0bdbddc040f5eb46e70469d1392deab6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Dec 2018 14:53:21 +0100
Subject: [PATCH 2736/2793] haskellPackages.safe-money-aeson: unbreak

The following fix is no longer necessary after a Stackage update:

https://github.com/NixOS/nixpkgs/issues/46467
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6fc6c2583f8..4642072e825 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1134,13 +1134,6 @@ self: super: {
   # Generate shell completions
   purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
 
-  # https://github.com/NixOS/nixpkgs/issues/46467
-  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 {
     url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;

From a6b74907f7a937841cb5307429d2b45f09f7b21a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Dec 2018 15:03:15 +0100
Subject: [PATCH 2737/2793] haskellPackages.yi-core: unbreak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

yi-language ≥ 0.18 is in the LTS now
---
 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 4642072e825..9875bc29c5a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1122,9 +1122,6 @@ self: super: {
       libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck];
     })) ./patches/sexpr-0.2.1.patch;
 
-  # Can be removed once yi-language >= 0.18 is in the LTS
-  yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
-
   # https://github.com/haskell/hoopl/issues/50
   hoopl = dontCheck super.hoopl;
 

From cb5bc310d36e80a4f5be28c9b7da573b6da86959 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Dec 2018 15:17:55 +0100
Subject: [PATCH 2738/2793] haskellPackages.Frames: unbreak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

vinyl ≥ 0.10 is in the LTS.
---
 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 9875bc29c5a..9e0dd0758b0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1137,9 +1137,6 @@ self: super: {
     sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
   });
 
-  # Can be removed once vinyl >= 0.10 is in the LTS.
-  Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; });
-
   # https://github.com/Euterpea/Euterpea2/pull/22
   Euterpea = overrideSrc super.Euterpea {
     src = pkgs.fetchFromGitHub {

From 7d141ec3269d34484fd1b98a8c67d9f71811ebe6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Dec 2018 14:25:45 -0500
Subject: [PATCH 2739/2793] ruby_2_6: init at 2.6.0

---
 pkgs/development/interpreters/ruby/default.nix   | 16 ++++++++++++----
 pkgs/development/interpreters/ruby/patchsets.nix |  2 ++
 pkgs/top-level/all-packages.nix                  |  3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index f1d48578541..9be8247add1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -32,7 +32,7 @@ let
   generic = { version, sha256 }: let
     ver = version;
     tag = ver.gitTag;
-    isRuby25 = ver.majMin == "2.5";
+    atLeast25 = lib.versionAtLeast ver.majMin "2.5";
     baseruby = self.override { useRailsExpress = false; };
     self = lib.makeOverridable (
       { stdenv, buildPackages, lib
@@ -56,7 +56,7 @@ let
           rev    = tag;
           sha256 = sha256.git;
         } else fetchurl {
-          url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
+          url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
           sha256 = sha256.src;
         };
       in
@@ -86,7 +86,7 @@ let
           ++ (op opensslSupport openssl)
           ++ (op gdbmSupport gdbm)
           ++ (op yamlSupport libyaml)
-          ++ (op isRuby25 autoconf)
+          ++ (op atLeast25 autoconf)
           # Looks like ruby fails to build on darwin without readline even if curses
           # support is not enabled, so add readline to the build inputs if curses
           # support is disabled (if it's enabled, we already have it) and we're
@@ -109,7 +109,7 @@ let
           popd
         '';
 
-        postPatch = if isRuby25 then ''
+        postPatch = if atLeast25 then ''
           sed -i configure.ac -e '/config.guess/d'
           cp --remove-destination ${config}/config.guess tool/
           cp --remove-destination ${config}/config.sub tool/
@@ -224,4 +224,12 @@ in {
       git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
     };
   };
+
+  ruby_2_6 = generic {
+    version = rubyVersion "2" "6" "0" "";
+    sha256 = {
+      src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk";
+      git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index c87cb120b40..8afc64edb3f 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -16,4 +16,6 @@ rec {
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
+  "2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26)
+  ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac05e5125d..88ea436477a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8073,7 +8073,8 @@ in
   })
     ruby_2_3
     ruby_2_4
-    ruby_2_5;
+    ruby_2_5
+    ruby_2_6;
 
   ruby = ruby_2_5;
 

From 956b4a87a8809170b07bcc5f6488cff1b1e8f540 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 26 Dec 2018 19:57:32 +0300
Subject: [PATCH 2740/2793] arrow-cpp: fix build

Fixes: 1f6b09506145 ('gtest: build shared library')
---
 pkgs/development/libraries/arrow-cpp/default.nix | 4 ++--
 pkgs/development/libraries/gtest/default.nix     | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 96259dc6694..f9d8736ea20 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
+{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest_static, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
 
 let
   parquet-testing = fetchFromGitHub {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   FLATBUFFERS_HOME = flatbuffers;
   GFLAGS_HOME = gflags;
   GLOG_HOME = glog;
-  GTEST_HOME = gtest;
+  GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest_static gtest_static.dev ]; };
   LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
   RAPIDJSON_HOME = rapidjson;
   SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 06fffc4f524..9c12e213deb 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, cmake, ninja, fetchFromGitHub }:
+{ stdenv, cmake, ninja, fetchFromGitHub
+, static ? false }:
+
 stdenv.mkDerivation rec {
   name = "gtest-${version}";
   version = "1.8.1";
@@ -14,9 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja ];
 
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-  ];
+  cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON";
 
   meta = with stdenv.lib; {
     description = "Google's framework for writing C++ tests";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac05e5125d..da0a13f00c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3160,7 +3160,8 @@ in
 
   gt5 = callPackage ../tools/system/gt5 { };
 
-  gtest = callPackage ../development/libraries/gtest {};
+  gtest = callPackage ../development/libraries/gtest { };
+  gtest_static = callPackage ../development/libraries/gtest { static = true; };
   gmock = gtest; # TODO: move to aliases.nix
 
   gbenchmark = callPackage ../development/libraries/gbenchmark {};

From a2fe6bca05f9d70337d04c0feaf7709a1d6c574c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Dec 2018 16:05:13 +0100
Subject: [PATCH 2741/2793] gtest: fix includedir in cmake config files

---
 pkgs/development/libraries/gtest/default.nix  |  4 +++
 .../gtest/fix-cmake-config-includedir.patch   | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch

diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 06fffc4f524..65904ba215a 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
   };
 
+  patches = [
+    ./fix-cmake-config-includedir.patch
+  ];
+
   nativeBuildInputs = [ cmake ninja ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
new file mode 100644
index 00000000000..c05e3a9326a
--- /dev/null
+++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
@@ -0,0 +1,30 @@
+--- a/googlemock/CMakeLists.txt
++++ b/googlemock/CMakeLists.txt
+@@ -106,10 +106,10 @@
+ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+   target_include_directories(gmock SYSTEM INTERFACE
+     "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+   target_include_directories(gmock_main SYSTEM INTERFACE
+     "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ endif()
+ 
+ ########################################################################
+--- a/googletest/CMakeLists.txt
++++ b/googletest/CMakeLists.txt
+@@ -126,10 +126,10 @@
+ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+   target_include_directories(gtest SYSTEM INTERFACE
+     "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+   target_include_directories(gtest_main SYSTEM INTERFACE
+     "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ endif()
+ target_link_libraries(gtest_main PUBLIC gtest)
+ 

From b0f9e472712b66613ac1f7703d3c914f35f7a1af Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 26 Dec 2018 19:36:49 +0100
Subject: [PATCH 2742/2793] ip2unix: 1.2.0 -> 2.0.0

New upstream features:

  - New ignore rule option, which prevents conversion to Unix socket.
  - A way to increase the verbosity via the -v command line argument.
  - Reams of log messages in addition to the FATAL errors we had so far.
  - Use Syslog format for logging if stderr is a socket.
  - Set FD_CLOEXEC on systemd socket file descriptors as soon as they're
    associated.

Upstream fixes:

  - Use right endian conversion functions in port matching.
  - Pass is_unix to child socket on accept to prevent accidentally
    replacing an already converted Unix socket by a new Unix socket. The
    latter would be a socket that's not accepted, which would eventually
    lead to an error.
  - Correctly handle setsockopts used with other levels than SOL_SOCKET.

Upstream changes:

  - Improve wording and add more descriptions in README and manpage.
  - The implementation for fetching systemd sockets now no longer uses
    libsystemd, thus the build-time dependency is no longer required.
  - New serialiser for passing rules to the preloaded library in a more
    compact form instead of using YAML, so it's less likely that we'll
    hit the maximum stack size.
  - Systemd sockets are now associated during rule initialisation and
    thus behave more predictable in complex setups.

On our side, the dependency on systemd is only needed for running the
tests, as it uses the systemd-socket-activate helper. Socket association
is now done by ip2unix directly and doesn't rely on libsystemd anymore.

Built and tested on i686-linux and x86_64-linux.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/networking/ip2unix/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index 1fa1531d183..a37626c14da 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -5,21 +5,22 @@
 
 stdenv.mkDerivation rec {
   name = "ip2unix-${version}";
-  version = "1.2.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
     rev = "v${version}";
-    sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652";
+    sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk";
   };
 
   nativeBuildInputs = [
     meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
     libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
+    systemd
   ];
 
-  buildInputs = [ libyamlcpp systemd ];
+  buildInputs = [ libyamlcpp ];
 
   doCheck = true;
 

From 5c5c83fb4e424454f487c546e30cfb38a26156df Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Dec 2018 20:21:35 +0000
Subject: [PATCH 2743/2793] qt5: update nixpkgs directory in readme

---
 pkgs/development/libraries/qt-5/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/README.md b/pkgs/development/libraries/qt-5/README.md
index c13b172e82a..b2ef74d0aef 100644
--- a/pkgs/development/libraries/qt-5/README.md
+++ b/pkgs/development/libraries/qt-5/README.md
@@ -5,7 +5,7 @@
 Let `$major` be the major version number, e.g. `5.9`.
 
 1. Change the version number in the `$major/fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major`
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major`
    from the top of the Nixpkgs tree.
 
 See below if it is necessary to update any patches.
@@ -16,7 +16,7 @@ Let `$major` be the new major version number, e.g. `5.10`.
 
 1. Copy the subdirectory from the previous major version to `$major`.
 2. Change the version number in `$major/fetch.sh`.
-3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major`
+3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major`
    from the top of the Nixpkgs tree.
 4. Add a top-level attribute in `pkgs/top-level/all-packages.nix` for the new
    major version.

From 889ef35303ff8223708ac74e58cc02dbbecaf964 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 26 Dec 2018 15:30:04 -0500
Subject: [PATCH 2744/2793] linuxPackages_4_{19,20}: works around bug with
 overlayfs.

See: https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
---
 pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d54e0153229..dc41c2e5f15 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -58,4 +58,14 @@ rec {
     };
   };
 
+  # Reverts a change related to the overlayfs overhaul in 4.19
+  # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
+  revert-vfs-dont-open-real = rec {
+	name = "revert-vfs-dont-open-real";
+	patch = fetchpatch {
+	  name = name + ".patch";
+	  url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
+	  sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
+	};
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df31f22eb9f..eba2c979b42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14562,6 +14562,7 @@ in
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.revert-vfs-dont-open-real
       ];
   };
 
@@ -14572,6 +14573,7 @@ in
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.revert-vfs-dont-open-real
       ];
   };
 

From 4c10970b1a1574f5130de018a12e27b1ca1e5e6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 15:36:43 -0800
Subject: [PATCH 2745/2793] gpsprune: 19.1 -> 19.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/gpsprune/versions
---
 pkgs/applications/misc/gpsprune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 1979d290c82..4f0c1864677 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
-  version = "19.1";
+  version = "19.2";
 
   src = fetchurl {
     url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "1drw30z21sdzjc2mcm13yqb5aipvcxmslb2yn6xs3b6b2mx3h2zy";
+    sha256 = "1q2kpkkh75b9l1x7fkmv88s8k84gzcdnrg5sgf8ih0zrp49lawg9";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 78c56d758d721f74b484d896cc65c0ba85c63794 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Thu, 27 Dec 2018 01:18:12 +0000
Subject: [PATCH 2746/2793] all-packages.nix: remove obsolete comments

cgroup2 cpu controller support was merged into Linux 4.15:
https://github.com/torvalds/linux/commit/22714a2ba4b55737cd7d5299db7aaf1fa8287354
---
 pkgs/top-level/all-packages.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eba2c979b42..bda7c48682f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14558,9 +14558,6 @@ in
   linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.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
         kernelPatches.revert-vfs-dont-open-real
       ];
@@ -14569,9 +14566,6 @@ in
   linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.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
         kernelPatches.revert-vfs-dont-open-real
       ];

From 9b3204d41b212587a6370ce25fad1b2f4d2389f7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 01:33:46 +0000
Subject: [PATCH 2747/2793] pythonPackages.uranium: add missing dependency on
 shapely

Needed since 3.5.1: https://github.com/Ultimaker/Uranium/commit/0c6d90b42d29fae5f41c23487e74ae8164b324ac
---
 pkgs/development/python-modules/uranium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 3c4d17a4698..cee33900784 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
-, pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
+, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
   version = "3.5.1";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.5.0";
 
   buildInputs = [ python gettext ];
-  propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
+  propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ];
   nativeBuildInputs = [ cmake doxygen ];
 
   postPatch = ''

From a3fc481b76e29f9c49465d606bcaa2d385fd729a Mon Sep 17 00:00:00 2001
From: agracie <agracie@linode.com>
Date: Wed, 26 Dec 2018 20:57:08 -0500
Subject: [PATCH 2748/2793] mkl: fix hash on Darwin

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

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 0eecb2012f1..0801238fb12 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = if stdenvNoCC.isDarwin
-    then "0000000000000000000000000000000000000000000000000000"
+    then "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw"
     else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a";
 
   meta = with stdenvNoCC.lib; {

From cbdaa29c3e169ec69ebd267720781724f1c5e276 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 02:15:04 +0000
Subject: [PATCH 2749/2793] python3Packages.libsavitar: init at 3.6.0

---
 .../python-modules/libsavitar/default.nix     | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/libsavitar/default.nix

diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
new file mode 100644
index 00000000000..9f78b999450
--- /dev/null
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }:
+
+buildPythonPackage rec {
+  pname = "libsavitar";
+  version = "3.6.0";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "libSavitar";
+    rev = version;
+    sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv";
+  };
+
+  postPatch = ''
+    # To workaround buggy SIP detection which overrides PYTHONPATH
+    sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+  '';
+
+  nativeBuildInputs = [ cmake ];
+
+  propagatedBuildInputs = [ sip ];
+
+  disabled = pythonOlder "3.4.0";
+
+  meta = with stdenv.lib; {
+    description = "C++ implementation of 3mf loading with SIP python bindings";
+    homepage = https://github.com/Ultimaker/libSavitar;
+    license = licenses.lgpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar orivej ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a377046c990..d7a22f94b53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2824,6 +2824,8 @@ in {
 
   fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
 
+  libarcus = callPackage ../development/python-modules/libarcus { };
+
   libcloud = callPackage ../development/python-modules/libcloud { };
 
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
@@ -2842,6 +2844,8 @@ in {
     inherit (pkgs) libsodium;
   };
 
+  libsavitar = callPackage ../development/python-modules/libsavitar { };
+
   libplist = disabledIf isPy3k
     (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
 
@@ -4493,8 +4497,6 @@ in {
     inherit (pkgs) libasyncns pkgconfig;
   };
 
-  libarcus = callPackage ../development/python-modules/libarcus { };
-
   pybrowserid = callPackage ../development/python-modules/pybrowserid { };
 
   pyzmq = callPackage ../development/python-modules/pyzmq { };

From ab95c92349a8092ac98b7ec79b32b5e1e0355145 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 02:16:32 +0000
Subject: [PATCH 2750/2793] python3Packages.libarcus: 3.4.1 -> 3.6.0

---
 pkgs/development/python-modules/libarcus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index fc58c6ca6a1..8d0bf2b7b17 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "libarcus";
-  version = "3.4.1";
+  version = "3.6.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk";
+    sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43";
   };
 
   disabled = pythonOlder "3.4.0";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Communication library between internal components for Ultimaker software";
     homepage = https://github.com/Ultimaker/libArcus;
-    license = licenses.agpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };

From b742250b3115ebd26f3bee2f621b6831931f8cd2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 02:17:24 +0000
Subject: [PATCH 2751/2793] python3Packages.uranium: 3.5.1 -> 3.6.0

---
 pkgs/development/python-modules/uranium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index cee33900784..351279476c8 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -2,7 +2,7 @@
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "3.5.1";
+  version = "3.6.0";
   pname = "uranium";
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1qfci5pl4yhirkkck1rm4i766j8gi56p81mfc6vgbdnhchcjyhy9";
+    sha256 = "02hid13h8anb9bgv2hhrcdg10bxdxa9hj9pbdv3gw3lpn9r2va98";
   };
 
   disabled = pythonOlder "3.5.0";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A Python framework for building Desktop applications";
     homepage = https://github.com/Ultimaker/Uranium;
-    license = licenses.agpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };

From 3ce19d96b3a26441510373b78fa4880c24597088 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 02:19:24 +0000
Subject: [PATCH 2752/2793] curaengine: 3.4.1 -> 3.6.0

---
 pkgs/applications/misc/curaengine/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 75d1936ba85..22215a7e2c6 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,23 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "3.4.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4";
+    sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm";
   };
 
-  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 8112354f4f7ec74203c554d041d6e6daccc8df00 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 02:20:25 +0000
Subject: [PATCH 2753/2793] cura: 3.4.1 -> 3.6.0

---
 pkgs/applications/misc/cura/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index f97b83a8507..f7907746d10 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,24 +2,26 @@
 
 mkDerivation rec {
   name = "cura-${version}";
-  version = "3.4.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w";
+    sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90";
   };
 
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
-    rev = "3.4.1";
-    sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28";
+    rev = version;
+    sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 ];
-  propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
+  propagatedBuildInputs = with python3.pkgs; [
+    libsavitar numpy-stl pyserial requests uranium zeroconf
+  ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
   cmakeFlags = [
@@ -44,7 +46,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "3D printer / slicing GUI built on top of the Uranium framework";
     homepage = https://github.com/Ultimaker/Cura;
-    license = licenses.agpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };

From 9f06d1885dbbf39b5aa69c8f14d76c7e7ee2ae60 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 26 Dec 2018 21:48:47 -0500
Subject: [PATCH 2754/2793] granite: 5.2.1 -> 5.2.2

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

diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 2113b4f690b..6c71f292a8d 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "5.2.1";
-
-  name = "${pname}-${version}";
+  version = "5.2.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "18rw1lv6zk5w2cq8bv6b869z3cdikn9gzk30gw1s9f8n06bh737h";
+    sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh";
   };
 
   cmakeFlags = [

From f15466ecf7d2deba080f726d3879a9c3fd235bdf Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Thu, 27 Dec 2018 04:04:11 +0100
Subject: [PATCH 2755/2793] cargo-release: 0.10.0 -> 0.10.5

---
 pkgs/tools/package-management/cargo-release/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 562f92121d6..8bb5861a23c 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-release-${version}";
-  version = "0.10.0";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "${version}";
-    sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0";
+    sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
   };
 
-  cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5";
+  cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq";
 
   meta = with stdenv.lib; {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';

From 010502472fb23a8794824a4b987e8335aec14549 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Dec 2018 14:22:27 +0800
Subject: [PATCH 2756/2793] check-esxi-hardware: 20161013 -> 20181001

---
 pkgs/servers/monitoring/plugins/esxi.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index e458e130ba4..888cef61fcb 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -6,13 +6,13 @@ let
 
 in python2Packages.buildPythonApplication rec {
   name = "${pName}-${version}";
-  version = "20161013";
+  version = "20181001";
 
   src = fetchFromGitHub {
     owner  = "Napsty";
     repo   = bName;
     rev    = version;
-    sha256 = "19zybcg62dqcinixnp1p8zw916x3w7xvy6dlsmn347iigfa5s55s";
+    sha256 = "0azfacxcnnxxfqzrhh29k8cnjyr88gz35bi6h8fq931fl3plv10l";
   };
 
   dontBuild = true;

From ea331218a01d87b1e18a9af851390f4acb611c90 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 27 Dec 2018 02:27:29 -0500
Subject: [PATCH 2757/2793] granite: various cleanups

This is just stuff that's in #48637 already that I wanted to sync.

In detail it's:

  - Patching in the use of meson

  - Add wrapGAppsHook and hicolor-icon-theme
    There's a demo application and granite
     provides some generic icons.

  - Included patches so third party apps still work
---
 .../02-datetime-clock-format-gsettings.patch  | 129 ++++++++++++++++++
 .../development/libraries/granite/default.nix |  30 +++-
 2 files changed, 153 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch

diff --git a/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch
new file mode 100644
index 00000000000..7b7c9871133
--- /dev/null
+++ b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch
@@ -0,0 +1,129 @@
+From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Mon, 17 Dec 2018 14:58:14 +0100
+Subject: DateTime: include "clock-format" gsettings key here
+
+---
+ data/io.elementary.granite.gschema.xml | 15 +++++++++++++++
+ data/meson.build                       |  4 ++++
+ lib/DateTime.vala                      |  4 ++--
+ meson.build                            | 11 +++++++++++
+ meson/post_install.py                  |  5 +++++
+ 5 files changed, 37 insertions(+), 2 deletions(-)
+ create mode 100644 data/io.elementary.granite.gschema.xml
+ create mode 100644 data/meson.build
+
+diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml
+new file mode 100644
+index 0000000..1540fb0
+--- /dev/null
++++ b/data/io.elementary.granite.gschema.xml
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<schemalist>
++  <enum id="io.elementary.granite.clock-formats">
++    <value nick="12h" value="0" />
++    <value nick="24h" value="1" />
++    <value nick="ISO8601" value="2" />
++  </enum>
++  <schema id="io.elementary.granite" path="/io/elementary/granite/">
++    <key name="clock-format" enum="io.elementary.granite.clock-formats">
++      <default>"12h"</default>
++      <summary>Whether the clock displays in 12h or 24h format</summary>
++      <description>Whether the clock displays in 12h or 24h format</description>
++    </key>
++  </schema>
++</schemalist>
+diff --git a/data/meson.build b/data/meson.build
+new file mode 100644
+index 0000000..96cc3b1
+--- /dev/null
++++ b/data/meson.build
+@@ -0,0 +1,4 @@
++install_data(
++    rdnn + '.gschema.xml',
++    install_dir: schema_dir
++)
+diff --git a/lib/DateTime.vala b/lib/DateTime.vala
+index aea2ec6..3d81191 100644
+--- a/lib/DateTime.vala
++++ b/lib/DateTime.vala
+@@ -104,13 +104,13 @@ namespace Granite.DateTime {
+     }
+ 
+     /**
+-     * Gets the //clock-format// key from //org.gnome.desktop.interface// schema
++     * Gets the //clock-format// key from //io.elementary.granite// schema
+      * and determines if the clock format is 12h based
+      *
+      * @return true if the clock format is 12h based, false otherwise.
+      */
+     private static bool is_clock_format_12h () {
+-        var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime");
++        var h24_settings = new Settings ("io.elementary.granite");
+         var format = h24_settings.get_string ("clock-format");
+         return (format.contains ("12h"));
+     }
+diff --git a/meson.build b/meson.build
+index 8b98eeb..f0abcdf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -4,6 +4,8 @@ project(
+     version: '5.2.2'
+ )
+ 
++rdnn = 'io.elementary.' + meson.project_name()
++
+ if meson.get_compiler('vala').version().version_compare('<0.40.0')
+     error('vala compiler version 0.40.0 or newer is required.')
+ endif
+@@ -52,10 +54,18 @@ icons_dir = join_paths(
+     'hicolor'
+ )
+ 
++schema_dir = join_paths(
++    get_option('prefix'),
++    get_option('datadir'),
++    'glib-2.0',
++    'schemas'
++)
++
+ pkgconfig = import('pkgconfig')
+ i18n = import('i18n')
+ 
+ subdir('lib')
++subdir('data')
+ subdir('demo')
+ subdir('icons')
+ subdir('po')
+@@ -68,5 +78,6 @@ endif
+ meson.add_install_script(
+     join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
+     '--iconsdir', icons_dir,
++    '--schemadir', schema_dir,
+ )
+ 
+diff --git a/meson/post_install.py b/meson/post_install.py
+index 1864515..5313f96 100755
+--- a/meson/post_install.py
++++ b/meson/post_install.py
+@@ -6,11 +6,16 @@ import subprocess
+ 
+ parser = argparse.ArgumentParser()
+ parser.add_argument("--iconsdir", action="store", required=True)
++parser.add_argument("--schemadir", action="store", required=True)
+ args = vars(parser.parse_args())
+ 
+ icons_dir = args["iconsdir"]
++schema_dir = args["schemadir"]
+ 
+ if not os.environ.get('DESTDIR'):
+     print('Compiling icon cache ...')
+     subprocess.run(['gtk-update-icon-cache', icons_dir])
+ 
++    print('Compiling GSettings schemas ...')
++    subprocess.run(['glib-compile-schemas', schema_dir])
++
+-- 
+2.20.1
+
diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 6c71f292a8d..eacb84e3361 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext }:
+{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "granite";
@@ -11,26 +11,44 @@ stdenv.mkDerivation rec {
     sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh";
   };
 
-  cmakeFlags = [
-    "-DINTROSPECTION_GIRDIR=share/gir-1.0/"
-    "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
+  patches = [
+    # Add Meson support that hit after 5.2.2
+    (fetchpatch {
+      url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch";
+      sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85";
+    })
+    (fetchpatch {
+      url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch";
+      sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs";
+    })
+    # Resolve the circular dependency between granite and the datetime wingpanel indicator
+    # See: https://github.com/elementary/granite/pull/242
+    ./02-datetime-clock-format-gsettings.patch
   ];
 
   nativeBuildInputs = [
-    cmake
     gettext
     gobject-introspection
+    meson
     ninja
     pkgconfig
+    python3
     vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
+    wrapGAppsHook
   ];
 
   buildInputs = [
     glib
-    gnome3.libgee
     gtk3
+    hicolor-icon-theme
+    gnome3.libgee
   ];
 
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
   meta = with stdenv.lib; {
     description = "An extension to GTK+ used by elementary OS";
     longDescription = ''

From 31680c54e1efc73791376e09ef31290adf2c7da1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 26 Dec 2018 15:34:20 -0500
Subject: [PATCH 2758/2793] python36: fix darwin build

Remove issue24658 patch because is already fixed and backported to
Python 3.6 https://github.com/python/cpython/commit/a5ebc205beea2bf1501e4ac33ed6e81732dd0604
---
 .../interpreters/python/cpython/3.6/default.nix        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 15a62b42959..cad35cac53a 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -69,12 +69,6 @@ in stdenv.mkDerivation {
 
   patches = [
     ./no-ldconfig.patch
-  ] ++ optionals stdenv.isDarwin [
-    # Fix for https://bugs.python.org/issue24658
-    (fetchpatch {
-      url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
-      sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
-    })
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
   ] ++ optionals hasDistutilsCxxPatch [
@@ -83,8 +77,8 @@ in stdenv.mkDerivation {
     # only works for GCC and Apple Clang. This makes distutils to call C++
     # compiler when needed.
     (fetchpatch {
-      url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
-      sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
+      url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
+      sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
     })
   ];
 

From 17648708130df10c5984af4d252f3cfb001a1827 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 26 Dec 2018 15:36:23 -0500
Subject: [PATCH 2759/2793] python37: fix darwin build

Remove issue24658 patch because is already fixed and backported to
Python 3.7 https://github.com/python/cpython/commit/178d1c07778553bf66e09fe0bb13796be3fb9abf
---
 pkgs/development/interpreters/python/cpython/3.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index 800534e17d5..a008be707c2 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -74,8 +74,8 @@ in stdenv.mkDerivation {
     # only works for GCC and Apple Clang. This makes distutils to call C++
     # compiler when needed.
     (fetchpatch {
-      url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
-      sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
+      url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
+      sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
     })
   ];
 

From edf8b984fa549118a9dcb412838cc29425239f00 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 10:32:27 +0100
Subject: [PATCH 2760/2793] vimPlugins: Update

---
 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 f899199c844..16d2e53212b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -157,13 +157,13 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-12-17";
+    name = "caw-vim-2018-12-25";
     pname = "caw-vim";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "0060d6fbf53e02a153c5faf6eca1d10c1ed7c489";
-      sha256 = "01pngcf7b04rw2a0bmr8xv191wlnsny2rwg5xzhmargzf68fd6lv";
+      rev = "98805a60aef339e55e5b917fdb9f69c74e8d8340";
+      sha256 = "0nn3dg3lnbnfwgvxpjbalw9ff876798jrzlkrnzqkvrwxv6k7ks5";
     };
   };
 
@@ -378,35 +378,35 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-17";
+    name = "denite-nvim-2018-12-24";
     pname = "denite-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "c21dd10b6d1c4fd3805b130e1a6551daadb8c111";
-      sha256 = "0is51kkzf2vqaxhdfsxaq3vzwjcysriqsigfmv8wl80r6nk1nxlp";
+      rev = "f20cd55d249712dd4d5ab7c2b9d8b7f0005c6290";
+      sha256 = "0g31p4n1hvl0vxn7gczbkfs6bvfhabmyfggcc5sfsd27chf49q43";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-12-17";
+    name = "deol-nvim-2018-12-25";
     pname = "deol-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "b052a5aef05bafd2b6dc48e089483eb5839febc6";
-      sha256 = "1y6nx364xg6xh9arvr53kk45j5p5pkhrm1izkqaigwmsnyr2gdjq";
+      rev = "04afcdd5f63153fe14795d1141fae1eb2bb5be42";
+      sha256 = "1pqxscisx2rymn13z7k988n5bskbi00g3hsy711bnjnazq1wdzib";
     };
   };
 
   deoplete-clang = buildVimPluginFrom2Nix {
-    name = "deoplete-clang-2018-07-01";
+    name = "deoplete-clang-2018-12-24";
     pname = "deoplete-clang";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
-      rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97";
-      sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i";
+      rev = "3353ddfb956841c4d0e5a43db5184504a62c066f";
+      sha256 = "07qhv2lqx4k27fhd4zhxpg0l9s8r83q5147sfh9knpbyawg5hw3i";
       fetchSubmodules = true;
     };
   };
@@ -424,13 +424,13 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-22";
+    name = "deoplete-jedi-2018-12-24";
     pname = "deoplete-jedi";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "d3fac767f7034baa3d61baf4f844c5f1b3470817";
-      sha256 = "0m16h2fwz7i7l7l5833jkc97sapg6p56v60yjwilmrlagq4k4bk8";
+      rev = "73c11875fbfaabf6c0b455596cb3f9dfe5d86595";
+      sha256 = "0xaa56d4scihzz2cwg9zqkv36jwpivnska936z9wq0fpr253yzxc";
       fetchSubmodules = true;
     };
   };
@@ -469,24 +469,24 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-17";
+    name = "deoplete-nvim-2018-12-26";
     pname = "deoplete-nvim";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "48bcbe06757907de62919d27dc75d51dc1deed3a";
-      sha256 = "1f7l8mczp5kl06swwzbdhbjqc9vw9xnyx1pbxla7wly2djjcawh2";
+      rev = "ec014e3a8d53b7bbc8a3906013975157d09936a1";
+      sha256 = "06z2d552jf7vhmk0dh8my38bmrnfrzqggbs2dyzvqlx3hxrwm14h";
     };
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-12-12";
+    name = "dhall-vim-2018-12-26";
     pname = "dhall-vim";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "ef31cfee6d8c555d44d282e4cec1367512ad7fe9";
-      sha256 = "0r7y614xld5spgpa4c8ms4rm1p8xzsayp91j4jiqhxn6ly6igv7f";
+      rev = "54a0f463d098abf72c76a233a6a3f0f9dd069dfe";
+      sha256 = "0yacjv7kv79yilsyij43m378shzln0qra5c3nc5g2mc2i9hxcial";
     };
   };
 
@@ -581,13 +581,13 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-20";
+    name = "ferret-2018-12-25";
     pname = "ferret";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "b1647292669ddfa13bfd16d2cc3e084b9b01cfbb";
-      sha256 = "1afry4h6ms2h92c0gdcx89z9jb1g2d5wk4swc3xc20x1p32qdql1";
+      rev = "890a01f85a5ac50ad16f151aacd828b31cbe6889";
+      sha256 = "0882mxa5n1cbvq4vzxnv2d5id3lxbv23anjrilbnkklgk1i5fq47";
     };
   };
 
@@ -946,13 +946,13 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-23";
+    name = "ncm2-2018-12-27";
     pname = "ncm2";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "ead80d5e0c8e6079b780a0470c3e893b508fcc5c";
-      sha256 = "082ixcr7v8h349aiyi0rrcp61nxk7g5jp0s1g48rv0mknwkzj9ir";
+      rev = "3b2749be3bb039ce0df34bca2eea4d6cdfe95caa";
+      sha256 = "152fyvkksqkzkcrr2lj9w26v46b0n9pzia10adbka0jx9ppnsv0k";
     };
   };
 
@@ -1100,13 +1100,13 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-23";
+    name = "neomake-2018-12-27";
     pname = "neomake";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "a7fe130028375e7dbc0d17ba5ee6b4d807245875";
-      sha256 = "14wmpf719w05hy9nhgdkpag5chzyai1x227cmmc3sqgdjy6phfxs";
+      rev = "27eef4e95ca18c6b4c01a779b49446b4ddcbe314";
+      sha256 = "038a8ja5rwm6cx804vqzp85gklyfw3gc7d79snc94g8jj6ply6w5";
     };
   };
 
@@ -1166,13 +1166,13 @@
   };
 
   nerdcommenter = buildVimPluginFrom2Nix {
-    name = "nerdcommenter-2018-12-03";
+    name = "nerdcommenter-2018-12-26";
     pname = "nerdcommenter";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "d24868bc85de599ee2424ca93aa5f6991bd3128c";
-      sha256 = "1xrnngrn537757as4jfiaamjq7yymgh8cdbciiwpc6a2qpiscmdb";
+      rev = "371e4d0e099abb86a3016fefd1efae28a4e13856";
+      sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg";
     };
   };
 
@@ -1529,12 +1529,12 @@
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix {
-    name = "Spacegray-vim-2018-06-21";
+    name = "Spacegray-vim-2018-12-25";
     pname = "Spacegray-vim";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
-      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
+      rev = "5dfdefbe083666bf7f3fe2d6cdff650efaa5e1f7";
       sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
     };
   };
@@ -1716,13 +1716,13 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-13";
+    name = "traces-vim-2018-12-25";
     pname = "traces-vim";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "46e01b6159a21c89695b9d03ea3529ddc92d3b1f";
-      sha256 = "0a77qx12kg4hmfz5zb2ng7lhd855gichs9qjrvich32v04qb2rwv";
+      rev = "7fd6019cd817842ec45836c2cec575e3c21fedca";
+      sha256 = "19pdpipng98s7kypkflfaxkhcskrppyb6714xf7y86adi1d2vly1";
     };
   };
 
@@ -1738,13 +1738,13 @@
   };
 
   tsuquyomi = buildVimPluginFrom2Nix {
-    name = "tsuquyomi-2018-10-31";
+    name = "tsuquyomi-2018-12-26";
     pname = "tsuquyomi";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
-      rev = "bdd034d06ed47176ec1ee0bd3dae5bc0aeb053e3";
-      sha256 = "119dxmkarbh0b0k4l59mxr19shks4mv96j3mbz02q0kdq18bgrdq";
+      rev = "fd47e1ac75ee3a09e13a3b7a8f609907c2b6b542";
+      sha256 = "09rivi64z7lhkan7hd7kdg2r1p3l2iplyc9vs1l6dqk3cp9i5rh0";
     };
   };
 
@@ -2464,13 +2464,13 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-12-23";
+    name = "vim-fugitive-2018-12-26";
     pname = "vim-fugitive";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "baee3bbfe87784985a410924a2b3a0008d6b8424";
-      sha256 = "05c99m2ph0iy9fan2l1148f7vs3nii5zbya7hpdiarvs5i35cj53";
+      rev = "a1f9596d2d884e74358bc5017a73f37e34f7b04c";
+      sha256 = "07am7ca8klnnq6iyp5lbqaas9lgz005rpvndcca7r5w0h45dpncw";
     };
   };
 
@@ -2530,13 +2530,13 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-21";
+    name = "vim-go-2018-12-24";
     pname = "vim-go";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "ead0ef3a169e1b990f20cbbbcca8b3bda5056675";
-      sha256 = "1f4v4jilk3hf0xapqq7zm6fx2p8n43baq3j9128ayd0cg5i60352";
+      rev = "23409acfa8b6e4a324730108d01826f0910a8973";
+      sha256 = "1ddbcwag8x26sim4aplslgmcjv8vr9smanh5939m4a1sw7lcg2xv";
     };
   };
 
@@ -2596,13 +2596,13 @@
   };
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
-    name = "vim-haskellConcealPlus-2018-08-07";
+    name = "vim-haskellConcealPlus-2018-12-26";
     pname = "vim-haskellConcealPlus";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
-      rev = "12608ecab20c3eda9a89a55931397b5e020f38a4";
-      sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0";
+      rev = "1d64dd2cdd1e99689e3d79e7ada151213acd5450";
+      sha256 = "0jsfg941qdpibzcg0ypf0nvabmv1bpwgzgzda7hjy1jcai4yrw1g";
     };
   };
 
@@ -2750,13 +2750,13 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-21";
+    name = "vim-javacomplete2-2018-12-25";
     pname = "vim-javacomplete2";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "fd441fde07fe132f1e278bc61354e02277559d2b";
-      sha256 = "11z9q11xgnmsm6dd4bk19pj585qwmi5qrlbs4ga5vyvbvng1xgl5";
+      rev = "0d96e7344eafc0d2ce6888e629668629d6a11f70";
+      sha256 = "18l0s90y3k7cbl1ql6nyhk13nbc97ll3zkzkvln9r189ckj7q1w7";
     };
   };
 
@@ -2938,13 +2938,13 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-12-03";
+    name = "vim-monokai-pro-2018-12-27";
     pname = "vim-monokai-pro";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
-      rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
-      sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
+      rev = "39fcf3b418fc3a01e604cbb5f9c08d79d7d957c0";
+      sha256 = "1k0n9chmilppsiyxhz1ig0ywimbnl4qpzib6ris1cy6kjnl4mdyq";
     };
   };
 
@@ -3158,13 +3158,13 @@
   };
 
   vim-polyglot = buildVimPluginFrom2Nix {
-    name = "vim-polyglot-2018-10-10";
+    name = "vim-polyglot-2018-12-26";
     pname = "vim-polyglot";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "ec1c94306953b678bb36572897bd218fe6c76506";
-      sha256 = "1n3s52ncmdbhygrdycrnqk9sj42413q0ah1q8a7s6q4z6zdm4scz";
+      rev = "c161994e9607399a7b365ab274592bfc4f100306";
+      sha256 = "19gdy7l87hm0i8jiic02v1xb3b660lsprankfgny9za8hk4kq3cq";
     };
   };
 
@@ -3521,24 +3521,24 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-12-20";
+    name = "vim-terraform-2018-12-25";
     pname = "vim-terraform";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "0f62e7937781cee672227f292b59ce687b28f037";
-      sha256 = "1iwsy5hcsxjzcgksfqwcn8lqwys828dsihazixjv01a31d2wrjsk";
+      rev = "259481e063e79392c25f293f8459462f942dd6f9";
+      sha256 = "0w3kwjd5ywnjkkc3cn765ra8mqqmxvk328b0d14b9hndyhs6v8gi";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-11-22";
+    name = "vim-test-2018-12-24";
     pname = "vim-test";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "c4b732003d120d60a2fc009423e34d80fb212651";
-      sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
+      rev = "fceb803bcde722b8a678251defb34f456affb3e3";
+      sha256 = "0g750rrxcgxvimxcpcz9xkjgsdbwnqc3wjvw056ghyy6mvsvq0wj";
     };
   };
 
@@ -3774,13 +3774,13 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-21";
+    name = "vimtex-2018-12-25";
     pname = "vimtex";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "0715b256f3cdab75c2b7818773f7df297d0a7cac";
-      sha256 = "1kkhhvx3dxd9dv9na724l7kzzlg14xbgh1mh82dwzv91yqikmr2c";
+      rev = "0746f21c2311acfec7c7c23bd122ea4eb3eacb4b";
+      sha256 = "0hga30q6b6v6mdzbqbqr6j6i7fdg4i0igpi2gwvx70a2x68d7ybk";
     };
   };
 

From 96b63961017ffc76becda6208e3b9940c49e376a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 10:34:14 +0100
Subject: [PATCH 2761/2793] vimUtils.buildVimPlugin: derive name from pname and
 version

---
 pkgs/misc/vim-plugins/build-vim-plugin.nix |  54 ++
 pkgs/misc/vim-plugins/generated.nix        | 722 ++++++++++-----------
 pkgs/misc/vim-plugins/update.py            |   2 +-
 pkgs/misc/vim-plugins/vim-utils.nix        |  52 +-
 4 files changed, 417 insertions(+), 413 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/build-vim-plugin.nix

diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix
new file mode 100644
index 00000000000..2646b55de96
--- /dev/null
+++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, rtpPath ? "share/vim-plugins"
+, vim
+}:
+
+rec {
+  addRtp = path: attrs: derivation:
+    derivation // { rtp = "${derivation}/${path}"; } // {
+      overrideAttrs = f: buildVimPlugin (attrs // f attrs);
+    };
+
+  buildVimPlugin = attrs@{
+    name ? "${attrs.pname}-${attrs.version}",
+    namePrefix ? "vimplugin-",
+    src,
+    unpackPhase ? "",
+    configurePhase ? "",
+    buildPhase ? "",
+    preInstall ? "",
+    postInstall ? "",
+    path ? (builtins.parseDrvName name).name,
+    addonInfo ? null,
+    ...
+  }:
+    addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
+      name = namePrefix + name;
+
+      inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
+
+      installPhase = ''
+        runHook preInstall
+
+        target=$out/${rtpPath}/${path}
+        mkdir -p $out/${rtpPath}
+        cp -r . $target
+
+        # build help tags
+        if [ -d "$target/doc" ]; then
+          ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
+        fi
+
+        if [ -n "$addonInfo" ]; then
+          echo "$addonInfo" > $target/addon-info.json
+        fi
+
+        runHook postInstall
+      '';
+    }));
+
+  buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
+    buildPhase = ":";
+    configurePhase =":";
+  } // attrs);
+}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 16d2e53212b..89406e92305 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3,8 +3,8 @@
 
 {
   a-vim = buildVimPluginFrom2Nix {
-    name = "a-vim-2010-11-06";
     pname = "a-vim";
+    version = "2010-11-06";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "a.vim";
@@ -14,8 +14,8 @@
   };
 
   ack-vim = buildVimPluginFrom2Nix {
-    name = "ack-vim-2018-02-27";
     pname = "ack-vim";
+    version = "2018-02-27";
     src = fetchFromGitHub {
       owner = "mileszs";
       repo = "ack.vim";
@@ -25,8 +25,8 @@
   };
 
   acp = buildVimPluginFrom2Nix {
-    name = "acp-2013-02-05";
     pname = "acp";
+    version = "2013-02-05";
     src = fetchFromGitHub {
       owner = "eikenb";
       repo = "acp";
@@ -36,8 +36,8 @@
   };
 
   agda-vim = buildVimPluginFrom2Nix {
-    name = "agda-vim-2018-11-10";
     pname = "agda-vim";
+    version = "2018-11-10";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
@@ -47,8 +47,8 @@
   };
 
   alchemist-vim = buildVimPluginFrom2Nix {
-    name = "alchemist-vim-2018-12-07";
     pname = "alchemist-vim";
+    version = "2018-12-07";
     src = fetchFromGitHub {
       owner = "slashmili";
       repo = "alchemist.vim";
@@ -58,8 +58,8 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-12-20";
     pname = "ale";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
@@ -69,8 +69,8 @@
   };
 
   align = buildVimPluginFrom2Nix {
-    name = "align-2012-08-08";
     pname = "align";
+    version = "2012-08-08";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "align";
@@ -80,8 +80,8 @@
   };
 
   argtextobj-vim = buildVimPluginFrom2Nix {
-    name = "argtextobj-vim-2010-10-18";
     pname = "argtextobj-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "argtextobj.vim";
@@ -91,8 +91,8 @@
   };
 
   auto-pairs = buildVimPluginFrom2Nix {
-    name = "auto-pairs-2018-09-23";
     pname = "auto-pairs";
+    version = "2018-09-23";
     src = fetchFromGitHub {
       owner = "jiangmiao";
       repo = "auto-pairs";
@@ -102,8 +102,8 @@
   };
 
   autoload_cscope-vim = buildVimPluginFrom2Nix {
-    name = "autoload_cscope-vim-2011-01-28";
     pname = "autoload_cscope-vim";
+    version = "2011-01-28";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "autoload_cscope.vim";
@@ -113,8 +113,8 @@
   };
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "awesome-vim-colorschemes-2018-12-16";
     pname = "awesome-vim-colorschemes";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
@@ -124,8 +124,8 @@
   };
 
   base16-vim = buildVimPluginFrom2Nix {
-    name = "base16-vim-2018-11-30";
     pname = "base16-vim";
+    version = "2018-11-30";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
@@ -135,8 +135,8 @@
   };
 
   bats-vim = buildVimPluginFrom2Nix {
-    name = "bats-vim-2013-07-03";
     pname = "bats-vim";
+    version = "2013-07-03";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "bats.vim";
@@ -146,8 +146,8 @@
   };
 
   calendar-vim = buildVimPluginFrom2Nix {
-    name = "calendar-vim-2018-11-02";
     pname = "calendar-vim";
+    version = "2018-11-02";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
@@ -157,8 +157,8 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-12-25";
     pname = "caw-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
@@ -168,8 +168,8 @@
   };
 
   changeColorScheme-vim = buildVimPluginFrom2Nix {
-    name = "changeColorScheme-vim-2010-10-18";
     pname = "changeColorScheme-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "changeColorScheme.vim";
@@ -179,8 +179,8 @@
   };
 
   CheckAttach = buildVimPluginFrom2Nix {
-    name = "CheckAttach-2018-09-02";
     pname = "CheckAttach";
+    version = "2018-09-02";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "CheckAttach";
@@ -190,8 +190,8 @@
   };
 
   clang_complete = buildVimPluginFrom2Nix {
-    name = "clang_complete-2018-09-19";
     pname = "clang_complete";
+    version = "2018-09-19";
     src = fetchFromGitHub {
       owner = "Rip-Rip";
       repo = "clang_complete";
@@ -201,8 +201,8 @@
   };
 
   clighter8 = buildVimPluginFrom2Nix {
-    name = "clighter8-2018-07-25";
     pname = "clighter8";
+    version = "2018-07-25";
     src = fetchFromGitHub {
       owner = "bbchung";
       repo = "clighter8";
@@ -212,8 +212,8 @@
   };
 
   Colour-Sampler-Pack = buildVimPluginFrom2Nix {
-    name = "Colour-Sampler-Pack-2012-11-30";
     pname = "Colour-Sampler-Pack";
+    version = "2012-11-30";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -223,8 +223,8 @@
   };
 
   command-t = buildVimPluginFrom2Nix {
-    name = "command-t-2018-09-19";
     pname = "command-t";
+    version = "2018-09-19";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -235,8 +235,8 @@
   };
 
   committia-vim = buildVimPluginFrom2Nix {
-    name = "committia-vim-2018-10-23";
     pname = "committia-vim";
+    version = "2018-10-23";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
@@ -246,8 +246,8 @@
   };
 
   concealedyank-vim = buildVimPluginFrom2Nix {
-    name = "concealedyank-vim-2013-03-24";
     pname = "concealedyank-vim";
+    version = "2013-03-24";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "concealedyank.vim";
@@ -257,8 +257,8 @@
   };
 
   context_filetype-vim = buildVimPluginFrom2Nix {
-    name = "context_filetype-vim-2018-08-30";
     pname = "context_filetype-vim";
+    version = "2018-08-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
@@ -268,8 +268,8 @@
   };
 
   cosco-vim = buildVimPluginFrom2Nix {
-    name = "cosco-vim-2018-08-07";
     pname = "cosco-vim";
+    version = "2018-08-07";
     src = fetchFromGitHub {
       owner = "lfilho";
       repo = "cosco.vim";
@@ -279,8 +279,8 @@
   };
 
   cpsm = buildVimPluginFrom2Nix {
-    name = "cpsm-2018-09-08";
     pname = "cpsm";
+    version = "2018-09-08";
     src = fetchFromGitHub {
       owner = "nixprime";
       repo = "cpsm";
@@ -290,8 +290,8 @@
   };
 
   csapprox = buildVimPluginFrom2Nix {
-    name = "csapprox-2013-07-27";
     pname = "csapprox";
+    version = "2013-07-27";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "csapprox";
@@ -301,8 +301,8 @@
   };
 
   csv-vim = buildVimPluginFrom2Nix {
-    name = "csv-vim-2018-10-04";
     pname = "csv-vim";
+    version = "2018-10-04";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
@@ -312,8 +312,8 @@
   };
 
   ctrlp-cmatcher = buildVimPluginFrom2Nix {
-    name = "ctrlp-cmatcher-2015-10-15";
     pname = "ctrlp-cmatcher";
+    version = "2015-10-15";
     src = fetchFromGitHub {
       owner = "JazzCore";
       repo = "ctrlp-cmatcher";
@@ -323,8 +323,8 @@
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix {
-    name = "ctrlp-py-matcher-2017-11-01";
     pname = "ctrlp-py-matcher";
+    version = "2017-11-01";
     src = fetchFromGitHub {
       owner = "FelikZ";
       repo = "ctrlp-py-matcher";
@@ -334,8 +334,8 @@
   };
 
   ctrlp-z = buildVimPluginFrom2Nix {
-    name = "ctrlp-z-2015-10-17";
     pname = "ctrlp-z";
+    version = "2015-10-17";
     src = fetchFromGitHub {
       owner = "amiorin";
       repo = "ctrlp-z";
@@ -345,8 +345,8 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-11-22";
     pname = "ctrlp-vim";
+    version = "2018-11-22";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
@@ -356,8 +356,8 @@
   };
 
   denite-extra = buildVimPluginFrom2Nix {
-    name = "denite-extra-2018-09-20";
     pname = "denite-extra";
+    version = "2018-09-20";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-extra";
@@ -367,8 +367,8 @@
   };
 
   denite-git = buildVimPluginFrom2Nix {
-    name = "denite-git-2018-07-19";
     pname = "denite-git";
+    version = "2018-07-19";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
@@ -378,8 +378,8 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-12-24";
     pname = "denite-nvim";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
@@ -389,8 +389,8 @@
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-12-25";
     pname = "deol-nvim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
@@ -400,8 +400,8 @@
   };
 
   deoplete-clang = buildVimPluginFrom2Nix {
-    name = "deoplete-clang-2018-12-24";
     pname = "deoplete-clang";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-clang";
@@ -412,8 +412,8 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-11-23";
     pname = "deoplete-go";
+    version = "2018-11-23";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
@@ -424,8 +424,8 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-12-24";
     pname = "deoplete-jedi";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
@@ -436,8 +436,8 @@
   };
 
   deoplete-julia = buildVimPluginFrom2Nix {
-    name = "deoplete-julia-2018-06-11";
     pname = "deoplete-julia";
+    version = "2018-06-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "deoplete-julia";
@@ -447,8 +447,8 @@
   };
 
   deoplete-rust = buildVimPluginFrom2Nix {
-    name = "deoplete-rust-2017-07-18";
     pname = "deoplete-rust";
+    version = "2017-07-18";
     src = fetchFromGitHub {
       owner = "sebastianmarkow";
       repo = "deoplete-rust";
@@ -458,8 +458,8 @@
   };
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
-    name = "deoplete-ternjs-2018-11-29";
     pname = "deoplete-ternjs";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
@@ -469,8 +469,8 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-12-26";
     pname = "deoplete-nvim";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
@@ -480,8 +480,8 @@
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-12-26";
     pname = "dhall-vim";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
@@ -491,8 +491,8 @@
   };
 
   direnv-vim = buildVimPluginFrom2Nix {
-    name = "direnv-vim-2018-11-10";
     pname = "direnv-vim";
+    version = "2018-11-10";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
@@ -502,8 +502,8 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-12-09";
     pname = "echodoc-vim";
+    version = "2018-12-09";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
@@ -513,8 +513,8 @@
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
-    name = "editorconfig-vim-2018-11-15";
     pname = "editorconfig-vim";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
@@ -525,8 +525,8 @@
   };
 
   elm-vim = buildVimPluginFrom2Nix {
-    name = "elm-vim-2018-11-13";
     pname = "elm-vim";
+    version = "2018-11-13";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
@@ -536,8 +536,8 @@
   };
 
   emmet-vim = buildVimPluginFrom2Nix {
-    name = "emmet-vim-2018-11-29";
     pname = "emmet-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
@@ -548,8 +548,8 @@
   };
 
   ensime-vim = buildVimPluginFrom2Nix {
-    name = "ensime-vim-2018-10-10";
     pname = "ensime-vim";
+    version = "2018-10-10";
     src = fetchFromGitHub {
       owner = "ensime";
       repo = "ensime-vim";
@@ -559,8 +559,8 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-12-21";
     pname = "falcon";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
@@ -570,8 +570,8 @@
   };
 
   fastfold = buildVimPluginFrom2Nix {
-    name = "fastfold-2018-09-24";
     pname = "fastfold";
+    version = "2018-09-24";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
@@ -581,8 +581,8 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-12-25";
     pname = "ferret";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
@@ -592,8 +592,8 @@
   };
 
   flake8-vim = buildVimPluginFrom2Nix {
-    name = "flake8-vim-2017-02-17";
     pname = "flake8-vim";
+    version = "2017-02-17";
     src = fetchFromGitHub {
       owner = "andviro";
       repo = "flake8-vim";
@@ -604,8 +604,8 @@
   };
 
   floobits-neovim = buildVimPluginFrom2Nix {
-    name = "floobits-neovim-2018-08-01";
     pname = "floobits-neovim";
+    version = "2018-08-01";
     src = fetchFromGitHub {
       owner = "floobits";
       repo = "floobits-neovim";
@@ -615,8 +615,8 @@
   };
 
   forms = buildVimPluginFrom2Nix {
-    name = "forms-2012-11-28";
     pname = "forms";
+    version = "2012-11-28";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "forms";
@@ -626,8 +626,8 @@
   };
 
   fugitive-gitlab-vim = buildVimPluginFrom2Nix {
-    name = "fugitive-gitlab-vim-2018-07-04";
     pname = "fugitive-gitlab-vim";
+    version = "2018-07-04";
     src = fetchFromGitHub {
       owner = "shumphrey";
       repo = "fugitive-gitlab.vim";
@@ -637,8 +637,8 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-12-11";
     pname = "fzf-vim";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
@@ -648,8 +648,8 @@
   };
 
   ghcmod-vim = buildVimPluginFrom2Nix {
-    name = "ghcmod-vim-2016-06-19";
     pname = "ghcmod-vim";
+    version = "2016-06-19";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "ghcmod-vim";
@@ -659,8 +659,8 @@
   };
 
   gist-vim = buildVimPluginFrom2Nix {
-    name = "gist-vim-2018-11-09";
     pname = "gist-vim";
+    version = "2018-11-09";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
@@ -670,8 +670,8 @@
   };
 
   gitv = buildVimPluginFrom2Nix {
-    name = "gitv-2018-11-24";
     pname = "gitv";
+    version = "2018-11-24";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
@@ -681,8 +681,8 @@
   };
 
   goyo-vim = buildVimPluginFrom2Nix {
-    name = "goyo-vim-2017-05-31";
     pname = "goyo-vim";
+    version = "2017-05-31";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "goyo.vim";
@@ -692,8 +692,8 @@
   };
 
   gruvbox = buildVimPluginFrom2Nix {
-    name = "gruvbox-2018-02-25";
     pname = "gruvbox";
+    version = "2018-02-25";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
@@ -703,8 +703,8 @@
   };
 
   gundo-vim = buildVimPluginFrom2Nix {
-    name = "gundo-vim-2017-05-09";
     pname = "gundo-vim";
+    version = "2017-05-09";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "gundo.vim";
@@ -714,8 +714,8 @@
   };
 
   haskell-vim = buildVimPluginFrom2Nix {
-    name = "haskell-vim-2018-05-22";
     pname = "haskell-vim";
+    version = "2018-05-22";
     src = fetchFromGitHub {
       owner = "neovimhaskell";
       repo = "haskell-vim";
@@ -725,8 +725,8 @@
   };
 
   hasksyn = buildVimPluginFrom2Nix {
-    name = "hasksyn-2014-09-04";
     pname = "hasksyn";
+    version = "2014-09-04";
     src = fetchFromGitHub {
       owner = "travitch";
       repo = "hasksyn";
@@ -736,8 +736,8 @@
   };
 
   hlint-refactor-vim = buildVimPluginFrom2Nix {
-    name = "hlint-refactor-vim-2015-12-05";
     pname = "hlint-refactor-vim";
+    version = "2015-12-05";
     src = fetchFromGitHub {
       owner = "mpickering";
       repo = "hlint-refactor-vim";
@@ -747,8 +747,8 @@
   };
 
   iceberg-vim = buildVimPluginFrom2Nix {
-    name = "iceberg-vim-2018-10-17";
     pname = "iceberg-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
@@ -758,8 +758,8 @@
   };
 
   idris-vim = buildVimPluginFrom2Nix {
-    name = "idris-vim-2017-12-04";
     pname = "idris-vim";
+    version = "2017-12-04";
     src = fetchFromGitHub {
       owner = "idris-hackers";
       repo = "idris-vim";
@@ -769,8 +769,8 @@
   };
 
   Improved-AnsiEsc = buildVimPluginFrom2Nix {
-    name = "Improved-AnsiEsc-2015-08-26";
     pname = "Improved-AnsiEsc";
+    version = "2015-08-26";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Improved-AnsiEsc";
@@ -780,8 +780,8 @@
   };
 
   incsearch-easymotion-vim = buildVimPluginFrom2Nix {
-    name = "incsearch-easymotion-vim-2016-01-18";
     pname = "incsearch-easymotion-vim";
+    version = "2016-01-18";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch-easymotion.vim";
@@ -791,8 +791,8 @@
   };
 
   incsearch-vim = buildVimPluginFrom2Nix {
-    name = "incsearch-vim-2017-11-24";
     pname = "incsearch-vim";
+    version = "2017-11-24";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch.vim";
@@ -802,8 +802,8 @@
   };
 
   intero-neovim = buildVimPluginFrom2Nix {
-    name = "intero-neovim-2018-08-07";
     pname = "intero-neovim";
+    version = "2018-08-07";
     src = fetchFromGitHub {
       owner = "parsonsmatt";
       repo = "intero-neovim";
@@ -813,8 +813,8 @@
   };
 
   iosvkem = buildVimPluginFrom2Nix {
-    name = "iosvkem-2018-08-26";
     pname = "iosvkem";
+    version = "2018-08-26";
     src = fetchFromGitHub {
       owner = "neutaaaaan";
       repo = "iosvkem";
@@ -824,8 +824,8 @@
   };
 
   jedi-vim = buildVimPluginFrom2Nix {
-    name = "jedi-vim-2018-12-03";
     pname = "jedi-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
@@ -836,8 +836,8 @@
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    name = "Jenkinsfile-vim-syntax-2018-11-25";
     pname = "Jenkinsfile-vim-syntax";
+    version = "2018-11-25";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
@@ -847,8 +847,8 @@
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-12-11";
     pname = "julia-vim";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
@@ -858,8 +858,8 @@
   };
 
   last256 = buildVimPluginFrom2Nix {
-    name = "last256-2017-06-10";
     pname = "last256";
+    version = "2017-06-10";
     src = fetchFromGitHub {
       owner = "sk1418";
       repo = "last256";
@@ -869,8 +869,8 @@
   };
 
   latex-box = buildVimPluginFrom2Nix {
-    name = "latex-box-2015-06-01";
     pname = "latex-box";
+    version = "2015-06-01";
     src = fetchFromGitHub {
       owner = "latex-box-team";
       repo = "latex-box";
@@ -880,8 +880,8 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-12-12";
     pname = "lightline-vim";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
@@ -891,8 +891,8 @@
   };
 
   limelight-vim = buildVimPluginFrom2Nix {
-    name = "limelight-vim-2016-06-23";
     pname = "limelight-vim";
+    version = "2016-06-23";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "limelight.vim";
@@ -902,8 +902,8 @@
   };
 
   lushtags = buildVimPluginFrom2Nix {
-    name = "lushtags-2017-04-19";
     pname = "lushtags";
+    version = "2017-04-19";
     src = fetchFromGitHub {
       owner = "mkasa";
       repo = "lushtags";
@@ -913,8 +913,8 @@
   };
 
   matchit-zip = buildVimPluginFrom2Nix {
-    name = "matchit-zip-2010-10-18";
     pname = "matchit-zip";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "matchit.zip";
@@ -924,8 +924,8 @@
   };
 
   mayansmoke = buildVimPluginFrom2Nix {
-    name = "mayansmoke-2010-10-18";
     pname = "mayansmoke";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "mayansmoke";
@@ -935,8 +935,8 @@
   };
 
   molokai = buildVimPluginFrom2Nix {
-    name = "molokai-2015-11-11";
     pname = "molokai";
+    version = "2015-11-11";
     src = fetchFromGitHub {
       owner = "tomasr";
       repo = "molokai";
@@ -946,8 +946,8 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-12-27";
     pname = "ncm2";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
@@ -957,8 +957,8 @@
   };
 
   ncm2-bufword = buildVimPluginFrom2Nix {
-    name = "ncm2-bufword-2018-12-06";
     pname = "ncm2-bufword";
+    version = "2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-bufword";
@@ -968,8 +968,8 @@
   };
 
   ncm2-jedi = buildVimPluginFrom2Nix {
-    name = "ncm2-jedi-2018-07-18";
     pname = "ncm2-jedi";
+    version = "2018-07-18";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-jedi";
@@ -979,8 +979,8 @@
   };
 
   ncm2-path = buildVimPluginFrom2Nix {
-    name = "ncm2-path-2018-09-12";
     pname = "ncm2-path";
+    version = "2018-09-12";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-path";
@@ -990,8 +990,8 @@
   };
 
   ncm2-tmux = buildVimPluginFrom2Nix {
-    name = "ncm2-tmux-2018-12-06";
     pname = "ncm2-tmux";
+    version = "2018-12-06";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-tmux";
@@ -1001,8 +1001,8 @@
   };
 
   ncm2-ultisnips = buildVimPluginFrom2Nix {
-    name = "ncm2-ultisnips-2018-08-01";
     pname = "ncm2-ultisnips";
+    version = "2018-08-01";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-ultisnips";
@@ -1012,8 +1012,8 @@
   };
 
   neco-ghc = buildVimPluginFrom2Nix {
-    name = "neco-ghc-2018-05-13";
     pname = "neco-ghc";
+    version = "2018-05-13";
     src = fetchFromGitHub {
       owner = "eagletmt";
       repo = "neco-ghc";
@@ -1023,8 +1023,8 @@
   };
 
   neco-look = buildVimPluginFrom2Nix {
-    name = "neco-look-2018-11-09";
     pname = "neco-look";
+    version = "2018-11-09";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
@@ -1034,8 +1034,8 @@
   };
 
   neco-syntax = buildVimPluginFrom2Nix {
-    name = "neco-syntax-2017-10-01";
     pname = "neco-syntax";
+    version = "2017-10-01";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-syntax";
@@ -1045,8 +1045,8 @@
   };
 
   neco-vim = buildVimPluginFrom2Nix {
-    name = "neco-vim-2018-10-30";
     pname = "neco-vim";
+    version = "2018-10-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
@@ -1056,8 +1056,8 @@
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix {
-    name = "neocomplete-vim-2018-11-19";
     pname = "neocomplete-vim";
+    version = "2018-11-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
@@ -1067,8 +1067,8 @@
   };
 
   neodark-vim = buildVimPluginFrom2Nix {
-    name = "neodark-vim-2018-10-17";
     pname = "neodark-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
@@ -1078,8 +1078,8 @@
   };
 
   neoformat = buildVimPluginFrom2Nix {
-    name = "neoformat-2018-12-21";
     pname = "neoformat";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
@@ -1089,8 +1089,8 @@
   };
 
   neoinclude-vim = buildVimPluginFrom2Nix {
-    name = "neoinclude-vim-2018-05-21";
     pname = "neoinclude-vim";
+    version = "2018-05-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoinclude.vim";
@@ -1100,8 +1100,8 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-12-27";
     pname = "neomake";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
@@ -1111,8 +1111,8 @@
   };
 
   neomru-vim = buildVimPluginFrom2Nix {
-    name = "neomru-vim-2018-11-29";
     pname = "neomru-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
@@ -1122,8 +1122,8 @@
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
-    name = "neosnippet-snippets-2018-09-30";
     pname = "neosnippet-snippets";
+    version = "2018-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
@@ -1133,8 +1133,8 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-12-03";
     pname = "neosnippet-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
@@ -1144,8 +1144,8 @@
   };
 
   neovim-sensible = buildVimPluginFrom2Nix {
-    name = "neovim-sensible-2017-09-20";
     pname = "neovim-sensible";
+    version = "2017-09-20";
     src = fetchFromGitHub {
       owner = "jeffkreeftmeijer";
       repo = "neovim-sensible";
@@ -1155,8 +1155,8 @@
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-12-03";
     pname = "neoyank-vim";
+    version = "2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
@@ -1166,8 +1166,8 @@
   };
 
   nerdcommenter = buildVimPluginFrom2Nix {
-    name = "nerdcommenter-2018-12-26";
     pname = "nerdcommenter";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
@@ -1177,8 +1177,8 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-12-12";
     pname = "nerdtree";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
@@ -1188,8 +1188,8 @@
   };
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
-    name = "nerdtree-git-plugin-2018-11-15";
     pname = "nerdtree-git-plugin";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
@@ -1199,8 +1199,8 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-12-16";
     pname = "nim-vim";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
@@ -1210,8 +1210,8 @@
   };
 
   nvim-cm-racer = buildVimPluginFrom2Nix {
-    name = "nvim-cm-racer-2017-07-27";
     pname = "nvim-cm-racer";
+    version = "2017-07-27";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-cm-racer";
@@ -1221,8 +1221,8 @@
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix {
-    name = "nvim-completion-manager-2018-07-27";
     pname = "nvim-completion-manager";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-completion-manager";
@@ -1232,8 +1232,8 @@
   };
 
   nvim-yarp = buildVimPluginFrom2Nix {
-    name = "nvim-yarp-2018-12-23";
     pname = "nvim-yarp";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
@@ -1243,8 +1243,8 @@
   };
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
-    name = "nvimdev-nvim-2018-11-07";
     pname = "nvimdev-nvim";
+    version = "2018-11-07";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
@@ -1254,8 +1254,8 @@
   };
 
   onehalf = buildVimPluginFrom2Nix {
-    name = "onehalf-2018-10-21";
     pname = "onehalf";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
@@ -1265,8 +1265,8 @@
   };
 
   open-browser-vim = buildVimPluginFrom2Nix {
-    name = "open-browser-vim-2018-11-29";
     pname = "open-browser-vim";
+    version = "2018-11-29";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
@@ -1276,8 +1276,8 @@
   };
 
   papercolor-theme = buildVimPluginFrom2Nix {
-    name = "papercolor-theme-2018-09-04";
     pname = "papercolor-theme";
+    version = "2018-09-04";
     src = fetchFromGitHub {
       owner = "NLKNguyen";
       repo = "papercolor-theme";
@@ -1287,8 +1287,8 @@
   };
 
   peskcolor-vim = buildVimPluginFrom2Nix {
-    name = "peskcolor-vim-2016-06-11";
     pname = "peskcolor-vim";
+    version = "2016-06-11";
     src = fetchFromGitHub {
       owner = "andsild";
       repo = "peskcolor.vim";
@@ -1298,8 +1298,8 @@
   };
 
   pig-vim = buildVimPluginFrom2Nix {
-    name = "pig-vim-2017-06-08";
     pname = "pig-vim";
+    version = "2017-06-08";
     src = fetchFromGitHub {
       owner = "motus";
       repo = "pig.vim";
@@ -1309,8 +1309,8 @@
   };
 
   pony-vim-syntax = buildVimPluginFrom2Nix {
-    name = "pony-vim-syntax-2017-09-26";
     pname = "pony-vim-syntax";
+    version = "2017-09-26";
     src = fetchFromGitHub {
       owner = "dleonard0";
       repo = "pony-vim-syntax";
@@ -1320,8 +1320,8 @@
   };
 
   PreserveNoEOL = buildVimPluginFrom2Nix {
-    name = "PreserveNoEOL-2013-06-14";
     pname = "PreserveNoEOL";
+    version = "2013-06-14";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "PreserveNoEOL";
@@ -1331,8 +1331,8 @@
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix {
-    name = "psc-ide-vim-2018-03-11";
     pname = "psc-ide-vim";
+    version = "2018-03-11";
     src = fetchFromGitHub {
       owner = "frigoeu";
       repo = "psc-ide-vim";
@@ -1342,8 +1342,8 @@
   };
 
   purescript-vim = buildVimPluginFrom2Nix {
-    name = "purescript-vim-2018-12-10";
     pname = "purescript-vim";
+    version = "2018-12-10";
     src = fetchFromGitHub {
       owner = "raichoo";
       repo = "purescript-vim";
@@ -1353,8 +1353,8 @@
   };
 
   python-mode = buildVimPluginFrom2Nix {
-    name = "python-mode-2018-04-29";
     pname = "python-mode";
+    version = "2018-04-29";
     src = fetchFromGitHub {
       owner = "python-mode";
       repo = "python-mode";
@@ -1364,8 +1364,8 @@
   };
 
   quickfixstatus = buildVimPluginFrom2Nix {
-    name = "quickfixstatus-2011-09-03";
     pname = "quickfixstatus";
+    version = "2011-09-03";
     src = fetchFromGitHub {
       owner = "dannyob";
       repo = "quickfixstatus";
@@ -1375,8 +1375,8 @@
   };
 
   rainbow = buildVimPluginFrom2Nix {
-    name = "rainbow-2018-07-31";
     pname = "rainbow";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "luochen1990";
       repo = "rainbow";
@@ -1386,8 +1386,8 @@
   };
 
   rainbow_parentheses-vim = buildVimPluginFrom2Nix {
-    name = "rainbow_parentheses-vim-2013-03-05";
     pname = "rainbow_parentheses-vim";
+    version = "2013-03-05";
     src = fetchFromGitHub {
       owner = "kien";
       repo = "rainbow_parentheses.vim";
@@ -1397,8 +1397,8 @@
   };
 
   random-vim = buildVimPluginFrom2Nix {
-    name = "random-vim-2010-10-18";
     pname = "random-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "random.vim";
@@ -1408,8 +1408,8 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-12-21";
     pname = "ranger-vim";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
@@ -1419,8 +1419,8 @@
   };
 
   Recover-vim = buildVimPluginFrom2Nix {
-    name = "Recover-vim-2018-10-22";
     pname = "Recover-vim";
+    version = "2018-10-22";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "Recover.vim";
@@ -1430,8 +1430,8 @@
   };
 
   Rename = buildVimPluginFrom2Nix {
-    name = "Rename-2011-08-31";
     pname = "Rename";
+    version = "2011-08-31";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Rename";
@@ -1441,8 +1441,8 @@
   };
 
   ReplaceWithRegister = buildVimPluginFrom2Nix {
-    name = "ReplaceWithRegister-2014-10-31";
     pname = "ReplaceWithRegister";
+    version = "2014-10-31";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "ReplaceWithRegister";
@@ -1452,8 +1452,8 @@
   };
 
   riv-vim = buildVimPluginFrom2Nix {
-    name = "riv-vim-2018-10-17";
     pname = "riv-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
@@ -1463,8 +1463,8 @@
   };
 
   robotframework-vim = buildVimPluginFrom2Nix {
-    name = "robotframework-vim-2017-04-14";
     pname = "robotframework-vim";
+    version = "2017-04-14";
     src = fetchFromGitHub {
       owner = "mfukar";
       repo = "robotframework-vim";
@@ -1474,8 +1474,8 @@
   };
 
   rtorrent-syntax-file = buildVimPluginFrom2Nix {
-    name = "rtorrent-syntax-file-2016-03-19";
     pname = "rtorrent-syntax-file";
+    version = "2016-03-19";
     src = fetchFromGitHub {
       owner = "ccarpita";
       repo = "rtorrent-syntax-file";
@@ -1485,8 +1485,8 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-12-23";
     pname = "rust-vim";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
@@ -1496,8 +1496,8 @@
   };
 
   self = buildVimPluginFrom2Nix {
-    name = "self-2014-05-28";
     pname = "self";
+    version = "2014-05-28";
     src = fetchFromGitHub {
       owner = "megaannum";
       repo = "self";
@@ -1507,8 +1507,8 @@
   };
 
   shabadou-vim = buildVimPluginFrom2Nix {
-    name = "shabadou-vim-2016-07-19";
     pname = "shabadou-vim";
+    version = "2016-07-19";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "shabadou.vim";
@@ -1518,8 +1518,8 @@
   };
 
   sourcemap-vim = buildVimPluginFrom2Nix {
-    name = "sourcemap-vim-2012-09-19";
     pname = "sourcemap-vim";
+    version = "2012-09-19";
     src = fetchFromGitHub {
       owner = "chikatoike";
       repo = "sourcemap.vim";
@@ -1529,8 +1529,8 @@
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix {
-    name = "Spacegray-vim-2018-12-25";
     pname = "Spacegray-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "ajh17";
       repo = "Spacegray.vim";
@@ -1540,8 +1540,8 @@
   };
 
   spacevim = buildVimPluginFrom2Nix {
-    name = "spacevim-2018-03-29";
     pname = "spacevim";
+    version = "2018-03-29";
     src = fetchFromGitHub {
       owner = "ctjhoa";
       repo = "spacevim";
@@ -1551,8 +1551,8 @@
   };
 
   sparkup = buildVimPluginFrom2Nix {
-    name = "sparkup-2012-06-11";
     pname = "sparkup";
+    version = "2012-06-11";
     src = fetchFromGitHub {
       owner = "chrisgeo";
       repo = "sparkup";
@@ -1562,8 +1562,8 @@
   };
 
   splice-vim = buildVimPluginFrom2Nix {
-    name = "splice-vim-2017-09-03";
     pname = "splice-vim";
+    version = "2017-09-03";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "splice.vim";
@@ -1573,8 +1573,8 @@
   };
 
   supertab = buildVimPluginFrom2Nix {
-    name = "supertab-2017-11-14";
     pname = "supertab";
+    version = "2017-11-14";
     src = fetchFromGitHub {
       owner = "ervandew";
       repo = "supertab";
@@ -1584,8 +1584,8 @@
   };
 
   swift-vim = buildVimPluginFrom2Nix {
-    name = "swift-vim-2018-09-12";
     pname = "swift-vim";
+    version = "2018-09-12";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
@@ -1595,8 +1595,8 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-11-24";
     pname = "syntastic";
+    version = "2018-11-24";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
@@ -1606,8 +1606,8 @@
   };
 
   tabmerge = buildVimPluginFrom2Nix {
-    name = "tabmerge-2010-10-18";
     pname = "tabmerge";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "tabmerge";
@@ -1617,8 +1617,8 @@
   };
 
   tabpagebuffer-vim = buildVimPluginFrom2Nix {
-    name = "tabpagebuffer-vim-2014-09-30";
     pname = "tabpagebuffer-vim";
+    version = "2014-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "tabpagebuffer.vim";
@@ -1628,8 +1628,8 @@
   };
 
   tabular = buildVimPluginFrom2Nix {
-    name = "tabular-2016-05-04";
     pname = "tabular";
+    version = "2016-05-04";
     src = fetchFromGitHub {
       owner = "godlygeek";
       repo = "tabular";
@@ -1639,8 +1639,8 @@
   };
 
   tagbar = buildVimPluginFrom2Nix {
-    name = "tagbar-2017-12-17";
     pname = "tagbar";
+    version = "2017-12-17";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
@@ -1650,8 +1650,8 @@
   };
 
   taglist-vim = buildVimPluginFrom2Nix {
-    name = "taglist-vim-2010-10-18";
     pname = "taglist-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "taglist.vim";
@@ -1661,8 +1661,8 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-12-21";
     pname = "targets-vim";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
@@ -1672,8 +1672,8 @@
   };
 
   tender-vim = buildVimPluginFrom2Nix {
-    name = "tender-vim-2017-03-14";
     pname = "tender-vim";
+    version = "2017-03-14";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
@@ -1683,8 +1683,8 @@
   };
 
   tern_for_vim = buildVimPluginFrom2Nix {
-    name = "tern_for_vim-2017-11-27";
     pname = "tern_for_vim";
+    version = "2017-11-27";
     src = fetchFromGitHub {
       owner = "ternjs";
       repo = "tern_for_vim";
@@ -1694,8 +1694,8 @@
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix {
-    name = "thumbnail-vim-2017-04-24";
     pname = "thumbnail-vim";
+    version = "2017-04-24";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "thumbnail.vim";
@@ -1705,8 +1705,8 @@
   };
 
   tlib_vim = buildVimPluginFrom2Nix {
-    name = "tlib_vim-2018-04-08";
     pname = "tlib_vim";
+    version = "2018-04-08";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
@@ -1716,8 +1716,8 @@
   };
 
   traces-vim = buildVimPluginFrom2Nix {
-    name = "traces-vim-2018-12-25";
     pname = "traces-vim";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
@@ -1727,8 +1727,8 @@
   };
 
   tslime-vim = buildVimPluginFrom2Nix {
-    name = "tslime-vim-2018-07-23";
     pname = "tslime-vim";
+    version = "2018-07-23";
     src = fetchFromGitHub {
       owner = "jgdavey";
       repo = "tslime.vim";
@@ -1738,8 +1738,8 @@
   };
 
   tsuquyomi = buildVimPluginFrom2Nix {
-    name = "tsuquyomi-2018-12-26";
     pname = "tsuquyomi";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
@@ -1749,8 +1749,8 @@
   };
 
   typescript-vim = buildVimPluginFrom2Nix {
-    name = "typescript-vim-2018-10-17";
     pname = "typescript-vim";
+    version = "2018-10-17";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
@@ -1760,8 +1760,8 @@
   };
 
   ultisnips = buildVimPluginFrom2Nix {
-    name = "ultisnips-2018-04-30";
     pname = "ultisnips";
+    version = "2018-04-30";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
@@ -1771,8 +1771,8 @@
   };
 
   undotree = buildVimPluginFrom2Nix {
-    name = "undotree-2018-10-15";
     pname = "undotree";
+    version = "2018-10-15";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
@@ -1782,8 +1782,8 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-12-14";
     pname = "unite-vim";
+    version = "2018-12-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
@@ -1793,8 +1793,8 @@
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-12-08";
     pname = "verilog_systemverilog-vim";
+    version = "2018-12-08";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
@@ -1804,8 +1804,8 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-12-22";
     pname = "vim";
+    version = "2018-12-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
@@ -1815,8 +1815,8 @@
   };
 
   vim-abolish = buildVimPluginFrom2Nix {
-    name = "vim-abolish-2018-11-25";
     pname = "vim-abolish";
+    version = "2018-11-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
@@ -1826,8 +1826,8 @@
   };
 
   vim-addon-actions = buildVimPluginFrom2Nix {
-    name = "vim-addon-actions-2018-01-18";
     pname = "vim-addon-actions";
+    version = "2018-01-18";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-actions";
@@ -1837,8 +1837,8 @@
   };
 
   vim-addon-async = buildVimPluginFrom2Nix {
-    name = "vim-addon-async-2017-03-20";
     pname = "vim-addon-async";
+    version = "2017-03-20";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-async";
@@ -1848,8 +1848,8 @@
   };
 
   vim-addon-background-cmd = buildVimPluginFrom2Nix {
-    name = "vim-addon-background-cmd-2015-12-11";
     pname = "vim-addon-background-cmd";
+    version = "2015-12-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-background-cmd";
@@ -1859,8 +1859,8 @@
   };
 
   vim-addon-commenting = buildVimPluginFrom2Nix {
-    name = "vim-addon-commenting-2013-06-10";
     pname = "vim-addon-commenting";
+    version = "2013-06-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-commenting";
@@ -1870,8 +1870,8 @@
   };
 
   vim-addon-completion = buildVimPluginFrom2Nix {
-    name = "vim-addon-completion-2015-02-10";
     pname = "vim-addon-completion";
+    version = "2015-02-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-completion";
@@ -1881,8 +1881,8 @@
   };
 
   vim-addon-errorformats = buildVimPluginFrom2Nix {
-    name = "vim-addon-errorformats-2014-11-05";
     pname = "vim-addon-errorformats";
+    version = "2014-11-05";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-errorformats";
@@ -1892,8 +1892,8 @@
   };
 
   vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
-    name = "vim-addon-goto-thing-at-cursor-2012-01-10";
     pname = "vim-addon-goto-thing-at-cursor";
+    version = "2012-01-10";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-goto-thing-at-cursor";
@@ -1903,8 +1903,8 @@
   };
 
   vim-addon-local-vimrc = buildVimPluginFrom2Nix {
-    name = "vim-addon-local-vimrc-2015-03-19";
     pname = "vim-addon-local-vimrc";
+    version = "2015-03-19";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-local-vimrc";
@@ -1914,8 +1914,8 @@
   };
 
   vim-addon-manager = buildVimPluginFrom2Nix {
-    name = "vim-addon-manager-2018-07-27";
     pname = "vim-addon-manager";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-manager";
@@ -1925,8 +1925,8 @@
   };
 
   vim-addon-mru = buildVimPluginFrom2Nix {
-    name = "vim-addon-mru-2013-08-08";
     pname = "vim-addon-mru";
+    version = "2013-08-08";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mru";
@@ -1936,8 +1936,8 @@
   };
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix {
-    name = "vim-addon-mw-utils-2018-03-09";
     pname = "vim-addon-mw-utils";
+    version = "2018-03-09";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mw-utils";
@@ -1947,8 +1947,8 @@
   };
 
   vim-addon-nix = buildVimPluginFrom2Nix {
-    name = "vim-addon-nix-2017-09-11";
     pname = "vim-addon-nix";
+    version = "2017-09-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-nix";
@@ -1958,8 +1958,8 @@
   };
 
   vim-addon-other = buildVimPluginFrom2Nix {
-    name = "vim-addon-other-2014-07-15";
     pname = "vim-addon-other";
+    version = "2014-07-15";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-other";
@@ -1969,8 +1969,8 @@
   };
 
   vim-addon-php-manual = buildVimPluginFrom2Nix {
-    name = "vim-addon-php-manual-2015-01-01";
     pname = "vim-addon-php-manual";
+    version = "2015-01-01";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-php-manual";
@@ -1980,8 +1980,8 @@
   };
 
   vim-addon-signs = buildVimPluginFrom2Nix {
-    name = "vim-addon-signs-2013-04-19";
     pname = "vim-addon-signs";
+    version = "2013-04-19";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-signs";
@@ -1991,8 +1991,8 @@
   };
 
   vim-addon-sql = buildVimPluginFrom2Nix {
-    name = "vim-addon-sql-2017-02-11";
     pname = "vim-addon-sql";
+    version = "2017-02-11";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-sql";
@@ -2002,8 +2002,8 @@
   };
 
   vim-addon-syntax-checker = buildVimPluginFrom2Nix {
-    name = "vim-addon-syntax-checker-2017-06-26";
     pname = "vim-addon-syntax-checker";
+    version = "2017-06-26";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-syntax-checker";
@@ -2013,8 +2013,8 @@
   };
 
   vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
-    name = "vim-addon-toggle-buffer-2012-01-13";
     pname = "vim-addon-toggle-buffer";
+    version = "2012-01-13";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-toggle-buffer";
@@ -2024,8 +2024,8 @@
   };
 
   vim-addon-xdebug = buildVimPluginFrom2Nix {
-    name = "vim-addon-xdebug-2014-08-29";
     pname = "vim-addon-xdebug";
+    version = "2014-08-29";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-xdebug";
@@ -2035,8 +2035,8 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-12-18";
     pname = "vim-airline";
+    version = "2018-12-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
@@ -2046,8 +2046,8 @@
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
-    name = "vim-airline-themes-2018-11-15";
     pname = "vim-airline-themes";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
@@ -2057,8 +2057,8 @@
   };
 
   vim-android = buildVimPluginFrom2Nix {
-    name = "vim-android-2018-07-31";
     pname = "vim-android";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
@@ -2068,8 +2068,8 @@
   };
 
   vim-anzu = buildVimPluginFrom2Nix {
-    name = "vim-anzu-2018-02-28";
     pname = "vim-anzu";
+    version = "2018-02-28";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-anzu";
@@ -2079,8 +2079,8 @@
   };
 
   vim-auto-save = buildVimPluginFrom2Nix {
-    name = "vim-auto-save-2017-11-08";
     pname = "vim-auto-save";
+    version = "2017-11-08";
     src = fetchFromGitHub {
       owner = "907th";
       repo = "vim-auto-save";
@@ -2090,8 +2090,8 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-12-19";
     pname = "vim-autoformat";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
@@ -2101,8 +2101,8 @@
   };
 
   vim-bazel = buildVimPluginFrom2Nix {
-    name = "vim-bazel-2018-01-11";
     pname = "vim-bazel";
+    version = "2018-01-11";
     src = fetchFromGitHub {
       owner = "bazelbuild";
       repo = "vim-bazel";
@@ -2112,8 +2112,8 @@
   };
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
-    name = "vim-better-whitespace-2018-06-11";
     pname = "vim-better-whitespace";
+    version = "2018-06-11";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
@@ -2123,8 +2123,8 @@
   };
 
   vim-buffergator = buildVimPluginFrom2Nix {
-    name = "vim-buffergator-2018-05-02";
     pname = "vim-buffergator";
+    version = "2018-05-02";
     src = fetchFromGitHub {
       owner = "jeetsukumaran";
       repo = "vim-buffergator";
@@ -2134,8 +2134,8 @@
   };
 
   vim-bufferline = buildVimPluginFrom2Nix {
-    name = "vim-bufferline-2016-02-09";
     pname = "vim-bufferline";
+    version = "2016-02-09";
     src = fetchFromGitHub {
       owner = "bling";
       repo = "vim-bufferline";
@@ -2145,8 +2145,8 @@
   };
 
   vim-closetag = buildVimPluginFrom2Nix {
-    name = "vim-closetag-2018-12-08";
     pname = "vim-closetag";
+    version = "2018-12-08";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
@@ -2156,8 +2156,8 @@
   };
 
   vim-codefmt = buildVimPluginFrom2Nix {
-    name = "vim-codefmt-2018-12-15";
     pname = "vim-codefmt";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
@@ -2167,8 +2167,8 @@
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix {
-    name = "vim-coffee-script-2018-02-27";
     pname = "vim-coffee-script";
+    version = "2018-02-27";
     src = fetchFromGitHub {
       owner = "kchmck";
       repo = "vim-coffee-script";
@@ -2178,8 +2178,8 @@
   };
 
   vim-colemak = buildVimPluginFrom2Nix {
-    name = "vim-colemak-2016-10-16";
     pname = "vim-colemak";
+    version = "2016-10-16";
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "vim-colemak";
@@ -2189,8 +2189,8 @@
   };
 
   vim-colors-solarized = buildVimPluginFrom2Nix {
-    name = "vim-colors-solarized-2011-05-09";
     pname = "vim-colors-solarized";
+    version = "2011-05-09";
     src = fetchFromGitHub {
       owner = "altercation";
       repo = "vim-colors-solarized";
@@ -2200,8 +2200,8 @@
   };
 
   vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "vim-colorschemes-2018-11-20";
     pname = "vim-colorschemes";
+    version = "2018-11-20";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
@@ -2211,8 +2211,8 @@
   };
 
   vim-colorstepper = buildVimPluginFrom2Nix {
-    name = "vim-colorstepper-2016-01-28";
     pname = "vim-colorstepper";
+    version = "2016-01-28";
     src = fetchFromGitHub {
       owner = "jonbri";
       repo = "vim-colorstepper";
@@ -2222,8 +2222,8 @@
   };
 
   vim-commentary = buildVimPluginFrom2Nix {
-    name = "vim-commentary-2018-07-27";
     pname = "vim-commentary";
+    version = "2018-07-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-commentary";
@@ -2233,8 +2233,8 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-11-20";
     pname = "vim-css-color";
+    version = "2018-11-20";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
@@ -2244,8 +2244,8 @@
   };
 
   vim-cursorword = buildVimPluginFrom2Nix {
-    name = "vim-cursorword-2017-10-19";
     pname = "vim-cursorword";
+    version = "2017-10-19";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
@@ -2255,8 +2255,8 @@
   };
 
   vim-cute-python = buildVimPluginFrom2Nix {
-    name = "vim-cute-python-2016-04-04";
     pname = "vim-cute-python";
+    version = "2016-04-04";
     src = fetchFromGitHub {
       owner = "ehamberg";
       repo = "vim-cute-python";
@@ -2266,8 +2266,8 @@
   };
 
   vim-devicons = buildVimPluginFrom2Nix {
-    name = "vim-devicons-2018-06-21";
     pname = "vim-devicons";
+    version = "2018-06-21";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
@@ -2277,8 +2277,8 @@
   };
 
   vim-dirdiff = buildVimPluginFrom2Nix {
-    name = "vim-dirdiff-2018-01-31";
     pname = "vim-dirdiff";
+    version = "2018-01-31";
     src = fetchFromGitHub {
       owner = "will133";
       repo = "vim-dirdiff";
@@ -2288,8 +2288,8 @@
   };
 
   vim-dirvish = buildVimPluginFrom2Nix {
-    name = "vim-dirvish-2018-12-04";
     pname = "vim-dirvish";
+    version = "2018-12-04";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
@@ -2299,8 +2299,8 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-10-31";
     pname = "vim-dispatch";
+    version = "2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
@@ -2310,8 +2310,8 @@
   };
 
   vim-docbk = buildVimPluginFrom2Nix {
-    name = "vim-docbk-2015-04-01";
     pname = "vim-docbk";
+    version = "2015-04-01";
     src = fetchFromGitHub {
       owner = "jhradilek";
       repo = "vim-docbk";
@@ -2321,8 +2321,8 @@
   };
 
   vim-easy-align = buildVimPluginFrom2Nix {
-    name = "vim-easy-align-2017-06-03";
     pname = "vim-easy-align";
+    version = "2017-06-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-easy-align";
@@ -2332,8 +2332,8 @@
   };
 
   vim-easygit = buildVimPluginFrom2Nix {
-    name = "vim-easygit-2018-07-08";
     pname = "vim-easygit";
+    version = "2018-07-08";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "vim-easygit";
@@ -2343,8 +2343,8 @@
   };
 
   vim-easymotion = buildVimPluginFrom2Nix {
-    name = "vim-easymotion-2018-06-04";
     pname = "vim-easymotion";
+    version = "2018-06-04";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
@@ -2354,8 +2354,8 @@
   };
 
   vim-easytags = buildVimPluginFrom2Nix {
-    name = "vim-easytags-2015-07-01";
     pname = "vim-easytags";
+    version = "2015-07-01";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-easytags";
@@ -2365,8 +2365,8 @@
   };
 
   vim-eighties = buildVimPluginFrom2Nix {
-    name = "vim-eighties-2016-12-15";
     pname = "vim-eighties";
+    version = "2016-12-15";
     src = fetchFromGitHub {
       owner = "justincampbell";
       repo = "vim-eighties";
@@ -2376,8 +2376,8 @@
   };
 
   vim-elixir = buildVimPluginFrom2Nix {
-    name = "vim-elixir-2018-12-12";
     pname = "vim-elixir";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
@@ -2387,8 +2387,8 @@
   };
 
   vim-eunuch = buildVimPluginFrom2Nix {
-    name = "vim-eunuch-2018-09-09";
     pname = "vim-eunuch";
+    version = "2018-09-09";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
@@ -2398,8 +2398,8 @@
   };
 
   vim-expand-region = buildVimPluginFrom2Nix {
-    name = "vim-expand-region-2013-08-19";
     pname = "vim-expand-region";
+    version = "2013-08-19";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-expand-region";
@@ -2409,8 +2409,8 @@
   };
 
   vim-extradite = buildVimPluginFrom2Nix {
-    name = "vim-extradite-2015-09-22";
     pname = "vim-extradite";
+    version = "2015-09-22";
     src = fetchFromGitHub {
       owner = "int3";
       repo = "vim-extradite";
@@ -2420,8 +2420,8 @@
   };
 
   vim-fireplace = buildVimPluginFrom2Nix {
-    name = "vim-fireplace-2018-06-01";
     pname = "vim-fireplace";
+    version = "2018-06-01";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
@@ -2431,8 +2431,8 @@
   };
 
   vim-flagship = buildVimPluginFrom2Nix {
-    name = "vim-flagship-2018-08-15";
     pname = "vim-flagship";
+    version = "2018-08-15";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-flagship";
@@ -2442,8 +2442,8 @@
   };
 
   vim-flake8 = buildVimPluginFrom2Nix {
-    name = "vim-flake8-2018-09-21";
     pname = "vim-flake8";
+    version = "2018-09-21";
     src = fetchFromGitHub {
       owner = "nvie";
       repo = "vim-flake8";
@@ -2453,8 +2453,8 @@
   };
 
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
-    name = "vim-ft-diff_fold-2013-02-10";
     pname = "vim-ft-diff_fold";
+    version = "2013-02-10";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-ft-diff_fold";
@@ -2464,8 +2464,8 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-12-26";
     pname = "vim-fugitive";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
@@ -2475,8 +2475,8 @@
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-12-12";
     pname = "vim-ghost";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
@@ -2486,8 +2486,8 @@
   };
 
   vim-gista = buildVimPluginFrom2Nix {
-    name = "vim-gista-2017-02-20";
     pname = "vim-gista";
+    version = "2017-02-20";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-gista";
@@ -2497,8 +2497,8 @@
   };
 
   vim-gitbranch = buildVimPluginFrom2Nix {
-    name = "vim-gitbranch-2017-05-27";
     pname = "vim-gitbranch";
+    version = "2017-05-27";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-gitbranch";
@@ -2508,8 +2508,8 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-12-15";
     pname = "vim-gitgutter";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
@@ -2519,8 +2519,8 @@
   };
 
   vim-github-dashboard = buildVimPluginFrom2Nix {
-    name = "vim-github-dashboard-2018-09-03";
     pname = "vim-github-dashboard";
+    version = "2018-09-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-github-dashboard";
@@ -2530,8 +2530,8 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-12-24";
     pname = "vim-go";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
@@ -2541,8 +2541,8 @@
   };
 
   vim-grammarous = buildVimPluginFrom2Nix {
-    name = "vim-grammarous-2018-09-13";
     pname = "vim-grammarous";
+    version = "2018-09-13";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-grammarous";
@@ -2552,8 +2552,8 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-12-22";
     pname = "vim-grepper";
+    version = "2018-12-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
@@ -2563,8 +2563,8 @@
   };
 
   vim-gutentags = buildVimPluginFrom2Nix {
-    name = "vim-gutentags-2018-11-17";
     pname = "vim-gutentags";
+    version = "2018-11-17";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
@@ -2574,8 +2574,8 @@
   };
 
   vim-hardtime = buildVimPluginFrom2Nix {
-    name = "vim-hardtime-2017-03-31";
     pname = "vim-hardtime";
+    version = "2017-03-31";
     src = fetchFromGitHub {
       owner = "takac";
       repo = "vim-hardtime";
@@ -2585,8 +2585,8 @@
   };
 
   vim-haskellconceal = buildVimPluginFrom2Nix {
-    name = "vim-haskellconceal-2017-06-15";
     pname = "vim-haskellconceal";
+    version = "2017-06-15";
     src = fetchFromGitHub {
       owner = "twinside";
       repo = "vim-haskellconceal";
@@ -2596,8 +2596,8 @@
   };
 
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
-    name = "vim-haskellConcealPlus-2018-12-26";
     pname = "vim-haskellConcealPlus";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "enomsg";
       repo = "vim-haskellConcealPlus";
@@ -2607,8 +2607,8 @@
   };
 
   vim-hdevtools = buildVimPluginFrom2Nix {
-    name = "vim-hdevtools-2018-11-19";
     pname = "vim-hdevtools";
+    version = "2018-11-19";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
@@ -2618,8 +2618,8 @@
   };
 
   vim-hier = buildVimPluginFrom2Nix {
-    name = "vim-hier-2011-08-27";
     pname = "vim-hier";
+    version = "2011-08-27";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-hier";
@@ -2629,8 +2629,8 @@
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
-    name = "vim-highlightedyank-2018-10-08";
     pname = "vim-highlightedyank";
+    version = "2018-10-08";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
@@ -2640,8 +2640,8 @@
   };
 
   vim-hindent = buildVimPluginFrom2Nix {
-    name = "vim-hindent-2018-07-31";
     pname = "vim-hindent";
+    version = "2018-07-31";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-hindent";
@@ -2651,8 +2651,8 @@
   };
 
   vim-hoogle = buildVimPluginFrom2Nix {
-    name = "vim-hoogle-2018-03-04";
     pname = "vim-hoogle";
+    version = "2018-03-04";
     src = fetchFromGitHub {
       owner = "Twinside";
       repo = "vim-hoogle";
@@ -2662,8 +2662,8 @@
   };
 
   vim-husk = buildVimPluginFrom2Nix {
-    name = "vim-husk-2015-11-29";
     pname = "vim-husk";
+    version = "2015-11-29";
     src = fetchFromGitHub {
       owner = "vim-utils";
       repo = "vim-husk";
@@ -2673,8 +2673,8 @@
   };
 
   vim-iced-coffee-script = buildVimPluginFrom2Nix {
-    name = "vim-iced-coffee-script-2013-12-26";
     pname = "vim-iced-coffee-script";
+    version = "2013-12-26";
     src = fetchFromGitHub {
       owner = "noc7c9";
       repo = "vim-iced-coffee-script";
@@ -2684,8 +2684,8 @@
   };
 
   vim-indent-guides = buildVimPluginFrom2Nix {
-    name = "vim-indent-guides-2018-05-14";
     pname = "vim-indent-guides";
+    version = "2018-05-14";
     src = fetchFromGitHub {
       owner = "nathanaelkane";
       repo = "vim-indent-guides";
@@ -2695,8 +2695,8 @@
   };
 
   vim-indent-object = buildVimPluginFrom2Nix {
-    name = "vim-indent-object-2018-04-08";
     pname = "vim-indent-object";
+    version = "2018-04-08";
     src = fetchFromGitHub {
       owner = "michaeljsmith";
       repo = "vim-indent-object";
@@ -2706,8 +2706,8 @@
   };
 
   vim-ipython = buildVimPluginFrom2Nix {
-    name = "vim-ipython-2015-06-23";
     pname = "vim-ipython";
+    version = "2015-06-23";
     src = fetchFromGitHub {
       owner = "ivanov";
       repo = "vim-ipython";
@@ -2717,8 +2717,8 @@
   };
 
   vim-isort = buildVimPluginFrom2Nix {
-    name = "vim-isort-2018-08-22";
     pname = "vim-isort";
+    version = "2018-08-22";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
@@ -2728,8 +2728,8 @@
   };
 
   vim-jade = buildVimPluginFrom2Nix {
-    name = "vim-jade-2018-09-10";
     pname = "vim-jade";
+    version = "2018-09-10";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
@@ -2739,8 +2739,8 @@
   };
 
   vim-janah = buildVimPluginFrom2Nix {
-    name = "vim-janah-2018-10-01";
     pname = "vim-janah";
+    version = "2018-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-janah";
@@ -2750,8 +2750,8 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-12-25";
     pname = "vim-javacomplete2";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
@@ -2761,8 +2761,8 @@
   };
 
   vim-javascript = buildVimPluginFrom2Nix {
-    name = "vim-javascript-2018-12-23";
     pname = "vim-javascript";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
@@ -2772,8 +2772,8 @@
   };
 
   vim-jinja = buildVimPluginFrom2Nix {
-    name = "vim-jinja-2016-11-16";
     pname = "vim-jinja";
+    version = "2016-11-16";
     src = fetchFromGitHub {
       owner = "lepture";
       repo = "vim-jinja";
@@ -2783,8 +2783,8 @@
   };
 
   vim-jsbeautify = buildVimPluginFrom2Nix {
-    name = "vim-jsbeautify-2018-10-23";
     pname = "vim-jsbeautify";
+    version = "2018-10-23";
     src = fetchFromGitHub {
       owner = "maksimr";
       repo = "vim-jsbeautify";
@@ -2795,8 +2795,8 @@
   };
 
   vim-jsdoc = buildVimPluginFrom2Nix {
-    name = "vim-jsdoc-2018-05-05";
     pname = "vim-jsdoc";
+    version = "2018-05-05";
     src = fetchFromGitHub {
       owner = "heavenshell";
       repo = "vim-jsdoc";
@@ -2806,8 +2806,8 @@
   };
 
   vim-json = buildVimPluginFrom2Nix {
-    name = "vim-json-2018-01-10";
     pname = "vim-json";
+    version = "2018-01-10";
     src = fetchFromGitHub {
       owner = "elzr";
       repo = "vim-json";
@@ -2817,8 +2817,8 @@
   };
 
   vim-jsonnet = buildVimPluginFrom2Nix {
-    name = "vim-jsonnet-2018-10-08";
     pname = "vim-jsonnet";
+    version = "2018-10-08";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
@@ -2828,8 +2828,8 @@
   };
 
   vim-lastplace = buildVimPluginFrom2Nix {
-    name = "vim-lastplace-2017-06-13";
     pname = "vim-lastplace";
+    version = "2017-06-13";
     src = fetchFromGitHub {
       owner = "farmergreg";
       repo = "vim-lastplace";
@@ -2839,8 +2839,8 @@
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
-    name = "vim-latex-live-preview-2018-09-25";
     pname = "vim-latex-live-preview";
+    version = "2018-09-25";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
@@ -2850,8 +2850,8 @@
   };
 
   vim-lawrencium = buildVimPluginFrom2Nix {
-    name = "vim-lawrencium-2018-11-04";
     pname = "vim-lawrencium";
+    version = "2018-11-04";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
@@ -2861,8 +2861,8 @@
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix {
-    name = "vim-leader-guide-2018-10-06";
     pname = "vim-leader-guide";
+    version = "2018-10-06";
     src = fetchFromGitHub {
       owner = "hecal3";
       repo = "vim-leader-guide";
@@ -2872,8 +2872,8 @@
   };
 
   vim-ledger = buildVimPluginFrom2Nix {
-    name = "vim-ledger-2017-12-12";
     pname = "vim-ledger";
+    version = "2017-12-12";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
@@ -2883,8 +2883,8 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-11-06";
     pname = "vim-localvimrc";
+    version = "2018-11-06";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
@@ -2894,8 +2894,8 @@
   };
 
   vim-logreview = buildVimPluginFrom2Nix {
-    name = "vim-logreview-2017-07-08";
     pname = "vim-logreview";
+    version = "2017-07-08";
     src = fetchFromGitHub {
       owner = "andreshazard";
       repo = "vim-logreview";
@@ -2905,8 +2905,8 @@
   };
 
   vim-maktaba = buildVimPluginFrom2Nix {
-    name = "vim-maktaba-2018-12-13";
     pname = "vim-maktaba";
+    version = "2018-12-13";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
@@ -2916,8 +2916,8 @@
   };
 
   vim-markdown = buildVimPluginFrom2Nix {
-    name = "vim-markdown-2018-10-24";
     pname = "vim-markdown";
+    version = "2018-10-24";
     src = fetchFromGitHub {
       owner = "plasticboy";
       repo = "vim-markdown";
@@ -2927,8 +2927,8 @@
   };
 
   vim-misc = buildVimPluginFrom2Nix {
-    name = "vim-misc-2015-05-21";
     pname = "vim-misc";
+    version = "2015-05-21";
     src = fetchFromGitHub {
       owner = "xolox";
       repo = "vim-misc";
@@ -2938,8 +2938,8 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-12-27";
     pname = "vim-monokai-pro";
+    version = "2018-12-27";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
@@ -2949,8 +2949,8 @@
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
-    name = "vim-multiple-cursors-2018-10-16";
     pname = "vim-multiple-cursors";
+    version = "2018-10-16";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
@@ -2960,8 +2960,8 @@
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix {
-    name = "vim-nerdtree-tabs-2018-12-21";
     pname = "vim-nerdtree-tabs";
+    version = "2018-12-21";
     src = fetchFromGitHub {
       owner = "jistr";
       repo = "vim-nerdtree-tabs";
@@ -2971,8 +2971,8 @@
   };
 
   vim-niceblock = buildVimPluginFrom2Nix {
-    name = "vim-niceblock-2018-09-06";
     pname = "vim-niceblock";
+    version = "2018-09-06";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-niceblock";
@@ -2982,8 +2982,8 @@
   };
 
   vim-nix = buildVimPluginFrom2Nix {
-    name = "vim-nix-2018-08-27";
     pname = "vim-nix";
+    version = "2018-08-27";
     src = fetchFromGitHub {
       owner = "LnL7";
       repo = "vim-nix";
@@ -2993,8 +2993,8 @@
   };
 
   vim-obsession = buildVimPluginFrom2Nix {
-    name = "vim-obsession-2018-09-17";
     pname = "vim-obsession";
+    version = "2018-09-17";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
@@ -3004,8 +3004,8 @@
   };
 
   vim-one = buildVimPluginFrom2Nix {
-    name = "vim-one-2018-07-22";
     pname = "vim-one";
+    version = "2018-07-22";
     src = fetchFromGitHub {
       owner = "rakr";
       repo = "vim-one";
@@ -3015,8 +3015,8 @@
   };
 
   vim-operator-replace = buildVimPluginFrom2Nix {
-    name = "vim-operator-replace-2015-02-24";
     pname = "vim-operator-replace";
+    version = "2015-02-24";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-replace";
@@ -3026,8 +3026,8 @@
   };
 
   vim-operator-surround = buildVimPluginFrom2Nix {
-    name = "vim-operator-surround-2018-11-01";
     pname = "vim-operator-surround";
+    version = "2018-11-01";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-operator-surround";
@@ -3037,8 +3037,8 @@
   };
 
   vim-operator-user = buildVimPluginFrom2Nix {
-    name = "vim-operator-user-2015-02-17";
     pname = "vim-operator-user";
+    version = "2015-02-17";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-operator-user";
@@ -3048,8 +3048,8 @@
   };
 
   vim-orgmode = buildVimPluginFrom2Nix {
-    name = "vim-orgmode-2018-07-25";
     pname = "vim-orgmode";
+    version = "2018-07-25";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
@@ -3059,8 +3059,8 @@
   };
 
   vim-pager = buildVimPluginFrom2Nix {
-    name = "vim-pager-2015-08-26";
     pname = "vim-pager";
+    version = "2015-08-26";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-pager";
@@ -3070,8 +3070,8 @@
   };
 
   vim-pandoc = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-2018-10-07";
     pname = "vim-pandoc";
+    version = "2018-10-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
@@ -3081,8 +3081,8 @@
   };
 
   vim-pandoc-after = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-after-2017-11-21";
     pname = "vim-pandoc-after";
+    version = "2017-11-21";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-after";
@@ -3092,8 +3092,8 @@
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-syntax-2017-04-13";
     pname = "vim-pandoc-syntax";
+    version = "2017-04-13";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
@@ -3103,8 +3103,8 @@
   };
 
   vim-pathogen = buildVimPluginFrom2Nix {
-    name = "vim-pathogen-2018-12-13";
     pname = "vim-pathogen";
+    version = "2018-12-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-pathogen";
@@ -3114,8 +3114,8 @@
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix {
-    name = "vim-peekaboo-2017-03-20";
     pname = "vim-peekaboo";
+    version = "2017-03-20";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-peekaboo";
@@ -3125,8 +3125,8 @@
   };
 
   vim-pencil = buildVimPluginFrom2Nix {
-    name = "vim-pencil-2017-06-14";
     pname = "vim-pencil";
+    version = "2017-06-14";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-pencil";
@@ -3136,8 +3136,8 @@
   };
 
   vim-plug = buildVimPluginFrom2Nix {
-    name = "vim-plug-2018-11-03";
     pname = "vim-plug";
+    version = "2018-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
@@ -3147,8 +3147,8 @@
   };
 
   vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
-    name = "vim-plugin-AnsiEsc-2018-05-10";
     pname = "vim-plugin-AnsiEsc";
+    version = "2018-05-10";
     src = fetchFromGitHub {
       owner = "powerman";
       repo = "vim-plugin-AnsiEsc";
@@ -3158,8 +3158,8 @@
   };
 
   vim-polyglot = buildVimPluginFrom2Nix {
-    name = "vim-polyglot-2018-12-26";
     pname = "vim-polyglot";
+    version = "2018-12-26";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
@@ -3169,8 +3169,8 @@
   };
 
   vim-prettyprint = buildVimPluginFrom2Nix {
-    name = "vim-prettyprint-2016-07-16";
     pname = "vim-prettyprint";
+    version = "2016-07-16";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-prettyprint";
@@ -3180,8 +3180,8 @@
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
-    name = "vim-projectionist-2018-10-21";
     pname = "vim-projectionist";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
@@ -3191,8 +3191,8 @@
   };
 
   vim-ps1 = buildVimPluginFrom2Nix {
-    name = "vim-ps1-2017-10-20";
     pname = "vim-ps1";
+    version = "2017-10-20";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
@@ -3202,8 +3202,8 @@
   };
 
   vim-puppet = buildVimPluginFrom2Nix {
-    name = "vim-puppet-2018-11-15";
     pname = "vim-puppet";
+    version = "2018-11-15";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
@@ -3213,8 +3213,8 @@
   };
 
   vim-qml = buildVimPluginFrom2Nix {
-    name = "vim-qml-2018-07-22";
     pname = "vim-qml";
+    version = "2018-07-22";
     src = fetchFromGitHub {
       owner = "peterhoeg";
       repo = "vim-qml";
@@ -3224,8 +3224,8 @@
   };
 
   vim-quickrun = buildVimPluginFrom2Nix {
-    name = "vim-quickrun-2018-11-27";
     pname = "vim-quickrun";
+    version = "2018-11-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
@@ -3235,8 +3235,8 @@
   };
 
   vim-racer = buildVimPluginFrom2Nix {
-    name = "vim-racer-2018-08-26";
     pname = "vim-racer";
+    version = "2018-08-26";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
@@ -3246,8 +3246,8 @@
   };
 
   vim-repeat = buildVimPluginFrom2Nix {
-    name = "vim-repeat-2018-07-02";
     pname = "vim-repeat";
+    version = "2018-07-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-repeat";
@@ -3257,8 +3257,8 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-11-16";
     pname = "vim-rhubarb";
+    version = "2018-11-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
@@ -3268,8 +3268,8 @@
   };
 
   vim-ruby = buildVimPluginFrom2Nix {
-    name = "vim-ruby-2018-12-11";
     pname = "vim-ruby";
+    version = "2018-12-11";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
@@ -3279,8 +3279,8 @@
   };
 
   vim-sayonara = buildVimPluginFrom2Nix {
-    name = "vim-sayonara-2017-03-13";
     pname = "vim-sayonara";
+    version = "2017-03-13";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-sayonara";
@@ -3290,8 +3290,8 @@
   };
 
   vim-scala = buildVimPluginFrom2Nix {
-    name = "vim-scala-2017-11-10";
     pname = "vim-scala";
+    version = "2017-11-10";
     src = fetchFromGitHub {
       owner = "derekwyatt";
       repo = "vim-scala";
@@ -3301,8 +3301,8 @@
   };
 
   vim-scouter = buildVimPluginFrom2Nix {
-    name = "vim-scouter-2014-08-10";
     pname = "vim-scouter";
+    version = "2014-08-10";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-scouter";
@@ -3312,8 +3312,8 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-12-19";
     pname = "vim-scriptease";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
@@ -3323,8 +3323,8 @@
   };
 
   vim-sensible = buildVimPluginFrom2Nix {
-    name = "vim-sensible-2018-10-27";
     pname = "vim-sensible";
+    version = "2018-10-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
@@ -3334,8 +3334,8 @@
   };
 
   vim-signature = buildVimPluginFrom2Nix {
-    name = "vim-signature-2018-07-06";
     pname = "vim-signature";
+    version = "2018-07-06";
     src = fetchFromGitHub {
       owner = "kshenoy";
       repo = "vim-signature";
@@ -3345,8 +3345,8 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-12-20";
     pname = "vim-signify";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
@@ -3356,8 +3356,8 @@
   };
 
   vim-sleuth = buildVimPluginFrom2Nix {
-    name = "vim-sleuth-2018-08-19";
     pname = "vim-sleuth";
+    version = "2018-08-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sleuth";
@@ -3367,8 +3367,8 @@
   };
 
   vim-smalls = buildVimPluginFrom2Nix {
-    name = "vim-smalls-2015-05-02";
     pname = "vim-smalls";
+    version = "2015-05-02";
     src = fetchFromGitHub {
       owner = "t9md";
       repo = "vim-smalls";
@@ -3378,8 +3378,8 @@
   };
 
   vim-snipmate = buildVimPluginFrom2Nix {
-    name = "vim-snipmate-2017-04-20";
     pname = "vim-snipmate";
+    version = "2017-04-20";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
@@ -3389,8 +3389,8 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-12-14";
     pname = "vim-snippets";
+    version = "2018-12-14";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
@@ -3400,8 +3400,8 @@
   };
 
   vim-solidity = buildVimPluginFrom2Nix {
-    name = "vim-solidity-2018-04-17";
     pname = "vim-solidity";
+    version = "2018-04-17";
     src = fetchFromGitHub {
       owner = "tomlion";
       repo = "vim-solidity";
@@ -3411,8 +3411,8 @@
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix {
-    name = "vim-sort-motion-2018-07-15";
     pname = "vim-sort-motion";
+    version = "2018-07-15";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-sort-motion";
@@ -3422,8 +3422,8 @@
   };
 
   vim-speeddating = buildVimPluginFrom2Nix {
-    name = "vim-speeddating-2018-10-31";
     pname = "vim-speeddating";
+    version = "2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-speeddating";
@@ -3433,8 +3433,8 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-12-16";
     pname = "vim-startify";
+    version = "2018-12-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
@@ -3444,8 +3444,8 @@
   };
 
   vim-stylish-haskell = buildVimPluginFrom2Nix {
-    name = "vim-stylish-haskell-2018-08-31";
     pname = "vim-stylish-haskell";
+    version = "2018-08-31";
     src = fetchFromGitHub {
       owner = "nbouscal";
       repo = "vim-stylish-haskell";
@@ -3455,8 +3455,8 @@
   };
 
   vim-stylishask = buildVimPluginFrom2Nix {
-    name = "vim-stylishask-2018-07-05";
     pname = "vim-stylishask";
+    version = "2018-07-05";
     src = fetchFromGitHub {
       owner = "alx741";
       repo = "vim-stylishask";
@@ -3466,8 +3466,8 @@
   };
 
   vim-surround = buildVimPluginFrom2Nix {
-    name = "vim-surround-2018-07-23";
     pname = "vim-surround";
+    version = "2018-07-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-surround";
@@ -3477,8 +3477,8 @@
   };
 
   vim-SyntaxRange = buildVimPluginFrom2Nix {
-    name = "vim-SyntaxRange-2018-03-09";
     pname = "vim-SyntaxRange";
+    version = "2018-03-09";
     src = fetchFromGitHub {
       owner = "inkarkat";
       repo = "vim-SyntaxRange";
@@ -3488,8 +3488,8 @@
   };
 
   vim-table-mode = buildVimPluginFrom2Nix {
-    name = "vim-table-mode-2018-10-21";
     pname = "vim-table-mode";
+    version = "2018-10-21";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
@@ -3499,8 +3499,8 @@
   };
 
   vim-tabpagecd = buildVimPluginFrom2Nix {
-    name = "vim-tabpagecd-2013-11-29";
     pname = "vim-tabpagecd";
+    version = "2013-11-29";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-tabpagecd";
@@ -3510,8 +3510,8 @@
   };
 
   vim-tbone = buildVimPluginFrom2Nix {
-    name = "vim-tbone-2018-06-28";
     pname = "vim-tbone";
+    version = "2018-06-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-tbone";
@@ -3521,8 +3521,8 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-12-25";
     pname = "vim-terraform";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
@@ -3532,8 +3532,8 @@
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-12-24";
     pname = "vim-test";
+    version = "2018-12-24";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
@@ -3543,8 +3543,8 @@
   };
 
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
-    name = "vim-textobj-multiblock-2014-06-02";
     pname = "vim-textobj-multiblock";
+    version = "2014-06-02";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-textobj-multiblock";
@@ -3554,8 +3554,8 @@
   };
 
   vim-themis = buildVimPluginFrom2Nix {
-    name = "vim-themis-2017-12-27";
     pname = "vim-themis";
+    version = "2017-12-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
@@ -3565,8 +3565,8 @@
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
-    name = "vim-tmux-navigator-2018-11-03";
     pname = "vim-tmux-navigator";
+    version = "2018-11-03";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
@@ -3576,8 +3576,8 @@
   };
 
   vim-toml = buildVimPluginFrom2Nix {
-    name = "vim-toml-2018-11-27";
     pname = "vim-toml";
+    version = "2018-11-27";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
@@ -3587,8 +3587,8 @@
   };
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
-    name = "vim-trailing-whitespace-2017-09-23";
     pname = "vim-trailing-whitespace";
+    version = "2017-09-23";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
@@ -3598,8 +3598,8 @@
   };
 
   vim-tsx = buildVimPluginFrom2Nix {
-    name = "vim-tsx-2017-03-16";
     pname = "vim-tsx";
+    version = "2017-03-16";
     src = fetchFromGitHub {
       owner = "ianks";
       repo = "vim-tsx";
@@ -3609,8 +3609,8 @@
   };
 
   vim-unimpaired = buildVimPluginFrom2Nix {
-    name = "vim-unimpaired-2018-12-20";
     pname = "vim-unimpaired";
+    version = "2018-12-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
@@ -3620,8 +3620,8 @@
   };
 
   vim-vinegar = buildVimPluginFrom2Nix {
-    name = "vim-vinegar-2018-08-06";
     pname = "vim-vinegar";
+    version = "2018-08-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-vinegar";
@@ -3631,8 +3631,8 @@
   };
 
   vim-visualstar = buildVimPluginFrom2Nix {
-    name = "vim-visualstar-2015-08-27";
     pname = "vim-visualstar";
+    version = "2015-08-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-visualstar";
@@ -3642,8 +3642,8 @@
   };
 
   vim-vue = buildVimPluginFrom2Nix {
-    name = "vim-vue-2018-11-11";
     pname = "vim-vue";
+    version = "2018-11-11";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
@@ -3653,8 +3653,8 @@
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-12-19";
     pname = "vim-wakatime";
+    version = "2018-12-19";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
@@ -3664,8 +3664,8 @@
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix {
-    name = "vim-watchdogs-2017-12-03";
     pname = "vim-watchdogs";
+    version = "2017-12-03";
     src = fetchFromGitHub {
       owner = "osyo-manga";
       repo = "vim-watchdogs";
@@ -3675,8 +3675,8 @@
   };
 
   vim-wordy = buildVimPluginFrom2Nix {
-    name = "vim-wordy-2018-03-10";
     pname = "vim-wordy";
+    version = "2018-03-10";
     src = fetchFromGitHub {
       owner = "reedes";
       repo = "vim-wordy";
@@ -3686,8 +3686,8 @@
   };
 
   vim-xdebug = buildVimPluginFrom2Nix {
-    name = "vim-xdebug-2012-08-15";
     pname = "vim-xdebug";
+    version = "2012-08-15";
     src = fetchFromGitHub {
       owner = "joonty";
       repo = "vim-xdebug";
@@ -3697,8 +3697,8 @@
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix {
-    name = "vim-xkbswitch-2017-03-27";
     pname = "vim-xkbswitch";
+    version = "2017-03-27";
     src = fetchFromGitHub {
       owner = "lyokha";
       repo = "vim-xkbswitch";
@@ -3708,8 +3708,8 @@
   };
 
   vim-yapf = buildVimPluginFrom2Nix {
-    name = "vim-yapf-2018-10-04";
     pname = "vim-yapf";
+    version = "2018-10-04";
     src = fetchFromGitHub {
       owner = "mindriot101";
       repo = "vim-yapf";
@@ -3719,8 +3719,8 @@
   };
 
   vim2hs = buildVimPluginFrom2Nix {
-    name = "vim2hs-2014-04-16";
     pname = "vim2hs";
+    version = "2014-04-16";
     src = fetchFromGitHub {
       owner = "dag";
       repo = "vim2hs";
@@ -3730,8 +3730,8 @@
   };
 
   vimoutliner = buildVimPluginFrom2Nix {
-    name = "vimoutliner-2018-07-04";
     pname = "vimoutliner";
+    version = "2018-07-04";
     src = fetchFromGitHub {
       owner = "vimoutliner";
       repo = "vimoutliner";
@@ -3741,8 +3741,8 @@
   };
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
-    name = "vimpreviewpandoc-2018-11-05";
     pname = "vimpreviewpandoc";
+    version = "2018-11-05";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
@@ -3752,8 +3752,8 @@
   };
 
   vimproc-vim = buildVimPluginFrom2Nix {
-    name = "vimproc-vim-2018-10-11";
     pname = "vimproc-vim";
+    version = "2018-10-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimproc.vim";
@@ -3763,8 +3763,8 @@
   };
 
   vimshell-vim = buildVimPluginFrom2Nix {
-    name = "vimshell-vim-2018-06-02";
     pname = "vimshell-vim";
+    version = "2018-06-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimshell.vim";
@@ -3774,8 +3774,8 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-12-25";
     pname = "vimtex";
+    version = "2018-12-25";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
@@ -3785,8 +3785,8 @@
   };
 
   vimux = buildVimPluginFrom2Nix {
-    name = "vimux-2017-10-24";
     pname = "vimux";
+    version = "2017-10-24";
     src = fetchFromGitHub {
       owner = "benmills";
       repo = "vimux";
@@ -3796,8 +3796,8 @@
   };
 
   vimwiki = buildVimPluginFrom2Nix {
-    name = "vimwiki-2018-10-12";
     pname = "vimwiki";
+    version = "2018-10-12";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
@@ -3807,8 +3807,8 @@
   };
 
   vissort-vim = buildVimPluginFrom2Nix {
-    name = "vissort-vim-2014-01-31";
     pname = "vissort-vim";
+    version = "2014-01-31";
     src = fetchFromGitHub {
       owner = "navicore";
       repo = "vissort.vim";
@@ -3818,8 +3818,8 @@
   };
 
   vundle = buildVimPluginFrom2Nix {
-    name = "vundle-2018-02-03";
     pname = "vundle";
+    version = "2018-02-03";
     src = fetchFromGitHub {
       owner = "gmarik";
       repo = "vundle";
@@ -3829,8 +3829,8 @@
   };
 
   wal-vim = buildVimPluginFrom2Nix {
-    name = "wal-vim-2018-06-04";
     pname = "wal-vim";
+    version = "2018-06-04";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
@@ -3840,8 +3840,8 @@
   };
 
   webapi-vim = buildVimPluginFrom2Nix {
-    name = "webapi-vim-2018-03-14";
     pname = "webapi-vim";
+    version = "2018-03-14";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "webapi-vim";
@@ -3851,8 +3851,8 @@
   };
 
   wombat256-vim = buildVimPluginFrom2Nix {
-    name = "wombat256-vim-2010-10-18";
     pname = "wombat256-vim";
+    version = "2010-10-18";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "wombat256.vim";
@@ -3862,8 +3862,8 @@
   };
 
   workflowish = buildVimPluginFrom2Nix {
-    name = "workflowish-2015-12-03";
     pname = "workflowish";
+    version = "2015-12-03";
     src = fetchFromGitHub {
       owner = "lukaszkorecki";
       repo = "workflowish";
@@ -3873,8 +3873,8 @@
   };
 
   xptemplate = buildVimPluginFrom2Nix {
-    name = "xptemplate-2017-12-06";
     pname = "xptemplate";
+    version = "2017-12-06";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
@@ -3884,8 +3884,8 @@
   };
 
   xterm-color-table-vim = buildVimPluginFrom2Nix {
-    name = "xterm-color-table-vim-2014-01-01";
     pname = "xterm-color-table-vim";
+    version = "2014-01-01";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "xterm-color-table.vim";
@@ -3895,8 +3895,8 @@
   };
 
   YankRing-vim = buildVimPluginFrom2Nix {
-    name = "YankRing-vim-2015-07-29";
     pname = "YankRing-vim";
+    version = "2015-07-29";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
@@ -3906,8 +3906,8 @@
   };
 
   yats-vim = buildVimPluginFrom2Nix {
-    name = "yats-vim-2018-12-15";
     pname = "yats-vim";
+    version = "2018-12-15";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
@@ -3918,8 +3918,8 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-12-23";
     pname = "youcompleteme";
+    version = "2018-12-23";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
@@ -3930,8 +3930,8 @@
   };
 
   YUNOcommit-vim = buildVimPluginFrom2Nix {
-    name = "YUNOcommit-vim-2014-11-26";
     pname = "YUNOcommit-vim";
+    version = "2014-11-26";
     src = fetchFromGitHub {
       owner = "esneider";
       repo = "YUNOcommit.vim";
@@ -3941,8 +3941,8 @@
   };
 
   zeavim-vim = buildVimPluginFrom2Nix {
-    name = "zeavim-vim-2018-03-22";
     pname = "zeavim-vim";
+    version = "2018-03-22";
     src = fetchFromGitHub {
       owner = "KabbAmine";
       repo = "zeavim.vim";
@@ -3952,8 +3952,8 @@
   };
 
   zenburn = buildVimPluginFrom2Nix {
-    name = "zenburn-2018-04-29";
     pname = "zenburn";
+    version = "2018-04-29";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
@@ -3963,8 +3963,8 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-12-12";
     pname = "zig-vim";
+    version = "2018-12-12";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
@@ -3974,8 +3974,8 @@
   };
 
   zoomwintab-vim = buildVimPluginFrom2Nix {
-    name = "zoomwintab-vim-2018-04-14";
     pname = "zoomwintab-vim";
+    version = "2018-04-14";
     src = fetchFromGitHub {
       owner = "troydm";
       repo = "zoomwintab.vim";
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index b57bff5c09d..1062241a0cb 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -309,8 +309,8 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
             f.write(
                 f"""
   {plugin.normalized_name} = buildVimPluginFrom2Nix {{
-    name = "{plugin.normalized_name}-{plugin.version}";
     pname = "{plugin.normalized_name}";
+    version = "{plugin.version}";
     src = fetchFromGitHub {{
       owner = "{owner}";
       repo = "{repo}";
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index a8146dbf5d4..1d305cd5349 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -403,59 +403,9 @@ rec {
     '';
   };
 
-  vimHelpTags = ''
-  vimHelpTags(){
-    if [ -d "$1/doc" ]; then
-      ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
-    fi
-  }
-  '';
-
-  addRtp = path: attrs: derivation:
-    derivation // { rtp = "${derivation}/${path}"; } // {
-      overrideAttrs = f: buildVimPlugin (attrs // f attrs);
-    };
-
-  buildVimPlugin = a@{
-    name,
-    namePrefix ? "vimplugin-",
-    src,
-    unpackPhase ? "",
-    configurePhase ? "",
-    buildPhase ? "",
-    preInstall ? "",
-    postInstall ? "",
-    path ? (builtins.parseDrvName name).name,
-    addonInfo ? null,
-    ...
-  }:
-    addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // {
-      name = namePrefix + name;
-
-      inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
-
-      installPhase = ''
-        runHook preInstall
-
-        target=$out/${rtpPath}/${path}
-        mkdir -p $out/${rtpPath}
-        cp -r . $target
-        ${vimHelpTags}
-        vimHelpTags $target
-        if [ -n "$addonInfo" ]; then
-          echo "$addonInfo" > $target/addon-info.json
-        fi
-
-        runHook postInstall
-      '';
-    }));
-
   vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
 
-  buildVimPluginFrom2Nix = a: buildVimPlugin ({
-    buildPhase = ":";
-    configurePhase =":";
-  } // a);
+  inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
 
   requiredPlugins = {
     packages ? {},

From db5fe5d240cfb262a92640de36f39d1689eb631a Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 27 Dec 2018 11:46:50 +0200
Subject: [PATCH 2762/2793] cargo-release: fix darwin build

---
 pkgs/tools/package-management/cargo-release/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 8bb5861a23c..116337e067e 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-release-${version}";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
   meta = with stdenv.lib; {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';
     homepage = https://github.com/sunng87/cargo-release;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eba2c979b42..14e381b7a14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7465,7 +7465,9 @@ in
 
   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-release = callPackage ../tools/package-management/cargo-release {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   cargo-tree = callPackage ../tools/package-management/cargo-tree { };
   cargo-update = callPackage ../tools/package-management/cargo-update { };
 

From 17eb96dabda03c316201104f8203a60e64d03773 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Dec 2018 18:00:00 -0500
Subject: [PATCH 2763/2793] pythonPackages.unidiff: init at 0.5.5

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

diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix
new file mode 100644
index 00000000000..81e9019f489
--- /dev/null
+++ b/pkgs/development/python-modules/unidiff/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "unidiff";
+  version = "0.5.5";
+
+  # PyPI tarball doesn't ship tests
+  src = fetchFromGitHub {
+    owner = "matiasb";
+    repo = "python-unidiff";
+    rev = "v${version}";
+    sha256 = "1nvi7s1nn5p7j6aql1nkn2kiadnfby98yla5m3jq8xwsx0aplwdm";
+  };
+
+  meta = with lib; {
+    description = "Unified diff python parsing/metadata extraction library";
+    homepage = https://github.com/matiasb/python-unidiff;
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7a22f94b53..0fa51214e43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4382,6 +4382,8 @@ in {
 
   unicodecsv = callPackage ../development/python-modules/unicodecsv { };
 
+  unidiff = callPackage ../development/python-modules/unidiff { };
+
   unittest2 = callPackage ../development/python-modules/unittest2 { };
 
   unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };

From 3258b00009e2108ec41d94e84fa49e1a7648d883 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Dec 2018 18:01:00 -0500
Subject: [PATCH 2764/2793] detect-secrets: init at 0.11.0

---
 .../tools/detect-secrets/default.nix          | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/detect-secrets/default.nix

diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix
new file mode 100644
index 00000000000..c341e2eb710
--- /dev/null
+++ b/pkgs/development/tools/detect-secrets/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }:
+
+buildPythonApplication rec {
+  pname = "detect-secrets";
+  version = "0.11.0";
+
+  # PyPI tarball doesn't ship tests
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = "detect-secrets";
+    rev = "v${version}";
+    sha256 = "11r11q6d8aajqqnhhz4lsa93qf1x745331kl9jd3z4y4w91l4gdz";
+  };
+
+  propagatedBuildInputs = [ pyyaml unidiff ]
+    ++ lib.optionals isPy27 [ configparser enum34 future functools32 ];
+
+  checkInputs = [ mock pytest ];
+
+  # deselect tests which require git setup
+  checkPhase = ''
+    PYTHONPATH=$PWD:$PYTHONPATH pytest \
+      --deselect tests/main_test.py::TestMain \
+      --deselect tests/pre_commit_hook_test.py::TestPreCommitHook \
+      --deselect tests/core/baseline_test.py::TestInitializeBaseline
+  '';
+
+  meta = with lib; {
+    description = "An enterprise friendly way of detecting and preventing secrets in code";
+    homepage = https://github.com/Yelp/detect-secrets;
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b42a58c8a56..778c80105c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,6 +700,8 @@ in
 
   deskew = callPackage ../applications/graphics/deskew { };
 
+  detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { };
+
   diskus = callPackage ../tools/misc/diskus {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From af465293f1cf2e4840e38795726ba2bf8c6d7199 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Dec 2018 11:12:48 +0100
Subject: [PATCH 2765/2793] vimPlugins: use fixed point

---
 pkgs/misc/vim-plugins/default.nix   |  10 +-
 pkgs/misc/vim-plugins/generated.nix |   9 +-
 pkgs/misc/vim-plugins/overrides.nix | 177 ++++++++++++----------------
 3 files changed, 84 insertions(+), 112 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f5053c2ec6e..b30413ac79c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -5,8 +5,8 @@ let
 
   inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
-  generated = callPackage ./generated.nix {
-    inherit buildVimPluginFrom2Nix;
+  plugins = callPackage ./generated.nix {
+    inherit buildVimPluginFrom2Nix overrides;
   };
 
   # TL;DR
@@ -22,10 +22,8 @@ let
     inherit llvmPackages;
   };
 
-  overriden = generated // (overrides generated);
-
-  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib overriden);
+  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
 
 in
 
-overriden // aliases
+plugins // aliases
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 89406e92305..5ac1793070b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1,5 +1,8 @@
 # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
-{ buildVimPluginFrom2Nix, fetchFromGitHub }:
+{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
+
+let
+  packages = ( self:
 
 {
   a-vim = buildVimPluginFrom2Nix {
@@ -3983,4 +3986,6 @@
       sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6";
     };
   };
-}
\ No newline at end of file
+});
+
+in lib.fix' (lib.extends overrides packages)
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index d0e55cb4c3f..a35e7aaf464 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,10 +1,9 @@
-{config, lib, stdenv
-, python, cmake, vim, vimUtils, ruby
+{ lib, stdenv
+, python, cmake, vim, ruby
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, fzf, skim
 , python3, boost, icu, ncurses
 , ycmd, rake
-, pythonPackages, python3Packages
 , substituteAll
 , languagetool
 , Cocoa, CoreFoundation, CoreServices
@@ -17,50 +16,22 @@
 , impl, iferr, gocode, gocode-gomod, go-tools
 }:
 
-let
-
-  _skim = skim;
-
-in
-
-generated:
-
-rec {
-
-  # list of plugins that are needed as dependencies somewhere
-  # This is necessary (as opposed to `with generated;`) because
-  # there would otherwise be conflicts with `rec`. `rec` is necessary
-  # however to make sure overriden plugins can be used as dependencies.
-  # This should use a proper package set with fixed-points instead.
-  inherit (generated)
-    self
-    webapi-vim
-    nvim-yarp
-    ultisnips
-    vim-addon-mw-utils
-    tlib_vim
-    vim-addon-signs
-    vim-addon-other
-    vim-addon-errorformats
-    vim-maktaba
-    vim-misc;
+self: super: {
 
   vim2nix = buildVimPluginFrom2Nix {
     name = "vim2nix";
     src = ./vim2nix;
-    dependencies = [ vim-addon-manager ];
+    dependencies = with super; [ vim-addon-manager ];
   };
 
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
-    dependencies = [];
   };
 
   skim = buildVimPluginFrom2Nix {
-    name = _skim.name;
-    src = _skim.vim;
-    dependencies = [];
+    name = skim.name;
+    src = skim.vim;
   };
 
   LanguageClient-neovim = let
@@ -86,7 +57,6 @@ rec {
     name = "LanguageClient-neovim-2018-09-07";
     src = LanguageClient-neovim-src;
 
-    dependencies = [];
     propogatedBuildInputs = [ LanguageClient-neovim-bin ];
 
     preFixup = ''
@@ -103,10 +73,9 @@ rec {
       rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
       sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
     };
-    dependencies = [];
   };
 
-  clang_complete = generated.clang_complete.overrideAttrs(old: {
+  clang_complete = super.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).
@@ -123,14 +92,14 @@ rec {
     '';
   });
 
-  clighter8 = generated.clighter8.overrideAttrs(old: {
+  clighter8 = super.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
     '';
   });
 
-  command-t = generated.command-t.overrideAttrs(old: {
+  command-t = super.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -138,7 +107,7 @@ rec {
     '';
   });
 
-  cpsm = generated.cpsm.overrideAttrs(old: {
+  cpsm = super.cpsm.overrideAttrs(old: {
     buildInputs = [
       python3
       stdenv
@@ -154,7 +123,7 @@ rec {
     '';
   });
 
-  ctrlp-cmatcher = generated.ctrlp-cmatcher.overrideAttrs(old: {
+  ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: {
     buildInputs = [ python ];
     buildPhase = ''
       patchShebangs .
@@ -162,7 +131,7 @@ rec {
     '';
   });
 
-  deoplete-go = generated.deoplete-go.overrideAttrs(old: {
+  deoplete-go = super.deoplete-go.overrideAttrs(old: {
     buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
@@ -172,33 +141,33 @@ rec {
    '';
   });
 
-  ensime-vim = generated.ensime-vim.overrideAttrs(old: {
+  ensime-vim = super.ensime-vim.overrideAttrs(old: {
     passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-    dependencies = [ vimproc-vim vimshell-vim self forms ];
+    dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
   });
 
-  forms = generated.forms.overrideAttrs(old: {
-    dependencies = [ self ];
+  forms = super.forms.overrideAttrs(old: {
+    dependencies = with super; [ super.self ];
   });
 
-  gist-vim = generated.gist-vim.overrideAttrs(old: {
-    dependencies = [ webapi-vim ];
+  gist-vim = super.gist-vim.overrideAttrs(old: {
+    dependencies = with super; [ webapi-vim ];
   });
 
-  ncm2 = generated.ncm2.overrideAttrs(old: {
-    dependencies = [ nvim-yarp ];
+  ncm2 = super.ncm2.overrideAttrs(old: {
+    dependencies = with super; [ nvim-yarp ];
   });
 
-  ncm2-jedi = generated.ncm2-jedi.overrideAttrs(old: {
-    dependencies = [ nvim-yarp ncm2 ];
+  ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: {
+    dependencies = with super; [ nvim-yarp ncm2 ];
     passthru.python3Dependencies = ps: with ps; [ jedi ];
   });
 
-  ncm2-ultisnips = generated.ncm2-ultisnips.overrideAttrs(old: {
-    dependencies = [ ultisnips ];
+  ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = with super; [ ultisnips ];
   });
 
-  taglist-vim = generated.taglist-vim.overrideAttrs(old: {
+  taglist-vim = super.taglist-vim.overrideAttrs(old: {
     setSourceRoot = ''
       export sourceRoot=taglist
       mkdir taglist
@@ -207,40 +176,40 @@ rec {
     '';
   });
 
-  vimshell-vim = generated.vimshell-vim.overrideAttrs(old: {
-    dependencies = [ vimproc-vim ];
+  vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
+    dependencies = with super; [ vimproc-vim ];
   });
 
-  vim-addon-manager = generated.vim-addon-manager.overrideAttrs(old: {
+  vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: {
     buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
   });
 
-  vim-addon-actions = generated.vim-addon-actions.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-async = generated.vim-addon-async.overrideAttrs(old: {
-    dependencies = [ vim-addon-signs ];
+  vim-addon-async = super.vim-addon-async.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-signs ];
   });
 
-  vim-addon-background-cmd = generated.vim-addon-background-cmd.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils ];
+  vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils ];
   });
 
-  vim-addon-completion = generated.vim-addon-completion.overrideAttrs(old: {
-    dependencies = [ tlib_vim ];
+  vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: {
+    dependencies = with super; [ tlib_vim ];
   });
 
-  vim-addon-goto-thing-at-cursor = generated.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
-    dependencies = [ tlib_vim ];
+  vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = with super; [ tlib_vim ];
   });
 
-  vim-addon-mru = generated.vim-addon-mru.overrideAttrs(old: {
-    dependencies = [ vim-addon-other vim-addon-mw-utils ];
+  vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
   });
 
-  vim-addon-nix = generated.vim-addon-nix.overrideAttrs(old: {
-    dependencies = [
+  vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: {
+    dependencies = with super; [
       vim-addon-completion
       vim-addon-goto-thing-at-cursor
       vim-addon-errorformats
@@ -249,38 +218,38 @@ rec {
     ];
   });
 
-  vim-addon-sql = generated.vim-addon-sql.overrideAttrs(old: {
-    dependencies = [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
+  vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
   });
 
-  vim-addon-syntax-checker = generated.vim-addon-syntax-checker.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-toggle-buffer = generated.vim-addon-toggle-buffer.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
-  vim-addon-xdebug = generated.vim-addon-xdebug.overrideAttrs(old: {
-    dependencies = [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
+  vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
   });
 
-  vim-bazel = generated.vim-bazel.overrideAttrs(old: {
-    dependencies = [ vim-maktaba ];
+  vim-bazel = super.vim-bazel.overrideAttrs(old: {
+    dependencies = with super; [ vim-maktaba ];
   });
 
-  vim-codefmt = generated.vim-codefmt.overrideAttrs(old: {
-    dependencies = [ vim-maktaba ];
+  vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
+    dependencies = with super; [ vim-maktaba ];
   });
 
-  vim-easytags = generated.vim-easytags.overrideAttrs(old: {
-    dependencies = [ vim-misc ];
+  vim-easytags = super.vim-easytags.overrideAttrs(old: {
+    dependencies = with super; [ vim-misc ];
   });
 
   # change the go_bin_path to point to a path in the nix store. See the code in
   # fatih/vim-go here
   # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
-  vim-go = generated.vim-go.overrideAttrs(old: let
+  vim-go = super.vim-go.overrideAttrs(old: let
     binPath = lib.makeBinPath [
       asmfmt
       delve
@@ -308,7 +277,7 @@ rec {
     '';
   });
 
-  vim-grammarous = generated.vim-grammarous.overrideAttrs(old: {
+  vim-grammarous = super.vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -321,31 +290,31 @@ rec {
     ];
   });
 
-  vim-hier = generated.vim-hier.overrideAttrs(old: {
+  vim-hier = super.vim-hier.overrideAttrs(old: {
     buildInputs = [ vim ];
   });
 
-  vim-isort = generated.vim-isort.overrideAttrs(old: {
+  vim-isort = super.vim-isort.overrideAttrs(old: {
     postPatch = ''
       substituteInPlace ftplugin/python_vimisort.vim \
-        --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+        --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
     '';
   });
 
-  vim-snipmate = generated.vim-snipmate.overrideAttrs(old: {
-    dependencies = [ vim-addon-mw-utils tlib_vim ];
+  vim-snipmate = super.vim-snipmate.overrideAttrs(old: {
+    dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
   });
 
 
-  vim-wakatime = generated.vim-wakatime.overrideAttrs(old: {
+  vim-wakatime = super.vim-wakatime.overrideAttrs(old: {
     buildInputs = [ python ];
   });
 
-  vim-xdebug = generated.vim-xdebug.overrideAttrs(old: {
+  vim-xdebug = super.vim-xdebug.overrideAttrs(old: {
     postInstall = false;
   });
 
-  vim-xkbswitch = generated.vim-xkbswitch.overrideAttrs(old: {
+  vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
         --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
@@ -353,14 +322,14 @@ rec {
     buildInputs = [ xkb_switch ];
   });
 
-  vim-yapf = generated.vim-yapf.overrideAttrs(old: {
+  vim-yapf = super.vim-yapf.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
     '';
   });
 
-  vimproc-vim = generated.vimproc-vim.overrideAttrs(old: {
+  vimproc-vim = super.vimproc-vim.overrideAttrs(old: {
     buildInputs = [ which ];
 
     buildPhase = ''
@@ -372,11 +341,11 @@ rec {
     '';
   });
 
-  YankRing-vim = generated.YankRing-vim.overrideAttrs(old: {
+  YankRing-vim = super.YankRing-vim.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
-  youcompleteme = generated.youcompleteme.overrideAttrs(old: {
+  youcompleteme = super.youcompleteme.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
@@ -395,9 +364,9 @@ rec {
     };
   });
 
-  jedi-vim = generated.jedi-vim.overrideAttrs(old: {
+  jedi-vim = super.jedi-vim.overrideAttrs(old: {
     # checking for python3 support in vim would be neat, too, but nobody else seems to care
-    buildInputs = [ python3Packages.jedi ];
+    buildInputs = [ python3.pkgs.jedi ];
     meta = {
       description = "code-completion for python using python-jedi";
       license = stdenv.lib.licenses.mit;

From bf1a563af0aab7e3057eb7f0f20b6c26ce0ee7cc Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 03:01:15 +0000
Subject: [PATCH 2766/2793] pythonPackages.sip: make sip-module name
 overridable

The author of sip wants it to be a private dependency of other packages by
making it importable under different names.
---
 pkgs/development/python-modules/sip/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index ee8a1ffbafc..b0ba377d628 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,20 +1,20 @@
-{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
+{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
 
 buildPythonPackage rec {
-  pname = "sip";
+  pname = sip-module;
   version = "4.19.13";
   format = "other";
 
   disabled = isPyPy;
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz";
     sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3";
   };
 
   configurePhase = ''
     ${python.executable} ./configure.py \
-      --sip-module PyQt5.sip \
+      --sip-module ${sip-module} \
       -d $out/lib/${python.libPrefix}/site-packages \
       -b $out/bin -e $out/include
   '';

From 4ec84c297cb0adfadcc8290a2395031581e8d640 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 03:06:14 +0000
Subject: [PATCH 2767/2793] pythonPackages.pyqt5: import sip as PyQt5.sip

pyqt5 5.11 has switched from sip to PyQt5.sip.
---
 pkgs/development/python-modules/pyqt/5.x.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 7c08b9f45d1..14d7bddbb70 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -8,7 +8,9 @@ let
   pname = "PyQt";
   version = "5.11.3";
 
-  inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34;
+  inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
+
+  sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; };
 
 in buildPythonPackage {
   pname = pname;
@@ -32,10 +34,10 @@ in buildPythonPackage {
 
   nativeBuildInputs = [ pkgconfig qmake lndir ];
 
-  buildInputs = [ dbus ];
+  buildInputs = [ dbus sip ];
 
   propagatedBuildInputs = [
-    sip qtbase qtsvg qtwebkit qtwebengine
+    qtbase qtsvg qtwebkit qtwebengine
   ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
 
   configurePhase = ''
@@ -65,7 +67,7 @@ in buildPythonPackage {
   '';
 
   postInstall = ''
-    ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
+    ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
     done

From 666be18aa32dd7114f52f078cd3ca11f7f0e43eb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 11:40:50 +0000
Subject: [PATCH 2768/2793] opentx: fix build, support building tests

It checks for "nano" with "if(NOT NANO STREQUAL NO)".

Broken since https://hydra.nixos.org/build/83296608 (#48286).
---
 pkgs/applications/misc/opentx/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 95a2f2b940c..cd9a86e7fac 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , cmake, gcc-arm-embedded, binutils-arm-embedded, python
-, qt5, SDL, gmock
+, qt5, SDL, gtest
 , dfu-util, avrdude
 }:
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
   buildInputs = with qt5; [
     python python.pkgs.pyqt4
     qtbase qtmultimedia qttranslations
-    SDL gmock
+    SDL
   ];
 
   postPatch = ''
@@ -38,11 +38,12 @@ in stdenv.mkDerivation {
   '';
 
   cmakeFlags = [
+    "-DGTEST_ROOT=${gtest.src}/googletest"
     "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
     # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
     #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
     #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
-    "-DNANO=OFF"
+    "-DNANO=NO"
   ];
 
   meta = with stdenv.lib; {

From ad587caf6a459f34307a5f85d644db3b4d6180c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Dec 2018 18:22:05 -0200
Subject: [PATCH 2769/2793] zafiro-icons: 0.7.7 -> 0.7.9

---
 pkgs/data/icons/zafiro-icons/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index 1614f6cd3d8..f44d22d4953 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchFromGitHub, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "zafiro-icons";
-  version = "0.7.7";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0471gf4s32dhcm3667l1bnam04jk4miw3c6s557vix59rih1y71p";
+    sha256 = "08cd4hcmhyrm91ps6j3c6jpwg5b9y635smnmrzgiz33iy2pa0qm7";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 21f04bc66acc5ba83a5d5ddf3a8789aebd9918f1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 13:10:36 +0000
Subject: [PATCH 2770/2793] pythonPackages.sip: enable parallel building

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index b0ba377d628..2b034897a78 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
       -b $out/bin -e $out/include
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Creates C++ bindings for Python modules";
     homepage    = "http://www.riverbankcomputing.co.uk/";

From 2534dddaa96af8faa442ba7ac360966c7990e773 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 27 Dec 2018 14:39:53 +0100
Subject: [PATCH 2771/2793] pandoc: fix build, unbreaks `metrics` job

---
 pkgs/top-level/all-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9242686263..93464decff5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4710,6 +4710,13 @@ in
       mkdir -p $out/share/man/man1
       cp man/pandoc.1 $out/share/man/man1/
     '';
+    # Newer tasty version works
+    # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7
+    # Note the patch doesn't apply because we fetch the cabal file from elsewhere
+    # This should be removed with pandoc 2.6.
+    postPatch = ''
+      substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3"
+    '';
   });
 
   pamtester = callPackage ../tools/security/pamtester { };

From 9db84f6fcdb2616471abb6a427a2b21fe8a8255f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 24 Nov 2018 18:37:46 +0100
Subject: [PATCH 2772/2793] nixos/security/misc: use mkMerge for easier
 extension

---
 nixos/modules/security/misc.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
index 42f872b7b08..f3fc6db22ea 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixos/modules/security/misc.nix
@@ -24,16 +24,18 @@ with lib;
     };
   };
 
-  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;
+  config = mkMerge [
+    (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`.";
-      }
-    ];
-  };
+      assertions = [
+        { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
+          message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
+        }
+      ];
+    })
+  ];
 }

From 84fb8820db6226a6e5333813d47da6d876243064 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 16 Dec 2018 10:37:36 +0100
Subject: [PATCH 2773/2793] nixos/security/misc: factor out protectKernelImage

Introduces the option security.protectKernelImage that is intended to control
various mitigations to protect the integrity of the running kernel
image (i.e., prevent replacing it without rebooting).

This makes sense as a dedicated module as it is otherwise somewhat difficult
to override for hardened profile users who want e.g., hibernation to work.
---
 nixos/modules/profiles/hardened.nix |  8 ++------
 nixos/modules/security/misc.nix     | 15 +++++++++++++++
 nixos/tests/hardened.nix            |  6 ++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 61e871bcaca..bad4cb81639 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -20,6 +20,8 @@ with lib;
 
   security.allowUserNamespaces = mkDefault false;
 
+  security.protectKernelImage = mkDefault true;
+
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [
@@ -28,9 +30,6 @@ with lib;
 
     # Disable legacy virtual syscalls
     "vsyscall=none"
-
-    # Disable hibernation (allows replacing the running kernel)
-    "nohibernate"
   ];
 
   boot.blacklistedKernelModules = [
@@ -44,9 +43,6 @@ with lib;
   # (e.g., parent/child)
   boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;
 
-  # Prevent replacing the running kernel image w/o reboot
-  boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
-
   # Restrict access to kernel ring buffer (information leaks)
   boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true;
 
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
index f3fc6db22ea..b1db0bc8da8 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixos/modules/security/misc.nix
@@ -22,6 +22,14 @@ with lib;
         a user namespace fails with "no space left on device" (ENOSPC).
       '';
     };
+
+    security.protectKernelImage = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to prevent replacing the running kernel image.
+      '';
+    };
   };
 
   config = mkMerge [
@@ -37,5 +45,12 @@ with lib;
         }
       ];
     })
+
+    (mkIf config.security.protectKernelImage {
+      # Disable hibernation (allows replacing the running kernel)
+      boot.kernelParams = [ "nohibernate" ];
+      # Prevent replacing the running kernel image w/o reboot
+      boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
+    })
   ];
 }
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index e10a6363164..683f56c45af 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -70,5 +70,11 @@ import ./make-test.nix ({ pkgs, ...} : {
         $machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'");
         $machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK";
       };
+
+      # Test kernel image protection
+      subtest "kernelimage", sub {
+        $machine->fail("systemctl hibernate");
+        $machine->fail("systemctl kexec");
+      };
     '';
 })

From e9761fa3270c5182b488e483be1d97ed7e8a0fee Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 26 Dec 2018 22:22:55 +0100
Subject: [PATCH 2774/2793] nixos/security/misc: expose l1tf mitigation option

For the hardened profile enable flushing whenever the hypervisor enters the
guest, but otherwise leave at kernel default (conditional flushing as of
writing).
---
 nixos/modules/profiles/hardened.nix |  2 ++
 nixos/modules/security/misc.nix     | 39 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index bad4cb81639..53aa4bae262 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -22,6 +22,8 @@ with lib;
 
   security.protectKernelImage = mkDefault true;
 
+  security.virtualization.flushL1DataCache = mkDefault "always";
+
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
index b1db0bc8da8..735362729bf 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixos/modules/security/misc.nix
@@ -30,6 +30,41 @@ with lib;
         Whether to prevent replacing the running kernel image.
       '';
     };
+
+    security.virtualization.flushL1DataCache = mkOption {
+      type = types.nullOr (types.enum [ "never" "cond" "always" ]);
+      default = null;
+      description = ''
+        Whether the hypervisor should flush the L1 data cache before
+        entering guests.
+        </para>
+
+        <para>
+          <variablelist>
+          <varlistentry>
+            <term><literal>null</literal></term>
+            <listitem><para>uses the kernel default</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"never"</literal></term>
+            <listitem><para>disables L1 data cache flushing entirely.
+            May be appropriate if all guests are trusted.</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"cond"</literal></term>
+            <listitem><para>flushes L1 data cache only for pre-determined
+            code paths.  May leak information about the host address space
+            layout.</para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"always"</literal></term>
+            <listitem><para>flushes L1 data cache every time the hypervisor
+            enters the guest.  May incur significant performance cost.
+            </para></listitem>
+          </varlistentry>
+          </variablelist>
+      '';
+    };
   };
 
   config = mkMerge [
@@ -52,5 +87,9 @@ with lib;
       # Prevent replacing the running kernel image w/o reboot
       boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
     })
+
+    (mkIf (config.security.virtualization.flushL1DataCache != null) {
+      boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ];
+    })
   ];
 }

From ea4f37162767280bbed460dc7293b6738cb43bd5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 26 Dec 2018 22:24:04 +0100
Subject: [PATCH 2775/2793] nixos/security/misc: expose SMT control option

For the hardened profile disable symmetric multi threading.  There seems to be
no *proven* method of exploiting cache sharing between threads on the same CPU
core, so this may be considered quite paranoid, considering the perf cost.
SMT can be controlled at runtime, however.  This is in keeping with OpenBSD
defaults.

TODO: since SMT is left to be controlled at runtime, changing the option
definition should take effect on system activation.  Write to
/sys/devices/system/cpu/smt/control
---
 nixos/modules/profiles/hardened.nix |  2 ++
 nixos/modules/security/misc.nix     | 30 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 53aa4bae262..a588943fe71 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -22,6 +22,8 @@ with lib;
 
   security.protectKernelImage = mkDefault true;
 
+  security.allowSimultaneousMultithreading = mkDefault false;
+
   security.virtualization.flushL1DataCache = mkDefault "always";
 
   security.apparmor.enable = mkDefault true;
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
index 735362729bf..4506a67487d 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixos/modules/security/misc.nix
@@ -31,12 +31,38 @@ with lib;
       '';
     };
 
+    security.allowSimultaneousMultithreading = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to allow SMT/hyperthreading.  Disabling SMT means that only
+        physical CPU cores will be usable at runtime, potentially at
+        significant performance cost.
+        </para>
+
+        <para>
+        The primary motivation for disabling SMT is to mitigate the risk of
+        leaking data between threads running on the same CPU core (due to
+        e.g., shared caches).  This attack vector is unproven.
+        </para>
+
+        <para>
+        Disabling SMT is a supplement to the L1 data cache flushing mitigation
+        (see <xref linkend="opt-security.virtualization.flushL1DataCache"/>)
+        versus malicious VM guests (SMT could "bring back" previously flushed
+        data).
+        </para>
+        <para>
+      '';
+    };
+
     security.virtualization.flushL1DataCache = mkOption {
       type = types.nullOr (types.enum [ "never" "cond" "always" ]);
       default = null;
       description = ''
         Whether the hypervisor should flush the L1 data cache before
         entering guests.
+        See also <xref linkend="opt-security.allowSimultaneousMultithreading"/>.
         </para>
 
         <para>
@@ -88,6 +114,10 @@ with lib;
       boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
     })
 
+    (mkIf (!config.security.allowSimultaneousMultithreading) {
+      boot.kernelParams = [ "nosmt" ];
+    })
+
     (mkIf (config.security.virtualization.flushL1DataCache != null) {
       boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ];
     })

From 544e7157b30e587ea4994fb78652c6fa12fa4101 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 27 Dec 2018 15:11:28 +0100
Subject: [PATCH 2776/2793] dmrconfig: 1.0 -> 1.1 (#52961)

Changes: https://github.com/sergev/dmrconfig/releases/tag/1.1
---
 pkgs/applications/misc/dmrconfig/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
index 7e20b87eb98..7125e37f7f9 100644
--- a/pkgs/applications/misc/dmrconfig/default.nix
+++ b/pkgs/applications/misc/dmrconfig/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "dmrconfig-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
     rev = version;
-    sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9";
+    sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
   };
 
   buildInputs = [
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace Makefile \
-      --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \
-      --replace "\$(shell git describe --tags --abbrev=0)" ${version} \
-      --replace "\$(shell git rev-list HEAD --count)" 0
+      --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
   '';
 
+  makeFlags = "VERSION=${version} GITCOUNT=0";
+
   installPhase = ''
     mkdir -p $out/bin $out/lib/udev/rules.d
     make install

From ebe05a7109b44a41e230752dd7f177910efad2e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Dec 2018 06:12:54 -0800
Subject: [PATCH 2777/2793] bacula: 9.2.2 -> 9.4.1 (#52924)

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

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index fce1ff75cfa..759e2606e19 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.2.2";
+  name = "bacula-9.4.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "0bi2jwvgs2ppdvksx41z69b5r5qr39kasxcgyhd08d6i8z89j87h";
+    sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

From 364c59dd9435ab9aedb79282568b0eeb5b0cbcc0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 27 Dec 2018 15:24:41 +0100
Subject: [PATCH 2778/2793] python.pkgs.pytest_xdist: pytest-forked is needed
 during runtime, fixes #45060

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 9b1be86a7c8..a8fc1c6742b 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
@@ -9,9 +9,9 @@ buildPythonPackage rec {
     sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de";
   };
 
-  nativeBuildInputs = [ setuptools_scm ];
-  checkInputs = [ pytest pytest-forked filelock ];
-  propagatedBuildInputs = [ execnet ];
+  nativeBuildInputs = [ setuptools_scm pytest ];
+  checkInputs = [ pytest filelock ];
+  propagatedBuildInputs = [ execnet pytest-forked six ];
 
   checkPhase = ''
     # Excluded tests access file system

From 167e748d94aff9957d7f064a54fbc70153c8ff03 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 27 Dec 2018 18:06:25 +0100
Subject: [PATCH 2779/2793] insync: 1.4.5.37069 -> 1.5.5.37367

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index fee19de0e8d..9c1aa8f86f6 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "insync-${version}";
-  version = "1.4.5.37069";
+  version = "1.5.5.37367";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-        sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd";
+        sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3";
       }
     else
       throw "${name} is not supported on ${stdenv.hostPlatform.system}";

From 6d315ab1facfb383119f84e5843d1ce9012f4846 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 17:14:33 +0000
Subject: [PATCH 2780/2793] allegro4: fix build with mesa 18.2.5

GL/glxext.h include guard was changed in
https://cgit.freedesktop.org/mesa/mesa/commit/include/GL/glxext.h?h=mesa-18.2.5&id=06eb33960e85994bd4ee952395dde6d1762c93b5
---
 .../allegro/allegro4-mesa-18.2.5.patch        | 26 +++++++++++++++++++
 .../development/libraries/allegro/default.nix |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch

diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch
new file mode 100644
index 00000000000..c49ebb550f3
--- /dev/null
+++ b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch
@@ -0,0 +1,26 @@
+--- a/addons/allegrogl/include/alleggl.h
++++ b/addons/allegrogl/include/alleggl.h
+@@ -63,9 +63,11 @@ typedef __int64 INT64;
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glext_h_
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include <GL/gl.h>
+ #undef  __glext_h_
+ #undef  __glxext_h_
++#undef  __glx_glxext_h_
+ 
+ #endif /* ALLEGRO_MACOSX */
+ 
+--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
++++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+@@ -1,7 +1,9 @@
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include <GL/glx.h>
+ #undef __glxext_h_
++#undef __glx_glxext_h_
+ 
+ #ifndef GLX_VERSION_1_3
+ #define AGLX_VERSION_1_3
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index f53aa873b48..133c0726acb 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./allegro4-mesa-18.2.5.patch
     ./nix-unstable-sandbox-fix.patch
   ];
 

From 39b3cad721ce1fe9f9a7cb74d3ed7622ac9fd5d1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 17:25:57 +0000
Subject: [PATCH 2781/2793] k3d: fix build

---
 pkgs/applications/graphics/k3d/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index a4b509704a7..301dc902dce 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
 
   #doCheck = false;
 
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-deprecated-declarations"
+  ];
+
   meta = with stdenv.lib; {
     description = "A 3D editor with support for procedural editing";
     homepage = http://www.k-3d.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f3ecebc3df..53bb883b55a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17793,6 +17793,7 @@ in
   k3d = callPackage ../applications/graphics/k3d {
     inherit (pkgs.gnome2) gtkglext;
     stdenv = overrideCC stdenv gcc6;
+    boost = boost166.override { enablePython = true; };
   };
 
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};

From 992fc1ae5434458bbbc37f7c7a64231ead940ccf Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 17:34:29 +0000
Subject: [PATCH 2782/2793] libs3: 2017-06-01 -> 2018-12-03

---
 pkgs/development/libraries/libs3/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 540d84dc244..dfec4bc4897 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,26 +1,23 @@
 { stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libs3-2017-06-01";
+  name = "libs3-2018-12-03";
 
   src = fetchFromGitHub {
     owner = "bji";
     repo = "libs3";
-    rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2";
-    sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3";
+    rev = "111dc30029f64bbf82031f3e160f253a0a63c119";
+    sha256 = "1ahf08hc7ql3fazfmlyj9vrhq7cvarsmgn2v8149y63zr1fl61hs";
   };
 
   buildInputs = [ curl libxml2 ];
 
-  # added to fix build with gcc7, review on update
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
-
-  DESTDIR = "\${out}";
+  makeFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/bji/libs3;
     description = "A library for interfacing with amazon s3";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
   };
 }

From 830599debecac99f0215029c922879af84be386e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 27 Dec 2018 17:52:04 +0000
Subject: [PATCH 2783/2793] nix1: fix build with boehmgc 7.6.8

It needs -lgc and -lgccpp, but boehmgc pkgconfig file specifies only -lgc.

Broken in https://hydra.nixos.org/build/82223544
---
 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 ea03570bb3e..e6beee0b38c 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -51,10 +51,11 @@ 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 is20
-      ''
+      if is20 then ''
         mkdir -p $out/lib
         cp ${boost}/lib/libboost_context* $out/lib
+      '' else ''
+        configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp")
       '';
 
     configureFlags =

From 4c2c27c94cb5cd8a89a9b872062b7b0a2a6b3f45 Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Thu, 27 Dec 2018 19:58:43 +0100
Subject: [PATCH 2784/2793] dwm-status: 1.5.0 -> 1.6.0 (#52982)

---
 .../window-managers/dwm/dwm-status.nix         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index d846ab7e29d..2a8f1d67f6e 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,30 +1,30 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
-, enableAlsaUtils ? true, alsaUtils, bash, coreutils }:
+, enableAlsaUtils ? true, alsaUtils, coreutils
+, enableNetwork ? true, dnsutils, iproute, wirelesstools }:
 
 let
-  binPath = stdenv.lib.makeBinPath [
-    alsaUtils bash coreutils
-  ];
+  bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
+    ++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ];
 in
 
 rustPlatform.buildRustPackage rec {
   name = "dwm-status-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = "dwm-status";
     rev = version;
-    sha256 = "0mfzpyacd7i6ipbjwyl1zc0x3lnz0f4qqzsmsb07p047z95mw4v6";
+    sha256 = "02gvlxv6ylx4mdkf59crm2zyahiz1zd4cr5zz29dnhx7r7738i9a";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "1cngcacsbzijs55k4kz8fidki3p8jblk3v5s21hjsn4glzjdbkmm";
+  cargoSha256 = "1khknf1bjs80cc2n4jnpilf8cc15crykhhyvvff6q4ay40353gr6";
 
-  postInstall = lib.optionalString enableAlsaUtils ''
-    wrapProgram $out/bin/dwm-status --prefix "PATH" : "${binPath}"
+  postInstall = lib.optionalString (bins != [])  ''
+    wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
   '';
 
   meta = with stdenv.lib; {

From 8d84ba7037c02d0dbb3937581f8ee2096e6258cb Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 27 Dec 2018 20:04:52 +0100
Subject: [PATCH 2785/2793] ideviceinstaller: init at 2018-06-01

---
 pkgs/tools/misc/ideviceinstaller/default.nix | 30 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/misc/ideviceinstaller/default.nix

diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
new file mode 100644
index 00000000000..957267ae10e
--- /dev/null
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }:
+
+stdenv.mkDerivation rec {
+  pname = "ideviceinstaller";
+  version = "2018-06-01";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "libimobiledevice";
+    repo = pname;
+    rev = "f7988de8279051f3d2d7973b8d7f2116aa5d9317";
+    sha256 = "1vmdvbwnjz3f90b9bqq7jg04q7awsbi9pmkvgwal8xdpp6jcwkwx";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/libimobiledevice/ideviceinstaller;
+    description = "List/modify installed apps of iOS devices";
+    longDescription = ''
+      ideviceinstaller is a tool to interact with the installation_proxy 
+      of an iOS device allowing to install, upgrade, uninstall, archive, restore
+      and enumerate installed or archived apps.
+    '';
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ aristid ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53bb883b55a..5d7cbf38025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3416,6 +3416,7 @@ in
   iftop = callPackage ../tools/networking/iftop { };
 
   ifuse = callPackage ../tools/filesystems/ifuse { };
+  ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
 
   inherit (callPackages ../tools/filesystems/irods rec {
             stdenv = llvmPackages_38.libcxxStdenv;

From 805e89ce32fc761a235a7877d93b3527c8a9fc9c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 27 Dec 2018 21:08:57 +0100
Subject: [PATCH 2786/2793] python3Packages.goobook: 3.1 -> 3.3

Unfortunately this package was unmaintained for years, which is why I
had to change quite some stuff (it's probably still not perfect) and set
myself as maintainer (replacing the existing ones, which maintained it
until version 1.9).
---
 .../python-modules/goobook/default.nix        | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
index 4a3c3dc3bcb..e63c97c6793 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -1,39 +1,24 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, oauth2client
-, gdata
-, google_api_python_client
-, simplejson
-, httplib2
-, keyring
-, six
-, rsa
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, google_api_python_client, simplejson, oauth2client
 }:
 
 buildPythonPackage rec {
   pname = "goobook";
-  version = "3.1";
-  disabled = isPy3k;
+  version = "3.3";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
+    sha256 = "0sanlki1rcqvhbds7a049v2kzglgpm761i728115mdracw0s6i3h";
   };
 
-  propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
-
-  preConfigure = ''
-    sed -i '/distribute/d' setup.py
-  '';
+  propagatedBuildInputs = [ google_api_python_client simplejson oauth2client ];
 
   meta = with stdenv.lib; {
     description = "Search your google contacts from the command-line or mutt";
     homepage    = https://pypi.python.org/pypi/goobook;
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ lovek323 hbunke ];
+    maintainers = with maintainers; [ primeos ];
     platforms   = platforms.unix;
   };
-
 }

From 1c8fea18e265b15722f0b3c4a76e024615035546 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 28 Dec 2018 03:31:25 +0000
Subject: [PATCH 2787/2793] kernel/patches.nix: remove hard tabs

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index dc41c2e5f15..2ff0d5d2620 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -61,11 +61,11 @@ rec {
   # Reverts a change related to the overlayfs overhaul in 4.19
   # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
   revert-vfs-dont-open-real = rec {
-	name = "revert-vfs-dont-open-real";
-	patch = fetchpatch {
-	  name = name + ".patch";
-	  url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
-	  sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
-	};
+    name = "revert-vfs-dont-open-real";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
+      sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
+    };
   };
 }

From 58b4351b38b35a5adb86c7ef91fe8bf431ca4c9b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 28 Dec 2018 13:31:58 +0100
Subject: [PATCH 2788/2793] vimPlugins.taglist-vim: fix build

The override actually broke the build, no idea why it was added
originally. The build works fine without it.
---
 pkgs/misc/vim-plugins/overrides.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index a35e7aaf464..307681111ac 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -167,15 +167,6 @@ self: super: {
     dependencies = with super; [ ultisnips ];
   });
 
-  taglist-vim = super.taglist-vim.overrideAttrs(old: {
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-  });
-
   vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
     dependencies = with super; [ vimproc-vim ];
   });

From d84ac4f43f7f64456399e091585c2072daa841df Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 28 Dec 2018 14:02:43 +0100
Subject: [PATCH 2789/2793] fflas-ffpack: add patch to fix flaky test (#53005)

---
 pkgs/development/libraries/fflas-ffpack/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index bf7630608f7..2dd58e64585 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
+, fetchpatch
 , gmpxx
 , optimize ? false # impure
 }:
@@ -14,6 +15,15 @@ stdenv.mkDerivation rec {
     sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
   };
 
+  patches = [
+    # https://github.com/linbox-team/fflas-ffpack/issues/146
+    (fetchpatch {
+      name = "fix-flaky-test-fgemm-check.patch";
+      url = "https://github.com/linbox-team/fflas-ffpack/commit/d8cd67d91a9535417a5cb193cf1540ad6758a3db.patch";
+      sha256 = "1gnfc616fvnlr0smvz6lb2d445vn8fgv6vqcr6pwm3dj4wa6v3b3";
+    })
+  ];
+
   checkInputs = [
     gmpxx
   ];

From bc7aa5d202665adca3c2ee28b35e813fffb74989 Mon Sep 17 00:00:00 2001
From: Andrey Komarov <taukus@gmail.com>
Date: Fri, 28 Dec 2018 02:01:18 +0300
Subject: [PATCH 2790/2793] iverilog: 2017.08.12 -> 2018.12.15

---
 pkgs/applications/science/electronics/verilog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index f31685b68ea..c4268b54c20 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iverilog-${version}";
-  version = "2017.08.12";
+  version = "2018.12.15";
 
   src = fetchFromGitHub {
     owner = "steveicarus";
     repo = "iverilog";
-    rev = "ac87138c44cd6089046668c59a328b4d14c16ddc";
-    sha256 = "1npv0533h0h2wxrxkgiaxqiasw2p4kj2vv5bd69w5xld227xcwpg";
+    rev = "7cd078e7ab184069b3b458fe6df7e83962254816";
+    sha256 = "1zc7lsa77dbsxjfz7vdgclmg97r0kw08xss7yfs4vyv5v5gnn98d";
   };
 
   patchPhase = ''

From f2c99c61cffee84aa51d3bd4d0ccea0893fb5057 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 28 Dec 2018 07:59:38 -0600
Subject: [PATCH 2791/2793] cockroachdb: 2.1.1 -> 2.1.3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/cockroachdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 6f4b10759e3..c1c70955d1f 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "2.1.1";
+  version = "2.1.3";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "1z34zlwznh4lgbc1ryn577w7mmycyjbmz28k1hhhb6ricmk1x847";
+    sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n";
   };
 
   inherit nativeBuildInputs buildInputs;

From 958a669e83d3463b7387179db651b220c6b3c0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 28 Dec 2018 16:07:06 -0200
Subject: [PATCH 2792/2793] qogir-theme: init at 2018-11-12 (#52918)

* qogir-theme: init at 2018-11-12

* qogir-theme: fix pname

Co-Authored-By: romildo <malaquias@gmail.com>
---
 pkgs/data/themes/qogir/default.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/themes/qogir/default.nix

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
new file mode 100644
index 00000000000..ee1808cd68e
--- /dev/null
+++ b/pkgs/data/themes/qogir/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "qogir-theme";
+  version = "2018-11-12";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = pname;
+    rev = version;
+    sha256 = "16hzgdl7d6jrd3gq0kmxad46gijc4hlxzy2rs3gqsfxqfj32nhqz";
+  };
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    patchShebangs .
+    mkdir -p $out/share/themes
+    name= ./Install -d $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A flat Design theme for GTK based desktop environments";
+    homepage = https://vinceliuice.github.io/Qogir-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 4a5192f900d..d0ccf05902d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15731,6 +15731,8 @@ in
 
   proggyfonts = callPackage ../data/fonts/proggyfonts { };
 
+  qogir-theme = callPackage ../data/themes/qogir { };
+
   route159 = callPackage ../data/fonts/route159 { };
 
   sampradaya = callPackage ../data/fonts/sampradaya { };

From aebec730715e81cc6e363a61b5f0fecf082da6f9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 25 Dec 2018 10:30:58 +0100
Subject: [PATCH 2793/2793] pythonPackages.update-copyright: init at 0.6.2

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

diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/pkgs/development/python-modules/update-copyright/default.nix
new file mode 100644
index 00000000000..ea20e9b3784
--- /dev/null
+++ b/pkgs/development/python-modules/update-copyright/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "update-copyright";
+  version = "0.6.2";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17ybdgbdc62yqhda4kfy1vcs1yzp78d91qfhj5zbvz1afvmvdk7z";
+  };
+
+  meta = with lib; {
+    description = "An automatic copyright update tool";
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0fa51214e43..ec86a570c7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4060,6 +4060,8 @@ in {
 
   update_checker = callPackage ../development/python-modules/update_checker {};
 
+  update-copyright = callPackage ../development/python-modules/update-copyright {};
+
   uritemplate = callPackage ../development/python-modules/uritemplate { };
 
   uproot = callPackage ../development/python-modules/uproot {};